@capgo/capacitor-updater 7.20.1 → 7.22.0

package/README.md

@@ -255,6 +255,7 @@ CapacitorUpdater can be configured with these options:
 | **`localApiFiles`**           | <code>string</code>                             | Configure the CLI to use a local file api for testing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | <code>undefined</code>                                                        | 6.3.3   |
 | **`allowModifyUrl`**          | <code>boolean</code>                            | Allow the plugin to modify the updateUrl, statsUrl and channelUrl dynamically from the JavaScript side.                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | <code>false</code>                                                            | 5.4.0   |
 | **`allowModifyAppId`**        | <code>boolean</code>                            | Allow the plugin to modify the appId dynamically from the JavaScript side.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | <code>false</code>                                                            | 7.14.0  |
+| **`allowManualBundleError`**  | <code>boolean</code>                            | Allow marking bundles as errored from JavaScript while using manual update flows. When enabled, {@link CapacitorUpdaterPlugin.setBundleError} can change a bundle status to `error`.                                                                                                                                                                                                                                                                                                                                                                                              | <code>false</code>                                                            | 7.20.0  |
 | **`persistCustomId`**         | <code>boolean</code>                            | Persist the customId set through {@link CapacitorUpdaterPlugin.setCustomId} across app restarts. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                              | <code>false (will be true by default in a future major release v8.x.x)</code> | 7.17.3  |
 | **`persistModifyUrl`**        | <code>boolean</code>                            | Persist the updateUrl, statsUrl and channelUrl set through {@link CapacitorUpdaterPlugin.setUpdateUrl}, {@link CapacitorUpdaterPlugin.setStatsUrl} and {@link CapacitorUpdaterPlugin.setChannelUrl} across app restarts. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                      | <code>false</code>                                                            | 7.20.0  |
 | **`defaultChannel`**          | <code>string</code>                             | Set the default channel for the app in the config. Case sensitive. This will setting will override the default channel set in the cloud, but will still respect overrides made in the cloud. This requires the channel to allow devices to self dissociate/associate in the channel settings. https://capgo.app/docs/public-api/channels/#channel-configuration-options                                                                                                                                                                                                           | <code>undefined</code>                                                        | 5.5.0   |
@@ -296,6 +297,7 @@ In `capacitor.config.json`:
       "localApiFiles": undefined,
       "allowModifyUrl": undefined,
       "allowModifyAppId": undefined,
+      "allowManualBundleError": undefined,
       "persistCustomId": undefined,
       "persistModifyUrl": undefined,
       "defaultChannel": undefined,
@@ -343,6 +345,7 @@ const config: CapacitorConfig = {
       localApiFiles: undefined,
       allowModifyUrl: undefined,
       allowModifyAppId: undefined,
+      allowManualBundleError: undefined,
       persistCustomId: undefined,
       persistModifyUrl: undefined,
       defaultChannel: undefined,
@@ -371,6 +374,7 @@ export default config;
 * [`next(...)`](#next)
 * [`set(...)`](#set)
 * [`delete(...)`](#delete)
+* [`setBundleError(...)`](#setbundleerror)
 * [`list(...)`](#list)
 * [`reset(...)`](#reset)
 * [`current()`](#current)
@@ -392,6 +396,7 @@ export default config;
 * [`addListener('noNeedUpdate', ...)`](#addlistenernoneedupdate-)
 * [`addListener('updateAvailable', ...)`](#addlistenerupdateavailable-)
 * [`addListener('downloadComplete', ...)`](#addlistenerdownloadcomplete-)
+* [`addListener('breakingAvailable', ...)`](#addlistenerbreakingavailable-)
 * [`addListener('majorAvailable', ...)`](#addlistenermajoravailable-)
 * [`addListener('updateFailed', ...)`](#addlistenerupdatefailed-)
 * [`addListener('downloadFailed', ...)`](#addlistenerdownloadfailed-)
@@ -399,6 +404,7 @@ export default config;
 * [`addListener('appReady', ...)`](#addlistenerappready-)
 * [`isAutoUpdateAvailable()`](#isautoupdateavailable)
 * [`getNextBundle()`](#getnextbundle)
+* [`getFailedUpdate()`](#getfailedupdate)
 * [`setShakeMenu(...)`](#setshakemenu)
 * [`isShakeMenuEnabled()`](#isshakemenuenabled)
 * [`getAppId()`](#getappid)
@@ -541,6 +547,25 @@ Deletes the specified bundle from the native app storage. Use with {@link list}
 --------------------
 
 
+### setBundleError(...)
+
+```typescript
+setBundleError(options: BundleId) => Promise<BundleInfo>
+```
+
+Mark an installed bundle as errored. Only available when {@link PluginsConfig.CapacitorUpdater.allowManualBundleError} is true.
+
+| Param         | Type                                          | Description                                                                                    |
+| ------------- | --------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| **`options`** | <code><a href="#bundleid">BundleId</a></code> | A {@link <a href="#bundleid">BundleId</a>} object containing the bundle id to mark as errored. |
+
+**Returns:** <code>Promise&lt;<a href="#bundleinfo">BundleInfo</a>&gt;</code>
+
+**Since:** 7.20.0
+
+--------------------
+
+
 ### list(...)
 
 ```typescript
@@ -890,6 +915,27 @@ Listen for downloadComplete events.
 --------------------
 
 
+### addListener('breakingAvailable', ...)
+
+```typescript
+addListener(eventName: 'breakingAvailable', listenerFunc: (state: BreakingAvailableEvent) => void) => Promise<PluginListenerHandle>
+```
+
+Listen for breaking update events when the backend flags an update as incompatible with the current app.
+Emits the same payload as the legacy `majorAvailable` listener.
+
+| Param              | Type                                                                                    |
+| ------------------ | --------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'breakingAvailable'</code>                                                        |
+| **`listenerFunc`** | <code>(state: <a href="#majoravailableevent">MajorAvailableEvent</a>) =&gt; void</code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+**Since:** 7.22.0
+
+--------------------
+
+
 ### addListener('majorAvailable', ...)
 
 ```typescript
@@ -1019,6 +1065,21 @@ Returns null if no next bundle is set.
 --------------------
 
 
+### getFailedUpdate()
+
+```typescript
+getFailedUpdate() => Promise<UpdateFailedEvent | null>
+```
+
+Get the most recent update that failed to install, if any. The stored value is cleared after it is retrieved once.
+
+**Returns:** <code>Promise&lt;<a href="#updatefailedevent">UpdateFailedEvent</a> | null&gt;</code>
+
+**Since:** 7.22.0
+
+--------------------
+
+
 ### setShakeMenu(...)
 
 ```typescript
@@ -1201,17 +1262,18 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 
 #### LatestVersion
 
-| Prop             | Type                         | Description                | Since |
-| ---------------- | ---------------------------- | -------------------------- | ----- |
-| **`version`**    | <code>string</code>          | Result of getLatest method | 4.0.0 |
-| **`checksum`**   | <code>string</code>          |                            | 6     |
-| **`major`**      | <code>boolean</code>         |                            |       |
-| **`message`**    | <code>string</code>          |                            |       |
-| **`sessionKey`** | <code>string</code>          |                            |       |
-| **`error`**      | <code>string</code>          |                            |       |
-| **`old`**        | <code>string</code>          |                            |       |
-| **`url`**        | <code>string</code>          |                            |       |
-| **`manifest`**   | <code>ManifestEntry[]</code> |                            | 6.1   |
+| Prop             | Type                         | Description                                                          | Since  |
+| ---------------- | ---------------------------- | -------------------------------------------------------------------- | ------ |
+| **`version`**    | <code>string</code>          | Result of getLatest method                                           | 4.0.0  |
+| **`checksum`**   | <code>string</code>          |                                                                      | 6      |
+| **`breaking`**   | <code>boolean</code>         | Indicates whether the update was flagged as breaking by the backend. | 7.22.0 |
+| **`major`**      | <code>boolean</code>         |                                                                      |        |
+| **`message`**    | <code>string</code>          |                                                                      |        |
+| **`sessionKey`** | <code>string</code>          |                                                                      |        |
+| **`error`**      | <code>string</code>          |                                                                      |        |
+| **`old`**        | <code>string</code>          |                                                                      |        |
+| **`url`**        | <code>string</code>          |                                                                      |        |
+| **`manifest`**   | <code>ManifestEntry[]</code> |                                                                      | 6.1    |
 
 
 #### GetLatestOptions
@@ -1346,9 +1408,9 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 
 #### MajorAvailableEvent
 
-| Prop          | Type                | Description                                | Since |
-| ------------- | ------------------- | ------------------------------------------ | ----- |
-| **`version`** | <code>string</code> | Emit when a new major bundle is available. | 4.0.0 |
+| Prop          | Type                | Description                               | Since |
+| ------------- | ------------------- | ----------------------------------------- | ----- |
+| **`version`** | <code>string</code> | Emit when a breaking update is available. | 4.0.0 |
 
 
 #### UpdateFailedEvent
@@ -1425,6 +1487,13 @@ error: The bundle has failed to download.
 
 <code>'background' | 'kill' | 'nativeVersion' | 'date'</code>
 
+
+#### BreakingAvailableEvent
+
+Payload emitted by {@link CapacitorUpdaterPlugin.addListener} with `breakingAvailable`.
+
+<code><a href="#majoravailableevent">MajorAvailableEvent</a></code>
+
 </docgen-api>
 
 ### Listen to download events

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -68,8 +68,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String UPDATE_URL_PREF_KEY = "CapacitorUpdater.updateUrl";
     private static final String STATS_URL_PREF_KEY = "CapacitorUpdater.statsUrl";
     private static final String CHANNEL_URL_PREF_KEY = "CapacitorUpdater.channelUrl";
+    private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
+    private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
-    private final String PLUGIN_VERSION = "7.20.1";
+    private final String PLUGIN_VERSION = "7.22.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -97,6 +99,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private String directUpdateMode = "false";
     private Boolean wasRecentlyInstalledOrUpdated = false;
     Boolean shakeMenuEnabled = false;
+    private Boolean allowManualBundleError = false;
 
     private Boolean isPreviousMainActivity = true;
 
@@ -115,6 +118,17 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private FrameLayout splashscreenLoaderOverlay;
     private Runnable splashscreenTimeoutRunnable;
 
+    private void notifyBreakingEvents(final String version) {
+        if (version == null || version.isEmpty()) {
+            return;
+        }
+        for (final String eventName : BREAKING_EVENT_NAMES) {
+            final JSObject payload = new JSObject();
+            payload.put("version", version);
+            CapacitorUpdaterPlugin.this.notifyListeners(eventName, payload);
+        }
+    }
+
     private JSObject mapToJSObject(Map<String, Object> map) {
         JSObject jsObject = new JSObject();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
@@ -123,6 +137,37 @@ public class CapacitorUpdaterPlugin extends Plugin {
         return jsObject;
     }
 
+    private void persistLastFailedBundle(BundleInfo bundle) {
+        if (this.prefs == null) {
+            return;
+        }
+        final SharedPreferences.Editor localEditor = this.prefs.edit();
+        if (bundle == null) {
+            localEditor.remove(LAST_FAILED_BUNDLE_PREF_KEY);
+        } else {
+            final JSONObject json = new JSONObject(bundle.toJSONMap());
+            localEditor.putString(LAST_FAILED_BUNDLE_PREF_KEY, json.toString());
+        }
+        localEditor.apply();
+    }
+
+    private BundleInfo readLastFailedBundle() {
+        if (this.prefs == null) {
+            return null;
+        }
+        final String raw = this.prefs.getString(LAST_FAILED_BUNDLE_PREF_KEY, null);
+        if (raw == null || raw.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            return BundleInfo.fromJSON(raw);
+        } catch (final JSONException e) {
+            logger.error("Failed to parse failed bundle info: " + e.getMessage());
+            this.persistLastFailedBundle(null);
+            return null;
+        }
+    }
+
     public Thread startNewThread(final Runnable function, Number waitTime) {
         Thread bgTask = new Thread(() -> {
             try {
@@ -153,17 +198,23 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.implementation = new CapgoUpdater(logger) {
                 @Override
                 public void notifyDownload(final String id, final int percent) {
-                    CapacitorUpdaterPlugin.this.notifyDownload(id, percent);
+                    activity.runOnUiThread(() -> {
+                        CapacitorUpdaterPlugin.this.notifyDownload(id, percent);
+                    });
                 }
 
                 @Override
                 public void directUpdateFinish(final BundleInfo latest) {
-                    CapacitorUpdaterPlugin.this.directUpdateFinish(latest);
+                    activity.runOnUiThread(() -> {
+                        CapacitorUpdaterPlugin.this.directUpdateFinish(latest);
+                    });
                 }
 
                 @Override
                 public void notifyListeners(final String id, final Map<String, Object> res) {
-                    CapacitorUpdaterPlugin.this.notifyListeners(id, CapacitorUpdaterPlugin.this.mapToJSObject(res));
+                    activity.runOnUiThread(() -> {
+                        CapacitorUpdaterPlugin.this.notifyListeners(id, CapacitorUpdaterPlugin.this.mapToJSObject(res));
+                    });
                 }
             };
             final PackageInfo pInfo = this.getContext().getPackageManager().getPackageInfo(this.getContext().getPackageName(), 0);
@@ -290,6 +341,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
         this.keepUrlPathAfterReload = this.getConfig().getBoolean("keepUrlPathAfterReload", false);
         this.syncKeepUrlPathFlag(this.keepUrlPathAfterReload);
+        this.allowManualBundleError = this.getConfig().getBoolean("allowManualBundleError", false);
         this.autoSplashscreen = this.getConfig().getBoolean("autoSplashscreen", false);
         this.autoSplashscreenLoader = this.getConfig().getBoolean("autoSplashscreenLoader", false);
         int splashscreenTimeoutValue = this.getConfig().getInt("autoSplashscreenTimeout", 10000);
@@ -586,30 +638,36 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void cleanupObsoleteVersions() {
-        final String previous = this.prefs.getString("LatestNativeBuildVersion", "");
-        if (!"".equals(previous) && !Objects.equals(this.currentBuildVersion, previous)) {
-            logger.info("New native build version detected: " + this.currentBuildVersion);
-            this.implementation.reset(true);
-            final List<BundleInfo> installed = this.implementation.list(false);
-            for (final BundleInfo bundle : installed) {
-                try {
-                    logger.info("Deleting obsolete bundle: " + bundle.getId());
-                    this.implementation.delete(bundle.getId());
-                } catch (final Exception e) {
-                    logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
-                }
-            }
-            final List<BundleInfo> storedBundles = this.implementation.list(true);
-            final Set<String> allowedIds = new HashSet<>();
-            for (final BundleInfo info : storedBundles) {
-                if (info != null && info.getId() != null && !info.getId().isEmpty()) {
-                    allowedIds.add(info.getId());
+        startNewThread(() -> {
+            try {
+                final String previous = this.prefs.getString("LatestNativeBuildVersion", "");
+                if (!"".equals(previous) && !Objects.equals(this.currentBuildVersion, previous)) {
+                    logger.info("New native build version detected: " + this.currentBuildVersion);
+                    this.implementation.reset(true);
+                    final List<BundleInfo> installed = this.implementation.list(false);
+                    for (final BundleInfo bundle : installed) {
+                        try {
+                            logger.info("Deleting obsolete bundle: " + bundle.getId());
+                            this.implementation.delete(bundle.getId());
+                        } catch (final Exception e) {
+                            logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
+                        }
+                    }
+                    final List<BundleInfo> storedBundles = this.implementation.list(true);
+                    final Set<String> allowedIds = new HashSet<>();
+                    for (final BundleInfo info : storedBundles) {
+                        if (info != null && info.getId() != null && !info.getId().isEmpty()) {
+                            allowedIds.add(info.getId());
+                        }
+                    }
+                    this.implementation.cleanupDownloadDirectories(allowedIds);
                 }
+                this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
+                this.editor.apply();
+            } catch (Exception e) {
+                logger.error("Error during cleanupObsoleteVersions: " + e.getMessage());
             }
-            this.implementation.cleanupDownloadDirectories(allowedIds);
-        }
-        this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
-        this.editor.apply();
+        });
     }
 
     public void notifyDownload(final String id, final int percent) {
@@ -1041,6 +1099,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
             } else {
                 this.bridge.setServerBasePath(path);
             }
+            if (this.bridge != null && this.bridge.getWebView() != null) {
+                this.bridge.getWebView().post(() -> {
+                    if (this.bridge.getWebView() != null) {
+                        this.bridge.getWebView().loadUrl(this.bridge.getAppUrl());
+                        if (!this.keepUrlPathAfterReload) {
+                            this.bridge.getWebView().clearHistory();
+                        }
+                    }
+                });
+            }
         }
 
         this.checkAppReady();
@@ -1140,6 +1208,44 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void setBundleError(final PluginCall call) {
+        if (!Boolean.TRUE.equals(this.allowManualBundleError)) {
+            logger.error("setBundleError called without allowManualBundleError");
+            call.reject("setBundleError not allowed. Set allowManualBundleError to true in your config to enable it.");
+            return;
+        }
+        final String id = call.getString("id");
+        if (id == null) {
+            logger.error("setBundleError called without id");
+            call.reject("setBundleError called without id");
+            return;
+        }
+        try {
+            final BundleInfo bundle = this.implementation.getBundleInfo(id);
+            if (bundle == null || bundle.isUnknown()) {
+                logger.error("setBundleError called with unknown bundle " + id);
+                call.reject("Bundle " + id + " does not exist");
+                return;
+            }
+            if (bundle.isBuiltin()) {
+                logger.error("setBundleError called on builtin bundle");
+                call.reject("Cannot set builtin bundle to error state");
+                return;
+            }
+            if (Boolean.TRUE.equals(this.autoUpdate)) {
+                logger.warn("setBundleError used while autoUpdate is enabled; this method is intended for manual mode");
+            }
+            this.implementation.setError(bundle);
+            final JSObject ret = new JSObject();
+            ret.put("bundle", mapToJSObject(this.implementation.getBundleInfo(id).toJSONMap()));
+            call.resolve(ret);
+        } catch (final Exception e) {
+            logger.error("Could not set bundle error for id " + id + " " + e.getMessage());
+            call.reject("Could not set bundle error for id " + id, e);
+        }
+    }
+
     @PluginMethod
     public void list(final PluginCall call) {
         try {
@@ -1236,6 +1342,26 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    @PluginMethod
+    public void getFailedUpdate(final PluginCall call) {
+        try {
+            final BundleInfo bundle = this.readLastFailedBundle();
+            if (bundle == null || bundle.isUnknown()) {
+                call.resolve(null);
+                return;
+            }
+
+            this.persistLastFailedBundle(null);
+
+            final JSObject ret = new JSObject();
+            ret.put("bundle", mapToJSObject(bundle.toJSONMap()));
+            call.resolve(ret);
+        } catch (final Exception e) {
+            logger.error("Could not get failed update " + e.getMessage());
+            call.reject("Could not get failed update", e);
+        }
+    }
+
     public void checkForUpdateAfterDelay() {
         if (this.periodCheckDelay == 0 || !this._isAutoUpdateEnabled()) {
             return;
@@ -1480,10 +1606,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     try {
                         if (jsRes.has("message")) {
                             logger.info("API message: " + jsRes.get("message"));
-                            if (jsRes.has("major") && jsRes.getBoolean("major") && jsRes.has("version")) {
-                                final JSObject majorAvailable = new JSObject();
-                                majorAvailable.put("version", jsRes.getString("version"));
-                                CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", majorAvailable);
+                            if (jsRes.has("version") && (jsRes.has("breaking") || jsRes.has("major"))) {
+                                CapacitorUpdaterPlugin.this.notifyBreakingEvents(jsRes.getString("version"));
                             }
                             String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
                             CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
@@ -1738,6 +1862,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             logger.info("Did you forget to call 'notifyAppReady()' in your Capacitor App code?");
             final JSObject ret = new JSObject();
             ret.put("bundle", mapToJSObject(current.toJSONMap()));
+            this.persistLastFailedBundle(current);
             this.notifyListeners("updateFailed", ret);
             this.implementation.sendStats("update_fail", current.getVersionName());
             this.implementation.setError(current);

package/android/src/main/java/ee/forgr/capacitor_updater/CapgoUpdater.java

@@ -35,6 +35,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -80,6 +82,7 @@ public class CapgoUpdater {
     public int timeout = 20000;
 
     private final Map<String, CompletableFuture<BundleInfo>> downloadFutures = new ConcurrentHashMap<>();
+    private final ExecutorService io = Executors.newSingleThreadExecutor();
 
     public CapgoUpdater(Logger logger) {
         this.logger = logger;
@@ -245,60 +248,71 @@ public class CapgoUpdater {
                             String checksum = outputData.getString(DownloadService.CHECKSUM);
                             boolean isManifest = outputData.getBoolean(DownloadService.IS_MANIFEST, false);
 
-                            boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
-                            BundleInfo resultBundle;
-                            if (!success) {
-                                logger.error("Finish download failed: " + version);
-                                resultBundle = new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "");
-                                saveBundleInfo(id, resultBundle);
-                                // Cleanup download tracking
-                                DownloadWorkerManager.cancelBundleDownload(activity, id, version);
-                                Map<String, Object> ret = new HashMap<>();
-                                ret.put("version", version);
-                                ret.put("error", "finish_download_fail");
-                                sendStats("finish_download_fail", version);
-                                notifyListeners("downloadFailed", ret);
-                            } else {
-                                // Successful download - cleanup tracking
-                                DownloadWorkerManager.cancelBundleDownload(activity, id, version);
-                                resultBundle = getBundleInfo(id);
-                            }
+                            io.execute(() -> {
+                                boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
+                                BundleInfo resultBundle;
+                                if (!success) {
+                                    logger.error("Finish download failed: " + version);
+                                    resultBundle = new BundleInfo(
+                                        id,
+                                        version,
+                                        BundleStatus.ERROR,
+                                        new Date(System.currentTimeMillis()),
+                                        ""
+                                    );
+                                    saveBundleInfo(id, resultBundle);
+                                    // Cleanup download tracking
+                                    DownloadWorkerManager.cancelBundleDownload(activity, id, version);
+                                    Map<String, Object> ret = new HashMap<>();
+                                    ret.put("version", version);
+                                    ret.put("error", "finish_download_fail");
+                                    sendStats("finish_download_fail", version);
+                                    notifyListeners("downloadFailed", ret);
+                                } else {
+                                    // Successful download - cleanup tracking
+                                    DownloadWorkerManager.cancelBundleDownload(activity, id, version);
+                                    resultBundle = getBundleInfo(id);
+                                }
 
-                            // Complete the future if it exists
-                            CompletableFuture<BundleInfo> future = downloadFutures.remove(id);
-                            if (future != null) {
-                                future.complete(resultBundle);
-                            }
+                                // Complete the future if it exists
+                                CompletableFuture<BundleInfo> future = downloadFutures.remove(id);
+                                if (future != null) {
+                                    future.complete(resultBundle);
+                                }
+                            });
                             break;
                         case FAILED:
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
                             logger.error("Download failed: " + error + " " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
-                            BundleInfo failedBundle = new BundleInfo(
-                                id,
-                                failedVersion,
-                                BundleStatus.ERROR,
-                                new Date(System.currentTimeMillis()),
-                                ""
-                            );
-                            saveBundleInfo(id, failedBundle);
-                            // Cleanup download tracking for failed downloads
-                            DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
-                            Map<String, Object> ret = new HashMap<>();
-                            ret.put("version", failedVersion);
-                            if ("low_mem_fail".equals(error)) {
-                                sendStats("low_mem_fail", failedVersion);
-                            }
-                            ret.put("error", error != null ? error : "download_fail");
-                            sendStats("download_fail", failedVersion);
-                            notifyListeners("downloadFailed", ret);
-
-                            // Complete the future with error status
-                            CompletableFuture<BundleInfo> failedFuture = downloadFutures.remove(id);
-                            if (failedFuture != null) {
-                                failedFuture.complete(failedBundle);
-                            }
+
+                            io.execute(() -> {
+                                BundleInfo failedBundle = new BundleInfo(
+                                    id,
+                                    failedVersion,
+                                    BundleStatus.ERROR,
+                                    new Date(System.currentTimeMillis()),
+                                    ""
+                                );
+                                saveBundleInfo(id, failedBundle);
+                                // Cleanup download tracking for failed downloads
+                                DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
+                                Map<String, Object> ret = new HashMap<>();
+                                ret.put("version", failedVersion);
+                                if ("low_mem_fail".equals(error)) {
+                                    sendStats("low_mem_fail", failedVersion);
+                                }
+                                ret.put("error", error != null ? error : "download_fail");
+                                sendStats("download_fail", failedVersion);
+                                notifyListeners("downloadFailed", ret);
+
+                                // Complete the future with error status
+                                CompletableFuture<BundleInfo> failedFuture = downloadFutures.remove(id);
+                                if (failedFuture != null) {
+                                    failedFuture.complete(failedBundle);
+                                }
+                            });
                             break;
                     }
                 });