Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Do not fail un-registration if Firebase token is not known. Fixes #2895

Browse source
This commit is contained in:
Benoit Marty 2024-05-23 09:51:56 +02:00
parent 3cae2c05c4
commit 16b04afa1f
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
View file

@ -64,14 +64,13 @@ class FirebasePushProvider @Inject constructor(
override suspend fun getCurrentDistributor(matrixClient: MatrixClient) = firebaseDistributor override suspend fun getCurrentDistributor(matrixClient: MatrixClient) = firebaseDistributor
override suspend fun unregister(matrixClient: MatrixClient): Result<Unit> { override suspend fun unregister(matrixClient: MatrixClient): Result<Unit> {
val pushKey = firebaseStore.getFcmToken() ?: return Result.failure<Unit>( val pushKey = firebaseStore.getFcmToken()
IllegalStateException( return if (pushKey == null) {
"Unable to unregister pusher, Firebase token is not known."
)
).also {
Timber.tag(loggerTag.value).w("Unable to unregister pusher, Firebase token is not known.") Timber.tag(loggerTag.value).w("Unable to unregister pusher, Firebase token is not known.")
Result.success(Unit)
} else {
pusherSubscriber.unregisterPusher(matrixClient, pushKey, FirebaseConfig.PUSHER_HTTP_URL)
} }
return pusherSubscriber.unregisterPusher(matrixClient, pushKey, FirebaseConfig.PUSHER_HTTP_URL)
} }
override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? { override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {

7
libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt
View file

@ -134,17 +134,14 @@ class FirebasePushProviderTest {
} }
@Test @Test
fun `unregister ko no token`() = runTest { fun `unregister no token - in this case, the error is ignored`() = runTest {
val firebasePushProvider = createFirebasePushProvider( val firebasePushProvider = createFirebasePushProvider(
firebaseStore = InMemoryFirebaseStore( firebaseStore = InMemoryFirebaseStore(
token = null token = null
), ),
pusherSubscriber = FakePusherSubscriber(
unregisterPusherResult = { _, _, _ -> Result.success(Unit) }
)
) )
val result = firebasePushProvider.unregister(FakeMatrixClient()) val result = firebasePushProvider.unregister(FakeMatrixClient())
assertThat(result.isFailure).isTrue() assertThat(result.isSuccess).isTrue()
} }
@Test @Test