Merge pull request #5 from kissmetrics/NullPropertyValue-fix

Adds a check for null property values during property encoding
kissmetrics · May 13, 2014 · 07a3748 · 07a3748
2 parents 42baea7 + 5aab796
commit 07a3748
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/KISSmetricsAPI/src/com/kissmetrics/sdk/QueryEncoder.java b/KISSmetricsAPI/src/com/kissmetrics/sdk/QueryEncoder.java
@@ -161,9 +161,9 @@ public String encodeProperties(final HashMap<String, String> properties) {
 
     		// Check for valid value
     		String stringValue = properties.get(stringKey);
-    		if (stringValue.length() == 0) {
+    		if (stringValue == null || stringValue.length() == 0) {
                 Log.w("KISSmetricsAPI", 
-                		"Property values must not be empty strings. Dropping property.");
+                		"Property values must not be null or empty strings. Dropping property.");
                 continue;
     		}
 

diff --git a/KISSmetricsAPIIntegrationTest/src/com/kissmetrics/sdk/QueryEncoderTest.java b/KISSmetricsAPIIntegrationTest/src/com/kissmetrics/sdk/QueryEncoderTest.java
@@ -140,6 +140,19 @@ public final void test_urlEncodeProperties() {
 	    assertEquals("urlEncodeProperties yields expected URL", expectedEncodedProperties, encodedProperties);
 	}
 
+
+	public final void test_urlEncodePropertiesDropsNullValues() {
+
+	    HashMap<String, String> testPropertyHashMap = new HashMap<String, String>();
+	    testPropertyHashMap.put("Reserved", null);    
+
+	    String encodedProperties = cut.encodeProperties(testPropertyHashMap);
+
+	    String expectedEncodedProperties = "";
+
+	    assertEquals("urlEncodeProperties drops null property values", expectedEncodedProperties, encodedProperties);
+	}
+
 
 	public final void test_createEventQueryWithProperties() {
 

diff --git a/KISSmetricsSDK.jar b/KISSmetricsSDK.jar