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

5 files changed, 33 insertions, 28 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt b/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt
index 36d1f8f4..ba6ddd3d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt
@@ -61,11 +61,11 @@ object BiometricAuthenticator {
         }
         val biometricPrompt = BiometricPrompt(activity, { handler.post(it) }, authCallback)
         val promptInfo = BiometricPrompt.PromptInfo.Builder()
-                .setTitle(activity.getString(dialogTitleRes))
-                .setDeviceCredentialAllowed(true)
-                .build()
+            .setTitle(activity.getString(dialogTitleRes))
+            .setDeviceCredentialAllowed(true)
+            .build()
         if (BiometricManager.from(activity).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS ||
-                activity.getSystemService<KeyguardManager>()?.isDeviceSecure == true) {
+            activity.getSystemService<KeyguardManager>()?.isDeviceSecure == true) {
             biometricPrompt.authenticate(promptInfo)
         } else {
             callback(Result.HardwareUnavailableOrDisabled)
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt b/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
index 5e987f22..ed91eede 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/Extensions.kt
@@ -36,11 +36,11 @@ fun Context.getEncryptedPrefs(fileName: String): SharedPreferences {
     val keyGenParameterSpec = MasterKeys.AES256_GCM_SPEC
     val masterKeyAlias = MasterKeys.getOrCreate(keyGenParameterSpec)
     return EncryptedSharedPreferences.create(
-            fileName,
-            masterKeyAlias,
-            this,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        fileName,
+        masterKeyAlias,
+        this,
+        EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+        EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
     )
 }
 
@@ -55,7 +55,7 @@ fun <T : View> AlertDialog.requestInputFocusOnView(@IdRes id: Int) {
             setOnFocusChangeListener { v, _ ->
                 v.post {
                     context.getSystemService<InputMethodManager>()
-                            ?.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT)
+                        ?.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT)
                 }
             }
             requestFocus()
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java b/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java
index 21326ed0..07f73423 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java
@@ -4,24 +4,28 @@
  */
 package com.zeapo.pwdstore.utils;
 
+import org.apache.commons.codec.binary.Base32;
+
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base32;
+
 import timber.log.Timber;
 
 public class Otp {
 
     private static final Base32 BASE_32 = new Base32();
 
-    private Otp() {}
+    private Otp() {
+    }
 
     public static String calculateCode(
-            String secret, long counter, String algorithm, String digits) {
+        String secret, long counter, String algorithm, String digits) {
         String[] steam = {
             "2", "3", "4", "5", "6", "7", "8", "9", "B", "C", "D", "F", "G", "H", "J", "K", "M",
             "N", "P", "Q", "R", "T", "V", "W", "X", "Y"
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt
index c0b68139..903f6402 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt
@@ -14,14 +14,15 @@ data class PasswordItem(
     val file: File,
     val rootDir: File
 ) : Comparable<PasswordItem> {
+
     val fullPathToParent = file.absolutePath
-            .replace(rootDir.absolutePath, "")
-            .replace(file.name, "")
+        .replace(rootDir.absolutePath, "")
+        .replace(file.name, "")
 
     val longName = PgpActivity.getLongName(
-            fullPathToParent,
-            rootDir.absolutePath,
-            toString())
+        fullPathToParent,
+        rootDir.absolutePath,
+        toString())
 
     override fun equals(other: Any?): Boolean {
         return (other is PasswordItem) && (other.file == file)
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
index b2367431..ccbf179e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
@@ -8,9 +8,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import java.io.File
-import java.io.FileFilter
-import java.util.Comparator
 import org.apache.commons.io.filefilter.FileFilterUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.Repository
@@ -18,6 +15,9 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 import org.eclipse.jgit.transport.RefSpec
 import org.eclipse.jgit.transport.RemoteConfig
 import org.eclipse.jgit.transport.URIish
+import java.io.File
+import java.io.FileFilter
+import java.util.Comparator
 
 open class PasswordRepository protected constructor() {
 
@@ -26,7 +26,7 @@ open class PasswordRepository protected constructor() {
 
         FOLDER_FIRST(Comparator { p1: PasswordItem, p2: PasswordItem ->
             (p1.type + p1.name)
-                    .compareTo(p2.type + p2.name, ignoreCase = true)
+                .compareTo(p2.type + p2.name, ignoreCase = true)
         }),
 
         INDEPENDENT(Comparator { p1: PasswordItem, p2: PasswordItem ->
@@ -62,8 +62,8 @@ open class PasswordRepository protected constructor() {
                 val builder = FileRepositoryBuilder()
                 try {
                     repository = builder.setGitDir(localDir)
-                            .readEnvironment()
-                            .build()
+                        .readEnvironment()
+                        .build()
                 } catch (e: Exception) {
                     e.printStackTrace()
                     return null
@@ -81,8 +81,8 @@ open class PasswordRepository protected constructor() {
             if (repository != null) {
                 // Check if remote exists
                 return repository!!.config.getSubsections("remote").isNotEmpty() &&
-                        repository!!.objectDatabase.exists() &&
-                        repository!!.allRefs.isNotEmpty()
+                    repository!!.objectDatabase.exists() &&
+                    repository!!.allRefs.isNotEmpty()
             }
             return false
         }
@@ -196,9 +196,9 @@ open class PasswordRepository protected constructor() {
             if (path == null || !path.exists()) return ArrayList()
 
             val directories = (path.listFiles(FileFilterUtils.directoryFileFilter() as FileFilter)
-                    ?: emptyArray()).toList()
+                ?: emptyArray()).toList()
             val files = (path.listFiles(FileFilterUtils.suffixFileFilter(".gpg") as FileFilter)
-                    ?: emptyArray()).toList()
+                ?: emptyArray()).toList()
 
             val items = ArrayList<File>()
             items.addAll(directories)