Merge branch 'release/25.05.2'

Author: jmartinesp

CHANGES.md

@@ -1,3 +1,18 @@
+Changes in Element X v25.05.1
+=============================
+
+## What's Changed
+### 🐛 Bugfixes
+* Fix broken Element Call in 25.05.0 by @bmarty in https://github.com/element-hq/element-x-android/pull/4694
+### Dependency upgrades
+* fix(deps): update android.gradle.plugin to v8.10.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4687
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.5.8 by @renovate in https://github.com/element-hq/element-x-android/pull/4696
+### Others
+* Let EnterpriseService prevent usage of homeserver by @bmarty in https://github.com/element-hq/element-x-android/pull/4682
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.05.0...v25.05.1
+
 Changes in Element X v25.05.0
 =============================
 

appconfig/src/main/kotlin/io/element/android/appconfig/LearnMoreConfig.kt

@@ -9,6 +9,7 @@ package io.element.android.appconfig
 
 object LearnMoreConfig {
     const val ENCRYPTION_URL: String = "https://element.io/help#encryption"
+    const val DEVICE_VERIFICATION_URL: String = "https://element.io/help#encryption-device-verification"
     const val SECURE_BACKUP_URL: String = "https://element.io/help#encryption5"
     const val IDENTITY_CHANGE_URL: String = "https://element.io/help#encryption18"
 }

fastlane/metadata/android/en-US/changelogs/202505020.txt

@@ -0,0 +1,2 @@
+Main changes in this version: TODO.
+Full changelog: https://github.com/element-hq/element-x-android/releases

features/ftue/impl/build.gradle.kts

@@ -1,5 +1,4 @@
 import extension.setupAnvil
-import org.gradle.kotlin.dsl.test
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt

@@ -26,7 +26,7 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appconfig.LearnMoreConfig
 import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModeNode
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
-import io.element.android.features.verifysession.api.VerifySessionEntryPoint
+import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
@@ -40,7 +40,7 @@ import kotlinx.parcelize.Parcelize
 class FtueSessionVerificationFlowNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val verifySessionEntryPoint: VerifySessionEntryPoint,
+    private val outgoingVerificationEntryPoint: OutgoingVerificationEntryPoint,
     private val secureBackupEntryPoint: SecureBackupEntryPoint,
 ) : BaseFlowNode<FtueSessionVerificationFlowNode.NavTarget>(
     backstack = BackStack(
@@ -94,19 +94,19 @@ class FtueSessionVerificationFlowNode @AssistedInject constructor(
                     }
 
                     override fun onLearnMoreAboutEncryption() {
-                        learnMoreUrl.value = LearnMoreConfig.ENCRYPTION_URL
+                        learnMoreUrl.value = LearnMoreConfig.DEVICE_VERIFICATION_URL
                     }
                 }
 
                 createNode<ChooseSelfVerificationModeNode>(buildContext, plugins = listOf(callback))
             }
             is NavTarget.UseAnotherDevice -> {
-                verifySessionEntryPoint.nodeBuilder(this, buildContext)
-                    .params(VerifySessionEntryPoint.Params(
+                outgoingVerificationEntryPoint.nodeBuilder(this, buildContext)
+                    .params(OutgoingVerificationEntryPoint.Params(
                         showDeviceVerifiedScreen = true,
                         verificationRequest = VerificationRequest.Outgoing.CurrentSession,
                     ))
-                    .callback(object : VerifySessionEntryPoint.Callback {
+                    .callback(object : OutgoingVerificationEntryPoint.Callback {
                         override fun onDone() {
                             plugins<Callback>().forEach { it.onDone() }
                         }
@@ -116,7 +116,8 @@ class FtueSessionVerificationFlowNode @AssistedInject constructor(
                         }
 
                         override fun onLearnMoreAboutEncryption() {
-                            learnMoreUrl.value = LearnMoreConfig.ENCRYPTION_URL
+                            // Note that this callback is never called. The "Learn more" link is not displayed
+                            // for the self session interactive verification.
                         }
                     })
                     .build()

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt

@@ -28,7 +28,7 @@ data class LoginPasswordState(
 @Parcelize
 data class LoginFormState(
     val login: String,
-    val password: String
+    val password: String,
 ) : Parcelable {
     companion object {
         val Default = LoginFormState("", "")

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt

@@ -8,23 +8,38 @@
 package io.element.android.features.login.impl.screens.loginpassword
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.anAccountProvider
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.SessionId
 
 open class LoginPasswordStateProvider : PreviewParameterProvider<LoginPasswordState> {
     override val values: Sequence<LoginPasswordState>
         get() = sequenceOf(
             aLoginPasswordState(),
             // Loading
-            aLoginPasswordState().copy(loginAction = AsyncData.Loading()),
+            aLoginPasswordState(loginAction = AsyncData.Loading()),
             // Error
-            aLoginPasswordState().copy(loginAction = AsyncData.Failure(Exception("An error occurred"))),
+            aLoginPasswordState(loginAction = AsyncData.Failure(Exception("An error occurred"))),
         )
 }
 
-fun aLoginPasswordState() = LoginPasswordState(
-    accountProvider = anAccountProvider(),
-    formState = LoginFormState.Default,
-    loginAction = AsyncData.Uninitialized,
-    eventSink = {}
+fun aLoginPasswordState(
+    accountProvider: AccountProvider = anAccountProvider(),
+    formState: LoginFormState = LoginFormState.Default,
+    loginAction: AsyncData<SessionId> = AsyncData.Uninitialized,
+    eventSink: (LoginPasswordEvents) -> Unit = {},
+) = LoginPasswordState(
+    accountProvider = accountProvider,
+    formState = formState,
+    loginAction = loginAction,
+    eventSink = eventSink,
+)
+
+fun aLoginFormState(
+    login: String = "",
+    password: String = "",
+) = LoginFormState(
+    login = login,
+    password = password,
 )

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt

@@ -201,6 +201,7 @@ private fun LoginForm(
                 {
                     Box(Modifier.clickable {
                         loginFieldState = ""
+                        eventSink(LoginPasswordEvents.SetLogin(""))
                     }) {
                         Icon(
                             imageVector = CompoundIcons.Close(),

features/login/impl/src/main/res/values-cs/translations.xml

@@ -14,7 +14,7 @@
   <string name="screen_change_account_provider_subtitle">"Použijte jiného poskytovatele účtu, například vlastní soukromý server nebo pracovní účet."</string>
   <string name="screen_change_account_provider_title">"Změnit poskytovatele účtu"</string>
   <string name="screen_change_server_error_invalid_homeserver">"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."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Klouzavá synchronizace není k dispozici kvůli problému se souborem well-known:
+  <string name="screen_change_server_error_invalid_well_known">"Server není k dispozici kvůli problému se souborem well-known:
 %1$s"</string>
   <string name="screen_change_server_error_no_sliding_sync_message">"Vybraný poskytovatel účtu nepodporuje klouzavou synchronizaci. Pro použití %1$s je nutná aktualizace serveru."</string>
   <string name="screen_change_server_form_header">"Adresa URL domovského serveru"</string>

features/login/impl/src/main/res/values-de/translations.xml

@@ -17,6 +17,7 @@
   <string name="screen_change_server_error_invalid_well_known">"Der Server ist aufgrund eines Problems im \"well-known file\" nicht verfügbar:
 %1$s"</string>
   <string name="screen_change_server_error_no_sliding_sync_message">"Der gewählte Kontoanbieter unterstützt Sliding Sync nicht. Für die Verwendung von %1$s ist ein Upgrade des Servers erforderlich."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$sdarf keine Verbindung herstellen zu%2$s."</string>
   <string name="screen_change_server_form_header">"Homeserver-URL"</string>
   <string name="screen_change_server_form_notice">"Geben Sie eine Domainadresse ein."</string>
   <string name="screen_change_server_subtitle">"Wie lautet die Adresse deines Servers?"</string>