fix: expose isAutoUpdateEnabled

Cap-go · May 5, 2022 · b0befb1 · b0befb1
1 parent b8a3e56
commit b0befb1
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 39 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java
@@ -375,9 +375,32 @@ public void cancelDelay(final PluginCall call) {
         }
     }
 
+    private Boolean _isAutoUpdateEnabled() {
+        return !"".equals(CapacitorUpdaterPlugin.this.autoUpdateUrl);
+    }
+
+    @PluginMethod
+    public void isAutoUpdateEnabled(final PluginCall call) {
+        final JSObject ret = new JSObject();
+        ret.put("enabled", this._isAutoUpdateEnabled());
+        call.resolve(ret);
+    }
+
+    private void checkAppReady() {
+        try {
+            if(this.appReadyCheck != null) {
+                this.appReadyCheck.interrupt();
+            }
+            this.appReadyCheck = new Thread(new DeferredNotifyAppReadyCheck());
+            this.appReadyCheck.start();
+        } catch (final Exception e) {
+            Log.e(CapacitorUpdater.TAG, "Failed to start " + DeferredNotifyAppReadyCheck.class.getName(), e);
+        }
+    }
+
     @Override
     public void onActivityStarted(@NonNull final Activity activity) {
-        if (CapacitorUpdaterPlugin.this.isAutoUpdateEnabled()) {
+        if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
             new Thread(new Runnable(){
                 @Override
                 public void run() {
@@ -528,44 +551,6 @@ public void onActivityStopped(@NonNull final Activity activity) {
         }
     }
 
-    private Boolean isAutoUpdateEnabled() {
-        return !"".equals(CapacitorUpdaterPlugin.this.autoUpdateUrl);
-    }
-
-    // not use but necessary here to remove warnings
-    @Override
-    public void onActivityResumed(@NonNull final Activity activity) {
-        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
-    }
-
-    @Override
-    public void onActivityPaused(@NonNull final Activity activity) {
-        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
-    }
-    @Override
-    public void onActivityCreated(@NonNull final Activity activity, @Nullable final Bundle savedInstanceState) {
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(@NonNull final Activity activity, @NonNull final Bundle outState) {
-    }
-
-    @Override
-    public void onActivityDestroyed(@NonNull final Activity activity) {
-    }
-
-    private void checkAppReady() {
-        try {
-            if(this.appReadyCheck != null) {
-                this.appReadyCheck.interrupt();
-            }
-            this.appReadyCheck = new Thread(new DeferredNotifyAppReadyCheck());
-            this.appReadyCheck.start();
-        } catch (final Exception e) {
-            Log.e(CapacitorUpdater.TAG, "Failed to start " + DeferredNotifyAppReadyCheck.class.getName(), e);
-        }
-    }
-
     private class DeferredNotifyAppReadyCheck implements Runnable {
         @Override
         public void run() {
@@ -593,4 +578,26 @@ public void run() {
             }
         }
     }
+
+    // not use but necessary here to remove warnings
+    @Override
+    public void onActivityResumed(@NonNull final Activity activity) {
+        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
+    }
+
+    @Override
+    public void onActivityPaused(@NonNull final Activity activity) {
+        // TODO: Implement background updating based on `backgroundUpdate` and `backgroundUpdateDelay` capacitor.config.ts settings
+    }
+    @Override
+    public void onActivityCreated(@NonNull final Activity activity, @Nullable final Bundle savedInstanceState) {
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(@NonNull final Activity activity, @NonNull final Bundle outState) {
+    }
+
+    @Override
+    public void onActivityDestroyed(@NonNull final Activity activity) {
+    }
 }
diff --git a/src/definitions.ts b/src/definitions.ts
@@ -1,5 +1,6 @@
 /// <reference types="@capacitor/cli" />
 import type { PluginListenerHandle } from '@capacitor/core';
+
 declare module '@capacitor/cli' {
   export interface PluginsConfig {
     /**
@@ -141,6 +142,13 @@ export interface CapacitorUpdaterPlugin {
    */
   next(options: { version: string, versionName?: string }): Promise<VersionInfo>;
 
+  /**
+   * Get the state of auto update config.
+   * 
+   * @returns {Promise<{enabled: boolean}>} The status for auto update.
+   */
+  isAutoUpdateEnabled(): Promise<{enabled: boolean}>;
+
   /**
    * Set the current bundle version and immediately reloads the app.
    * 

diff --git a/src/web.ts b/src/web.ts
@@ -15,6 +15,11 @@ export class CapacitorUpdaterWeb
     console.warn('Cannot set next version in web', options);
     return VERSION_BUILTIN;
   }
+
+  async isAutoUpdateEnabled(): Promise<{ enabled: boolean }> {
+    console.warn('Cannot get isAutoUpdateEnabled version in web');
+    return { enabled: false };
+  }
   async set(options: { version: string, versionName?: string }): Promise<void> {
     console.warn('Cannot set version in web', options);
     return;