Skip to content

Fix warnings in LoginActivity.kt #6406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix warnings in LoginActivity.kt #6406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08024da
Remove unused onEditorAction function (Part of issue #5996)
Kota-Jagadeesh Aug 20, 2025
d00e650
Replace size checks with isNotEmpty() in onTextChanged (Part of issue…
Kota-Jagadeesh Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -462,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
}

Expand Down
Loading