@capgo/capacitor-updater 6.11.1 → 6.12.0

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -45,7 +45,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.11.1"
+    private let PLUGIN_VERSION: String = "6.12.0"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"
@@ -69,26 +69,26 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     override public func load() {
         #if targetEnvironment(simulator)
-        print("\(self.implementation.TAG) ::::: SIMULATOR :::::")
-        print("\(self.implementation.TAG) Application directory: \(NSHomeDirectory())")
+        print("\(CapacitorUpdater.TAG) ::::: SIMULATOR :::::")
+        print("\(CapacitorUpdater.TAG) Application directory: \(NSHomeDirectory())")
         #endif
 
         self.semaphoreUp()
         self.implementation.deviceID = (UserDefaults.standard.string(forKey: "appUUID") ?? UUID().uuidString).lowercased()
         UserDefaults.standard.set( self.implementation.deviceID, forKey: "appUUID")
         UserDefaults.standard.synchronize()
-        print("\(self.implementation.TAG) init for device \(self.implementation.deviceID)")
+        print("\(CapacitorUpdater.TAG) init for device \(self.implementation.deviceID)")
         guard let versionName = getConfig().getString("version", Bundle.main.versionName) else {
-            print("\(self.implementation.TAG) Cannot get version name")
+            print("\(CapacitorUpdater.TAG) Cannot get version name")
             // crash the app
             fatalError("Cannot get version name")
         }
         do {
             currentVersionNative = try Version(versionName)
         } catch {
-            print("\(self.implementation.TAG) Cannot parse versionName \(versionName)")
+            print("\(CapacitorUpdater.TAG) Cannot parse versionName \(versionName)")
         }
-        print("\(self.implementation.TAG) version native \(self.currentVersionNative.description)")
+        print("\(CapacitorUpdater.TAG) version native \(self.currentVersionNative.description)")
         implementation.versionBuild = getConfig().getString("version", Bundle.main.versionName)!
         autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", true)
         autoDeletePrevious = getConfig().getBoolean("autoDeletePrevious", true)
@@ -120,7 +120,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if implementation.appId == "" {
             fatalError("appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config")
         }
-        print("\(self.implementation.TAG) appId \(implementation.appId)")
+        print("\(CapacitorUpdater.TAG) appId \(implementation.appId)")
         implementation.statsUrl = getConfig().getString("statsUrl", CapacitorUpdaterPlugin.statsUrlDefault)!
         implementation.channelUrl = getConfig().getString("channelUrl", CapacitorUpdaterPlugin.channelUrlDefault)!
         implementation.defaultChannel = getConfig().getString("defaultChannel", "")!
@@ -138,7 +138,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         // According to martin it is not possible to use serverBasePath on ios in a way that allows us to store the bundle once
 
         if !self.initialLoad() {
-            print("\(self.implementation.TAG) unable to force reload, the plugin might fallback to the builtin version")
+            print("\(CapacitorUpdater.TAG) unable to force reload, the plugin might fallback to the builtin version")
         }
 
         let nc = NotificationCenter.default
@@ -161,18 +161,18 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         if !FileManager.default.fileExists(atPath: dest.path) {
-            print("\(self.implementation.TAG) Initial load fail - file at path \(dest.path) doesn't exist. Defaulting to buildin!! \(id)")
+            print("\(CapacitorUpdater.TAG) Initial load fail - file at path \(dest.path) doesn't exist. Defaulting to buildin!! \(id)")
             dest = Bundle.main.resourceURL!.appendingPathComponent("public")
         }
 
-        print("\(self.implementation.TAG) Initial load \(id)")
+        print("\(CapacitorUpdater.TAG) Initial load \(id)")
         // We don't use the viewcontroller here as it does not work during the initial load state
         bridge.setServerBasePath(dest.path)
         return true
     }
 
     private func semaphoreWait(waitTime: Int) {
-        print("\(self.implementation.TAG) semaphoreWait \(waitTime)")
+        print("\(CapacitorUpdater.TAG) semaphoreWait \(waitTime)")
         _ = semaphoreReady.wait(timeout: .now() + .milliseconds(waitTime))
     }
 
@@ -191,16 +191,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         do {
             LatestVersionNative = try Version(UserDefaults.standard.string(forKey: "LatestVersionNative") ?? "0.0.0")
         } catch {
-            print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
+            print("\(CapacitorUpdater.TAG) Cannot get version native \(currentVersionNative)")
         }
         if LatestVersionNative != "0.0.0" && self.currentVersionNative.description != LatestVersionNative.description {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
-                print("\(self.implementation.TAG) Deleting obsolete bundle: \(version.getId())")
+                print("\(CapacitorUpdater.TAG) Deleting obsolete bundle: \(version.getId())")
                 let res = implementation.delete(id: version.getId())
                 if !res {
-                    print("\(self.implementation.TAG) Delete failed, id \(version.getId()) doesn't exist")
+                    print("\(CapacitorUpdater.TAG) Delete failed, id \(version.getId()) doesn't exist")
                 }
             }
         }
@@ -221,12 +221,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setUpdateUrl(_ call: CAPPluginCall) {
         if !getConfig().getBoolean("allowModifyUrl", false) {
-            print("\(self.implementation.TAG) setUpdateUrl called without allowModifyUrl")
+            print("\(CapacitorUpdater.TAG) setUpdateUrl called without allowModifyUrl")
             call.reject("setUpdateUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {
-            print("\(self.implementation.TAG) setUpdateUrl called without url")
+            print("\(CapacitorUpdater.TAG) setUpdateUrl called without url")
             call.reject("setUpdateUrl called without url")
             return
         }
@@ -236,12 +236,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setStatsUrl(_ call: CAPPluginCall) {
         if !getConfig().getBoolean("allowModifyUrl", false) {
-            print("\(self.implementation.TAG) setStatsUrl called without allowModifyUrl")
+            print("\(CapacitorUpdater.TAG) setStatsUrl called without allowModifyUrl")
             call.reject("setStatsUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {
-            print("\(self.implementation.TAG) setStatsUrl called without url")
+            print("\(CapacitorUpdater.TAG) setStatsUrl called without url")
             call.reject("setStatsUrl called without url")
             return
         }
@@ -251,12 +251,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setChannelUrl(_ call: CAPPluginCall) {
         if !getConfig().getBoolean("allowModifyUrl", false) {
-            print("\(self.implementation.TAG) setChannelUrl called without allowModifyUrl")
+            print("\(CapacitorUpdater.TAG) setChannelUrl called without allowModifyUrl")
             call.reject("setChannelUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {
-            print("\(self.implementation.TAG) setChannelUrl called without url")
+            print("\(CapacitorUpdater.TAG) setChannelUrl called without url")
             call.reject("setChannelUrl called without url")
             return
         }
@@ -278,12 +278,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func download(_ call: CAPPluginCall) {
         guard let urlString = call.getString("url") else {
-            print("\(self.implementation.TAG) Download called without url")
+            print("\(CapacitorUpdater.TAG) Download called without url")
             call.reject("Download called without url")
             return
         }
         guard let version = call.getString("version") else {
-            print("\(self.implementation.TAG) Download called without version")
+            print("\(CapacitorUpdater.TAG) Download called without version")
             call.reject("Download called without version")
             return
         }
@@ -291,29 +291,34 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         let sessionKey = call.getString("sessionKey", "")
         var checksum = call.getString("checksum", "")
         let url = URL(string: urlString)
-        print("\(self.implementation.TAG) Downloading \(String(describing: url))")
+        print("\(CapacitorUpdater.TAG) Downloading \(String(describing: url))")
         DispatchQueue.global(qos: .background).async {
             do {
                 let next = try self.implementation.download(url: url!, version: version, sessionKey: sessionKey)
                 if !self.implementation.hasOldPrivateKeyPropertyInConfig {
-                    checksum = try self.implementation.decryptChecksum(checksum: checksum, version: version)
+                    do {
+                        checksum = try CryptoCipherV2.decryptChecksum(checksum: checksum, publicKey: self.implementation.publicKey, version: version)
+                    } catch {
+                        self.implementation.sendStats(action: "decrypt_fail", versionName: version)
+                        throw error
+                    }
                 }
                 if (checksum != "" || self.implementation.publicKey != "") && next.getChecksum() != checksum {
-                    print("\(self.implementation.TAG) Error checksum", next.getChecksum(), checksum)
+                    print("\(CapacitorUpdater.TAG) Error checksum", next.getChecksum(), checksum)
                     self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                     let id = next.getId()
                     let resDel = self.implementation.delete(id: id)
                     if !resDel {
-                        print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
+                        print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist")
                     }
                     throw ObjectSavableError.checksum
                 } else {
-                    print("\(self.implementation.TAG) Good checksum", next.getChecksum(), checksum)
+                    print("\(CapacitorUpdater.TAG) Good checksum", next.getChecksum(), checksum)
                 }
                 self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                 call.resolve(next.toJSON())
             } catch {
-                print("\(self.implementation.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
+                print("\(CapacitorUpdater.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
                 self.notifyListeners("downloadFailed", data: ["version": version])
                 self.implementation.sendStats(action: "download_fail")
                 call.reject("Failed to download from: \(url!)", error.localizedDescription)
@@ -331,16 +336,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         } else {
             dest = self.implementation.getBundleDirectory(id: id)
         }
-        print("\(self.implementation.TAG) Reloading \(id)")
+        print("\(CapacitorUpdater.TAG) Reloading \(id)")
         if let vc = bridge.viewController as? CAPBridgeViewController {
             guard let capBridge = vc.bridge else {
-                print("\(self.implementation.TAG) Cannot get capBridge")
+                print("\(CapacitorUpdater.TAG) Cannot get capBridge")
                 return false
             }
             if keepUrlPathAfterReload {
                 DispatchQueue.main.async {
                     guard let url = vc.webView?.url else {
-                        print("\(self.implementation.TAG) vc.webView?.url is null?")
+                        print("\(CapacitorUpdater.TAG) vc.webView?.url is null?")
                         return
                     }
                     capBridge.setServerBasePath(dest.path)
@@ -367,20 +372,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if self._reload() {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Reload failed")
+            print("\(CapacitorUpdater.TAG) Reload failed")
             call.reject("Reload failed")
         }
     }
 
     @objc func next(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Next called without id")
+            print("\(CapacitorUpdater.TAG) Next called without id")
             call.reject("Next called without id")
             return
         }
-        print("\(self.implementation.TAG) Setting next active id \(id)")
+        print("\(CapacitorUpdater.TAG) Setting next active id \(id)")
         if !self.implementation.setNextBundle(next: id) {
-            print("\(self.implementation.TAG) Set next version failed. id \(id) does not exist.")
+            print("\(CapacitorUpdater.TAG) Set next version failed. id \(id) does not exist.")
             call.reject("Set next version failed. id \(id) does not exist.")
         } else {
             call.resolve(self.implementation.getBundleInfo(id: id).toJSON())
@@ -389,14 +394,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func set(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Set called without id")
+            print("\(CapacitorUpdater.TAG) Set called without id")
             call.reject("Set called without id")
             return
         }
         let res = implementation.set(id: id)
-        print("\(self.implementation.TAG) Set active bundle: \(id)")
+        print("\(CapacitorUpdater.TAG) Set active bundle: \(id)")
         if !res {
-            print("\(self.implementation.TAG) Bundle successfully set to: \(id) ")
+            print("\(CapacitorUpdater.TAG) Bundle successfully set to: \(id) ")
             call.reject("Update failed, id \(id) doesn't exist")
         } else {
             self.reload(call)
@@ -405,7 +410,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func delete(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Delete called without version")
+            print("\(CapacitorUpdater.TAG) Delete called without version")
             call.reject("Delete called without id")
             return
         }
@@ -413,7 +418,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if res {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist or it cannot be deleted (perhaps it is the 'next' bundle)")
+            print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist or it cannot be deleted (perhaps it is the 'next' bundle)")
             call.reject("Delete failed, id \(id) does not exist or it cannot be deleted (perhaps it is the 'next' bundle)")
         }
     }
@@ -451,7 +456,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 call.reject(res.error)
             } else {
                 if self._isAutoUpdateEnabled() && triggerAutoUpdate {
-                    print("\(self.implementation.TAG) Calling autoupdater after channel change!")
+                    print("\(CapacitorUpdater.TAG) Calling autoupdater after channel change!")
                     self.backgroundDownload()
                 }
                 call.resolve(res.toDict())
@@ -461,7 +466,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setChannel(_ call: CAPPluginCall) {
         guard let channel = call.getString("channel") else {
-            print("\(self.implementation.TAG) setChannel called without channel")
+            print("\(CapacitorUpdater.TAG) setChannel called without channel")
             call.reject("setChannel called without channel")
             return
         }
@@ -472,7 +477,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 call.reject(res.error)
             } else {
                 if self._isAutoUpdateEnabled() && triggerAutoUpdate {
-                    print("\(self.implementation.TAG) Calling autoupdater after channel change!")
+                    print("\(CapacitorUpdater.TAG) Calling autoupdater after channel change!")
                     self.backgroundDownload()
                 }
                 call.resolve(res.toDict())
@@ -492,7 +497,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
     @objc func setCustomId(_ call: CAPPluginCall) {
         guard let customId = call.getString("customId") else {
-            print("\(self.implementation.TAG) setCustomId called without customId")
+            print("\(CapacitorUpdater.TAG) setCustomId called without customId")
             call.reject("setCustomId called without customId")
             return
         }
@@ -508,11 +513,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             // If developer wants to reset to the last successful bundle, and that bundle is not
             // the built-in bundle, set it as the bundle to use and reload.
             if toLastSuccessful && !fallback.isBuiltin() {
-                print("\(self.implementation.TAG) Resetting to: \(fallback.toString())")
+                print("\(CapacitorUpdater.TAG) Resetting to: \(fallback.toString())")
                 return self.implementation.set(bundle: fallback) && self._reload()
             }
 
-            print("\(self.implementation.TAG) Resetting to builtin version")
+            print("\(CapacitorUpdater.TAG) Resetting to builtin version")
 
             // Otherwise, reset back to the built-in bundle and reload.
             self.implementation.reset()
@@ -527,8 +532,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if self._reset(toLastSuccessful: toLastSuccessful) {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Reset failed")
-            call.reject("\(self.implementation.TAG) Reset failed")
+            print("\(CapacitorUpdater.TAG) Reset failed")
+            call.reject("\(CapacitorUpdater.TAG) Reset failed")
         }
     }
 
@@ -544,13 +549,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.semaphoreDown()
         let bundle = self.implementation.getCurrentBundle()
         self.implementation.setSuccess(bundle: bundle, autoDeletePrevious: self.autoDeletePrevious)
-        print("\(self.implementation.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(bundle.toString())")
+        print("\(CapacitorUpdater.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(bundle.toString())")
         call.resolve(["bundle": bundle.toJSON()])
     }
 
     @objc func setMultiDelay(_ call: CAPPluginCall) {
         guard let delayConditionList = call.getValue("delayConditions") else {
-            print("\(self.implementation.TAG) setMultiDelay called without delayCondition")
+            print("\(CapacitorUpdater.TAG) setMultiDelay called without delayCondition")
             call.reject("setMultiDelay called without delayCondition")
             return
         }
@@ -566,16 +571,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if delayConditions != nil && "" != delayConditions {
             UserDefaults.standard.set(delayConditions, forKey: DELAY_CONDITION_PREFERENCES)
             UserDefaults.standard.synchronize()
-            print("\(self.implementation.TAG) Delay update saved.")
+            print("\(CapacitorUpdater.TAG) Delay update saved.")
             return true
         } else {
-            print("\(self.implementation.TAG) Failed to delay update, [Error calling '_setMultiDelay()']")
+            print("\(CapacitorUpdater.TAG) Failed to delay update, [Error calling '_setMultiDelay()']")
             return false
         }
     }
 
     private func _cancelDelay(source: String) {
-        print("\(self.implementation.TAG) delay Canceled from \(source)")
+        print("\(CapacitorUpdater.TAG) delay Canceled from \(source)")
         UserDefaults.standard.removeObject(forKey: DELAY_CONDITION_PREFERENCES)
         UserDefaults.standard.synchronize()
     }
@@ -635,9 +640,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         self._cancelDelay(source: "delayVal absent")
                     }
                 case .none:
-                    print("\(self.implementation.TAG) _checkCancelDelay switch case none error")
+                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case none error")
                 case .some:
-                    print("\(self.implementation.TAG) _checkCancelDelay switch case some error")
+                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case some error")
                 }
             }
         }
@@ -647,7 +652,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private func _isAutoUpdateEnabled() -> Bool {
         let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
         if instanceDescriptor?.serverURL != nil {
-            print("⚠️ \(self.implementation.TAG) AutoUpdate is automatic disabled when serverUrl is set.")
+            print("⚠️ \(CapacitorUpdater.TAG) AutoUpdate is automatic disabled when serverUrl is set.")
         }
         return self.autoUpdate && self.updateUrl != "" && instanceDescriptor?.serverURL == nil
     }
@@ -671,7 +676,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.appReadyCheck = DispatchWorkItem(block: {
             self.DeferredNotifyAppReadyCheck()
         })
-        print("\(self.implementation.TAG) Wait for \(self.appReadyTimeout) ms, then check for notifyAppReady")
+        print("\(CapacitorUpdater.TAG) Wait for \(self.appReadyTimeout) ms, then check for notifyAppReady")
         DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(self.appReadyTimeout), execute: self.appReadyCheck!)
     }
 
@@ -679,15 +684,15 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         // Automatically roll back to fallback version if notifyAppReady has not been called yet
         let current: BundleInfo = self.implementation.getCurrentBundle()
         if current.isBuiltin() {
-            print("\(self.implementation.TAG) Built-in bundle is active. We skip the check for notifyAppReady.")
+            print("\(CapacitorUpdater.TAG) Built-in bundle is active. We skip the check for notifyAppReady.")
             return
         }
 
-        print("\(self.implementation.TAG) Current bundle is: \(current.toString())")
+        print("\(CapacitorUpdater.TAG) Current bundle is: \(current.toString())")
 
         if BundleStatus.SUCCESS.localizedString != current.getStatus() {
-            print("\(self.implementation.TAG) notifyAppReady was not called, roll back current bundle: \(current.toString())")
-            print("\(self.implementation.TAG) Did you forget to call 'notifyAppReady()' in your Capacitor App code?")
+            print("\(CapacitorUpdater.TAG) notifyAppReady was not called, roll back current bundle: \(current.toString())")
+            print("\(CapacitorUpdater.TAG) Did you forget to call 'notifyAppReady()' in your Capacitor App code?")
             self.notifyListeners("updateFailed", data: [
                 "bundle": current.toJSON()
             ])
@@ -695,16 +700,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             self.implementation.setError(bundle: current)
             _ = self._reset(toLastSuccessful: true)
             if self.autoDeleteFailed && !current.isBuiltin() {
-                print("\(self.implementation.TAG) Deleting failing bundle: \(current.toString())")
+                print("\(CapacitorUpdater.TAG) Deleting failing bundle: \(current.toString())")
                 let res = self.implementation.delete(id: current.getId(), removeInfo: false)
                 if !res {
-                    print("\(self.implementation.TAG) Delete version deleted: \(current.toString())")
+                    print("\(CapacitorUpdater.TAG) Delete version deleted: \(current.toString())")
                 } else {
-                    print("\(self.implementation.TAG) Failed to delete failed bundle: \(current.toString())")
+                    print("\(CapacitorUpdater.TAG) Failed to delete failed bundle: \(current.toString())")
                 }
             }
         } else {
-            print("\(self.implementation.TAG) notifyAppReady was called. This is fine: \(current.toString())")
+            print("\(CapacitorUpdater.TAG) notifyAppReady was called. This is fine: \(current.toString())")
         }
     }
 
@@ -719,7 +724,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     func sendReadyToJs(current: BundleInfo, msg: String) {
-        print("\(self.implementation.TAG) sendReadyToJs")
+        print("\(CapacitorUpdater.TAG) sendReadyToJs")
         DispatchQueue.global().async {
             self.semaphoreWait(waitTime: self.appReadyTimeout)
             self.notifyListeners("appReady", data: ["bundle": current.toJSON(), "status": msg])
@@ -733,14 +738,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
         self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
         self.sendReadyToJs(current: current, msg: msg)
-        print("\(self.implementation.TAG) endBackGroundTaskWithNotif \(msg) current: \(current.getVersionName()) latestVersionName: \(latestVersionName)")
+        print("\(CapacitorUpdater.TAG) endBackGroundTaskWithNotif \(msg) current: \(current.getVersionName()) latestVersionName: \(latestVersionName)")
         self.endBackGroundTask()
     }
 
     func backgroundDownload() {
         let messageUpdate = self.directUpdate ? "Update will occur now." : "Update will occur next time app moves to background."
         guard let url = URL(string: self.updateUrl) else {
-            print("\(self.implementation.TAG) Error no url or wrong format")
+            print("\(CapacitorUpdater.TAG) Error no url or wrong format")
             return
         }
         DispatchQueue.global(qos: .background).async {
@@ -748,12 +753,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 // End the task if time expires.
                 self.endBackGroundTask()
             }
-            print("\(self.implementation.TAG) Check for update via \(self.updateUrl)")
+            print("\(CapacitorUpdater.TAG) Check for update via \(self.updateUrl)")
             let res = self.implementation.getLatest(url: url, channel: nil)
             let current = self.implementation.getCurrentBundle()
 
             if (res.message) != nil {
-                print("\(self.implementation.TAG) API message: \(res.message ?? "")")
+                print("\(CapacitorUpdater.TAG) API message: \(res.message ?? "")")
                 if res.major == true {
                     self.notifyListeners("majorAvailable", data: ["version": res.version])
                 }
@@ -761,13 +766,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
             if res.version == "builtin" {
-                print("\(self.implementation.TAG) Latest version is builtin")
+                print("\(CapacitorUpdater.TAG) Latest version is builtin")
                 if self.directUpdate {
-                    print("\(self.implementation.TAG) Direct update to builtin version")
+                    print("\(CapacitorUpdater.TAG) Direct update to builtin version")
                     _ = self._reset(toLastSuccessful: false)
                     self.endBackGroundTaskWithNotif(msg: "Updated to builtin version", latestVersionName: res.version, current: self.implementation.getCurrentBundle(), error: false)
                 } else {
-                    print("\(self.implementation.TAG) Setting next bundle to builtin")
+                    print("\(CapacitorUpdater.TAG) Setting next bundle to builtin")
                     _ = self.implementation.setNextBundle(next: BundleInfo.ID_BUILTIN)
                     self.endBackGroundTaskWithNotif(msg: "Next update will be to builtin version", latestVersionName: res.version, current: current, error: false)
                 }
@@ -775,23 +780,23 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             }
             let sessionKey = res.sessionKey ?? ""
             guard let downloadUrl = URL(string: res.url) else {
-                print("\(self.implementation.TAG) Error no url or wrong format")
+                print("\(CapacitorUpdater.TAG) Error no url or wrong format")
                 self.endBackGroundTaskWithNotif(msg: "Error no url or wrong format", latestVersionName: res.version, current: current)
                 return
             }
             let latestVersionName = res.version
             if latestVersionName != "" && current.getVersionName() != latestVersionName {
                 do {
-                    print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). \(messageUpdate)")
+                    print("\(CapacitorUpdater.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). \(messageUpdate)")
                     var nextImpl = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
                     if nextImpl == nil || nextImpl?.isDeleted() == true {
                         if nextImpl?.isDeleted() == true {
-                            print("\(self.implementation.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
+                            print("\(CapacitorUpdater.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
                             let res = self.implementation.delete(id: nextImpl!.getId(), removeInfo: true)
                             if res {
-                                print("\(self.implementation.TAG) Failed bundle deleted: \(nextImpl!.toString())")
+                                print("\(CapacitorUpdater.TAG) Failed bundle deleted: \(nextImpl!.toString())")
                             } else {
-                                print("\(self.implementation.TAG) Failed to delete failed bundle: \(nextImpl!.toString())")
+                                print("\(CapacitorUpdater.TAG) Failed to delete failed bundle: \(nextImpl!.toString())")
                             }
                         }
                         if res.manifest != nil {
@@ -801,25 +806,30 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                         }
                     }
                     guard let next = nextImpl else {
-                        print("\(self.implementation.TAG) Error downloading file")
+                        print("\(CapacitorUpdater.TAG) Error downloading file")
                         self.endBackGroundTaskWithNotif(msg: "Error downloading file", latestVersionName: latestVersionName, current: current)
                         return
                     }
                     if next.isErrorStatus() {
-                        print("\(self.implementation.TAG) Latest bundle already exists and is in error state. Aborting update.")
+                        print("\(CapacitorUpdater.TAG) Latest bundle already exists and is in error state. Aborting update.")
                         self.endBackGroundTaskWithNotif(msg: "Latest version is in error state. Aborting update.", latestVersionName: latestVersionName, current: current)
                         return
                     }
                     if !self.implementation.hasOldPrivateKeyPropertyInConfig {
-                        res.checksum = try self.implementation.decryptChecksum(checksum: res.checksum, version: latestVersionName)
+                        do {
+                            res.checksum = try CryptoCipherV2.decryptChecksum(checksum: res.checksum, publicKey: self.implementation.publicKey, version: latestVersionName)
+                        } catch {
+                            self.implementation.sendStats(action: "decrypt_fail", versionName: latestVersionName)
+                            throw error
+                        }
                     }
                     if res.checksum != "" && next.getChecksum() != res.checksum && res.manifest == nil {
-                        print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
+                        print("\(CapacitorUpdater.TAG) Error checksum", next.getChecksum(), res.checksum)
                         self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                         let id = next.getId()
                         let resDel = self.implementation.delete(id: id)
                         if !resDel {
-                            print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
+                            print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist")
                         }
                         self.endBackGroundTaskWithNotif(msg: "Error checksum", latestVersionName: latestVersionName, current: current)
                         return
@@ -836,13 +846,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                     }
                     return
                 } catch {
-                    print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
+                    print("\(CapacitorUpdater.TAG) Error downloading file", error.localizedDescription)
                     let current: BundleInfo = self.implementation.getCurrentBundle()
                     self.endBackGroundTaskWithNotif(msg: "Error downloading file", latestVersionName: latestVersionName, current: current)
                     return
                 }
             } else {
-                print("\(self.implementation.TAG) No need to update, \(current.getId()) is the latest bundle.")
+                print("\(CapacitorUpdater.TAG) No need to update, \(current.getId()) is the latest bundle.")
                 self.endBackGroundTaskWithNotif(msg: "No need to update, \(current.getId()) is the latest bundle.", latestVersionName: latestVersionName, current: current, error: false)
                 return
             }
@@ -850,7 +860,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func appKilled() {
-        print("\(self.implementation.TAG) onActivityDestroyed: all activity destroyed")
+        print("\(CapacitorUpdater.TAG) onActivityDestroyed: all activity destroyed")
         self._checkCancelDelay(killed: true)
     }
 
@@ -862,19 +872,19 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return DelayCondition(kind: kind, value: value)
         }
         if delayConditionList != nil && delayConditionList?.capacity != 0 {
-            print("\(self.implementation.TAG) Update delayed until delay conditions met")
+            print("\(CapacitorUpdater.TAG) Update delayed until delay conditions met")
             return
         }
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
 
         if next != nil && !next!.isErrorStatus() && next!.getVersionName() != current.getVersionName() {
-            print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
+            print("\(CapacitorUpdater.TAG) Next bundle is: \(next!.toString())")
             if self.implementation.set(bundle: next!) && self._reload() {
-                print("\(self.implementation.TAG) Updated to bundle: \(next!.toString())")
+                print("\(CapacitorUpdater.TAG) Updated to bundle: \(next!.toString())")
                 _ = self.implementation.setNextBundle(next: Optional<String>.none)
             } else {
-                print("\(self.implementation.TAG) Update to bundle: \(next!.toString()) Failed!")
+                print("\(CapacitorUpdater.TAG) Update to bundle: \(next!.toString()) Failed!")
             }
         }
     }
@@ -902,12 +912,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.implementation.sendStats(action: "app_moved_to_foreground", versionName: current.getVersionName())
         if backgroundWork != nil && taskRunning {
             backgroundWork!.cancel()
-            print("\(self.implementation.TAG) Background Timer Task canceled, Activity resumed before timer completes")
+            print("\(CapacitorUpdater.TAG) Background Timer Task canceled, Activity resumed before timer completes")
         }
         if self._isAutoUpdateEnabled() {
             self.backgroundDownload()
         } else {
-            print("\(self.implementation.TAG) Auto update is disabled")
+            print("\(CapacitorUpdater.TAG) Auto update is disabled")
             self.sendReadyToJs(current: current, msg: "disabled")
         }
         self.checkAppReady()
@@ -918,7 +928,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
         guard let url = URL(string: self.updateUrl) else {
-            print("\(self.implementation.TAG) Error no url or wrong format")
+            print("\(CapacitorUpdater.TAG) Error no url or wrong format")
             return
         }
         let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { _ in
@@ -927,7 +937,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 let current = self.implementation.getCurrentBundle()
 
                 if res.version != current.getVersionName() {
-                    print("\(self.implementation.TAG) New version found: \(res.version)")
+                    print("\(CapacitorUpdater.TAG) New version found: \(res.version)")
                     self.backgroundDownload()
                 }
             }
@@ -937,7 +947,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func appMovedToBackground() {
         self.implementation.sendStats(action: "app_moved_to_background")
-        print("\(self.implementation.TAG) Check for pending update")
+        print("\(CapacitorUpdater.TAG) Check for pending update")
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
 
         let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in