[MOB-9235] Cleanup

Author: sumeruchat

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

@@ -107,7 +107,7 @@ class IterableDataEncryptor {
 
     class DecryptionException(message: String, cause: Throwable? = null) : Exception(message, cause)
 
-    fun clearKeyAndData(sharedPrefs: SharedPreferences) {
+    fun resetKeys() {
         try {
             keyStore.deleteEntry(ITERABLE_KEY_ALIAS)
             generateKey()

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

@@ -55,14 +55,14 @@ class IterableKeychain {
             .remove(KEY_AUTH_TOKEN)
             .apply()
 
-        encryptor.clearKeyAndData(sharedPrefs)
+        encryptor.resetKeys()
         decryptionFailureHandler?.onDecryptionFailed(e ?: Exception("Unknown decryption error"))
     }
 
     private fun secureGet(key: String): String? {
         return try {
             sharedPrefs.getString(key, null)?.let { encryptor.decrypt(it) }
-        } catch (e: IterableDataEncryptor.DecryptionException) {
+        } catch (e: Exception) {
             handleDecryptionError(e)
             null
         }

iterableapi/src/test/java/com/iterable/iterableapi/IterableDataEncryptorTest.java

@@ -130,12 +130,12 @@ public void testDecryptTamperedData() {
     }
 
     @Test
-    public void testClearKeyAndData() {
+    public void testResetKeys() {
         String originalText = "test data";
         String encrypted = encryptor.encrypt(originalText);
 
         // Clear the key
-        encryptor.clearKeyAndData(sharedPreferences);
+        encryptor.resetKeys();
 
         // Try to decrypt the data encrypted with the old key
         try {
@@ -180,7 +180,7 @@ public void testKeyRegeneration() throws Exception {
         String encrypted1 = encryptor1.encrypt(testData);
 
         // Delete the key
-        encryptor1.clearKeyAndData(sharedPreferences);
+        encryptor1.resetKeys();
 
         // Create second encryptor which should generate a new key
         IterableDataEncryptor encryptor2 = new IterableDataEncryptor();
@@ -279,7 +279,7 @@ public void testDecryptionAfterKeyLoss() {
         String encrypted = encryptor.encrypt(testData);
 
         // Clear the key and generate a new one
-        encryptor.clearKeyAndData(sharedPreferences);
+        encryptor.resetKeys();
 
         try {
             encryptor.decrypt(encrypted);

iterableapi/src/test/java/com/iterable/iterableapi/IterableKeychainEncryptedDataMigratorTest.java

@@ -248,4 +248,24 @@ public void testMigrationTimeout() throws InterruptedException {
         verify(mockEditor, times(2)).apply();
     }
 
+    @Test
+    public void testNullEncryptedPrefs() throws InterruptedException {
+        // Test behavior when encrypted prefs creation fails
+        CountDownLatch latch = new CountDownLatch(1);
+        AtomicReference<Throwable> error = new AtomicReference<>();
+
+        migrator.setMockEncryptedPrefs(null);
+        migrator.setMigrationCompletionCallback(throwable -> {
+            error.set(throwable);
+            latch.countDown();
+            return null;
+        });
+
+        migrator.attemptMigration();
+        
+        assertTrue(latch.await(5, TimeUnit.SECONDS));
+        assertNotNull("Should have received an error", error.get());
+        assertTrue(error.get().getMessage().contains("Failed to create or obtain encrypted preferences"));
+    }
+
 } 

iterableapi/src/test/java/com/iterable/iterableapi/IterableKeychainTest.kt

@@ -74,11 +74,15 @@ class IterableKeychainTest {
 
         // Setup encrypt/decrypt behavior
         `when`(mockEncryptor.encrypt(any())).thenAnswer { invocation ->
-            "encrypted_${invocation.arguments[0]}"
+            val input = invocation.arguments[0] as String?
+            input?.let { "encrypted_$it" }
         }
+        
         `when`(mockEncryptor.decrypt(any())).thenAnswer { invocation ->
-            val encrypted = invocation.arguments[0] as String
-            if (encrypted.startsWith("encrypted_")) {
+            val encrypted = invocation.arguments[0] as String?
+            if (encrypted == null) {
+                null
+            } else if (encrypted.startsWith("encrypted_")) {
                 encrypted.substring("encrypted_".length)
             } else {
                 throw IterableDataEncryptor.DecryptionException("Invalid encrypted value")
@@ -148,9 +152,12 @@ class IterableKeychainTest {
 
     @Test
     fun testDecryptionFailure() {
-        // Setup mock to simulate decryption failure
+        // Setup mock to throw runtime exception instead
+        `when`(mockEncryptor.decrypt(any())).thenAnswer { 
+            throw RuntimeException("Test decryption failed")
+        }
         `when`(mockSharedPrefs.getString(eq("iterable-email"), isNull()))
-            .thenReturn("corrupted_encrypted_value")
+            .thenReturn("any_encrypted_value")
 
         val result = keychain.getEmail()
 
@@ -160,12 +167,35 @@ class IterableKeychainTest {
         verify(mockEditor).remove("iterable-auth-token")
         verify(mockEditor).apply()
 
-        // Verify failure handler was called
+        // Verify failure handler was called with any exception
         verify(mockDecryptionFailureHandler).onDecryptionFailed(any())
+        
+        // Verify encryptor keys were reset
+        verify(mockEncryptor).resetKeys()
 
         assertNull(result)
     }
 
+    @Test
+    fun testDecryptionFailureForAllOperations() {
+        // Setup mock to throw runtime exception
+        `when`(mockEncryptor.decrypt(any())).thenAnswer { 
+            throw RuntimeException("Test decryption failed")
+        }
+        `when`(mockSharedPrefs.getString(any(), isNull())).thenReturn("any_encrypted_value")
+        
+        // Test all getter methods
+        assertNull(keychain.getEmail())
+        assertNull(keychain.getUserId())
+        assertNull(keychain.getAuthToken())
+        
+        // Verify failure handler was called exactly once for each operation
+        verify(mockDecryptionFailureHandler, times(3)).onDecryptionFailed(any())
+        
+        // Verify keys were reset for each failure
+        verify(mockEncryptor, times(3)).resetKeys()
+    }
+
     @Test
     fun testSaveNullValues() {
         keychain.saveEmail(null)