Notification is generated from receiver if no remote files

* This to prevent creating a JobService or Service when not needed.
* Also removed some unneeded pre-4.0 Android version checks.

Author: jkasten2

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

@@ -1,3 +1,31 @@
+/**
+ * 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.Intent;

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

@@ -64,7 +64,7 @@ public void onReceive(Context context, Intent intent) {
       Bundle bundle = intent.getExtras();
       if (bundle == null || "google.com/iid".equals(bundle.getString("from")))
          return;
-   
+      
       ProcessedBundleResult processedResult = processOrderBroadcast(context, intent, bundle);
 
       // Null means this isn't a GCM / FCM message.
@@ -120,18 +120,18 @@ private static ProcessedBundleResult processOrderBroadcast(Context context, Inte
    }
 
    private static void startGCMService(Context context, Bundle bundle) {
-      // TODO: Display notification directly if from BroadcastReceiver IF
-      //  1. No remote resource needs to be loaded. Starts with "http"
-      //    - Check large icon, big picture, and background image
-      
       BundleCompat taskExtras = BundleCompatFactory.getInstance();
       taskExtras.putString("json_payload", NotificationBundleProcessor.bundleAsJSONObject(bundle).toString());
       taskExtras.putLong("timestamp", System.currentTimeMillis() / 1000L);
 
-      // TODO: Only use JobScheduler implementation if:
-      //    1. If GCM payload priority is not high.
-      //       - startWakefulService will work in this case on O.
-      if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      // If no remote resources have to be downloaded don't create a job which could add some delay.
+      if (!NotificationBundleProcessor.hasRemoteResource(bundle)) {
+         NotificationBundleProcessor.ProcessFromGCMIntentService(context, taskExtras, null);
+         return;
+      }
+      
+      boolean isHighPriority = Integer.parseInt(bundle.getString("pri", "0")) > 9;
+      if (!isHighPriority && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
          ComponentName componentName = new ComponentName(context.getPackageName(),
                                                          GcmIntentJobService.class.getName());
          Random random = new Random();
@@ -150,7 +150,6 @@ private static void startGCMService(Context context, Bundle bundle) {
       else {
          ComponentName componentName = new ComponentName(context.getPackageName(),
                                                          GcmIntentService.class.getName());
-      
          Intent intentForService = new Intent()
                                     .replaceExtras((Bundle)taskExtras.getBundle())
                                     .setComponent(componentName);

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

@@ -391,9 +391,6 @@ private static Notification createSingleNotificationBeforeSummaryBuilder(Notific
    // Without this MIUI 8 will only show the app icon on the left.
    //  When a large icon is set the small icon will no longer show.
    private static void addXiaomiSettings(OneSignalNotificationBuilder oneSignalNotificationBuilder, Notification notification) {
-      if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
-         return;
-
       // Don't use unless a large icon is set.
       // The small white notification icon is hard to see with MIUI default light theme.
       if (!oneSignalNotificationBuilder.hasLargeIcon)
@@ -711,9 +708,6 @@ private static Integer safeGetColorFromHex(JSONObject gcmBundle, String colorKey
    }
 
    private static Bitmap getLargeIcon(JSONObject gcmBundle) {
-      if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
-         return null;
-
       Bitmap bitmap = getBitmap(gcmBundle.optString("licon"));
       if (bitmap == null)
          bitmap = getBitmapFromAssetsOrResourceName("ic_onesignal_large_icon_default");
@@ -725,9 +719,6 @@ private static Bitmap getLargeIcon(JSONObject gcmBundle) {
    }
 
    private static Bitmap getDefaultLargeIcon() {
-      if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
-         return null;
-      
       Bitmap bitmap = getBitmapFromAssetsOrResourceName("ic_onesignal_large_icon_default");
       return resizeBitmapForLargeIconArea(bitmap);
    }

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

@@ -438,6 +438,16 @@ static JSONArray newJsonArray(JSONObject jsonObject) {
       return jsonArray;
    }
 
+   static boolean hasRemoteResource(Bundle bundle) {
+      return isBuildKeyRemote(bundle, "licon")
+          || isBuildKeyRemote(bundle, "bicon")
+          || bundle.getString("bg_img", null) != null;
+   }
+   
+   private static boolean isBuildKeyRemote(Bundle bundle, String key) {
+      String value = bundle.getString(key, "").trim();
+      return value.startsWith("http://") || value.startsWith("https://");
+   }
 
    static class ProcessedBundleResult {
       boolean isOneSignalPayload;

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

@@ -30,7 +30,6 @@
 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;
@@ -44,11 +43,6 @@ 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;