Merge branch 'dev'

emartech · Oct 10, 2024 · e7d45e7 · e7d45e7
2 parents 2284625 + c29dcc0
commit e7d45e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/com/emarsys/core/storage/EmarsysEncryptedSharedPreferencesV3.kt b/core/src/main/java/com/emarsys/core/storage/EmarsysEncryptedSharedPreferencesV3.kt
@@ -91,7 +91,7 @@ class EmarsysEncryptedSharedPreferencesV3(
         private val editor: SharedPreferences.Editor = realPreferences.edit()
 
         override fun putString(key: String, value: String?): SharedPreferences.Editor {
-            editor.putString(key, encryptString(value ?: ""))
+            editor.putString(key, encryptString(value))
             return this
         }
 
@@ -143,7 +143,8 @@ class EmarsysEncryptedSharedPreferencesV3(
             editor
         }
 
-        private fun encryptString(value: String): String {
+        private fun encryptString(value: String?): String? {
+            value ?: return null
             return sharedPreferenceCrypto.encrypt(value, secretKey)
         }
     }

diff --git a/core/src/main/java/com/emarsys/core/util/log/Logger.kt b/core/src/main/java/com/emarsys/core/util/log/Logger.kt
@@ -153,7 +153,7 @@ class Logger(
 
     private fun shouldLogBasedOnRemoteConfig(logLevel: LogLevel): Boolean {
         val savedLogLevel: LogLevel =
-            if (logLevelStorage.get() == null) ERROR else valueOf(logLevelStorage.get()!!)
+            if (logLevelStorage.get().isNullOrBlank()) ERROR else valueOf(logLevelStorage.get()!!)
 
         return logLevel.priority >= savedLogLevel.priority
     }