Merge pull request #3 from Leanplum/feature/fix-lp-4216

feat(proguard): adds consumer proguard to be bundled with aar

Author: benmarten

AndroidSDK/build.gradle

@@ -36,7 +36,7 @@ android {
     publishNonDefault true
 
     defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
+        consumerProguardFiles 'consumer-proguard-rules.pro'
     }
 
     buildTypes {

AndroidSDK/consumer-proguard-rules.pro

@@ -0,0 +1,16 @@
+# Keep default Leanplum classes.
+-keepclassmembers class * {
+@com.leanplum.annotations.* <fields>;
+}
+
+-keep class com.leanplum.** { *; }
+-dontwarn com.leanplum.**
+
+# Keep bytebuddy classes.
+-keep class net.bytebuddy.** { *; }
+-dontwarn net.bytebuddy.**
+
+# Keep Support Library classes.
+-dontwarn android.support.v7.**
+-keep class android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }

AndroidSDK/src/com/leanplum/LeanplumGcmProvider.java

@@ -90,8 +90,9 @@ public String getRegistrationId() {
         Util.handleException(e);
       }
     } catch (Throwable t) {
-      Log.e("Failed to complete registration token refresh.");
-      Util.handleException(t);
+      Log.w("There was a problem setting up GCM, please make sure you follow instructions " +
+          "on how to set it up. Please verify that you are using correct version of " +
+          "Google Play Services and Android Support Library v4.");
     }
     return registrationId;
   }

AndroidSDK/src/com/leanplum/internal/ActionManager.java

@@ -8,6 +8,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 
+import com.google.android.gms.location.LocationServices;
 import com.leanplum.ActionContext;
 import com.leanplum.ActionContext.ContextualValues;
 import com.leanplum.Leanplum;
@@ -17,7 +18,6 @@
 import com.leanplum.callbacks.ActionCallback;
 
 import java.io.Serializable;
-import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,13 +58,7 @@ public static synchronized ActionManager getInstance() {
   public static LocationManager getLocationManager() {
     if (Util.hasPlayServices()) {
       try {
-        Class<?> googleApiClientClass =
-            Class.forName("com.google.android.gms.common.api.GoogleApiClient");
-        if (googleApiClientClass != null
-            && Modifier.isAbstract(googleApiClientClass.getModifiers())
-            && Modifier.isAbstract(
-            googleApiClientClass.getMethod("isConnected").getModifiers())
-            && Class.forName("com.google.android.gms.location.LocationServices") != null) {
+        if (LocationServices.API != null) {
           // Reflection here prevents linker errors
           // in Google Play Services is not used in the client app.
           return (LocationManager) Class

AndroidSDK/src/com/leanplum/internal/Util.java

@@ -22,6 +22,7 @@
 import android.text.TextUtils;
 import android.util.TypedValue;
 
+import com.google.android.gms.ads.identifier.AdvertisingIdClient;
 import com.leanplum.Leanplum;
 import com.leanplum.LeanplumActivityHelper;
 import com.leanplum.LeanplumDeviceIdMode;
@@ -181,24 +182,17 @@ private static String getWifiMacAddressHash(Context context) {
    */
   private static DeviceIdInfo getAdvertisingId(Context caller) throws Exception {
     try {
-      // Using reflection because the app will either crash or print warnings
-      // if the app doesn't link to Google Play Services, even if this method is not called.
-      Object adInfo = Class.forName("com.google.android.gms.ads.identifier.AdvertisingIdClient")
-          .getMethod("getAdvertisingIdInfo", Context.class).invoke(null, caller);
-      String id = checkDeviceId(
-          "advertising id", (String) adInfo.getClass().getMethod("getId").invoke(adInfo));
-      if (id != null) {
-        boolean limitTracking = (Boolean) adInfo.getClass()
-            .getMethod("isLimitAdTrackingEnabled").invoke(adInfo);
-        Log.v("Using advertising device id: " + id);
-        return new DeviceIdInfo(id, limitTracking);
-      }
-    } catch (Exception e) {
-      if (e.getClass().getName().equals("GooglePlayServicesNotAvailableException")) {
-        Log.w("Error getting advertising ID. Google Play services are not available.");
-      } else {
-        throw e;
+      AdvertisingIdClient.Info info = AdvertisingIdClient.getAdvertisingIdInfo(caller);
+      if (info != null) {
+        String advertisingId = info.getId();
+        String deviceId = checkDeviceId("advertising id", advertisingId);
+        if (deviceId != null) {
+          boolean limitedTracking = info.isLimitAdTrackingEnabled();
+          return new DeviceIdInfo(deviceId, limitedTracking);
+        }
       }
+    } catch (Throwable ignored) {
+      Log.e("Error getting advertising ID. Google Play Services are not available.");
     }
     return null;
   }