@capgo/capacitor-updater 8.45.9 → 8.45.11

package/README.md

@@ -462,6 +462,7 @@ export default config;
 * [`removeAllListeners()`](#removealllisteners)
 * [`addListener('download', ...)`](#addlistenerdownload-)
 * [`addListener('noNeedUpdate', ...)`](#addlistenernoneedupdate-)
+* [`addListener('updateCheckResult', ...)`](#addlistenerupdatecheckresult-)
 * [`addListener('updateAvailable', ...)`](#addlistenerupdateavailable-)
 * [`addListener('downloadComplete', ...)`](#addlistenerdownloadcomplete-)
 * [`addListener('breakingAvailable', ...)`](#addlistenerbreakingavailable-)
@@ -929,27 +930,23 @@ 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"**
+**Important: Handling "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.
+`message: "No new version available"`. This is a normal, expected condition and resolves with
+`kind: "up_to_date"` when the backend provides that classification.
 
-You should catch this specific error to handle it gracefully:
+You should check `kind` and `error` before attempting to download:
 
 ```typescript
-try {
-  const latest = await CapacitorUpdater.getLatest();
+const latest = await CapacitorUpdater.getLatest();
+if (latest.kind === 'up_to_date') {
+  console.log('Already up to date');
+} else if (latest.kind === 'blocked') {
+  console.log('Update is blocked:', latest.error);
+} else if (latest.url) {
   // 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);
-  }
 }
 ```
 
@@ -1251,6 +1248,7 @@ Remove all event listeners registered for this plugin.
 This unregisters all listeners added via {@link addListener} for all event types:
 - `download`
 - `noNeedUpdate`
+- `updateCheckResult`
 - `updateAvailable`
 - `downloadComplete`
 - `downloadFailed`
@@ -1308,6 +1306,31 @@ Listen for no need to update event, useful when you want force check every time
 --------------------
 
 
+#### addListener('updateCheckResult', ...)
+
+```typescript
+addListener(eventName: 'updateCheckResult', listenerFunc: (state: UpdateCheckResultEvent) => void) => Promise<PluginListenerHandle>
+```
+
+Listen for update check results before the updater decides whether to download.
+The backend can classify the <a href="#updatecheckresultevent">UpdateCheckResultEvent</a> payload as `up_to_date`, `blocked`, or `failed`.
+
+This event is emitted alongside legacy events. For `up_to_date` and `blocked`, it is emitted before
+`noNeedUpdate` and does not emit `downloadFailed`. For `failed`, it is emitted before the legacy
+`downloadFailed` event and keeps the existing failure stats behavior.
+
+| Param              | Type                                                                                          |
+| ------------------ | --------------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'updateCheckResult'</code>                                                              |
+| **`listenerFunc`** | <code>(state: <a href="#updatecheckresultevent">UpdateCheckResultEvent</a>) =&gt; void</code> |
+
+**Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
+
+**Since:** 8.45.11
+
+--------------------
+
+
 #### addListener('updateAvailable', ...)
 
 ```typescript
@@ -2094,20 +2117,22 @@ 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>          | 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 delta updates (when using multi-file downloads).                                                                                                                                                | 6.1    |
-| **`link`**       | <code>string</code>          | Optional link associated with this bundle version (e.g., release notes URL, changelog, GitHub release).                                                                                                       | 7.35.0 |
-| **`comment`**    | <code>string</code>          | Optional comment or description for this bundle version.                                                                                                                                                      | 7.35.0 |
+| 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. Use `kind` for classification instead of parsing this value.             |         |
+| **`kind`**       | <code><a href="#updateresponsekind">UpdateResponseKind</a></code> | Classification for this response, provided by the backend.                                                   | 8.45.11 |
+| **`statusCode`** | <code>number</code>                                               | HTTP status code returned by the update server for classified update-check responses.                        | 8.45.11 |
+| **`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 delta updates (when using multi-file downloads).                                               | 6.1     |
+| **`link`**       | <code>string</code>                                               | Optional link associated with this bundle version (e.g., release notes URL, changelog, GitHub release).      | 7.35.0  |
+| **`comment`**    | <code>string</code>                                               | Optional comment or description for this bundle version.                                                     | 7.35.0  |
 
 
 ##### GetLatestOptions
@@ -2226,6 +2251,18 @@ If you don't use backend, you need to provide the URL and version of the bundle.
 | **`bundle`** | <code><a href="#bundleinfo">BundleInfo</a></code> | Current status of download, between 0 and 100. | 4.0.0 |
 
 
+##### UpdateCheckResultEvent
+
+| Prop             | Type                                                              | Description                                                          | Since   |
+| ---------------- | ----------------------------------------------------------------- | -------------------------------------------------------------------- | ------- |
+| **`kind`**       | <code><a href="#updateresponsekind">UpdateResponseKind</a></code> | Classification for the update check result, provided by the backend. | 8.45.11 |
+| **`error`**      | <code>string</code>                                               | Backend error code, when provided.                                   | 8.45.11 |
+| **`message`**    | <code>string</code>                                               | Backend message, when provided.                                      | 8.45.11 |
+| **`statusCode`** | <code>number</code>                                               | HTTP status code returned by the update endpoint.                    | 8.45.11 |
+| **`version`**    | <code>string</code>                                               | Version referenced by the update check result.                       | 8.45.11 |
+| **`bundle`**     | <code><a href="#bundleinfo">BundleInfo</a></code>                 | Current bundle on the device.                                        | 8.45.11 |
+
+
 ##### UpdateAvailableEvent
 
 | Prop         | Type                                              | Description                                    | Since |
@@ -2417,6 +2454,15 @@ error: The bundle has failed to download.
 <code>'background' | 'kill' | 'nativeVersion' | 'date'</code>
 
 
+##### UpdateResponseKind
+
+Classification for update-check responses that do not provide a downloadable bundle.
+The update backend provides this field directly. Missing or unknown values are treated as
+failed by native clients.
+
+<code>'up_to_date' | 'blocked' | 'failed'</code>
+
+
 ##### BreakingAvailableEvent
 
 Payload emitted by {@link CapacitorUpdaterPlugin.addListener} with `breakingAvailable`.

package/android/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     implementation "androidx.work:work-runtime:$work_version"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
     implementation "com.google.android.gms:play-services-tasks:18.4.1"
-    implementation "com.google.guava:guava:33.5.0-android"
+    implementation "com.google.guava:guava:33.6.0-android"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"

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

@@ -50,7 +50,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -90,7 +89,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final int SPLASH_SCREEN_MAX_RETRIES = 20;
     private static final long PENDING_BUNDLE_APP_READY_MIN_TIMEOUT_MS = 30000L;
 
-    private final String pluginVersion = "8.45.9";
+    private final String pluginVersion = "8.45.11";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1293,6 +1292,23 @@ public class CapacitorUpdaterPlugin extends Plugin {
             startNewThread(() ->
                 CapacitorUpdaterPlugin.this.implementation.listChannels((res) -> {
                     JSObject jsRes = InternalUtils.mapToJSObject(res);
+                    Object channels = res.get("channels");
+                    if (channels instanceof List<?> channelsList) {
+                        JSArray channelsArray = new JSArray();
+                        for (Object channel : channelsList) {
+                            if (channel instanceof Map<?, ?> channelMap) {
+                                JSObject channelObject = new JSObject();
+                                for (Map.Entry<?, ?> entry : channelMap.entrySet()) {
+                                    Object key = entry.getKey();
+                                    if (key != null) {
+                                        channelObject.put(key.toString(), entry.getValue());
+                                    }
+                                }
+                                channelsArray.put(channelObject);
+                            }
+                        }
+                        jsRes.put("channels", channelsArray);
+                    }
                     if (jsRes.has("error")) {
                         String errorMessage = jsRes.has("message") ? jsRes.getString("message") : jsRes.getString("error");
                         String errorCode = jsRes.getString("error");
@@ -1505,49 +1521,51 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     @PluginMethod
     public void reload(final PluginCall call) {
-        try {
-            final BundleInfo current = this.implementation.getCurrentBundle();
-            final BundleInfo next = this.implementation.getNextBundle();
-
-            if (next != null && !next.isErrorStatus() && !next.getId().equals(current.getId())) {
-                final CapgoUpdater.ResetState previousState = this.implementation.captureResetState();
-                final String previousBundleName = this.implementation.getCurrentBundle().getVersionName();
-                logger.info("Applying pending bundle before reload: " + next.getVersionName());
-                final boolean didApplyPendingBundle;
-                if (next.isBuiltin()) {
-                    this.implementation.prepareResetStateForTransition();
-                    didApplyPendingBundle = true;
-                } else {
-                    didApplyPendingBundle = this.implementation.stagePendingReload(next);
-                }
-                if (didApplyPendingBundle && this._reload()) {
+        startNewThread(() -> {
+            try {
+                final BundleInfo current = this.implementation.getCurrentBundle();
+                final BundleInfo next = this.implementation.getNextBundle();
+
+                if (next != null && !next.isErrorStatus() && !next.getId().equals(current.getId())) {
+                    final CapgoUpdater.ResetState previousState = this.implementation.captureResetState();
+                    final String previousBundleName = this.implementation.getCurrentBundle().getVersionName();
+                    logger.info("Applying pending bundle before reload: " + next.getVersionName());
+                    final boolean didApplyPendingBundle;
                     if (next.isBuiltin()) {
-                        this.implementation.finalizeResetTransition(previousBundleName, false);
+                        this.implementation.prepareResetStateForTransition();
+                        didApplyPendingBundle = true;
                     } else {
-                        this.implementation.finalizePendingReload(next, previousBundleName);
+                        didApplyPendingBundle = this.implementation.stagePendingReload(next);
                     }
-                    this.notifyBundleSet(next);
-                    this.implementation.setNextBundle(null);
-                    call.resolve();
+                    if (didApplyPendingBundle && this._reload()) {
+                        if (next.isBuiltin()) {
+                            this.implementation.finalizeResetTransition(previousBundleName, false);
+                        } else {
+                            this.implementation.finalizePendingReload(next, previousBundleName);
+                        }
+                        this.notifyBundleSet(next);
+                        this.implementation.setNextBundle(null);
+                        call.resolve();
+                        return;
+                    }
+                    this.implementation.restoreResetState(previousState);
+                    this.restoreLiveBundleStateAfterFailedReload();
+                    logger.error("Reload failed after applying pending bundle: " + next.getVersionName());
+                    call.reject("Reload failed after applying pending bundle: " + next.getVersionName());
                     return;
                 }
-                this.implementation.restoreResetState(previousState);
-                this.restoreLiveBundleStateAfterFailedReload();
-                logger.error("Reload failed after applying pending bundle: " + next.getVersionName());
-                call.reject("Reload failed after applying pending bundle: " + next.getVersionName());
-                return;
-            }
 
-            if (this._reload()) {
-                call.resolve();
-            } else {
-                logger.error("Reload failed");
-                call.reject("Reload failed");
+                if (this._reload()) {
+                    call.resolve();
+                } else {
+                    logger.error("Reload failed");
+                    call.reject("Reload failed");
+                }
+            } catch (final Exception e) {
+                logger.error("Could not reload " + e.getMessage());
+                call.reject("Could not reload", e);
             }
-        } catch (final Exception e) {
-            logger.error("Could not reload " + e.getMessage());
-            call.reject("Could not reload", e);
-        }
+        });
     }
 
     @PluginMethod
@@ -1580,23 +1598,25 @@ public class CapacitorUpdaterPlugin extends Plugin {
             call.reject("Set called without id");
             return;
         }
-        try {
-            logger.info("Setting active bundle " + id);
-            if (!this.implementation.set(id)) {
-                logger.info("No such bundle " + id);
-                call.reject("Update failed, id " + id + " does not exist.");
-            } else if (!this._reload()) {
-                logger.error("Reload failed after setting bundle " + id);
-                call.reject("Reload failed after setting bundle " + id);
-            } else {
-                logger.info("Bundle successfully set to " + id);
-                this.notifyBundleSet(this.implementation.getBundleInfo(id));
-                call.resolve();
+        startNewThread(() -> {
+            try {
+                logger.info("Setting active bundle " + id);
+                if (!this.implementation.set(id)) {
+                    logger.info("No such bundle " + id);
+                    call.reject("Update failed, id " + id + " does not exist.");
+                } else if (!this._reload()) {
+                    logger.error("Reload failed after setting bundle " + id);
+                    call.reject("Reload failed after setting bundle " + id);
+                } else {
+                    logger.info("Bundle successfully set to " + id);
+                    this.notifyBundleSet(this.implementation.getBundleInfo(id));
+                    call.resolve();
+                }
+            } catch (final Exception e) {
+                logger.error("Could not set id " + id + " " + e.getMessage());
+                call.reject("Could not set id " + id, e);
             }
-        } catch (final Exception e) {
-            logger.error("Could not set id " + id + " " + e.getMessage());
-            call.reject("Could not set id " + id, e);
-        }
+        });
     }
 
     @PluginMethod
@@ -1683,11 +1703,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
         startNewThread(() ->
             CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, channel, (res) -> {
                 JSObject jsRes = InternalUtils.mapToJSObject(res);
-                if (jsRes.has("error")) {
-                    String error = jsRes.getString("error");
+                if (jsRes.has("error") || jsRes.has("kind")) {
+                    String error = jsRes.has("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);
-                    call.reject(jsRes.getString("error"));
+                    String kind = CapacitorUpdaterPlugin.this.getUpdateResponseKind(jsRes.has("kind") ? jsRes.getString("kind") : null);
+                    jsRes.put("kind", kind);
+                    if ("failed".equals(kind)) {
+                        logger.error("getLatest failed with error: " + error + ", message: " + errorMessage);
+                        call.reject(error.isEmpty() ? errorMessage : error);
+                    } else {
+                        if (!jsRes.has("version") || jsRes.getString("version").isEmpty()) {
+                            jsRes.put("version", CapacitorUpdaterPlugin.this.implementation.getCurrentBundle().getVersionName());
+                        }
+                        logger.info("getLatest returned " + kind + ": " + errorMessage);
+                        call.resolve(jsRes);
+                    }
                     return;
                 } else if (jsRes.has("message")) {
                     call.reject(jsRes.getString("message"));
@@ -1772,19 +1802,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
     @PluginMethod
     public void reset(final PluginCall call) {
-        try {
-            final Boolean toLastSuccessful = call.getBoolean("toLastSuccessful", false);
-            final Boolean usePendingBundle = call.getBoolean("usePendingBundle", false);
-            if (this._reset(toLastSuccessful, usePendingBundle)) {
-                call.resolve();
-                return;
+        startNewThread(() -> {
+            try {
+                final Boolean toLastSuccessful = call.getBoolean("toLastSuccessful", false);
+                final Boolean usePendingBundle = call.getBoolean("usePendingBundle", false);
+                if (this._reset(toLastSuccessful, usePendingBundle)) {
+                    call.resolve();
+                    return;
+                }
+                logger.error("Reset failed");
+                call.reject("Reset failed");
+            } catch (final Exception e) {
+                logger.error("Reset failed " + e.getMessage());
+                call.reject("Reset failed", e);
             }
-            logger.error("Reset failed");
-            call.reject("Reset failed");
-        } catch (final Exception e) {
-            logger.error("Reset failed " + e.getMessage());
-            call.reject("Reset failed", e);
-        }
+        });
     }
 
     @PluginMethod
@@ -1850,12 +1882,33 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     try {
                         CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, null, (res) -> {
                             JSObject jsRes = InternalUtils.mapToJSObject(res);
-                            if (jsRes.has("error")) {
-                                String error = jsRes.getString("error");
+                            if (jsRes.has("error") || jsRes.has("kind")) {
+                                final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
+                                String error = jsRes.has("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;
+                                String kind = CapacitorUpdaterPlugin.this.getUpdateResponseKind(
+                                    jsRes.has("kind") ? jsRes.getString("kind") : null
+                                );
+                                String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
+                                CapacitorUpdaterPlugin.this.notifyUpdateCheckResult(
+                                    kind,
+                                    error,
+                                    errorMessage,
+                                    statusCode,
+                                    latestVersion,
+                                    current
+                                );
+
+                                if ("failed".equals(kind)) {
+                                    logger.error("getLatest failed with error: " + error + ", message: " + errorMessage);
+                                } else if ("blocked".equals(kind)) {
+                                    logger.info("Update check blocked with error: " + error);
+                                } else {
+                                    logger.info("No new version available");
+                                }
                             } else if (jsRes.has("version")) {
                                 String newVersion = jsRes.getString("version");
                                 String currentVersion = String.valueOf(CapacitorUpdaterPlugin.this.implementation.getCurrentBundle());
@@ -1980,10 +2033,22 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.checkAppReady(this.resolveAppReadyCheckTimeoutMs());
     }
 
+    synchronized boolean shouldInterruptAppReadyCheck(final Thread existingCheck, final Thread currentThread) {
+        return existingCheck != null && existingCheck != currentThread;
+    }
+
+    synchronized void clearAppReadyCheckIfCurrent(final Thread expectedThread) {
+        if (this.appReadyCheck == expectedThread) {
+            this.appReadyCheck = null;
+        }
+    }
+
     private void checkAppReady(final long waitTimeMs) {
         try {
-            if (this.appReadyCheck != null) {
-                this.appReadyCheck.interrupt();
+            final Thread currentThread = Thread.currentThread();
+            final Thread existingCheck = this.appReadyCheck;
+            if (this.shouldInterruptAppReadyCheck(existingCheck, currentThread)) {
+                existingCheck.interrupt();
             }
             this.appReadyCheck = startNewThread(new DeferredNotifyAppReadyCheck(waitTimeMs));
         } catch (final Exception e) {
@@ -2000,6 +2065,31 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
+    private String getUpdateResponseKind(final String kind) {
+        if ("up_to_date".equals(kind) || "blocked".equals(kind) || "failed".equals(kind)) {
+            return kind;
+        }
+        return "failed";
+    }
+
+    private void notifyUpdateCheckResult(
+        final String kind,
+        final String error,
+        final String message,
+        final int statusCode,
+        final String version,
+        final BundleInfo current
+    ) {
+        JSObject ret = new JSObject();
+        ret.put("kind", kind);
+        ret.put("error", error);
+        ret.put("message", message);
+        ret.put("statusCode", statusCode);
+        ret.put("version", version);
+        ret.put("bundle", InternalUtils.mapToJSObject(current.toJSONMap()));
+        this.notifyListeners("updateCheckResult", ret);
+    }
+
     private void ensureBridgeSet() {
         if (this.bridge != null && this.bridge.getWebView() != null) {
             logger.setBridge(this.bridge);
@@ -2109,30 +2199,37 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
 
                     // Handle network errors and other failures first
-                    if (jsRes.has("error")) {
-                        String error = jsRes.getString("error");
+                    if (jsRes.has("error") || jsRes.has("kind")) {
+                        String error = jsRes.has("error") ? jsRes.getString("error") : "";
                         String errorMessage = jsRes.has("message") ? jsRes.getString("message") : "server did not provide a message";
                         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 kind = CapacitorUpdaterPlugin.this.getUpdateResponseKind(jsRes.has("kind") ? jsRes.getString("kind") : null);
                         String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
+                        CapacitorUpdaterPlugin.this.notifyUpdateCheckResult(kind, error, errorMessage, statusCode, latestVersion, current);
 
+                        if ("up_to_date".equals(kind)) {
+                            logger.info("No new version available");
+                        } else if ("blocked".equals(kind)) {
+                            logger.info("Update check blocked with error: " + error);
+                        } else {
+                            logger.error(
+                                "getLatest failed with error: " + error + ", message: " + errorMessage + ", statusCode: " + statusCode
+                            );
+                        }
+
+                        boolean isFailure = "failed".equals(kind);
                         CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                             errorMessage,
                             latestVersion,
                             current,
-                            true,
+                            isFailure,
                             plannedDirectUpdate,
                             "download_fail",
                             "downloadFailed",
-                            !responseIsOk
+                            isFailure
                         );
                         return;
                     }
-
                     try {
                         final String latestVersionName = jsRes.getString("version");
 
@@ -2438,12 +2535,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
 
         @Override
         public void run() {
+            final Thread currentThread = Thread.currentThread();
             try {
                 logger.info("Wait for " + this.waitTimeMs + "ms, then check for notifyAppReady");
                 Thread.sleep(this.waitTimeMs);
                 CapacitorUpdaterPlugin.this.checkRevert();
-                CapacitorUpdaterPlugin.this.appReadyCheck = null;
+                CapacitorUpdaterPlugin.this.clearAppReadyCheckIfCurrent(currentThread);
             } catch (final InterruptedException e) {
+                CapacitorUpdaterPlugin.this.clearAppReadyCheckIfCurrent(currentThread);
                 logger.info(DeferredNotifyAppReadyCheck.class.getName() + " was interrupted.");
             }
         }