fix: issue with empty or null value

Cap-go · Feb 2, 2023 · d8acacc · d8acacc
1 parent 15e3300
commit d8acacc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/BundleInfo.java b/android/src/main/java/ee/forgr/capacitor_updater/BundleInfo.java
@@ -83,7 +83,7 @@ public boolean isDownloaded() {
     return (
       !this.isBuiltin() &&
       this.downloaded != null &&
-      !this.downloaded.equals("") &&
+      !this.downloaded.isEmpty() &&
       !this.isDeleted()
     );
   }

diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java
@@ -337,7 +337,7 @@ public void finishDownload(
         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 +463,8 @@ private String getChecksum(File file) throws IOException {
 
   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 {

diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java
@@ -1053,7 +1053,7 @@ public void onActivityStopped(@NonNull final Activity activity) {
       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) {

diff --git a/android/src/main/java/ee/forgr/capacitor_updater/DownloadService.java b/android/src/main/java/ee/forgr/capacitor_updater/DownloadService.java
@@ -104,10 +104,10 @@ private void publishResults(
     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);

diff --git a/ios/Plugin/BundleInfo.swift b/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 {

diff --git a/ios/Plugin/CapacitorUpdater.swift b/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