@capgo/capacitor-updater 6.30.0 → 6.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/README.md +100 -12
  2. package/android/build.gradle +3 -3
  3. package/android/src/main/java/ee/forgr/capacitor_updater/BundleInfo.java +60 -8
  4. package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java +76 -38
  5. package/android/src/main/java/ee/forgr/capacitor_updater/CapgoUpdater.java +49 -112
  6. package/android/src/main/java/ee/forgr/capacitor_updater/{CryptoCipherV2.java → CryptoCipher.java} +80 -8
  7. package/android/src/main/java/ee/forgr/capacitor_updater/DownloadService.java +86 -75
  8. package/dist/docs.json +105 -8
  9. package/dist/esm/definitions.d.ts +97 -1
  10. package/dist/esm/definitions.js.map +1 -1
  11. package/ios/Sources/CapacitorUpdaterPlugin/BundleInfo.swift +37 -10
  12. package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift +33 -13
  13. package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift +80 -89
  14. package/ios/Sources/CapacitorUpdaterPlugin/{CryptoCipherV2.swift → CryptoCipher.swift} +49 -3
  15. package/ios/Sources/CapacitorUpdaterPlugin/InternalUtils.swift +4 -0
  16. package/package.json +2 -1
  17. package/android/src/main/java/ee/forgr/capacitor_updater/CryptoCipherV1.java +0 -222
  18. package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipherV1.swift +0 -245
package/README.md CHANGED
@@ -66,6 +66,14 @@ The most complete [documentation here](https://capgo.app/docs/).
66
66
  ## Community
67
67
  Join the [discord](https://discord.gg/VnYRvBfgA6) to get help.
68
68
 
69
+ ## Migration to v7.34
70
+
71
+ - **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.
72
+ - Channel assignments persist between app restarts
73
+ - Use `unsetChannel()` to clear the local assignment and revert to `defaultChannel`
74
+ - Old devices (< v7.34.0) will continue using cloud-based storage
75
+ - **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.
76
+
69
77
  ## Migration to v7
70
78
 
71
79
  - `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/)
@@ -272,6 +280,7 @@ CapacitorUpdater can be configured with these options:
272
280
  | **`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 |
273
281
  | **`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 |
274
282
  | **`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 |
283
+ | **`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 |
275
284
  | **`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 |
276
285
  | **`appId`** | <code>string</code> | Configure the app id for the app in the config. | <code>undefined</code> | 6.0.0 |
277
286
  | **`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 |
@@ -315,6 +324,7 @@ In `capacitor.config.json`:
315
324
  "allowManualBundleError": undefined,
316
325
  "persistCustomId": undefined,
317
326
  "persistModifyUrl": undefined,
327
+ "allowSetDefaultChannel": undefined,
318
328
  "defaultChannel": undefined,
319
329
  "appId": undefined,
320
330
  "keepUrlPathAfterReload": undefined,
@@ -364,6 +374,7 @@ const config: CapacitorConfig = {
364
374
  allowManualBundleError: undefined,
365
375
  persistCustomId: undefined,
366
376
  persistModifyUrl: undefined,
377
+ allowSetDefaultChannel: undefined,
367
378
  defaultChannel: undefined,
368
379
  appId: undefined,
369
380
  keepUrlPathAfterReload: undefined,
@@ -419,6 +430,7 @@ export default config;
419
430
  * [`addListener('downloadFailed', ...)`](#addlistenerdownloadfailed-)
420
431
  * [`addListener('appReloaded', ...)`](#addlistenerappreloaded-)
421
432
  * [`addListener('appReady', ...)`](#addlistenerappready-)
433
+ * [`addListener('channelPrivate', ...)`](#addlistenerchannelprivate-)
422
434
  * [`isAutoUpdateAvailable()`](#isautoupdateavailable)
423
435
  * [`getNextBundle()`](#getnextbundle)
424
436
  * [`getFailedUpdate()`](#getfailedupdate)
@@ -866,6 +878,34 @@ After receiving the latest version info, you can:
866
878
  2. Download it using {@link download}
867
879
  3. Apply it using {@link next} or {@link set}
868
880
 
881
+ **Important: Error handling for "no new version available"**
882
+
883
+ When the device's current version matches the latest version on the server (i.e., the device is already
884
+ up-to-date), the server returns a 200 response with `error: "no_new_version_available"` and
885
+ `message: "No new version available"`. **This causes `getLatest()` to throw an error**, even though
886
+ this is a normal, expected condition.
887
+
888
+ You should catch this specific error to handle it gracefully:
889
+
890
+ ```typescript
891
+ try {
892
+ const latest = await CapacitorUpdater.getLatest();
893
+ // New version is available, proceed with download
894
+ } catch (error) {
895
+ if (error.message === 'No new version available') {
896
+ // Device is already on the latest version - this is normal
897
+ console.log('Already up to date');
898
+ } else {
899
+ // Actual error occurred
900
+ console.error('Failed to check for updates:', error);
901
+ }
902
+ }
903
+ ```
904
+
905
+ In this scenario, the server:
906
+ - Logs the request with a "No new version available" message
907
+ - Sends a "noNew" stat action to track that the device checked for updates but was already current (done on the backend)
908
+
869
909
  | Param | Type | Description |
870
910
  | ------------- | ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
871
911
  | **`options`** | <code><a href="#getlatestoptions">GetLatestOptions</a></code> | Optional {@link <a href="#getlatestoptions">GetLatestOptions</a>} to specify which channel to check. |
@@ -901,6 +941,19 @@ Channels allow you to distribute different bundle versions to different groups o
901
941
  - At app boot/initialization - use {@link PluginsConfig.CapacitorUpdater.defaultChannel} config instead
902
942
  - Before user interaction
903
943
 
944
+ **Important: Listen for the `channelPrivate` event**
945
+
946
+ When a user attempts to set a channel that doesn't allow device self-assignment, the method will
947
+ throw an error AND fire a {@link addListener}('channelPrivate') event. You should listen to this event
948
+ to provide appropriate feedback to users:
949
+
950
+ ```typescript
951
+ CapacitorUpdater.addListener('channelPrivate', (data) =&gt; {
952
+ console.warn(`Cannot access channel "${data.channel}": ${data.message}`);
953
+ // Show user-friendly message
954
+ });
955
+ ```
956
+
904
957
  This sends a request to the Capgo backend linking your device ID to the specified channel.
905
958
 
906
959
  | Param | Type | Description |
@@ -1365,6 +1418,31 @@ Listen for app ready event in the App, let you know when app is ready to use, th
1365
1418
  --------------------
1366
1419
 
1367
1420
 
1421
+ #### addListener('channelPrivate', ...)
1422
+
1423
+ ```typescript
1424
+ addListener(eventName: 'channelPrivate', listenerFunc: (state: ChannelPrivateEvent) => void) => Promise<PluginListenerHandle>
1425
+ ```
1426
+
1427
+ Listen for channel private event, fired when attempting to set a channel that doesn't allow device self-assignment.
1428
+
1429
+ This event is useful for:
1430
+ - Informing users they don't have permission to switch to a specific channel
1431
+ - Implementing custom error handling for channel restrictions
1432
+ - Logging unauthorized channel access attempts
1433
+
1434
+ | Param | Type |
1435
+ | ------------------ | --------------------------------------------------------------------------------------- |
1436
+ | **`eventName`** | <code>'channelPrivate'</code> |
1437
+ | **`listenerFunc`** | <code>(state: <a href="#channelprivateevent">ChannelPrivateEvent</a>) =&gt; void</code> |
1438
+
1439
+ **Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
1440
+
1441
+ **Since:** 7.34.0
1442
+
1443
+ --------------------
1444
+
1445
+
1368
1446
  #### isAutoUpdateAvailable()
1369
1447
 
1370
1448
  ```typescript
@@ -1681,18 +1759,20 @@ If you don't use backend, you need to provide the URL and version of the bundle.
1681
1759
 
1682
1760
  ##### LatestVersion
1683
1761
 
1684
- | Prop | Type | Description | Since |
1685
- | ---------------- | ---------------------------- | -------------------------------------------------------------------- | ------ |
1686
- | **`version`** | <code>string</code> | Result of getLatest method | 4.0.0 |
1687
- | **`checksum`** | <code>string</code> | | 6 |
1688
- | **`breaking`** | <code>boolean</code> | Indicates whether the update was flagged as breaking by the backend. | 7.22.0 |
1689
- | **`major`** | <code>boolean</code> | | |
1690
- | **`message`** | <code>string</code> | | |
1691
- | **`sessionKey`** | <code>string</code> | | |
1692
- | **`error`** | <code>string</code> | | |
1693
- | **`old`** | <code>string</code> | | |
1694
- | **`url`** | <code>string</code> | | |
1695
- | **`manifest`** | <code>ManifestEntry[]</code> | | 6.1 |
1762
+ | Prop | Type | Description | Since |
1763
+ | ---------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
1764
+ | **`version`** | <code>string</code> | Result of getLatest method | 4.0.0 |
1765
+ | **`checksum`** | <code>string</code> | | 6 |
1766
+ | **`breaking`** | <code>boolean</code> | Indicates whether the update was flagged as breaking by the backend. | 7.22.0 |
1767
+ | **`major`** | <code>boolean</code> | | |
1768
+ | **`message`** | <code>string</code> | Optional message from the server. When no new version is available, this will be "No new version available". | |
1769
+ | **`sessionKey`** | <code>string</code> | | |
1770
+ | **`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 | |
1771
+ | **`old`** | <code>string</code> | The previous/current version name (provided for reference). | |
1772
+ | **`url`** | <code>string</code> | Download URL for the bundle (when a new version is available). | |
1773
+ | **`manifest`** | <code>ManifestEntry[]</code> | File list for partial updates (when using multi-file downloads). | 6.1 |
1774
+ | **`link`** | <code>string</code> | Optional link associated with this bundle version (e.g., release notes URL, changelog, GitHub release). | 7.35.0 |
1775
+ | **`comment`** | <code>string</code> | Optional comment or description for this bundle version. | 7.35.0 |
1696
1776
 
1697
1777
 
1698
1778
  ##### GetLatestOptions
@@ -1854,6 +1934,14 @@ If you don't use backend, you need to provide the URL and version of the bundle.
1854
1934
  | **`status`** | <code>string</code> | | |
1855
1935
 
1856
1936
 
1937
+ ##### ChannelPrivateEvent
1938
+
1939
+ | Prop | Type | Description | Since |
1940
+ | ------------- | ------------------- | ----------------------------------------------------------------------------------- | ------ |
1941
+ | **`channel`** | <code>string</code> | Emitted when attempting to set a channel that doesn't allow device self-assignment. | 7.34.0 |
1942
+ | **`message`** | <code>string</code> | | |
1943
+
1944
+
1857
1945
  ##### AutoUpdateAvailable
1858
1946
 
1859
1947
  | Prop | Type |
package/android/build.gradle CHANGED
@@ -49,16 +49,16 @@ repositories {
49
49
 
50
50
 
51
51
  dependencies {
52
- def work_version = "2.11.0"
52
+ def work_version = "2.10.5"
53
53
  implementation "androidx.work:work-runtime:$work_version"
54
54
  implementation "com.google.android.gms:play-services-tasks:18.4.0"
55
- implementation "com.google.guava:guava:33.4.8-android"
55
+ implementation "com.google.guava:guava:33.5.0-android"
56
56
  implementation fileTree(dir: 'libs', include: ['*.jar'])
57
57
  implementation project(':capacitor-android')
58
58
  implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
59
59
  implementation 'io.github.g00fy2:versioncompare:1.5.0'
60
60
  testImplementation "junit:junit:$junitVersion"
61
- testImplementation 'org.mockito:mockito-core:5.14.2'
61
+ testImplementation 'org.mockito:mockito-core:5.20.0'
62
62
  testImplementation 'org.json:json:20250517'
63
63
  testImplementation 'org.robolectric:robolectric:4.13'
64
64
  androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
package/android/src/main/java/ee/forgr/capacitor_updater/BundleInfo.java CHANGED
@@ -29,25 +29,53 @@ public class BundleInfo {
29
29
  private final String version;
30
30
  private final String checksum;
31
31
  private final BundleStatus status;
32
+ private final String link;
33
+ private final String comment;
32
34
 
33
35
  static {
34
36
  sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
35
37
  }
36
38
 
37
39
  public BundleInfo(final BundleInfo source) {
38
- this(source.id, source.version, source.status, source.downloaded, source.checksum);
40
+ this(source.id, source.version, source.status, source.downloaded, source.checksum, source.link, source.comment);
39
41
  }
40
42
 
41
43
  public BundleInfo(final String id, final String version, final BundleStatus status, final Date downloaded, final String checksum) {
42
- this(id, version, status, sdf.format(downloaded), checksum);
44
+ this(id, version, status, sdf.format(downloaded), checksum, null, null);
45
+ }
46
+
47
+ public BundleInfo(
48
+ final String id,
49
+ final String version,
50
+ final BundleStatus status,
51
+ final Date downloaded,
52
+ final String checksum,
53
+ final String link,
54
+ final String comment
55
+ ) {
56
+ this(id, version, status, sdf.format(downloaded), checksum, link, comment);
43
57
  }
44
58
 
45
59
  public BundleInfo(final String id, final String version, final BundleStatus status, final String downloaded, final String checksum) {
60
+ this(id, version, status, downloaded, checksum, null, null);
61
+ }
62
+
63
+ public BundleInfo(
64
+ final String id,
65
+ final String version,
66
+ final BundleStatus status,
67
+ final String downloaded,
68
+ final String checksum,
69
+ final String link,
70
+ final String comment
71
+ ) {
46
72
  this.downloaded = downloaded != null ? downloaded.trim() : "";
47
73
  this.id = id != null ? id : "";
48
74
  this.version = version;
49
75
  this.checksum = checksum != null ? checksum : "";
50
76
  this.status = status != null ? status : BundleStatus.ERROR;
77
+ this.link = link;
78
+ this.comment = comment;
51
79
  }
52
80
 
53
81
  public Boolean isBuiltin() {
@@ -75,7 +103,7 @@ public class BundleInfo {
75
103
  }
76
104
 
77
105
  public BundleInfo setDownloaded(Date downloaded) {
78
- return new BundleInfo(this.id, this.version, this.status, downloaded, this.checksum);
106
+ return new BundleInfo(this.id, this.version, this.status, downloaded, this.checksum, this.link, this.comment);
79
107
  }
80
108
 
81
109
  public String getChecksum() {
@@ -83,7 +111,7 @@ public class BundleInfo {
83
111
  }
84
112
 
85
113
  public BundleInfo setChecksum(String checksum) {
86
- return new BundleInfo(this.id, this.version, this.status, this.downloaded, checksum);
114
+ return new BundleInfo(this.id, this.version, this.status, this.downloaded, checksum, this.link, this.comment);
87
115
  }
88
116
 
89
117
  public String getId() {
@@ -91,7 +119,7 @@ public class BundleInfo {
91
119
  }
92
120
 
93
121
  public BundleInfo setId(String id) {
94
- return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum);
122
+ return new BundleInfo(id, this.version, this.status, this.downloaded, this.checksum, this.link, this.comment);
95
123
  }
96
124
 
97
125
  public String getVersionName() {
@@ -99,7 +127,7 @@ public class BundleInfo {
99
127
  }
100
128
 
101
129
  public BundleInfo setVersionName(String version) {
102
- return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum);
130
+ return new BundleInfo(this.id, version, this.status, this.downloaded, this.checksum, this.link, this.comment);
103
131
  }
104
132
 
105
133
  public BundleStatus getStatus() {
@@ -110,7 +138,23 @@ public class BundleInfo {
110
138
  }
111
139
 
112
140
  public BundleInfo setStatus(BundleStatus status) {
113
- return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum);
141
+ return new BundleInfo(this.id, this.version, status, this.downloaded, this.checksum, this.link, this.comment);
142
+ }
143
+
144
+ public String getLink() {
145
+ return this.link;
146
+ }
147
+
148
+ public BundleInfo setLink(String link) {
149
+ return new BundleInfo(this.id, this.version, this.status, this.downloaded, this.checksum, link, this.comment);
150
+ }
151
+
152
+ public String getComment() {
153
+ return this.comment;
154
+ }
155
+
156
+ public BundleInfo setComment(String comment) {
157
+ return new BundleInfo(this.id, this.version, this.status, this.downloaded, this.checksum, this.link, comment);
114
158
  }
115
159
 
116
160
  public static BundleInfo fromJSON(final String jsonString) throws JSONException {
@@ -120,7 +164,9 @@ public class BundleInfo {
120
164
  json.has("version") ? json.getString("version") : BundleInfo.VERSION_UNKNOWN,
121
165
  json.has("status") ? BundleStatus.fromString(json.getString("status")) : BundleStatus.PENDING,
122
166
  json.has("downloaded") ? json.getString("downloaded") : "",
123
- json.has("checksum") ? json.getString("checksum") : ""
167
+ json.has("checksum") ? json.getString("checksum") : "",
168
+ json.has("link") ? json.getString("link") : null,
169
+ json.has("comment") ? json.getString("comment") : null
124
170
  );
125
171
  }
126
172
 
@@ -131,6 +177,12 @@ public class BundleInfo {
131
177
  result.put("downloaded", this.getDownloaded());
132
178
  result.put("checksum", this.getChecksum());
133
179
  result.put("status", this.getStatus().toString());
180
+ if (this.link != null && !this.link.isEmpty()) {
181
+ result.put("link", this.link);
182
+ }
183
+ if (this.comment != null && !this.comment.isEmpty()) {
184
+ result.put("comment", this.comment);
185
+ }
134
186
  return result;
135
187
  }
136
188
 
package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java CHANGED
@@ -68,10 +68,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
68
68
  private static final String UPDATE_URL_PREF_KEY = "CapacitorUpdater.updateUrl";
69
69
  private static final String STATS_URL_PREF_KEY = "CapacitorUpdater.statsUrl";
70
70
  private static final String CHANNEL_URL_PREF_KEY = "CapacitorUpdater.channelUrl";
71
+ private static final String DEFAULT_CHANNEL_PREF_KEY = "CapacitorUpdater.defaultChannel";
71
72
  private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
72
73
  private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
73
74
 
74
- private final String pluginVersion = "6.27.11";
75
+ private final String pluginVersion = "6.35.0";
75
76
  private static final String DELAY_CONDITION_PREFERENCES = "";
76
77
 
77
78
  private SharedPreferences.Editor editor;
@@ -100,6 +101,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
100
101
  private Boolean onLaunchDirectUpdateUsed = false;
101
102
  Boolean shakeMenuEnabled = false;
102
103
  private Boolean allowManualBundleError = false;
104
+ private Boolean allowSetDefaultChannel = true;
103
105
 
104
106
  private Boolean isPreviousMainActivity = true;
105
107
 
@@ -283,8 +285,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
283
285
  }
284
286
 
285
287
  // Set logger for shared classes
286
- CryptoCipherV1.setLogger(logger);
287
- CryptoCipherV2.setLogger(logger);
288
+ CryptoCipher.setLogger(logger);
288
289
  DownloadService.setLogger(logger);
289
290
  DownloadWorkerManager.setLogger(logger);
290
291
 
@@ -302,6 +303,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
302
303
 
303
304
  this.persistCustomId = this.getConfig().getBoolean("persistCustomId", false);
304
305
  this.persistModifyUrl = this.getConfig().getBoolean("persistModifyUrl", false);
306
+ this.allowSetDefaultChannel = this.getConfig().getBoolean("allowSetDefaultChannel", true);
305
307
  this.implementation.publicKey = this.getConfig().getString("publicKey", "");
306
308
  this.implementation.privateKey = this.getConfig().getString("privateKey", "");
307
309
  if (this.implementation.privateKey != null && !this.implementation.privateKey.isEmpty()) {
@@ -325,8 +327,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
325
327
  }
326
328
  }
327
329
  }
330
+
331
+ // Load defaultChannel: first try from persistent storage (set via setChannel), then fall back to config
332
+ if (this.prefs.contains(DEFAULT_CHANNEL_PREF_KEY)) {
333
+ final String storedDefaultChannel = this.prefs.getString(DEFAULT_CHANNEL_PREF_KEY, "");
334
+ if (storedDefaultChannel != null && !storedDefaultChannel.isEmpty()) {
335
+ this.implementation.defaultChannel = storedDefaultChannel;
336
+ logger.info("Loaded persisted defaultChannel from setChannel()");
337
+ } else {
338
+ this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
339
+ }
340
+ } else {
341
+ this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
342
+ }
343
+
328
344
  int userValue = this.getConfig().getInt("periodCheckDelay", 0);
329
- this.implementation.defaultChannel = this.getConfig().getString("defaultChannel", "");
330
345
 
331
346
  if (userValue >= 0 && userValue <= 600) {
332
347
  this.periodCheckDelay = 600 * 1000;
@@ -868,27 +883,33 @@ public class CapacitorUpdaterPlugin extends Plugin {
868
883
 
869
884
  try {
870
885
  logger.info("unsetChannel triggerAutoUpdate: " + triggerAutoUpdate);
871
- startNewThread(() ->
872
- CapacitorUpdaterPlugin.this.implementation.unsetChannel((res) -> {
873
- JSObject jsRes = mapToJSObject(res);
874
- if (jsRes.has("error")) {
875
- String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
876
- String errorCode = jsRes.getString("error");
877
-
878
- JSObject errorObj = new JSObject();
879
- errorObj.put("message", errorMessage);
880
- errorObj.put("error", errorCode);
881
-
882
- call.reject(errorMessage, "UNSETCHANNEL_FAILED", null, errorObj);
883
- } else {
884
- if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
885
- logger.info("Calling autoupdater after channel change!");
886
- backgroundDownload();
886
+ startNewThread(() -> {
887
+ String configDefaultChannel = CapacitorUpdaterPlugin.this.getConfig().getString("defaultChannel", "");
888
+ CapacitorUpdaterPlugin.this.implementation.unsetChannel(
889
+ CapacitorUpdaterPlugin.this.editor,
890
+ DEFAULT_CHANNEL_PREF_KEY,
891
+ configDefaultChannel,
892
+ (res) -> {
893
+ JSObject jsRes = mapToJSObject(res);
894
+ if (jsRes.has("error")) {
895
+ String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
896
+ String errorCode = jsRes.getString("error");
897
+
898
+ JSObject errorObj = new JSObject();
899
+ errorObj.put("message", errorMessage);
900
+ errorObj.put("error", errorCode);
901
+
902
+ call.reject(errorMessage, "UNSETCHANNEL_FAILED", null, errorObj);
903
+ } else {
904
+ if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
905
+ logger.info("Calling autoupdater after channel change!");
906
+ backgroundDownload();
907
+ }
908
+ call.resolve(jsRes);
887
909
  }
888
- call.resolve(jsRes);
889
910
  }
890
- })
891
- );
911
+ );
912
+ });
892
913
  } catch (final Exception e) {
893
914
  logger.error("Failed to unsetChannel: " + e.getMessage());
894
915
  call.reject("Failed to unsetChannel: ", e);
@@ -911,25 +932,42 @@ public class CapacitorUpdaterPlugin extends Plugin {
911
932
  try {
912
933
  logger.info("setChannel " + channel + " triggerAutoUpdate: " + triggerAutoUpdate);
913
934
  startNewThread(() ->
914
- CapacitorUpdaterPlugin.this.implementation.setChannel(channel, (res) -> {
915
- JSObject jsRes = mapToJSObject(res);
916
- if (jsRes.has("error")) {
917
- String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
918
- String errorCode = jsRes.getString("error");
935
+ CapacitorUpdaterPlugin.this.implementation.setChannel(
936
+ channel,
937
+ CapacitorUpdaterPlugin.this.editor,
938
+ DEFAULT_CHANNEL_PREF_KEY,
939
+ CapacitorUpdaterPlugin.this.allowSetDefaultChannel,
940
+ (res) -> {
941
+ JSObject jsRes = mapToJSObject(res);
942
+ if (jsRes.has("error")) {
943
+ String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
944
+ String errorCode = jsRes.getString("error");
945
+
946
+ // Fire channelPrivate event if channel doesn't allow self-assignment
947
+ if (
948
+ errorCode.contains("cannot_update_via_private_channel") ||
949
+ errorCode.contains("channel_self_set_not_allowed")
950
+ ) {
951
+ JSObject eventData = new JSObject();
952
+ eventData.put("channel", channel);
953
+ eventData.put("message", errorMessage);
954
+ notifyListeners("channelPrivate", eventData);
955
+ }
919
956
 
920
- JSObject errorObj = new JSObject();
921
- errorObj.put("message", errorMessage);
922
- errorObj.put("error", errorCode);
957
+ JSObject errorObj = new JSObject();
958
+ errorObj.put("message", errorMessage);
959
+ errorObj.put("error", errorCode);
923
960
 
924
- call.reject(errorMessage, "SETCHANNEL_FAILED", null, errorObj);
925
- } else {
926
- if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
927
- logger.info("Calling autoupdater after channel change!");
928
- backgroundDownload();
961
+ call.reject(errorMessage, "SETCHANNEL_FAILED", null, errorObj);
962
+ } else {
963
+ if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled() && Boolean.TRUE.equals(triggerAutoUpdate)) {
964
+ logger.info("Calling autoupdater after channel change!");
965
+ backgroundDownload();
966
+ }
967
+ call.resolve(jsRes);
929
968
  }
930
- call.resolve(jsRes);
931
969
  }
932
- })
970
+ )
933
971
  );
934
972
  } catch (final Exception e) {
935
973
  logger.error("Failed to setChannel: " + channel + " " + e.getMessage());