Added Google Play Services ad id

Author: nonelse

.gitignore

@@ -63,3 +63,6 @@ build/
 #for oh-my-zsh jira plugin (https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#jira)
 .jira-url
 atlassian-ide-plugin.xml
+
+# add exception of google play services jar
+!google-play-services.jar

Adjust/libs/google-play-services.jar

@@ -136,7 +136,7 @@ public void trackSubsessionEnd() {
     }
 
     public void trackEvent(String eventToken, Map<String, String> parameters) {
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         builder.setEventToken(eventToken);
         builder.setCallbackParameters(parameters);
 
@@ -147,7 +147,7 @@ public void trackEvent(String eventToken, Map<String, String> parameters) {
     }
 
     public void trackRevenue(double amountInCents, String eventToken, Map<String, String> parameters) {
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         builder.setAmountInCents(amountInCents);
         builder.setEventToken(eventToken);
         builder.setCallbackParameters(parameters);
@@ -503,7 +503,7 @@ public static Boolean deleteActivityState(Context context) {
     }
 
     private void transferSessionPackage() {
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         injectGeneralAttributes(builder);
         injectReferrer(builder);
         activityState.injectSessionAttributes(builder);

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

@@ -19,7 +19,7 @@ public interface Constants {
     int THIRTY_MINUTES = 30 * ONE_MINUTE;
 
     String BASE_URL   = "https://app.adjust.io";
-    String CLIENT_SDK = "android3.0.0";
+    String CLIENT_SDK = "android3.2.0";
     String LOGTAG     = "Adjust";
 
     String SESSION_STATE_FILENAME    = "AdjustIoActivityState";

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

@@ -9,18 +9,19 @@
 
 package com.adjust.sdk;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
 import org.json.JSONObject;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.util.Base64;
 
 public class PackageBuilder {
 
+	private Context context;
 
     // general
     private String appToken;
@@ -49,8 +50,10 @@ public class PackageBuilder {
     private double              amountInCents;
     private Map<String, String> callbackParameters;
 
-    public PackageBuilder()
-    { }
+    public PackageBuilder(Context context)
+    {
+        this.context = context;
+    }
 
     public void setAppToken(String appToken) {
         this.appToken = appToken;
@@ -235,6 +238,8 @@ private Map<String, String> getDefaultParameters() {
         addString(parameters, "android_uuid", uuid);
         addString(parameters, "fb_id", fbAttributionId);
         addString(parameters, "environment", environment);
+        String gpsAdid = Util.getGpsAdid(context);
+        addString(parameters, "gps_adid", gpsAdid);
 
         // session related (used for events as well)
         addInt(parameters, "session_count", sessionCount);
@@ -291,7 +296,6 @@ private void addDate(Map<String, String> parameters, String key, long value) {
             return;
         }
 
-        Date date = new Date(value);
         String dateString = Util.dateFormat(value);
         addString(parameters, key, dateString);
     }

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

@@ -48,6 +48,8 @@
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 
+import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+
 
 /**
  * Collects utility functions used by Adjust.
@@ -348,4 +350,19 @@ public static String dateFormat(long date) {
         }
         return dateFormat.format(date);
     }
+
+	public static String getGpsAdid(Context context) {
+		String gpsAdid = null;
+		try {
+			AdvertisingIdClient.Info info = AdvertisingIdClient.getAdvertisingIdInfo(context);
+			if (!info.isLimitAdTrackingEnabled()) {
+                gpsAdid = info.getId();
+			}
+		} catch (Exception e) {
+            Logger logger = AdjustFactory.getLogger();
+		    logger.error(String.format("Error getting Google Play Services advertising ID, (%s)", e.getMessage()));
+		}
+
+		return gpsAdid;
+	}
 }

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

@@ -65,7 +65,7 @@ public void testFirstPackage() {
         packageHandler.resumeSending();
 
         // build and add a package the queue
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         ActivityPackage sessionPackage = builder.buildSessionPackage();
         packageHandler.addPackage(sessionPackage);
         SystemClock.sleep(1000);
@@ -108,7 +108,7 @@ public void testPause() {
         SystemClock.sleep(1000);
 
         // build and add a package the queue
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         ActivityPackage sessionPackage = builder.buildSessionPackage();
         packageHandler.addPackage(sessionPackage);
         SystemClock.sleep(1000);
@@ -151,7 +151,7 @@ public void testDropOfflineActivities() {
         packageHandler.resumeSending();
 
         // build and add a package the queue
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         ActivityPackage sessionPackage = builder.buildSessionPackage();
         packageHandler.addPackage(sessionPackage);
         SystemClock.sleep(1000);
@@ -206,7 +206,7 @@ public void testMultiplePackages() {
         packageHandler.resumeSending();
 
         // build and add 3 packages the queue
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         ActivityPackage sessionPackage = builder.buildSessionPackage();
 
         packageHandler.addPackage(sessionPackage);

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

@@ -1,5 +1,6 @@
 package com.adjust.sdk.test;
 
+import android.content.Context;
 import android.os.SystemClock;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -26,6 +27,7 @@ public TestRequestHandler(Class<UnitTestActivity> activityClass) {
         super(activityClass);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -44,11 +46,14 @@ protected void setUp() throws Exception {
         // to let the internal queue act
         SystemClock.sleep(1000);
 
+        Context context = getActivity().getApplicationContext();
+
         // build a default session package
-        PackageBuilder builder = new PackageBuilder();
+        PackageBuilder builder = new PackageBuilder(context);
         sessionPackage = builder.buildSessionPackage();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();