Use JSON encoding for deeplink parameters

Author: wellle

Adjust/src/com/adjust/sdk/PackageBuilder.java

@@ -21,7 +21,7 @@
 
 public class PackageBuilder {
 
-	private Context context;
+    private Context context;
 
     // general
     private String appToken;
@@ -219,7 +219,7 @@ public ActivityPackage buildRevenuePackage() {
 
     public ActivityPackage buildReattributionPackage() {
         Map<String, String> parameters = getDefaultParameters();
-        addMap(parameters, "deeplink_parameters", deepLinkParameters);
+        addMapJson(parameters, "deeplink_parameters", deepLinkParameters);
 
         ActivityPackage reattributionPackage = getDefaultActivityPackage();
         reattributionPackage.setPath("/reattribute");
@@ -273,7 +273,7 @@ private Map<String, String> getDefaultParameters() {
     private void injectEventParameters(Map<String, String> parameters) {
         addInt(parameters, "event_count", eventCount);
         addString(parameters, "event_token", eventToken);
-        addMap(parameters, "params", callbackParameters);
+        addMapBase64(parameters, "params", callbackParameters);
     }
 
     private String getAmountString() {
@@ -329,7 +329,7 @@ private void addDuration(Map<String, String> parameters, String key, long durati
         addInt(parameters, key, durationInSeconds);
     }
 
-    private void addMap(Map<String, String> parameters, String key, Map<String, String> map) {
+    private void addMapBase64(Map<String, String> parameters, String key, Map<String, String> map) {
         if (null == map) {
             return;
         }
@@ -340,4 +340,15 @@ private void addMap(Map<String, String> parameters, String key, Map<String, Stri
 
         addString(parameters, key, encodedMap);
     }
+
+    private void addMapJson(Map<String, String> parameters, String key, Map<String, String> map) {
+        if (null == map) {
+            return;
+        }
+
+        JSONObject jsonObject = new JSONObject(map);
+        String jsonString = jsonObject.toString();
+
+        addString(parameters, key, jsonString);
+    }
 }

Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java

@@ -634,7 +634,7 @@ public void testOpenUrl() {
 
         // check that deep link parameters contains the base64 with the 2 keys
         assertEquals(activityPackage.getExtendedString(),
-            "eyJmb28iOiJiYXIiLCJrZXkiOiJ2YWx1ZSJ9", parameters.get("deeplink_parameters"));
+            "{\"foo\":\"bar\",\"key\":\"value\"}", parameters.get("deeplink_parameters"));
 
         // check that added and set both session and reattribution package
         assertTrue(mockLogger.toString(), mockLogger.containsTestMessage("PackageHandler addPackage"));