Merge pull request #213 from OneSignal/chrome_tabs

jkasten2 · web-flow · commit a6b2490cf936 · 2017-04-20T18:16:44.000-07:00
Adding Custom Chrome tabs
diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle
@@ -24,8 +24,12 @@ android {
 dependencies {
     provided fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.google.android.gms:play-services-gcm:9.8.0'
-    compile 'com.google.android.gms:play-services-location:9.8.0'
+    // NOTE: Starting with play-services 10.2.0, minSdkVersion is now 14
+    compile 'com.google.android.gms:play-services-gcm:10.0.1'
+    compile 'com.google.android.gms:play-services-location:10.0.1'
+
+    // NOTE: customtabs sets minSdkVersion to 15.
+    compile 'com.android.support:customtabs:24.0.0'
 }
 
 // Remove OnActivityPausedListener class.
diff --git a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
@@ -1,4 +1,10 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.onesignal">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.onesignal">
+
+    <!-- OneSignal SDK has runtime checks Android version. -->
+    <uses-sdk tools:overrideLibrary="android.support.customtabs"/>
 
     <!-- INTERNET and c2dm RECEIVE are basic requirements for push messages through Google's GCM. -->
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/AdvertisingIdProviderGPS.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/AdvertisingIdProviderGPS.java
@@ -32,16 +32,23 @@
 import android.content.Context;
 
 class AdvertisingIdProviderGPS implements AdvertisingIdentifierProvider {
+   
+   private static String lastValue;
+   
+   static String getLastValue() {
+      return lastValue;
+   }
 
    @Override
    public String getIdentifier(Context appContext) {
       try {
          AdvertisingIdClient.Info adInfo = AdvertisingIdClient.getAdvertisingIdInfo(appContext);
-         final String id = adInfo.getId();
-         final boolean isLAT = adInfo.isLimitAdTrackingEnabled();
-         if (isLAT)
-            return "OptedOut"; // Google restricts usage of the id to "build profiles" if the user checks opt out so we can't collect.
-         return id;
+         if (adInfo.isLimitAdTrackingEnabled())
+            lastValue = "OptedOut"; // Google restricts usage of the id to "build profiles" if the user checks opt out so we can't collect.
+         else
+            lastValue = adInfo.getId();
+         
+         return lastValue;
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "Error getting Google Ad id: ", t);
       }
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationGMS.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationGMS.java
@@ -83,7 +83,7 @@ static void scheduleUpdate(Context context) {
       if (!hasLocationPermission(context) && OneSignal.shareLocation)
          return;
       
-      long lastTime = getLastLocationTime();
+      long lastTime = getLastLocationTime(context);
       long minTime = 1000 * (OneSignal.isForeground() ? TIME_FOREGROUND : TIME_BACKGROUND);
       long scheduleTime = lastTime + minTime;
       
@@ -97,8 +97,8 @@ private static void setLastLocationTime(long time) {
       editor.apply();
    }
    
-   private static long getLastLocationTime() {
-      final SharedPreferences prefs = OneSignal.getGcmPreferences(classContext);
+   private static long getLastLocationTime(Context context) {
+      final SharedPreferences prefs = OneSignal.getGcmPreferences(context);
       return prefs.getLong("OS_LAST_LOCATION_TIME", -TIME_BACKGROUND * 1000);
    }
    
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
@@ -207,6 +207,7 @@ public void init() {
    private static boolean sendAsSession;
 
    private static JSONObject awl;
+   static boolean mEnterp;
    
    private static class IAPUpdateJob {
       JSONArray toReport;
@@ -434,6 +435,9 @@ void onSuccess(String response) {
                   mGoogleProjectNumberIsRemote = true;
                   mGoogleProjectNumber = responseJson.getString("android_sender_id");
                }
+               
+               mEnterp = responseJson.optBoolean("enterp", false);
+               
                awl = responseJson.getJSONObject("awl_list");
             } catch (Throwable t) {
                t.printStackTrace();
@@ -705,6 +709,8 @@ public void run() {
 
             OneSignalStateSynchronizer.postUpdate(userState, sendAsSession);
             waitingToPostStateSync = false;
+            
+            OneSignalChromeTab.setup(appContext, appId, userId, AdvertisingIdProviderGPS.getLastValue());
          }
       }, "OS_REG_USER").start();
    }
@@ -1180,6 +1186,8 @@ static void updateUserIdDependents(String userId) {
          sendPurchases(iapUpdateJob.toReport, iapUpdateJob.newAsExisting, iapUpdateJob.restResponseHandler);
          iapUpdateJob = null;
       }
+      
+      OneSignalChromeTab.setup(appContext, appId, userId, AdvertisingIdProviderGPS.getLastValue());
    }
 
    // If true(default) - Device will always vibrate unless the device is in silent mode.
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalChromeTab.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalChromeTab.java
@@ -0,0 +1,115 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2017 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 android.content.ComponentName;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.customtabs.CustomTabsCallback;
+import android.support.customtabs.CustomTabsClient;
+import android.support.customtabs.CustomTabsServiceConnection;
+import android.support.customtabs.CustomTabsSession;
+
+import java.util.Random;
+
+class OneSignalChromeTab {
+   
+   private static boolean opened;
+   
+   static void setup(Context context, String appId, String userId, String adId) {
+      // Min Android API Level is set to 9 in the aar's AndroidManifest.xml for capability.
+      //    We need to check for compatibility at runtime for Chrome tabs then.
+      if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+         return;
+      
+      if (opened)
+         return;
+      
+      if (OneSignal.mEnterp)
+         return;
+      
+      if (userId == null || adId == null || appId.equals("OptedOut"))
+         return;
+      
+      String params = "?app_id=" + appId + "&user_id=" + userId + "&ad_id=" + adId + "&cbs_id=" + new Random().nextInt(Integer.MAX_VALUE);
+      
+      try {
+         CustomTabsServiceConnection connection = new OneSignalCustomTabsServiceConnection(context, params);
+         opened = CustomTabsClient.bindCustomTabsService(context, "com.android.chrome", connection);
+      } catch (NoClassDefFoundError e) {
+         // May not be included in app.
+      }
+   }
+   
+   private static class OneSignalCustomTabsServiceConnection extends CustomTabsServiceConnection {
+   
+      private Context mContext;
+      private String mParams;
+      
+      OneSignalCustomTabsServiceConnection(Context context, String params) {
+         mContext = context;
+         mParams = params;
+      }
+      
+      @Override
+      public void onCustomTabsServiceConnected(ComponentName componentName, CustomTabsClient customTabsClient) {
+         if (customTabsClient == null)
+            return;
+      
+         customTabsClient.warmup(0);
+   
+         CustomTabsSession session = customTabsClient.newSession(new CustomTabsCallback()  {
+            public void onNavigationEvent(int navigationEvent, Bundle extras) {
+               super.onNavigationEvent(navigationEvent, extras);
+            }
+         
+            public void extraCallback(String callbackName, Bundle args) {
+               super.extraCallback(callbackName, args);
+            }
+         });
+         
+         Uri uri = Uri.parse("https://onesignal.com/android_frame.html" + mParams);
+         session.mayLaunchUrl(uri, null, null);
+      
+         // Shows tab as it's own Activity
+         /*
+         CustomTabsIntent.Builder mBuilder = new CustomTabsIntent.Builder(session);
+         CustomTabsIntent customTabsIntent = mBuilder.build();
+         customTabsIntent.intent.setData(uri);
+         customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+         mContext.startActivity(customTabsIntent.intent, customTabsIntent.startAnimationBundle);
+         */
+      }
+   
+      @Override
+      public void onServiceDisconnected(ComponentName name) {
+      }
+   }
+}
diff --git a/OneSignalSDK/unittest/build.gradle b/OneSignalSDK/unittest/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     // Use for SDK Development
     compile(project(':onesignal')) {
         exclude group: 'com.android.support', module: 'support-v4'
+        exclude group: 'com.android.support', module: 'customtabs'
         exclude group: 'com.google.android.gms', module: 'play-services-gcm'
         exclude group: 'com.google.android.gms', module: 'play-services-analytics'
         exclude group: 'com.google.android.gms', module: 'play-services-location'
@@ -53,14 +54,16 @@ dependencies {
 
     // 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-gcm:10.0.1"
 
     // play-services-analytics is required for AdvertisingIdClient when using GMS 8.1.0 or lower.
     // 8.3.0 it is included in 'basement' which is required by 'base'.
     //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-location:10.0.1"
 
-    compile 'com.google.android.gms:play-services-analytics:7.0.0'
+    // compile 'com.google.android.gms:play-services-analytics:7.0.0'
+
+    compile 'com.android.support:customtabs:24.0.0'
 
     testCompile 'junit:junit:4.12'
     testCompile('org.robolectric:robolectric:3.3.2') {
diff --git a/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowAdvertisingIdProviderGPS.java b/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowAdvertisingIdProviderGPS.java
@@ -33,7 +33,14 @@
 
 @Implements(AdvertisingIdProviderGPS.class)
 public class ShadowAdvertisingIdProviderGPS {
+   
+   private static final String MOCK_ID = "11111111-2222-3333-4444-555555555555";
+   
+   public static String getLastValue() {
+      return MOCK_ID;
+   }
+   
    public String getIdentifier(Context appContext) {
-      return "11111111-2222-3333-4444-555555555555";
+      return MOCK_ID;
    }
 }
diff --git a/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowCustomTabsClient.java b/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowCustomTabsClient.java
@@ -0,0 +1,79 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2017 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 android.content.ComponentName;
+import android.content.Context;
+import android.support.customtabs.CustomTabsCallback;
+import android.support.customtabs.CustomTabsClient;
+import android.support.customtabs.CustomTabsServiceConnection;
+import android.support.customtabs.CustomTabsSession;
+import android.support.customtabs.ICustomTabsCallback;
+import android.support.customtabs.ICustomTabsService;
+
+import org.robolectric.annotation.Implements;
+
+import java.lang.reflect.Constructor;
+
+@Implements(CustomTabsClient.class)
+public class ShadowCustomTabsClient {
+   
+   public static boolean bindCustomTabsServiceCalled;
+   
+   public boolean warmup(long flags) {
+      return true;
+   }
+   
+   public static boolean bindCustomTabsService(Context context, String packageName, CustomTabsServiceConnection connection) {
+      try {
+         Constructor<CustomTabsClient> constructor = CustomTabsClient.class.getDeclaredConstructor(ICustomTabsService.class, ComponentName.class);
+         constructor.setAccessible(true);
+         CustomTabsClient inst = constructor.newInstance(null, null);
+   
+         bindCustomTabsServiceCalled = true;
+         connection.onCustomTabsServiceConnected(null, inst);
+      } catch(Throwable t) {
+      }
+      return true;
+   }
+   
+   public CustomTabsSession newSession(final CustomTabsCallback callback) {
+      try {
+         Constructor<CustomTabsSession> constructor = CustomTabsSession.class.getDeclaredConstructor(ICustomTabsService.class,
+             ICustomTabsCallback.class,
+             ComponentName.class);
+         constructor.setAccessible(true);
+   
+         return constructor.newInstance(null, null, null);
+      }catch (Throwable t) {
+         t.printStackTrace();
+      }
+      
+      return null;
+   }
+}
diff --git a/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowCustomTabsSession.java b/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowCustomTabsSession.java
diff --git a/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java b/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@ public void init() {`
`207`	`207`	`private static boolean sendAsSession;`
`208`	`208`
`209`	`209`	`private static JSONObject awl;`
	`210`	`+ static boolean mEnterp;`
`210`	`211`
`211`	`212`	`private static class IAPUpdateJob {`
`212`	`213`	`JSONArray toReport;`
`@@ -434,6 +435,9 @@ void onSuccess(String response) {`
`434`	`435`	`mGoogleProjectNumberIsRemote = true;`
`435`	`436`	`mGoogleProjectNumber = responseJson.getString("android_sender_id");`
`436`	`437`	`}`
	`438`	`+`
	`439`	`+ mEnterp = responseJson.optBoolean("enterp", false);`
	`440`	`+`
`437`	`441`	`awl = responseJson.getJSONObject("awl_list");`
`438`	`442`	`} catch (Throwable t) {`
`439`	`443`	`t.printStackTrace();`
`@@ -705,6 +709,8 @@ public void run() {`
`705`	`709`
`706`	`710`	`OneSignalStateSynchronizer.postUpdate(userState, sendAsSession);`
`707`	`711`	`waitingToPostStateSync = false;`
	`712`	`+`
	`713`	`+ OneSignalChromeTab.setup(appContext, appId, userId, AdvertisingIdProviderGPS.getLastValue());`
`708`	`714`	`}`
`709`	`715`	`}, "OS_REG_USER").start();`
`710`	`716`	`}`
`@@ -1180,6 +1186,8 @@ static void updateUserIdDependents(String userId) {`
`1180`	`1186`	`sendPurchases(iapUpdateJob.toReport, iapUpdateJob.newAsExisting, iapUpdateJob.restResponseHandler);`
`1181`	`1187`	`iapUpdateJob = null;`
`1182`	`1188`	`}`
	`1189`	`+`
	`1190`	`+ OneSignalChromeTab.setup(appContext, appId, userId, AdvertisingIdProviderGPS.getLastValue());`
`1183`	`1191`	`}`
`1184`	`1192`
`1185`	`1193`	`// If true(default) - Device will always vibrate unless the device is in silent mode.`