Merge pull request #868 from Iterable/evan/MOB-10624-add-anonymous-user-id-to-keychain

[MOB-10624] add anonymous user id to keychain

Author: evantk91

iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java

@@ -102,14 +102,12 @@ public class IterableConfig {
     final boolean enableEmbeddedMessaging;
 
     /**
-
-	/**
      * This controls whether the SDK should allow event replay from local storage to logged in profile
      * and merging between the generated anonymous profile and the logged in profile by default.
      */
     final IterableIdentityResolution identityResolution;
 
-	/**
+    /**
      * Handler for decryption failures of PII information.
      * Before calling this handler, the SDK will clear the PII information and create new encryption keys
      */
@@ -154,15 +152,13 @@ public static class Builder {
         private String[] allowedProtocols = new String[0];
         private IterableDataRegion dataRegion = IterableDataRegion.US;
         private boolean useInMemoryStorageForInApps = false;
-		private IterableDecryptionFailureHandler decryptionFailureHandler;
-
+        private IterableDecryptionFailureHandler decryptionFailureHandler;
         private boolean encryptionEnforced = false;
         private boolean enableAnonActivation = false;
         private boolean enableEmbeddedMessaging = false;
         private int eventThresholdLimit = 100;
         private IterableIdentityResolution identityResolution = new IterableIdentityResolution();
         private IterableAnonUserHandler iterableAnonUserHandler;
-		private IterableDecryptionFailureHandler decryptionFailureHandler;
 
         @NonNull
         public Builder setIterableAnonUserHandler(@NonNull IterableAnonUserHandler iterableAnonUserHandler) {
@@ -346,8 +342,6 @@ public Builder setEnableEmbeddedMessaging(boolean enableEmbeddedMessaging) {
         }
 
         /**
-
-		/**
          * Set whether the SDK should replay events from local storage to the logged in profile
          * and set whether the SDK should merge the generated anonymous profile and the logged in profile.
          * This can be overwritten by a parameter passed into setEmail or setUserId.
@@ -357,8 +351,10 @@ public Builder setEnableEmbeddedMessaging(boolean enableEmbeddedMessaging) {
 
         public Builder setIdentityResolution(IterableIdentityResolution identityResolution) {
             this.identityResolution = identityResolution;
+            return this;
+        }
 
-		/**
+        /**
          * Set a handler for decryption failures that can be used to handle data recovery
          * @param handler Decryption failure handler provided by the app
          */

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

@@ -8,6 +8,7 @@ class IterableKeychain {
         private const val TAG = "IterableKeychain"
         const val KEY_EMAIL = "iterable-email"
 		const val KEY_USER_ID = "iterable-user-id"
+        const val KEY_ANON_USER_ID = "iterable-anon-user-id"
 		const val KEY_AUTH_TOKEN = "iterable-auth-token"
     }
 
@@ -39,7 +40,7 @@ class IterableKeychain {
                     }
                 }
                 dataMigrator.attemptMigration()
-				IterableLogger.v(TAG, "Migration completed")
+                IterableLogger.v(TAG, "Migration completed")
 			}
         } catch (e: Exception) {
             IterableLogger.w(TAG, "Migration failed, clearing data", e)
@@ -52,6 +53,7 @@ class IterableKeychain {
         sharedPrefs.edit()
             .remove(KEY_EMAIL)
             .remove(KEY_USER_ID)
+            .remove(KEY_ANON_USER_ID)
             .remove(KEY_AUTH_TOKEN)
             .apply()
 
@@ -96,4 +98,7 @@ class IterableKeychain {
 
     fun getAuthToken() = secureGet(KEY_AUTH_TOKEN)
     fun saveAuthToken(authToken: String?) = secureSave(KEY_AUTH_TOKEN, authToken)
+
+    fun getUserIdAnon() = secureGet(KEY_ANON_USER_ID)
+    fun saveUserIdAnon(userIdAnon: String?) = secureSave(KEY_ANON_USER_ID, userIdAnon)
 }