3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94c94c31..42c99227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - Allow creating nested directories directly
 - I keep saying this but for real: error message for wrong SSH/HTTPS password is properly fixed now
 - Fix crash when OpenKeychain is not installed
+- Clone operation won't leave user on an empty password list upon failure
 
 ## [1.10.3] - 2020-07-30
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
index 8c516eac..a032a669 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
@@ -24,6 +24,15 @@ class CloneOperation(fileDir: File, uri: String, callingActivity: AppCompatActiv
     )
 
     override suspend fun execute() {
-        GitCommandExecutor(callingActivity, this).execute()
+        GitCommandExecutor(callingActivity, this, finishActivityOnEnd = false).execute()
+    }
+
+    override fun onSuccess() {
+        callingActivity.finish()
+    }
+
+    override fun onError(err: Exception) {
+        finishFromErrorDialog = false
+        super.onError(err)
     }
 }
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 ad8d318a..e72c5743 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
@@ -46,6 +46,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
     private var provider: CredentialsProvider? = null
     private val sshKeyFile = callingActivity.filesDir.resolve(".ssh_key")
     private val hostKeyFile = callingActivity.filesDir.resolve(".host_key")
+    protected var finishFromErrorDialog = true
     protected val repository = PasswordRepository.getRepository(gitDir)
     protected val git = Git(repository)
     protected val remoteBranch = GitSettings.branch
@@ -166,7 +167,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
             .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
             .setMessage(ErrorMessages[err])
             .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
-                callingActivity.finish()
+                if (finishFromErrorDialog) callingActivity.finish()
             }.show()
     }