Avoid continue logic when having foreground handler

* When having foreground handler active, stop processing notification, it will be processed by user or timer complete

Author: Jeasmine

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

@@ -140,14 +140,14 @@ static int processJobForDisplay(OSNotificationController notificationController,
             if (fromBackgroundLogic && OneSignal.shouldFireForegroundHandlers()) {
                 notificationController.setFromBackgroundLogic(false);
                 OneSignal.fireForegroundHandlers(notificationController);
+                // Notification will be processed by foreground user complete or timer complete
+                return androidNotificationId;
             } else {
-                notificationController.setForegroundLogicEnded(true);
                 GenerateNotification.fromJsonPayload(notificationJob);
             }
         }
 
-        if (!notificationJob.isRestoring() && !notificationJob.isIamPreview() && !notificationJob.isProcessed()) {
-            notificationJob.setProcessed(true);
+        if (!notificationJob.isRestoring() && !notificationJob.isIamPreview()) {
             processNotification(notificationJob, opened);
             OneSignal.handleNotificationReceived(notificationJob);
         }
@@ -265,7 +265,6 @@ private static void saveNotification(OSNotificationGenerationJob notificationJob
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "Finish saving notification");
     }
 
     static void markRestoredNotificationAsDismissed(OSNotificationGenerationJob notifiJob) {

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

@@ -43,7 +43,6 @@ public class OSNotificationController {
    private final OSNotificationGenerationJob notificationJob;
    private boolean restoring;
    private boolean fromBackgroundLogic;
-   private boolean foregroundLogicEnded;
 
    OSNotificationController(OSNotificationGenerationJob notificationJob, boolean restoring, boolean fromBackgroundLogic) {
       this.restoring = restoring;
@@ -81,7 +80,6 @@ private OSNotificationGenerationJob createNotificationJobFromCurrent(Context con
     * @see OSNotificationReceivedEvent#complete(OSNotification)
     */
    void processNotification(OSNotification originalNotification, @Nullable OSNotification notification) {
-      OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "processNotification called from Thread: " + Thread.currentThread().toString());
       if (notification != null) {
          // Save as processed to prevent possible duplicate calls from canonical ids
          boolean display = isStringEmpty(notification.getBody());
@@ -111,7 +109,6 @@ private void notDisplayNotificationLogic(OSNotification originalNotification) {
       } else {
          // -1 is used to note never displayed
          notificationJob.getNotification().setAndroidNotificationId(-1);
-         notificationJob.setProcessed(true);
          NotificationBundleProcessor.processNotification(notificationJob, true);
          OneSignal.handleNotificationReceived(notificationJob);
       }
@@ -141,14 +138,6 @@ public void setFromBackgroundLogic(boolean fromBackgroundLogic) {
       this.fromBackgroundLogic = fromBackgroundLogic;
    }
 
-   public boolean isForegroundLogicEnded() {
-      return foregroundLogicEnded;
-   }
-
-   public void setForegroundLogicEnded(boolean foregroundLogicEnded) {
-      this.foregroundLogicEnded = foregroundLogicEnded;
-   }
-
    /**
     * In addition to using the setters to set all of the handlers you can also create your own implementation
     *  within a separate class and give your AndroidManifest.xml a special meta data tag

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

@@ -44,7 +44,6 @@ public class OSNotificationGenerationJob {
     private JSONObject jsonPayload;
     private boolean restoring;
     private boolean iamPreview;
-    private boolean processed;
 
     private Long shownTimeStamp;
 
@@ -173,14 +172,6 @@ public void setIamPreview(boolean iamPreview) {
         this.iamPreview = iamPreview;
     }
 
-    public boolean isProcessed() {
-        return processed;
-    }
-
-    public void setProcessed(boolean processed) {
-        this.processed = processed;
-    }
-
     public Long getShownTimeStamp() {
         return shownTimeStamp;
     }
@@ -243,7 +234,6 @@ public String toString() {
                 "jsonPayload=" + jsonPayload +
                 ", isRestoring=" + restoring +
                 ", isIamPreview=" + iamPreview +
-                ", isProcessed=" + processed +
                 ", shownTimeStamp=" + shownTimeStamp +
                 ", overriddenBodyFromExtender=" + overriddenBodyFromExtender +
                 ", overriddenTitleFromExtender=" + overriddenTitleFromExtender +

OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java

@@ -2062,7 +2062,7 @@ public void testNotificationWillShowInForegroundHandler_silentNotificationNotSav
               .pollInterval(new Duration(500, TimeUnit.MILLISECONDS))
               .untilAsserted(() -> {
                  // Make sure 1 notification exists in DB
-                 assertNotificationDbRecords(1, false);
+                 assertNotificationDbRecords(1, true);
               });
    }