1 files changed, 27 insertions, 27 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt b/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt
index 4edd9e38..94ee0845 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt
@@ -7,11 +7,11 @@ package com.zeapo.pwdstore.git
 import android.app.Activity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.zeapo.pwdstore.R
-import java.io.File
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.GitCommand
 import org.eclipse.jgit.api.PushCommand
 import org.eclipse.jgit.api.RebaseCommand
+import java.io.File
 
 class BreakOutOfDetached(fileDir: File, callingActivity: Activity) : GitOperation(fileDir, callingActivity) {
     private lateinit var commands: List<GitCommand<out Any>>
@@ -26,14 +26,14 @@ class BreakOutOfDetached(fileDir: File, callingActivity: Activity) : GitOperatio
         val branchName = "conflicting-master-${System.currentTimeMillis()}"
 
         this.commands = listOf(
-                // abort the rebase
-                git.rebase().setOperation(RebaseCommand.Operation.ABORT),
-                // git checkout -b conflict-branch
-                git.checkout().setCreateBranch(true).setName(branchName),
-                // push the changes
-                git.push().setRemote("origin"),
-                // switch back to master
-                git.checkout().setName("master")
+            // abort the rebase
+            git.rebase().setOperation(RebaseCommand.Operation.ABORT),
+            // git checkout -b conflict-branch
+            git.checkout().setCreateBranch(true).setName(branchName),
+            // push the changes
+            git.push().setRemote("origin"),
+            // switch back to master
+            git.checkout().setName("master")
         )
         return this
     }
@@ -42,11 +42,11 @@ class BreakOutOfDetached(fileDir: File, callingActivity: Activity) : GitOperatio
         val git = Git(repository)
         if (!git.repository.repositoryState.isRebasing) {
             MaterialAlertDialogBuilder(callingActivity)
-                    .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
-                    .setMessage("The repository is not rebasing, no need to push to another branch")
-                    .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
-                        callingActivity.finish()
-                    }.show()
+                .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
+                .setMessage("The repository is not rebasing, no need to push to another branch")
+                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                    callingActivity.finish()
+                }.show()
             return
         }
 
@@ -59,26 +59,26 @@ class BreakOutOfDetached(fileDir: File, callingActivity: Activity) : GitOperatio
             }
         }
         GitAsyncTask(callingActivity, true, this, null)
-                .execute(*this.commands.toTypedArray())
+            .execute(*this.commands.toTypedArray())
     }
 
     override fun onError(errorMessage: String) {
         MaterialAlertDialogBuilder(callingActivity)
-                .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
-                .setMessage("Error occurred when checking out another branch operation $errorMessage")
-                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
-                    callingActivity.finish()
-                }.show()
+            .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
+            .setMessage("Error occurred when checking out another branch operation $errorMessage")
+            .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                callingActivity.finish()
+            }.show()
     }
 
     override fun onSuccess() {
         MaterialAlertDialogBuilder(callingActivity)
-                .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
-                .setMessage("There was a conflict when trying to rebase. " +
-                        "Your local master branch was pushed to another branch named conflicting-master-....\n" +
-                        "Use this branch to resolve conflict on your computer")
-                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
-                    callingActivity.finish()
-                }.show()
+            .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
+            .setMessage("There was a conflict when trying to rebase. " +
+                "Your local master branch was pushed to another branch named conflicting-master-....\n" +
+                "Use this branch to resolve conflict on your computer")
+            .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                callingActivity.finish()
+            }.show()
     }
 }