From a34f749e9ac1d6112a42b0f4ded3ae801d8c583c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 14 Sep 2020 22:37:22 +0530 Subject: 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 * Remove unused operation type Signed-off-by: Harsh Shandilya * Refactor launchGitOperation to use an enum Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt') 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) { -- cgit v1.2.3