@capgo/capacitor-updater 6.43.5 → 6.45.10

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

@@ -758,6 +758,20 @@ public class CapgoUpdater {
         this.editor.commit();
     }
 
+    static boolean shouldResetForForeignBundle(final String bundlePath, final boolean isBuiltin, final boolean hasStoredBundleInfo) {
+        return bundlePath != null && !bundlePath.trim().isEmpty() && !isBuiltin && !hasStoredBundleInfo;
+    }
+
+    private boolean hasStoredBundleInfo(final String id) {
+        return (
+            id != null &&
+            !id.isEmpty() &&
+            !BundleInfo.ID_BUILTIN.equals(id) &&
+            !BundleInfo.VERSION_UNKNOWN.equals(id) &&
+            this.prefs.contains(id + INFO_SUFFIX)
+        );
+    }
+
     public void downloadBackground(
         final String url,
         final String version,
@@ -977,6 +991,64 @@ public class CapgoUpdater {
         return (bundle.isDirectory() && bundle.exists() && new File(bundle.getPath(), "/index.html").exists() && !bundleInfo.isDeleted());
     }
 
+    static final class ResetState {
+
+        final String currentBundlePath;
+        final String fallbackBundleId;
+        final String nextBundleId;
+
+        ResetState(final String currentBundlePath, final String fallbackBundleId, final String nextBundleId) {
+            this.currentBundlePath = currentBundlePath;
+            this.fallbackBundleId = fallbackBundleId;
+            this.nextBundleId = nextBundleId;
+        }
+    }
+
+    ResetState captureResetState() {
+        return new ResetState(
+            this.getCurrentBundlePath(),
+            this.prefs.getString(FALLBACK_VERSION, BundleInfo.ID_BUILTIN),
+            this.prefs.getString(NEXT_VERSION, null)
+        );
+    }
+
+    void restoreResetState(final ResetState state) {
+        final String currentBundlePath = state.currentBundlePath == null || state.currentBundlePath.trim().isEmpty()
+            ? "public"
+            : state.currentBundlePath;
+        final String fallbackBundleId = state.fallbackBundleId == null || state.fallbackBundleId.isEmpty()
+            ? BundleInfo.ID_BUILTIN
+            : state.fallbackBundleId;
+
+        this.editor.putString(this.CAP_SERVER_PATH, currentBundlePath);
+        this.editor.putString(FALLBACK_VERSION, fallbackBundleId);
+        if (state.nextBundleId == null || state.nextBundleId.isEmpty()) {
+            this.editor.remove(NEXT_VERSION);
+        } else {
+            this.editor.putString(NEXT_VERSION, state.nextBundleId);
+        }
+        this.editor.commit();
+    }
+
+    void prepareResetStateForTransition() {
+        this.setCurrentBundle(new File("public"));
+        this.setFallbackBundle(null);
+        this.setNextBundle(null);
+    }
+
+    void finalizeResetTransition(final String previousBundleName, final boolean internal) {
+        if (this.activity != null) {
+            DownloadWorkerManager.cancelAllDownloads(this.activity);
+        }
+        if (!internal) {
+            this.sendStats("reset", this.getCurrentBundle().getVersionName(), previousBundleName);
+        }
+    }
+
+    boolean canSet(final BundleInfo bundle) {
+        return bundle != null && (bundle.isBuiltin() || this.bundleExists(bundle.getId()));
+    }
+
     public Boolean set(final BundleInfo bundle) {
         return this.set(bundle.getId());
     }
@@ -1001,11 +1073,32 @@ public class CapgoUpdater {
         return false;
     }
 
+    boolean stagePendingReload(final BundleInfo bundle) {
+        if (bundle == null || bundle.isBuiltin() || !this.bundleExists(bundle.getId())) {
+            return false;
+        }
+        this.setCurrentBundle(this.getBundleDirectory(bundle.getId()));
+        return true;
+    }
+
+    void finalizePendingReload(final BundleInfo bundle, final String previousBundleName) {
+        if (bundle == null || bundle.isBuiltin()) {
+            return;
+        }
+        this.sendStats("set", bundle.getVersionName(), previousBundleName);
+    }
+
     public void autoReset() {
         final BundleInfo currentBundle = this.getCurrentBundle();
         if (!currentBundle.isBuiltin() && !this.bundleExists(currentBundle.getId())) {
             logger.info("Folder at bundle path does not exist. Triggering reset.");
             this.reset();
+            return;
+        }
+        String bundlePath = this.prefs.getString(this.CAP_SERVER_PATH, null);
+        if (shouldResetForForeignBundle(bundlePath, currentBundle.isBuiltin(), this.hasStoredBundleInfo(currentBundle.getId()))) {
+            logger.info("Current bundle id is not one of the bundle ids stored by this plugin. Triggering reset.");
+            this.reset();
         }
     }
 
@@ -1038,17 +1131,9 @@ public class CapgoUpdater {
 
     public void reset(final boolean internal) {
         logger.debug("reset: " + internal);
-        var currentBundleName = this.getCurrentBundle().getVersionName();
-        this.setCurrentBundle(new File("public"));
-        this.setFallbackBundle(null);
-        this.setNextBundle(null);
-        // Cancel any ongoing downloads
-        if (this.activity != null) {
-            DownloadWorkerManager.cancelAllDownloads(this.activity);
-        }
-        if (!internal) {
-            this.sendStats("reset", this.getCurrentBundle().getVersionName(), currentBundleName);
-        }
+        final String currentBundleName = this.getCurrentBundle().getVersionName();
+        this.prepareResetStateForTransition();
+        this.finalizeResetTransition(currentBundleName, internal);
     }
 
     private JSONObject createInfoObject() throws JSONException {
@@ -1144,6 +1229,7 @@ public class CapgoUpdater {
                         Map<String, Object> retError = new HashMap<>();
                         retError.put("message", "Request failed: " + e.getMessage());
                         retError.put("error", "network_error");
+                        retError.put("kind", "failed");
                         callback.callback(retError);
                     }
 
@@ -1151,11 +1237,46 @@ public class CapgoUpdater {
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
                             final int statusCode = response.code();
+                            final String responseData = responseBody != null ? responseBody.string() : "";
+                            JSONObject jsonResponse = null;
+                            if (!responseData.isEmpty()) {
+                                try {
+                                    jsonResponse = new JSONObject(responseData);
+                                } catch (JSONException ignored) {
+                                    // Non-JSON responses are handled as response or parse errors below.
+                                }
+                            }
+
+                            if (jsonResponse != null && (jsonResponse.has("error") || jsonResponse.has("kind"))) {
+                                if (statusCode == 429) {
+                                    checkAndHandleRateLimitResponse(response);
+                                }
+                                Map<String, Object> retError = new HashMap<>();
+                                if (jsonResponse.has("error") && !jsonResponse.isNull("error")) {
+                                    retError.put("error", jsonResponse.getString("error"));
+                                }
+                                if (jsonResponse.has("kind") && !jsonResponse.isNull("kind")) {
+                                    retError.put("kind", jsonResponse.getString("kind"));
+                                }
+                                if (jsonResponse.has("message") && !jsonResponse.isNull("message")) {
+                                    retError.put("message", jsonResponse.getString("message"));
+                                } else {
+                                    retError.put("message", "server did not provide a message");
+                                }
+                                if (jsonResponse.has("version") && !jsonResponse.isNull("version")) {
+                                    retError.put("version", jsonResponse.getString("version"));
+                                }
+                                retError.put("statusCode", statusCode);
+                                callback.callback(retError);
+                                return;
+                            }
+
                             // 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");
+                                retError.put("kind", "failed");
                                 retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
@@ -1165,27 +1286,14 @@ public class CapgoUpdater {
                                 Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
+                                retError.put("kind", "failed");
                                 retError.put("statusCode", statusCode);
                                 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");
-                                }
-                                retError.put("statusCode", statusCode);
-                                callback.callback(retError);
-                                return;
+                            if (jsonResponse == null) {
+                                throw new JSONException("Response is not a JSON object");
                             }
 
                             Map<String, Object> ret = new HashMap<>();
@@ -1207,6 +1315,7 @@ public class CapgoUpdater {
                             Map<String, Object> retError = new HashMap<>();
                             retError.put("message", "JSON parse error: " + e.getMessage());
                             retError.put("error", "parse_error");
+                            retError.put("kind", "failed");
                             callback.callback(retError);
                         }
                     }
@@ -1707,7 +1816,13 @@ public class CapgoUpdater {
         }
         BundleInfo result;
         if (BundleInfo.ID_BUILTIN.equals(trueId)) {
-            result = new BundleInfo(trueId, null, BundleStatus.SUCCESS, "", "");
+            result = new BundleInfo(
+                trueId,
+                this.versionBuild == null || this.versionBuild.isEmpty() ? null : this.versionBuild,
+                BundleStatus.SUCCESS,
+                "",
+                ""
+            );
         } else if (BundleInfo.VERSION_UNKNOWN.equals(trueId)) {
             result = new BundleInfo(trueId, null, BundleStatus.ERROR, "", "");
         } else {
@@ -1812,6 +1927,7 @@ public class CapgoUpdater {
     }
 
     public boolean setNextBundle(final String next) {
+        BundleInfo bundleToNotify = null;
         if (next == null) {
             this.editor.remove(NEXT_VERSION);
         } else {
@@ -1821,8 +1937,15 @@ public class CapgoUpdater {
             }
             this.editor.putString(NEXT_VERSION, next);
             this.setBundleStatus(next, BundleStatus.PENDING);
+            bundleToNotify = newBundle;
         }
         this.editor.commit();
+        if (bundleToNotify != null) {
+            this.sendStats("set_next", bundleToNotify.getVersionName(), this.getCurrentBundle().getVersionName());
+            final Map<String, Object> payload = new HashMap<>();
+            payload.put("bundle", bundleToNotify.toJSONMap());
+            this.notifyListeners("setNext", payload);
+        }
         return true;
     }
 

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

@@ -91,27 +91,52 @@ public class DownloadService extends Worker {
             .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
             .addInterceptor((chain) -> {
                 Request originalRequest = chain.request();
-                String userAgent =
-                    "CapacitorUpdater/" +
-                    (currentPluginVersion != null ? currentPluginVersion : "unknown") +
-                    " (" +
-                    (currentAppId != null ? currentAppId : "unknown") +
-                    ") android/" +
-                    (currentVersionOs != null ? currentVersionOs : "unknown");
+                String userAgent = buildUserAgent(currentAppId, currentPluginVersion, currentVersionOs);
                 Request requestWithUserAgent = originalRequest.newBuilder().header("User-Agent", userAgent).build();
                 return chain.proceed(requestWithUserAgent);
             })
             .build();
     }
 
+    static String buildUserAgent(String appId, String pluginVersion, String versionOs) {
+        return (
+            "CapacitorUpdater/" +
+            sanitizeUserAgentValue(pluginVersion) +
+            " (" +
+            sanitizeUserAgentValue(appId) +
+            ") android/" +
+            sanitizeUserAgentValue(versionOs)
+        );
+    }
+
+    private static String sanitizeUserAgentValue(String value) {
+        if (value == null || value.isEmpty()) {
+            return "unknown";
+        }
+
+        StringBuilder sanitized = new StringBuilder();
+        value
+            .codePoints()
+            .forEach((cp) -> {
+                boolean isVisibleAscii = cp >= 0x20 && cp <= 0x7E;
+                boolean isIso88591 = cp >= 0xA0 && cp <= 0xFF;
+                if (isVisibleAscii || isIso88591) {
+                    sanitized.appendCodePoint(cp);
+                }
+            });
+
+        String result = sanitized.toString().trim();
+        return result.isEmpty() ? "unknown" : result;
+    }
+
     // Method to update User-Agent values
     public static void updateUserAgent(String appId, String pluginVersion, String versionOs) {
-        currentAppId = appId != null ? appId : "unknown";
-        currentPluginVersion = pluginVersion != null ? pluginVersion : "unknown";
-        currentVersionOs = versionOs != null ? versionOs : "unknown";
-        logger.debug(
-            "Updated User-Agent: CapacitorUpdater/" + currentPluginVersion + " (" + currentAppId + ") android/" + currentVersionOs
-        );
+        currentAppId = sanitizeUserAgentValue(appId);
+        currentPluginVersion = sanitizeUserAgentValue(pluginVersion);
+        currentVersionOs = sanitizeUserAgentValue(versionOs);
+        if (logger != null) {
+            logger.debug("Updated User-Agent: " + buildUserAgent(currentAppId, currentPluginVersion, currentVersionOs));
+        }
     }
 
     public DownloadService(@NonNull Context context, @NonNull WorkerParameters params) {

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

@@ -249,12 +249,7 @@ public class ShakeMenu implements ShakeDetector.Listener {
                             }
 
                             List<?> channelsRaw = (List<?>) channelsObj;
-                            List<Map<String, Object>> channels = new ArrayList<>();
-                            for (Object item : channelsRaw) {
-                                if (item instanceof Map) {
-                                    channels.add((Map<String, Object>) item);
-                                }
-                            }
+                            List<Map<String, Object>> channels = toChannelList(channelsRaw);
 
                             if (channels.isEmpty()) {
                                 showError("No channels available for self-assignment");
@@ -273,6 +268,27 @@ public class ShakeMenu implements ShakeDetector.Listener {
         });
     }
 
+    private List<Map<String, Object>> toChannelList(List<?> channelsRaw) {
+        List<Map<String, Object>> channels = new ArrayList<>();
+        for (Object item : channelsRaw) {
+            if (!(item instanceof Map<?, ?> rawMap)) {
+                continue;
+            }
+
+            Map<String, Object> channel = new java.util.HashMap<>();
+            for (Map.Entry<?, ?> entry : rawMap.entrySet()) {
+                if (entry.getKey() instanceof String key) {
+                    channel.put(key, entry.getValue());
+                }
+            }
+
+            if (!channel.isEmpty()) {
+                channels.add(channel);
+            }
+        }
+        return channels;
+    }
+
     private void presentChannelPicker(List<Map<String, Object>> channels) {
         try {
             AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -432,12 +448,36 @@ public class ShakeMenu implements ShakeDetector.Listener {
                                 }
 
                                 String latestError = getString(latestRes, "error");
+                                String latestKind = getString(latestRes, "kind");
+                                String latestMessage = getString(latestRes, "message");
+
+                                String detail = latestMessage != null && !latestMessage.isEmpty()
+                                    ? latestMessage
+                                    : latestError != null && !latestError.isEmpty()
+                                        ? latestError
+                                        : latestKind != null && !latestKind.isEmpty()
+                                            ? latestKind
+                                            : "server did not provide a message";
 
                                 // Handle update errors first (before "no new version" check)
-                                if (latestError != null && !latestError.isEmpty() && !"no_new_version_available".equals(latestError)) {
+                                if (
+                                    "failed".equals(latestKind) ||
+                                    (latestError != null &&
+                                        !latestError.isEmpty() &&
+                                        !"up_to_date".equals(latestKind) &&
+                                        !"blocked".equals(latestKind))
+                                ) {
+                                    activity.runOnUiThread(() -> {
+                                        progressDialog.dismiss();
+                                        showError("Channel set to " + channelName + ". Update check failed: " + detail);
+                                    });
+                                    return;
+                                }
+
+                                if ("blocked".equals(latestKind)) {
                                     activity.runOnUiThread(() -> {
                                         progressDialog.dismiss();
-                                        showError("Channel set to " + channelName + ". Update check failed: " + latestError);
+                                        showError("Channel set to " + channelName + ". Update check blocked: " + detail);
                                     });
                                     return;
                                 }
@@ -445,7 +485,7 @@ public class ShakeMenu implements ShakeDetector.Listener {
                                 String latestUrl = getString(latestRes, "url");
 
                                 // Check if there's an actual update available
-                                if ("no_new_version_available".equals(latestError) || latestUrl == null || latestUrl.isEmpty()) {
+                                if ("up_to_date".equals(latestKind) || latestUrl == null || latestUrl.isEmpty()) {
                                     activity.runOnUiThread(() -> {
                                         progressDialog.dismiss();
                                         showSuccess("Channel set to " + channelName + ". Already on latest version.");