Treewide codestyle cleanup (#765)

- Updated gitignore and checked in the IDE's codestyle config
- Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year
- Reformat the entire codebase based on the previously committed code style configuration.

1: https://github.com/pinterest/ktlint/issues/527

1 files changed, 10 insertions, 9 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt
index 44cd75a0..48997657 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt
@@ -8,11 +8,11 @@ import android.app.Activity
 import android.content.Intent
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.zeapo.pwdstore.R
-import java.io.File
 import org.eclipse.jgit.api.AddCommand
 import org.eclipse.jgit.api.FetchCommand
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.ResetCommand
+import java.io.File
 
 /**
  * Creates a new git operation
@@ -21,6 +21,7 @@ import org.eclipse.jgit.api.ResetCommand
  * @param callingActivity the calling activity
  */
 class ResetToRemoteOperation(fileDir: File, callingActivity: Activity) : GitOperation(fileDir, callingActivity) {
+
     private var addCommand: AddCommand? = null
     private var fetchCommand: FetchCommand? = null
     private var resetCommand: ResetCommand? = null
@@ -41,18 +42,18 @@ class ResetToRemoteOperation(fileDir: File, callingActivity: Activity) : GitOper
     override fun execute() {
         this.fetchCommand?.setCredentialsProvider(this.provider)
         GitAsyncTask(callingActivity, false, this, Intent())
-                .execute(this.addCommand, this.fetchCommand, this.resetCommand)
+            .execute(this.addCommand, this.fetchCommand, this.resetCommand)
     }
 
     override fun onError(errorMessage: String) {
         super.onError(errorMessage)
         MaterialAlertDialogBuilder(callingActivity)
-                .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
-                .setMessage("Error occured during the sync operation, " +
-                        "\nPlease check the FAQ for possible reasons why this error might occur." +
-                        callingActivity.resources.getString(R.string.jgit_error_dialog_text) +
-                        errorMessage)
-                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> }
-                .show()
+            .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
+            .setMessage("Error occured during the sync operation, " +
+                "\nPlease check the FAQ for possible reasons why this error might occur." +
+                callingActivity.resources.getString(R.string.jgit_error_dialog_text) +
+                errorMessage)
+            .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> }
+            .show()
     }
 }