Merge pull request #1935 from OneSignal/crash-bindService-with-Broadc…

…ast-Context Crash on bindService with broadcast receiver context
OneSignal · Feb 6, 2024 · dd41509 · dd41509
2 parents f7527d5 + a2ebc3c
commit dd41509
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...gnal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt b/...gnal/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/...ignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt b/...ignal/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/...notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt b/...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/...gnal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt b/...gnal/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
  }