@capgo/capacitor-updater 3.3.11 → 4.0.0-alpha.10

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

@@ -5,12 +5,15 @@ import android.app.Application;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.volley.toolbox.Volley;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -18,389 +21,621 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.plugin.WebView;
+
 import io.github.g00fy2.versioncompare.Version;
 
 import org.json.JSONException;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
 public class CapacitorUpdaterPlugin extends Plugin implements Application.ActivityLifecycleCallbacks {
-    private static final String autoUpdateUrlDefault = "https://capgo.app/api/auto_update";
-    private static final String statsUrlDefault = "https://capgo.app/api/stats";
-    private final String TAG = "Capacitor-updater";
-    private CapacitorUpdater implementation;
+    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 DELAY_UPDATE = "delayUpdate";
 
-    private SharedPreferences prefs;
     private SharedPreferences.Editor editor;
+    private SharedPreferences prefs;
+    private CapacitorUpdater implementation;
 
-    private String autoUpdateUrl = "";
-    private Version currentVersionNative;
+    private Integer appReadyTimeout = 10000;
+    private Boolean autoDeleteFailed = true;
+    private Boolean autoDeletePrevious = true;
     private Boolean autoUpdate = false;
+    private String updateUrl = "";
+    private Version currentVersionNative;
     private Boolean resetWhenUpdate = true;
 
+    private volatile Thread appReadyCheck;
+
     @Override
     public void load() {
         super.load();
-        this.prefs = this.getContext().getSharedPreferences("CapWebViewSettings", Activity.MODE_PRIVATE);
+        this.prefs = this.getContext().getSharedPreferences(WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);
         this.editor = this.prefs.edit();
+
         try {
-            this.implementation = new CapacitorUpdater(this.getContext()) {
+            this.implementation = new CapacitorUpdater() {
                 @Override
-                public void notifyDownload(final int percent) {
-                    CapacitorUpdaterPlugin.this.notifyDownload(percent);
+                public void notifyDownload(final String id, final int percent) {
+                    CapacitorUpdaterPlugin.this.notifyDownload(id, percent);
                 }
             };
             final PackageInfo pInfo = this.getContext().getPackageManager().getPackageInfo(this.getContext().getPackageName(), 0);
+            this.implementation.versionBuild = pInfo.versionName;
+            this.implementation.versionCode = Integer.toString(pInfo.versionCode);
+            this.implementation.requestQueue = Volley.newRequestQueue(this.getContext());
             this.currentVersionNative = new Version(pInfo.versionName);
         } catch (final PackageManager.NameNotFoundException e) {
-            Log.e(this.TAG, "Error instantiating implementation", e);
+            Log.e(CapacitorUpdater.TAG, "Error instantiating implementation", e);
             return;
-        } catch (final Exception ex) {
-            Log.e(this.TAG, "Error getting current native app version", ex);
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Error getting current native app version", e);
             return;
         }
+
         final CapConfig config = CapConfig.loadDefault(this.getActivity());
-        this.implementation.setAppId(config.getString("appId", ""));
-        this.implementation.setStatsUrl(this.getConfig().getString("statsUrl", statsUrlDefault));
-        this.autoUpdateUrl = this.getConfig().getString("autoUpdateUrl", autoUpdateUrlDefault);
+        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.versionOs = Build.VERSION.RELEASE;
+        this.implementation.deviceID = Settings.Secure.getString(this.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+
+        this.autoDeleteFailed = this.getConfig().getBoolean("autoDeleteFailed", true);
+        this.autoDeletePrevious = this.getConfig().getBoolean("autoDeletePrevious", true);
+        this.updateUrl = this.getConfig().getString("updateUrl", updateUrlDefault);
         this.autoUpdate = this.getConfig().getBoolean("autoUpdate", false);
+        this.appReadyTimeout = this.getConfig().getInt("appReadyTimeout", 10000);
         this.resetWhenUpdate = this.getConfig().getBoolean("resetWhenUpdate", true);
+
         if (this.resetWhenUpdate) {
-            final Version LatestVersionNative = new Version(this.prefs.getString("LatestVersionNative", ""));
+            this.cleanupObsoleteVersions();
+        }
+        final Application application = (Application) this.getContext().getApplicationContext();
+        application.registerActivityLifecycleCallbacks(this);
+
+        this.onActivityStarted(this.getActivity());
+    }
+
+    private void cleanupObsoleteVersions() {
+        try {
+            final Version previous = new Version(this.prefs.getString("LatestVersionNative", ""));
             try {
-                if (!LatestVersionNative.equals("") && this.currentVersionNative.getMajor() > LatestVersionNative.getMajor()) {
-                    this._reset(false);
-                    this.editor.putString("LatestVersionAutoUpdate", "");
-                    this.editor.putString("LatestVersionNameAutoUpdate", "");
-                    final ArrayList<String> res = this.implementation.list();
-                    for (int i = 0; i < res.size(); i++) {
+                if (!"".equals(previous.getOriginalString()) && this.currentVersionNative.getMajor() > previous.getMajor()) {
+
+                    Log.i(CapacitorUpdater.TAG, "New native major version detected: " + this.currentVersionNative);
+                    this.implementation.reset(true);
+                    final List<BundleInfo> installed = this.implementation.list();
+                    for (final BundleInfo bundle: installed) {
                         try {
-                            final String version = res.get(i);
-                            this.implementation.delete(version, "");
-                            Log.i(this.TAG, "Deleted obsolete version: " + version);
-                        } catch (final IOException e) {
-                            Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
+                            Log.i(CapacitorUpdater.TAG, "Deleting obsolete bundle: " + bundle.getId());
+                            this.implementation.delete(bundle.getId());
+                        } catch (final Exception e) {
+                            Log.e(CapacitorUpdater.TAG, "Failed to delete: " + bundle.getId(), e);
                         }
                     }
                 }
-                this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
-                this.editor.commit();
-            } catch (final Exception ex) {
-                Log.e(this.TAG, "Cannot get the current version " + ex.getMessage());
+            } catch (final Exception e) {
+                Log.e(CapacitorUpdater.TAG, "Could not determine the current version", e);
             }
+        } catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Error calculating previous native version", e);
         }
-        if (!this.autoUpdate || this.autoUpdateUrl.equals("")) return;
-        final Application application = (Application) this.getContext().getApplicationContext();
-        application.registerActivityLifecycleCallbacks(this);
-        this.onActivityStarted(this.getActivity());
+        this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
+        this.editor.commit();
     }
 
-    public void notifyDownload(final int percent) {
-        final JSObject ret = new JSObject();
-        ret.put("percent", percent);
-        this.notifyListeners("download", ret);
+    public void notifyDownload(final String id, final int percent) {
+        try {
+            final JSObject ret = new JSObject();
+            ret.put("percent", percent);
+            JSObject bundle = this.implementation.getBundleInfo(id).toJSON();
+            ret.put("bundle", bundle);
+            this.notifyListeners("download", ret);
+            if (percent == 100) {
+                this.notifyListeners("downloadComplete", bundle);
+            }
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not notify listeners", e);
+        }
     }
 
+
     @PluginMethod
     public void getId(final PluginCall call) {
-        final JSObject ret = new JSObject();
-        ret.put("id", this.implementation.getDeviceID());
-        call.resolve(ret);
+        try {
+            final JSObject ret = new JSObject();
+            ret.put("id", this.implementation.deviceID);
+            call.resolve(ret);
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not get device id", e);
+            call.reject("Could not get device id", e);
+        }
     }
 
     @PluginMethod
     public void getPluginVersion(final PluginCall call) {
-        final JSObject ret = new JSObject();
-        ret.put("version", this.implementation.pluginVersion);
-        call.resolve(ret);
+        try {
+            final JSObject ret = new JSObject();
+            ret.put("version", CapacitorUpdater.pluginVersion);
+            call.resolve(ret);
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not get plugin version", e);
+            call.reject("Could not get plugin version", e);
+        }
     }
 
     @PluginMethod
     public void download(final PluginCall call) {
-        new Thread(new Runnable(){
-            @Override
-            public void run() {
-                try {
-                    final String url = call.getString("url");
-                    final String version = CapacitorUpdaterPlugin.this.implementation.download(url);
-                    final JSObject ret = new JSObject();
-                    ret.put("version", version);
-                    call.resolve(ret);
-                } catch (final IOException e) {
-                    Log.e(CapacitorUpdaterPlugin.this.TAG, "download failed", e);
-                    call.reject("download failed", e);
+        final String url = call.getString("url");
+        final String version = call.getString("version");
+        if (url == null || version == null) {
+            call.reject("missing url or version");
+            return;
+        }
+        try {
+            Log.i(CapacitorUpdater.TAG, "Downloading " + url);
+            new Thread(new Runnable(){
+                @Override
+                public void run() {
+                    try {
+
+                        final BundleInfo downloaded = CapacitorUpdaterPlugin.this.implementation.download(url, version);
+                        call.resolve(downloaded.toJSON());
+                    } catch (final IOException e) {
+                        Log.e(CapacitorUpdater.TAG, "download failed", e);
+                        call.reject("download failed", e);
+                    }
                 }
-            }
-        }).start();
+            }).start();
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to download " + url, e);
+            call.reject("Failed to download " + url, e);
+        }
     }
 
     private boolean _reload() {
-        final String pathHot = this.implementation.getLastPathHot();
-        this.bridge.setServerBasePath(pathHot);
+        final String path = this.implementation.getCurrentBundlePath();
+        Log.i(CapacitorUpdater.TAG, "Reloading: " + path);
+        if(this.implementation.isUsingBuiltin()) {
+            this.bridge.setServerAssetPath(path);
+        } else {
+            this.bridge.setServerBasePath(path);
+        }
+        this.checkAppReady();
         return true;
     }
 
     @PluginMethod
     public void reload(final PluginCall call) {
-        if (this._reload()) {
-            call.resolve();
-        } else {
-            call.reject("reload failed");
+        try {
+            if (this._reload()) {
+                call.resolve();
+            } else {
+                call.reject("Reload failed");
+            }
+        } catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not reload", e);
+            call.reject("Could not reload", e);
+        }
+    }
+
+    @PluginMethod
+    public void next(final PluginCall call) {
+        final String id = call.getString("id");
+
+        try {
+            Log.i(CapacitorUpdater.TAG, "Setting next active id " + id);
+            if (!this.implementation.setNextVersion(id)) {
+                call.reject("Set next id failed. Bundle " + id + " does not exist.");
+            } else {
+                call.resolve(this.implementation.getBundleInfo(id).toJSON());
+            }
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not set next id " + id, e);
+            call.reject("Could not set next id " + id, e);
         }
     }
 
     @PluginMethod
     public void set(final PluginCall call) {
-        final String version = call.getString("version");
-        final String versionName = call.getString("versionName", version);
-        final Boolean res = this.implementation.set(version, versionName);
+        final String id = call.getString("id");
 
-        if (!res) {
-            call.reject("Update failed, version " + version + " doesn't exist");
-        } else {
-            this.reload(call);
+        try {
+            Log.i(CapacitorUpdater.TAG, "Setting active bundle " + id);
+            if (!this.implementation.set(id)) {
+                Log.i(CapacitorUpdater.TAG, "No such bundle " + id);
+                call.reject("Update failed, id " + id + " does not exist.");
+            } else {
+                Log.i(CapacitorUpdater.TAG, "Bundle successfully set to" + id);
+                this.reload(call);
+            }
+        } catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not set id " + id, e);
+            call.reject("Could not set id " + id, e);
         }
     }
 
     @PluginMethod
     public void delete(final PluginCall call) {
-        final String version = call.getString("version");
+        final String id = call.getString("id");
+        Log.i(CapacitorUpdater.TAG, "Deleting id: " + id);
         try {
-            final Boolean res = this.implementation.delete(version, "");
+            final Boolean res = this.implementation.delete(id);
             if (res) {
                 call.resolve();
             } else {
-                call.reject("Delete failed, version " + version + " doesn't exist");
+                call.reject("Delete failed, id " + id + " does not exist");
             }
-        } catch(final IOException ex) {
-            Log.e(this.TAG, "An unexpected error occurred during deletion of folder. Message: " + ex.getMessage());
-            call.reject("An unexpected error occurred during deletion of folder.");
+        } catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not delete id " + id, e);
+            call.reject("Could not delete id " + id, e);
         }
     }
 
+
     @PluginMethod
     public void list(final PluginCall call) {
-        final ArrayList<String> res = this.implementation.list();
-        final JSObject ret = new JSObject();
-        ret.put("versions", new JSArray(res));
-        call.resolve(ret);
-    }
-
-    private boolean _reset(final Boolean toAutoUpdate) {
-        final String version = this.prefs.getString("LatestVersionAutoUpdate", "");
-        final String versionName = this.prefs.getString("LatestVersionNameAutoUpdate", "");
-        if (toAutoUpdate && !version.equals("") && !versionName.equals("")) {
-            final Boolean res = this.implementation.set(version, versionName);
-            return res && this._reload();
+        try {
+            final List<BundleInfo> res = this.implementation.list();
+            final JSObject ret = new JSObject();
+            final JSArray values = new JSArray();
+            for (final BundleInfo bundle : res) {
+                values.put(bundle.toJSON());
+            }
+            ret.put("bundles", values);
+            call.resolve(ret);
         }
-        this.implementation.reset();
-        final String pathHot = this.implementation.getLastPathHot();
-        if (this.bridge.getLocalServer() != null) {
-            // if the server is not ready yet, hot reload is not needed
-            this.bridge.setServerAssetPath(pathHot);
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not list bundles", e);
+            call.reject("Could not list bundles", e);
         }
-        return true;
     }
 
     @PluginMethod
-    public void reset(final PluginCall call) {
-        final Boolean toAutoUpdate = call.getBoolean("toAutoUpdate", false);
-        if (this._reset(toAutoUpdate)) {
-            call.resolve();
-            return;
+    public void getLatest(final PluginCall call) {
+        new Thread(new Runnable(){
+            @Override
+            public void run() {
+                CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, (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();
+        this.implementation.reset();
+
+        if (toLastSuccessful && !fallback.isBuiltin()) {
+            Log.i(CapacitorUpdater.TAG, "Resetting to: " + fallback);
+            return this.implementation.set(fallback) && this._reload();
         }
-        call.reject("✨  Capacitor-updater: Reset failed");
+
+        Log.i(CapacitorUpdater.TAG, "Resetting to native.");
+        return this._reload();
     }
 
     @PluginMethod
-    public void versionName(final PluginCall call) {
-        final String name = this.implementation.getVersionName();
-        final JSObject ret = new JSObject();
-        ret.put("versionName", name);
-        call.resolve(ret);
+    public void reset(final PluginCall call) {
+        try {
+            final Boolean toLastSuccessful = call.getBoolean("toLastSuccessful", false);
+            if (this._reset(toLastSuccessful)) {
+                call.resolve();
+                return;
+            }
+            call.reject("Reset failed");
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Reset failed", e);
+            call.reject("Reset failed", e);
+        }
     }
 
     @PluginMethod
     public void current(final PluginCall call) {
-        final String pathHot = this.implementation.getLastPathHot();
-        final JSObject ret = new JSObject();
-        final String current = pathHot.length() >= 10 ? pathHot.substring(pathHot.length() - 10) : "builtin";
-        ret.put("current", current);
-        ret.put("currentNative", this.currentVersionNative);
-        call.resolve(ret);
+        try {
+            final JSObject ret = new JSObject();
+            final BundleInfo bundle = this.implementation.getCurrentBundle();
+            ret.put("bundle", bundle.toJSON());
+            ret.put("native", this.currentVersionNative);
+            call.resolve(ret);
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not get current bundle", e);
+            call.reject("Could not get current bundle", e);
+        }
     }
 
     @PluginMethod
     public void notifyAppReady(final PluginCall call) {
-        this.editor.putBoolean("notifyAppReady", true);
-        this.editor.commit();
-        call.resolve();
+        try {
+            Log.i(CapacitorUpdater.TAG, "Current bundle loaded successfully. ['notifyAppReady()' was called]");
+            final BundleInfo bundle = this.implementation.getCurrentBundle();
+            this.implementation.commit(bundle);
+            call.resolve();
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to notify app ready state. [Error calling 'notifyAppReady()']", e);
+            call.reject("Failed to commit app ready state.", e);
+        }
     }
 
     @PluginMethod
     public void delayUpdate(final PluginCall call) {
-        this.editor.putBoolean("delayUpdate", true);
-        this.editor.commit();
-        call.resolve();
+        try {
+            Log.i(CapacitorUpdater.TAG, "Delay update.");
+            this.editor.putBoolean(DELAY_UPDATE, true);
+            this.editor.commit();
+            call.resolve();
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to delay update", e);
+            call.reject("Failed to delay update", e);
+        }
     }
 
     @PluginMethod
     public void cancelDelay(final PluginCall call) {
-        this.editor.putBoolean("delayUpdate", false);
-        this.editor.commit();
-        call.resolve();
+        try {
+            Log.i(CapacitorUpdater.TAG, "Cancel update delay.");
+            this.editor.putBoolean(DELAY_UPDATE, false);
+            this.editor.commit();
+            call.resolve();
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
+            call.reject("Failed to cancel update delay", e);
+        }
     }
 
-    @Override
+    private Boolean _isAutoUpdateEnabled() {
+        return CapacitorUpdaterPlugin.this.autoUpdate && !"".equals(CapacitorUpdaterPlugin.this.updateUrl);
+    }
+
+    @PluginMethod
+    public void isAutoUpdateEnabled(final PluginCall call) {
+        try {
+            final JSObject ret = new JSObject();
+            ret.put("enabled", this._isAutoUpdateEnabled());
+            call.resolve(ret);
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Could not get autoUpdate status", e);
+            call.reject("Could not get autoUpdate status", e);
+        }
+    }
+
+    private void checkAppReady() {
+        try {
+            if(this.appReadyCheck != null) {
+                this.appReadyCheck.interrupt();
+            }
+            this.appReadyCheck = new Thread(new DeferredNotifyAppReadyCheck());
+            this.appReadyCheck.start();
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to start " + DeferredNotifyAppReadyCheck.class.getName(), e);
+        }
+    }
+
+    @Override // appMovedToForeground
     public void onActivityStarted(@NonNull final Activity activity) {
-//        disableRevert disableBreaking
-        Log.i(this.TAG, "Check for update in the server");
-        if (this.autoUpdateUrl.equals("")) return;
-        new Thread(new Runnable(){
-            @Override
-            public void run() {
-                CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.autoUpdateUrl, (res) -> {
-                    try {
-                        if (res.has("message")) {
-                            Log.i(CapacitorUpdaterPlugin.this.TAG, "Capacitor-updater: " + res.get("message"));
-                            if (res.has("major") && res.getBoolean("major") && res.has("version")) {
-                                final JSObject ret = new JSObject();
-                                ret.put("newVersion", (String) res.get("version"));
-                                CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", ret);
+        if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
+            new Thread(new Runnable(){
+                @Override
+                public void run() {
+
+                    Log.i(CapacitorUpdater.TAG, "Check for update via: " + CapacitorUpdaterPlugin.this.updateUrl);
+                    CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, (res) -> {
+                        try {
+                            if (res.has("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);
+                                }
+                                return;
                             }
-                            return;
-                        }
-                        final String currentVersion = CapacitorUpdaterPlugin.this.implementation.getVersionName();
-                        final String newVersion = (String) res.get("version");
-                        final JSObject ret = new JSObject();
-                        ret.put("newVersion", newVersion);
-                        final String failingVersion = CapacitorUpdaterPlugin.this.prefs.getString("failingVersion", "");
-                        if (!newVersion.equals("") && !newVersion.equals(failingVersion)) {
-                            new Thread(new Runnable(){
-                                @Override
-                                public void run() {
-                                    try {
-                                        final String url = (String) res.get("url");
-                                        final String dl = CapacitorUpdaterPlugin.this.implementation.download(url);
-                                        if (dl.equals("")) {
-                                            Log.i(CapacitorUpdaterPlugin.this.TAG, "Download version: " + newVersion + " failed");
-                                            return;
-                                        }
-                                        Log.i(CapacitorUpdaterPlugin.this.TAG, "New version: " + newVersion + " found. Current is " + (currentVersion.equals("") ? "builtin" : currentVersion) + ", next backgrounding will trigger update");
-                                        CapacitorUpdaterPlugin.this.editor.putString("nextVersion", dl);
-                                        CapacitorUpdaterPlugin.this.editor.putString("nextVersionName", (String) res.get("version"));
-                                        CapacitorUpdaterPlugin.this.editor.commit();
-                                        CapacitorUpdaterPlugin.this.notifyListeners("updateAvailable", ret);
-                                    } catch (final Exception e) {
-                                        Log.e(CapacitorUpdaterPlugin.this.TAG, "error downloading file", e);
+                            final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+                            final String latestVersionName = (String) res.get("version");
+
+                            if (latestVersionName != null && !"".equals(latestVersionName) && !current.getVersionName().equals(latestVersionName)) {
+
+                                final BundleInfo latest = CapacitorUpdaterPlugin.this.implementation.getBundleInfoByName(latestVersionName);
+                                if(latest != null) {
+                                    if(latest.isErrorStatus()) {
+                                        Log.e(CapacitorUpdater.TAG, "Latest bundle already exists, and is in error state. Aborting update.");
+                                        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());
+                                        return;
                                     }
                                 }
-                            }).start();
-                        } else {
-                            Log.i(CapacitorUpdaterPlugin.this.TAG, "No need to update, " + currentVersion + " is the latest");
+
+
+                                new Thread(new Runnable(){
+                                    @Override
+                                    public void run() {
+                                        try {
+                                            Log.i(CapacitorUpdater.TAG, "New bundle: " + latestVersionName + " found. Current is: " + current.getVersionName() + ". Update will occur next time app moves to background.");
+
+                                            final String url = (String) res.get("url");
+                                            final BundleInfo next = CapacitorUpdaterPlugin.this.implementation.download(url, latestVersionName);
+
+                                            CapacitorUpdaterPlugin.this.implementation.setNextVersion(next.getId());
+                                        } catch (final Exception e) {
+                                            Log.e(CapacitorUpdater.TAG, "error downloading file", e);
+                                        }
+                                    }
+                                }).start();
+                            } else {
+                                Log.i(CapacitorUpdater.TAG, "No need to update, " + current + " is the latest bundle.");
+                            }
+                        } catch (final JSONException e) {
+                            Log.e(CapacitorUpdater.TAG, "error parsing JSON", e);
                         }
-                    } catch (final JSONException e) {
-                        Log.e(CapacitorUpdaterPlugin.this.TAG, "error parsing JSON", e);
-                    }
-                });
-            }
-        }).start();
+                    });
+                }
+            }).start();
+        }
+
+        this.checkAppReady();
     }
 
-    @Override
+    @Override // appMovedToBackground
     public void onActivityStopped(@NonNull final Activity activity) {
-        final String pathHot = this.implementation.getLastPathHot();
-        Log.i(this.TAG, "Check for waiting update");
-        final String nextVersion = this.prefs.getString("nextVersion", "");
-        final Boolean delayUpdate = this.prefs.getBoolean("delayUpdate", false);
-        this.editor.putBoolean("delayUpdate", false);
-        this.editor.commit();
-        if (delayUpdate) {
-            Log.i(this.TAG, "Update delayed to next backgrounding");
-            return;
-        }
-        final String nextVersionName = this.prefs.getString("nextVersionName", "");
-        final String pastVersion = this.prefs.getString("pastVersion", "");
-        final String pastVersionName = this.prefs.getString("pastVersionName", "");
-        final Boolean notifyAppReady = this.prefs.getBoolean("notifyAppReady", false);
-        final String tmpCurVersion = this.implementation.getLastPathHot();
-        final String curVersion = tmpCurVersion.substring(tmpCurVersion.lastIndexOf('/') +1);
-        final String curVersionName = this.implementation.getVersionName();
-        if (!nextVersion.equals("") && !nextVersionName.equals("")) {
-            final Boolean res = this.implementation.set(nextVersion, nextVersionName);
-            if (res && this._reload()) {
-                Log.i(this.TAG, "Auto update to version: " + nextVersionName);
-                this.editor.putString("LatestVersionAutoUpdate", nextVersion);
-                this.editor.putString("LatestVersionNameAutoUpdate", nextVersionName);
-                this.editor.putString("nextVersion", "");
-                this.editor.putString("nextVersionName", "");
-                this.editor.putString("pastVersion", curVersion);
-                this.editor.putString("pastVersionName", curVersionName);
-                this.editor.putBoolean("notifyAppReady", false);
-                this.editor.commit();
-            } else {
-                Log.i(this.TAG, "Auto update to version: " + nextVersionName + "Failed");
+        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) {
+                Log.i(CapacitorUpdater.TAG, "Update delayed to next backgrounding");
+                return;
             }
-        } else if (!notifyAppReady && !pathHot.equals("public")) {
-            Log.i(this.TAG, "notifyAppReady never trigger");
-            Log.i(this.TAG, "Version: " + curVersionName + ", is considered broken");
-            Log.i(this.TAG, "Will downgraded to version: " + (pastVersionName.equals("") ? "builtin" : pastVersionName) + " for next start");
-            Log.i(this.TAG, "Don't forget to trigger 'notifyAppReady()' in js code to validate a version.");
-            this.implementation.sendStats("revert", curVersionName);
-            if (!pastVersion.equals("") && !pastVersionName.equals("")) {
-                final Boolean res = this.implementation.set(pastVersion, pastVersionName);
-                if (res && this._reload()) {
-                    Log.i(this.TAG, "Revert to version: " + (pastVersionName.equals("") ? "builtin" : pastVersionName));
-                    this.editor.putString("LatestVersionAutoUpdate", pastVersion);
-                    this.editor.putString("LatestVersionNameAutoUpdate", pastVersionName);
-                    this.editor.putString("pastVersion", "");
-                    this.editor.putString("pastVersionName", "");
-                    this.editor.commit();
+
+            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);
+
+            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);
                 } else {
-                    Log.i(this.TAG, "Revert to version: " + (pastVersionName.equals("") ? "builtin" : pastVersionName) + "Failed");
+                    Log.e(CapacitorUpdater.TAG, "Update to bundle: " + next.getVersionName() + " Failed!");
                 }
-            } else {
-                if (this._reset(false)) {
-                    this.editor.putString("LatestVersionAutoUpdate", "");
-                    this.editor.putString("LatestVersionNameAutoUpdate", "");
-                    Log.i(this.TAG, "Auto reset done");
+            } 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);
+
+                    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("update_fail", current.getVersionName());
+                    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.");
+                        }
+                    }
+
+                    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()'.
                 }
-            }
-            this.editor.putString("failingVersion", curVersionName);
-            this.editor.commit();
-            try {
-                final Boolean res = this.implementation.delete(curVersion, curVersionName);
-                if (res) {
-                    Log.i(this.TAG, "Deleted failing version: " + curVersionName);
+
+            } else if (!fallback.isBuiltin()) {
+                // There is a no next bundle, and the current bundle has succeeded
+                this.implementation.commit(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);
+                    }
                 }
-            } catch (final IOException e) {
-                Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
             }
-        } else if (!pastVersion.equals("")) {
-            Log.i(this.TAG, "Validated version: " + curVersionName);
+        }
+        catch(final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Error during onActivityStopped", e);
+        }
+    }
+
+    private class DeferredNotifyAppReadyCheck implements Runnable {
+        @Override
+        public void run() {
             try {
-                final Boolean res = this.implementation.delete(pastVersion, pastVersionName);
-                if (res) {
-                    Log.i(this.TAG, "Deleted past version: " + pastVersionName);
+                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());
                 }
-            } catch (final IOException e) {
-                Log.e(CapacitorUpdaterPlugin.this.TAG, "error deleting version", e);
+
+                CapacitorUpdaterPlugin.this.appReadyCheck = null;
+            } catch (final InterruptedException e) {
+                Log.e(CapacitorUpdater.TAG, DeferredNotifyAppReadyCheck.class.getName() + " was interrupted.");
             }
-            this.editor.putString("pastVersion", "");
-            this.editor.putString("pastVersionName", "");
-            this.editor.commit();
         }
     }
 
     // not use but necessary here to remove warnings
     @Override
     public void onActivityResumed(@NonNull final Activity activity) {
+        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
     }
 
     @Override
     public void onActivityPaused(@NonNull final Activity activity) {
+        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
     }
     @Override
     public void onActivityCreated(@NonNull final Activity activity, @Nullable final Bundle savedInstanceState) {