From 43d414c6028a9ea9d368e7c60f4e739e3a7a041b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 7 May 2024 17:22:39 +0200
Subject: [PATCH] Cleanup

---
 .../impl/advanced/AdvancedSettingsPresenter.kt   |  1 -
 .../firebase/FirebaseNewTokenHandler.kt          | 16 ++++++++++------
 .../firebase/FirebasePushProvider.kt             |  6 +++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
index 77654d6c4c..3582517ef5 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
@@ -147,4 +147,3 @@ class AdvancedSettingsPresenter @Inject constructor(
         )
     }
 }
-
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
index 1261df0911..e61ea4bc91 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
@@ -44,19 +44,23 @@ class FirebaseNewTokenHandler @Inject constructor(
         // Register the pusher for all the sessions
         sessionStore.getAllSessions().toUserList()
             .map { SessionId(it) }
-            .forEach { userId ->
-                val userDataStore = userPushStoreFactory.getOrCreate(userId)
+            .forEach { sessionId ->
+                val userDataStore = userPushStoreFactory.getOrCreate(sessionId)
                 if (userDataStore.getPushProviderName() == FirebaseConfig.NAME) {
                     matrixAuthenticationService
-                        .restoreSession(userId)
+                        .restoreSession(sessionId)
                         .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 ->
-                            pusherSubscriber.registerPusher(client, firebaseToken, FirebaseConfig.PUSHER_HTTP_URL)
+                            pusherSubscriber.registerPusher(
+                                matrixClient = client,
+                                pushKey = firebaseToken,
+                                gateway = FirebaseConfig.PUSHER_HTTP_URL,
+                            )
                         }
                         .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 {
                     Timber.tag(loggerTag.value).d("This session is not using Firebase pusher")
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
index f804ec4227..b88d70b157 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
@@ -54,7 +54,11 @@ class FirebasePushProvider @Inject constructor(
         ).also {
             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