handle null exception

Mansi-mParticle · Mansi-mParticle · commit 7f2c514b6c22 · 2025-08-22T16:46:28.000-04:00
diff --git a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java
@@ -1553,12 +1553,12 @@ else if (hashedEmailMismatch && existingHashedEmail != null) {
                 if (emailMismatch) {
                     identityBuilder.email(email);
                 }
-                if (hashedEmailMismatch && kitConfiguration != null && kitConfiguration.getHashedEmailUserIdentityType() != null) {
+                if (hashedEmailMismatch && kitConfiguration != null) {
                     MParticle.IdentityType type;
                     try {
                         type = MParticle.IdentityType.valueOf(kitConfiguration.getHashedEmailUserIdentityType());
-                    } catch (IllegalArgumentException e) {
-                        type = MParticle.IdentityType.Other; // fallback
+                    } catch (IllegalArgumentException | NullPointerException e) {
+                        type = MParticle.IdentityType.Other; // fallback if null or invalid
                     }
                     identityBuilder.userIdentity(type, hashedEmail);
                 }

Original file line number	Diff line number	Diff line change
`@@ -1553,12 +1553,12 @@ else if (hashedEmailMismatch && existingHashedEmail != null) {`
`1553`	`1553`	`if (emailMismatch) {`
`1554`	`1554`	`identityBuilder.email(email);`
`1555`	`1555`	`}`
`1556`		`- if (hashedEmailMismatch && kitConfiguration != null && kitConfiguration.getHashedEmailUserIdentityType() != null) {`
	`1556`	`+ if (hashedEmailMismatch && kitConfiguration != null) {`
`1557`	`1557`	`MParticle.IdentityType type;`
`1558`	`1558`	`try {`
`1559`	`1559`	`type = MParticle.IdentityType.valueOf(kitConfiguration.getHashedEmailUserIdentityType());`
`1560`		`- } catch (IllegalArgumentException e) {`
`1561`		`- type = MParticle.IdentityType.Other; // fallback`
	`1560`	`+ } catch (IllegalArgumentException \| NullPointerException e) {`
	`1561`	`+ type = MParticle.IdentityType.Other; // fallback if null or invalid`
`1562`	`1562`	`}`
`1563`	`1563`	`identityBuilder.userIdentity(type, hashedEmail);`
`1564`	`1564`	`}`