Merge pull request #50 from adjust/development

nonelse · nonelse · commit 2c86dbbf0e01 · 2014-06-10T14:23:57.000+01:00
New version v3.3.3
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -21,13 +21,13 @@ dependencies {
 }
 
 android {
-  buildToolsVersion '19.0.3'
-  compileSdkVersion 19
+  buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+  compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
   defaultConfig {
     versionCode 11
-    versionName '3.3.2'
-    minSdkVersion 8
-    targetSdkVersion 19
+    versionName '3.3.3'
+    minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
+    targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
   }
   sourceSets {
     main {
diff --git a/Adjust/gradle.properties b/Adjust/gradle.properties
@@ -0,0 +1,4 @@
+ANDROID_BUILD_MIN_SDK_VERSION=8
+ANDROID_BUILD_TARGET_SDK_VERSION=19
+ANDROID_BUILD_TOOLS_VERSION=19.1
+ANDROID_BUILD_SDK_VERSION=19
diff --git a/Adjust/pom.xml b/Adjust/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>adjust-android</artifactId>
   <groupId>com.adjust.sdk</groupId>
-  <version>3.3.2</version>
+  <version>3.3.3</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/Adjust/src/com/adjust/sdk/ActivityHandler.java b/Adjust/src/com/adjust/sdk/ActivityHandler.java
@@ -53,13 +53,13 @@ public class ActivityHandler extends HandlerThread {
     private static final String TIME_TRAVEL = "Time travel!";
     private static final String ADJUST_PREFIX = "adjust_";
 
-    private final  SessionHandler           sessionHandler;
+    private        SessionHandler           sessionHandler;
     private        IPackageHandler          packageHandler;
     private        OnFinishedListener       onFinishedListener;
     private        ActivityState            activityState;
-    private final  Logger                   logger;
+    private        Logger                   logger;
     private static ScheduledExecutorService timer;
-    private final  Context                  context;
+    private        Context                  context;
     private        String                   environment;
     private        String                   defaultTracker;
     private        boolean                  eventBuffering;
@@ -76,17 +76,8 @@ public class ActivityHandler extends HandlerThread {
 
     public ActivityHandler(Activity activity) {
         super(LOGTAG, MIN_PRIORITY);
-        setDaemon(true);
-        start();
-        TIMER_INTERVAL = AdjustFactory.getTimerInterval();
-        SESSION_INTERVAL = AdjustFactory.getSessionInterval();
-        SUBSESSION_INTERVAL = AdjustFactory.getSubsessionInterval();
-        sessionHandler = new SessionHandler(getLooper(), this);
-        context = activity.getApplicationContext();
-        clientSdk = Constants.CLIENT_SDK;
-        enabled = true;
 
-        logger = AdjustFactory.getLogger();
+        initActivityHandler(activity);
 
         Message message = Message.obtain();
         message.arg1 = SessionHandler.INIT_BUNDLE;
@@ -96,8 +87,23 @@ public ActivityHandler(Activity activity) {
     public ActivityHandler(Activity activity, String appToken,
             String environment, String logLevel, boolean eventBuffering) {
         super(LOGTAG, MIN_PRIORITY);
+
+        initActivityHandler(activity);
+
+        this.appToken = appToken;
+        this.environment = environment;
+        this.eventBuffering = eventBuffering;
+        logger.setLogLevelString(logLevel);
+
+        Message message = Message.obtain();
+        message.arg1 = SessionHandler.INIT_PRESET;
+        sessionHandler.sendMessage(message);
+    }
+
+    private void initActivityHandler(Activity activity) {
         setDaemon(true);
         start();
+
         TIMER_INTERVAL = AdjustFactory.getTimerInterval();
         SESSION_INTERVAL = AdjustFactory.getSessionInterval();
         SUBSESSION_INTERVAL = AdjustFactory.getSubsessionInterval();
@@ -108,14 +114,10 @@ public ActivityHandler(Activity activity, String appToken,
 
         logger = AdjustFactory.getLogger();
 
-        this.appToken = appToken;
-        this.environment = environment;
-        this.eventBuffering = eventBuffering;
-        logger.setLogLevelString(logLevel);
-
-        Message message = Message.obtain();
-        message.arg1 = SessionHandler.INIT_PRESET;
-        sessionHandler.sendMessage(message);
+        String gpsAdid = Util.getGpsAdid(context);
+        if (gpsAdid == null) {
+            logger.info("Unable to get Google Play Services Advertising ID at start time");
+        }
     }
 
     public void setSdkPrefix(String sdkPrefx) {
diff --git a/Adjust/src/com/adjust/sdk/Adjust.java b/Adjust/src/com/adjust/sdk/Adjust.java
@@ -161,12 +161,12 @@ public static void appWillOpenUrl(Uri url) {
 
 
     // Special appDidLaunch method used by SDK wrappers such as our Adobe Air SDK.
-    protected static void appDidLaunch(Activity activity, String appToken, String environment, String logLevel, boolean eventBuffering) {
+    public static void appDidLaunch(Activity activity, String appToken, String environment, String logLevel, boolean eventBuffering) {
         activityHandler = new ActivityHandler(activity, appToken, environment, logLevel, eventBuffering);
     }
 
     // Special method used by SDK wrappers such as our Adobe Air SDK.
-    protected static void setSdkPrefix(String sdkPrefix) {
+    public static void setSdkPrefix(String sdkPrefix) {
         activityHandler.setSdkPrefix(sdkPrefix);
     }
 
diff --git a/Adjust/src/com/adjust/sdk/Constants.java b/Adjust/src/com/adjust/sdk/Constants.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.3.2";
+    String CLIENT_SDK = "android3.3.3";
     String LOGTAG     = "Adjust";
 
     String SESSION_STATE_FILENAME    = "AdjustIoActivityState";
diff --git a/Adjust/src/com/adjust/sdk/Util.java b/Adjust/src/com/adjust/sdk/Util.java
@@ -25,6 +25,7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.text.SimpleDateFormat;
@@ -48,9 +49,6 @@
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-
-
 /**
  * Collects utility functions used by Adjust.
  */
@@ -352,17 +350,36 @@ public static String dateFormat(long date) {
     }
 
     public static String getGpsAdid(Context context) {
-        String gpsAdid = null;
         try {
-            AdvertisingIdClient.Info info = AdvertisingIdClient.getAdvertisingIdInfo(context);
-            if (!info.isLimitAdTrackingEnabled()) {
-                gpsAdid = info.getId();
+            Class AdvertisingIdClientClass = Class.forName("com.google.android.gms.ads.identifier.AdvertisingIdClient");
+
+            Class[] cArg = new Class[1];
+            cArg[0] = Context.class;
+            Method getAdvertisingInfoMethod = AdvertisingIdClientClass.getMethod("getAdvertisingIdInfo", cArg);
+
+            Object AdvertisingInfoObject = getAdvertisingInfoMethod.invoke(null, context);
+
+            Class AdvertisingInfoClass = AdvertisingInfoObject.getClass();
+
+            Method isLimitedTrackingEnabledMethod = AdvertisingInfoClass.getMethod("isLimitAdTrackingEnabled");
+
+            Object isLimitedTrackingEnabledObject = isLimitedTrackingEnabledMethod.invoke(AdvertisingInfoObject);
+
+            Boolean isLimitedTrackingEnabled = (Boolean) isLimitedTrackingEnabledObject;
+
+            if (!isLimitedTrackingEnabled) {
+                Method getIdMethod = AdvertisingInfoClass.getMethod("getId");
+
+                Object getIdObject = getIdMethod.invoke(AdvertisingInfoObject);
+
+                String gpsAdid = (String) getIdObject;
             }
-        } catch (Exception e) {
-            Logger logger = AdjustFactory.getLogger();
-            logger.error(String.format("Error getting Google Play Services advertising ID, (%s)", e.getMessage()));
+        }
+        catch (Exception e) {
+        }
+        catch (NoClassDefFoundError ncdffe) {
         }
 
-        return gpsAdid;
+        return null;
     }
 }
diff --git a/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java b/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java
@@ -12,6 +12,7 @@
 import com.adjust.sdk.ActivityKind;
 import com.adjust.sdk.ActivityPackage;
 import com.adjust.sdk.AdjustFactory;
+import com.adjust.sdk.Constants;
 import com.adjust.sdk.Logger.LogLevel;
 
 public class TestActivityHandler extends ActivityInstrumentationTestCase2<UnitTestActivity> {
@@ -92,7 +93,10 @@ public void testFirstSession() {
 
         // check the Sdk version is being tested
         assertEquals(activityPackage.getExtendedString(),
-            "android3.3.2", activityPackage.getClientSdk());
+            "android3.3.3", activityPackage.getClientSdk());
+
+        // check the server url
+        assertEquals(Constants.BASE_URL, "https://app.adjust.io");
 
         Map<String, String> parameters = activityPackage.getParameters();
 
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ for **each** Activity of your app:
 - Add the `import` statement at the top of the file.
 - In your Activity's `onResume` method call `Adjust.onResume`. Create the
   method if needed.
-- In your Activity's `orPause` method call `Adjust.onPause`. Create the
+- In your Activity's `onPause` method call `Adjust.onPause`. Create the
   method if needed.
 
 After these steps your activity should look like this:
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.3.2
+3.3.3
diff --git a/doc/google_play_services.md b/doc/google_play_services.md
@@ -0,0 +1,12 @@
+# Google Play Services
+
+We access the Google Play Services (GPS) to get the advertising ID if the user didn’t opt out. 
+To know more about the advertising ID check the [Android documentation][doc]
+
+We have a private jar of GPS, so the app using adjust SDK is not forced to use GPS as well. 
+You can remove the GPS jar if you want to save space or to link with your own GPS jar. 
+
+To link to your own, first delete our GPS jar located at `libs/google-play-services.jar`. 
+Then link the adjust SDK project to your GPS jar.
+
+[doc]:https://developer.android.com/google/play-services/id.html
diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Android to 3.3.2 from v2.1.x
+## Migrate your adjust SDK for Android to 3.3.3 from v2.1.x
 
 We renamed the main class `com.adeven.adjustio.AdjustIo` to
 `com.adjust.sdk.Adjust`. Follow these steps to update all adjust SDK calls.
@@ -24,7 +24,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to
 4. In the same fashion, replace `adeven.adjustio` with `adjust.sdk` in all
    manifest files to update the package name of the `ReferrerReceiver`.
 
-5. Download version v3.3.2 and create a new Android project from the `Adjust` folder.
+5. Download version v3.3.3 and create a new Android project from the `Adjust` folder.
 
     ![][import]
 
@@ -36,7 +36,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to
 
 8. Build your project to confirm that everything is properly connected again.
 
-The adjust SDK v3.3.2 added delegate notifications. Check out the [README] for
+The adjust SDK v3.3.3 added delegate notifications. Check out the [README] for
 details.
 
 

Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,12 @@ public static void appWillOpenUrl(Uri url) {`
`161`	`161`
`162`	`162`
`163`	`163`	`// Special appDidLaunch method used by SDK wrappers such as our Adobe Air SDK.`
`164`		`- protected static void appDidLaunch(Activity activity, String appToken, String environment, String logLevel, boolean eventBuffering) {`
	`164`	`+ public static void appDidLaunch(Activity activity, String appToken, String environment, String logLevel, boolean eventBuffering) {`
`165`	`165`	`activityHandler = new ActivityHandler(activity, appToken, environment, logLevel, eventBuffering);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// Special method used by SDK wrappers such as our Adobe Air SDK.`
`169`		`- protected static void setSdkPrefix(String sdkPrefix) {`
	`169`	`+ public static void setSdkPrefix(String sdkPrefix) {`
`170`	`170`	`activityHandler.setSdkPrefix(sdkPrefix);`
`171`	`171`	`}`
`172`	`172`