Handle legacy persisted domain mappings safely (#703)

Co-authored-by: James Newman <james.newman@rokt.com>

Author: ankitsingh08

android-core/src/main/java/com/mparticle/networking/DomainMapping.java

@@ -326,7 +326,7 @@ private static Builder withJson(String jsonString) {
                 JSONObject jsonObject = new JSONObject(jsonString);
                 int type = jsonObject.getInt("mType");
                 String newUrl = jsonObject.getString("url");
-                boolean overridesSubdirectory = jsonObject.getBoolean("overridesSubdirectory");
+                boolean overridesSubdirectory = jsonObject.optBoolean("overridesSubdirectory", false);
                 Builder builder = new Builder(Endpoint.parseInt(type), newUrl, overridesSubdirectory);
                 JSONArray certificatesJsonArray = jsonObject.getJSONArray("mCertificates");
                 for (int i = 0; i < certificatesJsonArray.length(); i++) {
@@ -339,4 +339,4 @@ private static Builder withJson(String jsonString) {
             return null;
         }
     }
-}
+}

android-core/src/main/java/com/mparticle/networking/NetworkOptions.java

@@ -77,9 +77,12 @@ public static NetworkOptions withNetworkOptions(@Nullable String jsonString) {
             }
             JSONArray domainMappingsJson = jsonObject.getJSONArray("domainMappings");
             for (int i = 0; i < domainMappingsJson.length(); i++) {
-                builder.addDomainMapping(DomainMapping
-                        .withDomainMapping(domainMappingsJson.getString(i))
-                        .build());
+                DomainMapping.Builder domainMappingBuilder = DomainMapping.withDomainMapping(domainMappingsJson.getString(i));
+                if (domainMappingBuilder == null) {
+                    Logger.warning("NetworkOptions: skipping invalid persisted domain mapping at index " + i + ".");
+                    continue;
+                }
+                builder.addDomainMapping(domainMappingBuilder.build());
             }
         } catch (Exception e) {
             Logger.error(e);

android-core/src/test/kotlin/com/mparticle/networking/NetworkOptionsTest.kt

@@ -47,6 +47,50 @@ class NetworkOptionsTest {
         Assert.assertTrue(equals(options, optionsDeserialized))
     }
 
+    @Test
+    fun testLegacyDomainMappingWithoutOverridesSubdirectoryParses() {
+        val options =
+            NetworkOptions.withNetworkOptions(
+                """
+                {
+                  "disableDevPinning": false,
+                  "disablePinning": false,
+                  "domainMappings": [
+                    "{\"mType\":1,\"url\":\"www.configUrl.com\",\"mCertificates\":[]}"
+                  ]
+                }
+                """.trimIndent(),
+            )
+
+        Assert.assertNotNull(options)
+        Assert.assertNotNull(options!!.configDomain)
+        Assert.assertFalse(options.configDomain!!.isOverridesSubdirectory)
+        Assert.assertEquals("www.configUrl.com", options.configDomain!!.url)
+    }
+
+    @Test
+    fun testNetworkOptionsSkipsInvalidPersistedDomainMappings() {
+        val options =
+            NetworkOptions.withNetworkOptions(
+                """
+                {
+                  "disableDevPinning": false,
+                  "disablePinning": false,
+                  "domainMappings": [
+                    "{\"mType\":1,\"url\":\"www.configUrl.com\",\"overridesSubdirectory\":true,\"mCertificates\":[]}",
+                    "{\"mType\":1,\"url\":\"www.invalid.com\""
+                  ]
+                }
+                """.trimIndent(),
+            )
+
+        Assert.assertNotNull(options)
+        Assert.assertNotNull(options!!.configDomain)
+        Assert.assertEquals(1, options.domainMappings.size)
+        Assert.assertTrue(options.configDomain!!.isOverridesSubdirectory)
+        Assert.assertEquals("www.configUrl.com", options.configDomain!!.url)
+    }
+
     companion object {
         fun equals(
             networkOptions1: NetworkOptions,