Rename ConnectionMode to AuthMode and remove clone_ prefix (#1053)

2 files changed, 14 insertions, 14 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt
index 6b6b8ea8..b7b4f881 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/CredentialFinder.kt
@@ -10,7 +10,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.zeapo.pwdstore.R
-import com.zeapo.pwdstore.git.config.ConnectionMode
+import com.zeapo.pwdstore.git.config.AuthMode
 import com.zeapo.pwdstore.git.sshj.InteractivePasswordFinder
 import com.zeapo.pwdstore.utils.PreferenceKeys
 import com.zeapo.pwdstore.utils.getEncryptedPrefs
@@ -20,7 +20,7 @@ import kotlin.coroutines.resume
 
 class CredentialFinder(
     val callingActivity: FragmentActivity,
-    val connectionMode: ConnectionMode
+    val authMode: AuthMode
 ) : InteractivePasswordFinder() {
 
     override fun askForPassword(cont: Continuation<String?>, isRetry: Boolean) {
@@ -30,15 +30,15 @@ class CredentialFinder(
         @StringRes val hintRes: Int
         @StringRes val rememberRes: Int
         @StringRes val errorRes: Int
-        when (connectionMode) {
-            ConnectionMode.SshKey -> {
+        when (authMode) {
+            AuthMode.SshKey -> {
                 credentialPref = PreferenceKeys.SSH_KEY_LOCAL_PASSPHRASE
                 messageRes = R.string.passphrase_dialog_text
                 hintRes = R.string.ssh_keygen_passphrase
                 rememberRes = R.string.git_operation_remember_passphrase
                 errorRes = R.string.git_operation_wrong_passphrase
             }
-            ConnectionMode.Password -> {
+            AuthMode.Password -> {
                 // Could be either an SSH or an HTTPS password
                 credentialPref = PreferenceKeys.HTTPS_PASSWORD
                 messageRes = R.string.password_dialog_text
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
index 3efd3bd8..d537ba7f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
@@ -13,7 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.zeapo.pwdstore.R
 import com.zeapo.pwdstore.UserPreference
 import com.zeapo.pwdstore.git.ErrorMessages
-import com.zeapo.pwdstore.git.config.ConnectionMode
+import com.zeapo.pwdstore.git.config.AuthMode
 import com.zeapo.pwdstore.git.config.GitSettings
 import com.zeapo.pwdstore.git.sshj.InteractivePasswordFinder
 import com.zeapo.pwdstore.git.sshj.SshAuthData
@@ -116,10 +116,10 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
     abstract suspend fun execute()
 
     suspend fun executeAfterAuthentication(
-        connectionMode: ConnectionMode,
+        authMode: AuthMode,
     ) {
-        when (connectionMode) {
-            ConnectionMode.SshKey -> if (!sshKeyFile.exists()) {
+        when (authMode) {
+            AuthMode.SshKey -> if (!sshKeyFile.exists()) {
                 MaterialAlertDialogBuilder(callingActivity)
                     .setMessage(callingActivity.resources.getString(R.string.ssh_preferences_dialog_text))
                     .setTitle(callingActivity.resources.getString(R.string.ssh_preferences_dialog_title))
@@ -135,12 +135,12 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
                     }.show()
             } else {
                 withPublicKeyAuthentication(
-                    CredentialFinder(callingActivity, connectionMode)).execute()
+                    CredentialFinder(callingActivity, authMode)).execute()
             }
-            ConnectionMode.OpenKeychain -> withOpenKeychainAuthentication(callingActivity).execute()
-            ConnectionMode.Password -> withPasswordAuthentication(
-                CredentialFinder(callingActivity, connectionMode)).execute()
-            ConnectionMode.None -> execute()
+            AuthMode.OpenKeychain -> withOpenKeychainAuthentication(callingActivity).execute()
+            AuthMode.Password -> withPasswordAuthentication(
+                CredentialFinder(callingActivity, authMode)).execute()
+            AuthMode.None -> execute()
         }
     }