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

package/README.md

@@ -1,18 +1,18 @@
-# capacitor-updater
-
+# Capacitor updater
+  <a href="https://capgo.app/"><img src='https://raw.githubusercontent.com/Cap-go/capgo/main/assets/capgo_banner.png' alt='Capgo - Instant updates for capacitor'/></a>
 Update Ionic Capacitor apps without App/Play Store review (Code-push / hot-code updates).
 
-Usage options:
-- use [capgo.app](https://capgo.app), a full featured auto update system. (5 min Setup, easily manage versions, update, revert, and see detailed stats.)
-- integrate your own API with this plugin's auto update system.
-- use manual methods to zip, upload, download, from application code - you have full control.
+You have 3 ways possible :
+- Use [capgo.app](https://capgo.app) a full featured auto update system in 5 min Setup, to manage version, update, revert and see stats.
+- Use your own server update with auto update system
+- Use manual methods to zip, upload, download, from JS to do it when you want.
 
 
 ## Community
 Join the [discord](https://discord.gg/VnYRvBfgA6) to get help.
 
 ## Documentation
-I maintain a more user friendly and complete [documentation](https://github.com/Cap-go/capacitor-updater/wiki) in GitHub wiki.
+I maintain a more user friendly and complete [documentation here](https://docs.capgo.app/).
 
 ## Installation
 
@@ -24,10 +24,10 @@ npx cap sync
 ## Auto-update setup
 
 Create account in [capgo.app](https://capgo.app) and get your [API key](https://capgo.app/app/apikeys)
-- Download the CLI `npm i -g @capgo/cli`
-- Add app from CLI `capgo add -a API_KEY`
-- Upload app `capgo upload -a API_KEY`
-- Upload app `capgo set -a API_KEY -s public`
+- Login to CLI `npx @capgo/cli@latest  login API_KEY`
+- Add app with CLI `npx @capgo/cli@latest add`
+- Upload app to channel production `npx @capgo/cli@latest  upload -c production`
+- Set channel production public `npx @capgo/cli@latest  set -c production -s public`
 - Edit your `capacitor.config.json` like below, set `autoUpdate` to true.
 ```json
 // capacitor.config.json
@@ -52,7 +52,8 @@ This tells Capacitor Updator that the current update bundle has loaded succesful
 - Run the app and see app auto update after each backgrounding.
 - Failed updates will automatically roll back to the last successful version.
 
-See more details in the [Auto update](https://github.com/Cap-go/capacitor-updater/wiki) documentation.
+See more there in the [Auto update](
+https://github.com/Cap-go/capacitor-updater/wiki) documentation.
 
 
 ## Manual setup
@@ -127,11 +128,15 @@ Capacitor Updator works by unzipping a compiled app bundle to the native device
 * [`current()`](#current)
 * [`reload()`](#reload)
 * [`setDelay(...)`](#setdelay)
+* [`cancelDelay()`](#canceldelay)
 * [`getLatest(...)`](#getlatest)
 * [`addListener('download', ...)`](#addlistenerdownload)
+* [`addListener('noNeedUpdate', ...)`](#addlistenernoneedupdate)
+* [`addListener('updateAvailable', ...)`](#addlistenerupdateavailable)
 * [`addListener('downloadComplete', ...)`](#addlistenerdownloadcomplete)
 * [`addListener('majorAvailable', ...)`](#addlistenermajoravailable)
 * [`addListener('updateFailed', ...)`](#addlistenerupdatefailed)
+* [`addListener('downloadFailed', ...)`](#addlistenerdownloadfailed)
 * [`getId()`](#getid)
 * [`getPluginVersion()`](#getpluginversion)
 * [`isAutoUpdateEnabled()`](#isautoupdateenabled)
@@ -161,14 +166,14 @@ Notify Capacitor Updater that the current bundle is working (a rollback will occ
 ### download(...)
 
 ```typescript
-download(options: { url: string; version?: string; }) => Promise<BundleInfo>
+download(options: { url: string; version: string; }) => Promise<BundleInfo>
 ```
 
 Download a new version from the provided URL, it should be a zip file, with files inside or with a unique id inside with all your files
 
-| Param         | Type                                            |
-| ------------- | ----------------------------------------------- |
-| **`options`** | <code>{ url: string; version?: string; }</code> |
+| Param         | Type                                           |
+| ------------- | ---------------------------------------------- |
+| **`options`** | <code>{ url: string; version: string; }</code> |
 
 **Returns:** <code>Promise&lt;<a href="#bundleinfo">BundleInfo</a>&gt;</code>
 
@@ -277,14 +282,27 @@ Reload the view
 ### setDelay(...)
 
 ```typescript
-setDelay(options: { delay: boolean; }) => Promise<void>
+setDelay(options: { kind: DelayUntilNext; value?: string; }) => Promise<void>
 ```
 
 Set delay to skip updates in the next time the app goes into the background
 
-| Param         | Type                             |
-| ------------- | -------------------------------- |
-| **`options`** | <code>{ delay: boolean; }</code> |
+| Param         | Type                                                                                 |
+| ------------- | ------------------------------------------------------------------------------------ |
+| **`options`** | <code>{ kind: <a href="#delayuntilnext">DelayUntilNext</a>; value?: string; }</code> |
+
+**Since:** 4.0.0
+
+--------------------
+
+
+### cancelDelay()
+
+```typescript
+cancelDelay() => Promise<void>
+```
+
+Cancel delay to updates as usual
 
 **Since:** 4.0.0
 
@@ -330,6 +348,46 @@ Listen for download event in the App, let you know when the download is started,
 --------------------
 
 
+### addListener('noNeedUpdate', ...)
+
+```typescript
+addListener(eventName: 'noNeedUpdate', listenerFunc: NoNeedListener) => Promise<PluginListenerHandle> & PluginListenerHandle
+```
+
+Listen for no need to update event, usefull when you want force check every time the app is launched
+
+| Param              | Type                                                      |
+| ------------------ | --------------------------------------------------------- |
+| **`eventName`**    | <code>'noNeedUpdate'</code>                               |
+| **`listenerFunc`** | <code><a href="#noneedlistener">NoNeedListener</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+
+**Since:** 4.0.0
+
+--------------------
+
+
+### addListener('updateAvailable', ...)
+
+```typescript
+addListener(eventName: 'updateAvailable', listenerFunc: UpdateAvailabledListener) => Promise<PluginListenerHandle> & PluginListenerHandle
+```
+
+Listen for availbale update event, usefull when you want to force check every time the app is launched
+
+| Param              | Type                                                                          |
+| ------------------ | ----------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'updateAvailable'</code>                                                |
+| **`listenerFunc`** | <code><a href="#updateavailabledlistener">UpdateAvailabledListener</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+
+**Since:** 4.0.0
+
+--------------------
+
+
 ### addListener('downloadComplete', ...)
 
 ```typescript
@@ -376,7 +434,7 @@ Listen for Major update event in the App, let you know when major update is bloc
 addListener(eventName: 'updateFailed', listenerFunc: UpdateFailedListener) => Promise<PluginListenerHandle> & PluginListenerHandle
 ```
 
-Listen for update event in the App, let you know when update is ready to install at next app start
+Listen for update fail event in the App, let you know when update has fail to install at next app start
 
 | Param              | Type                                                                  |
 | ------------------ | --------------------------------------------------------------------- |
@@ -390,6 +448,26 @@ Listen for update event in the App, let you know when update is ready to install
 --------------------
 
 
+### addListener('downloadFailed', ...)
+
+```typescript
+addListener(eventName: 'downloadFailed', listenerFunc: DownloadFailedListener) => Promise<PluginListenerHandle> & PluginListenerHandle
+```
+
+Listen for download fail event in the App, let you know when download has fail finished
+
+| Param              | Type                                                                      |
+| ------------------ | ------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'downloadFailed'</code>                                             |
+| **`listenerFunc`** | <code><a href="#downloadfailedlistener">DownloadFailedListener</a></code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt; & <a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+
+**Since:** 4.0.0
+
+--------------------
+
+
 ### getId()
 
 ```typescript
@@ -464,6 +542,7 @@ removeAllListeners() => Promise<void>
 | **`id`**         | <code>string</code>                                   |
 | **`version`**    | <code>string</code>                                   |
 | **`downloaded`** | <code>string</code>                                   |
+| **`checksum`**   | <code>string</code>                                   |
 | **`status`**     | <code><a href="#bundlestatus">BundleStatus</a></code> |
 
 
@@ -493,6 +572,20 @@ removeAllListeners() => Promise<void>
 | **`bundle`**  | <code><a href="#bundleinfo">BundleInfo</a></code> |                                                |       |
 
 
+#### noNeedEvent
+
+| Prop         | Type                                              | Description                                    | Since |
+| ------------ | ------------------------------------------------- | ---------------------------------------------- | ----- |
+| **`bundle`** | <code><a href="#bundleinfo">BundleInfo</a></code> | Current status of download, between 0 and 100. | 4.0.0 |
+
+
+#### updateAvailableEvent
+
+| Prop         | Type                                              | Description                                    | Since |
+| ------------ | ------------------------------------------------- | ---------------------------------------------- | ----- |
+| **`bundle`** | <code><a href="#bundleinfo">BundleInfo</a></code> | Current status of download, between 0 and 100. | 4.0.0 |
+
+
 #### DownloadCompleteEvent
 
 | Prop         | Type                                              | Description                          | Since |
@@ -514,6 +607,13 @@ removeAllListeners() => Promise<void>
 | **`bundle`** | <code><a href="#bundleinfo">BundleInfo</a></code> | Emit when a update failed to install. | 4.0.0 |
 
 
+#### DownloadFailedEvent
+
+| Prop          | Type                | Description                | Since |
+| ------------- | ------------------- | -------------------------- | ----- |
+| **`version`** | <code>string</code> | Emit when a download fail. | 4.0.0 |
+
+
 ### Type Aliases
 
 
@@ -522,11 +622,26 @@ removeAllListeners() => Promise<void>
 <code>'success' | 'error' | 'pending' | 'downloading'</code>
 
 
+#### DelayUntilNext
+
+<code>'background' | 'kill' | 'nativeVersion' | 'date'</code>
+
+
 #### DownloadChangeListener
 
 <code>(state: <a href="#downloadevent">DownloadEvent</a>): void</code>
 
 
+#### NoNeedListener
+
+<code>(state: <a href="#noneedevent">noNeedEvent</a>): void</code>
+
+
+#### UpdateAvailabledListener
+
+<code>(state: <a href="#updateavailableevent">updateAvailableEvent</a>): void</code>
+
+
 #### DownloadCompleteListener
 
 <code>(state: <a href="#downloadcompleteevent">DownloadCompleteEvent</a>): void</code>
@@ -541,6 +656,11 @@ removeAllListeners() => Promise<void>
 
 <code>(state: <a href="#updatefailedevent">UpdateFailedEvent</a>): void</code>
 
+
+#### DownloadFailedListener
+
+<code>(state: <a href="#downloadfailedevent">DownloadFailedEvent</a>): void</code>
+
 </docgen-api>
 
 ### Listen to download events

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

@@ -21,6 +21,7 @@ public class BundleInfo {
     private final String downloaded;
     private final String id;
     private final String version;
+    private final String checksum;
     private final BundleStatus status;
 
     static {
@@ -28,17 +29,18 @@ public class BundleInfo {
     }
 
     public BundleInfo(final BundleInfo source) {
-        this(source.id, source.version, source.status, source.downloaded);
+        this(source.id, source.version, source.status, source.downloaded, source.checksum);
     }
 
-    public BundleInfo(final String id, final String version, final BundleStatus status, final Date downloaded) {
-        this(id, version, status, sdf.format(downloaded));
+    public BundleInfo(final String id, final String version, final BundleStatus status, final Date downloaded, final String checksum) {
+        this(id, version, status, sdf.format(downloaded), checksum);
     }
 
-    public BundleInfo(final String id, final String version, final BundleStatus status, final String downloaded) {
+    public BundleInfo(final String id, final String version, final BundleStatus status, final String downloaded, final String checksum) {
         this.downloaded = downloaded.trim();
         this.id = id;
         this.version = version;
+        this.checksum = checksum;
         this.status = status;
     }
 
@@ -60,7 +62,15 @@ public class BundleInfo {
     }
 
     public BundleInfo setDownloaded(Date downloaded) {
-        return new BundleInfo(this.id, this.version, this.status, downloaded);
+        return new BundleInfo(this.id, this.version, this.status, downloaded, this.checksum);
+    }
+
+    public String getChecksum() {
+        return this.isBuiltin() ? "" : this.checksum;
+    }
+
+    public BundleInfo setChecksum(String checksum) {
+        return new BundleInfo(this.id, this.version, this.status, this.downloaded, checksum);
     }
 
     public String getId() {
@@ -68,7 +78,7 @@ public class BundleInfo {
     }
 
     public BundleInfo setId(String id) {
-        return new BundleInfo(id, this.version, this.status, this.downloaded);
+        return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum);
     }
 
     public String getVersionName() {
@@ -76,7 +86,7 @@ public class BundleInfo {
     }
 
     public BundleInfo setVersionName(String version) {
-        return new BundleInfo(this.id, version, this.status, this.downloaded);
+        return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum);
     }
 
     public BundleStatus getStatus() {
@@ -84,7 +94,7 @@ public class BundleInfo {
     }
 
     public BundleInfo setStatus(BundleStatus status) {
-        return new BundleInfo(this.id, this.version, status, this.downloaded);
+        return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum);
     }
 
     public static BundleInfo fromJSON(final JSObject json) throws JSONException {
@@ -97,7 +107,8 @@ public class BundleInfo {
                 json.has("id") ? json.getString("id") : "",
                 json.has("version") ? json.getString("version") : BundleInfo.VERSION_UNKNOWN,
                 json.has("status") ? BundleStatus.fromString(json.getString("status")) : BundleStatus.PENDING,
-                json.has("downloaded") ? json.getString("downloaded") : ""
+                json.has("downloaded") ? json.getString("downloaded") : "",
+                json.has("checksum") ? json.getString("checksum") : ""
         );
     }
 
@@ -106,6 +117,7 @@ public class BundleInfo {
         result.put("id", this.getId());
         result.put("version", this.getVersionName());
         result.put("downloaded", this.getDownloaded());
+        result.put("checksum", this.getChecksum());
         result.put("status", this.getStatus());
         return result;
     }

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

@@ -28,6 +28,7 @@ import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -46,7 +47,7 @@ public class CapacitorUpdater {
     private static final String bundleDirectory = "versions";
 
     public static final String TAG = "Capacitor-updater";
-    public static final String pluginVersion = "4.0.0-alpha.9";
+    public static final String pluginVersion = "4.0.0";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -212,13 +213,25 @@ public class CapacitorUpdater {
         this.editor.commit();
     }
 
+    private String getChecksum(File file) throws IOException {
+        byte[] bytes = new byte[(int) file.length()];
+        try(FileInputStream fis = new FileInputStream(file)){
+            fis.read(bytes);
+        }
+        CRC32 crc = new CRC32();
+        crc.update(bytes);
+        String enc = String.format("%08X", crc.getValue());
+        return enc.toLowerCase();
+    }
+
     public BundleInfo download(final String url, final String version) throws IOException {
         final String id = this.randomString(10);
-        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis())));
+        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
         this.notifyDownload(id, 0);
         final String idName = bundleDirectory + "/" + id;
         this.notifyDownload(id, 5);
         final File downloaded = this.downloadFile(id, url, this.randomString(10));
+        final String checksum = this.getChecksum(downloaded);
         this.notifyDownload(id, 71);
         final File unzipped = this.unzip(id, downloaded, this.randomString(10));
         downloaded.delete();
@@ -226,7 +239,7 @@ public class CapacitorUpdater {
         this.flattenAssets(unzipped, idName);
         this.notifyDownload(id, 100);
         this.saveBundleInfo(id, null);
-        BundleInfo info = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()));
+        BundleInfo info = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()), checksum);
         this.saveBundleInfo(id, info);
         return info;
     }
@@ -246,28 +259,38 @@ public class CapacitorUpdater {
         return res;
     }
 
-    public Boolean delete(final String id) throws IOException {
+    public Boolean delete(final String id, final Boolean removeInfo) throws IOException {
         final BundleInfo deleted = this.getBundleInfo(id);
+        if (deleted.isBuiltin() || this.getCurrentBundleId() == id) {
+            Log.e(TAG, "Cannot delete " + id);
+            return false;
+        }
         final File bundle = new File(this.documentsDir, bundleDirectory + "/" + id);
         if (bundle.exists()) {
             this.deleteDirectory(bundle);
-            this.removeBundleInfo(id);
+            if (removeInfo) {
+                this.removeBundleInfo(id);
+            }
             return true;
         }
         Log.e(TAG, "Directory not removed: " + bundle.getPath());
-        this.sendStats("delete", deleted);
+        this.sendStats("delete", deleted.getVersionName());
         return false;
     }
 
+    public Boolean delete(final String id) throws IOException {
+        return this.delete(id, true);
+    }
+
     private File getBundleDirectory(final String id) {
         return new File(this.documentsDir, bundleDirectory + "/" + id);
     }
 
-    private boolean bundleExists(final File bundle) {
+    private boolean bundleExists(final String id) {
+        final File bundle = this.getBundleDirectory(id);
         if(bundle == null || !bundle.exists()) {
             return false;
         }
-
         return new File(bundle.getPath(), "/index.html").exists();
     }
 
@@ -276,40 +299,56 @@ public class CapacitorUpdater {
     }
 
     public Boolean set(final String id) {
-
-        final BundleInfo existing = this.getBundleInfo(id);
+        final BundleInfo newBundle = this.getBundleInfo(id);
+        if(newBundle.isBuiltin()) {
+            this.reset();
+            return true;
+        }
         final File bundle = this.getBundleDirectory(id);
-
-        Log.i(TAG, "Setting next active bundle: " + existing);
-        if (this.bundleExists(bundle)) {
+        Log.i(TAG, "Setting next active bundle: " + id);
+        if (this.bundleExists(id)) {
             this.setCurrentBundle(bundle);
             this.setBundleStatus(id, BundleStatus.PENDING);
-            this.sendStats("set", existing);
+            this.sendStats("set", newBundle.getVersionName());
             return true;
         }
-        this.sendStats("set_fail", existing);
+        this.sendStats("set_fail", newBundle.getVersionName());
         return false;
     }
 
-    public void commit(final BundleInfo bundle) {
-        this.setBundleStatus(bundle.getId(), BundleStatus.SUCCESS);
-        this.setFallbackVersion(bundle);
-    }
-
     public void reset() {
         this.reset(false);
     }
 
-    public void rollback(final BundleInfo bundle) {
+    public void setSuccess(final BundleInfo bundle, Boolean autoDeletePrevious) {
+        this.setBundleStatus(bundle.getId(), BundleStatus.SUCCESS);
+        final BundleInfo fallback = this.getFallbackBundle();
+        Log.d(CapacitorUpdater.TAG, "Fallback bundle is: " + fallback);
+        Log.i(CapacitorUpdater.TAG, "Version successfully loaded: " + bundle.getVersionName());
+        if(autoDeletePrevious && !fallback.isBuiltin()) {
+            try {
+                final Boolean res = this.delete(fallback.getId());
+                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);
+            }
+        }
+        this.setFallbackBundle(bundle);
+    }
+
+    public void setError(final BundleInfo bundle) {
         this.setBundleStatus(bundle.getId(), BundleStatus.ERROR);
     }
 
     public void reset(final boolean internal) {
+        Log.d(CapacitorUpdater.TAG, "reset: " + internal);
         this.setCurrentBundle(new File("public"));
-        this.setFallbackVersion(null);
-        this.setNextVersion(null);
+        this.setFallbackBundle(null);
+        this.setNextBundle(null);
         if(!internal) {
-            this.sendStats("reset", this.getCurrentBundle());
+            this.sendStats("reset", this.getCurrentBundle().getVersionName());
         }
     }
 
@@ -332,6 +371,7 @@ public class CapacitorUpdater {
             json.put("version_name", version);
             json.put("plugin_version", pluginVersion);
 
+            Log.e(CapacitorUpdater.TAG, "Auto-update parameters: " + json.toString());
             // Building a request
             JsonObjectRequest request = new JsonObjectRequest(
                     Request.Method.POST,
@@ -356,7 +396,7 @@ public class CapacitorUpdater {
         }
     }
 
-    public void sendStats(final String action, final BundleInfo bundle) {
+    public void sendStats(final String action, final String versionName) {
         String statsUrl = this.statsUrl;
         if (statsUrl == null || "".equals(statsUrl) || statsUrl.length() == 0) { return; }
         try {
@@ -367,7 +407,7 @@ public class CapacitorUpdater {
             json.put("version_build", this.versionBuild);
             json.put("version_code", this.versionCode);
             json.put("version_os", this.versionOs);
-            json.put("version_name", bundle.getVersionName());
+            json.put("version_name", versionName);
             json.put("plugin_version", pluginVersion);
             json.put("action", action);
 
@@ -379,13 +419,13 @@ public class CapacitorUpdater {
                     new Response.Listener<JSONObject>() {
                         @Override
                         public void onResponse(JSONObject response) {
-                            Log.i(TAG, "Stats send for \"" + action + "\", version " + bundle.getVersionName());
+                            Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName);
                         }
                     },
                     new Response.ErrorListener(){
                         @Override
                         public void onErrorResponse(VolleyError error) {
-                            Log.i(TAG, "Stats send for \"" + action + "\", version " + bundle.getVersionName());
+                            Log.i(TAG, "Stats send for \"" + action + "\", version " + versionName);
                         }
                     });
             this.requestQueue.add(request);
@@ -395,25 +435,28 @@ public class CapacitorUpdater {
         }
     }
 
-    public BundleInfo getBundleInfo(String id) {
-        if(id == null) {
-            id = BundleInfo.VERSION_UNKNOWN;
+    public BundleInfo getBundleInfo(final String id) {
+        String trueId = BundleInfo.VERSION_UNKNOWN;
+        if(id != null) {
+            trueId = id;
         }
-        Log.d(TAG, "Getting info for bundle [" + id + "]");
+        Log.d(TAG, "Getting info for bundle [" + trueId + "]");
         BundleInfo result;
-        if(BundleInfo.ID_BUILTIN.equals(id)) {
-            result = new BundleInfo(id, (String) null, BundleStatus.SUCCESS, "");
+        if(BundleInfo.ID_BUILTIN.equals(trueId)) {
+            result = new BundleInfo(trueId, (String) null, BundleStatus.SUCCESS, "", "");
+        } else if(BundleInfo.VERSION_UNKNOWN.equals(trueId)) {
+            result = new BundleInfo(trueId, (String) null, BundleStatus.ERROR, "", "");
         } else {
             try {
-                String stored = this.prefs.getString(id + INFO_SUFFIX, "");
+                String stored = this.prefs.getString(trueId + INFO_SUFFIX, "");
                 result = BundleInfo.fromJSON(stored);
             } catch (JSONException e) {
-                Log.e(TAG, "Failed to parse info for bundle [" + id + "] ", e);
-                result = new BundleInfo(id, (String) null, BundleStatus.PENDING, "");
+                Log.e(TAG, "Failed to parse info for bundle [" + trueId + "] ", e);
+                result = new BundleInfo(trueId, (String) null, BundleStatus.PENDING, "", "");
             }
         }
 
-        Log.d(TAG, "Returning info [" + id + "] " + result);
+        Log.d(TAG, "Returning info [" + trueId + "] " + result);
         return result;
     }
 
@@ -489,37 +532,33 @@ public class CapacitorUpdater {
         return this.getCurrentBundlePath().equals("public");
     }
 
-    public BundleInfo getFallbackVersion() {
+    public BundleInfo getFallbackBundle() {
         final String id = this.prefs.getString(FALLBACK_VERSION, BundleInfo.ID_BUILTIN);
         return this.getBundleInfo(id);
     }
 
-    private void setFallbackVersion(final BundleInfo fallback) {
+    private void setFallbackBundle(final BundleInfo fallback) {
         this.editor.putString(FALLBACK_VERSION,
                 fallback == null
                         ? BundleInfo.ID_BUILTIN
                         : fallback.getId()
         );
+        this.editor.commit();
     }
 
-    public BundleInfo getNextVersion() {
-        final String id = this.prefs.getString(NEXT_VERSION, "");
-        if(id != "") {
-            return this.getBundleInfo(id);
-        } else {
-            return null;
-        }
+    public BundleInfo getNextBundle() {
+        final String id = this.prefs.getString(NEXT_VERSION, null);
+        return this.getBundleInfo(id);
     }
 
-    public boolean setNextVersion(final String next) {
+    public boolean setNextBundle(final String next) {
         if (next == null) {
             this.editor.remove(NEXT_VERSION);
         } else {
-            final File bundle = this.getBundleDirectory(next);
-            if (!this.bundleExists(bundle)) {
+            final BundleInfo newBundle = this.getBundleInfo(next);
+            if (!newBundle.isBuiltin() && !this.bundleExists(next)) {
                 return false;
             }
-
             this.editor.putString(NEXT_VERSION, next);
             this.setBundleStatus(next, BundleStatus.PENDING);
         }