fix: reset for ios

Cap-go · Dec 16, 2021 · 62b7d23 · 62b7d23
1 parent 7f202cc
commit 62b7d23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/ios/Plugin/CapacitorUpdater.swift b/ios/Plugin/CapacitorUpdater.swift
@@ -152,7 +152,7 @@ extension URL {
     }
 
     @objc public func reset() {
-        UserDefaults.standard.set("", forKey: "lastPathHot")
-        UserDefaults.standard.set("", forKey: "lastPathPersist")
+        UserDefaults.standard.set("capacitor://localhost", forKey: "lastPathHot")
+        UserDefaults.standard.set("capacitor://localhost", forKey: "lastPathPersist")
     }
 }
diff --git a/ios/Plugin/CapacitorUpdaterPlugin.swift b/ios/Plugin/CapacitorUpdaterPlugin.swift
@@ -34,9 +34,6 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 let pathHot = implementation.getLastPathHot()
                 let pathPersist = implementation.getLastPathPersist()
                 if (pathHot != "" && pathPersist != "") {
-                    if (defaults.string(forKey: "serverBasePathOriginal") == nil) {
-                        defaults.set(vc.getServerBasePath(), forKey: "serverBasePathOriginal")
-                    }
                     defaults.set(String(pathPersist.suffix(10)), forKey: "serverBasePath")
                     vc.setServerBasePath(path: pathHot)
                     return call.resolve()
@@ -72,11 +69,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
        if let vc = bridge.viewController as? CAPBridgeViewController {
            let defaults = UserDefaults.standard
-           let serverBasePathOriginal = defaults.string(forKey: "serverBasePathOriginal") ?? ""
-           print("RESET", serverBasePathOriginal, implementation.getLastPathHot())
            implementation.reset()
-           vc.setServerBasePath(path: serverBasePathOriginal)
-           defaults.set(serverBasePathOriginal, forKey: "serverBasePath")
+           let pathPersist = implementation.getLastPathPersist()
+           vc.setServerBasePath(path: pathPersist)
+           defaults.set(pathPersist, forKey: "serverBasePath")
            DispatchQueue.main.async {
                bridge.webView?.reload()
            }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-updater",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "license": "AGPL-3.0-only",
   "description": "Download app update from url",
   "main": "dist/plugin.cjs.js",