From 08024da65e5a04509111fa8a5e7851c2c4a4a9e4 Mon Sep 17 00:00:00 2001 From: jagadeesh-18-bot Date: Wed, 20 Aug 2025 11:51:33 +0530 Subject: [PATCH 1/2] Remove unused onEditorAction function (Part of issue #5996) --- .../java/fr/free/nrw/commons/auth/LoginActivity.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt index 7a665197b..c01e2e469 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt @@ -14,7 +14,6 @@ import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager -import android.widget.TextView import androidx.annotation.ColorRes import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting @@ -274,11 +273,11 @@ class LoginActivity : AccountAuthenticatorActivity() { } } - private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) = - if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) { - performLogin() - true - } else false +// private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) = +// if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) { +// performLogin() +// true +// } else false private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) = actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER From d00e6502b1b90241e1c662b73dddfe6d449b580f Mon Sep 17 00:00:00 2001 From: jagadeesh-18-bot Date: Wed, 20 Aug 2025 11:52:12 +0530 Subject: [PATCH 2/2] Replace size checks with isNotEmpty() in onTextChanged (Part of issue #5996) --- app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt index c01e2e469..8e7a3ddda 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt @@ -461,8 +461,8 @@ class LoginActivity : AccountAuthenticatorActivity() { private fun onTextChanged(text: String) { val enabled = - binding!!.loginUsername.text!!.length != 0 && binding!!.loginPassword.text!!.length != 0 && - (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.length != 0 || binding!!.loginTwoFactor.visibility != View.VISIBLE) + binding!!.loginUsername.text!!.isNotEmpty() && binding!!.loginPassword.text!!.isNotEmpty() && + (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.isNotEmpty() || binding!!.loginTwoFactor.visibility != View.VISIBLE) binding!!.loginButton.isEnabled = enabled }