Fix behavior on failing Git operations (#1084)

3 files changed, 46 insertions, 25 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
index dd8ea731..a15972c1 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
@@ -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()
         }
     }
 
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 46a54f57..b3217395 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
@@ -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()
+                      }
+                  },
                 )
             }
         }
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
index c18c79c6..97010c23 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
@@ -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()
+                        }
+                    },
                 )
             }
         }