@capgo/capacitor-updater 4.0.0-alpha.7 → 4.0.0

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

@@ -28,13 +28,20 @@ import io.github.g00fy2.versioncompare.Version;
 import org.json.JSONException;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
+import java.util.UUID;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
 public class CapacitorUpdaterPlugin extends Plugin implements Application.ActivityLifecycleCallbacks {
-    private static final String updateUrlDefault = "https://xvwzpoazmxkqosrdewyv.functions.supabase.co/updates";
-    private static final String statsUrlDefault = "https://xvwzpoazmxkqosrdewyv.functions.supabase.co/stats";
+    private static final String updateUrlDefault = "https://api.capgo.app/updates";
+    private static final String statsUrlDefault = "https://api.capgo.app/stats";
     private static final String DELAY_UPDATE = "delayUpdate";
+    private static final String DELAY_UPDATE_VAL = "delayUpdateVal";
 
     private SharedPreferences.Editor editor;
     private SharedPreferences prefs;
@@ -80,10 +87,12 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         this.implementation.appId = config.getString("appId", "");
         this.implementation.statsUrl = this.getConfig().getString("statsUrl", statsUrlDefault);
         this.implementation.documentsDir = this.getContext().getFilesDir();
-        this.implementation.prefs = this.getContext().getSharedPreferences(WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);
-        this.implementation.editor = this.prefs.edit();
+        this.implementation.prefs = this.prefs;
+        this.implementation.editor = this.editor;
         this.implementation.versionOs = Build.VERSION.RELEASE;
-        this.implementation.deviceID = Settings.Secure.getString(this.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+        this.implementation.deviceID = this.prefs.getString("appUUID", UUID.randomUUID().toString());
+        this.editor.putString("appUUID", this.implementation.deviceID);
+        Log.e(CapacitorUpdater.TAG, "init for device " + this.implementation.deviceID);
 
         this.autoDeleteFailed = this.getConfig().getBoolean("autoDeleteFailed", true);
         this.autoDeletePrevious = this.getConfig().getBoolean("autoDeletePrevious", true);
@@ -97,8 +106,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
         final Application application = (Application) this.getContext().getApplicationContext();
         application.registerActivityLifecycleCallbacks(this);
-
         this.onActivityStarted(this.getActivity());
+        this._checkCancelDelay(true);
     }
 
     private void cleanupObsoleteVersions() {
@@ -133,7 +142,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         try {
             final JSObject ret = new JSObject();
             ret.put("percent", percent);
-            var bundle = this.implementation.getBundleInfo(id).toJSON();
+            JSObject bundle = this.implementation.getBundleInfo(id).toJSON();
             ret.put("bundle", bundle);
             this.notifyListeners("download", ret);
             if (percent == 100) {
@@ -146,10 +155,10 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
 
 
     @PluginMethod
-    public void getId(final PluginCall call) {
+    public void getDeviceId(final PluginCall call) {
         try {
             final JSObject ret = new JSObject();
-            ret.put("id", this.implementation.deviceID);
+            ret.put("deviceId", this.implementation.deviceID);
             call.resolve(ret);
         } catch (final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Could not get device id", e);
@@ -173,8 +182,14 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     public void download(final PluginCall call) {
         final String url = call.getString("url");
         final String version = call.getString("version");
-        if (url == null || version == null) {
-            call.reject("missing url or version");
+        if (url == null) {
+            Log.e(CapacitorUpdater.TAG, "Download called without url");
+            call.reject("Download called without url");
+            return;
+        }
+        if (version == null) {
+            Log.e(CapacitorUpdater.TAG, "Download called without version");
+            call.reject("Download called without version");
             return;
         }
         try {
@@ -189,6 +204,9 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                     } catch (final IOException e) {
                         Log.e(CapacitorUpdater.TAG, "download failed", e);
                         call.reject("download failed", e);
+                        final JSObject ret = new JSObject();
+                        ret.put("version", version);
+                        CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
                     }
                 }
             }).start();
@@ -216,6 +234,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             if (this._reload()) {
                 call.resolve();
             } else {
+                Log.e(CapacitorUpdater.TAG, "Reload failed");
                 call.reject("Reload failed");
             }
         } catch(final Exception e) {
@@ -227,10 +246,15 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void next(final PluginCall call) {
         final String id = call.getString("id");
-
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "Next called without id");
+            call.reject("Next called without id");
+            return;
+        }
         try {
             Log.i(CapacitorUpdater.TAG, "Setting next active id " + id);
-            if (!this.implementation.setNextVersion(id)) {
+            if (!this.implementation.setNextBundle(id)) {
+                Log.e(CapacitorUpdater.TAG, "Set next id failed. Bundle " + id + " does not exist.");
                 call.reject("Set next id failed. Bundle " + id + " does not exist.");
             } else {
                 call.resolve(this.implementation.getBundleInfo(id).toJSON());
@@ -244,7 +268,11 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void set(final PluginCall call) {
         final String id = call.getString("id");
-
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "Set called without id");
+            call.reject("Set called without id");
+            return;
+        }
         try {
             Log.i(CapacitorUpdater.TAG, "Setting active bundle " + id);
             if (!this.implementation.set(id)) {
@@ -263,12 +291,18 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void delete(final PluginCall call) {
         final String id = call.getString("id");
+        if (id == null) {
+            Log.e(CapacitorUpdater.TAG, "missing id");
+            call.reject("missing id");
+            return;
+        }
         Log.i(CapacitorUpdater.TAG, "Deleting id: " + id);
         try {
             final Boolean res = this.implementation.delete(id);
             if (res) {
                 call.resolve();
             } else {
+                Log.e(CapacitorUpdater.TAG, "Delete failed, id " + id + " does not exist");
                 call.reject("Delete failed, id " + id + " does not exist");
             }
         } catch(final Exception e) {
@@ -302,14 +336,26 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             @Override
             public void run() {
                 CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, (res) -> {
-                    call.resolve(res);
+                    final JSObject ret = new JSObject();
+                    Iterator<String> keys = res.keys();
+                    while(keys.hasNext()) {
+                        String key = keys.next();
+                        if (res.has(key)) {
+                            try {
+                                ret.put(key, res.get(key));
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                    call.resolve(ret);
                 });
             }
         });
     }
 
     private boolean _reset(final Boolean toLastSuccessful) {
-        final BundleInfo fallback = this.implementation.getFallbackVersion();
+        final BundleInfo fallback = this.implementation.getFallbackBundle();
         this.implementation.reset();
 
         if (toLastSuccessful && !fallback.isBuiltin()) {
@@ -329,6 +375,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                 call.resolve();
                 return;
             }
+            Log.e(CapacitorUpdater.TAG, "Reset failed");
             call.reject("Reset failed");
         }
         catch(final Exception e) {
@@ -355,9 +402,9 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     @PluginMethod
     public void notifyAppReady(final PluginCall call) {
         try {
-            Log.i(CapacitorUpdater.TAG, "Current bundle loaded successfully. ['notifyAppReady()' was called]");
             final BundleInfo bundle = this.implementation.getCurrentBundle();
-            this.implementation.commit(bundle);
+            this.implementation.setSuccess(bundle, this.autoDeletePrevious);
+            Log.i(CapacitorUpdater.TAG, "Current bundle loaded successfully. ['notifyAppReady()' was called] " + bundle.toString());
             call.resolve();
         }
         catch(final Exception e) {
@@ -367,11 +414,19 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     }
 
     @PluginMethod
-    public void delayUpdate(final PluginCall call) {
+    public void setDelay(final PluginCall call) {
         try {
-            Log.i(CapacitorUpdater.TAG, "Delay update.");
-            this.editor.putBoolean(DELAY_UPDATE, true);
+            final String kind = call.getString("kind");
+            final String value = call.getString("value");
+            if (kind == null) {
+                Log.e(CapacitorUpdater.TAG, "setDelay called without kind");
+                call.reject("setDelay called without kind");
+                return;
+            }
+            this.editor.putString(DELAY_UPDATE, kind);
+            this.editor.putString(DELAY_UPDATE_VAL, value);
             this.editor.commit();
+            Log.i(CapacitorUpdater.TAG, "Delay update saved");
             call.resolve();
         }
         catch(final Exception e) {
@@ -380,17 +435,63 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
-    @PluginMethod
-    public void cancelDelay(final PluginCall call) {
+    private boolean _cancelDelay(String source) {
         try {
-            Log.i(CapacitorUpdater.TAG, "Cancel update delay.");
-            this.editor.putBoolean(DELAY_UPDATE, false);
+            this.editor.remove(DELAY_UPDATE);
+            this.editor.remove(DELAY_UPDATE_VAL);
             this.editor.commit();
-            call.resolve();
+            Log.i(CapacitorUpdater.TAG, "delay canceled from " + source);
+            return true;
         }
         catch(final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
-            call.reject("Failed to cancel update delay", e);
+            return false;
+        }
+    }
+
+    @PluginMethod
+    public void cancelDelay(final PluginCall call) {
+        if(this._cancelDelay("JS")) {
+            call.resolve();
+        } else {
+            call.reject("Failed to cancel delay");
+        }
+    }
+
+    private void _checkCancelDelay(Boolean killed) {
+        final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
+        if ("".equals(delayUpdate)) {
+            if ("background".equals(delayUpdate) && !killed) {
+                this._cancelDelay("background check");
+            } else if ("kill".equals(delayUpdate) && killed) {
+                this._cancelDelay("kill check");
+            }
+            final String delayVal = this.prefs.getString(DELAY_UPDATE_VAL, "");
+            if ("".equals(delayVal)) {
+                this._cancelDelay("delayVal absent");
+            } else if ("date".equals(delayUpdate)) {
+                try {
+                    final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+                    Date date = sdf.parse(delayVal);
+                    if (date.compareTo(new Date()) > 0)  {
+                        this._cancelDelay("date expired");
+                    }
+                }
+                catch(final Exception e) {
+                    this._cancelDelay("date parsing issue");
+                }
+
+            } else if ("nativeVersion".equals(delayUpdate)) {
+                try {
+                    final Version versionLimit = new Version(delayVal);
+                    if (this.currentVersionNative.isAtLeast(versionLimit)) {
+                        this._cancelDelay("nativeVersion above limit");
+                    }
+                }
+                catch(final Exception e) {
+                    this._cancelDelay("nativeVersion parsing issue");
+                }
+            }
         }
     }
 
@@ -422,6 +523,16 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
+    private boolean isValidURL(String urlStr) {
+        try {
+            URL url = new URL(urlStr);
+            return true;
+        }
+        catch (MalformedURLException e) {
+            return false;
+        }
+    }
+
     @Override // appMovedToForeground
     public void onActivityStarted(@NonNull final Activity activity) {
         if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
@@ -431,17 +542,27 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
 
                     Log.i(CapacitorUpdater.TAG, "Check for update via: " + CapacitorUpdaterPlugin.this.updateUrl);
                     CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, (res) -> {
+                        final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
                         try {
                             if (res.has("message")) {
-                                Log.i(CapacitorUpdater.TAG, "message: " + res.get("message"));
+                                Log.i(CapacitorUpdater.TAG, "message " + res.get("message"));
                                 if (res.has("major") && res.getBoolean("major") && res.has("version")) {
                                     final JSObject majorAvailable = new JSObject();
                                     majorAvailable.put("version", (String) res.get("version"));
                                     CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", majorAvailable);
                                 }
+                                final JSObject retNoNeed = new JSObject();
+                                retNoNeed.put("bundle", current.toJSON());
+                                CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
                                 return;
                             }
-                            final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+
+                            if (!res.has("url") || CapacitorUpdaterPlugin.this.isValidURL((String)res.get("url"))) {
+                                Log.e(CapacitorUpdater.TAG, "Error no url or wrong format");
+                                final JSObject retNoNeed = new JSObject();
+                                retNoNeed.put("bundle", current.toJSON());
+                                CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
+                            }
                             final String latestVersionName = (String) res.get("version");
 
                             if (latestVersionName != null && !"".equals(latestVersionName) && !current.getVersionName().equals(latestVersionName)) {
@@ -450,11 +571,17 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                 if(latest != null) {
                                     if(latest.isErrorStatus()) {
                                         Log.e(CapacitorUpdater.TAG, "Latest bundle already exists, and is in error state. Aborting update.");
+                                        final JSObject retNoNeed = new JSObject();
+                                        retNoNeed.put("bundle", current.toJSON());
+                                        CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
                                         return;
                                     }
                                     if(latest.isDownloaded()){
                                         Log.e(CapacitorUpdater.TAG, "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background.");
-                                        CapacitorUpdaterPlugin.this.implementation.setNextVersion(latest.getId());
+                                        final JSObject ret = new JSObject();
+                                        ret.put("bundle", latest.toJSON());
+                                        CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
+                                        CapacitorUpdaterPlugin.this.implementation.setNextBundle(latest.getId());
                                         return;
                                     }
                                 }
@@ -468,18 +595,32 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
 
                                             final String url = (String) res.get("url");
                                             final BundleInfo next = CapacitorUpdaterPlugin.this.implementation.download(url, latestVersionName);
-
-                                            CapacitorUpdaterPlugin.this.implementation.setNextVersion(next.getId());
+                                            final JSObject ret = new JSObject();
+                                            ret.put("bundle", next.toJSON());
+                                            CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
+                                            CapacitorUpdaterPlugin.this.implementation.setNextBundle(next.getId());
                                         } catch (final Exception e) {
                                             Log.e(CapacitorUpdater.TAG, "error downloading file", e);
+                                            final JSObject ret = new JSObject();
+                                            ret.put("version", latestVersionName);
+                                            CapacitorUpdaterPlugin.this.notifyListeners("downloadFailed", ret);
+                                            final JSObject retNoNeed = new JSObject();
+                                            retNoNeed.put("bundle", current.toJSON());
+                                            CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
                                         }
                                     }
                                 }).start();
                             } else {
-                                Log.i(CapacitorUpdater.TAG, "No need to update, " + current + " is the latest bundle.");
+                                Log.i(CapacitorUpdater.TAG, "No need to update, " + current.getId() + " is the latest bundle.");
+                                final JSObject retNoNeed = new JSObject();
+                                retNoNeed.put("bundle", current.toJSON());
+                                CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
                             }
                         } catch (final JSONException e) {
                             Log.e(CapacitorUpdater.TAG, "error parsing JSON", e);
+                            final JSObject retNoNeed = new JSObject();
+                            retNoNeed.put("bundle", current.toJSON());
+                            CapacitorUpdaterPlugin.this.notifyListeners("noNeedUpdate", retNoNeed);
                         }
                     });
                 }
@@ -493,96 +634,63 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     public void onActivityStopped(@NonNull final Activity activity) {
         Log.i(CapacitorUpdater.TAG, "Checking for pending update");
         try {
-            final Boolean delayUpdate = this.prefs.getBoolean(DELAY_UPDATE, false);
-            this.editor.putBoolean(DELAY_UPDATE, false);
-            this.editor.commit();
-
-            if (delayUpdate) {
+            final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
+            this._checkCancelDelay(false);
+            if (!"".equals(delayUpdate)) {
                 Log.i(CapacitorUpdater.TAG, "Update delayed to next backgrounding");
                 return;
             }
-
-            final BundleInfo fallback = this.implementation.getFallbackVersion();
             final BundleInfo current = this.implementation.getCurrentBundle();
-            final BundleInfo next = this.implementation.getNextVersion();
-
-            final Boolean success = current.getStatus() == BundleStatus.SUCCESS;
-
-            Log.d(CapacitorUpdater.TAG, "Fallback bundle is: " + fallback);
-            Log.d(CapacitorUpdater.TAG, "Current bundle is: " + current);
+            final BundleInfo next = this.implementation.getNextBundle();
 
-            if (next != null && !next.isErrorStatus() && (next.getId() != current.getId())) {
+            if (next != null && !next.isErrorStatus() && next.getId() != current.getId()) {
                 // There is a next bundle waiting for activation
                 Log.d(CapacitorUpdater.TAG, "Next bundle is: " + next.getVersionName());
                 if (this.implementation.set(next) && this._reload()) {
                     Log.i(CapacitorUpdater.TAG, "Updated to bundle: " + next.getVersionName());
-                    this.implementation.setNextVersion(null);
+                    this.implementation.setNextBundle(null);
                 } else {
                     Log.e(CapacitorUpdater.TAG, "Update to bundle: " + next.getVersionName() + " Failed!");
                 }
-            } else if (!success) {
-                // There is a no next bundle, and the current bundle has failed
-
-                if(!current.isBuiltin()) {
-                    // Don't try to roll back the builtin bundle. Nothing we can do.
-
-                    this.implementation.rollback(current);
+            }
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Error during onActivityStopped", e);
+        }
+    }
 
-                    Log.i(CapacitorUpdater.TAG, "Update failed: 'notifyAppReady()' was never called.");
-                    Log.i(CapacitorUpdater.TAG, "Bundle: " + current + ", is in error state.");
-                    Log.i(CapacitorUpdater.TAG, "Will fallback to: " + fallback + " on application restart.");
-                    Log.i(CapacitorUpdater.TAG, "Did you forget to call 'notifyAppReady()' in your Capacitor App code?");
-                    final JSObject ret = new JSObject();
-                    ret.put("bundle", current);
-                    this.notifyListeners("updateFailed", ret);
-                    this.implementation.sendStats("revert", current);
-                    if (!fallback.isBuiltin() && !fallback.equals(current)) {
-                        final Boolean res = this.implementation.set(fallback);
-                        if (res && this._reload()) {
-                            Log.i(CapacitorUpdater.TAG, "Revert to bundle: " + fallback.getVersionName());
-                        } else {
-                            Log.e(CapacitorUpdater.TAG, "Revert to bundle: " + fallback.getVersionName() + " Failed!");
-                        }
-                    } else {
-                        if (this._reset(false)) {
-                            Log.i(CapacitorUpdater.TAG, "Reverted to 'builtin' bundle.");
-                        }
-                    }
+    private void checkRevert() {
+        // Automatically roll back to fallback version if notifyAppReady has not been called yet
+        final BundleInfo current = this.implementation.getCurrentBundle();
 
-                    if (this.autoDeleteFailed) {
-                        Log.i(CapacitorUpdater.TAG, "Deleting failing bundle: " + current.getVersionName());
-                        try {
-                            final Boolean res = this.implementation.delete(current.getId());
-                            if (res) {
-                                Log.i(CapacitorUpdater.TAG, "Failed bundle deleted: " + current.getVersionName());
-                            }
-                        } catch (final IOException e) {
-                            Log.e(CapacitorUpdater.TAG, "Failed to delete failed bundle: " + current.getVersionName(), e);
-                        }
-                    }
-                } else {
-                    // Nothing we can/should do by default if the 'builtin' bundle fails to call 'notifyAppReady()'.
-                }
-
-            } else if (!fallback.isBuiltin()) {
-                // There is a no next bundle, and the current bundle has succeeded
-                this.implementation.commit(current);
+        if(current.isBuiltin()) {
+            Log.i(CapacitorUpdater.TAG, "Built-in bundle is active. Nothing to do.");
+            return;
+        }
+        Log.d(CapacitorUpdater.TAG, "Current bundle is: " + current);
 
-                if(this.autoDeletePrevious) {
-                    Log.i(CapacitorUpdater.TAG, "Bundle successfully loaded: " + current);
-                    try {
-                        final Boolean res = this.implementation.delete(fallback.getVersionName());
-                        if (res) {
-                            Log.i(CapacitorUpdater.TAG, "Deleted previous bundle: " + fallback.getVersionName());
-                        }
-                    } catch (final IOException e) {
-                        Log.e(CapacitorUpdater.TAG, "Failed to delete previous bundle: " + fallback.getVersionName(), e);
+        if(BundleStatus.SUCCESS != current.getStatus()) {
+            Log.e(CapacitorUpdater.TAG, "notifyAppReady was not called, roll back current bundle: " + current.getId());
+            Log.i(CapacitorUpdater.TAG, "Did you forget to call 'notifyAppReady()' in your Capacitor App code?");
+            final JSObject ret = new JSObject();
+            ret.put("bundle", current.toJSON());
+            this.notifyListeners("updateFailed", ret);
+            this.implementation.sendStats("update_fail", current.getVersionName());
+            this.implementation.setError(current);
+            this._reset(true);
+            if (CapacitorUpdaterPlugin.this.autoDeleteFailed && !current.isBuiltin()) {
+                Log.i(CapacitorUpdater.TAG, "Deleting failing bundle: " + current.getVersionName());
+                try {
+                    final Boolean res = this.implementation.delete(current.getId(), false);
+                    if (res) {
+                        Log.i(CapacitorUpdater.TAG, "Failed bundle deleted: " + current.getVersionName());
                     }
+                } catch (final IOException e) {
+                    Log.e(CapacitorUpdater.TAG, "Failed to delete failed bundle: " + current.getVersionName(), e);
                 }
             }
-        }
-        catch(final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Error during onActivityStopped", e);
+        } else {
+            Log.i(CapacitorUpdater.TAG, "notifyAppReady was called. This is fine: " + current.getId());
         }
     }
 
@@ -592,21 +700,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
             try {
                 Log.i(CapacitorUpdater.TAG, "Wait for " + CapacitorUpdaterPlugin.this.appReadyTimeout + "ms, then check for notifyAppReady");
                 Thread.sleep(CapacitorUpdaterPlugin.this.appReadyTimeout);
-                // Automatically roll back to fallback version if notifyAppReady has not been called yet
-                final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
-                if(current.isBuiltin()) {
-                    Log.i(CapacitorUpdater.TAG, "Built-in bundle is active. Nothing to do.");
-                    return;
-                }
-
-                if(BundleStatus.SUCCESS != current.getStatus()) {
-                    Log.e(CapacitorUpdater.TAG, "notifyAppReady was not called, roll back current bundle: " + current.getId());
-                    CapacitorUpdaterPlugin.this.implementation.rollback(current);
-                    CapacitorUpdaterPlugin.this._reset(true);
-                } else {
-                    Log.i(CapacitorUpdater.TAG, "notifyAppReady was called. This is fine: " + current.getId());
-                }
-
+                CapacitorUpdaterPlugin.this.checkRevert();
                 CapacitorUpdaterPlugin.this.appReadyCheck = null;
             } catch (final InterruptedException e) {
                 Log.e(CapacitorUpdater.TAG, DeferredNotifyAppReadyCheck.class.getName() + " was interrupted.");