Prevent possible non-string null fields in callbacks

Author: nonelse

Adjust/adjust/src/main/java/com/adjust/sdk/EventResponseData.java

@@ -1,5 +1,7 @@
 package com.adjust.sdk;
 
+import org.json.JSONObject;
+
 /**
  * Created by pfms on 09/02/16.
  */
@@ -19,7 +21,11 @@ public AdjustEventSuccess getSuccessResponseData() {
         successResponseData.message = message;
         successResponseData.timestamp = timestamp;
         successResponseData.adid = adid;
-        successResponseData.jsonResponse = jsonResponse;
+        if (jsonResponse != null) {
+            successResponseData.jsonResponse = jsonResponse;
+        } else {
+            successResponseData.jsonResponse = new JSONObject();
+        }
         successResponseData.eventToken = eventToken;
 
         return successResponseData;
@@ -35,7 +41,11 @@ public AdjustEventFailure getFailureResponseData() {
         failureResponseData.timestamp = timestamp;
         failureResponseData.adid = adid;
         failureResponseData.willRetry = willRetry;
-        failureResponseData.jsonResponse = jsonResponse;
+        if (jsonResponse != null) {
+            failureResponseData.jsonResponse = jsonResponse;
+        } else {
+            failureResponseData.jsonResponse = new JSONObject();
+        }
         failureResponseData.eventToken = eventToken;
 
         return failureResponseData;

Adjust/adjust/src/main/java/com/adjust/sdk/SessionResponseData.java

@@ -1,5 +1,7 @@
 package com.adjust.sdk;
 
+import org.json.JSONObject;
+
 /**
  * Created by pfms on 09/02/16.
  */
@@ -13,7 +15,11 @@ public AdjustSessionSuccess getSuccessResponseData() {
         successResponseData.message = message;
         successResponseData.timestamp = timestamp;
         successResponseData.adid = adid;
-        successResponseData.jsonResponse = jsonResponse;
+        if (jsonResponse != null) {
+            successResponseData.jsonResponse = jsonResponse;
+        } else {
+            successResponseData.jsonResponse = new JSONObject();
+        }
 
         return successResponseData;
     }
@@ -28,7 +34,11 @@ public AdjustSessionFailure getFailureResponseData() {
         failureResponseData.timestamp = timestamp;
         failureResponseData.adid = adid;
         failureResponseData.willRetry = willRetry;
-        failureResponseData.jsonResponse = jsonResponse;
+        if (jsonResponse != null) {
+            failureResponseData.jsonResponse = jsonResponse;
+        } else {
+            failureResponseData.jsonResponse = new JSONObject();
+        }
 
         return failureResponseData;
     }