From e963aeaece8d276ac21665513a711798f04709ea Mon Sep 17 00:00:00 2001
From: Thore Goebel <goebel.thore@gmail.com>
Date: Sun, 14 Apr 2024 18:19:11 +0200
Subject: [PATCH] Make ktlint happy

For the record: I strongly find the trailing && and ||
less readable than the leading version.
But if that's what the Kotlin folks want :shrug:.
---
 .../main/java/org/fdroid/repo/RepoAdder.kt    | 25 +++++++++----------
 .../java/org/fdroid/repo/RepoAdderTest.kt     |  3 ++-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt b/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
index 480b89c7b..89a07479f 100644
--- a/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
+++ b/libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
@@ -62,22 +62,21 @@ public class Fetching(
     /**
      * true if the repository can be added (be it as new [Repository] or new mirror).
      */
-    public val canAdd: Boolean = repo != null
-            && fetchResult != null
-            && fetchResult !is FetchResult.IsExistingRepository
-            && fetchResult !is FetchResult.IsExistingMirror
+    public val canAdd: Boolean = repo != null &&
+        fetchResult != null &&
+        fetchResult !is FetchResult.IsExistingRepository &&
+        fetchResult !is FetchResult.IsExistingMirror
 
-    public val isMirror: Boolean = repo != null
-            && fetchResult != null
-            && (
-                fetchResult is FetchResult.IsNewMirror
-                    || fetchResult is FetchResult.IsExistingMirror
-                    || fetchResult is FetchResult.IsNewRepoAndNewMirror
+    public val isMirror: Boolean = repo != null &&
+        fetchResult != null &&
+        (fetchResult is FetchResult.IsNewMirror ||
+            fetchResult is FetchResult.IsExistingMirror ||
+            fetchResult is FetchResult.IsNewRepoAndNewMirror
             )
 
     override fun toString(): String {
         return "Fetching(fetchUrl=$fetchUrl, repo=${repo?.address}, apps=${apps.size}, " +
-                "fetchResult=$fetchResult, done=$done, canAdd=$canAdd)"
+            "fetchResult=$fetchResult, done=$done, canAdd=$canAdd)"
     }
 }
 
@@ -244,8 +243,8 @@ internal class RepoAdder(
         val existingRepo = repositoryDao.getRepository(cert)
 
         return if (existingRepo == null) {
-            val isUserMirror = url.trimEnd('/') != repo.address.trimEnd('/')
-                    && repo.mirrors.find { url.trimEnd('/') == it.url.trimEnd('/') } == null
+            val isUserMirror = url.trimEnd('/') != repo.address.trimEnd('/') &&
+                repo.mirrors.find { url.trimEnd('/') == it.url.trimEnd('/') } == null
             if (isUserMirror) {
                 FetchResult.IsNewRepoAndNewMirror
             } else {
diff --git a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
index ddf817c0b..11a227b34 100644
--- a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
+++ b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
@@ -359,7 +359,8 @@ internal class RepoAdderTest {
         every { repoDao.getRepository(any<String>()) } returns existingRepo
 
         val expectedFetchResult =
-            if (existingRepo.address == url) FetchResult.IsExistingRepository else FetchResult.IsExistingMirror
+            if (existingRepo.address == url) FetchResult.IsExistingRepository
+            else FetchResult.IsExistingMirror
 
         expectMinRepoPreview(repoName, expectedFetchResult, canAdd = false) {
             repoAdder.fetchRepository(url = downloadUrl, proxy = null)