Removed Android 2.3 compat code and updated commit to apply

Author: jkasten2

OneSignalSDK/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

OneSignalSDK/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jul 15 00:03:19 PDT 2017
+#Tue Aug 01 13:07:13 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip

OneSignalSDK/onesignal/build.gradle

@@ -28,27 +28,11 @@ android {
 dependencies {
     provided fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.android.support:support-v4:26.0.0'
-
-    // NOTE: Starting with play-services 10.2.0, minSdkVersion is now 14
     compile 'com.google.android.gms:play-services-gcm:11.0.4'
     compile 'com.google.android.gms:play-services-location:11.0.4'
 
-    // NOTE: customtabs sets minSdkVersion to 15.
+    compile 'com.android.support:support-v4:26.0.0'
     compile 'com.android.support:customtabs:26.0.0'
 }
 
-// Remove OnActivityPausedListener class.
-//     Only required to compile but doesn't need to be in the release jar / aar
-project.afterEvaluate {
-    android.libraryVariants.all { variant ->
-        String variantName = variant.name.capitalize()
-        Task cleanTask = task("removeUnneeded${variantName}Classes") << {
-            delete "build/intermediates/classes/${variant.name}/android/app/OnActivityPausedListener.class"
-        }
-        tasks.findByName("bundle${variantName}").dependsOn cleanTask
-        cleanTask.mustRunAfter tasks.findByName("compile${variantName}Sources")
-    }
-}
-
 apply from: 'maven-push.gradle'

OneSignalSDK/onesignal/src/main/java/android/app/OnActivityPausedListener.java

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2016 OneSignal
+ * 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

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

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2016 OneSignal
+ * 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
@@ -27,12 +27,10 @@
 
 package com.onesignal;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 
-@TargetApi(14)
 class ActivityLifecycleListener implements Application.ActivityLifecycleCallbacks {
 
    @Override

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

@@ -72,7 +72,7 @@ void persistAsFrom() {
       final SharedPreferences prefs = getGcmPreferences(appContext);
       SharedPreferences.Editor editor = prefs.edit();
       editor.putBoolean("ONESIGNAL_ACCEPTED_NOTIFICATION_LAST", enabled);
-      editor.commit();
+      editor.apply();
    }
 
    boolean compare(OSPermissionState from) {

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

@@ -122,7 +122,7 @@ void persistAsFrom() {
       editor.putString("ONESIGNAL_PUSH_TOKEN_LAST", pushToken);
       editor.putBoolean("ONESIGNAL_PERMISSION_ACCEPTED_LAST", accepted);
 
-      editor.commit();
+      editor.apply();
    }
 
    boolean compare(OSSubscriptionState from) {

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

@@ -396,11 +396,8 @@ public static void init(Context context, String googleProjectNumber, String oneS
       lastTrackedFocusTime = SystemClock.elapsedRealtime();
 
       OneSignalStateSynchronizer.initUserState(appContext);
-
-      if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB_MR2)
-         ((Application)appContext).registerActivityLifecycleCallbacks(new ActivityLifecycleListener());
-      else
-         ActivityLifecycleListenerCompat.startListener();
+      
+      ((Application)appContext).registerActivityLifecycleCallbacks(new ActivityLifecycleListener());
 
       try {
          Class.forName("com.amazon.device.iap.PurchasingListener");
@@ -1238,7 +1235,7 @@ private static void SaveAppId(String appId) {
       final SharedPreferences prefs = getGcmPreferences(appContext);
       SharedPreferences.Editor editor = prefs.edit();
       editor.putString("GT_APP_ID", appId);
-      editor.commit();
+      editor.apply();
    }
 
    static String getSavedAppId() {
@@ -1289,7 +1286,7 @@ static void saveFilterOtherGCMReceivers(boolean set) {
       final SharedPreferences prefs = getGcmPreferences(appContext);
       SharedPreferences.Editor editor = prefs.edit();
       editor.putBoolean("OS_FILTER_OTHER_GCM_RECEIVERS", set);
-      editor.commit();
+      editor.apply();
    }
 
    static void updateUserIdDependents(String userId) {
@@ -1684,7 +1681,7 @@ private static void SaveUnsentActiveTime(long time) {
       final SharedPreferences prefs = getGcmPreferences(appContext);
       SharedPreferences.Editor editor = prefs.edit();
       editor.putLong("GT_UNSENT_ACTIVE_TIME", time);
-      editor.commit();
+      editor.apply();
    }
 
    static SharedPreferences getGcmPreferences(Context context) {