Merge pull request #223 from OneSignal/fixed_proguard_android_optimize_config

Fixed build errors with proguard-android-optimize.txt

Author: jkasten2

OneSignalSDK/app/build.gradle

@@ -20,8 +20,8 @@ android {
             // minify does not work with GMS 7.0.0 with the current settings. Use 8.4.0 to test.
             minifyEnabled true
 
-            // Normally `getDefaultProguardFile('proguard-android.txt')` is included in Andorid projects.
-            //   however testing without for compatibility with projects that may not have this.
+            // Normally `getDefaultProguardFile('proguard-android.txt')` is included in Android projects.
+            //   however testing without a modified proguard-android-optimize.txt for compatibility.
             proguardFiles 'proguard-rules.pro'
             // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -70,7 +70,7 @@ dependencies {
     //    compile 'com.android.support:support-core-utils:24.2.1'
 
     // For Chrome tabs
-     compile 'com.android.support:customtabs:24.0.0'
+    compile 'com.android.support:customtabs:24.0.0'
 
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'

OneSignalSDK/app/proguard-rules.pro

@@ -21,28 +21,34 @@
 
 
 
-# File contents below from "android-sdk\tools\proguard\proguard-android.txt"
+####### File contents below from "android-sdk\tools\proguard\proguard-android-optimize.txt"
 # This is a configuration file for ProGuard.
 # http://proguard.sourceforge.net/index.html#manual/usage.html
 
+# Optimizations: If you don't want to optimize, use the
+# proguard-android.txt configuration file instead of this one, which
+# turns off the optimization flags.  Adding optimization introduces
+# certain risks, since for example not all optimizations performed by
+# ProGuard works on all versions of Dalvik.  The following flags turn
+# off various optimizations known to have issues, but the list may not
+# be complete or up to date. (The "arithmetic" optimization can be
+# used if you are only targeting Android 2.0 or later.)  Make sure you
+# test thoroughly if you go this route.
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+
+#### Omitting flag as it is not hard to keep compiblity and have done some in the past
+#-dontpreverify
+
+# The remainder of this file is identical to the non-optimized version
+# of the Proguard configuration file (except that the other file has
+# flags to turn off optimization).
+
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -verbose
 
-# Optimization is turned off by default. Dex does not like code run
-# through the ProGuard optimize and preverify steps (and performs some
-# of these optimizations on its own).
--dontoptimize
-
-## Normally enabled but testing without as compibility isn't hard to meet
-#-dontpreverify
-
-# Note that if you want to enable optimization, you cannot just
-# include optimization flags in your own project configuration file;
-# instead you will need to point to the
-# "proguard-android-optimize.txt" file instead of this one from your
-# project.properties file.
-
 -keepattributes *Annotation*
 -keep public class com.google.vending.licensing.ILicensingService
 -keep public class com.android.vending.licensing.ILicensingService

OneSignalSDK/onesignal/consumer-proguard-rules.pro

@@ -1,13 +1,17 @@
 -dontwarn com.onesignal.**
 
+# These 2 methods are called with reflection.
 -keep class com.google.android.gms.common.api.GoogleApiClient {
     void connect();
     void disconnect();
 }
 
+
 -keep public interface android.app.OnActivityPausedListener {*;}
 -keep class com.onesignal.ActivityLifecycleListenerCompat** {*;}
 
+
+# Observer backcall methods are called with reflection
 -keep class com.onesignal.OSSubscriptionState {
     void changed(com.onesignal.OSPermissionState);
 }
@@ -44,5 +48,8 @@
 -keep class com.onesignal.shortcutbadger.impl.XiaomiHomeBadger { <init>(...); }
 -keep class com.onesignal.shortcutbadger.impl.ZukHomeBadger { <init>(...); }
 
+
 -dontwarn com.amazon.**
+
+# Proguard ends up removing this class even if it is used in AndroidManifest.xml so force keeping it.
 -keep public class com.onesignal.ADMMessageHandler {*;}

OneSignalSDK/onesignal/src/main/java/com/onesignal/ADMMessageHandler.java

@@ -27,12 +27,15 @@
 
 package com.onesignal;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
 import com.amazon.device.messaging.ADMMessageHandlerBase;
 import com.amazon.device.messaging.ADMMessageReceiver;
 
+// WARNING: Do not pass 'this' to any methods as it will cause proguard build errors
+//             when "proguard-android-optimize.txt" is used.
 public class ADMMessageHandler extends ADMMessageHandlerBase {
 
    public static class Receiver extends ADMMessageReceiver {
@@ -47,16 +50,17 @@ public ADMMessageHandler() {
 
    @Override
    protected void onMessage(Intent intent) {
+      Context context = getApplicationContext();
       Bundle bundle = intent.getExtras();
-   
-      NotificationBundleProcessor.ProcessedBundleResult processedResult = NotificationBundleProcessor.processBundle(this, bundle);
-   
+      
+      NotificationBundleProcessor.ProcessedBundleResult processedResult = NotificationBundleProcessor.processBundle(context, bundle);
+
       if (processedResult.processed())
          return;
-   
-      NotificationGenerationJob notifJob = new NotificationGenerationJob(this);
+      
+      NotificationGenerationJob notifJob = new NotificationGenerationJob(context);
       notifJob.jsonPayload = NotificationBundleProcessor.bundleAsJSONObject(bundle);
-   
+      
       NotificationBundleProcessor.Process(notifJob);
    }