[MOB-9235] Always encrypting

Author: sumeruchat

iterableapi/src/main/java/com/iterable/iterableapi/IterableKeychain.kt

@@ -16,9 +16,9 @@ class IterableKeychain {
     private var sharedPrefs: SharedPreferences
     private val encryptor: IterableDataEncryptor
 
-    private val emailKey = "iterable-email"
-    private val userIdKey = "iterable-user-id"
-    private val authTokenKey = "iterable-auth-token"
+    internal val emailKey = "iterable-email"
+    internal val userIdKey = "iterable-user-id"
+    internal val authTokenKey = "iterable-auth-token"
 
     constructor(context: Context) {
         sharedPrefs = context.getSharedPreferences(
@@ -28,11 +28,16 @@ class IterableKeychain {
         encryptor = IterableDataEncryptor()
         IterableLogger.v(TAG, "SharedPreferences being used with encryption")
 
-        // Attempt migration from encrypted preferences
-        IterableKeychainEncryptedDataMigrator(context, sharedPrefs, this).attemptMigration()
+        try {
+            // Attempt migration from encrypted preferences
+            IterableKeychainEncryptedDataMigrator(context, sharedPrefs, this).attemptMigration()
+        } catch (e: IterableKeychainEncryptedDataMigrator.MigrationException) {
+            IterableLogger.w(TAG, "Migration failed, clearing data", e)
+            handleDecryptionError()
+        }
     }
 
-    fun handleDecryptionError() {
+    private fun handleDecryptionError() {
         IterableLogger.w(TAG, "Decryption failed, clearing all data and regenerating key")
         sharedPrefs.edit()
             .remove(emailKey)

iterableapi/src/main/java/com/iterable/iterableapi/IterableKeychainEncryptedDataMigrator.kt

@@ -14,34 +14,31 @@ class IterableKeychainEncryptedDataMigrator(
     private val TAG = "IterableKeychainMigrator"
 
     private val encryptedSharedPrefsFileName = "iterable-encrypted-shared-preferences"
-    private val migrationAttemptedKey = "iterable-encrypted-migration-attempted"
     private val migrationStartedKey = "iterable-encrypted-migration-started"
     private val migrationCompletedKey = "iterable-encrypted-migration-completed"
 
-    private val emailKey = "iterable-email"
-    private val userIdKey = "iterable-user-id"
-    private val authTokenKey = "iterable-auth-token"
+    class MigrationException(message: String, cause: Throwable? = null) : Exception(message, cause)
 
     fun attemptMigration() {
-        // Skip if migration was already attempted and completed
+        // Skip if migration was already completed
         if (sharedPrefs.getBoolean(migrationCompletedKey, false)) {
             IterableLogger.v(TAG, "Migration was already completed, skipping")
             return
         }
 
-        // Check if migration was started but not completed (potential crash during migration)
-        if (sharedPrefs.getBoolean(migrationStartedKey, false)) {
-            IterableLogger.w(TAG, "Previous migration attempt was interrupted, clearing data")
-            keychain.handleDecryptionError()
-            return
-        }
-
         // Only attempt migration on Android M and above
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             markMigrationCompleted()
             return
         }
 
+        // If previous migration was interrupted, mark as completed and throw exception
+        if (sharedPrefs.getBoolean(migrationStartedKey, false)) {
+            IterableLogger.w(TAG, "Previous migration attempt was interrupted")
+            markMigrationCompleted()
+            throw MigrationException("Previous migration attempt was interrupted")
+        }
+
         // Mark migration as started
         sharedPrefs.edit()
             .putBoolean(migrationStartedKey, true)
@@ -73,17 +70,18 @@ class IterableKeychainEncryptedDataMigrator(
 
                 IterableLogger.v(TAG, "Successfully migrated data from encrypted preferences")
             } catch (e: Throwable) {
-                IterableLogger.w(TAG, "Failed to access encrypted preferences, skipping migration", e)
-                markMigrationCompleted() // Mark as completed even on failure to prevent retries
+                IterableLogger.w(TAG, "Failed to access encrypted preferences", e)
+                markMigrationCompleted() // Mark as completed even on failure
+                throw MigrationException("Failed to migrate data", e)
             }
         }.start()
     }
 
     private fun migrateData(encryptedPrefs: SharedPreferences) {
         // Use keychain methods to ensure proper encryption
-        encryptedPrefs.getString(emailKey, null)?.let { keychain.saveEmail(it) }
-        encryptedPrefs.getString(userIdKey, null)?.let { keychain.saveUserId(it) }
-        encryptedPrefs.getString(authTokenKey, null)?.let { keychain.saveAuthToken(it) }
+        encryptedPrefs.getString(keychain.emailKey, null)?.let { keychain.saveEmail(it) }
+        encryptedPrefs.getString(keychain.userIdKey, null)?.let { keychain.saveUserId(it) }
+        encryptedPrefs.getString(keychain.authTokenKey, null)?.let { keychain.saveAuthToken(it) }
     }
 
     private fun markMigrationCompleted() {