Rename UserPushStoreFactory.create to UserPushStoreFactory.getOrCreate for code clarity.

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt

@@ -48,7 +48,7 @@ class NotificationSettingsPresenter @Inject constructor(
 ) : Presenter<NotificationSettingsState> {
     @Composable
     override fun present(): NotificationSettingsState {
-        val userPushStore = remember { userPushStoreFactory.create(matrixClient.sessionId) }
+        val userPushStore = remember { userPushStoreFactory.getOrCreate(matrixClient.sessionId) }
         val systemNotificationsEnabled: MutableState<Boolean> = remember {
             mutableStateOf(systemNotificationsEnabledProvider.notificationsEnabled())
         }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultGetCurrentPushProvider.kt

@@ -35,7 +35,7 @@ class DefaultGetCurrentPushProvider @Inject constructor(
             .value
             .navigationState
             .currentSessionId()
-            ?.let { pushStoreFactory.create(it) }
+            ?.let { pushStoreFactory.getOrCreate(it) }
             ?.getPushProviderName()
     }
 }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt

@@ -49,7 +49,7 @@ class DefaultPushService @Inject constructor(
      * Get current push provider, compare with provided one, then unregister and register if different, and store change.
      */
     override suspend fun registerWith(matrixClient: MatrixClient, pushProvider: PushProvider, distributor: Distributor) {
-        val userPushStore = userPushStoreFactory.create(matrixClient.sessionId)
+        val userPushStore = userPushStoreFactory.getOrCreate(matrixClient.sessionId)
         val currentPushProviderName = userPushStore.getPushProviderName()
         if (currentPushProviderName != pushProvider.name) {
             // Unregister previous one if any

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt

@@ -63,7 +63,7 @@ class PushersManager @Inject constructor(
      * Register a pusher to the server if not done yet.
      */
     override suspend fun registerPusher(matrixClient: MatrixClient, pushKey: String, gateway: String) {
-        val userDataStore = userPushStoreFactory.create(matrixClient.sessionId)
+        val userDataStore = userPushStoreFactory.getOrCreate(matrixClient.sessionId)
         if (userDataStore.getCurrentRegisteredPushKey() == pushKey) {
             Timber.tag(loggerTag.value)
                 .d("Unnecessary to register again the same pusher, but do it in case the pusher has been removed from the server")

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt

@@ -122,7 +122,7 @@ class DefaultPushHandler @Inject constructor(
                 return
             }
 
-            val userPushStore = userPushStoreFactory.create(userId)
+            val userPushStore = userPushStoreFactory.getOrCreate(userId)
             if (!userPushStore.getNotificationEnabledForDevice().first()) {
                 // TODO We need to check if this is an incoming call
                 Timber.tag(loggerTag.value).i("Notification are disabled for this device, ignore push.")

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

@@ -44,7 +44,7 @@ class FirebaseNewTokenHandler @Inject constructor(
         sessionStore.getAllSessions().toUserList()
             .map { SessionId(it) }
             .forEach { userId ->
-                val userDataStore = userPushStoreFactory.create(userId)
+                val userDataStore = userPushStoreFactory.getOrCreate(userId)
                 if (userDataStore.getPushProviderName() == FirebaseConfig.NAME) {
                     matrixAuthenticationService.restoreSession(userId).getOrNull()?.use { client ->
                         pusherSubscriber.registerPusher(client, firebaseToken, FirebaseConfig.PUSHER_HTTP_URL)

libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushNewGatewayHandler.kt

@@ -40,7 +40,7 @@ class UnifiedPushNewGatewayHandler @Inject constructor(
         val userId = pushClientSecret.getUserIdFromSecret(clientSecret) ?: return Unit.also {
             Timber.w("Unable to retrieve session")
         }
-        val userDataStore = userPushStoreFactory.create(userId)
+        val userDataStore = userPushStoreFactory.getOrCreate(userId)
         if (userDataStore.getPushProviderName() == UnifiedPushConfig.NAME) {
             matrixAuthenticationService.restoreSession(userId).getOrNull()?.use { client ->
                 pusherSubscriber.registerPusher(client, endpoint, pushGateway)

libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStoreFactory.kt

@@ -22,5 +22,5 @@ import io.element.android.libraries.matrix.api.core.SessionId
  * Store data related to push about a user.
  */
 interface UserPushStoreFactory {
-    fun create(userId: SessionId): UserPushStore
+    fun getOrCreate(userId: SessionId): UserPushStore
 }

libraries/pushstore/impl/src/androidTest/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactoryTest.kt

@@ -40,11 +40,11 @@ class DefaultUserPushStoreFactoryTest {
         val userPushStoreFactory = DefaultUserPushStoreFactory(context, NoOpSessionObserver())
         var userPushStore1: UserPushStore? = null
         val thread1 = thread {
-            userPushStore1 = userPushStoreFactory.create(sessionId)
+            userPushStore1 = userPushStoreFactory.getOrCreate(sessionId)
         }
         var userPushStore2: UserPushStore? = null
         val thread2 = thread {
-            userPushStore2 = userPushStoreFactory.create(sessionId)
+            userPushStore2 = userPushStoreFactory.getOrCreate(sessionId)
         }
         thread1.join()
         thread2.join()

libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactory.kt

@@ -41,7 +41,7 @@ class DefaultUserPushStoreFactory @Inject constructor(
 
     // We can have only one class accessing a single data store, so keep a cache of them.
     private val cache = ConcurrentHashMap<SessionId, UserPushStore>()
-    override fun create(userId: SessionId): UserPushStore {
+    override fun getOrCreate(userId: SessionId): UserPushStore {
         return cache.getOrPut(userId) {
             UserPushStoreDataStore(
                 context = context,
@@ -60,6 +60,6 @@ class DefaultUserPushStoreFactory @Inject constructor(
 
     override suspend fun onSessionDeleted(userId: String) {
         // Delete the store
-        create(SessionId(userId)).reset()
+        getOrCreate(SessionId(userId)).reset()
     }
 }

libraries/pushstore/test/src/main/kotlin/com/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStoreFactory.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.pushstore.api.UserPushStore
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
 
 class FakeUserPushStoreFactory : UserPushStoreFactory {
-    override fun create(userId: SessionId): UserPushStore {
+    override fun getOrCreate(userId: SessionId): UserPushStore {
         return FakeUserPushStore()
     }
 }