Create const of any account provider value

Author: bmarty

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt

@@ -21,10 +21,14 @@ interface EnterpriseService {
 
     fun firebasePushGateway(): String?
     fun unifiedPushDefaultPushGateway(): String?
+
+    companion object {
+        const val ANY_ACCOUNT_PROVIDER = "*"
+    }
 }
 
 fun EnterpriseService.canConnectToAnyHomeserver(): Boolean {
     return defaultHomeserverList().let {
-        it.isEmpty() || it.contains("*")
+        it.isEmpty() || it.contains(EnterpriseService.ANY_ACCOUNT_PROVIDER)
     }
 }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt

@@ -20,15 +20,16 @@ import javax.inject.Inject
 class AccountProviderDataSource @Inject constructor(
     enterpriseService: EnterpriseService,
 ) {
-    private val defaultAccountProvider = (enterpriseService.defaultHomeserverList().firstOrNull { it != "*" } ?: AuthenticationConfig.MATRIX_ORG_URL)
-        .let { url ->
-            AccountProvider(
-                url = url,
-                subtitle = null,
-                isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
-                isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
-            )
-        }
+    private val defaultAccountProvider =
+        (enterpriseService.defaultHomeserverList().firstOrNull { it != EnterpriseService.ANY_ACCOUNT_PROVIDER } ?: AuthenticationConfig.MATRIX_ORG_URL)
+            .let { url ->
+                AccountProvider(
+                    url = url,
+                    subtitle = null,
+                    isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
+                    isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
+                )
+            }
 
     private val accountProvider: MutableStateFlow<AccountProvider> = MutableStateFlow(
         defaultAccountProvider

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt

@@ -26,7 +26,7 @@ class ChangeAccountProviderPresenter @Inject constructor(
     override fun present(): ChangeAccountProviderState {
         val staticAccountProviderList = remember {
             enterpriseService.defaultHomeserverList()
-                .filter { it != "*" }
+                .filter { it != EnterpriseService.ANY_ACCOUNT_PROVIDER }
                 .map { it.ensureProtocol() }
                 .ifEmpty { listOf(AuthenticationConfig.MATRIX_ORG_URL) }
                 .map { url ->

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt

@@ -56,7 +56,7 @@ class ChooseAccountProviderPresenter @Inject constructor(
         }
 
         val staticAccountProviderList = remember {
-            // The list cannot contains "*" and cannot be empty at this point
+            // The list cannot contains ANY_ACCOUNT_PROVIDER ("*") and cannot be empty at this point
             enterpriseService.defaultHomeserverList()
                 .map { it.ensureProtocol() }
                 .map { url ->

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSourceTest.kt

@@ -10,6 +10,7 @@ package io.element.android.features.login.impl.accountprovider
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appconfig.AuthenticationConfig
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
@@ -64,7 +65,7 @@ class AccountProviderDataSourceTest {
     fun `present - ensure that default homeserver is not start char`() = runTest {
         val sut = AccountProviderDataSource(
             FakeEnterpriseService(
-                defaultHomeserverListResult = { listOf("*", AuthenticationConfig.MATRIX_ORG_URL) }
+                defaultHomeserverListResult = { listOf(EnterpriseService.ANY_ACCOUNT_PROVIDER, AuthenticationConfig.MATRIX_ORG_URL) }
             )
         )
         sut.flow.test {

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt

@@ -11,6 +11,7 @@ import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.changeserver.aChangeServerState
@@ -97,7 +98,7 @@ class ChangeAccountProviderPresenterTest {
             changeServerPresenter = { aChangeServerState() },
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = {
-                    listOf(AN_ACCOUNT_PROVIDER, "*")
+                    listOf(AN_ACCOUNT_PROVIDER, EnterpriseService.ANY_ACCOUNT_PROVIDER)
                 }
             ),
         )

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt

@@ -73,7 +73,7 @@ class OnBoardingPresenterTest {
             buildMeta = buildMeta,
             featureFlagService = featureFlagService,
             enterpriseService = FakeEnterpriseService(
-                defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, "*") },
+                defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, EnterpriseService.ANY_ACCOUNT_PROVIDER) },
             ),
             rageshakeFeatureAvailability = { true },
         )
@@ -110,7 +110,7 @@ class OnBoardingPresenterTest {
                 initialState = mapOf(FeatureFlags.QrCodeLogin.key to true),
             ),
             enterpriseService = FakeEnterpriseService(
-                defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, "*") },
+                defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, EnterpriseService.ANY_ACCOUNT_PROVIDER) },
                 isAllowedToConnectToHomeserverResult = { true },
             ),
         )