feat: Allow attribution to be converted to Map

Author: ntsk

Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustAttribution.java

@@ -7,6 +7,8 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by pfms on 07/11/14.
@@ -102,6 +104,23 @@ public boolean equals(Object other) {
         return true;
     }
 
+    public Map<String, String> toMap() {
+        Map<String, String> fields = new HashMap<>();
+        if (trackerToken != null) fields.put("trackerToken", trackerToken);
+        if (trackerName != null) fields.put("trackerName", trackerName);
+        if (network != null) fields.put("network", network);
+        if (campaign != null) fields.put("campaign", campaign);
+        if (adgroup != null) fields.put("adgroup", adgroup);
+        if (creative != null) fields.put("creative", creative);
+        if (clickLabel != null) fields.put("clickLabel", clickLabel);
+        if (adid != null) fields.put("adid", adid);
+        if (costType != null) fields.put("costType", costType);
+        if (costAmount != null) fields.put("costAmount", costAmount.toString());
+        if (costCurrency != null) fields.put("costCurrency", costCurrency);
+
+        return fields;
+    }
+
     @Override
     public int hashCode() {
         int hashCode = 17;

Adjust/test-app-core/src/main/java/com/adjust/testapp/AdjustCommandExecutor.java

@@ -372,20 +372,7 @@ public boolean launchReceivedDeeplink(Uri deeplink) {
                 public void onAttributionChanged(AdjustAttribution attribution) {
                     Log.d("TestApp", "attribution = " + attribution.toString());
 
-                    MainActivity.testLibrary.addInfoToSend("trackerToken", attribution.trackerToken);
-                    MainActivity.testLibrary.addInfoToSend("trackerName", attribution.trackerName);
-                    MainActivity.testLibrary.addInfoToSend("network", attribution.network);
-                    MainActivity.testLibrary.addInfoToSend("campaign", attribution.campaign);
-                    MainActivity.testLibrary.addInfoToSend("adgroup", attribution.adgroup);
-                    MainActivity.testLibrary.addInfoToSend("creative", attribution.creative);
-                    MainActivity.testLibrary.addInfoToSend("clickLabel", attribution.clickLabel);
-                    MainActivity.testLibrary.addInfoToSend("adid", attribution.adid);
-                    MainActivity.testLibrary.addInfoToSend("costType", attribution.costType);
-                    if (attribution.costAmount != null) {
-                        MainActivity.testLibrary.addInfoToSend("costAmount", attribution.costAmount.toString());
-                    }
-                    MainActivity.testLibrary.addInfoToSend("costCurrency", attribution.costCurrency);
-                    MainActivity.testLibrary.addInfoToSend("fbInstallReferrer", attribution.fbInstallReferrer);
+                    MainActivity.testLibrary.setInfoToSend(attribution.toMap());
                     MainActivity.testLibrary.sendInfoToServer(localBasePath);
                 }
             });

Adjust/test-library/src/main/java/com/adjust/test/TestLibrary.java

@@ -154,6 +154,10 @@ public void addInfoToSend(String key, String value) {
         infoToServer.put(key, value);
     }
 
+    public void setInfoToSend(Map<String, String> info) {
+        infoToServer = info;
+    }
+
     public void sendInfoToServer(final String basePath) {
         executor.submit(new Runnable() {
             @Override