Skip to content

Commit dd41509

Browse files
committed
Merge pull request #1935 from OneSignal/crash-bindService-with-Broadcast-Context
Crash on bindService with broadcast receiver context
2 parents f7527d5 + a2ebc3c commit dd41509

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackGooglePurchase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ internal class TrackGooglePurchase(
132132
mServiceConn = serviceConn
133133
val serviceIntent = Intent("com.android.vending.billing.InAppBillingService.BIND")
134134
serviceIntent.setPackage("com.android.vending")
135-
_applicationService.appContext.bindService(serviceIntent, serviceConn, Context.BIND_AUTO_CREATE)
135+
// Invoke 'applicationContext' to avoid exceptions caused by 'ReceiverRestrictedContext' when using 'bindService'.
136+
_applicationService.appContext.applicationContext.bindService(serviceIntent, serviceConn, Context.BIND_AUTO_CREATE)
136137
} else if (mIInAppBillingService != null) {
137138
queryBoughtItems()
138139
}

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/BootUpReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BootUpReceiver : BroadcastReceiver() {
3737
context: Context,
3838
intent: Intent,
3939
) {
40-
if (!OneSignal.initWithContext(context)) {
40+
if (!OneSignal.initWithContext(context.applicationContext)) {
4141
return
4242
}
4343

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/FCMBroadcastReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FCMBroadcastReceiver : BroadcastReceiver() {
2323
return
2424
}
2525

26-
if (!OneSignal.initWithContext(context)) {
26+
if (!OneSignal.initWithContext(context.applicationContext)) {
2727
return
2828
}
2929

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/receivers/UpgradeReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class UpgradeReceiver : BroadcastReceiver() {
4646
return
4747
}
4848

49-
if (!OneSignal.initWithContext(context)) {
49+
if (!OneSignal.initWithContext(context.applicationContext)) {
5050
return
5151
}
5252

0 commit comments

Comments
 (0)