@_nazmiforreal/flutter-ota 0.1.28 → 0.1.30

package/dart-src/root/android/src/main/kotlin/com/flutter_patcher/flutter_patcher/PatchManager.kt

@@ -613,14 +613,22 @@ internal class PatchManager(
     }
 
     private fun extractBaseAssetsIfNeeded(): Int {
-        // Extract base APK assets to assets/0/ if not already done
+        // Store the base APK's flutter_assets as a single archive for rollback.
+        // We keep ONLY the compressed archive (not an uncompressed mirror dir):
+        // the previous implementation left both `assets/0/` (uncompressed) AND
+        // `assets/0/flutter_assets.apk` (zip) on disk — two full copies of every
+        // bundled asset. The uncompressed copy is never read (rollback re-extracts
+        // from the archive), so it was pure waste.
         if (!baseAssetsArchive.exists()) {
             baseAssetsArchive.parentFile?.mkdirs()
+            val tmp = File(assetsHistoryDir, "0.tmp")
             try {
-                copyInstalledFlutterAssets(File(assetsHistoryDir, "0"))
-                writeFlutterAssetsArchive(File(assetsHistoryDir, "0"), baseAssetsArchive)
+                copyInstalledFlutterAssets(tmp)
+                writeFlutterAssetsArchive(tmp, baseAssetsArchive)
             } catch (e: Exception) {
                 Log.w(TAG, "failed to extract base assets", e)
+            } finally {
+                tmp.deleteRecursively()
             }
         }
         return 0
@@ -998,8 +1006,19 @@ internal class PatchManager(
                 meta.put("assetsRef", assetsRef)
                 archiveCurrentPatchToHistory(meta)
             } else {
-                // First patch ever - extract base assets
-                assetsRef = extractBaseAssetsIfNeeded()
+                // First patch ever.
+                //
+                // Only extract the base APK's flutter_assets (as a rollback
+                // reference) when this patch actually ships assets. A Dart-only
+                // (code-only) patch never overlays assets, so extracting the
+                // whole base asset tree here is pure waste — it was the main
+                // cause of a first code-patch ballooning app storage by 100s of
+                // MB. Code-only patches load assets straight from the APK.
+                assetsRef = if (finalAssets != null) {
+                    extractBaseAssetsIfNeeded()
+                } else {
+                    0
+                }
                 meta.put("assetsRef", assetsRef)
             }
 

package/dart-src/root/android/src/main/kotlin/com/flutter_patcher/flutter_patcher/PatcherConfig.kt

@@ -30,6 +30,11 @@ internal object PatcherConfig {
     const val KEY_CRASH_COUNT = "crash_count"
     const val KEY_PATCH_LOADING = "patch_loading"
 
+    /** Random UUID generated on first read and persisted; seeds the rollout
+     *  cohort on the Dart side. Survives patch updates and base-APK upgrades —
+     *  only reset by uninstall / `pm clear`, like the rest of these prefs. */
+    private const val KEY_DEVICE_ID = "device_install_id"
+
     /** PID written at [com.flutter_patcher.flutter_patcher.CrashGuard.markBooting]; consumed
      *  next cold start to look up `ActivityManager.getHistoricalProcessExitReasons` (API 30+).
      *  Unused on API < 30 — that path uses the naive "patch_loading=true ⇒ crash" rule. */
@@ -87,6 +92,21 @@ internal object PatcherConfig {
     fun prefs(context: Context): SharedPreferences =
         context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
+    /**
+     * Stable per-install device identifier (generated once, persisted).
+     *
+     * Used as the seed for server-side rollout-cohort hashing so a device
+     * lands in a consistent cohort across releases. Never leaves the device —
+     * the app sends only the derived 0-999 cohort number.
+     */
+    fun deviceInstallId(context: Context): String {
+        val existing = prefs(context).getString(KEY_DEVICE_ID, null)
+        if (!existing.isNullOrEmpty()) return existing
+        val fresh = java.util.UUID.randomUUID().toString()
+        prefs(context).edit().putString(KEY_DEVICE_ID, fresh).apply()
+        return fresh
+    }
+
     internal fun encodeLoaderFieldCandidates(fields: List<String>): String {
         val normalized = fields
             .map { it.trim() }

package/dart-src/root/lib/flutter_ota_kit.dart

@@ -756,7 +756,9 @@ class FlutterPatcher {
   ///
   /// Call [restart] after a successful rollback to activate the previous patch.
   static Future<RollbackOutcome> rollbackToPrevious() async {
-    if (_notAndroidGuard('rollbackToPrevious')) return RollbackOutcome.fallbackToBase;
+    if (_notAndroidGuard('rollbackToPrevious')) {
+      return RollbackOutcome.fallbackToBase;
+    }
     try {
       final outcomeName = await PatcherChannel.rollbackToPrevious();
       return RollbackOutcome.values.byName(outcomeName);
@@ -815,8 +817,9 @@ class FlutterPatcher {
     final showOverlay = showUpdateUi && result.shouldForceUpdate;
     final fromVersion = await currentVersion;
     final patchHash = result.patch!.md5;
-    final shortHash =
-        patchHash.isNotEmpty ? patchHash.substring(0, patchHash.length.clamp(0, 8)) : null;
+    final shortHash = patchHash.isNotEmpty
+        ? patchHash.substring(0, patchHash.length.clamp(0, 8))
+        : null;
 
     // Extract channel/platform from whichever config is active
     String? channel;
@@ -878,7 +881,9 @@ class FlutterPatcher {
       if (error != null &&
           deterministic.contains(error) &&
           patchVersion.isNotEmpty) {
-        _log('applyUpdate: patch failed (${error.name}), blacklisting $patchVersion');
+        _log(
+          'applyUpdate: patch failed (${error.name}), blacklisting $patchVersion',
+        );
         try {
           await PatcherChannel.reportApplyFailure(
             version: patchVersion,
@@ -889,15 +894,22 @@ class FlutterPatcher {
           _log('applyUpdate: failed to blacklist $patchVersion: $e', s);
         }
       } else {
-        _log('applyUpdate: patch failed (${error?.name}); transient, not '
-            'blacklisting (will retry next check)');
+        _log(
+          'applyUpdate: patch failed (${error?.name}); transient, not '
+          'blacklisting (will retry next check)',
+        );
       }
     }
 
     if (applied.ok && result.shouldForceUpdate) {
       handle?.end();
-      // Wait for overlay to finish its minimum display time + success dwell
-      await Future.delayed(const Duration(seconds: 3));
+      // Let the overlay finish its minimum display time + success dwell and
+      // fully unmount before killing the process. The old fixed 3s wait could
+      // restart while the install screen was still visible, because a fast
+      // download keeps the overlay up until the 7s minimum duration elapses.
+      await (handle?.dismissed ??
+              Future<void>.delayed(const Duration(seconds: 3)))
+          .timeout(const Duration(seconds: 12), onTimeout: () {});
       await restart();
     } else {
       handle?.end(hasError: !applied.ok, errorText: applied.message);
@@ -932,7 +944,9 @@ class FlutterPatcher {
           if (showUpdateUi) {
             OtaOverlayManager.instance.showRollbackToast(
               message: 'Update reverted — using previous version',
-              previousVersion: outcome == RollbackOutcome.success ? 'previous' : 'base',
+              previousVersion: outcome == RollbackOutcome.success
+                  ? 'previous'
+                  : 'base',
             );
           }
           await restart();
@@ -953,7 +967,10 @@ class FlutterPatcher {
       final patchVersion = result.patch!.version;
       final patchMd5 = result.patch!.md5;
       try {
-        if (await PatcherChannel.isVersionBlacklisted(patchVersion, md5: patchMd5)) {
+        if (await PatcherChannel.isVersionBlacklisted(
+          patchVersion,
+          md5: patchMd5,
+        )) {
           _log('checkAndApplyUpdates: $patchVersion is blacklisted, skip');
           return null;
         }
@@ -1039,7 +1056,10 @@ class FlutterPatcher {
   ///
   /// When [md5] is provided, the match uses both version and md5. Without md5,
   /// any entry with the same version is considered a match.
-  static Future<bool> isVersionBlacklisted(String version, {String md5 = ''}) async {
+  static Future<bool> isVersionBlacklisted(
+    String version, {
+    String md5 = '',
+  }) async {
     if (_notAndroidGuard('isVersionBlacklisted')) return false;
     try {
       return await PatcherChannel.isVersionBlacklisted(version, md5: md5);

package/dart-src/root/lib/src/aws_update_source.dart

@@ -91,6 +91,7 @@ class AwsUpdateSource {
       fingerprintHash: config.fingerprintHash,
       minBundleId: config.minBundleId,
       currentBundleId: currentBundleId,
+      cohort: config.cohort,
       timeout: timeout,
     );
   }

package/dart-src/root/lib/src/cloudflare_update_source.dart

@@ -91,6 +91,7 @@ class CloudflareUpdateSource {
       fingerprintHash: config.fingerprintHash,
       minBundleId: config.minBundleId,
       currentBundleId: currentBundleId,
+      cohort: config.cohort,
       timeout: timeout,
     );
   }