Cancel Worker thread if notification nor processed

* Notification might not be processed if it is a restored one or an IAM

Author: Jeasmine

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

@@ -165,6 +165,11 @@ private static int processJobForDisplay(OSNotificationController notificationCon
             String osNotificationId = OSNotificationFormatHelper.getOSNotificationIdFromJson(notificationController.getNotificationJob().getJsonPayload());
             OSNotificationWorkManager.removeNotificationIdProcessed(osNotificationId);
             OneSignal.handleNotificationReceived(notificationJob);
+        } else {
+            CallbackToFutureAdapter.Completer<ListenableWorker.Result>  callbackCompleter = notificationJob.getCallbackCompleter();
+            OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "Process notification restored or IAM with callback completer: " + callbackCompleter);
+            if (callbackCompleter != null)
+                callbackCompleter.set(ListenableWorker.Result.success());
         }
 
         return androidNotificationId;

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

@@ -55,7 +55,6 @@ static void removeNotificationIdProcessed(String osNotificationId) {
 
     static void beginEnqueueingWork(Context context, String osNotificationId, int androidNotificationId, String jsonPayload, long timestamp,
                                     boolean isRestoring, boolean isHighPriority, boolean needsWorkerThread) {
-
         if (!needsWorkerThread) {
             try {
                 JSONObject jsonPayloadObject = new JSONObject(jsonPayload);

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

@@ -1256,7 +1256,6 @@ public void shouldShowInAppPreviewWhenOpeningPreviewNotification() throws Except
    @Test
    @Config(shadows = { ShadowGenerateNotification.class })
    public void shouldSendReceivedReceiptWhenEnabled() throws Exception {
-
       ShadowOneSignalRestClient.setRemoteParamsReceiveReceiptsEnable(true);
 
       String appId = "b2f7f966-d8cc-11e4-bed1-df8f05be55ba";