Skip to content

Fix multi-bundle feature when using Firebase as Push Provider #4341

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

Merged
merged 3 commits into from
Nov 2, 2022
Merged

Fix multi-bundle feature when using Firebase as Push Provider #4341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
058f3f4
Use properly `providerName` when new token is received by FirebaseMes…
JcMinarro Nov 2, 2022
ed97ae2
Store userPushToken in a synchronous way on SharedPreferences
JcMinarro Nov 2, 2022
7ccb701
Update CHANGELOG.md
JcMinarro Nov 2, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@

## stream-chat-android-pushprovider-firebase
### 🐞 Fixed
- Fix multi-bundle feature when using Firebase as Push Provider. [#4341](https://github.com/GetStream/stream-chat-android/pull/4341)

### ⬆️ Improved

Expand Down
13 changes: 7 additions & 6 deletions ...nt/src/main/java/io/getstream/chat/android/client/notifications/PushTokenUpdateHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package io.getstream.chat.android.client.notifications

import android.content.Context
import android.content.SharedPreferences
import androidx.core.content.edit
import io.getstream.chat.android.client.ChatClient
import io.getstream.chat.android.client.extensions.getNonNullString
import io.getstream.chat.android.client.models.Device
Expand All @@ -34,12 +35,12 @@ internal class PushTokenUpdateHandler(context: Context) {

private var userPushToken: UserPushToken
set(value) {
prefs.edit()
.putString(KEY_USER_ID, value.userId)
.putString(KEY_TOKEN, value.token)
.putString(KEY_PUSH_PROVIDER, value.pushProvider)
.putString(KEY_PUSH_PROVIDER_NAME, value.providerName)
.apply()
prefs.edit(true) {
putString(KEY_USER_ID, value.userId)
putString(KEY_TOKEN, value.token)
putString(KEY_PUSH_PROVIDER, value.pushProvider)
putString(KEY_PUSH_PROVIDER_NAME, value.providerName)
}
}
get() {
return UserPushToken(
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/getstream/chat/android/pushprovider/firebase/ChatFirebaseMessagingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal class ChatFirebaseMessagingService : FirebaseMessagingService() {

override fun onNewToken(token: String) {
try {
FirebaseMessagingDelegate.registerFirebaseToken(token, null)
FirebaseMessagingDelegate.registerFirebaseToken(token)
} catch (exception: IllegalStateException) {
logger.e(exception) { "[onFirebaseNewToken] error while registering Firebase Token" }
}
Expand Down