> = flow {
val flowContext = currentCoroutineContext()
@@ -39,36 +39,24 @@ class HomeserverResolver @Inject constructor(
// Run all the requests in parallel
withContext(dispatchers.io) {
list.parallelMap { url ->
- val wellKnown = tryOrNull {
- withTimeout(5000) {
- wellknownRequest.execute(url)
- }
- }
- val isValid = wellKnown?.isValid().orFalse()
+ val isValid = homeServerLoginCompatibilityChecker.check(url)
+ .onFailure { Timber.w(it, "Failed to check compatibility with homeserver $url") }
+ .getOrNull()
+ ?: return@parallelMap
+
+ // Emit the list as soon as possible
if (isValid) {
- // Emit the list as soon as possible
- currentList.add(
- HomeserverData(
- homeserverUrl = url,
- isWellknownValid = true,
- )
- )
+ currentList.add(HomeserverData(homeserverUrl = url))
withContext(flowContext) {
emit(currentList.toList())
}
}
}
}
- // If list is empty, and the user has entered an URL, do not block the user.
- if (currentList.isEmpty() && trimmedUserInput.isValidUrl()) {
- emit(
- listOf(
- HomeserverData(
- homeserverUrl = trimmedUserInput,
- isWellknownValid = false,
- )
- )
- )
+ // If list is empty, and candidateBase is a valid an URL, do not block the user.
+ // A unsupported homeserver / homeserver not found error will be displayed if the user continues
+ if (currentList.isEmpty() && candidateBase.isValidUrl()) {
+ emit(listOf(HomeserverData(homeserverUrl = candidateBase)))
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt
deleted file mode 100644
index d217b4ca9e3..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-package io.element.android.features.login.impl.resolver.network
-
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.network.RetrofitFactory
-import javax.inject.Inject
-
-@ContributesBinding(AppScope::class)
-class DefaultWellknownRequest @Inject constructor(
- private val retrofitFactory: RetrofitFactory,
-) : WellknownRequest {
- /**
- * Return the WellKnown data, if found.
- * @param baseUrl for instance https://matrix.org
- */
- override suspend fun execute(baseUrl: String): WellKnown {
- val wellknownApi = retrofitFactory.create(baseUrl)
- .create(WellknownAPI::class.java)
- return wellknownApi.getWellKnown()
- }
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/ElementWellKnown.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/ElementWellKnown.kt
deleted file mode 100644
index 2ed54bc4e25..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/ElementWellKnown.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.resolver.network
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Example:
- *
- * {
- * "registration_helper_url": "https://element.io"
- * }
- *
- * .
- */
-@Serializable
-data class ElementWellKnown(
- @SerialName("registration_helper_url")
- val registrationHelperUrl: String? = null,
-)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt
deleted file mode 100644
index 5c2843bb3db..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.resolver.network
-
-import io.element.android.libraries.core.bool.orFalse
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * https://matrix.org/docs/spec/client_server/r0.4.0.html#server-discovery
- *
- * {
- * "m.homeserver": {
- * "base_url": "https://matrix.org"
- * },
- * "m.identity_server": {
- * "base_url": "https://vector.im"
- * },
- * }
- *
- * .
- */
-@Serializable
-data class WellKnown(
- @SerialName("m.homeserver")
- val homeServer: WellKnownBaseConfig? = null,
- @SerialName("m.identity_server")
- val identityServer: WellKnownBaseConfig? = null,
-) {
- fun isValid(): Boolean {
- return homeServer?.baseURL?.isNotBlank().orFalse()
- }
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt
deleted file mode 100644
index b67ec9cb952..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.resolver.network
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * https://matrix.org/docs/spec/client_server/r0.4.0.html#server-discovery
- *
- * {
- * "base_url": "https://element.io"
- * }
- *
- * .
- */
-@Serializable
-data class WellKnownBaseConfig(
- @SerialName("base_url")
- val baseURL: String? = null
-)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt
deleted file mode 100644
index 29d0b83beb9..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.resolver.network
-
-import retrofit2.http.GET
-
-internal interface WellknownAPI {
- @GET(".well-known/matrix/client")
- suspend fun getWellKnown(): WellKnown
-
- @GET(".well-known/element/element.json")
- suspend fun getElementWellKnown(): ElementWellKnown
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt
deleted file mode 100644
index b7348509892..00000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-package io.element.android.features.login.impl.resolver.network
-
-interface WellknownRequest {
- /**
- * Return the WellKnown data, or throw an error if not found.
- * @param baseUrl for instance https://matrix.org
- */
- suspend fun execute(baseUrl: String): WellKnown
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
index 1ef6508bd2b..018a25dc896 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,31 +14,26 @@ import androidx.compose.ui.platform.LocalContext
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.util.openLearnMorePage
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.architecture.callback
@ContributesNode(AppScope::class)
-class ChangeAccountProviderNode @AssistedInject constructor(
+@AssistedInject
+class ChangeAccountProviderNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: ChangeAccountProviderPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onDone()
- fun onOtherClick()
+ fun navigateToSearchAccountProvider()
}
- private fun onDone() {
- plugins().forEach { it.onDone() }
- }
-
- private fun onOtherClick() {
- plugins().forEach { it.onOtherClick() }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
@@ -48,8 +44,8 @@ class ChangeAccountProviderNode @AssistedInject constructor(
modifier = modifier,
onBackClick = ::navigateUp,
onLearnMoreClick = { openLearnMorePage(context) },
- onSuccess = ::onDone,
- onOtherProviderClick = ::onOtherClick,
+ onSuccess = callback::onDone,
+ onOtherProviderClick = callback::navigateToSearchAccountProvider,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
index bb3da316b1b..41605352efb 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -9,6 +10,7 @@ package io.element.android.features.login.impl.screens.changeaccountprovider
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
+import dev.zacsweers.metro.Inject
import io.element.android.appconfig.AuthenticationConfig
import io.element.android.features.enterprise.api.EnterpriseService
import io.element.android.features.enterprise.api.canConnectToAnyHomeserver
@@ -16,9 +18,10 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.changeserver.ChangeServerState
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.uri.ensureProtocol
-import javax.inject.Inject
+import kotlinx.collections.immutable.toImmutableList
-class ChangeAccountProviderPresenter @Inject constructor(
+@Inject
+class ChangeAccountProviderPresenter(
private val changeServerPresenter: Presenter,
private val enterpriseService: EnterpriseService,
) : Presenter {
@@ -35,9 +38,9 @@ class ChangeAccountProviderPresenter @Inject constructor(
subtitle = null,
isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
- isValid = true,
)
}
+ .toImmutableList()
}
val canSearchForAccountProviders = remember {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
index e8e1f21cd85..3068a1cb57b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -9,10 +10,10 @@ package io.element.android.features.login.impl.screens.changeaccountprovider
import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.changeserver.ChangeServerState
+import kotlinx.collections.immutable.ImmutableList
-// Do not use default value, so no member get forgotten in the presenters.
data class ChangeAccountProviderState(
- val accountProviders: List,
+ val accountProviders: ImmutableList,
val canSearchForAccountProviders: Boolean,
val changeServerState: ChangeServerState,
)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
index 435eee7f897..5cec1961a41 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,6 +13,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.accountprovider.anAccountProvider
import io.element.android.features.login.impl.changeserver.ChangeServerState
import io.element.android.features.login.impl.changeserver.aChangeServerState
+import kotlinx.collections.immutable.toImmutableList
open class ChangeAccountProviderStateProvider : PreviewParameterProvider {
override val values: Sequence
@@ -29,7 +31,7 @@ fun aChangeAccountProviderState(
canSearchForAccountProviders: Boolean = true,
changeServerState: ChangeServerState = aChangeServerState(),
) = ChangeAccountProviderState(
- accountProviders = accountProviders,
+ accountProviders = accountProviders.toImmutableList(),
canSearchForAccountProviders = canSearchForAccountProviders,
changeServerState = changeServerState,
)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
index c4542dfb0df..4f6c87ac73c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
index 76c86d18c23..f60cc3e9da3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
index 2189252d01e..5dc6ebbd6b9 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,37 +14,28 @@ import androidx.compose.ui.platform.LocalContext
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.util.openLearnMorePage
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.matrix.api.auth.OidcDetails
@ContributesNode(AppScope::class)
-class ChooseAccountProviderNode @AssistedInject constructor(
+@AssistedInject
+class ChooseAccountProviderNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: ChooseAccountProviderPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
- fun onLoginPasswordNeeded()
- fun onOidcDetails(oidcDetails: OidcDetails)
- fun onCreateAccountContinue(url: String)
+ fun navigateToLoginPassword()
+ fun navigateToOidc(oidcDetails: OidcDetails)
+ fun navigateToCreateAccount(url: String)
}
- private fun onOidcDetails(oidcDetails: OidcDetails) {
- plugins().forEach { it.onOidcDetails(oidcDetails) }
- }
-
- private fun onLoginPasswordNeeded() {
- plugins().forEach { it.onLoginPasswordNeeded() }
- }
-
- private fun onCreateAccountContinue(url: String) {
- plugins().forEach { it.onCreateAccountContinue(url) }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
@@ -53,10 +45,10 @@ class ChooseAccountProviderNode @AssistedInject constructor(
state = state,
modifier = modifier,
onBackClick = ::navigateUp,
- onOidcDetails = ::onOidcDetails,
- onNeedLoginPassword = ::onLoginPasswordNeeded,
+ onOidcDetails = callback::navigateToOidc,
+ onNeedLoginPassword = callback::navigateToLoginPassword,
onLearnMoreClick = { openLearnMorePage(context) },
- onCreateAccountContinue = ::onCreateAccountContinue,
+ onCreateAccountContinue = callback::navigateToCreateAccount,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
index 464e30936fd..87010a4a305 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,6 +14,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
import io.element.android.appconfig.AuthenticationConfig
import io.element.android.features.enterprise.api.EnterpriseService
import io.element.android.features.login.impl.accountprovider.AccountProvider
@@ -20,9 +22,11 @@ import io.element.android.features.login.impl.login.LoginHelper
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.uri.ensureProtocol
-import javax.inject.Inject
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.launch
-class ChooseAccountProviderPresenter @Inject constructor(
+@Inject
+class ChooseAccountProviderPresenter(
private val enterpriseService: EnterpriseService,
private val loginHelper: LoginHelper,
) : Presenter {
@@ -35,10 +39,9 @@ class ChooseAccountProviderPresenter @Inject constructor(
fun handleEvent(event: ChooseAccountProviderEvents) {
when (event) {
- ChooseAccountProviderEvents.Continue -> {
+ ChooseAccountProviderEvents.Continue -> localCoroutineScope.launch {
selectedAccountProvider?.let {
loginHelper.submit(
- coroutineScope = localCoroutineScope,
isAccountCreation = false,
homeserverUrl = it.url,
loginHint = null,
@@ -65,9 +68,9 @@ class ChooseAccountProviderPresenter @Inject constructor(
subtitle = null,
isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
- isValid = true,
)
}
+ .toImmutableList()
}
return ChooseAccountProviderState(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
index 35913340473..e34fbccb413 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -10,10 +11,10 @@ package io.element.android.features.login.impl.screens.chooseaccountprovider
import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.login.LoginMode
import io.element.android.libraries.architecture.AsyncData
+import kotlinx.collections.immutable.ImmutableList
-// Do not use default value, so no member get forgotten in the presenters.
data class ChooseAccountProviderState(
- val accountProviders: List,
+ val accountProviders: ImmutableList,
val selectedAccountProvider: AccountProvider?,
val loginMode: AsyncData,
val eventSink: (ChooseAccountProviderEvents) -> Unit,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
index b921fee3308..93bd6650118 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,6 +13,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.accountprovider.anAccountProvider
import io.element.android.features.login.impl.login.LoginMode
import io.element.android.libraries.architecture.AsyncData
+import kotlinx.collections.immutable.toImmutableList
open class ChooseAccountProviderStateProvider : PreviewParameterProvider {
private val server1 = anAccountProvider(
@@ -70,7 +72,7 @@ fun aChooseAccountProviderState(
loginMode: AsyncData = AsyncData.Uninitialized,
eventSink: (ChooseAccountProviderEvents) -> Unit = {},
) = ChooseAccountProviderState(
- accountProviders = accountProviders,
+ accountProviders = accountProviders.toImmutableList(),
selectedAccountProvider = selectedAccountProvider,
loginMode = loginMode,
eventSink = eventSink,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
index 760e39ce851..cdb80304a7c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
index 8fe5a6c814e..d66606b22c3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
index 975f83375bc..e3643afbf2a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,18 +14,19 @@ import androidx.compose.ui.platform.LocalContext
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.util.openLearnMorePage
import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
import io.element.android.libraries.matrix.api.auth.OidcDetails
@ContributesNode(AppScope::class)
-class ConfirmAccountProviderNode @AssistedInject constructor(
+@AssistedInject
+class ConfirmAccountProviderNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
presenterFactory: ConfirmAccountProviderPresenter.Factory,
@@ -41,27 +43,13 @@ class ConfirmAccountProviderNode @AssistedInject constructor(
)
interface Callback : Plugin {
- fun onLoginPasswordNeeded()
- fun onOidcDetails(oidcDetails: OidcDetails)
- fun onCreateAccountContinue(url: String)
- fun onChangeAccountProvider()
+ fun navigateToLoginPassword()
+ fun navigateToOidc(oidcDetails: OidcDetails)
+ fun navigateToCreateAccount(url: String)
+ fun navigateToChangeAccountProvider()
}
- private fun onOidcDetails(data: OidcDetails) {
- plugins().forEach { it.onOidcDetails(data) }
- }
-
- private fun onLoginPasswordNeeded() {
- plugins().forEach { it.onLoginPasswordNeeded() }
- }
-
- private fun onCreateAccountContinue(url: String) {
- plugins().forEach { it.onCreateAccountContinue(url) }
- }
-
- private fun onChangeAccountProvider() {
- plugins().forEach { it.onChangeAccountProvider() }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
@@ -70,10 +58,10 @@ class ConfirmAccountProviderNode @AssistedInject constructor(
ConfirmAccountProviderView(
state = state,
modifier = modifier,
- onOidcDetails = ::onOidcDetails,
- onNeedLoginPassword = ::onLoginPasswordNeeded,
- onCreateAccountContinue = ::onCreateAccountContinue,
- onChange = ::onChangeAccountProvider,
+ onOidcDetails = callback::navigateToOidc,
+ onNeedLoginPassword = callback::navigateToLoginPassword,
+ onCreateAccountContinue = callback::navigateToCreateAccount,
+ onChange = callback::navigateToChangeAccountProvider,
onLearnMoreClick = { openLearnMorePage(context) },
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
index 3bcc81ac831..c38da7b11c0 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -11,14 +12,16 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
import io.element.android.features.login.impl.login.LoginHelper
import io.element.android.libraries.architecture.Presenter
+import kotlinx.coroutines.launch
-class ConfirmAccountProviderPresenter @AssistedInject constructor(
+@AssistedInject
+class ConfirmAccountProviderPresenter(
@Assisted private val params: Params,
private val accountProviderDataSource: AccountProviderDataSource,
private val loginHelper: LoginHelper,
@@ -39,11 +42,10 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
val loginMode by loginHelper.collectLoginMode()
- fun handleEvents(event: ConfirmAccountProviderEvents) {
+ fun handleEvent(event: ConfirmAccountProviderEvents) {
when (event) {
- ConfirmAccountProviderEvents.Continue -> {
+ ConfirmAccountProviderEvents.Continue -> localCoroutineScope.launch {
loginHelper.submit(
- coroutineScope = localCoroutineScope,
isAccountCreation = params.isAccountCreation,
homeserverUrl = accountProvider.url,
loginHint = null,
@@ -57,7 +59,7 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
accountProvider = accountProvider,
isAccountCreation = params.isAccountCreation,
loginMode = loginMode,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
index d0da9ab85ef..b29b610b3ec 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -11,7 +12,6 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
import io.element.android.features.login.impl.login.LoginMode
import io.element.android.libraries.architecture.AsyncData
-// Do not use default value, so no member get forgotten in the presenters.
data class ConfirmAccountProviderState(
val accountProvider: AccountProvider,
val isAccountCreation: Boolean,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
index 90d34571e9d..f3a48a86b49 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
index 8ecfbb56287..a175ab556dd 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
index 019a0d4e1fe..f91eea25ce0 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
index e16c6d8f9aa..a51557347e1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
index 128a4c03e87..e1972e5a0f2 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -14,17 +15,18 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
@ContributesNode(AppScope::class)
-class CreateAccountNode @AssistedInject constructor(
+@AssistedInject
+class CreateAccountNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
presenterFactory: CreateAccountPresenter.Factory,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
index 371c3c39106..f7a23df7d18 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,10 +14,9 @@ import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import io.element.android.features.login.impl.DefaultLoginUserStory
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.data.tryOrNull
@@ -32,11 +32,11 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withTimeout
import kotlin.time.Duration.Companion.seconds
-class CreateAccountPresenter @AssistedInject constructor(
+@AssistedInject
+class CreateAccountPresenter(
@Assisted private val url: String,
private val authenticationService: MatrixAuthenticationService,
private val clientProvider: MatrixClientProvider,
- private val defaultLoginUserStory: DefaultLoginUserStory,
private val messageParser: MessageParser,
private val buildMeta: BuildMeta,
) : Presenter {
@@ -51,7 +51,7 @@ class CreateAccountPresenter @AssistedInject constructor(
val pageProgress: MutableState = remember { mutableIntStateOf(0) }
val createAction: MutableState> = remember { mutableStateOf(AsyncAction.Uninitialized) }
- fun handleEvents(event: CreateAccountEvents) {
+ fun handleEvent(event: CreateAccountEvents) {
when (event) {
is CreateAccountEvents.SetPageProgress -> {
pageProgress.value = event.progress
@@ -69,7 +69,7 @@ class CreateAccountPresenter @AssistedInject constructor(
pageProgress = pageProgress.value,
isDebugBuild = buildMeta.isDebuggable,
createAction = createAction.value,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
@@ -83,11 +83,9 @@ class CreateAccountPresenter @AssistedInject constructor(
tryOrNull {
// Wait until the session is verified
val client = clientProvider.getOrRestore(sessionId).getOrThrow()
- val sessionVerificationService = client.sessionVerificationService()
+ val sessionVerificationService = client.sessionVerificationService
withTimeout(10.seconds) { sessionVerificationService.sessionVerifiedStatus.first { it.isVerified() } }
}
- // We will not navigate to the WaitList screen, so the login user story is done
- defaultLoginUserStory.setLoginFlowIsDone(true)
loggedInState.value = AsyncAction.Success(sessionId)
}.onFailure { failure ->
loggedInState.value = AsyncAction.Failure(failure)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
index 13ffd11ed57..de7efe573e2 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
index e2e7ac32511..976ceae70d4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
index 2ad96edf750..051188627ad 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
index c937cf9d484..d7954373bc0 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
@@ -1,18 +1,18 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.createaccount
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.androidutils.json.JsonProvider
import io.element.android.libraries.matrix.api.auth.external.ExternalSession
-import kotlinx.serialization.json.Json
-import javax.inject.Inject
interface MessageParser {
/**
@@ -23,12 +23,12 @@ interface MessageParser {
}
@ContributesBinding(AppScope::class)
-class DefaultMessageParser @Inject constructor(
+class DefaultMessageParser(
private val accountProviderDataSource: AccountProviderDataSource,
+ private val json: JsonProvider,
) : MessageParser {
override fun parse(message: String): ExternalSession {
- val parser = Json { ignoreUnknownKeys = true }
- val response = parser.decodeFromString(MobileRegistrationResponse.serializer(), message)
+ val response = json().decodeFromString(MobileRegistrationResponse.serializer(), message)
val userId = response.userId ?: error("No user ID in response")
val homeServer = response.homeServer ?: accountProviderDataSource.flow.value.url
val accessToken = response.accessToken ?: error("No access token in response")
@@ -39,7 +39,6 @@ class DefaultMessageParser @Inject constructor(
accessToken = accessToken,
deviceId = deviceId,
refreshToken = null,
- slidingSyncProxy = null
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
index 96f07585d60..5e78b1bd37b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
index 02e872090ec..20d503522b9 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
index e5fb57347e3..25a003b5310 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
index 69b63afce0f..c6ce16141dc 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,13 +13,14 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
@ContributesNode(AppScope::class)
-class LoginPasswordNode @AssistedInject constructor(
+@AssistedInject
+class LoginPasswordNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: LoginPasswordPresenter,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
index 3a12715f6ec..b1ddc6e5b80 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -15,7 +16,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.features.login.impl.DefaultLoginUserStory
+import dev.zacsweers.metro.Inject
import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.architecture.Presenter
@@ -23,12 +24,11 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
import io.element.android.libraries.matrix.api.core.SessionId
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
-import javax.inject.Inject
-class LoginPasswordPresenter @Inject constructor(
+@Inject
+class LoginPasswordPresenter(
private val authenticationService: MatrixAuthenticationService,
private val accountProviderDataSource: AccountProviderDataSource,
- private val defaultLoginUserStory: DefaultLoginUserStory,
) : Presenter {
@Composable
override fun present(): LoginPasswordState {
@@ -42,7 +42,7 @@ class LoginPasswordPresenter @Inject constructor(
}
val accountProvider by accountProviderDataSource.flow.collectAsState()
- fun handleEvents(event: LoginPasswordEvents) {
+ fun handleEvent(event: LoginPasswordEvents) {
when (event) {
is LoginPasswordEvents.SetLogin -> updateFormState(formState) {
copy(login = event.login)
@@ -61,7 +61,7 @@ class LoginPasswordPresenter @Inject constructor(
accountProvider = accountProvider,
formState = formState.value,
loginAction = loginAction.value,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
@@ -69,8 +69,6 @@ class LoginPasswordPresenter @Inject constructor(
loggedInState.value = AsyncData.Loading()
authenticationService.login(formState.login.trim(), formState.password)
.onSuccess { sessionId ->
- // We will not navigate to the WaitList screen, so the login user story is done
- defaultLoginUserStory.setLoginFlowIsDone(true)
loggedInState.value = AsyncData.Success(sessionId)
}
.onFailure { failure ->
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
index 18bac196333..d8adc7351f7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
index af6c07146e1..2183790365a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
index 5cb0c23d9c1..d3641ea749a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
index 5e0cc054fca..6101b21dedb 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
@@ -1,7 +1,8 @@
/*
+ * Copyright (c) 2025 Element Creations Ltd.
* Copyright 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
new file mode 100644
index 00000000000..a1a0266f34b
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.onboarding
+
+import android.annotation.SuppressLint
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.annotations.ApplicationContext
+
+fun interface OnBoardingLogoResIdProvider {
+ fun get(): Int?
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultOnBoardingLogoResIdProvider(
+ @ApplicationContext private val context: Context,
+) : OnBoardingLogoResIdProvider {
+ @SuppressLint("DiscouragedApi")
+ override fun get(): Int? {
+ val resId = context.resources
+ .getIdentifier("onboarding_logo", "drawable", context.packageName)
+ .takeIf { it != 0 }
+ return resId
+ }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
index d9c1615fde8..7e0901470a4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,18 +14,19 @@ import androidx.compose.ui.platform.LocalContext
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.util.openLearnMorePage
import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
import io.element.android.libraries.matrix.api.auth.OidcDetails
@ContributesNode(AppScope::class)
-class OnBoardingNode @AssistedInject constructor(
+@AssistedInject
+class OnBoardingNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
presenterFactory: OnBoardingPresenter.Factory,
@@ -33,13 +35,13 @@ class OnBoardingNode @AssistedInject constructor(
plugins = plugins
) {
interface Callback : Plugin {
- fun onSignUp()
- fun onSignIn(mustChooseAccountProvider: Boolean)
- fun onSignInWithQrCode()
- fun onReportProblem()
- fun onLoginPasswordNeeded()
- fun onOidcDetails(oidcDetails: OidcDetails)
- fun onCreateAccountContinue(url: String)
+ fun navigateToSignUpFlow()
+ fun navigateToSignInFlow(mustChooseAccountProvider: Boolean)
+ fun navigateToQrCode()
+ fun navigateToBugReport()
+ fun navigateToLoginPassword()
+ fun navigateToOidc(oidcDetails: OidcDetails)
+ fun navigateToCreateAccount(url: String)
}
data class Params(
@@ -47,40 +49,13 @@ class OnBoardingNode @AssistedInject constructor(
val loginHint: String?,
) : NodeInputs
+ private val callback: Callback = callback()
private val params = inputs()
private val presenter = presenterFactory.create(
params = params,
)
- private fun onSignIn(mustChooseAccountProvider: Boolean) {
- plugins().forEach { it.onSignIn(mustChooseAccountProvider) }
- }
-
- private fun onSignUp() {
- plugins().forEach { it.onSignUp() }
- }
-
- private fun onSignInWithQrCode() {
- plugins().forEach { it.onSignInWithQrCode() }
- }
-
- private fun onReportProblem() {
- plugins().forEach { it.onReportProblem() }
- }
-
- private fun onOidcDetails(data: OidcDetails) {
- plugins().forEach { it.onOidcDetails(data) }
- }
-
- private fun onLoginPasswordNeeded() {
- plugins().forEach { it.onLoginPasswordNeeded() }
- }
-
- private fun onCreateAccountContinue(url: String) {
- plugins().forEach { it.onCreateAccountContinue(url) }
- }
-
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
@@ -88,14 +63,15 @@ class OnBoardingNode @AssistedInject constructor(
OnBoardingView(
state = state,
modifier = modifier,
- onSignIn = ::onSignIn,
- onCreateAccount = ::onSignUp,
- onSignInWithQrCode = ::onSignInWithQrCode,
- onReportProblem = ::onReportProblem,
- onOidcDetails = ::onOidcDetails,
- onNeedLoginPassword = ::onLoginPasswordNeeded,
+ onSignIn = callback::navigateToSignInFlow,
+ onCreateAccount = callback::navigateToSignUpFlow,
+ onSignInWithQrCode = callback::navigateToQrCode,
+ onReportProblem = callback::navigateToBugReport,
+ onOidcDetails = callback::navigateToOidc,
+ onNeedLoginPassword = callback::navigateToLoginPassword,
onLearnMoreClick = { openLearnMorePage(context) },
- onCreateAccountContinue = ::onCreateAccountContinue,
+ onCreateAccountContinue = callback::navigateToCreateAccount,
+ onBackClick = ::navigateUp,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
index 37dce8e4b5a..4d83c45a44d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
@@ -1,13 +1,15 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.onboarding
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.produceState
@@ -15,27 +17,33 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
import io.element.android.appconfig.OnBoardingConfig
import io.element.android.features.enterprise.api.EnterpriseService
import io.element.android.features.enterprise.api.canConnectToAnyHomeserver
+import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
+import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
import io.element.android.features.login.impl.login.LoginHelper
import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.sessionstorage.api.SessionStore
import io.element.android.libraries.ui.utils.MultipleTapToUnlock
+import kotlinx.coroutines.launch
-class OnBoardingPresenter @AssistedInject constructor(
+@AssistedInject
+class OnBoardingPresenter(
@Assisted private val params: OnBoardingNode.Params,
private val buildMeta: BuildMeta,
- private val featureFlagService: FeatureFlagService,
private val enterpriseService: EnterpriseService,
+ private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,
private val rageshakeFeatureAvailability: RageshakeFeatureAvailability,
private val loginHelper: LoginHelper,
+ private val onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider,
+ private val sessionStore: SessionStore,
+ private val accountProviderDataSource: AccountProviderDataSource,
) : Presenter {
@AssistedFactory
interface Factory {
@@ -63,7 +71,12 @@ class OnBoardingPresenter @AssistedInject constructor(
val linkAccountProvider by produceState(initialValue = null) {
// Account provider from the link, if allowed by the enterprise service
value = params.accountProvider?.takeIf {
- enterpriseService.isAllowedToConnectToHomeserver(it)
+ try {
+ defaultAccountProviderAccessControl.assertIsAllowedToConnectToAccountProvider(it, it)
+ true
+ } catch (_: Exception) {
+ false
+ }
}
}
val defaultAccountProvider = remember(linkAccountProvider) {
@@ -72,22 +85,31 @@ class OnBoardingPresenter @AssistedInject constructor(
forcedAccountProvider ?: linkAccountProvider
}
val canLoginWithQrCode by produceState(initialValue = false, linkAccountProvider) {
- value = linkAccountProvider == null &&
- featureFlagService.isFeatureEnabled(FeatureFlags.QrCodeLogin)
+ value = linkAccountProvider == null
}
- val canReportBug = remember { rageshakeFeatureAvailability.isAvailable() }
+ val canReportBug by remember { rageshakeFeatureAvailability.isAvailable() }.collectAsState(false)
var showReportBug by rememberSaveable { mutableStateOf(false) }
+ val onBoardingLogoResId = remember {
+ onBoardingLogoResIdProvider.get()
+ }
+ val isAddingAccount by produceState(initialValue = false) {
+ // We are adding an account if there is at least one session already stored
+ value = sessionStore.numberOfSessions() > 0
+ }
val loginMode by loginHelper.collectLoginMode()
fun handleEvent(event: OnBoardingEvents) {
when (event) {
- is OnBoardingEvents.OnSignIn -> loginHelper.submit(
- coroutineScope = localCoroutineScope,
- isAccountCreation = false,
- homeserverUrl = event.defaultAccountProvider,
- loginHint = params.loginHint?.takeIf { forcedAccountProvider == null },
- )
+ is OnBoardingEvents.OnSignIn -> localCoroutineScope.launch {
+ // Ensure that the current account provider is set
+ accountProviderDataSource.setUrl(event.defaultAccountProvider)
+ loginHelper.submit(
+ isAccountCreation = false,
+ homeserverUrl = event.defaultAccountProvider,
+ loginHint = params.loginHint?.takeIf { forcedAccountProvider == null },
+ )
+ }
OnBoardingEvents.ClearError -> loginHelper.clearError()
OnBoardingEvents.OnVersionClick -> {
if (canReportBug) {
@@ -100,6 +122,7 @@ class OnBoardingPresenter @AssistedInject constructor(
}
return OnBoardingState(
+ isAddingAccount = isAddingAccount,
productionApplicationName = buildMeta.productionApplicationName,
defaultAccountProvider = defaultAccountProvider,
mustChooseAccountProvider = mustChooseAccountProvider,
@@ -108,6 +131,7 @@ class OnBoardingPresenter @AssistedInject constructor(
canReportBug = canReportBug && showReportBug,
loginMode = loginMode,
version = buildMeta.versionName,
+ onBoardingLogoResId = onBoardingLogoResId,
eventSink = ::handleEvent,
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
index 1e55c3af2d5..db6c3573f92 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
@@ -1,16 +1,19 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.onboarding
+import androidx.annotation.DrawableRes
import io.element.android.features.login.impl.login.LoginMode
import io.element.android.libraries.architecture.AsyncData
data class OnBoardingState(
+ val isAddingAccount: Boolean,
val productionApplicationName: String,
val defaultAccountProvider: String?,
val mustChooseAccountProvider: Boolean,
@@ -18,6 +21,8 @@ data class OnBoardingState(
val canCreateAccount: Boolean,
val canReportBug: Boolean,
val version: String,
+ @DrawableRes
+ val onBoardingLogoResId: Int?,
val loginMode: AsyncData,
val eventSink: (OnBoardingEvents) -> Unit,
) {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
index cdf77da5233..d7db27ca0ba 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
@@ -1,15 +1,18 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.onboarding
+import androidx.annotation.DrawableRes
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.features.login.impl.login.LoginMode
import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.R
open class OnBoardingStateProvider : PreviewParameterProvider {
override val values: Sequence
@@ -20,10 +23,17 @@ open class OnBoardingStateProvider : PreviewParameterProvider {
anOnBoardingState(canLoginWithQrCode = true, canCreateAccount = true),
anOnBoardingState(canLoginWithQrCode = true, canCreateAccount = true, canReportBug = true),
anOnBoardingState(defaultAccountProvider = "element.io", canCreateAccount = false, canReportBug = true),
+ anOnBoardingState(customLogoResId = R.drawable.sample_background),
+ anOnBoardingState(
+ isAddingAccount = true,
+ canLoginWithQrCode = true,
+ canCreateAccount = true,
+ ),
)
}
fun anOnBoardingState(
+ isAddingAccount: Boolean = false,
productionApplicationName: String = "Element",
defaultAccountProvider: String? = null,
mustChooseAccountProvider: Boolean = false,
@@ -31,9 +41,12 @@ fun anOnBoardingState(
canCreateAccount: Boolean = false,
canReportBug: Boolean = false,
version: String = "1.0.0",
+ @DrawableRes
+ customLogoResId: Int? = null,
loginMode: AsyncData = AsyncData.Uninitialized,
eventSink: (OnBoardingEvents) -> Unit = {},
) = OnBoardingState(
+ isAddingAccount = isAddingAccount,
productionApplicationName = productionApplicationName,
defaultAccountProvider = defaultAccountProvider,
mustChooseAccountProvider = mustChooseAccountProvider,
@@ -42,5 +55,6 @@ fun anOnBoardingState(
canReportBug = canReportBug,
version = version,
loginMode = loginMode,
+ onBoardingLogoResId = customLogoResId,
eventSink = eventSink,
)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
index 6c67e75cd14..977c6de71c4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
@@ -1,12 +1,14 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.onboarding
+import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -19,9 +21,11 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.BiasAlignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -35,7 +39,9 @@ import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtom
import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtomSize
import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
import io.element.android.libraries.designsystem.atomic.pages.OnBoardingPage
+import io.element.android.libraries.designsystem.components.BigIcon
import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Button
@@ -55,6 +61,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable
fun OnBoardingView(
state: OnBoardingState,
+ onBackClick: () -> Unit,
onSignInWithQrCode: () -> Unit,
onSignIn: (mustChooseAccountProvider: Boolean) -> Unit,
onCreateAccount: () -> Unit,
@@ -64,34 +71,89 @@ fun OnBoardingView(
onCreateAccountContinue: (url: String) -> Unit,
onReportProblem: () -> Unit,
modifier: Modifier = Modifier,
+) {
+ val loginView = @Composable {
+ LoginModeView(
+ loginMode = state.loginMode,
+ onClearError = {
+ state.eventSink(OnBoardingEvents.ClearError)
+ },
+ onLearnMoreClick = onLearnMoreClick,
+ onOidcDetails = onOidcDetails,
+ onNeedLoginPassword = onNeedLoginPassword,
+ onCreateAccountContinue = onCreateAccountContinue,
+ )
+ }
+ val buttons = @Composable {
+ OnBoardingButtons(
+ state = state,
+ onSignInWithQrCode = onSignInWithQrCode,
+ onSignIn = onSignIn,
+ onCreateAccount = onCreateAccount,
+ onReportProblem = onReportProblem,
+ )
+ }
+
+ if (state.isAddingAccount) {
+ AddOtherAccountScaffold(
+ modifier = modifier,
+ loginView = loginView,
+ buttons = buttons,
+ onBackClick = onBackClick,
+ )
+ } else {
+ AddFirstAccountScaffold(
+ modifier = modifier,
+ state = state,
+ loginView = loginView,
+ buttons = buttons,
+ )
+ }
+}
+
+@Composable
+private fun AddFirstAccountScaffold(
+ state: OnBoardingState,
+ loginView: @Composable () -> Unit,
+ buttons: @Composable () -> Unit,
+ modifier: Modifier = Modifier,
) {
OnBoardingPage(
modifier = modifier,
+ renderBackground = state.onBoardingLogoResId == null,
content = {
- OnBoardingContent(state = state)
- LoginModeView(
- loginMode = state.loginMode,
- onClearError = {
- state.eventSink(OnBoardingEvents.ClearError)
- },
- onLearnMoreClick = onLearnMoreClick,
- onOidcDetails = onOidcDetails,
- onNeedLoginPassword = onNeedLoginPassword,
- onCreateAccountContinue = onCreateAccountContinue,
- )
+ if (state.onBoardingLogoResId != null) {
+ OnBoardingLogo(
+ onBoardingLogoResId = state.onBoardingLogoResId,
+ )
+ } else {
+ OnBoardingContent(state = state)
+ }
+ loginView()
},
footer = {
- OnBoardingButtons(
- state = state,
- onSignInWithQrCode = onSignInWithQrCode,
- onSignIn = onSignIn,
- onCreateAccount = onCreateAccount,
- onReportProblem = onReportProblem,
- )
+ buttons()
}
)
}
+@Composable
+private fun AddOtherAccountScaffold(
+ loginView: @Composable () -> Unit,
+ buttons: @Composable () -> Unit,
+ onBackClick: () -> Unit,
+ modifier: Modifier = Modifier,
+) {
+ FlowStepPage(
+ modifier = modifier,
+ title = stringResource(CommonStrings.common_add_account),
+ iconStyle = BigIcon.Style.Default(CompoundIcons.HomeSolid()),
+ buttons = { buttons() },
+ content = loginView,
+ onBackClick = onBackClick,
+ )
+}
+
@Composable
private fun OnBoardingContent(state: OnBoardingState) {
Box(
@@ -139,6 +201,24 @@ private fun OnBoardingContent(state: OnBoardingState) {
}
}
+@Composable
+private fun OnBoardingLogo(
+ onBoardingLogoResId: Int,
+ modifier: Modifier = Modifier,
+) {
+ Box(
+ modifier = modifier
+ .fillMaxSize()
+ .padding(16.dp),
+ contentAlignment = Alignment.Center,
+ ) {
+ Image(
+ painter = painterResource(id = onBoardingLogoResId),
+ contentDescription = null
+ )
+ }
+}
+
@Composable
private fun OnBoardingButtons(
state: OnBoardingState,
@@ -198,27 +278,29 @@ private fun OnBoardingButtons(
.fillMaxWidth()
)
}
- if (state.canReportBug) {
- // Add a report problem text button. Use a Text since we need a special theme here.
- Text(
- modifier = Modifier
- .clickable(onClick = onReportProblem)
- .padding(16.dp),
- text = stringResource(id = CommonStrings.common_report_a_problem),
- style = ElementTheme.typography.fontBodySmRegular,
- color = ElementTheme.colors.textSecondary,
- )
- } else {
- Text(
- modifier = Modifier
- .clickable {
- state.eventSink(OnBoardingEvents.OnVersionClick)
- }
- .padding(16.dp),
- text = stringResource(id = R.string.screen_onboarding_app_version, state.version),
- style = ElementTheme.typography.fontBodySmRegular,
- color = ElementTheme.colors.textSecondary,
- )
+ if (state.isAddingAccount.not()) {
+ if (state.canReportBug) {
+ // Add a report problem text button. Use a Text since we need a special theme here.
+ Text(
+ modifier = Modifier
+ .clickable(onClick = onReportProblem)
+ .padding(16.dp),
+ text = stringResource(id = CommonStrings.common_report_a_problem),
+ style = ElementTheme.typography.fontBodySmRegular,
+ color = ElementTheme.colors.textSecondary,
+ )
+ } else {
+ Text(
+ modifier = Modifier
+ .clickable {
+ state.eventSink(OnBoardingEvents.OnVersionClick)
+ }
+ .padding(16.dp),
+ text = stringResource(id = R.string.screen_onboarding_app_version, state.version),
+ style = ElementTheme.typography.fontBodySmRegular,
+ color = ElementTheme.colors.textSecondary,
+ )
+ }
}
}
}
@@ -230,6 +312,7 @@ internal fun OnBoardingViewPreview(
) = ElementPreview {
OnBoardingView(
state = state,
+ onBackClick = {},
onSignInWithQrCode = {},
onSignIn = {},
onCreateAccount = {},
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
index ce68eec76da..b3b5ee80315 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,15 +13,16 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
@ContributesNode(QrCodeLoginScope::class)
-class QrCodeConfirmationNode @AssistedInject constructor(
+@AssistedInject
+class QrCodeConfirmationNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
) : Node(buildContext = buildContext, plugins = plugins) {
@@ -28,17 +30,14 @@ class QrCodeConfirmationNode @AssistedInject constructor(
fun onCancel()
}
+ private val callback: Callback = callback()
private val step = inputs()
- private fun onCancel() {
- plugins().forEach { it.onCancel() }
- }
-
@Composable
override fun View(modifier: Modifier) {
QrCodeConfirmationView(
step = step,
- onCancel = ::onCancel,
+ onCancel = callback::onCancel,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
index c285a5631ee..6aacebe6b4d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
index ea0e1802841..17864f68a18 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
index 99bb11662ee..8de93bcb0f7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
index a1d05e44e6f..4dc1e48e518 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,17 +13,18 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.di.QrCodeLoginScope
import io.element.android.features.login.impl.qrcode.QrCodeErrorScreenType
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.architecture.inputs
import io.element.android.libraries.core.meta.BuildMeta
@ContributesNode(QrCodeLoginScope::class)
-class QrCodeErrorNode @AssistedInject constructor(
+@AssistedInject
+class QrCodeErrorNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val buildMeta: BuildMeta,
@@ -31,10 +33,7 @@ class QrCodeErrorNode @AssistedInject constructor(
fun onRetry()
}
- private fun onRetry() {
- plugins().forEach { it.onRetry() }
- }
-
+ private val callback: Callback = callback()
private val qrCodeErrorScreenType = inputs()
@Composable
@@ -43,7 +42,7 @@ class QrCodeErrorNode @AssistedInject constructor(
modifier = modifier,
errorScreenType = qrCodeErrorScreenType,
appName = buildMeta.productionApplicationName,
- onRetry = ::onRetry,
+ onRetry = callback::onRetry,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
index 6f3731bd756..d2ec6ce1929 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
index f567569d800..11abd636831 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
index 0c96f614cdc..5ff5f09d53d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,38 +13,33 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
@ContributesNode(QrCodeLoginScope::class)
-class QrCodeIntroNode @AssistedInject constructor(
+@AssistedInject
+class QrCodeIntroNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: QrCodeIntroPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
- fun onCancelClicked()
- fun onContinue()
+ fun cancel()
+ fun navigateToQrCodeScan()
}
- private fun onCancelClicked() {
- plugins().forEach { it.onCancelClicked() }
- }
-
- private fun onContinue() {
- plugins().forEach { it.onContinue() }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
QrCodeIntroView(
state = state,
- onBackClick = ::onCancelClicked,
- onContinue = ::onContinue,
+ onBackClick = callback::cancel,
+ onContinue = callback::navigateToQrCodeScan,
modifier = modifier
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
index 8a64e6921c6..4da64480271 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -14,13 +15,14 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.permissions.api.PermissionsEvents
import io.element.android.libraries.permissions.api.PermissionsPresenter
-import javax.inject.Inject
-class QrCodeIntroPresenter @Inject constructor(
+@Inject
+class QrCodeIntroPresenter(
private val buildMeta: BuildMeta,
permissionsPresenterFactory: PermissionsPresenter.Factory,
) : Presenter {
@@ -38,7 +40,7 @@ class QrCodeIntroPresenter @Inject constructor(
}
}
- fun handleEvents(event: QrCodeIntroEvents) {
+ fun handleEvent(event: QrCodeIntroEvents) {
when (event) {
QrCodeIntroEvents.Continue -> if (cameraPermissionState.permissionGranted) {
canContinue = true
@@ -54,7 +56,7 @@ class QrCodeIntroPresenter @Inject constructor(
desktopAppName = buildMeta.desktopApplicationName,
cameraPermissionState = cameraPermissionState,
canContinue = canContinue,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
index e2f878603fe..d20a3f58d91 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
index fa3faa50a0a..22c7fd67f68 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
index 3125c0fcca4..767dc49999d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
index 574604903ec..f5804aceb04 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
index d5e10d2a827..987221eb94c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -12,39 +13,34 @@ import androidx.compose.ui.Modifier
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
@ContributesNode(QrCodeLoginScope::class)
-class QrCodeScanNode @AssistedInject constructor(
+@AssistedInject
+class QrCodeScanNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: QrCodeScanPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
- fun onScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
- fun onCancelClicked()
+ fun handleScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
+ fun cancel()
}
- private fun onQrCodeDataReady(qrCodeLoginData: MatrixQrCodeLoginData) {
- plugins().forEach { it.onScannedCode(qrCodeLoginData) }
- }
-
- private fun onCancelClicked() {
- plugins().forEach { it.onCancelClicked() }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
QrCodeScanView(
state = state,
- onQrCodeDataReady = ::onQrCodeDataReady,
- onBackClick = ::onCancelClicked,
+ onQrCodeDataReady = callback::handleScannedCode,
+ onBackClick = callback::cancel,
modifier = modifier
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
index 49b94ac5042..2f93d5b214b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -15,8 +16,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
-import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.features.login.impl.changeserver.UnauthorizedAccountProviderException
+import dev.zacsweers.metro.Inject
+import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.architecture.Presenter
@@ -32,13 +33,13 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import timber.log.Timber
import java.util.concurrent.atomic.AtomicBoolean
-import javax.inject.Inject
-class QrCodeScanPresenter @Inject constructor(
+@Inject
+class QrCodeScanPresenter(
private val qrCodeLoginDataFactory: MatrixQrCodeLoginDataFactory,
private val qrCodeLoginManager: QrCodeLoginManager,
private val coroutineDispatchers: CoroutineDispatchers,
- private val enterpriseService: EnterpriseService,
+ private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,
) : Presenter {
private var isScanning by mutableStateOf(true)
@@ -53,7 +54,7 @@ class QrCodeScanPresenter @Inject constructor(
authenticationAction.value = AsyncAction.Failure(it)
}
- fun handleEvents(event: QrCodeScanEvents) {
+ fun handleEvent(event: QrCodeScanEvents) {
when (event) {
QrCodeScanEvents.TryAgain -> {
isScanning = true
@@ -69,7 +70,7 @@ class QrCodeScanPresenter @Inject constructor(
return QrCodeScanState(
isScanning = isScanning,
authenticationAction = authenticationAction.value,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
@@ -97,10 +98,10 @@ class QrCodeScanPresenter @Inject constructor(
Timber.e(it, "Error parsing QR code data")
}.getOrThrow()
val serverName = data.serverName()
- if (serverName != null && enterpriseService.isAllowedToConnectToHomeserver(serverName).not()) {
- throw UnauthorizedAccountProviderException(
- unauthorisedAccountProviderTitle = serverName,
- authorisedAccountProviderTitles = enterpriseService.defaultHomeserverList(),
+ if (serverName != null) {
+ defaultAccountProviderAccessControl.assertIsAllowedToConnectToAccountProvider(
+ title = serverName,
+ accountProviderUrl = serverName,
)
}
data
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
index fb72767a3db..0e64bfc6a69 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
index cdea9f8b411..0d467efb71e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
@@ -1,14 +1,15 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.screens.qrcode.scan
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.login.impl.changeserver.UnauthorizedAccountProviderException
+import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
import io.element.android.libraries.matrix.api.auth.qrlogin.QrLoginException
@@ -23,12 +24,21 @@ open class QrCodeScanStateProvider : PreviewParameterProvider {
aQrCodeScanState(
isScanning = false,
authenticationAction = AsyncAction.Failure(
- UnauthorizedAccountProviderException(
+ AccountProviderAccessException.UnauthorizedAccountProviderException(
unauthorisedAccountProviderTitle = "example.com",
authorisedAccountProviderTitles = listOf("element.io", "element.org"),
)
)
),
+ aQrCodeScanState(
+ isScanning = false,
+ authenticationAction = AsyncAction.Failure(
+ AccountProviderAccessException.NeedElementProException(
+ unauthorisedAccountProviderTitle = "example.com",
+ applicationId = "applicationId"
+ )
+ )
+ ),
// Add other state here
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
index 0c5598c5281..4f444b14bcd 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -35,7 +36,7 @@ import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.features.login.impl.R
-import io.element.android.features.login.impl.changeserver.UnauthorizedAccountProviderException
+import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
import io.element.android.libraries.architecture.AsyncAction
import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
import io.element.android.libraries.designsystem.components.BigIcon
@@ -145,7 +146,10 @@ private fun ColumnScope.Buttons(
Spacer(modifier = Modifier.width(4.dp))
Text(
text = when (error) {
- is UnauthorizedAccountProviderException -> {
+ is AccountProviderAccessException.NeedElementProException -> {
+ stringResource(R.string.screen_change_server_error_element_pro_required_title)
+ }
+ is AccountProviderAccessException.UnauthorizedAccountProviderException -> {
stringResource(
id = R.string.screen_change_server_error_unauthorized_homeserver_title,
error.unauthorisedAccountProviderTitle,
@@ -163,7 +167,13 @@ private fun ColumnScope.Buttons(
}
Text(
text = when (error) {
- is UnauthorizedAccountProviderException -> {
+ is AccountProviderAccessException.NeedElementProException -> {
+ stringResource(
+ R.string.screen_change_server_error_element_pro_required_message,
+ error.unauthorisedAccountProviderTitle,
+ )
+ }
+ is AccountProviderAccessException.UnauthorizedAccountProviderException -> {
stringResource(
id = R.string.screen_change_server_error_unauthorized_homeserver_content,
error.authorisedAccountProviderTitles.joinToString(),
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
index 4fafe494bbc..8816de39467 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
index d6e411393c2..ddbcc4c847b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,15 +14,16 @@ import androidx.compose.ui.platform.LocalContext
import com.bumble.appyx.core.modality.BuildContext
import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
import io.element.android.features.login.impl.util.openLearnMorePage
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.architecture.callback
@ContributesNode(AppScope::class)
-class SearchAccountProviderNode @AssistedInject constructor(
+@AssistedInject
+class SearchAccountProviderNode(
@Assisted buildContext: BuildContext,
@Assisted plugins: List,
private val presenter: SearchAccountProviderPresenter,
@@ -30,9 +32,7 @@ class SearchAccountProviderNode @AssistedInject constructor(
fun onDone()
}
- private fun onDone() {
- plugins().forEach { it.onDone() }
- }
+ private val callback: Callback = callback()
@Composable
override fun View(modifier: Modifier) {
@@ -43,7 +43,7 @@ class SearchAccountProviderNode @AssistedInject constructor(
modifier = modifier,
onBackClick = ::navigateUp,
onLearnMoreClick = { openLearnMorePage(context) },
- onSuccess = ::onDone,
+ onSuccess = callback::onDone,
)
}
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
index 956d24dc8c4..2efe4501c6a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -15,6 +16,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
import io.element.android.features.login.impl.changeserver.ChangeServerState
import io.element.android.features.login.impl.resolver.HomeserverData
import io.element.android.features.login.impl.resolver.HomeserverResolver
@@ -23,9 +25,9 @@ import io.element.android.libraries.architecture.Presenter
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
-import javax.inject.Inject
-class SearchAccountProviderPresenter @Inject constructor(
+@Inject
+class SearchAccountProviderPresenter(
private val homeserverResolver: HomeserverResolver,
private val changeServerPresenter: Presenter,
) : Presenter {
@@ -44,7 +46,7 @@ class SearchAccountProviderPresenter @Inject constructor(
onUserInput(userInput, data)
}
- fun handleEvents(event: SearchAccountProviderEvents) {
+ fun handleEvent(event: SearchAccountProviderEvents) {
when (event) {
is SearchAccountProviderEvents.UserInput -> {
userInput = event.input
@@ -56,14 +58,14 @@ class SearchAccountProviderPresenter @Inject constructor(
userInput = userInput,
userInputResult = data.value,
changeServerState = changeServerState,
- eventSink = ::handleEvents
+ eventSink = ::handleEvent,
)
}
private fun CoroutineScope.onUserInput(userInput: String, data: MutableState>>) = launch {
data.value = AsyncData.Uninitialized
// Debounce
- delay(300)
+ delay(500)
data.value = AsyncData.Loading()
homeserverResolver.resolve(userInput).collect {
data.value = AsyncData.Success(it)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
index 4fb0a08141a..dc02a997a66 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -11,7 +12,6 @@ import io.element.android.features.login.impl.changeserver.ChangeServerState
import io.element.android.features.login.impl.resolver.HomeserverData
import io.element.android.libraries.architecture.AsyncData
-// Do not use default value, so no member get forgotten in the presenters.
data class SearchAccountProviderState(
val userInput: String,
val userInputResult: AsyncData>,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
index fb0e0f5c5a7..2a8512c38a5 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -34,18 +35,14 @@ fun aSearchAccountProviderState(
fun aHomeserverDataList(): List {
return listOf(
- aHomeserverData(isWellknownValid = true),
- aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true),
- aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false),
+ aHomeserverData(homeserverUrl = AuthenticationConfig.MATRIX_ORG_URL),
+ aHomeserverData(homeserverUrl = "https://no.sliding.sync"),
+ aHomeserverData(homeserverUrl = "https://invalid"),
)
}
fun aHomeserverData(
homeserverUrl: String = AuthenticationConfig.MATRIX_ORG_URL,
- isWellknownValid: Boolean = true,
): HomeserverData {
- return HomeserverData(
- homeserverUrl = homeserverUrl,
- isWellknownValid = isWellknownValid,
- )
+ return HomeserverData(homeserverUrl = homeserverUrl)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
index 13bfd9e38ed..55c2c28f5be 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -192,7 +193,6 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {
// There is no need to know for other servers right now
isPublic = isMatrixOrg,
isMatrixOrg = isMatrixOrg,
- isValid = isWellknownValid,
)
}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
index 36ee64c600f..06fbf12f4d7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
@@ -1,7 +1,8 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
index 3793f3a53b2..df08cf468b7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
@@ -1,47 +1,37 @@
/*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.login.impl.web
import androidx.core.net.toUri
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
import io.element.android.appconfig.AuthenticationConfig
-import io.element.android.features.login.impl.resolver.network.WellknownAPI
import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.network.RetrofitFactory
+import io.element.android.libraries.wellknown.api.WellknownRetriever
import timber.log.Timber
-import java.net.HttpURLConnection
-import javax.inject.Inject
interface WebClientUrlForAuthenticationRetriever {
suspend fun retrieve(homeServerUrl: String): String
}
@ContributesBinding(AppScope::class)
-class DefaultWebClientUrlForAuthenticationRetriever @Inject constructor(
- private val retrofitFactory: RetrofitFactory,
+class DefaultWebClientUrlForAuthenticationRetriever(
+ private val wellknownRetriever: WellknownRetriever,
) : WebClientUrlForAuthenticationRetriever {
override suspend fun retrieve(homeServerUrl: String): String {
if (homeServerUrl != AuthenticationConfig.MATRIX_ORG_URL) {
Timber.w("Temporary account creation flow is only supported on matrix.org")
throw AccountCreationNotSupported()
}
- val wellknownApi = retrofitFactory.create(homeServerUrl)
- .create(WellknownAPI::class.java)
- val result = try {
- wellknownApi.getElementWellKnown()
- } catch (e: retrofit2.HttpException) {
- throw when {
- e.code() == HttpURLConnection.HTTP_NOT_FOUND -> AccountCreationNotSupported()
- else -> e
- }
- }
- val registrationHelperUrl = result.registrationHelperUrl
+ val wellknown = wellknownRetriever.getElementWellKnown(homeServerUrl).dataOrNull()
+ ?: throw AccountCreationNotSupported()
+ val registrationHelperUrl = wellknown.registrationHelperUrl
return if (registrationHelperUrl != null) {
registrationHelperUrl.toUri()
.buildUpon()
diff --git a/features/login/impl/src/main/res/raw/keep.xml b/features/login/impl/src/main/res/raw/keep.xml
new file mode 100644
index 00000000000..b0130564458
--- /dev/null
+++ b/features/login/impl/src/main/res/raw/keep.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/features/login/impl/src/main/res/values-be/translations.xml b/features/login/impl/src/main/res/values-be/translations.xml
index 6fde5f6622a..307ccf72635 100644
--- a/features/login/impl/src/main/res/values-be/translations.xml
+++ b/features/login/impl/src/main/res/values-be/translations.xml
@@ -30,6 +30,7 @@
"Сардэчна запрашаем!"
"Увайсці ў %1$s"
"Увайсці ўручную"
+ "Увайсці ў %1$s"
"Увайсці з QR-кодам"
"Стварыць уліковы запіс"
"Сардэчна запрашаем у самы хуткі %1$s. Перавага ў хуткасці і прастаце."
diff --git a/features/login/impl/src/main/res/values-bg/translations.xml b/features/login/impl/src/main/res/values-bg/translations.xml
index bd321a9c5a8..6ccc7c9129d 100644
--- a/features/login/impl/src/main/res/values-bg/translations.xml
+++ b/features/login/impl/src/main/res/values-bg/translations.xml
@@ -1,6 +1,7 @@
"Промяна на доставчика на акаунт"
+ "Адрес на сървъра"
"Въведете термин за търсене или адрес на домейн."
"Потърсете компания, общност или частен сървър."
"Намерете доставчик на акаунт"
@@ -8,18 +9,25 @@
"На път сте да влезете в %s"
"Това е мястото, където ще живеят вашите разговори — точно както бихте използвали имейл доставчик, за да съхранявате вашите имейли."
"На път сте да създадете акаунт в %s"
+ "Matrix.org е голям, безплатен сървър в публичната мрежа на Matrix за сигурна, децентрализирана комуникация, управляван от фондация Matrix.org."
"Друг"
"Използвайте друг доставчик на акаунт, като например собствен частен сървър или работен акаунт."
"Промяна на доставчика на акаунт"
+ "Не можахме да достигнем този сървър. Моля, проверете дали сте въвели правилно URL адреса на сървъра. Ако URL адресът е правилен, свържете се с администратора на вашия сървър за допълнителна помощ."
+ "URL адрес на сървъра"
"Какъв е адресът на вашия сървър?"
+ "Изберете своя сървър"
"Създаване на акаунт"
"Този акаунт бе деактивиран."
"Неправилно потребителско име и/или парола"
+ "Това не е валиден потребителски идентификатор. Очакван формат: ‘@user:homeserver.org’"
+ "Избраният сървър не поддържа влизане с парола или OIDC. Моля, свържете се с вашия администратор или изберете друг сървър."
"Въведете своите данни"
"Matrix е отворена мрежа за сигурна, децентрализирана комуникация."
"Добре дошли отново!"
"Влизане в %1$s"
"Влизане ръчно"
+ "Влизане в %1$s"
"Влизане с QR код"
"Създаване на акаунт"
"Добре дошли в най-бързия %1$s досега. Супер зареден за скорост и простота."
@@ -28,6 +36,7 @@
"Повторен опит"
"Вашият код за потвърждение"
"Промяна на доставчика на акаунт"
+ "Частен сървър за служителите на Element."
"Matrix е отворена мрежа за сигурна, децентрализирана комуникация."
"Това е мястото, където ще живеят вашите разговори — точно както бихте използвали имейл доставчик, за да съхранявате вашите имейли."
"На път сте да влезете в %1$s"
diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml
index 9d6e4c51f72..6ffd9a84d4a 100644
--- a/features/login/impl/src/main/res/values-cs/translations.xml
+++ b/features/login/impl/src/main/res/values-cs/translations.xml
@@ -13,6 +13,9 @@
"Jiný"
"Použijte jiného poskytovatele účtu, například vlastní soukromý server nebo pracovní účet."
"Změnit poskytovatele účtu"
+ "Google Play"
+ "Na %1$s je vyžadována aplikace Element Pro. Stáhněte si ji prosím z obchodu."
+ "Vyžadován Element Pro"
"Nepodařilo se nám připojit k tomuto domovskému serveru. Zkontrolujte prosím, zda jste správně zadali adresu URL domovského serveru. Pokud je adresa URL správná, obraťte se na správce domovského serveru, který vám poskytne další pomoc."
"Server není k dispozici kvůli problému se souborem well-known:
%1$s"
@@ -34,8 +37,9 @@
"Matrix je otevřená síť pro bezpečnou a decentralizovanou komunikaci."
"Vítejte zpět!"
"Přihlaste se k %1$s"
+ "Verze %1$s"
"Ruční přihlášení"
- "Přihlásit se do %1$s"
+ "Přihlaste se k %1$s"
"Přihlásit se pomocí QR kódu"
"Vytvořit účet"
"Vítejte v dosud nejrychlejším %1$su. Vylepšený pro rychlost a jednoduchost."
diff --git a/features/login/impl/src/main/res/values-cy/translations.xml b/features/login/impl/src/main/res/values-cy/translations.xml
index a9e4b615419..b8988a9889f 100644
--- a/features/login/impl/src/main/res/values-cy/translations.xml
+++ b/features/login/impl/src/main/res/values-cy/translations.xml
@@ -13,6 +13,9 @@
"Arall"
"Defnyddiwch ddarparwr cyfrif gwahanol, fel eich gweinydd preifat eich hun neu gyfrif gwaith."
"Newid darparwr cyfrif"
+ "Google Play"
+ "Mae angen yr ap Element Pro ar %1$s. Llwythwch ef o\'r siop."
+ "Mae angen Element Pro"
"Doedd dim modd i ni gyrraedd y gweinydd cartref hwn. Gwiriwch eich bod wedi rhoi URL y gweinydd cartref yn gywir. Os yw\'r URL yn gywir, cysylltwch â gweinyddwr eich gweinydd cartref am ragor o help."
"Dyw cydweddu llithrig ddim ar gael oherwydd problem yn y ffeil .well-known:
%1$s"
diff --git a/features/login/impl/src/main/res/values-da/translations.xml b/features/login/impl/src/main/res/values-da/translations.xml
index cefd0b75a43..cffa9c7e2e7 100644
--- a/features/login/impl/src/main/res/values-da/translations.xml
+++ b/features/login/impl/src/main/res/values-da/translations.xml
@@ -13,6 +13,9 @@
"Anden"
"Brug en anden kontoudbyder, f.eks. din egen private server eller en arbejdskonto."
"Skift kontoudbyder"
+ "Google Play"
+ "Element Pro-appen er påkrævet på %1$s Download den venligst fra din app store."
+ "Element Pro kræves"
"Vi kunne ikke nå denne hjemmeserver. Kontroller, at du har indtastet hjemmeserverens URL korrekt. Hvis URL-adressen er korrekt, skal du kontakte administratoren på din hjemmeserver for at få yderligere hjælp."
"Serveren er ikke tilgængelig på grund af et problem i .well-known-filen:
%1$s"
@@ -83,7 +86,7 @@ Prøv at logge ind manuelt, eller scan QR-koden med en anden enhed."
](https://play.google.com/store/apps/details?id=io.element.android.x)[
](https://f-droid.org/packages/io.element.android.x)
@@ -72,7 +70,7 @@ We're doing this as a way to share code between platforms and while we've seen p
## Status
-This project is in an early rollout and migration phase.
+This project is actively developed and supported. New users are recommended to use Element X instead of the previous-generation app.
## Minimum SDK version
@@ -104,9 +102,10 @@ If after your research you still have a question, ask at [#element-x-android:mat
## Copyright and License
-Copyright (c) 2022 - 2025 New Vector Ltd
+Copyright (c) 2025 Element Creations Ltd.
+Copyright (c) 2022 - 2025 New Vector Ltd.
-This software is dual licensed by New Vector Ltd (Element). It can be used either:
+This software is dual licensed by Element Creations Ltd (Element). It can be used either:
(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
diff --git a/anvilannotations/.gitignore b/annotations/.gitignore
similarity index 100%
rename from anvilannotations/.gitignore
rename to annotations/.gitignore
diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
new file mode 100644
index 00000000000..33e3cbeff22
--- /dev/null
+++ b/annotations/build.gradle.kts
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+ alias(libs.plugins.kotlin.jvm)
+ id("com.android.lint")
+}
diff --git a/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt b/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
similarity index 78%
rename from anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
rename to annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
index d91a4761fc6..632bdc3e811 100644
--- a/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
+++ b/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
@@ -1,11 +1,12 @@
/*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
-package io.element.android.anvilannotations
+package io.element.android.annotations
import kotlin.reflect.KClass
@@ -13,7 +14,7 @@ import kotlin.reflect.KClass
* Adds Node to the specified component graph.
* Equivalent to the following declaration:
*
- * @Module
+ * @BindingContainer
* @ContributesTo(Scope::class)
* abstract class YourNodeModule {
diff --git a/anvilannotations/build.gradle.kts b/anvilannotations/build.gradle.kts
deleted file mode 100644
index 66b88b4dfa8..00000000000
--- a/anvilannotations/build.gradle.kts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2022-2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-plugins {
- alias(libs.plugins.kotlin.jvm)
- id("com.android.lint")
-}
-
-dependencies {
- api(libs.inject)
-}
diff --git a/anvilcodegen/build.gradle.kts b/anvilcodegen/build.gradle.kts
deleted file mode 100644
index 6f73bd9f443..00000000000
--- a/anvilcodegen/build.gradle.kts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2022-2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-plugins {
- alias(libs.plugins.kotlin.jvm)
-}
-
-dependencies {
- implementation(projects.anvilannotations)
- api(libs.anvil.compiler.api)
- implementation(libs.anvil.compiler.utils)
- implementation(libs.kotlinpoet)
- implementation(libs.dagger)
- implementation(libs.ksp.plugin)
- implementation(libs.kotlinpoet.ksp)
-}
diff --git a/anvilcodegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/anvilcodegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
deleted file mode 100644
index d5c111b0b2f..00000000000
--- a/anvilcodegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
+++ /dev/null
@@ -1 +0,0 @@
-io.element.android.anvilcodegen.ContributesNodeProcessorProvider
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f233620cdb6..4026888ee27 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,8 @@
/*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
*
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
* Please see LICENSE files in the repository root for full details.
*/
@@ -13,7 +14,6 @@ import com.android.build.gradle.tasks.GenerateBuildConfig
import com.google.firebase.appdistribution.gradle.firebaseAppDistribution
import config.BuildTimeConfig
import extension.AssetCopyTask
-import extension.ComponentMergingStrategy
import extension.GitBranchNameValueSource
import extension.GitRevisionValueSource
import extension.allEnterpriseImpl
@@ -23,8 +23,9 @@ import extension.allServicesImpl
import extension.buildConfigFieldStr
import extension.koverDependencies
import extension.locales
-import extension.setupAnvil
+import extension.setupDependencyInjection
import extension.setupKover
+import extension.testCommonDependencies
import java.util.Locale
plugins {
@@ -37,7 +38,7 @@ plugins {
alias(libs.plugins.licensee)
alias(libs.plugins.kotlin.serialization)
// To be able to update the firebase.xml files, uncomment and build the project
- // id("com.google.gms.google-services")
+ // alias(libs.plugins.gms.google.services)
}
setupKover()
@@ -103,7 +104,8 @@ android {
}
val baseAppName = BuildTimeConfig.APPLICATION_NAME
- logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)")
+ val buildType = if (isEnterpriseBuild) "Enterprise" else "FOSS"
+ logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName) [$buildType]")
buildTypes {
val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
@@ -196,6 +198,12 @@ android {
buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
}
}
+
+ packaging {
+ resources.pickFirsts += setOf(
+ "META-INF/versions/9/OSGI-INF/MANIFEST.MF",
+ )
+ }
}
androidComponents {
@@ -247,11 +255,7 @@ knit {
}
}
-setupAnvil(
- generateDaggerCode = true,
- generateDaggerFactoriesUsingAnvil = false,
- componentMergingStrategy = ComponentMergingStrategy.KSP,
-)
+setupDependencyInjection()
dependencies {
allLibrariesImpl()
@@ -260,6 +264,7 @@ dependencies {
allEnterpriseImpl(project)
implementation(projects.appicon.enterprise)
} else {
+ implementation(projects.features.enterprise.implFoss)
implementation(projects.appicon.element)
}
allFeaturesImpl(project)
@@ -293,12 +298,7 @@ dependencies {
implementation(libs.matrix.emojibase.bindings)
- testImplementation(libs.test.junit)
- testImplementation(libs.test.robolectric)
- testImplementation(libs.coroutines.test)
- testImplementation(libs.molecule.runtime)
- testImplementation(libs.test.truth)
- testImplementation(libs.test.turbine)
+ testCommonDependencies(libs)
testImplementation(projects.libraries.matrix.test)
testImplementation(projects.services.toolbox.test)
@@ -318,12 +318,14 @@ licensee {
allow("MIT")
allow("BSD-2-Clause")
allow("BSD-3-Clause")
+ allow("EPL-1.0")
allowUrl("https://opensource.org/licenses/MIT")
allowUrl("https://developer.android.com/studio/terms.html")
allowUrl("https://www.zetetic.net/sqlcipher/license/")
allowUrl("https://jsoup.org/license")
allowUrl("https://asm.ow2.io/license.html")
allowUrl("https://www.gnu.org/licenses/agpl-3.0.txt")
+ allowUrl("https://github.com/mhssn95/compose-color-picker/blob/main/LICENSE")
ignoreDependencies("com.github.matrix-org", "matrix-analytics-events")
// Ignore dependency that are not third-party licenses to us.
ignoreDependencies(groupId = "io.element.android")
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 89dcab5fad7..c55b1bf1c29 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -42,3 +42,12 @@
}
-keep class io.element.android.x.di.** { *; }
+
+
+# Keep LogSessionId class and related classes (https://github.com/androidx/media/issues/2535)
+-keep class android.media.metrics.LogSessionId { *; }
+-keep class android.media.metrics.** { *; }
+
+# Keep Media3 classes that use reflection (https://github.com/androidx/media/issues/2535)
+-keep class androidx.media3.** { *; }
+-dontwarn android.media.metrics.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1fdc07d72ce..628c428790d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@