Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade play-services-basement to 18.1.0 #1982

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Upgrade play-services-basement to 18.1.0 #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9961531
Upgrade to play-services-basement:18.1.0
jkasten2 Feb 6, 2024
31cc669
Handle FCM tokenTask.exception nullability
jkasten2 Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions OneSignalSDK/onesignal/notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,13 @@ dependencies {

compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')

// play-services-base:16.1.0 is the last version before going to AndroidX
// play-services-base:17.0.0 is the first version using AndroidX
// Required for GoogleApiAvailability
implementation('com.google.android.gms:play-services-base') {
jinliu9508 marked this conversation as resolved.
Show resolved Hide resolved
version {
require '[17.0.0, 17.6.99]'
prefer '17.6.0'
}
}

// firebase-messaging:18.0.0 is the last version before going to AndroidX
// firebase-messaging:19.0.0 is the first version using AndroidX
// firebase-messaging:23.0.0 incoporates fix for SecurityException: Not allowed to bind to service
api('com.google.firebase:firebase-messaging') {
version {
require '[19.0.0, 23.0.99]'
prefer '23.0.0'
prefer '23.0.8'
}
}

Expand Down
3 changes: 2 additions & 1 deletion ...a/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.onesignal.notifications.internal.registration.IPushRegistrator
import com.onesignal.user.internal.subscriptions.SubscriptionStatus
import kotlinx.coroutines.delay
import java.io.IOException
import java.util.concurrent.ExecutionException

/**
* The abstract google push registration service. It is expected [PushRegistratorFCM] will extend
Expand All @@ -47,7 +48,7 @@ internal abstract class PushRegistratorAbstractGoogle(
IPushRegistrator, IPushRegistratorCallback {
abstract val providerName: String

@Throws(Throwable::class)
@Throws(ExecutionException::class, InterruptedException::class, IOException::class)
abstract suspend fun getToken(senderId: String): String

override suspend fun registerForPush(): IPushRegistrator.RegisterResult {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorFCM.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ internal class PushRegistratorFCM(
try {
token = Tasks.await(tokenTask)
} catch (e: ExecutionException) {
throw tokenTask.exception
throw tokenTask.exception ?: e
}
}

Expand Down
Loading