Cleaned up WakefulBroadcastReceiver

* Using delayed restore instead of starting service right away

Author: jkasten2

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

@@ -27,14 +27,14 @@
 
 package com.onesignal;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.WakefulBroadcastReceiver;
 
-public class BootUpReceiver extends WakefulBroadcastReceiver {
+public class BootUpReceiver extends BroadcastReceiver {
 
    @Override
    public void onReceive(Context context, Intent intent) {
-      NotificationRestorer.startRestoreTaskFromReceiver(context);
+      NotificationRestorer.startDelayedRestoreTaskFromReceiver(context);
    }
 }

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

@@ -215,19 +215,6 @@ static void showNotifications(Context context, Cursor cursor) {
    private static void startService(Context context, Intent intent) {
       context.startService(intent);
    }
-   
-   static void startRestoreTaskFromReceiver(Context context) {
-      if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-         // NotificationRestorer#restore is Code-sensitive to Android O
-         NotificationRestorer.restore(context);
-      }
-      else {
-         Intent intentForService = new Intent();
-         intentForService.setComponent(new ComponentName(context.getPackageName(),
-             NotificationRestoreService.class.getName()));
-         WakefulBroadcastReceiver.startWakefulService(context, intentForService);
-      }
-   }
 
    static void startDelayedRestoreTaskFromReceiver(Context context) {
       if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

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

@@ -27,12 +27,11 @@
 
 package com.onesignal;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Handler;
-import android.support.v4.content.WakefulBroadcastReceiver;
 
-public class UpgradeReceiver extends WakefulBroadcastReceiver {
+public class UpgradeReceiver extends BroadcastReceiver {
 
    @Override
    public void onReceive(final Context context, Intent intent) {