Merge branch 'develop' of github.com:element-hq/element-x-android into align-cta-button-on-login-flow

# Conflicts: # features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Day-0_1_null_0,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Day-0_1_null_1,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Day-0_1_null_2,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Day-0_1_null_3,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Day-0_1_null_4,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Night-0_2_null_0,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Night-0_2_null_1,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Night-0_2_null_2,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Night-0_2_null_3,NEXUS_5,1.0,en].png # tests/uitests/src/test/snapshots/images/ui_S_t[f.onboarding.impl_OnBoardingScreen_null_OnBoardingScreen-Night-0_2_null_4,NEXUS_5,1.0,en].png
2024-02-01 17:54:11 +01:00 · 2024-02-01 17:54:11 +01:00 · f98cd5b99b
commit f98cd5b99b
parent 02d092cc0e f89d02fa74
694 changed files with 6806 additions and 1630 deletions
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
@ -18,6 +18,8 @@ package io.element.android.features.login.impl.changeserver

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.login.impl.dialogs.SlidingSyncNotSupportedDialog
@ -63,8 +65,11 @@ fun ChangeServerView(
            }
        }
        is AsyncData.Loading -> ProgressDialog()
-        is AsyncData.Success -> LaunchedEffect(state.changeServerAction) {
-            onDone()
+        is AsyncData.Success -> {
+            val latestOnDone by rememberUpdatedState(onDone)
+            LaunchedEffect(state.changeServerAction) {
+                latestOnDone()
+            }
        }
        AsyncData.Uninitialized -> Unit
    }
--- 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
@ -203,15 +203,17 @@ private fun LoginForm(
                .onTabOrEnterKeyFocusNext(focusManager)
                .testTag(TestTags.loginEmailUsername)
                .autofill(autofillTypes = listOf(AutofillType.Username), onFill = {
-                    loginFieldState = it
-                    eventSink(LoginPasswordEvents.SetLogin(it))
+                    val sanitized = it.sanitize()
+                    loginFieldState = sanitized
+                    eventSink(LoginPasswordEvents.SetLogin(sanitized))
                }),
            placeholder = {
                Text(text = stringResource(CommonStrings.common_username))
            },
            onValueChange = {
-                loginFieldState = it
-                eventSink(LoginPasswordEvents.SetLogin(it))
+                val sanitized = it.sanitize()
+                loginFieldState = sanitized
+                eventSink(LoginPasswordEvents.SetLogin(sanitized))
            },
            keyboardOptions = KeyboardOptions(
                keyboardType = KeyboardType.Email,
@ -233,7 +235,6 @@ private fun LoginForm(
                null
            },
        )
-
        var passwordVisible by remember { mutableStateOf(false) }
        if (state.loginAction is AsyncData.Loading) {
            // Ensure password is hidden when user submits the form
@ -248,12 +249,14 @@ private fun LoginForm(
                .onTabOrEnterKeyFocusNext(focusManager)
                .testTag(TestTags.loginPassword)
                .autofill(autofillTypes = listOf(AutofillType.Password), onFill = {
-                    passwordFieldState = it
-                    eventSink(LoginPasswordEvents.SetPassword(it))
+                    val sanitized = it.sanitize()
+                    passwordFieldState = sanitized
+                    eventSink(LoginPasswordEvents.SetPassword(sanitized))
                }),
            onValueChange = {
-                passwordFieldState = it
-                eventSink(LoginPasswordEvents.SetPassword(it))
+                val sanitized = it.sanitize()
+                passwordFieldState = sanitized
+                eventSink(LoginPasswordEvents.SetPassword(sanitized))
            },
            placeholder = {
                Text(text = stringResource(CommonStrings.common_password))
@ -281,6 +284,13 @@ private fun LoginForm(
    }
 }

+/**
+ * Ensure that the string does not contain any new line characters, which can happen when pasting values.
+ */
+private fun String.sanitize(): String {
+    return replace("\n", "")
+}
+
@Composable
 private fun LoginErrorDialog(error: Throwable, onDismiss: () -> Unit) {
    ErrorDialog(
--- a/features/login/impl/src/main/res/values-hu/translations.xml
+++ b/features/login/impl/src/main/res/values-hu/translations.xml
@ -7,7 +7,7 @@
  <string name="screen_account_provider_form_title">"Fiókszolgáltató keresése"</string>
  <string name="screen_account_provider_signin_subtitle">"Itt lesznek a beszélgetései – ahogyan egy e-mail-szolgáltatást is használna a levelei kezeléséhez."</string>
  <string name="screen_account_provider_signin_title">"Hamarosan bejelentkezik ide: %s"</string>
-  <string name="screen_account_provider_signup_subtitle">"Itt lesznek a beszélgetései – ahogyan egy e-mail-szolgáltatást is használna a levelei kezeléséhez."</string>
+  <string name="screen_account_provider_signup_subtitle">"Itt lesznek a beszélgetéseid – ahogyan egy e-mail-szolgáltatást is használnál a leveleid kezeléséhez."</string>
  <string name="screen_account_provider_signup_title">"Hamarosan létrehoz egy fiókot itt: %s"</string>
  <string name="screen_change_account_provider_matrix_org_subtitle">"A Matrix.org egy nagy, ingyenes kiszolgáló a nyilvános Matrix-hálózaton, a biztonságos, decentralizált kommunikáció érdekében, amelyet a Matrix.org Alapítvány üzemeltet."</string>
  <string name="screen_change_account_provider_other">"Egyéb"</string>
--- a/features/login/impl/src/main/res/values-it/translations.xml
+++ b/features/login/impl/src/main/res/values-it/translations.xml
@ -1,14 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"Cambia fornitore dell\'account"</string>
+  <string name="screen_account_provider_form_hint">"Indirizzo dell\'homeserver"</string>
+  <string name="screen_account_provider_form_notice">"Inserisci un termine di ricerca o un indirizzo di dominio."</string>
+  <string name="screen_account_provider_form_subtitle">"Cerca un\' azienda, una comunità o un server privato."</string>
+  <string name="screen_account_provider_form_title">"Trova un fornitore di account"</string>
+  <string name="screen_account_provider_signin_subtitle">"Qui è dove vivranno le tue conversazioni - proprio come useresti un fornitore di posta elettronica per conservare le tue email."</string>
+  <string name="screen_account_provider_signin_title">"Stai per accedere a %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"Qui è dove vivranno le tue conversazioni - proprio come useresti un fornitore di posta elettronica per conservare le tue email."</string>
+  <string name="screen_account_provider_signup_title">"Stai per creare un account su %s"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org è un grande server gratuito nella rete pubblica Matrix per una comunicazione sicura e decentralizzata, gestito dalla Fondazione Matrix.org."</string>
+  <string name="screen_change_account_provider_other">"Altro"</string>
+  <string name="screen_change_account_provider_subtitle">"Utilizza un provider di account diverso, ad esempio il tuo server privato o un account di lavoro."</string>
+  <string name="screen_change_account_provider_title">"Cambia fornitore dell\'account"</string>
  <string name="screen_change_server_error_invalid_homeserver">"Non siamo riusciti a raggiungere questo homserver. Verifica di aver inserito correttamente l\'URL del server domestico. Se l\'URL è corretto, contatta l\'amministratore del tuo server domestico per ulteriore assistenza."</string>
  <string name="screen_change_server_error_no_sliding_sync_message">"Questo server attualmente non supporta la sincronizzazione scorrevole."</string>
  <string name="screen_change_server_form_header">"URL dell\'homeserver"</string>
  <string name="screen_change_server_form_notice">"Puoi connetterti solo a un server esistente che supporta la sincronizzazione scorrevole. L\'amministratore del tuo server domestico dovrà configurarlo. %1$s"</string>
  <string name="screen_change_server_subtitle">"Qual è l\'indirizzo del tuo server?"</string>
+  <string name="screen_change_server_title">"Seleziona il tuo server"</string>
  <string name="screen_login_error_deactivated_account">"Questo profilo è stato disattivato."</string>
  <string name="screen_login_error_invalid_credentials">"Nome utente e/o password errati"</string>
  <string name="screen_login_error_invalid_user_id">"Questo non è un identificatore utente valido. Formato previsto: \'@user:homeserver.org\'"</string>
  <string name="screen_login_error_unsupported_authentication">"L\'homeserver selezionato non supporta la password o l\'accesso OIDC. Contatta il tuo amministratore o scegli un altro homeserver."</string>
  <string name="screen_login_form_header">"Inserisci i tuoi dati"</string>
  <string name="screen_login_title">"Bentornato!"</string>
+  <string name="screen_login_title_with_homeserver">"Accedi a %1$s"</string>
+  <string name="screen_server_confirmation_change_server">"Cambia fornitore dell\'account"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Un server privato per i dipendenti di Element."</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix è una rete aperta per comunicazioni sicure e decentralizzate."</string>
+  <string name="screen_server_confirmation_message_register">"Qui è dove vivranno le tue conversazioni — proprio come useresti un fornitore di posta elettronica per conservare le tue email."</string>
+  <string name="screen_server_confirmation_title_login">"Stai per accedere a %1$s"</string>
+  <string name="screen_server_confirmation_title_register">"Stai per creare un account su %1$s"</string>
+  <string name="screen_waitlist_message">"Al momento c\'è una grande richiesta per %1$s su %2$s. Torna a visitare l\'app tra qualche giorno e riprova.
+
+Grazie per la pazienza!"</string>
+  <string name="screen_waitlist_title">"Ci sei quasi."</string>
+  <string name="screen_waitlist_title_success">"Sei dentro."</string>
+  <string name="screen_login_subtitle">"Matrix è una rete aperta per comunicazioni sicure e decentralizzate."</string>
+  <string name="screen_waitlist_message_success">"Benvenuti in %1$s!"</string>
 </resources>