kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve client cert password handling

Browse Source
This commit is contained in:
Niko Diamadis
2024-06-06 00:42:36 +02:00
parent 4fac47f3b1
commit 090edb75fc
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt
View File

@@ -79,7 +79,11 @@ internal class AdvancedDialog(
showRemoveClientCertificate() showRemoveClientCertificate()
} }
binding.clientCertPasswordEdittext.doOnTextChanged { _, _, _, _ -> binding.clientCertPasswordEdittext.doOnTextChanged { _, _, _, _ ->
showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty()) if (binding.selectedClientCert.text.toString() ==
context.getString(R.string.certificate_found)
) {
showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty())
}
} }
val dialog = MaterialAlertDialogBuilder(context) val dialog = MaterialAlertDialogBuilder(context)
.setView(binding.root) .setView(binding.root)
@@ -114,6 +118,7 @@ internal class AdvancedDialog(
binding.toggleClientCert.setOnClickListener { onClickSelectClientCertificate.run() } binding.toggleClientCert.setOnClickListener { onClickSelectClientCertificate.run() }
binding.selectedClientCert.setText(R.string.no_certificate_selected) binding.selectedClientCert.setText(R.string.no_certificate_selected)
showPasswordMissing(false) showPasswordMissing(false)
binding.clientCertPasswordEdittext.text = null
} }
fun showRemoveClientCertificate() { fun showRemoveClientCertificate() {

1
app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
View File

@@ -181,6 +181,7 @@ internal class LoginActivity : AppCompatActivity() {
.onClickRemoveCaCertificate { .onClickRemoveCaCertificate {
invalidateUrl() invalidateUrl()
caCertPath = null caCertPath = null
clientCertPassword = null
} }
.onClickSelectClientCertificate { .onClickSelectClientCertificate {
invalidateUrl() invalidateUrl()