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

Fix behavior on failing Git operations (#1084)

Browse source
This commit is contained in:
Fabian Henneke 2020-09-07 10:10:59 +02:00 committed by GitHub
parent 2c0ecdfb67
commit 2687763bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
View file

@ -110,7 +110,11 @@ class PasswordFragment : Fragment(R.layout.password_recycler_view) {
binding.swipeRefresher.isRefreshing = false
refreshPasswordList()
},
failure = ::finishAfterPromptOnErrorHandler,
failure = { err ->
promptOnErrorHandler(err) {
binding.swipeRefresher.isRefreshing = false
}
},
)
}
}

2
app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
View file

@ -315,7 +315,7 @@ class PasswordStore : BaseGitActivity() {
private fun runGitOperation(operation: Int) = lifecycleScope.launch {
launchGitOperation(operation).fold(
success = { refreshPasswordList() },
failure = ::finishAfterPromptOnErrorHandler,
failure = ::promptOnErrorHandler
)
}

19
app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
View file

@ -61,7 +61,7 @@ abstract class BaseGitActivity : AppCompatActivity() {
finish()
}
fun finishAfterPromptOnErrorHandler(err: Throwable) {
fun promptOnErrorHandler(err: Throwable, onPromptDone: () -> Unit = {}) {
val error = rootCauseException(err)
if (!isExplicitlyUserInitiatedError(error)) {
getEncryptedPrefs("git_operation").edit {
@ -69,12 +69,17 @@ abstract class BaseGitActivity : AppCompatActivity() {
}
sharedPrefs.edit { remove(PreferenceKeys.SSH_OPENKEYSTORE_KEYID) }
d(error)
MaterialAlertDialogBuilder(this)
.setTitle(resources.getString(R.string.jgit_error_dialog_title))
.setMessage(ErrorMessages[error])
.setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ ->
finish()
}.show()
MaterialAlertDialogBuilder(this).run {
setTitle(resources.getString(R.string.jgit_error_dialog_title))
setMessage(ErrorMessages[error])
setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ -> }
setOnDismissListener {
onPromptDone()
}
show()
}
} else {
onPromptDone()
}
}

40
app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
View file

@ -81,28 +81,36 @@ class GitConfigActivity : BaseGitActivity() {
binding.gitAbortRebase.setOnClickListener {
lifecycleScope.launch {
launchGitOperation(BREAK_OUT_OF_DETACHED).fold(
success = {
MaterialAlertDialogBuilder(this@GitConfigActivity)
.setTitle(resources.getString(R.string.git_abort_and_push_title))
.setMessage(resources.getString(
R.string.git_break_out_of_detached_success,
GitSettings.branch,
"conflicting-${GitSettings.branch}-...",
))
.setOnCancelListener { finish() }
.setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ ->
finish()
}.show()
},
failure = ::finishAfterPromptOnErrorHandler,
success = {
MaterialAlertDialogBuilder(this@GitConfigActivity).run {
setTitle(resources.getString(R.string.git_abort_and_push_title))
setMessage(resources.getString(
R.string.git_break_out_of_detached_success,
GitSettings.branch,
"conflicting-${GitSettings.branch}-...",
))
setOnDismissListener() { finish() }
setPositiveButton(resources.getString(R.string.dialog_ok)) { _, _ -> }
show()
}
},
failure = { err ->
promptOnErrorHandler(err) {
finish()
}
},
)
}
}
binding.gitResetToRemote.setOnClickListener {
lifecycleScope.launch {
launchGitOperation(REQUEST_RESET).fold(
success = ::finishOnSuccessHandler,
failure = ::finishAfterPromptOnErrorHandler,
success = ::finishOnSuccessHandler,
failure = { err ->
promptOnErrorHandler(err) {
finish()
}
},
)
}
}

12
app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
View file

@ -130,7 +130,11 @@ class GitServerConfigActivity : BaseGitActivity() {
setResult(RESULT_OK)
finish()
},
failure = ::finishAfterPromptOnErrorHandler,
failure = { err ->
promptOnErrorHandler(err) {
finish()
}
}
)
}
}.onFailure { e ->
@ -160,7 +164,11 @@ class GitServerConfigActivity : BaseGitActivity() {
setResult(RESULT_OK)
finish()
},
failure = ::finishAfterPromptOnErrorHandler,
failure = { err ->
promptOnErrorHandler(err) {
finish()
}
},
)
}
}