Google Play Services refac

Author: nonelse

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) {

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);
     }
 

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;
     }
 }

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:

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