fix: ios part

Cap-go · Jun 30, 2022 · 2ff3224 · 2ff3224
1 parent 3fdae2b
commit 2ff3224
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/ios/Plugin/BundleInfo.swift b/ios/Plugin/BundleInfo.swift
@@ -3,8 +3,8 @@ import Foundation
 
 
 @objc public class BundleInfo: NSObject, Decodable, Encodable {
-    public static let VERSION_BUILTIN: String = "builtin"
-    public static let VERSION_UNKNOWN: String = "unknown"
+    public static let ID_BUILTIN: String = "builtin"
+    public static let ID_UNKNOWN: String = "unknown"
     public static let DOWNLOADED_BUILTIN: String = "1970-01-01T00:00:00.000Z"
 
     private let downloaded: String
@@ -28,11 +28,11 @@ import Foundation
     }
 
     public func isBuiltin() -> Bool {
-        return BundleInfo.VERSION_BUILTIN == self.id
+        return BundleInfo.ID_BUILTIN == self.id
     }
 
     public func isUnknown() -> Bool {
-        return BundleInfo.VERSION_UNKNOWN == self.id
+        return BundleInfo.ID_UNKNOWN == self.id
     }
 
     public func isErrorStatus() -> Bool {
@@ -52,15 +52,15 @@ import Foundation
     }
 
     public func getId() -> String {
-        return self.isBuiltin() ? BundleInfo.VERSION_BUILTIN : self.id
+        return self.isBuiltin() ? BundleInfo.ID_BUILTIN : self.id
     }
 
     public func setId(id: String) -> BundleInfo {
         return BundleInfo(id: id, version: self.version, status: self.status, downloaded: self.downloaded)
     }
 
     public func getVersionName() -> String {
-        return self.version == "" ? BundleInfo.VERSION_BUILTIN : self.version
+        return self.version == "" ? BundleInfo.ID_BUILTIN : self.version
     }
 
     public func setVersionName(version: String) -> BundleInfo {

diff --git a/ios/Plugin/CapacitorUpdater.swift b/ios/Plugin/CapacitorUpdater.swift
@@ -413,9 +413,9 @@ extension CustomError: LocalizedError {
         }
     }
 
-    public func getBundleInfo(id: String = BundleInfo.VERSION_BUILTIN) -> BundleInfo {
+    public func getBundleInfo(id: String = BundleInfo.ID_BUILTIN) -> BundleInfo {
         print("\(self.TAG) Getting info for [\(id)]")
-        if(BundleInfo.VERSION_BUILTIN == id) {
+        if(BundleInfo.ID_BUILTIN == id) {
             return BundleInfo(id: id, version: "", status: BundleStatus.SUCCESS)
         }
         do {
@@ -476,7 +476,7 @@ extension CustomError: LocalizedError {
 
     private func getCurrentBundleVersion() -> String {
         if(self.isUsingBuiltin()) {
-            return BundleInfo.VERSION_BUILTIN
+            return BundleInfo.ID_BUILTIN
         } else {
             let path: String = self.getCurrentBundleId()
             return path.lastPathComponent
@@ -496,12 +496,12 @@ extension CustomError: LocalizedError {
     }
 
     public func getFallbackVersion() -> BundleInfo {
-        let id: String = UserDefaults.standard.string(forKey: self.FALLBACK_VERSION) ?? BundleInfo.VERSION_BUILTIN
+        let id: String = UserDefaults.standard.string(forKey: self.FALLBACK_VERSION) ?? BundleInfo.ID_BUILTIN
         return self.getBundleInfo(id: id)
     }
 
     private func setFallbackVersion(fallback: BundleInfo?) {
-        UserDefaults.standard.set(fallback == nil ? BundleInfo.VERSION_BUILTIN : fallback!.getId(), forKey: self.FALLBACK_VERSION)
+        UserDefaults.standard.set(fallback == nil ? BundleInfo.ID_BUILTIN : fallback!.getId(), forKey: self.FALLBACK_VERSION)
     }
 
     public func getNextVersion() -> BundleInfo? {

diff --git a/ios/Plugin/CapacitorUpdaterPlugin.swift b/ios/Plugin/CapacitorUpdaterPlugin.swift
@@ -373,7 +373,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 print("\(self.implementation.TAG) Did you forget to call 'notifyAppReady()' in your Capacitor App code?")
 
                 self.notifyListeners("updateFailed", data: [
-                    "version": current.toJSON()
+                    "bundle": current.toJSON()
                 ])
                 self.implementation.sendStats(action: "revert", bundle: current)
                 if (!fallback.isBuiltin() && !(fallback == current)) {