@capgo/capacitor-updater 5.31.0 → 5.34.0

package/README.md

@@ -66,6 +66,14 @@ The most complete [documentation here](https://capgo.app/docs/).
 ## Community
 Join the [discord](https://discord.gg/VnYRvBfgA6) to get help.
 
+## Migration to v7.34
+
+- **Channel storage change**: `setChannel()` now stores channel assignments locally on the device instead of in the cloud. This provides better offline support and reduces backend load.
+  - Channel assignments persist between app restarts
+  - Use `unsetChannel()` to clear the local assignment and revert to `defaultChannel`
+  - Old devices (< v7.34.0) will continue using cloud-based storage
+- **New event**: Listen to the `channelPrivate` event to handle cases where a user tries to assign themselves to a private channel (one that doesn't allow self-assignment). See example in the `setChannel()` documentation above.
+
 ## Migration to v7
 
 - `privateKey` is not available anymore, it was used for the old encryption method. to migrate follow this guide : [https://capgo.app/docs/plugin/cloud-mode/getting-started/](https://capgo.app/docs/cli/migrations/encryption/)
@@ -271,6 +279,7 @@ CapacitorUpdater can be configured with these options:
 | **`allowManualBundleError`**  | <code>boolean</code>                                          | Allow marking bundles as errored from JavaScript while using manual update flows. When enabled, {@link CapacitorUpdaterPlugin.setBundleError} can change a bundle status to `error`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | <code>false</code>                                                            | 7.20.0  |
 | **`persistCustomId`**         | <code>boolean</code>                                          | Persist the customId set through {@link CapacitorUpdaterPlugin.setCustomId} across app restarts. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | <code>false (will be true by default in a future major release v8.x.x)</code> | 7.17.3  |
 | **`persistModifyUrl`**        | <code>boolean</code>                                          | Persist the updateUrl, statsUrl and channelUrl set through {@link CapacitorUpdaterPlugin.setUpdateUrl}, {@link CapacitorUpdaterPlugin.setStatsUrl} and {@link CapacitorUpdaterPlugin.setChannelUrl} across app restarts. Only available for Android and iOS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | <code>false</code>                                                            | 7.20.0  |
+| **`allowSetDefaultChannel`**  | <code>boolean</code>                                          | Allow or disallow the {@link CapacitorUpdaterPlugin.setChannel} method to modify the defaultChannel. When set to `false`, calling `setChannel()` will return an error with code `disabled_by_config`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | <code>true</code>                                                             | 7.34.0  |
 | **`defaultChannel`**          | <code>string</code>                                           | Set the default channel for the app in the config. Case sensitive. This will setting will override the default channel set in the cloud, but will still respect overrides made in the cloud. This requires the channel to allow devices to self dissociate/associate in the channel settings. https://capgo.app/docs/public-api/channels/#channel-configuration-options                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | <code>undefined</code>                                                        | 5.5.0   |
 | **`appId`**                   | <code>string</code>                                           | Configure the app id for the app in the config.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | <code>undefined</code>                                                        | 6.0.0   |
 | **`keepUrlPathAfterReload`**  | <code>boolean</code>                                          | Configure the plugin to keep the URL path after a reload. WARNING: When a reload is triggered, 'window.history' will be cleared.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | <code>false</code>                                                            | 6.8.0   |
@@ -313,6 +322,7 @@ In `capacitor.config.json`:
       "allowManualBundleError": undefined,
       "persistCustomId": undefined,
       "persistModifyUrl": undefined,
+      "allowSetDefaultChannel": undefined,
       "defaultChannel": undefined,
       "appId": undefined,
       "keepUrlPathAfterReload": undefined,
@@ -361,6 +371,7 @@ const config: CapacitorConfig = {
       allowManualBundleError: undefined,
       persistCustomId: undefined,
       persistModifyUrl: undefined,
+      allowSetDefaultChannel: undefined,
       defaultChannel: undefined,
       appId: undefined,
       keepUrlPathAfterReload: undefined,
@@ -416,6 +427,7 @@ export default config;
 * [`addListener('downloadFailed', ...)`](#addlistenerdownloadfailed-)
 * [`addListener('appReloaded', ...)`](#addlistenerappreloaded-)
 * [`addListener('appReady', ...)`](#addlistenerappready-)
+* [`addListener('channelPrivate', ...)`](#addlistenerchannelprivate-)
 * [`isAutoUpdateAvailable()`](#isautoupdateavailable)
 * [`getNextBundle()`](#getnextbundle)
 * [`getFailedUpdate()`](#getfailedupdate)
@@ -863,6 +875,34 @@ After receiving the latest version info, you can:
 2. Download it using {@link download}
 3. Apply it using {@link next} or {@link set}
 
+**Important: Error handling for "no new version available"**
+
+When the device's current version matches the latest version on the server (i.e., the device is already
+up-to-date), the server returns a 200 response with `error: "no_new_version_available"` and
+`message: "No new version available"`. **This causes `getLatest()` to throw an error**, even though
+this is a normal, expected condition.
+
+You should catch this specific error to handle it gracefully:
+
+```typescript
+try {
+  const latest = await CapacitorUpdater.getLatest();
+  // New version is available, proceed with download
+} catch (error) {
+  if (error.message === 'No new version available') {
+    // Device is already on the latest version - this is normal
+    console.log('Already up to date');
+  } else {
+    // Actual error occurred
+    console.error('Failed to check for updates:', error);
+  }
+}
+```
+
+In this scenario, the server:
+- Logs the request with a "No new version available" message
+- Sends a "noNew" stat action to track that the device checked for updates but was already current (done on the backend)
+
 | Param         | Type                                                          | Description                                                                                          |
 | ------------- | ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
 | **`options`** | <code><a href="#getlatestoptions">GetLatestOptions</a></code> | Optional {@link <a href="#getlatestoptions">GetLatestOptions</a>} to specify which channel to check. |
@@ -898,6 +938,19 @@ Channels allow you to distribute different bundle versions to different groups o
 - At app boot/initialization - use {@link PluginsConfig.CapacitorUpdater.defaultChannel} config instead
 - Before user interaction
 
+**Important: Listen for the `channelPrivate` event**
+
+When a user attempts to set a channel that doesn't allow device self-assignment, the method will
+throw an error AND fire a {@link addListener}('channelPrivate') event. You should listen to this event
+to provide appropriate feedback to users:
+
+```typescript
+CapacitorUpdater.addListener('channelPrivate', (data) =&gt; {
+  console.warn(`Cannot access channel "${data.channel}": ${data.message}`);
+  // Show user-friendly message
+});
+```
+
 This sends a request to the Capgo backend linking your device ID to the specified channel.
 
 | Param         | Type                                                            | Description                                                                                                                  |
@@ -1362,6 +1415,31 @@ Listen for app ready event in the App, let you know when app is ready to use, th
 --------------------
 
 
+#### addListener('channelPrivate', ...)
+
+```typescript
+addListener(eventName: 'channelPrivate', listenerFunc: (state: ChannelPrivateEvent) => void) => Promise<PluginListenerHandle>
+```
+
+Listen for channel private event, fired when attempting to set a channel that doesn't allow device self-assignment.
+
+This event is useful for:
+- Informing users they don't have permission to switch to a specific channel
+- Implementing custom error handling for channel restrictions
+- Logging unauthorized channel access attempts
+
+| Param              | Type                                                                                    |
+| ------------------ | --------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'channelPrivate'</code>                                                           |
+| **`listenerFunc`** | <code>(state: <a href="#channelprivateevent">ChannelPrivateEvent</a>) =&gt; void</code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+**Since:** 7.34.0
+
+--------------------
+
+
 #### isAutoUpdateAvailable()
 
 ```typescript
@@ -1678,18 +1756,18 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 
 ##### LatestVersion
 
-| Prop             | Type                         | Description                                                          | Since  |
-| ---------------- | ---------------------------- | -------------------------------------------------------------------- | ------ |
-| **`version`**    | <code>string</code>          | Result of getLatest method                                           | 4.0.0  |
-| **`checksum`**   | <code>string</code>          |                                                                      | 6      |
-| **`breaking`**   | <code>boolean</code>         | Indicates whether the update was flagged as breaking by the backend. | 7.22.0 |
-| **`major`**      | <code>boolean</code>         |                                                                      |        |
-| **`message`**    | <code>string</code>          |                                                                      |        |
-| **`sessionKey`** | <code>string</code>          |                                                                      |        |
-| **`error`**      | <code>string</code>          |                                                                      |        |
-| **`old`**        | <code>string</code>          |                                                                      |        |
-| **`url`**        | <code>string</code>          |                                                                      |        |
-| **`manifest`**   | <code>ManifestEntry[]</code> |                                                                      | 6.1    |
+| Prop             | Type                         | Description                                                                                                                                                                                                   | Since  |
+| ---------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
+| **`version`**    | <code>string</code>          | Result of getLatest method                                                                                                                                                                                    | 4.0.0  |
+| **`checksum`**   | <code>string</code>          |                                                                                                                                                                                                               | 6      |
+| **`breaking`**   | <code>boolean</code>         | Indicates whether the update was flagged as breaking by the backend.                                                                                                                                          | 7.22.0 |
+| **`major`**      | <code>boolean</code>         |                                                                                                                                                                                                               |        |
+| **`message`**    | <code>string</code>          | Optional message from the server. When no new version is available, this will be "No new version available".                                                                                                  |        |
+| **`sessionKey`** | <code>string</code>          |                                                                                                                                                                                                               |        |
+| **`error`**      | <code>string</code>          | Error code from the server, if any. Common values: - `"no_new_version_available"`: Device is already on the latest version (not a failure) - Other error codes indicate actual failures in the update process |        |
+| **`old`**        | <code>string</code>          | The previous/current version name (provided for reference).                                                                                                                                                   |        |
+| **`url`**        | <code>string</code>          | Download URL for the bundle (when a new version is available).                                                                                                                                                |        |
+| **`manifest`**   | <code>ManifestEntry[]</code> | File list for partial updates (when using multi-file downloads).                                                                                                                                              | 6.1    |
 
 
 ##### GetLatestOptions
@@ -1851,6 +1929,14 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 | **`status`** | <code>string</code>                               |                                       |       |
 
 
+##### ChannelPrivateEvent
+
+| Prop          | Type                | Description                                                                         | Since  |
+| ------------- | ------------------- | ----------------------------------------------------------------------------------- | ------ |
+| **`channel`** | <code>string</code> | Emitted when attempting to set a channel that doesn't allow device self-assignment. | 7.34.0 |
+| **`message`** | <code>string</code> |                                                                                     |        |
+
+
 ##### AutoUpdateAvailable
 
 | Prop            | Type                 |

package/android/build.gradle

@@ -49,16 +49,16 @@ repositories {
 
 
 dependencies {
-    def work_version = "2.11.0"
+    def work_version = "2.10.5"
     implementation "androidx.work:work-runtime:$work_version"
     implementation "com.google.android.gms:play-services-tasks:18.4.0"
-    implementation "com.google.guava:guava:33.4.8-android"
+    implementation "com.google.guava:guava:33.5.0-android"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
     testImplementation "junit:junit:$junitVersion"
-    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.mockito:mockito-core:5.20.0'
     testImplementation 'org.json:json:20250517'
     testImplementation 'org.robolectric:robolectric:4.13'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

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

@@ -68,6 +68,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String UPDATE_URL_PREF_KEY = "CapacitorUpdater.updateUrl";
     private static final String STATS_URL_PREF_KEY = "CapacitorUpdater.statsUrl";
     private static final String CHANNEL_URL_PREF_KEY = "CapacitorUpdater.channelUrl";
+    private static final String DEFAULT_CHANNEL_PREF_KEY = "CapacitorUpdater.defaultChannel";
     private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
     private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
@@ -100,6 +101,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private Boolean onLaunchDirectUpdateUsed = false;
     Boolean shakeMenuEnabled = false;
     private Boolean allowManualBundleError = false;
+    private Boolean allowSetDefaultChannel = true;
 
     private Boolean isPreviousMainActivity = true;
 
@@ -301,6 +303,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         this.persistCustomId = this.getConfig().getBoolean("persistCustomId", false);
         this.persistModifyUrl = this.getConfig().getBoolean("persistModifyUrl", false);
+        this.allowSetDefaultChannel = this.getConfig().getBoolean("allowSetDefaultChannel", true);
         this.implementation.publicKey = this.getConfig().getString("publicKey", "");
         this.implementation.statsUrl = this.getConfig().getString("statsUrl", statsUrlDefault);
         this.implementation.channelUrl = this.getConfig().getString("channelUrl", channelUrlDefault);
@@ -320,8 +323,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 }
             }
         }
+
+        // Load defaultChannel: first try from persistent storage (set via setChannel), then fall back to config
+        if (this.prefs.contains(DEFAULT_CHANNEL_PREF_KEY)) {
+            final String storedDefaultChannel = this.prefs.getString(DEFAULT_CHANNEL_PREF_KEY, "");
+            if (storedDefaultChannel != null && !storedDefaultChannel.isEmpty()) {
+                this.implementation.defaultChannel = storedDefaultChannel;
+                logger.info("Loaded persisted defaultChannel from setChannel()");
+            } else {
+                this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
+            }
+        } else {
+            this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
+        }
+
         int userValue = this.getConfig().getInt("periodCheckDelay", 0);
-        this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
 
         if (userValue >= 0 && userValue <= 600) {
             this.periodCheckDelay = 600 * 1000;
@@ -863,27 +879,33 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         try {
             logger.info("unsetChannel triggerAutoUpdate: " + triggerAutoUpdate);
-            startNewThread(() ->
-                CapacitorUpdaterPlugin.this.implementation.unsetChannel((res) -> {
-                    JSObject jsRes = mapToJSObject(res);
-                    if (jsRes.has("error")) {
-                        String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
-                        String errorCode = jsRes.getString("error");
-
-                        JSObject errorObj = new JSObject();
-                        errorObj.put("message", errorMessage);
-                        errorObj.put("error", errorCode);
-
-                        call.reject(errorMessage, "UNSETCHANNEL_FAILED", null, errorObj);
-                    } else {
-                        if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
-                            logger.info("Calling autoupdater after channel change!");
-                            backgroundDownload();
+            startNewThread(() -> {
+                String configDefaultChannel = CapacitorUpdaterPlugin.this.getConfig().getString("defaultChannel", "");
+                CapacitorUpdaterPlugin.this.implementation.unsetChannel(
+                    CapacitorUpdaterPlugin.this.editor,
+                    DEFAULT_CHANNEL_PREF_KEY,
+                    configDefaultChannel,
+                    (res) -> {
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
+
+                            call.reject(errorMessage, "UNSETCHANNEL_FAILED", null, errorObj);
+                        } else {
+                            if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
+                                logger.info("Calling autoupdater after channel change!");
+                                backgroundDownload();
+                            }
+                            call.resolve(jsRes);
                         }
-                        call.resolve(jsRes);
                     }
-                })
-            );
+                );
+            });
         } catch (final Exception e) {
             logger.error("Failed to unsetChannel: " + e.getMessage());
             call.reject("Failed to unsetChannel: ", e);
@@ -906,25 +928,42 @@ public class CapacitorUpdaterPlugin extends Plugin {
         try {
             logger.info("setChannel " + channel + " triggerAutoUpdate: " + triggerAutoUpdate);
             startNewThread(() ->
-                CapacitorUpdaterPlugin.this.implementation.setChannel(channel, (res) -> {
-                    JSObject jsRes = mapToJSObject(res);
-                    if (jsRes.has("error")) {
-                        String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
-                        String errorCode = jsRes.getString("error");
+                CapacitorUpdaterPlugin.this.implementation.setChannel(
+                    channel,
+                    CapacitorUpdaterPlugin.this.editor,
+                    DEFAULT_CHANNEL_PREF_KEY,
+                    CapacitorUpdaterPlugin.this.allowSetDefaultChannel,
+                    (res) -> {
+                        JSObject jsRes = mapToJSObject(res);
+                        if (jsRes.has("error")) {
+                            String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
+                            String errorCode = jsRes.getString("error");
+
+                            // Fire channelPrivate event if channel doesn't allow self-assignment
+                            if (
+                                errorCode.contains("cannot_update_via_private_channel") ||
+                                errorCode.contains("channel_self_set_not_allowed")
+                            ) {
+                                JSObject eventData = new JSObject();
+                                eventData.put("channel", channel);
+                                eventData.put("message", errorMessage);
+                                notifyListeners("channelPrivate", eventData);
+                            }
 
-                        JSObject errorObj = new JSObject();
-                        errorObj.put("message", errorMessage);
-                        errorObj.put("error", errorCode);
+                            JSObject errorObj = new JSObject();
+                            errorObj.put("message", errorMessage);
+                            errorObj.put("error", errorCode);
 
-                        call.reject(errorMessage, "SETCHANNEL_FAILED", null, errorObj);
-                    } else {
-                        if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
-                            logger.info("Calling autoupdater after channel change!");
-                            backgroundDownload();
+                            call.reject(errorMessage, "SETCHANNEL_FAILED", null, errorObj);
+                        } else {
+                            if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
+                                logger.info("Calling autoupdater after channel change!");
+                                backgroundDownload();
+                            }
+                            call.resolve(jsRes);
                         }
-                        call.resolve(jsRes);
                     }
-                })
+                )
             );
         } catch (final Exception e) {
             logger.error("Failed to setChannel: " + channel + " " + e.getMessage());

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

@@ -403,6 +403,8 @@ public class CapgoUpdater {
                 } else {
                     checksum = CryptoCipher.calcChecksum(downloaded);
                 }
+                CryptoCipher.logChecksumInfo("Calculated checksum", checksum);
+                CryptoCipher.logChecksumInfo("Expected checksum", checksumDecrypted);
                 if ((!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) && !checksumDecrypted.equals(checksum)) {
                     logger.error("Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");
                     this.sendStats("checksum_fail");
@@ -966,115 +968,41 @@ public class CapgoUpdater {
         makeJsonRequest(updateUrl, json, callback);
     }
 
-    public void unsetChannel(final Callback callback) {
-        // Check if rate limit was exceeded
-        if (rateLimitExceeded) {
-            logger.debug("Skipping unsetChannel due to rate limit (429). Requests will resume after app restart.");
-            final Map<String, Object> retError = new HashMap<>();
-            retError.put("message", "Rate limit exceeded");
-            retError.put("error", "rate_limit_exceeded");
-            callback.callback(retError);
-            return;
-        }
+    public void unsetChannel(
+        final SharedPreferences.Editor editor,
+        final String defaultChannelKey,
+        final String configDefaultChannel,
+        final Callback callback
+    ) {
+        // Clear persisted defaultChannel and revert to config value
+        editor.remove(defaultChannelKey);
+        editor.apply();
+        this.defaultChannel = configDefaultChannel;
+        logger.info("Persisted defaultChannel cleared, reverted to config value: " + configDefaultChannel);
+
+        Map<String, Object> ret = new HashMap<>();
+        ret.put("status", "ok");
+        ret.put("message", "Channel override removed");
+        callback.callback(ret);
+    }
 
-        String channelUrl = this.channelUrl;
-        if (channelUrl == null || channelUrl.isEmpty()) {
-            logger.error("Channel URL is not set");
-            final Map<String, Object> retError = new HashMap<>();
-            retError.put("message", "channelUrl missing");
-            retError.put("error", "missing_config");
-            callback.callback(retError);
-            return;
-        }
-        JSONObject json;
-        try {
-            json = this.createInfoObject();
-        } catch (JSONException e) {
-            logger.error("Error unsetChannel JSONException " + e.getMessage());
+    public void setChannel(
+        final String channel,
+        final SharedPreferences.Editor editor,
+        final String defaultChannelKey,
+        final boolean allowSetDefaultChannel,
+        final Callback callback
+    ) {
+        // Check if setting defaultChannel is allowed
+        if (!allowSetDefaultChannel) {
+            logger.error("setChannel is disabled by allowSetDefaultChannel config");
             final Map<String, Object> retError = new HashMap<>();
-            retError.put("message", "Cannot get info: " + e);
-            retError.put("error", "json_error");
+            retError.put("message", "setChannel is disabled by configuration");
+            retError.put("error", "disabled_by_config");
             callback.callback(retError);
             return;
         }
 
-        Request request = new Request.Builder()
-            .url(channelUrl)
-            .delete(RequestBody.create(json.toString(), MediaType.get("application/json")))
-            .build();
-
-        DownloadService.sharedClient
-            .newCall(request)
-            .enqueue(
-                new okhttp3.Callback() {
-                    @Override
-                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        Map<String, Object> retError = new HashMap<>();
-                        retError.put("message", "Request failed: " + e.getMessage());
-                        retError.put("error", "network_error");
-                        callback.callback(retError);
-                    }
-
-                    @Override
-                    public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
-                        try (ResponseBody responseBody = response.body()) {
-                            // Check for 429 rate limit
-                            if (checkAndHandleRateLimitResponse(response)) {
-                                Map<String, Object> retError = new HashMap<>();
-                                retError.put("message", "Rate limit exceeded");
-                                retError.put("error", "rate_limit_exceeded");
-                                callback.callback(retError);
-                                return;
-                            }
-
-                            if (!response.isSuccessful()) {
-                                Map<String, Object> retError = new HashMap<>();
-                                retError.put("message", "Server error: " + response.code());
-                                retError.put("error", "response_error");
-                                callback.callback(retError);
-                                return;
-                            }
-
-                            assert responseBody != null;
-                            String responseData = responseBody.string();
-                            JSONObject jsonResponse = new JSONObject(responseData);
-
-                            // Check for server-side errors first
-                            if (jsonResponse.has("error")) {
-                                Map<String, Object> retError = new HashMap<>();
-                                retError.put("error", jsonResponse.getString("error"));
-                                if (jsonResponse.has("message")) {
-                                    retError.put("message", jsonResponse.getString("message"));
-                                } else {
-                                    retError.put("message", "server did not provide a message");
-                                }
-                                callback.callback(retError);
-                                return;
-                            }
-
-                            Map<String, Object> ret = new HashMap<>();
-
-                            Iterator<String> keys = jsonResponse.keys();
-                            while (keys.hasNext()) {
-                                String key = keys.next();
-                                if (jsonResponse.has(key)) {
-                                    ret.put(key, jsonResponse.get(key));
-                                }
-                            }
-                            logger.info("Channel unset");
-                            callback.callback(ret);
-                        } catch (JSONException e) {
-                            Map<String, Object> retError = new HashMap<>();
-                            retError.put("message", "JSON parse error: " + e.getMessage());
-                            retError.put("error", "parse_error");
-                            callback.callback(retError);
-                        }
-                    }
-                }
-            );
-    }
-
-    public void setChannel(final String channel, final Callback callback) {
         // Check if rate limit was exceeded
         if (rateLimitExceeded) {
             logger.debug("Skipping setChannel due to rate limit (429). Requests will resume after app restart.");
@@ -1107,7 +1035,18 @@ public class CapgoUpdater {
             return;
         }
 
-        makeJsonRequest(channelUrl, json, callback);
+        makeJsonRequest(channelUrl, json, (res) -> {
+            if (res.containsKey("error")) {
+                callback.callback(res);
+            } else {
+                // Success - persist defaultChannel
+                this.defaultChannel = channel;
+                editor.putString(defaultChannelKey, channel);
+                editor.apply();
+                logger.info("defaultChannel persisted locally: " + channel);
+                callback.callback(res);
+            }
+        });
     }
 
     public void getChannel(final Callback callback) {