fix: native build issues

Cap-go · Nov 24, 2022 · 05da8b2 · 05da8b2
1 parent b07a0dc
commit 05da8b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java
@@ -265,7 +265,7 @@ private String getChecksum(File file) throws IOException {
     }
 
     private void decodeFile(File file) throws IOException {
-        if (this.privateKey.equal("")) {
+        if (this.privateKey.equals("")) {
             return;
         }
         try {

diff --git a/ios/Plugin.xcodeproj/project.pbxproj b/ios/Plugin.xcodeproj/project.pbxproj
@@ -287,6 +287,7 @@
 				"${BUILT_PRODUCTS_DIR}/Capacitor/Capacitor.framework",
 				"${BUILT_PRODUCTS_DIR}/CapacitorCordova/Cordova.framework",
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyRSA/SwiftyRSA.framework",
 				"${BUILT_PRODUCTS_DIR}/Version/Version.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -295,6 +296,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capacitor.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cordova.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyRSA.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Version.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ios/Plugin/CapacitorUpdater.swift b/ios/Plugin/CapacitorUpdater.swift
@@ -190,6 +190,16 @@ extension CustomError: LocalizedError {
                 "An unexpected error occurred.",
                 comment: "Unexpected Error"
             )
+        case .cannotDecode:
+            return NSLocalizedString(
+                "Decoding the zip failed with this key",
+                comment: "Invalid private key"
+            )
+        case .cannotWrite:
+            return NSLocalizedString(
+                "Cannot write to the destination",
+                comment: "Invalid destination"
+            )
         }
     }
 }
@@ -426,7 +436,7 @@ extension CustomError: LocalizedError {
                     self.notifyDownload(id, 71)
                     do {
                         checksum = self.getChecksum(filePath: fileURL)
-                        decodeFile(filePath: fileURL)
+                        try self.decodeFile(filePath: fileURL)
                         try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.documentsDir.appendingPathComponent(self.bundleDirectoryHot))
                         self.notifyDownload(id, 85)
                         try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.libraryDir.appendingPathComponent(self.bundleDirectory))
-Original file line number
+Diff line change
@@ Expand Up / @@ -265,7 +265,7 @@ private String getChecksum(File file) throws IOException { @@
         }
         private void decodeFile(File file) throws IOException {
-            if (this.privateKey.equal("")) {
+            if (this.privateKey.equals("")) {
                 return;
             }
             try {
@@ Expand Down @@