From 7a3bd134a0ac752d88398eb454a66f76aa6f861e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Wed, 26 Aug 2020 18:15:03 +0530
Subject: [PATCH] Apply suggestions from code review

Remove now unused protocol mismatch result type

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
---
 .../java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt     | 3 ---
 app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt | 1 -
 app/src/main/res/values/strings.xml                            | 1 -
 3 files changed, 5 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 6a21f7e9a..5aa342017 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
@@ -79,9 +79,6 @@ class GitServerConfigActivity : BaseGitActivity() {
                         Protocol.Ssh -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_missing_username_ssh), Snackbar.LENGTH_LONG).show()
                     }
                 }
-                GitSettings.UpdateConnectionSettingsResult.ProtocolMismatch -> {
-                    Snackbar.make(binding.root, getString(R.string.git_server_config_save_protocol_mismatch), Snackbar.LENGTH_LONG).show()
-                }
                 GitSettings.UpdateConnectionSettingsResult.Valid -> {
                     if (isClone && PasswordRepository.getRepository(null) == null)
                         PasswordRepository.initialize()
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt b/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
index bb9069597..4d4a65116 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/config/GitSettings.kt
@@ -102,7 +102,6 @@ object GitSettings {
         class AuthModeMismatch(val newProtocol: Protocol, val validModes: List<AuthMode>) : UpdateConnectionSettingsResult()
         object Valid : UpdateConnectionSettingsResult()
         object FailedToParseUrl : UpdateConnectionSettingsResult()
-        object ProtocolMismatch : UpdateConnectionSettingsResult()
     }
 
     fun updateConnectionSettingsIfValid(newAuthMode: AuthMode, newUrl: String, newBranch: String): UpdateConnectionSettingsResult {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1e990e64..f27224ff6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -330,7 +330,6 @@
     <string name="git_server_config_save_error">The provided repository URL is not valid</string>
     <string name="git_server_config_save_missing_username_https">Please specify the HTTPS username in the form https://username@example.com/…</string>
     <string name="git_server_config_save_missing_username_ssh">Please specify the SSH username in the form username@example.com:…</string>
-    <string name="git_server_config_save_protocol_mismatch">The provided repository URL\'s scheme does not match the selected protocol</string>
     <string name="git_server_config_save_auth_mode_mismatch">Valid authentication modes for %1$s: %2$s</string>
     <string name="git_config_error_hostname_empty">empty hostname</string>
     <string name="git_config_error_generic">please verify your settings and try again</string>