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

Cleanup

Browse source
This commit is contained in:
Benoit Marty 2024-05-07 17:22:39 +02:00 • committed by Benoit Marty
parent 6de5e7b3f5
commit 43d414c602
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
View file

@ -147,4 +147,3 @@ class AdvancedSettingsPresenter @Inject constructor(
) )
} }
} }

16
libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
View file

@ -44,19 +44,23 @@ class FirebaseNewTokenHandler @Inject constructor(
// Register the pusher for all the sessions // Register the pusher for all the sessions
sessionStore.getAllSessions().toUserList() sessionStore.getAllSessions().toUserList()
.map { SessionId(it) } .map { SessionId(it) }
.forEach { userId -> .forEach { sessionId ->
val userDataStore = userPushStoreFactory.getOrCreate(userId) val userDataStore = userPushStoreFactory.getOrCreate(sessionId)
if (userDataStore.getPushProviderName() == FirebaseConfig.NAME) { if (userDataStore.getPushProviderName() == FirebaseConfig.NAME) {
matrixAuthenticationService matrixAuthenticationService
.restoreSession(userId) .restoreSession(sessionId)
.onFailure { .onFailure {
Timber.tag(loggerTag.value).e(it, "Failed to restore session $userId") Timber.tag(loggerTag.value).e(it, "Failed to restore session $sessionId")
} }
.flatMap { client -> .flatMap { client ->
pusherSubscriber.registerPusher(client, firebaseToken, FirebaseConfig.PUSHER_HTTP_URL) pusherSubscriber.registerPusher(
matrixClient = client,
pushKey = firebaseToken,
gateway = FirebaseConfig.PUSHER_HTTP_URL,
)
} }
.onFailure { .onFailure {
Timber.tag(loggerTag.value).e(it, "Failed to register pusher for session $userId") Timber.tag(loggerTag.value).e(it, "Failed to register pusher for session $sessionId")
} }
} else { } else {
Timber.tag(loggerTag.value).d("This session is not using Firebase pusher") Timber.tag(loggerTag.value).d("This session is not using Firebase pusher")

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

@ -54,7 +54,11 @@ class FirebasePushProvider @Inject constructor(
).also { ).also {
Timber.tag(loggerTag.value).w("Unable to register pusher, Firebase token is not known.") Timber.tag(loggerTag.value).w("Unable to register pusher, Firebase token is not known.")
} }
return pusherSubscriber.registerPusher(matrixClient, pushKey, FirebaseConfig.PUSHER_HTTP_URL) return pusherSubscriber.registerPusher(
matrixClient = matrixClient,
pushKey = pushKey,
gateway = FirebaseConfig.PUSHER_HTTP_URL,
)
} }
override suspend fun getCurrentDistributor(matrixClient: MatrixClient) = firebaseDistributor override suspend fun getCurrentDistributor(matrixClient: MatrixClient) = firebaseDistributor