Skip to content

Commit 090edb7

Browse files
committed
Improve client cert password handling
1 parent 4fac47f commit 090edb7

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ internal class AdvancedDialog(
7979
showRemoveClientCertificate()
8080
}
8181
binding.clientCertPasswordEdittext.doOnTextChanged { _, _, _, _ ->
82-
showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty())
82+
if (binding.selectedClientCert.text.toString() ==
83+
context.getString(R.string.certificate_found)
84+
) {
85+
showPasswordMissing(binding.clientCertPasswordEdittext.text.toString().isEmpty())
86+
}
8387
}
8488
val dialog = MaterialAlertDialogBuilder(context)
8589
.setView(binding.root)
@@ -114,6 +118,7 @@ internal class AdvancedDialog(
114118
binding.toggleClientCert.setOnClickListener { onClickSelectClientCertificate.run() }
115119
binding.selectedClientCert.setText(R.string.no_certificate_selected)
116120
showPasswordMissing(false)
121+
binding.clientCertPasswordEdittext.text = null
117122
}
118123

119124
fun showRemoveClientCertificate() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ internal class LoginActivity : AppCompatActivity() {
181181
.onClickRemoveCaCertificate {
182182
invalidateUrl()
183183
caCertPath = null
184+
clientCertPassword = null
184185
}
185186
.onClickSelectClientCertificate {
186187
invalidateUrl()

0 commit comments

Comments
 (0)