kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: correctly handle default auth mode

Browse source
This commit is contained in:
Harsh Shandilya 2022-11-26 19:25:49 +05:30
parent 438a332132
commit c89e9250c2
No known key found for this signature in database
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt
View file

@ -62,17 +62,17 @@ class GitServerConfigActivity : BaseGitActivity() {
when (newAuthMode) {
AuthMode.SshKey -> check(binding.authModeSshKey.id)
AuthMode.Password -> check(binding.authModePassword.id)
AuthMode.None -> check(View.NO_ID)
AuthMode.None -> clearChecked()
}
addOnButtonCheckedListener { _, checkedId, isChecked ->
if (!isChecked) {
addOnButtonCheckedListener { _, _, _ ->
if (checkedButtonIds.isEmpty()) {
newAuthMode = AuthMode.None
return@addOnButtonCheckedListener
}
when (checkedId) {
binding.authModeSshKey.id -> newAuthMode = AuthMode.SshKey
binding.authModePassword.id -> newAuthMode = AuthMode.Password
View.NO_ID -> newAuthMode = AuthMode.None
} else {
when (checkedButtonId) {
binding.authModeSshKey.id -> newAuthMode = AuthMode.SshKey
binding.authModePassword.id -> newAuthMode = AuthMode.Password
View.NO_ID -> newAuthMode = AuthMode.None
}
}
}
}
@ -214,7 +214,7 @@ class GitServerConfigActivity : BaseGitActivity() {
if (isHttps) {
authModeSshKey.isVisible = false
authModePassword.isVisible = true
if (authModeGroup.checkedButtonId != authModePassword.id) authModeGroup.check(View.NO_ID)
if (authModeGroup.checkedButtonId != authModePassword.id) authModeGroup.clearChecked()
} else {
authModeSshKey.isVisible = true
authModePassword.isVisible = true