feat: disable autoupdate in livereload mode + warning

Cap-go · Apr 13, 2023 · d3c2838 · d3c2838
1 parent 7746388
commit d3c2838
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 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
@@ -782,9 +782,20 @@ private void _checkCancelDelay(Boolean killed) {
   }
 
   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)
     );
   }
 

diff --git a/ios/Plugin/CapacitorUpdaterPlugin.swift b/ios/Plugin/CapacitorUpdaterPlugin.swift
@@ -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()
     }