Compatibility fix for GMS library 8.1.0 and newer.

* Fixed compatibility issues when using GMS (Google Play services library) 8.1.0 or newer in your app.
   - Also insured backwards compatibility to 7.0.0.

Author: jkasten2

Examples/AndroidStudio/app/build.gradle

@@ -27,12 +27,14 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+
     compile 'com.android.support:appcompat-v7:+'
 
-    // OneSignal and required libraries
+    // OneSignal SDK
     compile 'com.onesignal:OneSignal:2.+@aar'
+
+    // OneSignal requires at least version 7.0.0 of GMS but the newest version is recommend.
     compile 'com.google.android.gms:play-services-gcm:+'
     compile 'com.google.android.gms:play-services-analytics:+'
-    compile "com.google.android.gms:play-services-location:+"
+    compile 'com.google.android.gms:play-services-location:+'
 }

Examples/AndroidStudio/app/src/main/AndroidManifest.xml

@@ -4,6 +4,9 @@
 
     <!-- All OneSignal manifest entries are added for you automatically from the OneSignal aar gradle entry. -->
 
+    <!-- Optional permission, needed for geo tagging feature. -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

OneSignalSDK.jar

@@ -48,6 +48,8 @@ dependencies {
     // Use for released SDK
     //compile 'com.onesignal:OneSignal:2.+@aar'
 
+    // Test with 7.0.0 to make sure there are no breaking changes in Google's libraries.
+    // This insure that the SDK will work if an app developer is using an older version of GMS.
     compile "com.google.android.gms:play-services-gcm:7.0.0"
     compile "com.google.android.gms:play-services-analytics:7.0.0"
     compile "com.google.android.gms:play-services-location:7.0.0"

OneSignalSDK/app/build.gradle

@@ -25,11 +25,9 @@ android {
 dependencies {
     provided fileTree(dir: 'libs', include: ['*.jar'])
 
-    // Compiling oldest version so we know the minimum required version at compile time.
-    // 7.0.0 depends on Android Support Library v4 22.0.0
-    compile "com.google.android.gms:play-services-gcm:7.0.0"
-    compile "com.google.android.gms:play-services-analytics:7.0.0"
-    compile "com.google.android.gms:play-services-location:7.0.0"
+    compile 'com.google.android.gms:play-services-gcm:8.4.0'
+    compile 'com.google.android.gms:play-services-analytics:8.4.0'
+    compile 'com.google.android.gms:play-services-location:8.4.0'
 }
 
 apply from: 'maven-push.gradle'

OneSignalSDK/onesignal/build.gradle

@@ -0,0 +1,63 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2015 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.onesignal;
+
+import com.google.android.gms.common.api.GoogleApiClient;
+
+// Allows compatibility with pre-8.1.0 of GMS via reflection.
+// This allows the methods below to be used even if the app developer is using an old version Google Play services.
+
+public class GoogleApiClientCompatProxy {
+   private final GoogleApiClient googleApiClient;
+   private final Class googleApiClientListenerClass;
+
+   public GoogleApiClientCompatProxy(GoogleApiClient googleApiClient) {
+      this.googleApiClient = googleApiClient;
+      googleApiClientListenerClass = googleApiClient.getClass();
+   }
+
+   public void connect() {
+      try {
+         googleApiClientListenerClass.getMethod("connect").invoke(googleApiClient);
+      } catch (Throwable t) {
+         t.printStackTrace();
+      }
+   }
+   
+   public void disconnect() {
+      try {
+         googleApiClientListenerClass.getMethod("disconnect").invoke(googleApiClient);
+      } catch (Throwable t) {
+         t.printStackTrace();
+      }
+   }
+
+   public GoogleApiClient realInstance() {
+      return googleApiClient;
+   }
+}

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

@@ -1,16 +1,40 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2015 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package com.onesignal;
 
 import com.onesignal.AndroidSupportV4Compat.ContextCompat;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -22,7 +46,7 @@
 import java.util.List;
 
 class LocationGMS {
-   private static GoogleApiClient mGoogleApiClient;
+   private static GoogleApiClientCompatProxy mGoogleApiClient;
    static String requestPermission;
 
    private static ActivityLifecycleHandler.ActivityAvailableListener activityAvailableListener;
@@ -78,11 +102,13 @@ else if (locationCoarsePermission == PackageManager.PERMISSION_GRANTED)
 
    static void startGetLocation() {
       GoogleApiClientListener googleApiClientListener = new GoogleApiClientListener();
-      mGoogleApiClient = new GoogleApiClient.Builder(OneSignal.appContext)
+      GoogleApiClient googleApiClient = new GoogleApiClient.Builder(OneSignal.appContext)
           .addApi(LocationServices.API)
           .addConnectionCallbacks(googleApiClientListener)
           .addOnConnectionFailedListener(googleApiClientListener)
           .build();
+      mGoogleApiClient = new GoogleApiClientCompatProxy(googleApiClient);
+
       mGoogleApiClient.connect();
    }
 
@@ -99,7 +125,7 @@ private static class GoogleApiClientListener implements GoogleApiClient.Connecti
       public void onConnected(Bundle bundle) {
          PermissionsActivity.answered = false;
 
-         Location location = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
+         Location location = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient.realInstance());
          // Coarse always gives out 14 digits and has an accuracy 2000. Always rounding to 7 as this is what fine returns.
          if (location != null)
             locationHandler.complete(new BigDecimal(location.getLatitude()).setScale(7, RoundingMode.HALF_UP).doubleValue(), new BigDecimal(location.getLongitude()).setScale(7, RoundingMode.HALF_UP).doubleValue());

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

@@ -162,7 +162,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "020001";
+   public static final String VERSION = "020002";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();