NotificationExtenderService now started from an Alarm

* Starting a service from the background is compatible with Android O
* Changing to a JobScheduler would break interface compatibility with apps extending the class

Author: jkasten2

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

@@ -78,7 +78,7 @@ public void onReceive(Context context, Intent intent) {
       //   OR app developer setup a extender service to handle the notification.
       if (processedResult.isDup || processedResult.hasExtenderService) {
          // Abort to prevent other GCM receivers from process this Intent.
-         abortBroadcast();
+         setAbort();
          return;
       }
 
@@ -87,8 +87,7 @@ public void onReceive(Context context, Intent intent) {
       //   AND the setting is enabled to allow filtering in this case.
       if (processedResult.isOneSignalPayload &&
           OneSignal.getFilterOtherGCMReceivers(context)) {
-         
-         abortBroadcast();
+         setAbort();
          return;
       }
 
@@ -99,6 +98,11 @@ private void setResult(int code) {
       if (isOrderedBroadcast())
          setResultCode(code);
    }
+
+   private void setAbort() {
+      if (isOrderedBroadcast())
+         abortBroadcast();
+   }
 
    private static ProcessedBundleResult processOrderBroadcast(Context context, Intent intent, Bundle bundle) {
       if (!isGcmMessage(intent))

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

@@ -33,6 +33,8 @@
 
 import com.onesignal.OneSignalDbContract.NotificationTable;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -376,17 +378,9 @@ static ProcessedBundleResult processBundle(Context context, final Bundle bundle)
       result.isOneSignalPayload = true;
 
       prepareBundle(bundle);
-      
-      // NotificationExtenderService still makes additional checks such as notValidOrDuplicated
-      Intent overrideIntent = NotificationExtenderService.getIntent(context);
-      if (overrideIntent != null) {
-         overrideIntent.putExtra("json_payload", bundleAsJSONObject(bundle).toString());
-         overrideIntent.putExtra("timestamp", System.currentTimeMillis() / 1000L);
-         WakefulBroadcastReceiver.startWakefulService(context, overrideIntent);
-         result.hasExtenderService = true;
-         return result;
-      }
-   
+
+      if (startExtenderService(context, bundle, result)) return result;
+
       // We already ran a getNotificationIdFromGCMBundle == null check above so this will only be true for dups
       result.isDup = OneSignal.notValidOrDuplicated(context, bundleAsJSONObject(bundle));
       if (result.isDup)
@@ -410,6 +404,24 @@ public void run() {
       return result;
    }
 
+   // NotificationExtenderService still makes additional checks such as notValidOrDuplicated
+   private static boolean startExtenderService(Context context, Bundle bundle, ProcessedBundleResult result) {
+      Intent intent = NotificationExtenderService.getIntent(context);
+      if (intent == null) return false;
+
+      intent.putExtra("json_payload", bundleAsJSONObject(bundle).toString());
+      intent.putExtra("timestamp", System.currentTimeMillis() / 1000L);
+
+      // Using Alarm with a short delay for Android O compatibility
+      long atTime = System.currentTimeMillis() + 100;
+      PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+      AlarmManager alarm = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+      alarm.set(AlarmManager.RTC_WAKEUP, atTime, pendingIntent);
+
+      result.hasExtenderService = true;
+      return true;
+   }
+
    static boolean shouldDisplay(boolean hasBody) {
       boolean showAsAlert = OneSignal.getInAppAlertNotificationEnabled();
       boolean isActive = OneSignal.isAppActive();

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

@@ -53,9 +53,7 @@
 </service>
 */
 
-// TODO: This class can no longer extend IntentService. Nor can we change it to JobService.
-//       It will be called from the respective server / job instead.
-public abstract class NotificationExtenderService {
+public abstract class NotificationExtenderService extends IntentService {
 
    public static class OverrideSettings {
       public NotificationCompat.Extender extender;
@@ -75,6 +73,11 @@ void override(OverrideSettings overrideSettings) {
       }
    }
 
+   public NotificationExtenderService() {
+      super("NotificationExtenderService");
+      setIntentRedelivery(true);
+   }
+
    private OSNotificationDisplayedResult osNotificationDisplayedResult;
    private JSONObject currentJsonPayload;
    private boolean currentlyRestoring;
@@ -90,19 +93,20 @@ protected final OSNotificationDisplayedResult displayNotification(OverrideSettin
 
       overrideSettings.override(currentBaseOverrideSettings);
       osNotificationDisplayedResult = new OSNotificationDisplayedResult();
-      
+
       NotificationGenerationJob notifJob = createNotifJobFromCurrent();
       notifJob.overrideSettings = overrideSettings;
-      
+
       osNotificationDisplayedResult.androidNotificationId = NotificationBundleProcessor.Process(notifJob);
       return osNotificationDisplayedResult;
    }
 
    // App developer must implement
    //   - Return true to count it as processed which will prevent the default OneSignal SDK notification from displaying.
    protected abstract boolean onNotificationProcessing(OSNotificationReceivedResult notification);
-   
-   final void onHandleIntent(Intent intent) {
+
+   @Override
+   protected final void onHandleIntent(Intent intent) {
       processIntent(intent);
       GcmBroadcastReceiver.completeWakefulIntent(intent);
    }
@@ -119,7 +123,7 @@ private void processIntent(Intent intent) {
 
       String jsonStrPayload = bundle.getString("json_payload");
       if (jsonStrPayload == null) {
-         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "json_payload key is nonexistent from mBundle passed to NotificationExtenderService: " + bundle);
+         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "json_payload key is nonexistent from bundle passed to NotificationExtenderService: " + bundle);
          return;
       }
 
@@ -165,15 +169,15 @@ void processJsonObject(JSONObject currentJsonPayload, boolean restoring) {
          // Save as processed to prevent possible duplicate calls from canonical ids.
 
          boolean display = !developerProcessed &&
-                           NotificationBundleProcessor.shouldDisplay(!"".equals(currentJsonPayload.optString("alert")));
+               NotificationBundleProcessor.shouldDisplay(!"".equals(currentJsonPayload.optString("alert")));
 
          if (!display) {
             if (!restoring) {
                NotificationGenerationJob notifJob = new NotificationGenerationJob(this);
                notifJob.jsonPayload = currentJsonPayload;
                notifJob.overrideSettings = new OverrideSettings();
                notifJob.overrideSettings.androidNotificationId = -1;
-               
+
                NotificationBundleProcessor.saveNotification(notifJob, true);
                OneSignal.handleNotificationReceived(NotificationBundleProcessor.newJsonArray(currentJsonPayload), false, false);
             }
@@ -182,31 +186,24 @@ void processJsonObject(JSONObject currentJsonPayload, boolean restoring) {
             NotificationBundleProcessor.Process(createNotifJobFromCurrent());
       }
    }
-   
-   private static Intent getIntentBase(Context context) {
-      return new Intent().setAction("com.onesignal.NotificationExtender").setPackage(context.getPackageName());
-   }
-   
-   static List<ResolveInfo> getIntentResolveInfoList(Context context) {
-      PackageManager packageManager = context.getPackageManager();
-      return packageManager.queryIntentServices(getIntentBase(context), PackageManager.GET_META_DATA);
-   }
 
    static Intent getIntent(Context context) {
-      List<ResolveInfo> resolveInfo = getIntentResolveInfoList(context);
+      PackageManager packageManager = context.getPackageManager();
+      Intent intent = new Intent().setAction("com.onesignal.NotificationExtender").setPackage(context.getPackageName());
+      List<ResolveInfo> resolveInfo = packageManager.queryIntentServices(intent, PackageManager.GET_META_DATA);
       if (resolveInfo.size() < 1)
          return null;
 
-      return getIntentBase(context);
+      return intent;
    }
-   
+
    private NotificationGenerationJob createNotifJobFromCurrent() {
       NotificationGenerationJob notifJob = new NotificationGenerationJob(this);
       notifJob.restoring = currentlyRestoring;
       notifJob.jsonPayload = currentJsonPayload;
       notifJob.shownTimeStamp = restoreTimestamp;
       notifJob.overrideSettings = currentBaseOverrideSettings;
-      
+
       return notifJob;
    }
 }