hanlde sceanrio related to unknown Identity type

Author: Mansi-mParticle

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

@@ -1523,13 +1523,23 @@ private void confirmEmail(
         boolean hasHashedEmail = hashedEmail != null && !hashedEmail.isEmpty();
 
         if ((hasEmail || hasHashedEmail) && user != null) {
+            MParticle.IdentityType selectedIdentityType = null;
+            try {
+                String identityTypeStr = (kitConfiguration != null)
+                        ? kitConfiguration.getHashedEmailUserIdentityType()
+                        : null;
+                if (identityTypeStr != null && !identityTypeStr.equalsIgnoreCase("Unknown")) {
+                    selectedIdentityType = MParticle.IdentityType.valueOf(identityTypeStr);
+                }
+            } catch (IllegalArgumentException e) {
+                selectedIdentityType = MParticle.IdentityType.Other; // fallback if invalid value
+            }
             String existingEmail = user.getUserIdentities().get(MParticle.IdentityType.Email);
-            String existingHashedEmail = user.getUserIdentities().get(MParticle.IdentityType.Other);
-
+            String existingHashedEmail = selectedIdentityType != null ? user.getUserIdentities().get(selectedIdentityType) : null;
             boolean emailMismatch = hasEmail && !email.equalsIgnoreCase(existingEmail);
             boolean hashedEmailMismatch = hasHashedEmail && !hashedEmail.equalsIgnoreCase(existingHashedEmail);
 
-            if (emailMismatch || hashedEmailMismatch) {
+            if (emailMismatch || (hashedEmailMismatch && selectedIdentityType != null)) {
                 // If there's an existing email but it doesn't match the passed-in email, log a warning
                 if (emailMismatch && existingEmail != null) {
                     Logger.warning(String.format(
@@ -1553,20 +1563,8 @@ else if (hashedEmailMismatch && existingHashedEmail != null) {
                 if (emailMismatch) {
                     identityBuilder.email(email);
                 }
-                if (hashedEmailMismatch && kitConfiguration != null) {
-                    MParticle.IdentityType type = null;
-                    try {
-                        String identityTypeStr = kitConfiguration.getHashedEmailUserIdentityType();
-                        if (identityTypeStr != null && !identityTypeStr.equalsIgnoreCase("UNASSIGNED")) {
-                            type = MParticle.IdentityType.valueOf(identityTypeStr);
-                        }
-                    } catch (IllegalArgumentException e) {
-                        type = MParticle.IdentityType.Other; // fallback if invalid
-                    }
-
-                    if (type != null) {
-                        identityBuilder.userIdentity(type, hashedEmail);
-                    }
+                if (hashedEmailMismatch && selectedIdentityType != null) {
+                    identityBuilder.userIdentity(selectedIdentityType, hashedEmail);
                 }
 
                 IdentityApiRequest identityRequest = identityBuilder.build();

android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt

@@ -1306,7 +1306,7 @@ class KitManagerImplTest {
         )
         method.isAccessible = true
         val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
-        verify(mockTask).addSuccessListener(any())
+        verify(runnable).run()
     }
 
     @Test
@@ -1460,7 +1460,7 @@ class KitManagerImplTest {
     }
 
     @Test
-    fun testConfirmHashedEmail_When_HashedEmailUserIdentityType_Is_UNASSIGNED() {
+    fun testConfirmHashedEmail_When_HashedEmailUserIdentityType_Is_Unknown() {
         var runnable: Runnable = mock(Runnable::class.java)
         var user: MParticleUser = mock(MParticleUser::class.java)
         val instance = MockMParticle()
@@ -1472,7 +1472,7 @@ class KitManagerImplTest {
         }
         val mockedKitConfig = KitConfiguration.createKitConfiguration(configJSONObj)
 
-        `when`(mockedKitConfig.hashedEmailUserIdentityType).thenReturn("UNASSIGNED")
+        `when`(mockedKitConfig.hashedEmailUserIdentityType).thenReturn("Unknown")
         `when`(sideloadedKit.configuration).thenReturn(mockedKitConfig)
         val identityApi = mock(IdentityApi::class.java)
         val oldHashedEmail = "hashed_old@example.com"
@@ -1488,7 +1488,7 @@ class KitManagerImplTest {
             // add placement attributes here if needed
         ]
             """.trimIndent(),
-            "hashedEmailUserIdentityType" to "UNASSIGNED"
+            "hashedEmailUserIdentityType" to "Unknown"
         )
         val field = KitConfiguration::class.java.getDeclaredField("settings")
         field.isAccessible = true
@@ -1508,7 +1508,7 @@ class KitManagerImplTest {
         )
         method.isAccessible = true
         val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
-        verify(mockTask).addSuccessListener(any())
+        verify(runnable).run()
     }
 
     @Test