@capgo/capacitor-updater 4.34.0 → 4.36.0

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "4.34.0";
+  private final String PLUGIN_VERSION = "4.36.0";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -782,9 +782,20 @@ public class CapacitorUpdaterPlugin
   }
 
   private Boolean _isAutoUpdateEnabled() {
+    final CapConfig config = CapConfig.loadDefault(this.getActivity());
+    String serverUrl = config.getServerUrl();
+    if (serverUrl != null && !"".equals(serverUrl)) {
+      // log warning autoupdate disabled when serverUrl is set
+      Log.w(
+        CapacitorUpdater.TAG,
+        "AutoUpdate is automatic disabled when serverUrl is set."
+      );
+    }
     return (
       CapacitorUpdaterPlugin.this.autoUpdate &&
-      !"".equals(CapacitorUpdaterPlugin.this.updateUrl)
+      !"".equals(CapacitorUpdaterPlugin.this.updateUrl) &&
+      serverUrl != null &&
+      !"".equals(serverUrl)
     );
   }
 

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.34.0"
+    private let PLUGIN_VERSION: String = "4.36.0"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -434,7 +434,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     private func _isAutoUpdateEnabled() -> Bool {
-        return self.autoUpdate && self.updateUrl != ""
+        let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
+        if instanceDescriptor?.serverURL != nil {
+            print("⚠️ \(self.implementation.TAG) AutoUpdate is automatic disabled when serverUrl is set.")
+        }
+        return self.autoUpdate && self.updateUrl != "" && instanceDescriptor?.serverURL == nil
     }
 
     @objc func isAutoUpdateEnabled(_ call: CAPPluginCall) {
@@ -632,6 +636,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         }
         if self._isAutoUpdateEnabled() {
             self.backgroundDownload()
+        } else {
+            print("\(self.implementation.TAG) Auto update is disabled")
         }
         self.checkAppReady()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.34.0",
+  "version": "4.36.0",
   "packageManager": "pnpm@8.1.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
@@ -53,18 +53,18 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^4.7.1",
-    "@capacitor/cli": "^4.7.1",
-    "@capacitor/core": "^4.7.1",
+    "@capacitor/android": "^4.7.3",
+    "@capacitor/cli": "^4.7.3",
+    "@capacitor/core": "^4.7.3",
     "@capacitor/docgen": "^0.2.1",
-    "@capacitor/ios": "^4.7.1",
+    "@capacitor/ios": "^4.7.3",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^2.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
-    "@types/node": "^18.15.7",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
-    "eslint": "^8.36.0",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
+    "eslint": "^8.38.0",
     "eslint-plugin-import": "^2.27.5",
     "prettier": "^2.8.7",
     "prettier-plugin-java": "^2.1.0",