From 058f3f422d373157d8c93a95419b7d7b969f06f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jc=20Mi=C3=B1arro?= Date: Wed, 2 Nov 2022 13:46:41 +0100 Subject: [PATCH 1/3] Use properly `providerName` when new token is received by FirebaseMessagingService --- .../pushprovider/firebase/ChatFirebaseMessagingService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream-chat-android-pushprovider-firebase/src/main/java/io/getstream/chat/android/pushprovider/firebase/ChatFirebaseMessagingService.kt b/stream-chat-android-pushprovider-firebase/src/main/java/io/getstream/chat/android/pushprovider/firebase/ChatFirebaseMessagingService.kt index 0855e6d9e5c..163de8657f7 100644 --- a/stream-chat-android-pushprovider-firebase/src/main/java/io/getstream/chat/android/pushprovider/firebase/ChatFirebaseMessagingService.kt +++ b/stream-chat-android-pushprovider-firebase/src/main/java/io/getstream/chat/android/pushprovider/firebase/ChatFirebaseMessagingService.kt @@ -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" } } From ed97ae23e9a8faa5aa4d58aab94385bf1419b133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jc=20Mi=C3=B1arro?= Date: Wed, 2 Nov 2022 13:54:38 +0100 Subject: [PATCH 2/3] Store userPushToken in a synchronous way on SharedPreferences --- .../client/notifications/PushTokenUpdateHandler.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/notifications/PushTokenUpdateHandler.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/notifications/PushTokenUpdateHandler.kt index a72247639a6..677b99dbf0c 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/notifications/PushTokenUpdateHandler.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/notifications/PushTokenUpdateHandler.kt @@ -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 @@ -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( From 7ccb701f391e59ddfc517b3f0e59c95225fc813b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jc=20Mi=C3=B1arro?= Date: Wed, 2 Nov 2022 17:21:05 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bcf73c0e82..ad45e67c046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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