Get rid of explicit Git server protocol (#1054)

* Double check Git server protocol

Ensure that the Git server protocol is not at odds with the URL scheme.

Also move the Protocol switches below the URL to make it clear that the
URL should be entered first.

* Remove protocol selection from server config

The protocol is now extracted from the URL, and the authentication mode selection is validated by GitSettings

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Don't use pref values for auth modes

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Apply suggestions from code review

Remove now unused protocol mismatch result type

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>

* Simplify migration logic and fix tests

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Revert "Simplify migration logic and fix tests"

This reverts commit 1c4c4ba5fbc212843cb6b74dd29ac858eaea7582.

* Detect URLs with null scheme as ssh

* Add changelog entry

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Co-authored-by: Harsh Shandilya <msfjarvis@gmail.com>

1 files changed, 13 insertions, 46 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
index cd6747f7..5aa34201 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
@@ -32,7 +32,6 @@ class GitServerConfigActivity : BaseGitActivity() {
 
     private val binding by viewBinding(ActivityGitCloneBinding::inflate)
 
-    private lateinit var newProtocol: Protocol
     private lateinit var newAuthMode: AuthMode
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,24 +43,8 @@ class GitServerConfigActivity : BaseGitActivity() {
         setContentView(binding.root)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        newProtocol = GitSettings.protocol
-        binding.protocolGroup.apply {
-            when (newProtocol) {
-                Protocol.Ssh -> check(R.id.protocol_ssh)
-                Protocol.Https -> check(R.id.protocol_https)
-            }
-            addOnButtonCheckedListener { _, checkedId, checked ->
-                if (checked) {
-                    when (checkedId) {
-                        R.id.protocol_https -> newProtocol = Protocol.Https
-                        R.id.protocol_ssh -> newProtocol = Protocol.Ssh
-                    }
-                    updateAuthModeToggleGroup()
-                }
-            }
-        }
-
         newAuthMode = GitSettings.authMode
+
         binding.authModeGroup.apply {
             when (newAuthMode) {
                 AuthMode.SshKey -> check(R.id.auth_mode_ssh_key)
@@ -78,27 +61,25 @@ class GitServerConfigActivity : BaseGitActivity() {
                 }
             }
         }
-        updateAuthModeToggleGroup()
 
         binding.serverUrl.setText(GitSettings.url)
         binding.serverBranch.setText(GitSettings.branch)
 
         binding.saveButton.setOnClickListener {
-            when (GitSettings.updateConnectionSettingsIfValid(
-                newProtocol = newProtocol,
+            when (val updateResult = GitSettings.updateConnectionSettingsIfValid(
                 newAuthMode = newAuthMode,
                 newUrl = binding.serverUrl.text.toString().trim(),
                 newBranch = binding.serverBranch.text.toString().trim())) {
                 GitSettings.UpdateConnectionSettingsResult.FailedToParseUrl -> {
                     Snackbar.make(binding.root, getString(R.string.git_server_config_save_error), Snackbar.LENGTH_LONG).show()
                 }
-                GitSettings.UpdateConnectionSettingsResult.MissingUsername -> {
-                    when (newProtocol) {
+                is GitSettings.UpdateConnectionSettingsResult.MissingUsername -> {
+                    when (updateResult.newProtocol) {
                         Protocol.Https -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_missing_username_https), Snackbar.LENGTH_LONG).show()
                         Protocol.Ssh -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_missing_username_ssh), Snackbar.LENGTH_LONG).show()
                     }
                 }
-                else -> {
+                GitSettings.UpdateConnectionSettingsResult.Valid -> {
                     if (isClone && PasswordRepository.getRepository(null) == null)
                         PasswordRepository.initialize()
                     if (!isClone) {
@@ -108,32 +89,18 @@ class GitServerConfigActivity : BaseGitActivity() {
                         cloneRepository()
                     }
                 }
+                is GitSettings.UpdateConnectionSettingsResult.AuthModeMismatch -> {
+                    val message = getString(
+                        R.string.git_server_config_save_auth_mode_mismatch,
+                        updateResult.newProtocol,
+                        updateResult.validModes.joinToString(", "),
+                    )
+                    Snackbar.make(binding.root, message, Snackbar.LENGTH_LONG).show()
+                }
             }
         }
     }
 
-    private fun updateAuthModeToggleGroup() {
-        if (newProtocol == Protocol.Ssh) {
-            binding.authModeSshKey.isEnabled = true
-            binding.authModeOpenKeychain.isEnabled = true
-            // Reset connection mode to SSH key if the current value (none) is not valid for SSH.
-            // Important note: This has to happen after enabling the other toggle buttons or they
-            // won't check.
-            if (binding.authModeGroup.checkedButtonIds.isEmpty())
-                binding.authModeGroup.check(R.id.auth_mode_ssh_key)
-            binding.authModeGroup.isSelectionRequired = true
-        } else {
-            binding.authModeGroup.isSelectionRequired = false
-            // Reset connection mode to password if the current value is not valid for HTTPS
-            // Important note: This has to happen before disabling the other toggle buttons or they
-            // won't uncheck.
-            if (newAuthMode !in listOf(AuthMode.None, AuthMode.Password))
-                binding.authModeGroup.check(R.id.auth_mode_password)
-            binding.authModeSshKey.isEnabled = false
-            binding.authModeOpenKeychain.isEnabled = false
-        }
-    }
-
     /**
      * Clones the repository, the directory exists, deletes it
      */