@capgo/capacitor-updater 8.51.25 → 8.52.1

package/CapgoCapacitorUpdater.podspec

@@ -13,8 +13,5 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'ZIPFoundation', '~> 0.9'
-  s.dependency 'Alamofire', '5.10.2'
-  s.dependency 'Version', '0.8.0'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -10,28 +10,20 @@ let package = Package(
             targets: ["CapacitorUpdaterPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
-        .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.12.0")),
-        .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.20"),
-        .package(url: "https://github.com/mrackwitz/Version.git", exact: "0.8.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
     ],
     targets: [
         .target(
             name: "CapacitorUpdaterPlugin",
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm"),
-                .product(name: "ZIPFoundation", package: "ZIPFoundation"),
-                .product(name: "Alamofire", package: "Alamofire"),
-                .product(name: "Version", package: "Version")
+                .product(name: "Cordova", package: "capacitor-swift-pm")
             ],
             path: "ios/Sources/CapacitorUpdaterPlugin"),
         .testTarget(
             name: "CapacitorUpdaterPluginTests",
             dependencies: [
-                "CapacitorUpdaterPlugin",
-                .product(name: "Version", package: "Version"),
-                .product(name: "ZIPFoundation", package: "ZIPFoundation")
+                "CapacitorUpdaterPlugin"
             ],
             path: "ios/Tests/CapacitorUpdaterPluginTests")
     ],

package/README.md

@@ -86,7 +86,7 @@ First follow the migration guide of Capacitor:
 
 The minimum iOS version is now **15.0** to match Capacitor 7/8 requirements.
 
-Starting from v8, the plugin uses [ZIPFoundation](https://github.com/weichsel/ZIPFoundation) instead of SSZipArchive/ZipArchive for ZIP extraction. ZIPFoundation uses Apple's native `libcompression` framework, which removes the previous zlib dependency and its associated security constraints.
+The plugin has no third-party iOS dependencies besides Capacitor: ZIP extraction uses a built-in reader on top of Apple's native `Compression` framework, and networking uses `URLSession`.
 
 ## Compatibility
 
@@ -335,6 +335,7 @@ CapacitorUpdater can be configured with these options:
 | **`localApi`**                         | <code>string</code>                                                                                        | Configure the CLI to use a local api for testing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | <code>undefined</code>                                                        | 6.3.3   |
 | **`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   |
+| **`allowHttpsToHttpRedirect`**         | <code>boolean</code>                                                                                       | Allow the plugin to follow redirects from HTTPS to plain HTTP for its own network requests (update checks, stats, channel calls, and bundle/manifest downloads). Blocked by default so a redirect can never downgrade updater traffic to an unencrypted connection. Only enable this if your self-hosted update server or CDN must redirect to an HTTP URL. Direct HTTP URLs (for example `localApi` during development) are not affected. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | <code>false</code>                                                            | 8.52.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  |
 | **`allowPreview`**                     | <code>boolean</code>                                                                                       | Allow JavaScript to start a native preview session and temporarily request updates for another app id. This is intended for trusted container apps that implement Expo Go-style preview flows. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | <code>false</code>                                                            | 8.47.0  |
@@ -383,6 +384,7 @@ In `capacitor.config.json`:
       "localApi": undefined,
       "localApiFiles": undefined,
       "allowModifyUrl": undefined,
+      "allowHttpsToHttpRedirect": undefined,
       "allowModifyAppId": undefined,
       "allowManualBundleError": undefined,
       "allowPreview": undefined,
@@ -437,6 +439,7 @@ const config: CapacitorConfig = {
       localApi: undefined,
       localApiFiles: undefined,
       allowModifyUrl: undefined,
+      allowHttpsToHttpRedirect: undefined,
       allowModifyAppId: undefined,
       allowManualBundleError: undefined,
       allowPreview: undefined,

package/android/build.gradle

@@ -58,10 +58,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    implementation 'io.github.g00fy2:versioncompare:1.5.0'
     // Play Core library for in-app updates
     implementation 'com.google.android.play:app-update:2.1.0'
-    implementation 'com.google.android.play:app-update-ktx:2.1.0'
     testImplementation "junit:junit:$junitVersion"
     testImplementation 'org.mockito:mockito-core:5.23.0'
     testImplementation 'org.json:json:20250517'

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

@@ -48,12 +48,10 @@ import com.google.android.play.core.install.InstallStateUpdatedListener;
 import com.google.android.play.core.install.model.AppUpdateType;
 import com.google.android.play.core.install.model.InstallStatus;
 import com.google.android.play.core.install.model.UpdateAvailability;
-import io.github.g00fy2.versioncompare.Version;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -75,7 +73,11 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
-// Removed OkHttpClient and Protocol imports - using shared client in DownloadService instead
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -146,7 +148,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     static final int APPLICATION_EXIT_REASON_USER_REQUESTED = 10;
     static final int APPLICATION_EXIT_REASON_DEPENDENCY_DIED = 12;
 
-    private final String pluginVersion = "8.51.25";
+    private final String pluginVersion = "8.52.1";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -222,6 +224,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private volatile Thread appReadyCheck;
     // When true, sendReadyToJs should wait for notifyAppReady before hiding splash.
     private volatile boolean pendingNotifyAppReadyWait = false;
+    // Armed only after a reload. The next document stamps this generation into notifyAppReady.
+    private final Object readyGuardLock = new Object();
+    private volatile int readyGeneration = 0;
+    private volatile boolean readyGuardArmed = false;
     private volatile int pendingNotifyAppReadyPhase = -1;
     private volatile long downloadStartTimeMs = 0;
     private static final long DOWNLOAD_TIMEOUT_MS = 600000; // 10 minute timeout
@@ -710,6 +716,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     CapacitorUpdaterPlugin.this.scheduleDirectUpdateFinish(latest);
                 }
 
+                @Override
+                public void backgroundDownloadSettled(final BundleInfo bundle, final String status) {
+                    CapacitorUpdaterPlugin.this.emitLaunchDownloadReady(bundle, status);
+                }
+
                 @Override
                 public void notifyListeners(final String id, final Map<String, Object> res) {
                     if (activity != null) {
@@ -727,7 +738,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.implementation.CAP_SERVER_PATH = WebView.CAP_SERVER_PATH;
             this.implementation.pluginVersion = this.pluginVersion;
             this.implementation.versionCode = this.getVersionCode(pInfo);
-            // Removed unused OkHttpClient creation - using shared client in DownloadService instead
             this.currentVersionNative = new Version(this.getConfig().getString("version", pInfo.versionName));
             this.currentBuildVersion = this.getVersionCode(pInfo);
             this.delayUpdateUtils = new DelayUpdateUtils(this.prefs, this.editor, this.currentVersionNative, logger);
@@ -886,6 +896,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         long responseTimeoutMillis = responseTimeoutSeconds > 0 ? (long) responseTimeoutSeconds * 1000L : 20_000L;
         this.implementation.timeout = (int) Math.min(Integer.MAX_VALUE, responseTimeoutMillis);
         DownloadService.applyHttpTimeouts(this.implementation.timeout);
+        DownloadService.setAllowHttpsToHttpRedirect(this.getConfig().getBoolean("allowHttpsToHttpRedirect", false));
         this.shakeMenuEnabled = this.getConfig().getBoolean("shakeMenu", false);
         this.shakeChannelSelectorEnabled = this.getConfig().getBoolean("allowShakeChannelSelector", false);
         this.shakeMenuGesture = normalizedShakeMenuGesture(this.getConfig().getString("shakeMenuGesture", SHAKE_MENU_GESTURE_SHAKE));
@@ -2336,6 +2347,24 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.endBackGroundTaskWithNotif("test", current.getVersionName(), current, false, plannedDirectUpdate);
     }
 
+    void emitLaunchDownloadReady(final BundleInfo bundle, final String status) {
+        final BundleInfo readyBundle = bundle != null ? bundle : this.implementation.getCurrentBundle();
+        if (readyBundle == null) {
+            return;
+        }
+        this.endBackGroundTaskWithNotif(
+            status,
+            readyBundle.getVersionName(),
+            readyBundle,
+            false,
+            false,
+            "download_fail",
+            "downloadFailed",
+            false,
+            false
+        );
+    }
+
     void scheduleDirectUpdateFinish(final BundleInfo latest) {
         startNewThread(() -> {
             try {
@@ -2925,6 +2954,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void applyCurrentBundleToBridge() {
+        this.stampReadyGenerationBeforeReload();
         final String path = this.implementation.getCurrentBundlePath();
         final boolean usingBuiltin = this.implementation.isUsingBuiltin();
         if (this.keepUrlPathAfterReload) {
@@ -3862,17 +3892,22 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private JSONObject fetchPreviewPayload(final String payloadUrl) throws IOException, JSONException {
-        final HttpURLConnection connection = (HttpURLConnection) new URL(payloadUrl).openConnection();
-        connection.setRequestMethod("GET");
-        connection.setRequestProperty("Accept", "application/json");
-        connection.setConnectTimeout(30000);
-        connection.setReadTimeout(60000);
-
-        try {
-            final int statusCode = connection.getResponseCode();
-            final String body = this.readResponseBody(
-                statusCode >= 200 && statusCode < 300 ? connection.getInputStream() : connection.getErrorStream()
-            );
+        final HttpUrl url = payloadUrl != null ? HttpUrl.parse(payloadUrl) : null;
+        if (url == null) {
+            throw new MalformedURLException("Expected an http or https preview payload URL");
+        }
+        // Shared client: no cookies, Capgo User-Agent.
+        final OkHttpClient client = DownloadService.sharedClient
+            .newBuilder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(60, TimeUnit.SECONDS)
+            .build();
+        final Request request = new Request.Builder().url(url).get().header("Accept", "application/json").build();
+
+        try (Response response = client.newCall(request).execute()) {
+            final int statusCode = response.code();
+            final ResponseBody responseBody = response.body();
+            final String body = this.readResponseBody(responseBody != null ? responseBody.byteStream() : null);
             final JSONObject payload = new JSONObject(body);
             if (statusCode < 200 || statusCode >= 300) {
                 throw new IOException(
@@ -3880,8 +3915,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 );
             }
             return payload;
-        } finally {
-            connection.disconnect();
         }
     }
 
@@ -4490,10 +4523,120 @@ public class CapacitorUpdaterPlugin extends Plugin {
         );
     }
 
+    static boolean shouldAcceptReadyCall(
+        final boolean guardArmed,
+        final int expectedGeneration,
+        final boolean hasGeneration,
+        final int reportedGeneration
+    ) {
+        if (!guardArmed) {
+            return true;
+        }
+        return hasGeneration && reportedGeneration == expectedGeneration;
+    }
+
+    static String readyGenerationScript(final int generation) {
+        // Wrap Capacitor.nativePromise, not the plugin proxy. registerPlugin's get trap
+        // ignores assignments to notifyAppReady. Each document keeps its own generation.
+        return (
+            "(function(){window.__CAPGO_READY_GEN=" +
+            generation +
+            ";if(window.__capgoReadyBridge)return;" +
+            "function arm(){var cap=window.Capacitor;if(!cap||typeof cap.nativePromise!=='function'||cap.__capgoNativePromise)return false;" +
+            "var orig=cap.nativePromise.bind(cap);" +
+            "cap.nativePromise=function(pluginName,methodName,options){if(pluginName==='CapacitorUpdater'&&methodName==='notifyAppReady'){" +
+            "var next={};if(options&&typeof options==='object'){for(var k in options){if(Object.prototype.hasOwnProperty.call(options,k))next[k]=options[k];}}" +
+            "next.loadGeneration=window.__CAPGO_READY_GEN;options=next;}return orig(pluginName,methodName,options);};" +
+            "cap.__capgoNativePromise=true;window.__capgoReadyBridge=true;return true;}" +
+            "if(!arm()){var n=0;var t=setInterval(function(){if(arm()||++n>100)clearInterval(t);},20);}" +
+            "})();"
+        );
+    }
+
+    private int armReadyGuard() {
+        synchronized (this.readyGuardLock) {
+            this.readyGeneration = this.readyGeneration + 1;
+            this.readyGuardArmed = true;
+            return this.readyGeneration;
+        }
+    }
+
+    private void disarmReadyGuard(final int generation) {
+        synchronized (this.readyGuardLock) {
+            if (this.readyGeneration == generation) {
+                this.readyGuardArmed = false;
+                logger.warn("Could not stamp notifyAppReady for the next page. Readiness guard disabled for this reload.");
+            }
+        }
+    }
+
+    private void stampReadyGenerationBeforeReload() {
+        final int generation = this.armReadyGuard();
+        final android.webkit.WebView webView = this.bridge != null ? this.bridge.getWebView() : null;
+        if (webView == null) {
+            this.disarmReadyGuard(generation);
+            return;
+        }
+        webView.post(() -> {
+            if (!this.installReadyGenerationScript(webView, generation)) {
+                this.disarmReadyGuard(generation);
+            }
+        });
+    }
+
+    private boolean installReadyGenerationScript(final android.webkit.WebView webView, final int generation) {
+        try {
+            final Class<?> webViewFeature = Class.forName("androidx.webkit.WebViewFeature");
+            final String feature = (String) webViewFeature.getField("DOCUMENT_START_SCRIPT").get(null);
+            final Boolean supported = (Boolean) webViewFeature.getMethod("isFeatureSupported", String.class).invoke(null, feature);
+            if (!Boolean.TRUE.equals(supported)) {
+                return false;
+            }
+            if (this.bridge == null || this.bridge.getAppUrl() == null) {
+                return false;
+            }
+            final String allowedOrigin = Uri.parse(this.bridge.getAppUrl())
+                .buildUpon()
+                .path(null)
+                .fragment(null)
+                .clearQuery()
+                .build()
+                .toString();
+            final Class<?> webViewCompat = Class.forName("androidx.webkit.WebViewCompat");
+            webViewCompat
+                .getMethod("addDocumentStartJavaScript", android.webkit.WebView.class, String.class, Set.class)
+                .invoke(null, webView, readyGenerationScript(generation), java.util.Collections.singleton(allowedOrigin));
+            return true;
+        } catch (final Exception e) {
+            logger.warn("Unable to stamp notifyAppReady generation: " + e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean acceptsReadyCall(final PluginCall call) {
+        if (!this.readyGuardArmed) {
+            return true;
+        }
+        final JSObject data = call.getData();
+        final boolean hasGeneration = data != null && data.has("loadGeneration");
+        final int reported = hasGeneration ? data.optInt("loadGeneration", -1) : -1;
+        return shouldAcceptReadyCall(this.readyGuardArmed, this.readyGeneration, hasGeneration, reported);
+    }
+
     @PluginMethod
     public void notifyAppReady(final PluginCall call) {
         ensureBridgeSet();
         try {
+            if (!this.acceptsReadyCall(call)) {
+                logger.info("Ignoring notifyAppReady from a page that is no longer current");
+                final BundleInfo current = this.implementation.getCurrentBundle();
+                final JSObject ignored = new JSObject();
+                if (current != null) {
+                    ignored.put("bundle", InternalUtils.mapToJSObject(current.toJSONMap()));
+                }
+                call.resolve(ignored);
+                return;
+            }
             final BundleInfo bundle = this.implementation.getCurrentBundle();
             this.implementation.setSuccess(bundle, this.autoDeletePrevious);
             this.reportAppLaunchReady(bundle);
@@ -5195,20 +5338,28 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.performReset(true, false, true);
             if (CapacitorUpdaterPlugin.this.autoDeleteFailed && !current.isBuiltin()) {
                 final String failedId = current.getId();
-                final String failedVersion = current.getVersionName();
-                logger.info("Deleting failing bundle: " + failedVersion);
-                // Mark before async work so kill/OOM still resumes via drainPendingDeletes.
-                CapacitorUpdaterPlugin.this.implementation.saveBundleInfo(failedId, current.setStatus(BundleStatus.DELETING));
-                startNewThread(() -> {
-                    try {
-                        final Boolean res = CapacitorUpdaterPlugin.this.implementation.delete(failedId, false, false);
-                        if (Boolean.TRUE.equals(res)) {
-                            logger.info("Failed bundle deleted: " + failedVersion);
+                final BundleInfo latest = this.implementation.getBundleInfo(failedId);
+                final boolean stillCurrent = failedId.equals(this.implementation.getCurrentBundle().getId());
+                // performReset waits for notifyAppReady. Resetting onto this same bundle writes
+                // SUCCESS before we get here, so the pre-reset snapshot must not become DELETING.
+                if (latest == null || BundleStatus.ERROR != latest.getStatus() || stillCurrent) {
+                    logger.info("Skip deleting bundle " + failedId + " after reset");
+                } else {
+                    final String failedVersion = latest.getVersionName();
+                    logger.info("Deleting failing bundle: " + failedVersion);
+                    // Mark before async work so kill/OOM still resumes via drainPendingDeletes.
+                    CapacitorUpdaterPlugin.this.implementation.saveBundleInfo(failedId, latest.setStatus(BundleStatus.DELETING));
+                    startNewThread(() -> {
+                        try {
+                            final Boolean res = CapacitorUpdaterPlugin.this.implementation.delete(failedId, false, false);
+                            if (Boolean.TRUE.equals(res)) {
+                                logger.info("Failed bundle deleted: " + failedVersion);
+                            }
+                        } catch (final IOException e) {
+                            logger.error("Failed to delete failed bundle: " + failedVersion + " " + e.getMessage());
                         }
-                    } catch (final IOException e) {
-                        logger.error("Failed to delete failed bundle: " + failedVersion + " " + e.getMessage());
-                    }
-                });
+                    });
+                }
             }
         } else {
             logger.info("notifyAppReady was called. This is fine: " + current.getId());

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

@@ -150,6 +150,9 @@ public class CapgoUpdater {
     }
 
     private final Map<String, CompletableFuture<BundleInfo>> downloadFutures = new ConcurrentHashMap<>();
+    // Versions whose WorkManager download is observed by this process. WorkManager persists work across a
+    // process kill, but the observer that finishes the download does not survive it.
+    private final Set<String> observedDownloadVersions = ConcurrentHashMap.newKeySet();
     private final ExecutorService io = Executors.newSingleThreadExecutor();
 
     public CapgoUpdater(Logger logger) {
@@ -255,8 +258,49 @@ public class CapgoUpdater {
 
     void directUpdateFinish(final BundleInfo latest) {}
 
+    /** Launch downloads have no waiter. The plugin emits appReady from here when WorkManager settles. */
+    void backgroundDownloadSettled(final BundleInfo bundle, final String status) {}
+
     void notifyListeners(final String id, final Map<String, Object> res) {}
 
+    static boolean shouldNotifyLaunchDownloadReady(
+        final boolean awaitedByCaller,
+        final boolean success,
+        final boolean directInstall,
+        final boolean previewSession
+    ) {
+        if (awaitedByCaller) {
+            return false;
+        }
+        if (!success) {
+            return true;
+        }
+        return !directInstall && !previewSession;
+    }
+
+    static boolean shouldRestartOrphanedDownload(final boolean observedByThisProcess) {
+        return !observedByThisProcess;
+    }
+
+    static boolean shouldReleaseLaunchWhileRetrying(
+        final boolean awaitedByCaller,
+        final boolean setNext,
+        final boolean directUpdate,
+        final boolean previewSession
+    ) {
+        return !awaitedByCaller && setNext && directUpdate && !previewSession;
+    }
+
+    static String launchDownloadReadyStatus(final boolean success, final boolean setNext) {
+        if (!success) {
+            return "Error downloading file";
+        }
+        if (setNext) {
+            return "update downloaded, will install next background";
+        }
+        return "update downloaded, autoUpdate onlyDownload";
+    }
+
     public String randomString() {
         final StringBuilder sb = new StringBuilder(10);
         for (int i = 0; i < 10; i++) sb.append(AB.charAt(rnd.nextInt(AB.length())));
@@ -703,12 +747,29 @@ public class CapgoUpdater {
         }
     }
 
-    private void observeWorkProgress(Context context, String id, boolean setNext) {
+    private void notifyLaunchDownloadReady(
+        final boolean awaitedByCaller,
+        final boolean success,
+        final boolean directInstall,
+        final boolean previewSession,
+        final boolean setNext,
+        final BundleInfo bundle
+    ) {
+        if (!shouldNotifyLaunchDownloadReady(awaitedByCaller, success, directInstall, previewSession)) {
+            return;
+        }
+        final BundleInfo readyBundle = bundle != null ? bundle : this.getCurrentBundle();
+        this.backgroundDownloadSettled(readyBundle, launchDownloadReadyStatus(success, setNext));
+    }
+
+    private void observeWorkProgress(Context context, String id, String observedVersion, boolean setNext) {
         if (!(context instanceof LifecycleOwner)) {
             logger.error("Context is not a LifecycleOwner, cannot observe work progress");
             return;
         }
 
+        final AtomicBoolean terminalHandled = new AtomicBoolean(false);
+        final AtomicBoolean launchReleasedWhileRetrying = new AtomicBoolean(false);
         activity.runOnUiThread(() -> {
             WorkManager.getInstance(context)
                 .getWorkInfosByTagLiveData(id)
@@ -719,11 +780,33 @@ public class CapgoUpdater {
                     Data progress = workInfo.getProgress();
 
                     switch (workInfo.getState()) {
+                        case ENQUEUED:
+                            // A run attempt already happened, so WorkManager scheduled a retry (network lost midway,
+                            // 5xx, ...). Retries back off without limit, so a direct install must not keep the launch
+                            // (and its splashscreen) blocked until the network comes back.
+                            if (
+                                workInfo.getRunAttemptCount() > 0 &&
+                                shouldReleaseLaunchWhileRetrying(
+                                    downloadFutures.containsKey(id),
+                                    setNext,
+                                    Boolean.TRUE.equals(CapgoUpdater.this.directUpdate),
+                                    CapgoUpdater.this.previewSession
+                                ) &&
+                                launchReleasedWhileRetrying.compareAndSet(false, true)
+                            ) {
+                                logger.warn("Direct update download is retrying, continuing launch on the current bundle");
+                                // Same fallback as the autoSplashscreen timeout: a later success installs on next background.
+                                CapgoUpdater.this.directUpdate = false;
+                                io.execute(() -> backgroundDownloadSettled(getCurrentBundle(), launchDownloadReadyStatus(false, false)));
+                            }
+                            break;
                         case RUNNING:
                             int percent = progress.getInt(DownloadService.PERCENT, 0);
                             notifyDownload(id, percent);
                             break;
                         case SUCCEEDED:
+                            if (!terminalHandled.compareAndSet(false, true)) break;
+                            observedDownloadVersions.remove(observedVersion);
                             logger.info("Download succeeded: " + workInfo.getState());
                             Data outputData = workInfo.getOutputData();
                             String dest = outputData.getString(DownloadService.FILEDEST);
@@ -733,6 +816,10 @@ public class CapgoUpdater {
                             boolean isManifest = outputData.getBoolean(DownloadService.IS_MANIFEST, false);
 
                             io.execute(() -> {
+                                // finishDownload clears directUpdate, so read the install plan first.
+                                final boolean directInstall =
+                                    setNext && Boolean.TRUE.equals(CapgoUpdater.this.directUpdate) && !CapgoUpdater.this.previewSession;
+                                final boolean previewSession = CapgoUpdater.this.previewSession;
                                 boolean success = finishDownload(id, dest, version, sessionKey, checksum, setNext, isManifest);
                                 BundleInfo resultBundle;
                                 if (!success) {
@@ -759,14 +846,21 @@ public class CapgoUpdater {
                                     resultBundle = getBundleInfo(id);
                                 }
 
-                                // Complete the future if it exists
+                                // Complete the future if it exists. download() waits on it.
+                                // downloadBackground does not, so the launch check must emit appReady here.
                                 CompletableFuture<BundleInfo> future = downloadFutures.remove(id);
                                 if (future != null) {
                                     future.complete(resultBundle);
                                 }
+                                final BundleInfo readyBundle = success && setNext ? resultBundle : null;
+                                if (!launchReleasedWhileRetrying.get()) {
+                                    notifyLaunchDownloadReady(future != null, success, directInstall, previewSession, setNext, readyBundle);
+                                }
                             });
                             break;
                         case FAILED:
+                            if (!terminalHandled.compareAndSet(false, true)) break;
+                            observedDownloadVersions.remove(observedVersion);
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
                             logger.error("Download failed");
@@ -801,9 +895,14 @@ public class CapgoUpdater {
                                 if (failedFuture != null) {
                                     failedFuture.complete(failedBundle);
                                 }
+                                if (!launchReleasedWhileRetrying.get()) {
+                                    notifyLaunchDownloadReady(failedFuture != null, false, false, false, false, null);
+                                }
                             });
                             break;
                         case CANCELLED:
+                            if (!terminalHandled.compareAndSet(false, true)) break;
+                            observedDownloadVersions.remove(observedVersion);
                             DataManager.getInstance().clearManifest(id);
                             CompletableFuture<BundleInfo> cancelledFuture = downloadFutures.remove(id);
                             if (cancelledFuture != null) {
@@ -829,7 +928,8 @@ public class CapgoUpdater {
             logger.error("Activity is null, cannot observe work progress");
             return;
         }
-        observeWorkProgress(this.activity, id, setNext);
+        observedDownloadVersions.add(version);
+        observeWorkProgress(this.activity, id, version, setNext);
 
         if (manifest != null) {
             DataManager.getInstance().setManifest(id, manifest);
@@ -1479,6 +1579,13 @@ public class CapgoUpdater {
                     return;
                 }
                 logger.info("Retrying failed download for version: " + version);
+            } else if (shouldRestartOrphanedDownload(observedDownloadVersions.contains(version))) {
+                // Left over from a killed process: nothing would finish it or release the launch, so start over.
+                if (!DownloadWorkerManager.cancelVersionDownloadAndAwait(this.activity, version)) {
+                    logger.error("Failed to cancel orphaned download before restarting it");
+                    return;
+                }
+                logger.info("Restarting download orphaned by a previous process for version: " + version);
             } else {
                 logger.info("Version already downloading: " + version);
                 return;
@@ -3469,6 +3576,10 @@ public class CapgoUpdater {
             if (!newBundle.isBuiltin() && !this.bundleExists(next)) {
                 return false;
             }
+            if (next.equals(this.getCurrentBundleId()) && BundleStatus.SUCCESS == newBundle.getStatus()) {
+                logger.info("Bundle " + next + " is already the current successful bundle. Skip next().");
+                return true;
+            }
             this.editor.putString(NEXT_VERSION, next);
             this.setBundleStatus(next, BundleStatus.PENDING);
             bundleToNotify = newBundle;

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

@@ -1,7 +1,6 @@
 package ee.forgr.capacitor_updater;
 
 import android.content.SharedPreferences;
-import io.github.g00fy2.versioncompare.Version;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;