@capawesome/capacitor-live-update 6.7.1 → 7.0.0

package/android/src/main/java/io/capawesome/capacitorjs/plugins/liveupdate/LiveUpdate.java

@@ -10,21 +10,21 @@ import android.os.Handler;
 import android.util.Base64;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.getcapacitor.Bridge;
 import com.getcapacitor.Logger;
 import com.getcapacitor.plugin.WebView;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.Manifest;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.ManifestItem;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.api.GetLatestBundleResponse;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.events.DownloadBundleProgressEvent;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.DeleteBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.DownloadBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.FetchLatestBundleOptions;
-import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetChannelOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetCustomIdOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SetNextBundleOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.options.SyncOptions;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.FetchLatestBundleResult;
-import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetBundleResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetBundlesResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetChannelResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetCurrentBundleResult;
@@ -33,8 +33,10 @@ import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetDeviceIdR
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetNextBundleResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetVersionCodeResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.GetVersionNameResult;
+import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.ReadyResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.classes.results.SyncResult;
 import io.capawesome.capacitorjs.plugins.liveupdate.enums.ArtifactType;
+import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.DownloadProgressCallback;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.EmptyCallback;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.NonEmptyCallback;
 import io.capawesome.capacitorjs.plugins.liveupdate.interfaces.Result;
@@ -68,10 +70,7 @@ public class LiveUpdate {
     @NonNull
     private final LiveUpdateConfig config;
 
-    private final String defaultWebAssetDir;
-
-    @NonNull
-    private final String host;
+    private final String defaultWebAssetDir = Bridge.DEFAULT_WEB_ASSET_DIR;
 
     @NonNull
     private final LiveUpdateHttpClient httpClient;
@@ -89,38 +88,29 @@ public class LiveUpdate {
     private final Handler rollbackHandler = new Handler();
     private final String manifestFileName = "capawesome-live-update-manifest.json"; // DO NOT CHANGE!
 
+    private boolean rollbackPerformed = false;
+
     public LiveUpdate(@NonNull LiveUpdateConfig config, @NonNull LiveUpdatePlugin plugin) throws PackageManager.NameNotFoundException {
         this.config = config;
-        this.defaultWebAssetDir = plugin.getBridge().DEFAULT_WEB_ASSET_DIR;
-        if (config.getLocation() != null && config.getLocation().equals("eu")) {
-            this.host = "api.cloud.capawesome.eu";
-        } else {
-            this.host = "api.cloud.capawesome.io";
-        }
         this.httpClient = new LiveUpdateHttpClient(config);
         this.plugin = plugin;
         this.preferences = new LiveUpdatePreferences(plugin.getContext());
         this.webViewSettingsEditor = plugin.getContext().getSharedPreferences(WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE).edit();
 
-        if (config.getEnabled()) {
-            if (wasUpdated() && config.getResetOnUpdate()) {
-                reset();
-            } else {
-                startRollbackTimer();
-            }
-            saveCurrentVersionCode();
-        }
+        // Start the rollback timer to rollback to the default bundle
+        // if the app is not ready after a certain time
+        startRollbackTimer();
     }
 
     public void deleteBundle(@NonNull DeleteBundleOptions options, @NonNull EmptyCallback callback) {
         String bundleId = options.getBundleId();
 
-        if (!hasBundle(bundleId)) {
+        if (!hasBundleById(bundleId)) {
             Exception exception = new Exception(LiveUpdatePlugin.ERROR_BUNDLE_NOT_FOUND);
             callback.error(exception);
             return;
         }
-        deleteBundle(bundleId);
+        deleteBundleById(bundleId);
 
         callback.success();
     }
@@ -128,11 +118,10 @@ public class LiveUpdate {
     public void downloadBundle(@NonNull DownloadBundleOptions options, @NonNull EmptyCallback callback) throws Exception {
         ArtifactType artifactType = options.getArtifactType();
         String bundleId = options.getBundleId();
-        String checksum = options.getChecksum();
         String url = options.getUrl();
 
         // Check if the bundle already exists
-        if (hasBundle(bundleId)) {
+        if (hasBundleById(bundleId)) {
             Exception exception = new Exception(LiveUpdatePlugin.ERROR_BUNDLE_EXISTS);
             callback.error(exception);
             return;
@@ -142,7 +131,7 @@ public class LiveUpdate {
         if (artifactType == ArtifactType.MANIFEST) {
             downloadBundleOfTypeManifest(bundleId, url);
         } else {
-            downloadBundleOfTypeZip(bundleId, url, checksum);
+            downloadBundleOfTypeZip(bundleId, url);
         }
         callback.success();
     }
@@ -151,17 +140,9 @@ public class LiveUpdate {
         GetLatestBundleResponse response = fetchLatestBundle(options);
         ArtifactType artifactType = response == null ? null : response.getArtifactType();
         String bundleId = response == null ? null : response.getBundleId();
+        JSONObject customProperties = response == null ? null : response.getCustomProperties();
         String downloadUrl = response == null ? null : response.getUrl();
-        FetchLatestBundleResult result = new FetchLatestBundleResult(artifactType, bundleId, downloadUrl);
-        callback.success(result);
-    }
-
-    public void getBundle(@NonNull NonEmptyCallback callback) {
-        String bundleId = getCurrentBundleId();
-        if (bundleId.equals(defaultWebAssetDir)) {
-            bundleId = null;
-        }
-        GetBundleResult result = new GetBundleResult(bundleId);
+        FetchLatestBundleResult result = new FetchLatestBundleResult(artifactType, bundleId, customProperties, downloadUrl);
         callback.success(result);
     }
 
@@ -179,9 +160,6 @@ public class LiveUpdate {
 
     public void getCurrentBundle(@NonNull NonEmptyCallback<GetCurrentBundleResult> callback) {
         String bundleId = getCurrentBundleId();
-        if (bundleId.equals(defaultWebAssetDir)) {
-            bundleId = null;
-        }
         GetCurrentBundleResult result = new GetCurrentBundleResult(bundleId);
         callback.success(result);
     }
@@ -200,9 +178,6 @@ public class LiveUpdate {
 
     public void getNextBundle(@NonNull NonEmptyCallback<GetNextBundleResult> callback) {
         String bundleId = getNextBundleId();
-        if (bundleId.equals(defaultWebAssetDir)) {
-            bundleId = null;
-        }
         GetNextBundleResult result = new GetNextBundleResult(bundleId);
         callback.success(result);
     }
@@ -219,14 +194,27 @@ public class LiveUpdate {
         callback.success(result);
     }
 
-    public void ready() {
+    public void ready(@NonNull NonEmptyCallback callback) {
         Logger.debug(LiveUpdatePlugin.TAG, "App is ready.");
+        if (config.getReadyTimeout() <= 0) {
+            Logger.warn(LiveUpdatePlugin.TAG, "Ready timeout is set to 0. Automatic rollback is disabled.");
+        }
         // Stop the rollback timer
         stopRollbackTimer();
         // Delete unused bundles
         if (config.getAutoDeleteBundles()) {
             deleteUnusedBundles();
         }
+        // Get the current and previous bundle IDs
+        String currentBundleId = getCurrentBundleId();
+        String previousBundleId = getPreviousBundleId();
+        // Return the result
+        ReadyResult result = new ReadyResult(currentBundleId, previousBundleId, rollbackPerformed);
+        callback.success(result);
+        // Set the new previous bundle ID
+        setPreviousBundleId(currentBundleId);
+        // Reset the rollback flag
+        rollbackPerformed = false;
     }
 
     public void reload() {
@@ -236,20 +224,7 @@ public class LiveUpdate {
     }
 
     public void reset() {
-        setNextCapacitorServerPathToDefaultWebAssetDir();
-    }
-
-    public void setBundle(@NonNull SetBundleOptions options, @NonNull EmptyCallback callback) {
-        String bundleId = options.getBundleId();
-
-        if (!hasBundle(bundleId)) {
-            Exception exception = new Exception(LiveUpdatePlugin.ERROR_BUNDLE_NOT_FOUND);
-            callback.error(exception);
-            return;
-        }
-
-        setNextBundle(bundleId);
-        callback.success();
+        setNextBundleById(null);
     }
 
     public void setChannel(@NonNull SetChannelOptions options, @NonNull EmptyCallback callback) {
@@ -272,8 +247,8 @@ public class LiveUpdate {
         if (bundleId == null) {
             reset();
         } else {
-            if (hasBundle(bundleId)) {
-                setNextBundle(bundleId);
+            if (hasBundleById(bundleId)) {
+                setNextBundleById(bundleId);
             } else {
                 Exception exception = new Exception(LiveUpdatePlugin.ERROR_BUNDLE_NOT_FOUND);
                 callback.error(exception);
@@ -298,12 +273,12 @@ public class LiveUpdate {
         String latestBundleId = response.getBundleId();
         String url = response.getUrl();
         // Check if the bundle already exists
-        if (hasBundle(latestBundleId)) {
+        if (hasBundleById(latestBundleId)) {
             String nextBundleId = null;
             String currentBundleId = getCurrentBundleId();
             if (!latestBundleId.equals(currentBundleId)) {
                 // Set the next bundle
-                setNextBundle(latestBundleId);
+                setNextBundleById(latestBundleId);
                 nextBundleId = latestBundleId;
             }
             SyncResult syncResult = new SyncResult(nextBundleId);
@@ -314,10 +289,10 @@ public class LiveUpdate {
         if (artifactType == ArtifactType.MANIFEST) {
             downloadBundleOfTypeManifest(latestBundleId, url);
         } else {
-            downloadBundleOfTypeZip(latestBundleId, url, null);
+            downloadBundleOfTypeZip(latestBundleId, url);
         }
         // Set the next bundle
-        setNextBundle(latestBundleId);
+        setNextBundleById(latestBundleId);
         SyncResult syncResult = new SyncResult(latestBundleId);
         callback.success(syncResult);
     }
@@ -366,9 +341,10 @@ public class LiveUpdate {
         return new File(plugin.getContext().getCacheDir(), fileName);
     }
 
-    private void copyCurrentBundleFile(@NonNull String href, @NonNull File destinationDirectory) throws IOException {
+    private void copyCurrentBundleFile(@NonNull ManifestItem fileToCopy, @NonNull File destinationDirectory) throws IOException {
+        String href = fileToCopy.getHref();
         String currentBundleId = getCurrentBundleId();
-        if (currentBundleId.equals(defaultWebAssetDir)) {
+        if (currentBundleId == null) {
             // Create the source input stream
             AssetManager assets = plugin.getContext().getAssets();
             InputStream inputStream = assets.open(defaultWebAssetDir + "/" + href);
@@ -390,9 +366,9 @@ public class LiveUpdate {
         }
     }
 
-    private void copyCurrentBundleFiles(@NonNull List<String> hrefs, @NonNull File destinationDirectory) throws IOException {
-        for (String href : hrefs) {
-            copyCurrentBundleFile(href, destinationDirectory);
+    private void copyCurrentBundleFiles(@NonNull List<ManifestItem> filesToCopy, @NonNull File destinationDirectory) throws IOException {
+        for (ManifestItem fileToCopy : filesToCopy) {
+            copyCurrentBundleFile(fileToCopy, destinationDirectory);
         }
     }
 
@@ -445,14 +421,14 @@ public class LiveUpdate {
         return file;
     }
 
-    private void deleteBundle(@NonNull String bundleId) {
+    private void deleteBundleById(@NonNull String bundleId) {
         // Delete the bundle directory
         File bundleDirectory = buildBundleDirectoryFor(bundleId);
         deleteFileRecursively(bundleDirectory);
         // Reset the next bundle if it is the deleted bundle
         String nextBundleId = getNextBundleId();
         if (bundleId.equals(nextBundleId)) {
-            setNextCapacitorServerPathToDefaultWebAssetDir();
+            setNextBundleById(null);
         }
     }
 
@@ -469,18 +445,19 @@ public class LiveUpdate {
         String[] bundleIds = getBundleIds();
         for (String bundleId : bundleIds) {
             if (!isBundleInUse(bundleId)) {
-                deleteBundle(bundleId);
+                deleteBundleById(bundleId);
             }
         }
     }
 
-    private void downloadAndVerifyFile(@NonNull String url, @NonNull File file, @Nullable String checksum) throws Exception {
+    private void downloadAndVerifyFile(@NonNull String url, @NonNull File file, @Nullable DownloadProgressCallback callback)
+        throws Exception {
         Response response = httpClient.execute(url);
         ResponseBody responseBody = response.body();
         if (response.isSuccessful()) {
-            LiveUpdateHttpClient.writeResponseBodyToFile(responseBody, file);
+            LiveUpdateHttpClient.writeResponseBodyToFile(responseBody, file, callback);
             // Verify the file
-            checksum = checksum == null ? LiveUpdateHttpClient.getChecksumFromResponse(response) : checksum;
+            String checksum = LiveUpdateHttpClient.getChecksumFromResponse(response);
             String signature = LiveUpdateHttpClient.getSignatureFromResponse(response);
             verifyFile(file, checksum, signature);
         } else {
@@ -490,24 +467,39 @@ public class LiveUpdate {
         }
     }
 
-    private File downloadBundleFile(@NonNull String baseUrl, @NonNull String href, @NonNull File destinationDirectory) throws Exception {
+    private File downloadBundleFile(
+        @NonNull String baseUrl,
+        @NonNull String href,
+        @NonNull File destinationDirectory,
+        @Nullable DownloadProgressCallback callback
+    ) throws Exception {
         HttpUrl.Builder urlBuilder = HttpUrl.parse(baseUrl).newBuilder();
         urlBuilder.addQueryParameter("href", href);
         String url = urlBuilder.build().toString();
 
         File destinationFile = new File(destinationDirectory, href);
         destinationFile.getParentFile().mkdirs();
-        downloadAndVerifyFile(url, destinationFile, null);
+        downloadAndVerifyFile(url, destinationFile, callback);
         return destinationFile;
     }
 
-    private void downloadBundleFiles(@NonNull String baseUrl, @NonNull List<String> hrefs, @NonNull File destinationDirectory)
-        throws Exception {
+    private void downloadBundleFiles(
+        @NonNull String baseUrl,
+        @NonNull List<ManifestItem> filesToDownload,
+        @NonNull File destinationDirectory,
+        @Nullable DownloadProgressCallback callback
+    ) throws Exception {
+        // Track the total downloaded bytes and total bytes to download for the progress callback
+        final long[] totalBytesDownloaded = { 0 };
+        long totalBytesToDownload = 0;
+        for (ManifestItem fileToDownload : filesToDownload) {
+            totalBytesToDownload += fileToDownload.getSizeInBytes();
+        }
         // Limit the number of threads to twice the number of processors
         int maxThreads = Runtime.getRuntime().availableProcessors() * 2;
         List<Thread> threads = new ArrayList<>();
         AtomicReference<Exception> exceptionReference = new AtomicReference<>();
-        for (String href : hrefs) {
+        for (ManifestItem fileToDownload : filesToDownload) {
             // Wait until a thread is available
             while (threads.size() >= maxThreads) {
                 for (Thread thread : threads) {
@@ -523,13 +515,23 @@ public class LiveUpdate {
             if (exceptionReference.get() != null) {
                 break;
             }
+            // Final variable that can be accessed from within inner class
+            long finalTotalBytesToDownload = totalBytesToDownload;
             // Start a new thread
             Thread thread = new Thread(() -> {
                 try {
-                    downloadBundleFile(baseUrl, href, destinationDirectory);
+                    downloadBundleFile(baseUrl, fileToDownload.getHref(), destinationDirectory, (downloadedBytes, totalBytes) -> {
+                        if (callback != null) {
+                            callback.onProgress(totalBytesDownloaded[0] + downloadedBytes, finalTotalBytesToDownload);
+                        }
+                    });
+                    if (callback != null) {
+                        totalBytesDownloaded[0] += fileToDownload.getSizeInBytes();
+                        callback.onProgress(totalBytesDownloaded[0], finalTotalBytesToDownload);
+                    }
                 } catch (Exception exception) {
                     exceptionReference.set(exception);
-                    Logger.error(LiveUpdatePlugin.TAG, "Failed to download file: " + href, exception);
+                    Logger.error(LiveUpdatePlugin.TAG, "Failed to download file: " + fileToDownload.getHref(), exception);
                 }
             });
             threads.add(thread);
@@ -544,13 +546,17 @@ public class LiveUpdate {
         if (exception != null) {
             throw exception;
         }
+        // Call the callback one last time to make sure the progress is at 100%
+        if (callback != null) {
+            callback.onProgress(totalBytesToDownload, totalBytesToDownload);
+        }
     }
 
     private void downloadBundleOfTypeManifest(@NonNull String bundleId, @NonNull String downloadUrl) throws Exception {
         // Create a temporary directory
         File temporaryDirectory = createTemporaryDirectory();
         // Download the latest manifest
-        File latestManifestFile = downloadBundleFile(downloadUrl, manifestFileName, temporaryDirectory);
+        File latestManifestFile = downloadBundleFile(downloadUrl, manifestFileName, temporaryDirectory, null);
         Manifest latestManifest = loadManifest(latestManifestFile);
         // Load the current manifest
         Manifest currentManifest = loadCurrentManifest();
@@ -564,26 +570,23 @@ public class LiveUpdate {
             itemsToDownload.addAll(Manifest.findMissingItems(latestManifest, currentManifest));
         }
         // Copy the files
-        List<String> hrefsToCopy = new ArrayList<>();
-        for (ManifestItem item : itemsToCopy) {
-            hrefsToCopy.add(item.getHref());
-        }
-        copyCurrentBundleFiles(hrefsToCopy, temporaryDirectory);
+        copyCurrentBundleFiles(itemsToCopy, temporaryDirectory);
         // Download the files
-        List<String> hrefsToDownload = new ArrayList<>();
-        for (ManifestItem item : itemsToDownload) {
-            hrefsToDownload.add(item.getHref());
-        }
-        downloadBundleFiles(downloadUrl, hrefsToDownload, temporaryDirectory);
+        downloadBundleFiles(downloadUrl, itemsToDownload, temporaryDirectory, (downloadedBytes, totalBytes) -> {
+            DownloadBundleProgressEvent event = new DownloadBundleProgressEvent(bundleId, downloadedBytes, totalBytes);
+            notifyDownloadBundleProgressListeners(event);
+        });
         // Add the bundle
         addBundleOfTypeManifest(bundleId, temporaryDirectory);
     }
 
-    private void downloadBundleOfTypeZip(@NonNull String bundleId, @NonNull String downloadUrl, @Nullable String checksum)
-        throws Exception {
+    private void downloadBundleOfTypeZip(@NonNull String bundleId, @NonNull String downloadUrl) throws Exception {
         File file = buildTemporaryZipFile();
         // Download the bundle
-        downloadAndVerifyFile(downloadUrl, file, checksum);
+        downloadAndVerifyFile(downloadUrl, file, (downloadedBytes, totalBytes) -> {
+            DownloadBundleProgressEvent event = new DownloadBundleProgressEvent(bundleId, downloadedBytes, totalBytes);
+            notifyDownloadBundleProgressListeners(event);
+        });
         // Add the bundle
         addBundleOfTypeZip(bundleId, file);
         // Delete the temporary file
@@ -595,7 +598,7 @@ public class LiveUpdate {
         String channel = options.getChannel() == null ? getChannel() : options.getChannel();
         String url = new HttpUrl.Builder()
             .scheme("https")
-            .host(host)
+            .host(config.getServerDomain())
             .addPathSegment("v1")
             .addPathSegment("apps")
             .addPathSegment(config.getAppId())
@@ -677,12 +680,13 @@ public class LiveUpdate {
     }
 
     /**
-     * @return The current bundle ID (`public` for the built-in bundle).
+     * @return The current bundle ID or `null` if the default bundle is in use.
      */
+    @Nullable
     private String getCurrentBundleId() {
         String currentPath = getCurrentCapacitorServerPath();
         if (currentPath.equals(defaultWebAssetDir)) {
-            return defaultWebAssetDir;
+            return null;
         }
         return new File(currentPath).getName();
     }
@@ -705,13 +709,13 @@ public class LiveUpdate {
     }
 
     /**
-     * @return The next bundle ID (`public` for the built-in bundle).
+     * @return The next bundle ID or `null` if the default bundle will be used.
      */
-    @NonNull
+    @Nullable
     private String getNextBundleId() {
         String nextPath = getNextCapacitorServerPath();
         if (nextPath.equals(defaultWebAssetDir)) {
-            return defaultWebAssetDir;
+            return null;
         }
         return new File(nextPath).getName();
     }
@@ -727,6 +731,14 @@ public class LiveUpdate {
             .getString(WebView.CAP_SERVER_PATH, defaultWebAssetDir);
     }
 
+    /**
+     * @return The previous bundle ID or `null` if the default bundle was used.
+     */
+    @Nullable
+    private String getPreviousBundleId() {
+        return preferences.getPreviousBundleId();
+    }
+
     private String getVersionCode() throws PackageManager.NameNotFoundException {
         return String.valueOf(getPackageInfo().versionCode);
     }
@@ -735,17 +747,23 @@ public class LiveUpdate {
         return getPackageInfo().versionName;
     }
 
-    private boolean hasBundle(@NonNull String bundleId) {
+    private boolean hasBundleById(@NonNull String bundleId) {
         File bundleDirectory = buildBundleDirectoryFor(bundleId);
         return bundleDirectory.exists();
     }
 
+    private boolean isBundleInUse(@NonNull String bundleId) {
+        String currentBundleId = getCurrentBundleId();
+        String nextBundleId = getNextBundleId();
+        return bundleId.equals(currentBundleId) || bundleId.equals(nextBundleId);
+    }
+
     @Nullable
     private Manifest loadCurrentManifest() throws Exception {
         String currentBundleId = getCurrentBundleId();
-        if (currentBundleId.equals(defaultWebAssetDir)) {
+        if (currentBundleId == null) {
             AssetManager assets = plugin.getContext().getAssets();
-            Boolean manifestFileExists = Arrays.asList(assets.list(defaultWebAssetDir)).contains(manifestFileName);
+            boolean manifestFileExists = Arrays.asList(assets.list(defaultWebAssetDir)).contains(manifestFileName);
             if (manifestFileExists) {
                 InputStream inputStream = assets.open(defaultWebAssetDir + "/" + manifestFileName);
                 BufferedSource source = Okio.buffer(Okio.source(inputStream));
@@ -775,25 +793,25 @@ public class LiveUpdate {
         return loadManifest(source);
     }
 
-    private boolean isBundleInUse(@NonNull String bundleId) {
-        String currentBundleId = getCurrentBundleId();
-        String nextBundleId = getNextBundleId();
-        return bundleId.equals(currentBundleId) || bundleId.equals(nextBundleId);
+    public void notifyDownloadBundleProgressListeners(@NonNull final DownloadBundleProgressEvent event) {
+        plugin.notifyDownloadBundleProgressListeners(event);
     }
 
     private void rollback() {
-        if (getCurrentBundleId() == defaultWebAssetDir) {
+        // Set the rollback flag
+        rollbackPerformed = true;
+        // Set the new previous bundle ID
+        String currentBundleId = getCurrentBundleId();
+        setPreviousBundleId(currentBundleId);
+        // Log the rollback result
+        if (currentBundleId == null) {
             Logger.debug(LiveUpdatePlugin.TAG, "App is not ready. Default bundle is already in use.");
-            return;
+        } else {
+            Logger.debug(LiveUpdatePlugin.TAG, "App is not ready. Rolling back to default bundle.");
+            // Rollback to the default bundle
+            setNextBundleById(null);
+            setCurrentBundleById(null);
         }
-        Logger.debug(LiveUpdatePlugin.TAG, "App is not ready. Rolling back to default bundle.");
-        setNextCapacitorServerPathToDefaultWebAssetDir();
-        setCurrentCapacitorServerPathToDefaultWebAssetDir();
-    }
-
-    private void saveCurrentVersionCode() throws PackageManager.NameNotFoundException {
-        int currentVersionCode = getPackageInfo().versionCode;
-        preferences.setLastVersionCode(currentVersionCode);
     }
 
     @Nullable
@@ -821,6 +839,18 @@ public class LiveUpdate {
         return null;
     }
 
+    /**
+     * @param bundleId The bundle ID to set as the current bundle. If `null`, the default bundle will be used.
+     */
+    private void setCurrentBundleById(@Nullable String bundleId) {
+        if (bundleId == null) {
+            setCurrentCapacitorServerPath(defaultWebAssetDir);
+        } else {
+            File bundleDirectory = buildBundleDirectoryFor(bundleId);
+            setCurrentCapacitorServerPath(bundleDirectory.getPath());
+        }
+    }
+
     private void setCurrentCapacitorServerPath(@NonNull String path) {
         if (path.equals(defaultWebAssetDir)) {
             this.plugin.getBridge().setServerAssetPath(path);
@@ -830,13 +860,16 @@ public class LiveUpdate {
         this.plugin.getBridge().reload();
     }
 
-    private void setCurrentCapacitorServerPathToDefaultWebAssetDir() {
-        setCurrentCapacitorServerPath(defaultWebAssetDir);
-    }
-
-    private void setNextBundle(@NonNull String bundleId) {
-        File bundleDirectory = buildBundleDirectoryFor(bundleId);
-        setNextCapacitorServerPath(bundleDirectory.getPath());
+    /**
+     * @param bundleId The bundle ID to set as the next bundle. If `null`, the default bundle will be used.
+     */
+    private void setNextBundleById(@Nullable String bundleId) {
+        if (bundleId == null) {
+            setNextCapacitorServerPath(defaultWebAssetDir);
+        } else {
+            File bundleDirectory = buildBundleDirectoryFor(bundleId);
+            setNextCapacitorServerPath(bundleDirectory.getPath());
+        }
     }
 
     private void setNextCapacitorServerPath(@NonNull String path) {
@@ -844,11 +877,17 @@ public class LiveUpdate {
         this.webViewSettingsEditor.commit();
     }
 
-    private void setNextCapacitorServerPathToDefaultWebAssetDir() {
-        setNextCapacitorServerPath(defaultWebAssetDir);
+    /**
+     * @param bundleId The bundle ID to save as the previous bundle. If `null`, the value will be removed.
+     */
+    private void setPreviousBundleId(@Nullable String bundleId) {
+        preferences.setPreviousBundleId(bundleId);
     }
 
     private void startRollbackTimer() {
+        if (config.getReadyTimeout() <= 0) {
+            return;
+        }
         stopRollbackTimer();
         rollbackHandler.postDelayed(() -> rollback(), config.getReadyTimeout());
     }
@@ -915,12 +954,6 @@ public class LiveUpdate {
         }
     }
 
-    private boolean wasUpdated() throws PackageManager.NameNotFoundException {
-        int lastVersionCode = preferences.getLastVersionCode();
-        int currentVersionCode = getPackageInfo().versionCode;
-        return lastVersionCode != currentVersionCode;
-    }
-
     private PackageInfo getPackageInfo() throws PackageManager.NameNotFoundException {
         String packageName = this.plugin.getContext().getPackageName();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {