Fixed merge conflict with received receipts

* Also made OSReceivedReceiptsController a singleton.

Author: jkasten2

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

@@ -145,14 +145,16 @@ private static void saveAndProcessNotification(Context context, Bundle bundle, b
    }
 
    /**
-    * Must call this method instead of saveNotification
-    *
-    * This send receive receipt call
+    * Save notification, updates Outcomes, and sends Received Receipt if they are enabled.
     */
    static void processNotification(NotificationGenerationJob notifiJob, boolean opened) {
       saveNotification(notifiJob, opened);
-      OSReceiveReceiptController controller = new OSReceiveReceiptController();
-      controller.sendReceiveReceipt(notifiJob.getApiNotificationId());
+
+      if (!notifiJob.isNotificationToDisplay())
+         return;
+      String notificationId = notifiJob.getApiNotificationId();
+      OutcomesUtils.markLastNotificationReceived(notificationId);
+      OSReceiveReceiptController.getInstance().sendReceiveReceipt(notificationId);
    }
 
    // Saving the notification provides the following:

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

@@ -33,9 +33,15 @@ class OSReceiveReceiptController {
 
     private final OSReceiveReceiptRepository repository;
 
-    OSReceiveReceiptController() {
+    private static OSReceiveReceiptController sInstance;
+    private OSReceiveReceiptController() {
         this.repository = new OSReceiveReceiptRepository();
     }
+    public static synchronized OSReceiveReceiptController getInstance() {
+        if (sInstance == null)
+            sInstance = new OSReceiveReceiptController();
+        return sInstance;
+    }
 
     void sendReceiveReceipt(@NonNull final String notificationId) {
         String appId = OneSignal.appId == null || OneSignal.appId.isEmpty() ? OneSignal.getSavedAppId() : OneSignal.appId;