@capgo/capacitor-updater 4.17.12 → 4.17.20

package/android/src/main/java/ee/forgr/capacitor_updater/BundleInfo.java

@@ -83,7 +83,7 @@ public class BundleInfo {
     return (
       !this.isBuiltin() &&
       this.downloaded != null &&
-      !this.downloaded.equals("") &&
+      !this.downloaded.isEmpty() &&
       !this.isDeleted()
     );
   }

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java

@@ -337,7 +337,11 @@ public class CapacitorUpdater {
         checksum
       );
       this.saveBundleInfo(id, info);
-      if (!checksumRes.equals("") && !checksumRes.equals(checksum)) {
+      if (
+        checksumRes != null &&
+        !checksumRes.isEmpty() &&
+        !checksumRes.equals(checksum)
+      ) {
         Log.e(
           CapacitorUpdater.TAG,
           "Error checksum " + info.getChecksum() + " " + checksum
@@ -463,7 +467,13 @@ public class CapacitorUpdater {
 
   private void decryptFile(final File file, final String ivSessionKey)
     throws IOException {
-    if (this.privateKey.equals("") || ivSessionKey.equals("")) {
+    // (str != null && !str.isEmpty())
+    if (
+      this.privateKey == null ||
+      this.privateKey.isEmpty() ||
+      ivSessionKey == null ||
+      ivSessionKey.isEmpty()
+    ) {
       return;
     }
     try {

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -47,7 +47,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "4.17.12";
+  private final String PLUGIN_VERSION = "4.17.20";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -1053,7 +1053,7 @@ public class CapacitorUpdaterPlugin
       for (DelayCondition delayCondition : delayConditionList) {
         if (delayCondition.getKind().toString().equals("background")) {
           String value = delayCondition.getValue();
-          backgroundValue = (value != null || !value.equals("")) ? value : "0";
+          backgroundValue = (value != null && !value.isEmpty()) ? value : "0";
         }
       }
       if (backgroundValue != null) {

package/android/src/main/java/ee/forgr/capacitor_updater/DownloadService.java

@@ -104,10 +104,10 @@ public class DownloadService extends IntentService {
     String error
   ) {
     Intent intent = new Intent(NOTIFICATION);
-    if (!dest.equals("")) {
+    if (dest != null && !dest.isEmpty()) {
       intent.putExtra(FILEDEST, dest);
     }
-    if (!error.equals("")) {
+    if (error != null && !error.isEmpty()) {
       intent.putExtra(ERROR, error);
     }
     intent.putExtra(ID, id);

package/ios/Plugin/BundleInfo.swift

@@ -72,7 +72,7 @@ import Foundation
     }
 
     public func getVersionName() -> String {
-        return self.version == "" ? BundleInfo.ID_BUILTIN : self.version
+        return (self.version ?? "").isEmpty ? BundleInfo.ID_BUILTIN : self.version
     }
 
     public func setVersionName(version: String) -> BundleInfo {

package/ios/Plugin/CapacitorUpdater.swift

@@ -334,7 +334,7 @@ extension CustomError: LocalizedError {
     }
 
     private func decryptFile(filePath: URL, sessionKey: String) throws {
-        if self.privateKey == "" || sessionKey == "" {
+        if (self.privateKey ?? "").isEmpty || (sessionKey ?? "").isEmpty {
             print("\(self.TAG) Cannot found privateKey or sessionKey")
             return
         }
@@ -437,7 +437,7 @@ extension CustomError: LocalizedError {
     private func setCurrentBundle(bundle: String) {
         UserDefaults.standard.set(bundle, forKey: self.CAP_SERVER_PATH)
         UserDefaults.standard.synchronize()
-        print("\(self.TAG) Current bundle set to: \(bundle == "" ? BundleInfo.ID_BUILTIN : bundle)")
+        print("\(self.TAG) Current bundle set to: \((bundle ?? "").isEmpty ? BundleInfo.ID_BUILTIN : bundle)")
     }
 
     public func download(url: URL, version: String, sessionKey: String) throws -> BundleInfo {
@@ -625,7 +625,7 @@ extension CustomError: LocalizedError {
 
     func setChannel(channel: String) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
-        if self.channelUrl == "" {
+        if (self.channelUrl ?? "").isEmpty {
             print("\(self.TAG) Channel URL is not set")
             setChannel.message = "Channel URL is not set"
             setChannel.error = "missing_config"
@@ -662,7 +662,7 @@ extension CustomError: LocalizedError {
 
     func getChannel() -> GetChannel {
         let getChannel: GetChannel = GetChannel()
-        if self.channelUrl == "" {
+        if (self.channelUrl ?? "").isEmpty {
             print("\(self.TAG) Channel URL is not set")
             getChannel.message = "Channel URL is not set"
             getChannel.error = "missing_config"
@@ -702,7 +702,7 @@ extension CustomError: LocalizedError {
     }
 
     func sendStats(action: String, versionName: String) {
-        if self.statsUrl == "" {
+        if (self.statsUrl ?? "").isEmpty {
             return
         }
         var parameters: InfoObject = self.createInfoObject()
@@ -797,7 +797,7 @@ extension CustomError: LocalizedError {
         guard let bundlePath: String = UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) else {
             return BundleInfo.ID_BUILTIN
         }
-        if bundlePath == "" {
+        if (bundlePath ?? "").isEmpty {
             return BundleInfo.ID_BUILTIN
         }
         let bundleID: String = bundlePath.components(separatedBy: "/").last ?? bundlePath

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -9,7 +9,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "4.17.12"
+    private let PLUGIN_VERSION: String = "4.17.20"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.17.12",
+  "version": "4.17.20",
   "packageManager": "pnpm@7.26.2",
   "license": "LGPL-3.0-only",
   "description": "Live update for capacitor apps",
@@ -46,31 +46,32 @@
     "prettier": "prettier --config .prettierrc.js \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api CapacitorUpdaterPlugin --output-readme README.md --output-json dist/docs.json",
+    "docgen:api": "docgen --api CapacitorUpdaterPlugin --output-readme api.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^4.5.0",
-    "@capacitor/cli": "^4.5.0",
-    "@capacitor/core": "^4.5.0",
+    "@capacitor/android": "^4.6.3",
+    "@capacitor/cli": "^4.6.3",
+    "@capacitor/core": "^4.6.3",
     "@capacitor/docgen": "^0.2.0",
-    "@capacitor/ios": "^4.5.0",
+    "@capacitor/ios": "^4.6.3",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^2.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
-    "@types/node": "^18.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
-    "eslint": "^8.28.0",
-    "eslint-plugin-import": "^2.26.0",
-    "prettier": "^2.8.0",
+    "@types/node": "^18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.50.0",
+    "@typescript-eslint/parser": "^5.50.0",
+    "eslint": "^8.33.0",
+    "eslint-plugin-import": "^2.27.5",
+    "prettier": "^2.8.3",
     "prettier-plugin-java": "^2.0.0",
     "rimraf": "^3.0.2",
-    "rollup": "^3.4.0",
+    "rollup": "^3.13.0",
     "swiftlint": "^1.0.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "@capacitor/core": "^4.0.0"