@capgo/capacitor-updater 6.25.7 → 6.27.10

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

@@ -71,7 +71,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
     private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
-    private final String pluginVersion = "6.25.7";
+    private final String pluginVersion = "6.27.10";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1572,7 +1572,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void endBackGroundTaskWithNotif(String msg, String latestVersionName, BundleInfo current, Boolean error) {
-        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false, "download_fail", "downloadFailed");
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false, "download_fail", "downloadFailed", true);
     }
 
     private void endBackGroundTaskWithNotif(
@@ -1582,7 +1582,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         Boolean error,
         Boolean isDirectUpdate
     ) {
-        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, "download_fail", "downloadFailed");
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, "download_fail", "downloadFailed", true);
     }
 
     private void endBackGroundTaskWithNotif(
@@ -1593,6 +1593,19 @@ public class CapacitorUpdaterPlugin extends Plugin {
         Boolean isDirectUpdate,
         String failureAction,
         String failureEvent
+    ) {
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, failureAction, failureEvent, true);
+    }
+
+    private void endBackGroundTaskWithNotif(
+        String msg,
+        String latestVersionName,
+        BundleInfo current,
+        Boolean error,
+        Boolean isDirectUpdate,
+        String failureAction,
+        String failureEvent,
+        boolean shouldSendStats
     ) {
         if (error) {
             logger.info(
@@ -1603,7 +1616,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     "latestVersionName: " +
                     latestVersionName
             );
-            this.implementation.sendStats(failureAction, current.getVersionName());
+            if (shouldSendStats) {
+                this.implementation.sendStats(failureAction, current.getVersionName());
+            }
             final JSObject ret = new JSObject();
             ret.put("version", latestVersionName);
             this.notifyListeners(failureEvent, ret);
@@ -1634,14 +1649,23 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     if (jsRes.has("error")) {
                         String error = jsRes.getString("error");
                         String errorMessage = jsRes.has("message") ? jsRes.getString("message") : "server did not provide a message";
-                        logger.error("getLatest failed with error: " + error + ", message: " + errorMessage);
+                        int statusCode = jsRes.has("statusCode") ? jsRes.optInt("statusCode", 0) : 0;
+                        boolean responseIsOk = statusCode >= 200 && statusCode < 300;
+
+                        logger.error(
+                            "getLatest failed with error: " + error + ", message: " + errorMessage + ", statusCode: " + statusCode
+                        );
                         String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
+
                         CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                             errorMessage,
                             latestVersion,
                             current,
                             true,
-                            plannedDirectUpdate
+                            plannedDirectUpdate,
+                            "download_fail",
+                            "downloadFailed",
+                            !responseIsOk
                         );
                         return;
                     }

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

@@ -871,11 +871,13 @@ public class CapgoUpdater {
                     @Override
                     public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                         try (ResponseBody responseBody = response.body()) {
+                            final int statusCode = response.code();
                             // 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("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
@@ -884,6 +886,7 @@ public class CapgoUpdater {
                                 Map<String, Object> retError = new HashMap<>();
                                 retError.put("message", "Server error: " + response.code());
                                 retError.put("error", "response_error");
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
@@ -901,11 +904,13 @@ public class CapgoUpdater {
                                 } else {
                                     retError.put("message", "server did not provide a message");
                                 }
+                                retError.put("statusCode", statusCode);
                                 callback.callback(retError);
                                 return;
                             }
 
                             Map<String, Object> ret = new HashMap<>();
+                            ret.put("statusCode", statusCode);
 
                             Iterator<String> keys = jsonResponse.keys();
                             while (keys.hasNext()) {