From 426fc924fba28ec898681ad7f7010456554f061e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 9 Jun 2022 13:51:29 +0530
Subject: Upgrade ktfmt (#1942)

* build-logic: upgrade ktfmt

* all: reformat
---
 .../java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt | 15 +++++++++------
 .../aps/ui/git/config/GitServerConfigActivity.kt          |  6 ++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git')

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 e44e3e3c..614d9a52 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
@@ -152,7 +152,8 @@ 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
+      if (
+        cause is SSHException && cause.disconnectReason == DisconnectReason.AUTH_CANCELLED_BY_USER
       )
         return true
       cause = cause.cause
@@ -170,11 +171,13 @@ abstract class BaseGitActivity : ContinuationContainerActivity() {
     // exceptions.
     // Also, SSHJ's UserAuthException about exhausting available authentication methods hides
     // more useful exceptions.
-    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"))) {
+    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 = rootCause.cause ?: break
     }
     return rootCause
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 e713a54e..93f104fb 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
@@ -140,7 +140,8 @@ class GitServerConfigActivity : BaseGitActivity() {
           .show(supportFragmentManager, "SSH_SCHEME_WARNING")
         return@setOnClickListener
       }
-      when (val updateResult =
+      when (
+        val updateResult =
           gitSettings.updateConnectionSettingsIfValid(
             newAuthMode = newAuthMode,
             newUrl = binding.serverUrl.text.toString().trim(),
@@ -230,7 +231,8 @@ 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() &&
+    if (
+      localDir.exists() &&
         localDirFiles.isNotEmpty() &&
         !(localDirFiles.size == 1 && localDirFiles[0].name == ".git")
     ) {
-- 
cgit v1.2.3