handle the UNASSIGNED default scenario

Author: Mansi-mParticle

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

@@ -1554,13 +1554,19 @@ else if (hashedEmailMismatch && existingHashedEmail != null) {
                     identityBuilder.email(email);
                 }
                 if (hashedEmailMismatch && kitConfiguration != null) {
-                    MParticle.IdentityType type;
+                    MParticle.IdentityType type = null;
                     try {
-                        type = MParticle.IdentityType.valueOf(kitConfiguration.getHashedEmailUserIdentityType());
-                    } catch (IllegalArgumentException | NullPointerException e) {
-                        type = MParticle.IdentityType.Other; // fallback if null or invalid
+                        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);
                     }
-                    identityBuilder.userIdentity(type, hashedEmail);
                 }
 
                 IdentityApiRequest identityRequest = identityBuilder.build();

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

@@ -1407,6 +1407,111 @@ class KitManagerImplTest {
         verify(runnable).run()
     }
 
+    @Test
+    fun testConfirmHashedEmail_When_HashedEmailUserIdentityType_Is_Other3(){
+        var runnable: Runnable = mock(Runnable::class.java)
+        var user: MParticleUser = mock(MParticleUser::class.java)
+        val instance = MockMParticle()
+        val sideloadedKit = mock(MPSideloadedKit::class.java)
+        val kitId = 6000000
+
+        val configJSONObj = JSONObject().apply {
+            put("id", kitId)
+        }
+        val mockedKitConfig = KitConfiguration.createKitConfiguration(configJSONObj)
+
+        `when`(mockedKitConfig.hashedEmailUserIdentityType).thenReturn("Other3")
+        `when`(sideloadedKit.configuration).thenReturn(mockedKitConfig)
+        val identityApi = mock(IdentityApi::class.java)
+        val oldHashedEmail = "hashed_old@example.com"
+        val mockTask = mock(MParticleTask::class.java) as MParticleTask<IdentityApiResult>
+        `when`(identityApi.identify(any())).thenReturn(mockTask)
+        val identities: MutableMap<MParticle.IdentityType, String> = HashMap()
+        identities.put(MParticle.IdentityType.Other, oldHashedEmail)
+        `when`(user.userIdentities).thenReturn(identities)
+        instance.setIdentityApi(identityApi)
+        val settingsMap = hashMapOf(
+            "placementAttributesMapping" to """
+        [
+            // add placement attributes here if needed
+        ]
+    """.trimIndent(),
+            "hashedEmailUserIdentityType" to "Other3"
+        )
+        val field = KitConfiguration::class.java.getDeclaredField("settings")
+        field.isAccessible = true
+        field.set(mockedKitConfig, settingsMap)
+
+        val options = MParticleOptions.builder(MockContext())
+            .sideloadedKits(mutableListOf(sideloadedKit) as List<SideloadedKit>).build()
+        val manager: KitManagerImpl = MockKitManagerImpl(options)
+        val method: Method = KitManagerImpl::class.java.getDeclaredMethod(
+            "confirmEmail",
+            String::class.java,
+            String::class.java,
+            MParticleUser::class.java,
+            IdentityApi::class.java,
+            KitConfiguration::class.java,
+            Runnable::class.java
+        )
+        method.isAccessible = true
+        val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
+        verify(mockTask).addSuccessListener(any())
+    }
+
+
+    @Test
+    fun testConfirmHashedEmail_When_HashedEmailUserIdentityType_Is_UNASSIGNED(){
+        var runnable: Runnable = mock(Runnable::class.java)
+        var user: MParticleUser = mock(MParticleUser::class.java)
+        val instance = MockMParticle()
+        val sideloadedKit = mock(MPSideloadedKit::class.java)
+        val kitId = 6000000
+
+        val configJSONObj = JSONObject().apply {
+            put("id", kitId)
+        }
+        val mockedKitConfig = KitConfiguration.createKitConfiguration(configJSONObj)
+
+        `when`(mockedKitConfig.hashedEmailUserIdentityType).thenReturn("UNASSIGNED")
+        `when`(sideloadedKit.configuration).thenReturn(mockedKitConfig)
+        val identityApi = mock(IdentityApi::class.java)
+        val oldHashedEmail = "hashed_old@example.com"
+        val mockTask = mock(MParticleTask::class.java) as MParticleTask<IdentityApiResult>
+        `when`(identityApi.identify(any())).thenReturn(mockTask)
+        val identities: MutableMap<MParticle.IdentityType, String> = HashMap()
+        identities.put(MParticle.IdentityType.Other, oldHashedEmail)
+        `when`(user.userIdentities).thenReturn(identities)
+        instance.setIdentityApi(identityApi)
+        val settingsMap = hashMapOf(
+            "placementAttributesMapping" to """
+        [
+            // add placement attributes here if needed
+        ]
+    """.trimIndent(),
+            "hashedEmailUserIdentityType" to "UNASSIGNED"
+        )
+        val field = KitConfiguration::class.java.getDeclaredField("settings")
+        field.isAccessible = true
+        field.set(mockedKitConfig, settingsMap)
+
+        val options = MParticleOptions.builder(MockContext())
+            .sideloadedKits(mutableListOf(sideloadedKit) as List<SideloadedKit>).build()
+        val manager: KitManagerImpl = MockKitManagerImpl(options)
+        val method: Method = KitManagerImpl::class.java.getDeclaredMethod(
+            "confirmEmail",
+            String::class.java,
+            String::class.java,
+            MParticleUser::class.java,
+            IdentityApi::class.java,
+            KitConfiguration::class.java,
+            Runnable::class.java
+        )
+        method.isAccessible = true
+        val result = method.invoke(manager, "", "hashed_Test@gmail.com", user, identityApi, mockedKitConfig, runnable)
+        verify(mockTask).addSuccessListener(any())
+    }
+
     @Test
     fun testGetValueIgnoreCase_keyExistsDifferentCase() {
         val sideloadedKit = mock(MPSideloadedKit::class.java)