From c89e9250c280ea58b5702644a323cf9b321d1bb0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 26 Nov 2022 19:25:49 +0530 Subject: fix: correctly handle default auth mode --- .../ui/git/config/GitServerConfigActivity.kt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt index a07b409f..85eae71d 100644 --- a/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt @@ -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 -- cgit v1.2.3