From 8e6fb1ff71b64d3d03935433e9e252275e84e460 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 7 Dec 2023 13:25:06 -0500 Subject: [PATCH] call bindService with applicationContext --- .../core/internal/purchases/impl/TrackGooglePurchase.kt | 3 ++- .../com/onesignal/notifications/receivers/BootUpReceiver.kt | 2 +- .../onesignal/notifications/receivers/FCMBroadcastReceiver.kt | 2 +- .../com/onesignal/notifications/receivers/UpgradeReceiver.kt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt index 8a6f5b4a2e..6d2f9e66ba 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt @@ -132,7 +132,8 @@ internal class TrackGooglePurchase( mServiceConn = serviceConn val serviceIntent = Intent("com.android.vending.billing.InAppBillingService.BIND") serviceIntent.setPackage("com.android.vending") - _applicationService.appContext.bindService(serviceIntent, serviceConn, Context.BIND_AUTO_CREATE) + // Invoke 'applicationContext' to avoid exceptions caused by 'ReceiverRestrictedContext' when using 'bindService'. + _applicationService.appContext.applicationContext.bindService(serviceIntent, serviceConn, Context.BIND_AUTO_CREATE) } else if (mIInAppBillingService != null) { queryBoughtItems() } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt index 208f427ebe..9bb41d3de0 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt @@ -37,7 +37,7 @@ class BootUpReceiver : BroadcastReceiver() { context: Context, intent: Intent, ) { - if (!OneSignal.initWithContext(context)) { + if (!OneSignal.initWithContext(context.applicationContext)) { return } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt index fe8062f662..bdef09d516 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt @@ -23,7 +23,7 @@ class FCMBroadcastReceiver : BroadcastReceiver() { return } - if (!OneSignal.initWithContext(context)) { + if (!OneSignal.initWithContext(context.applicationContext)) { return } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt index d6ed9e4782..7fd768c9ae 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt @@ -46,7 +46,7 @@ class UpgradeReceiver : BroadcastReceiver() { return } - if (!OneSignal.initWithContext(context)) { + if (!OneSignal.initWithContext(context.applicationContext)) { return }