From b5095505de4dfc0ea7aaa1d5056b03f33da3b306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 30 Sep 2021 14:55:20 -0400
Subject: [PATCH] account wizard: use proper hint for new password

Change-Id: I3ac2c3007ca80564e0594f52b587d86cc84aaddc
---
 .../main/java/cx/ring/fragments/AccountMigrationFragment.kt   | 2 +-
 .../app/src/main/res/layout/frag_acc_jami_password.xml        | 4 ++--
 .../kotlin/net/jami/account/JamiAccountCreationPresenter.kt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt b/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
index f46de5f3a..b96364ca8 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
@@ -126,7 +126,7 @@ class AccountMigrationFragment : Fragment() {
 
     private fun checkPassword(pwd: TextView, confirm: TextView?): Boolean {
         var error = false
-        if (pwd.text.length == 0) {
+        if (pwd.text.isEmpty()) {
             error = true
         } else {
             if (pwd.text.length < 6) {
diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml b/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
index 50d158503..77e67edf3 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
@@ -81,7 +81,7 @@
                     android:id="@+id/ring_password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="username"
+                    android:autofillHints="password,newPassword"
                     android:hint="@string/prompt_new_password"
                     android:imeOptions="actionNext"
                     android:inputType="textPassword" />
@@ -103,7 +103,7 @@
                     android:id="@+id/ring_password_repeat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="username"
+                    android:autofillHints="password,newPassword"
                     android:hint="@string/prompt_new_password_repeat"
                     android:imeActionLabel="@string/action_create_short"
                     android:imeOptions="actionDone"
diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
index ac76c1f59..53d8b4ed5 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
@@ -99,7 +99,7 @@ class JamiAccountCreationPresenter @Inject constructor(
 
     fun passwordChanged(password: String) {
         mAccountCreationModel?.password = password
-        if (!isEmpty(password) && password.length < PASSWORD_MIN_LENGTH) {
+        if (password.isNotEmpty() && password.length < PASSWORD_MIN_LENGTH) {
             view?.showInvalidPasswordError(true)
             isPasswordCorrect = false
         } else {
-- 
GitLab