aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-09-14 22:37:22 +0530
committerGitHub <noreply@github.com>2020-09-14 22:37:22 +0530
commita34f749e9ac1d6112a42b0f4ded3ae801d8c583c (patch)
tree0bab8a806c64af04fe7422dcb6f906515278cdb7 /app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
parenteef809760c7359a34b414af45165b157813e78af (diff)
downloadHardenedPass-a34f749e9ac1d6112a42b0f4ded3ae801d8c583c.tar.gz
HardenedPass-a34f749e9ac1d6112a42b0f4ded3ae801d8c583c.zip
Add tentative workaround for dialog crashes and refactor Git-related code (#1100)
* Ensure we're creating dialogs on the main thread Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * Remove unused operation type Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * Refactor launchGitOperation to use an enum Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
index 49abc92d..752a6b7a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
@@ -91,7 +91,7 @@ class GitConfigActivity : BaseGitActivity() {
}
binding.gitAbortRebase.setOnClickListener {
lifecycleScope.launch {
- launchGitOperation(BREAK_OUT_OF_DETACHED).fold(
+ launchGitOperation(GitOp.BREAK_OUT_OF_DETACHED).fold(
success = {
MaterialAlertDialogBuilder(this@GitConfigActivity).run {
setTitle(resources.getString(R.string.git_abort_and_push_title))
@@ -115,7 +115,7 @@ class GitConfigActivity : BaseGitActivity() {
}
binding.gitResetToRemote.setOnClickListener {
lifecycleScope.launch {
- launchGitOperation(REQUEST_RESET).fold(
+ launchGitOperation(GitOp.RESET).fold(
success = ::finishOnSuccessHandler,
failure = { err ->
promptOnErrorHandler(err) {