mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-29 21:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: simplify PasswordDialog emissions

Browse Source
This commit is contained in:
Harsh Shandilya 2022-10-07 20:25:19 +05:30
parent 6dcffc04d2
commit 6615992332
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/app/passwordstore/ui/crypto/PasswordDialog.kt
View File

@ -19,6 +19,7 @@ import app.passwordstore.util.extensions.unsafeLazy
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
/** [DialogFragment] to request a password from the user and forward it along. */ /** [DialogFragment] to request a password from the user and forward it along. */
class PasswordDialog : DialogFragment() { class PasswordDialog : DialogFragment() {
@ -32,7 +33,7 @@ class PasswordDialog : DialogFragment() {
val builder = MaterialAlertDialogBuilder(requireContext()) val builder = MaterialAlertDialogBuilder(requireContext())
builder.setView(binding.root) builder.setView(binding.root)
builder.setTitle(R.string.password) builder.setTitle(R.string.password)
builder.setPositiveButton(android.R.string.ok) { _, _ -> tryEmitPassword() } builder.setPositiveButton(android.R.string.ok) { _, _ -> setPasswordAndDismiss() }
val dialog = builder.create() val dialog = builder.create()
dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
dialog.setOnShowListener { dialog.setOnShowListener {
@ -42,7 +43,7 @@ class PasswordDialog : DialogFragment() {
binding.passwordEditText.doOnTextChanged { _, _, _, _ -> binding.passwordField.error = null } binding.passwordEditText.doOnTextChanged { _, _, _, _ -> binding.passwordField.error = null }
binding.passwordEditText.setOnKeyListener { _, keyCode, _ -> binding.passwordEditText.setOnKeyListener { _, keyCode, _ ->
if (keyCode == KeyEvent.KEYCODE_ENTER) { if (keyCode == KeyEvent.KEYCODE_ENTER) {
tryEmitPassword() setPasswordAndDismiss()
return@setOnKeyListener true return@setOnKeyListener true
} }
false false
@ -64,9 +65,8 @@ class PasswordDialog : DialogFragment() {
finish() finish()
} }
@Suppress("ControlFlowWithEmptyBody") private fun setPasswordAndDismiss() {
private fun tryEmitPassword() { _password.update { binding.passwordEditText.text.toString() }
do {} while (!_password.tryEmit(binding.passwordEditText.text.toString()))
dismissAllowingStateLoss() dismissAllowingStateLoss()
} }
} }