Merge pull request #2018 from OneSignal/fix/always-initWithContext-on…

…-process-entry-points [Fix] Call initWithContext on all entry points
OneSignal · Mar 12, 2024 · 3c79306 · 3c79306
2 parents 94c9fb7 + 5aa610c
commit 3c79306
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/...com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt b/...com/onesignal/notifications/internal/generation/impl/NotificationGenerationWorkManager.kt
@@ -63,8 +63,8 @@ internal class NotificationGenerationWorkManager : INotificationGenerationWorkMa
 
     class NotificationGenerationWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
         override suspend fun doWork(): Result {
-            if (!OneSignal.isInitialized) {
-                return Result.failure()
+            if (!OneSignal.initWithContext(applicationContext)) {
+                return Result.success()
             }
 
             val notificationProcessor: INotificationGenerationProcessor = OneSignal.getService()

diff --git a/...ava/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptWorkManager.kt b/...ava/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptWorkManager.kt
@@ -72,13 +72,16 @@ internal class ReceiveReceiptWorkManager(
     }
 
     class ReceiveReceiptWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
-        private var receiveReceiptProcessor: IReceiveReceiptProcessor = OneSignal.getService()
-
         override suspend fun doWork(): Result {
-            val inputData = inputData
+            if (!OneSignal.initWithContext(applicationContext)) {
+                return Result.success()
+            }
+
             val notificationId = inputData.getString(OS_NOTIFICATION_ID)!!
             val appId = inputData.getString(OS_APP_ID)!!
             val subscriptionId = inputData.getString(OS_SUBSCRIPTION_ID)!!
+
+            val receiveReceiptProcessor = OneSignal.getService<IReceiveReceiptProcessor>()
             receiveReceiptProcessor.sendReceiveReceipt(appId, subscriptionId, notificationId)
             return Result.success()
         }

diff --git a/...nal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt b/...nal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt
@@ -13,6 +13,10 @@ import com.onesignal.notifications.internal.registration.impl.IPushRegistratorCa
 class ADMMessageHandler : ADMMessageHandlerBase("ADMMessageHandler") {
     override fun onMessage(intent: Intent) {
         val context = applicationContext
+        if (!OneSignal.initWithContext(context)) {
+            return
+        }
+
         val bundle = intent.extras
 
         val bundleProcessor = OneSignal.getService<INotificationBundleProcessor>()

diff --git a/.../notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt b/.../notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt
@@ -14,10 +14,16 @@ class ADMMessageHandlerJob : ADMMessageHandlerJobBase() {
         context: Context?,
         intent: Intent?,
     ) {
-        val bundle = intent?.extras
-
+        if (context == null) {
+            return
+        }
+        if (!OneSignal.initWithContext(context.applicationContext)) {
+            return
+        }
         val bundleProcessor = OneSignal.getService<INotificationBundleProcessor>()
 
+        val bundle = intent?.extras
+
         bundleProcessor.processBundleFromReceiver(context!!, bundle!!)
     }