-
Notifications
You must be signed in to change notification settings - Fork 109
fix(fcm): skip session update without token #6467
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.
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
+198
−16
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0577a7d
fix(fcm): skip session update without token
SeniorZhai e11e894
feat(debug): add manual fcm token update
SeniorZhai 3044414
fix(fcm): skip worker retry without token
SeniorZhai 0cdd859
fix(fcm): reset installation on auth errors
SeniorZhai 4d537eb
Merge branch 'master' into fix/refresh-fcm-token
crossle 32fb3ec
fix(fcm): post session without firebase token
SeniorZhai c3dc43f
fix(fcm): use shared exception reporting
SeniorZhai 36627e6
fix(reporting): send exceptions to bugsnag
SeniorZhai 5cef7d0
fix(fcm): report key errors to firebase and bugsnag
SeniorZhai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
app/src/main/java/one/mixin/android/util/FirebaseTokenUtil.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package one.mixin.android.util | ||
|
|
||
| import com.google.firebase.installations.FirebaseInstallations | ||
| import com.google.firebase.messaging.FirebaseMessaging | ||
| import kotlinx.coroutines.tasks.await | ||
| import timber.log.Timber | ||
|
|
||
| private const val FIS_AUTH_ERROR = "FIS_AUTH_ERROR" | ||
|
|
||
| suspend fun retrieveFirebaseMessagingToken(): String = | ||
| try { | ||
| FirebaseMessaging.getInstance().token.await() | ||
| } catch (e: Exception) { | ||
| if (!e.isFisAuthError()) throw e | ||
| Timber.w(e, "Firebase token retrieval failed with FIS_AUTH_ERROR") | ||
| try { | ||
| Timber.w("Deleting Firebase installation before retrying token retrieval") | ||
| FirebaseInstallations.getInstance().delete().await() | ||
| Timber.w("Firebase installation deleted, retrying token retrieval") | ||
| } catch (deleteError: Exception) { | ||
| Timber.e(deleteError, "Failed to delete Firebase installation after FIS_AUTH_ERROR") | ||
| reportException("Failed to delete Firebase installation after FIS_AUTH_ERROR", deleteError) | ||
| throw deleteError | ||
| } | ||
| FirebaseMessaging.getInstance().token.await() | ||
| } | ||
|
|
||
| private fun Throwable.isFisAuthError(): Boolean = | ||
| generateSequence(this) { it.cause }.any { throwable -> | ||
| throwable.message?.contains(FIS_AUTH_ERROR, ignoreCase = true) == true | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.