all: reformat with Spotless again

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

4 files changed, 48 insertions, 14 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
index ac4c400d..b9bfd911 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt
@@ -116,7 +116,8 @@ abstract class BaseGitActivity : ContinuationContainerActivity() {
           "Your local repository appears to be an incomplete Git clone, please delete and re-clone from settings"
         )
       }
-      err is TransportException && err.disconnectReason == DisconnectReason.HOST_KEY_NOT_VERIFIABLE -> {
+      err is TransportException &&
+        err.disconnectReason == DisconnectReason.HOST_KEY_NOT_VERIFIABLE -> {
         SSHException(
           DisconnectReason.HOST_KEY_NOT_VERIFIABLE,
           "WARNING: The remote host key has changed. If this is expected, please go to Git server settings and clear the saved host key."
@@ -135,7 +136,9 @@ abstract class BaseGitActivity : ContinuationContainerActivity() {
   private fun isExplicitlyUserInitiatedError(throwable: Throwable): Boolean {
     var cause: Throwable? = throwable
     while (cause != null) {
-      if (cause is SSHException && cause.disconnectReason == DisconnectReason.AUTH_CANCELLED_BY_USER) return true
+      if (cause is SSHException && cause.disconnectReason == DisconnectReason.AUTH_CANCELLED_BY_USER
+      )
+        return true
       cause = cause.cause
     }
     return false
@@ -154,7 +157,8 @@ abstract class BaseGitActivity : ContinuationContainerActivity() {
     while ((rootCause is org.eclipse.jgit.errors.TransportException ||
       rootCause is org.eclipse.jgit.api.errors.TransportException ||
       rootCause is org.eclipse.jgit.api.errors.InvalidRemoteException ||
-      (rootCause is UserAuthException && rootCause.message == "Exhausted available authentication methods"))) {
+      (rootCause is UserAuthException &&
+        rootCause.message == "Exhausted available authentication methods"))) {
       rootCause = rootCause.cause ?: break
     }
     return rootCause
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 a1125ef0..faaf426f 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
@@ -55,7 +55,12 @@ class GitConfigActivity : BaseGitActivity() {
       } else {
         GitSettings.authorEmail = email
         GitSettings.authorName = name
-        Snackbar.make(binding.root, getString(R.string.git_server_config_save_success), Snackbar.LENGTH_SHORT).show()
+        Snackbar.make(
+            binding.root,
+            getString(R.string.git_server_config_save_success),
+            Snackbar.LENGTH_SHORT
+          )
+          .show()
         Handler(Looper.getMainLooper()).postDelayed(500) { finish() }
       }
     }
@@ -77,7 +82,8 @@ class GitConfigActivity : BaseGitActivity() {
     if (repo != null) {
       binding.gitHeadStatus.text = headStatusMsg(repo)
       // enable the abort button only if we're rebasing or merging
-      val needsAbort = repo.repositoryState.isRebasing || repo.repositoryState == RepositoryState.MERGING
+      val needsAbort =
+        repo.repositoryState.isRebasing || repo.repositoryState == RepositoryState.MERGING
       binding.gitAbortRebase.isEnabled = needsAbort
       binding.gitAbortRebase.alpha = if (needsAbort) 1.0f else 0.5f
     }
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 372d5863..cab8d3ae 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
@@ -89,7 +89,12 @@ class GitServerConfigActivity : BaseGitActivity() {
     binding.clearHostKeyButton.isVisible = GitSettings.hasSavedHostKey()
     binding.clearHostKeyButton.setOnClickListener {
       GitSettings.clearSavedHostKey()
-      Snackbar.make(binding.root, getString(R.string.clear_saved_host_key_success), Snackbar.LENGTH_LONG).show()
+      Snackbar.make(
+          binding.root,
+          getString(R.string.clear_saved_host_key_success),
+          Snackbar.LENGTH_LONG
+        )
+        .show()
       it.isVisible = false
     }
     binding.saveButton.setOnClickListener {
@@ -102,7 +107,9 @@ class GitServerConfigActivity : BaseGitActivity() {
           BasicBottomSheet.Builder(this)
             .setTitleRes(R.string.https_scheme_with_port_title)
             .setMessageRes(R.string.https_scheme_with_port_message)
-            .setPositiveButtonClickListener { binding.serverUrl.setText(newUrl.replace(PORT_REGEX, "/")) }
+            .setPositiveButtonClickListener {
+              binding.serverUrl.setText(newUrl.replace(PORT_REGEX, "/"))
+            }
             .build()
             .show(supportFragmentManager, "SSH_SCHEME_WARNING")
           return@setOnClickListener
@@ -110,7 +117,9 @@ class GitServerConfigActivity : BaseGitActivity() {
           BasicBottomSheet.Builder(this)
             .setTitleRes(R.string.ssh_scheme_needed_title)
             .setMessageRes(R.string.ssh_scheme_needed_message)
-            .setPositiveButtonClickListener { @Suppress("SetTextI18n") binding.serverUrl.setText("ssh://$newUrl") }
+            .setPositiveButtonClickListener {
+              @Suppress("SetTextI18n") binding.serverUrl.setText("ssh://$newUrl")
+            }
             .build()
             .show(supportFragmentManager, "SSH_SCHEME_WARNING")
           return@setOnClickListener
@@ -133,7 +142,12 @@ class GitServerConfigActivity : BaseGitActivity() {
           )
       ) {
         GitSettings.UpdateConnectionSettingsResult.FailedToParseUrl -> {
-          Snackbar.make(binding.root, getString(R.string.git_server_config_save_error), Snackbar.LENGTH_LONG).show()
+          Snackbar.make(
+              binding.root,
+              getString(R.string.git_server_config_save_error),
+              Snackbar.LENGTH_LONG
+            )
+            .show()
         }
         is GitSettings.UpdateConnectionSettingsResult.MissingUsername -> {
           when (updateResult.newProtocol) {
@@ -154,9 +168,14 @@ class GitServerConfigActivity : BaseGitActivity() {
           }
         }
         GitSettings.UpdateConnectionSettingsResult.Valid -> {
-          if (isClone && PasswordRepository.getRepository(null) == null) PasswordRepository.initialize()
+          if (isClone && PasswordRepository.getRepository(null) == null)
+            PasswordRepository.initialize()
           if (!isClone) {
-            Snackbar.make(binding.root, getString(R.string.git_server_config_save_success), Snackbar.LENGTH_SHORT)
+            Snackbar.make(
+                binding.root,
+                getString(R.string.git_server_config_save_success),
+                Snackbar.LENGTH_SHORT
+              )
               .show()
             Handler(Looper.getMainLooper()).postDelayed(500) { finish() }
           } else {
@@ -206,7 +225,9 @@ class GitServerConfigActivity : BaseGitActivity() {
     val localDir = requireNotNull(PasswordRepository.getRepositoryDirectory())
     val localDirFiles = localDir.listFiles() ?: emptyArray()
     // Warn if non-empty folder unless it's a just-initialized store that has just a .git folder
-    if (localDir.exists() && localDirFiles.isNotEmpty() && !(localDirFiles.size == 1 && localDirFiles[0].name == ".git")
+    if (localDir.exists() &&
+        localDirFiles.isNotEmpty() &&
+        !(localDirFiles.size == 1 && localDirFiles[0].name == ".git")
     ) {
       MaterialAlertDialogBuilder(this)
         .setTitle(R.string.dialog_delete_title)
@@ -269,7 +290,9 @@ class GitServerConfigActivity : BaseGitActivity() {
     private val PORT_REGEX = ":[0-9]{1,5}/".toRegex()
 
     fun createCloneIntent(context: Context): Intent {
-      return Intent(context, GitServerConfigActivity::class.java).apply { putExtra("cloning", true) }
+      return Intent(context, GitServerConfigActivity::class.java).apply {
+        putExtra("cloning", true)
+      }
     }
   }
 }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
index 4b29542e..1470d642 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt
@@ -45,7 +45,8 @@ class GitLogAdapter : RecyclerView.Adapter<GitLogAdapter.ViewHolder>() {
 
   override fun getItemCount() = model.size
 
-  class ViewHolder(private val binding: GitLogRowLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
+  class ViewHolder(private val binding: GitLogRowLayoutBinding) :
+    RecyclerView.ViewHolder(binding.root) {
 
     fun bind(commit: GitCommit) =
       with(binding) {