Merge pull request #1403 from OneSignal/fix/foregroundHandler_on_restoring_notifs

No longer firing willShowInForegroundHandler for restoring notifications

Author: emawby

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

@@ -146,7 +146,7 @@ private static int processJobForDisplay(OSNotificationController notificationCon
 
         if (doDisplay) {
             androidNotificationId = notificationJob.getAndroidId();
-            if (fromBackgroundLogic && OneSignal.shouldFireForegroundHandlers()) {
+            if (fromBackgroundLogic && OneSignal.shouldFireForegroundHandlers(notificationJob)) {
                 notificationController.setFromBackgroundLogic(false);
                 OneSignal.fireForegroundHandlers(notificationController);
                 // Notification will be processed by foreground user complete or timer complete

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

@@ -2299,7 +2299,7 @@ static void handleNotificationReceived(OSNotificationGenerationJob notificationJ
     * <br/><br/>
     * @see OSNotificationWillShowInForegroundHandler
     */
-   static boolean shouldFireForegroundHandlers() {
+   static boolean shouldFireForegroundHandlers(OSNotificationGenerationJob notificationJob) {
       if (!isInForeground()) {
          OneSignal.onesignalLog(LOG_LEVEL.INFO, "App is in background, show notification");
          return false;
@@ -2310,6 +2310,12 @@ static boolean shouldFireForegroundHandlers() {
          return false;
       }
 
+      // Notification is restored. Don't fire for restored notifications.
+      if (notificationJob.isRestoring()) {
+         OneSignal.onesignalLog(LOG_LEVEL.INFO, "Not firing notificationWillShowInForegroundHandler for restored notifications");
+         return false;
+      }
+
       return true;
    }