Clean up sfcode setting. (#5)

* Guard against null pointer exceptions if `sfcode` setting is not present.

Author: brennan

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.segment.analytics.android.integrations
 
-VERSION=0.0.2-SNAPSHOT
+VERSION=0.0.3-SNAPSHOT
 
 POM_ARTIFACT_ID=nielsen-dtvr
 POM_PACKAGING=jar

src/main/java/com/segment/analytics/android/integrations/nielsendtvr/NielsenDTVRIntegrationFactory.java

@@ -106,10 +106,14 @@ AppSdk reuseAppSdk(String appId, Map<String, List<AppSdk>> appSdkInstances) {
    */
   JSONObject parseAppSdkConfig(ValueMap settings) throws JSONException {
     JSONObject appSdkConfig = new JSONObject();
-    String sfcode = settings.getString(SETTING_SF_CODE_KEY);
-    if (sfcode.isEmpty()) {
-      sfcode = "us";
+
+    String sfcode = "us";
+    if (settings.containsKey(SETTING_SF_CODE_KEY)
+        && settings.getString(SETTING_SF_CODE_KEY) != null
+        && !settings.getString(SETTING_SF_CODE_KEY).isEmpty()) {
+      sfcode = settings.getString(SETTING_SF_CODE_KEY);
     }
+
     appSdkConfig.put("appid", settings.getString(SETTING_APP_ID_KEY)).put("sfcode", sfcode);
 
     if (settings.getBoolean(SETTING_DEBUG_KEY, false)) {

src/test/java/com/segment/analytics/android/integrations/nielsendtvr/NielsenDTVRIntegrationFactoryTest.java

@@ -52,7 +52,7 @@ public class NielsenDTVRIntegrationFactoryTest {
     private NielsenDTVRIntegrationFactory factory;
 
     private final String appid = "testappid";
-    private final String sfcode = "";
+    private final String sfcode = "us";
 
     @Before
     public void init() {
@@ -79,7 +79,7 @@ public void reuseAppSdk() {
     public void parseAppSdkConfig() throws JSONException {
         JSONObject expectedConfig = new JSONObject()
                 .put("appid", appid)
-                .put("sfcode", "us");
+                .put("sfcode", sfcode);
 
         JSONAssert.assertEquals(expectedConfig, factory.parseAppSdkConfig(settings), JSONCompareMode.STRICT);
 
@@ -115,6 +115,39 @@ public void fetchAppSdk() throws JSONException {
         verify(factoryMock, never()).saveAppSdk(anyString(), (AppSdk) any(), ArgumentMatchers.<String, List<AppSdk>>anyMap());
     }
 
+    @Test
+    public void sfcodeKeyMissing() throws JSONException {
+        settings.remove(SETTING_SF_CODE_KEY);
+
+        JSONObject expectedConfig = new JSONObject()
+                .put("appid", appid)
+                .put(SETTING_SF_CODE_KEY, "us");
+
+        JSONAssert.assertEquals(expectedConfig, factory.parseAppSdkConfig(settings), JSONCompareMode.STRICT);
+    }
+
+    @Test
+    public void emptySfCodeValue() throws JSONException {
+        settings.put(SETTING_SF_CODE_KEY, "");
+
+        JSONObject expectedConfig = new JSONObject()
+                .put("appid", appid)
+                .put("sfcode", sfcode);
+
+        JSONAssert.assertEquals(expectedConfig, factory.parseAppSdkConfig(settings), JSONCompareMode.STRICT);
+    }
+
+    @Test
+    public void nullSfCodeValue() throws JSONException {
+        settings.put(SETTING_SF_CODE_KEY, null);
+
+        JSONObject expectedConfig = new JSONObject()
+                .put("appid", appid)
+                .put("sfcode", sfcode);
+
+        JSONAssert.assertEquals(expectedConfig, factory.parseAppSdkConfig(settings), JSONCompareMode.STRICT);
+    }
+
     @Test
     public void parseId3EventNames() {
         List<String> expected = Arrays.asList("sendid3a", "sendid3b");