2 files changed, 32 insertions, 33 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
index 959d9325..03c92313 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt
@@ -88,9 +88,8 @@ class GitConfigActivity : BaseGitActivity() {
       binding.gitAbortRebase.alpha = if (needsAbort) 1.0f else 0.5f
     }
     binding.gitLog.setOnClickListener {
-      runCatching { startActivity(Intent(this, GitLogActivity::class.java)) }.onFailure { ex ->
-        logcat(ERROR) { "Failed to start GitLogActivity\n${ex}" }
-      }
+      runCatching { startActivity(Intent(this, GitLogActivity::class.java)) }
+        .onFailure { ex -> logcat(ERROR) { "Failed to start GitLogActivity\n${ex}" } }
     }
     binding.gitAbortRebase.setOnClickListener {
       lifecycleScope.launch {
@@ -142,16 +141,16 @@ class GitConfigActivity : BaseGitActivity() {
    */
   private fun headStatusMsg(repo: Repository): String {
     return runCatching {
-      val headRef = repo.getRef(Constants.HEAD)
-      if (headRef.isSymbolic) {
-        val branchName = headRef.target.name
-        val shortBranchName = Repository.shortenRefName(branchName)
-        getString(R.string.git_head_on_branch, shortBranchName)
-      } else {
-        val commitHash = headRef.objectId.abbreviate(8).name()
-        getString(R.string.git_head_detached, commitHash)
+        val headRef = repo.getRef(Constants.HEAD)
+        if (headRef.isSymbolic) {
+          val branchName = headRef.target.name
+          val shortBranchName = Repository.shortenRefName(branchName)
+          getString(R.string.git_head_on_branch, shortBranchName)
+        } else {
+          val commitHash = headRef.objectId.abbreviate(8).name()
+          getString(R.string.git_head_detached, commitHash)
+        }
       }
-    }
       .getOrElse { ex ->
         logcat(ERROR) { "Error getting HEAD reference\n${ex}" }
         getString(R.string.git_head_missing)
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
index 6b1f30ea..e713a54e 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt
@@ -240,24 +240,24 @@ class GitServerConfigActivity : BaseGitActivity() {
         .setCancelable(false)
         .setPositiveButton(R.string.dialog_delete) { dialog, _ ->
           runCatching {
-            lifecycleScope.launch {
-              val snackbar =
-                snackbar(
-                  message = getString(R.string.delete_directory_progress_text),
-                  length = Snackbar.LENGTH_INDEFINITE
-                )
-              withContext(Dispatchers.IO) { localDir.deleteRecursively() }
-              snackbar.dismiss()
-              launchGitOperation(GitOp.CLONE)
-                .fold(
-                  success = {
-                    setResult(RESULT_OK)
-                    finish()
-                  },
-                  failure = { err -> promptOnErrorHandler(err) { finish() } }
-                )
+              lifecycleScope.launch {
+                val snackbar =
+                  snackbar(
+                    message = getString(R.string.delete_directory_progress_text),
+                    length = Snackbar.LENGTH_INDEFINITE
+                  )
+                withContext(Dispatchers.IO) { localDir.deleteRecursively() }
+                snackbar.dismiss()
+                launchGitOperation(GitOp.CLONE)
+                  .fold(
+                    success = {
+                      setResult(RESULT_OK)
+                      finish()
+                    },
+                    failure = { err -> promptOnErrorHandler(err) { finish() } }
+                  )
+              }
             }
-          }
             .onFailure { e ->
               e.printStackTrace()
               MaterialAlertDialogBuilder(this).setMessage(e.message).show()
@@ -268,11 +268,11 @@ class GitServerConfigActivity : BaseGitActivity() {
         .show()
     } else {
       runCatching {
-        // Silently delete & replace the lone .git folder if it exists
-        if (localDir.exists() && localDirFiles.size == 1 && localDirFiles[0].name == ".git") {
-          localDir.deleteRecursively()
+          // Silently delete & replace the lone .git folder if it exists
+          if (localDir.exists() && localDirFiles.size == 1 && localDirFiles[0].name == ".git") {
+            localDir.deleteRecursively()
+          }
         }
-      }
         .onFailure { e ->
           logcat(ERROR) { e.asLog() }
           MaterialAlertDialogBuilder(this).setMessage(e.message).show()