Merge pull request #149 from adjust/proguard_exceptions

Proguard exceptions
adjust · Nov 13, 2015 · 963a46f · 963a46f
2 parents adb4408 + 7cd66e7
commit 963a46f
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 124 deletions.
diff --git a/Adjust/example/build.gradle b/Adjust/example/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.adjust.example"
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"

diff --git a/Adjust/example/proguard-rules.pro b/Adjust/example/proguard-rules.pro
@@ -16,23 +16,18 @@
 #   public *;
 #}
 
--keep class com.adjust.sdk.plugin.MacAddressUtil { <methods>; }
--keep class com.adjust.sdk.plugin.AndroidIdUtil { <methods>; }
-#-keep class com.adjust.sdk.plugin.MacAddressUtil { String getMacAddress(android.content.Context); }
-#-keep class com.adjust.sdk.plugin.AndroidIdUtil { String getAndroidId(android.content.Context); }
+-keep class com.adjust.sdk.plugin.MacAddressUtil { java.lang.String getMacAddress(android.content.Context); }
+-keep class com.adjust.sdk.plugin.AndroidIdUtil { java.lang.String getAndroidId(android.content.Context); }
 
--keep class com.google.android.gms.common.GooglePlayServicesUtil {
-    int isGooglePlayServicesAvailable (android.content.Context);
-}
 -keep class com.google.android.gms.common.ConnectionResult {
     int SUCCESS;
 }
--keep class com.google.android.gms.ads.identifier.** { *; }
 
-#-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
-#    com.google.android.gms.ads.identifier.AdvertisingIdClient.Info getAdvertisingIdInfo (android.content.Context);
-#}
-#-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient.Info {
-#    String getId ();
-#    boolean isLimitAdTrackingEnabled();
-#}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+    com.google.android.gms.ads.identifier.AdvertisingIdClient.Info getAdvertisingIdInfo (android.content.Context);
+}
+
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient.Info {
+    java.lang.String getId ();
+    boolean isLimitAdTrackingEnabled();
+}
diff --git a/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java b/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java
@@ -1,6 +1,8 @@
 package com.adjust.example;
 
+import android.app.Activity;
 import android.app.Application;
+import android.os.Bundle;
 import android.util.Log;
 
 import com.adjust.sdk.Adjust;
@@ -45,8 +47,8 @@ public void onAttributionChanged(AdjustAttribution attribution) {
 
 
         // register onResume and onPause events of all activities
-        // for applications with minimum support of Android v4 or greater
-        //registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
+        // for applications with minSdkVersion >= 14
+        registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
 
         // put the SDK in offline mode
         //Adjust.setOfflineMode(true);
@@ -56,7 +58,6 @@ public void onAttributionChanged(AdjustAttribution attribution) {
     }
 
     // you can use this class if your app is for Android 4.0 or higher
-    /*
     private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
         @Override
         public void onActivityResumed(Activity activity) {
@@ -93,5 +94,4 @@ public void onActivityStarted(Activity activity) {
 
         }
     }
-    */
 }
diff --git a/Adjust/example/src/main/java/com/adjust/example/MainActivity.java b/Adjust/example/src/main/java/com/adjust/example/MainActivity.java
@@ -59,18 +59,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        Adjust.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        Adjust.onPause();
-    }
-
     public void onTrackSimpleEventClick(View v) {
         AdjustEvent event = new AdjustEvent(EVENT_TOKEN_SIMPLE);