Cleanup

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

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

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 ->
+            .forEach { sessionId ->
-                val userDataStore = userPushStoreFactory.getOrCreate(userId)
+                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")

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