Merge pull request #62 from adjust/deviceids

Deviceids
adjust · Jul 23, 2014 · d679bce · d679bce
2 parents 5c2673f + 4974497
commit d679bce
Show file tree

Hide file tree

Showing 15 changed files with 290 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,5 +64,4 @@ build/
 .jira-url
 atlassian-ide-plugin.xml
 
-# add exception of google play services jar
-!google-play-services.jar
+# add exception for private libraries 
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -25,7 +25,7 @@ android {
   compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
   defaultConfig {
     versionCode 11
-    versionName '3.4.0'
+    versionName '3.5.0'
     minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
     targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
   }

diff --git a/Adjust/libs/google-play-services.jar b/Adjust/libs/google-play-services.jar
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.4</version>
+  <version>3.5.0</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
@@ -273,13 +273,7 @@ private void initInternal(boolean fromBundle, String appToken) {
             return;
         }
 
-        String macAddress = Util.getMacAddress(context);
-        String macShort = macAddress.replaceAll(":", "");
-
         this.appToken = appToken;
-        macSha1 = Util.sha1(macAddress);
-        macShortMd5 = Util.md5(macShort);
-        androidId = Util.getAndroidId(context);
         fbAttributionId = Util.getAttributionId(context);
         userAgent = Util.getUserAgent(context);
 
@@ -288,6 +282,13 @@ private void initInternal(boolean fromBundle, String appToken) {
             logger.info("Unable to get Google Play Services Advertising ID at start time");
         }
 
+        if  (!Util.isGooglePlayServicesAvailable(context)) {
+            String macAddress = Util.getMacAddress(context);
+            macSha1 = Util.getMacSha1(macAddress);
+            macShortMd5 = Util.getMacShortMd5(macAddress);
+            androidId = Util.getAndroidId(context);
+        }
+
         packageHandler = AdjustFactory.getPackageHandler(this, context, dropOfflineActivities);
 
         readActivityState();

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.4.0";
+    String CLIENT_SDK = "android3.5.0";
     String LOGTAG     = "Adjust";
 
     String SESSION_STATE_FILENAME    = "AdjustIoActivityState";

diff --git a/Adjust/src/com/adjust/sdk/LogCatLogger.java b/Adjust/src/com/adjust/sdk/LogCatLogger.java
@@ -76,5 +76,6 @@ public void error(String message, Object ...parameters) {
 
     @Override
     public void Assert(String message, Object ...parameters) {
+        Log.println(Log.ASSERT, LOGTAG, String.format(message, parameters));
     }
 }
diff --git a/Adjust/src/com/adjust/sdk/Reflection.java b/Adjust/src/com/adjust/sdk/Reflection.java
@@ -0,0 +1,129 @@
+package com.adjust.sdk;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import android.content.Context;
+
+public class Reflection {
+
+    public static String getPlayAdId(Context context) {
+        try {
+            Object AdvertisingInfoObject = getAdvertisingInfoObject(context);
+
+            String playAdid = (String) invokeInstanceMethod(AdvertisingInfoObject, "getId", null);
+
+            return playAdid;
+        }
+        catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static boolean isPlayTrackingEnabled(Context context) {
+        try {
+            Object AdvertisingInfoObject = getAdvertisingInfoObject(context);
+
+            Boolean isLimitedTrackingEnabled = (Boolean) invokeInstanceMethod(AdvertisingInfoObject, "isLimitAdTrackingEnabled", null);
+
+            return !isLimitedTrackingEnabled;
+        }
+        catch (Throwable t) {
+            return false;
+        }
+    }
+
+    public static boolean isGooglePlayServicesAvailable(Context context) {
+        try {
+            Integer isGooglePlayServicesAvailableStatusCode = (Integer) invokeStaticMethod(
+                    "com.google.android.gms.common.GooglePlayServicesUtil",
+                    "isGooglePlayServicesAvailable",
+                    new Class[] {Context.class}, context
+            );
+
+            boolean isGooglePlayServicesAvailable = (Boolean) isConnectionResultSuccess(isGooglePlayServicesAvailableStatusCode);
+
+            return isGooglePlayServicesAvailable;
+        }
+        catch (Throwable t) {
+            return false;
+        }
+    }
+
+    public static String getMacAddress(Context context) {
+        try {
+            String macSha1 = (String) invokeStaticMethod(
+                    "com.adjust.sdk.deviceIds.MacAddressUtil",
+                    "getMacAddress",
+                    new Class[] {Context.class}, context
+            );
+
+            return macSha1;
+        }
+        catch (Throwable t) {
+            return null;
+        }
+    }
+
+    public static String getAndroidId(Context context) {
+        try {
+            String androidId = (String) invokeStaticMethod("com.adjust.sdk.deviceIds.AndroidIdUtil", "getAndroidId"
+                    ,new Class[] {Context.class}, context);
+
+            return androidId;
+        }
+        catch (Throwable t) {
+            return null;
+        }
+    }
+
+    private static Object getAdvertisingInfoObject(Context context)
+            throws Exception {
+        return invokeStaticMethod("com.google.android.gms.ads.identifier.AdvertisingIdClient",
+                "getAdvertisingIdInfo",
+                new Class[] {Context.class} , context
+        );
+    }
+
+    private static boolean isConnectionResultSuccess(Integer statusCode) {
+        if (statusCode == null) {
+            return false;
+        }
+
+        try {
+            Class ConnectionResultClass = Class.forName("com.google.android.gms.common.ConnectionResult");
+
+            Field SuccessField = ConnectionResultClass.getField("SUCCESS");
+
+            int successStatusCode = SuccessField.getInt(null);
+
+            return successStatusCode == statusCode;
+        }
+        catch (Throwable t) {
+            return false;
+        }
+    }
+
+    private static Object invokeStaticMethod(String className, String methodName, Class[] cArgs, Object... args)
+            throws Exception {
+        Class classObject = Class.forName(className);
+
+        return invokeMethod(classObject, methodName, null, cArgs, args);
+    }
+
+    private static Object invokeInstanceMethod(Object instance, String methodName, Class[] cArgs, Object... args)
+            throws Exception {
+        Class classObject = instance.getClass();
+
+        return invokeMethod(classObject, methodName, instance, cArgs, args);
+    }
+
+    private static Object invokeMethod(Class classObject, String methodName, Object instance, Class[] cArgs, Object... args)
+            throws Exception {
+        Method methodObject = classObject.getMethod(methodName, cArgs);
+
+        Object resultObject = methodObject.invoke(instance, args);
+
+        return resultObject;
+    }
+}