Skip to content

Commit 29ade1e

Browse files
Kota-JagadeeshKota-Jagadeesh
authored
Fix email verification input (#6367)
* Set imeOptions to actionDone and enforce singleLine for xlarge * Set imeOptions to actionDone and enforce singleLine for landscape * Set imeOptions to actionDone and enforce singleLine * Update askUserForTwoFactorAuth for IME_ACTION_DONE to trigger performLogin * Fix email verification: Set imeOptions to actionDone and replace singleLine with maxLines=1 * Fix email verification: Set imeOptions to actionDone and replace singleLine with maxLines=1 * Fix email verification: Set imeOptions to actionDone and replace singleLine with maxLines=1 * feat: Set imeOptions to actionNext for login_password to improve focus transition * feat: Enhance keyboard visibility for email verification code input
1 parent 88565b7 commit 29ade1e

File tree

4 files changed

+84
-18
lines changed

4 files changed

+84
-18
lines changed

‎app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt‎

Lines changed: 74 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,19 @@ class LoginActivity : AccountAuthenticatorActivity() {
9292
aboutPrivacyPolicy.setOnClickListener { onPrivacyPolicyClicked() }
9393
signUpButton.setOnClickListener { signUp() }
9494
loginButton.setOnClickListener { performLogin() }
95-
loginPassword.setOnEditorActionListener(::onEditorAction)
95+
loginPassword.setOnEditorActionListener { textView, actionId, keyEvent ->
96+
if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
97+
if (actionId == EditorInfo.IME_ACTION_NEXT && lastLoginResult != null) {
98+
askUserForTwoFactorAuthWithKeyboard()
99+
true
100+
} else {
101+
performLogin()
102+
true
103+
}
104+
} else {
105+
false
106+
}
107+
}
96108

97109
loginPassword.onFocusChangeListener =
98110
View.OnFocusChangeListener(::onPasswordFocusChanged)
@@ -113,6 +125,39 @@ class LoginActivity : AccountAuthenticatorActivity() {
113125
}
114126
}
115127

128+
@VisibleForTesting
129+
fun askUserForTwoFactorAuthWithKeyboard() {
130+
if (binding == null) {
131+
Timber.w("Binding is null, reinitializing in askUserForTwoFactorAuthWithKeyboard")
132+
binding = ActivityLoginBinding.inflate(layoutInflater)
133+
setContentView(binding!!.root)
134+
}
135+
progressDialog!!.dismiss()
136+
if (binding != null) {
137+
with(binding!!) {
138+
twoFactorContainer.visibility = View.VISIBLE
139+
twoFactorContainer.hint = getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.email_auth_code else R.string._2fa_code)
140+
loginTwoFactor.visibility = View.VISIBLE
141+
loginTwoFactor.requestFocus()
142+
143+
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
144+
imm.showSoftInput(loginTwoFactor, InputMethodManager.SHOW_IMPLICIT)
145+
146+
loginTwoFactor.setOnEditorActionListener { _, actionId, event ->
147+
if (actionId == EditorInfo.IME_ACTION_DONE ||
148+
(event != null && event.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN)) {
149+
performLogin()
150+
true
151+
} else {
152+
false
153+
}
154+
}
155+
}
156+
} else {
157+
Timber.e("Binding is null in askUserForTwoFactorAuthWithKeyboard after reinitialization attempt")
158+
}
159+
showMessageAndCancelDialog(getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.login_failed_email_auth_needed else R.string.login_failed_2fa_needed))
160+
}
116161
override fun onPostCreate(savedInstanceState: Bundle?) {
117162
super.onPostCreate(savedInstanceState)
118163
delegate.onPostCreate(savedInstanceState)
@@ -236,7 +281,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
236281
} else false
237282

238283
private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) =
239-
actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER
284+
actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER
240285

241286
private fun skipLogin() {
242287
AlertDialog.Builder(this)
@@ -286,14 +331,14 @@ class LoginActivity : AccountAuthenticatorActivity() {
286331
Timber.d("Requesting 2FA prompt")
287332
progressDialog!!.dismiss()
288333
lastLoginResult = loginResult
289-
askUserForTwoFactorAuth()
334+
askUserForTwoFactorAuthWithKeyboard()
290335
}
291336

292-
override fun emailAuthPrompt(loginResult: LoginResult, caught: Throwable, token: String?) {
337+
override fun emailAuthPrompt(loginResult: LoginResult, caught: Throwable, token: String?) = runOnUiThread {
293338
Timber.d("Requesting email auth prompt")
294339
progressDialog!!.dismiss()
295340
lastLoginResult = loginResult
296-
askUserForTwoFactorAuth()
341+
askUserForTwoFactorAuthWithKeyboard()
297342
}
298343

299344
override fun passwordResetPrompt(token: String?) = runOnUiThread {
@@ -348,12 +393,31 @@ class LoginActivity : AccountAuthenticatorActivity() {
348393

349394
@VisibleForTesting
350395
fun askUserForTwoFactorAuth() {
396+
if (binding == null) {
397+
Timber.w("Binding is null, reinitializing in askUserForTwoFactorAuth")
398+
binding = ActivityLoginBinding.inflate(layoutInflater)
399+
setContentView(binding!!.root)
400+
}
351401
progressDialog!!.dismiss()
352-
with(binding!!) {
353-
twoFactorContainer.visibility = View.VISIBLE
354-
twoFactorContainer.hint = getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.email_auth_code else R.string._2fa_code)
355-
loginTwoFactor.visibility = View.VISIBLE
356-
loginTwoFactor.requestFocus()
402+
if (binding != null) {
403+
with(binding!!) {
404+
twoFactorContainer.visibility = View.VISIBLE
405+
twoFactorContainer.hint = getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.email_auth_code else R.string._2fa_code)
406+
loginTwoFactor.visibility = View.VISIBLE
407+
loginTwoFactor.requestFocus()
408+
409+
loginTwoFactor.setOnEditorActionListener { _, actionId, event ->
410+
if (actionId == EditorInfo.IME_ACTION_DONE ||
411+
(event != null && event.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN)) {
412+
performLogin()
413+
true
414+
} else {
415+
false
416+
}
417+
}
418+
}
419+
} else {
420+
Timber.e("Binding is null in askUserForTwoFactorAuth after reinitialization attempt")
357421
}
358422
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
359423
imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY)

‎app/src/main/res/layout-land/activity_login.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
android:layout_width="match_parent"
126126
android:layout_height="wrap_content"
127127
android:hint="@string/password"
128-
android:imeOptions="flagNoExtractUi"
128+
android:imeOptions="actionNext"
129129
android:inputType="textPassword" />
130130

131131
</com.google.android.material.textfield.TextInputLayout>
@@ -148,9 +148,9 @@
148148
android:id="@+id/login_two_factor"
149149
android:layout_width="match_parent"
150150
android:layout_height="wrap_content"
151-
android:hint="@string/_2fa_code"
152-
android:imeOptions="flagNoExtractUi"
151+
android:imeOptions="actionDone"
153152
android:inputType="number"
153+
android:maxLines="1"
154154
android:visibility="gone"
155155
tools:visibility="visible" />
156156

‎app/src/main/res/layout-xlarge/activity_login.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
android:layout_width="match_parent"
129129
android:layout_height="wrap_content"
130130
android:hint="@string/password"
131-
android:imeOptions="flagNoExtractUi"
131+
android:imeOptions="actionNext"
132132
android:inputType="textPassword" />
133133

134134
</com.google.android.material.textfield.TextInputLayout>
@@ -151,9 +151,9 @@
151151
android:id="@+id/login_two_factor"
152152
android:layout_width="match_parent"
153153
android:layout_height="wrap_content"
154-
android:hint="@string/_2fa_code"
155-
android:imeOptions="flagNoExtractUi"
154+
android:imeOptions="actionDone"
156155
android:inputType="number"
156+
android:maxLines="1"
157157
android:visibility="gone"
158158
tools:visibility="visible" />
159159

‎app/src/main/res/layout/activity_login.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
android:layout_width="match_parent"
132132
android:layout_height="wrap_content"
133133
android:hint="@string/password"
134-
android:imeOptions="flagNoExtractUi"
134+
android:imeOptions="actionNext"
135135
android:inputType="textPassword" />
136136

137137
</com.google.android.material.textfield.TextInputLayout>
@@ -155,7 +155,9 @@
155155
android:id="@+id/login_two_factor"
156156
android:layout_width="match_parent"
157157
android:layout_height="wrap_content"
158-
android:imeOptions="flagNoExtractUi"
158+
android:imeOptions="actionDone"
159+
android:inputType="number"
160+
android:maxLines="1"
159161
android:visibility="gone"
160162
tools:visibility="visible" />
161163

0 commit comments

Comments
 (0)