kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Improve clone operation semantics (#1010)

Browse source 
* Improve clone operation semantics

Fixes #1003

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

* Update changelog

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-08-12 13:04:47 +05:30 committed by GitHub
parent 52e2139f6a
commit 372c0f3dbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
- Allow creating nested directories directly - Allow creating nested directories directly
- I keep saying this but for real: error message for wrong SSH/HTTPS password is properly fixed now - 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 - 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 ## [1.10.3] - 2020-07-30

11
app/src/main/java/com/zeapo/pwdstore/git/operation/CloneOperation.kt
View file

@ -24,6 +24,15 @@ class CloneOperation(fileDir: File, uri: String, callingActivity: AppCompatActiv
) )
override suspend fun execute() { 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)
} }
} }

3
app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
View file

@ -46,6 +46,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
private var provider: CredentialsProvider? = null private var provider: CredentialsProvider? = null
private val sshKeyFile = callingActivity.filesDir.resolve(".ssh_key") private val sshKeyFile = callingActivity.filesDir.resolve(".ssh_key")
private val hostKeyFile = callingActivity.filesDir.resolve(".host_key") private val hostKeyFile = callingActivity.filesDir.resolve(".host_key")
protected var finishFromErrorDialog = true
protected val repository = PasswordRepository.getRepository(gitDir) protected val repository = PasswordRepository.getRepository(gitDir)
protected val git = Git(repository) protected val git = Git(repository)
protected val remoteBranch = GitSettings.branch 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)) .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
.setMessage(ErrorMessages[err]) .setMessage(ErrorMessages[err])
.setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
callingActivity.finish() if (finishFromErrorDialog) callingActivity.finish()
}.show() }.show()
} }