SY linting

app/src/main/java/exh/GalleryAdder.kt

@@ -66,8 +66,11 @@ class GalleryAdder(
             // Find matching source
             val source = if (forceSource != null) {
                 try {
-                    if (forceSource.matchesUri(uri)) forceSource
-                    else return GalleryAddEvent.Fail.UnknownSource(url, context)
+                    if (forceSource.matchesUri(uri)) {
+                        forceSource
+                    } else {
+                        return GalleryAddEvent.Fail.UnknownSource(url, context)
+                    }
                 } catch (e: Exception) {
                     logger.e(context.getString(R.string.gallery_adder_source_uri_must_match), e)
                     return GalleryAddEvent.Fail.UnknownType(url, context)
@@ -98,11 +101,15 @@ class GalleryAdder(
                     logger.e(context.getString(R.string.gallery_adder_uri_clean_error), e)
                     null
                 }
-            } else null
+            } else {
+                null
+            }
 
             val chapterMangaUrl = if (realChapterUrl != null) {
                 source.mapChapterUrlToMangaUrl(realChapterUrl.toUri())
-            } else null
+            } else {
+                null
+            }
 
             // Map URL to manga URL
             val realMangaUrl = try {

app/src/main/java/exh/debug/DebugToggles.kt

@@ -20,7 +20,8 @@ enum class DebugToggles(val default: Boolean) {
     RESTRICT_EXH_GALLERY_UPDATE_CHECK_FREQUENCY(true),
 
     // Pretend that all galleries only have a single version
-    INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS(false);
+    INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS(false),
+    ;
 
     private val prefKey = "eh_debug_toggle_${name.lowercase(Locale.US)}"
 

app/src/main/java/exh/debug/SettingsDebugController.kt

@@ -162,7 +162,9 @@ class SettingsDebugController : BasicFullComposeController() {
                             .capitalize(Locale.getDefault()),
                         subtitleAnnotated = if (pref.value != default) {
                             AnnotatedString("MODIFIED", SpanStyle(color = Color.Red))
-                        } else null,
+                        } else {
+                            null
+                        },
                     )
                 }
                 item {

app/src/main/java/exh/eh/EHentaiUpdateHelper.kt

@@ -172,7 +172,9 @@ class EHentaiUpdateHelper(context: Context) {
                 ?.takeIf { it.chapterId != chapter.id && it.readAt != null }
             if (newHistory != null) {
                 HistoryUpdate(chapter.id, newHistory.readAt!!, newHistory.readDuration)
-            } else null
+            } else {
+                null
+            }
         }
         val currentChapterIds = currentChapters.map { it.id }
         val historyToDelete = chainsAsHistory.filterNot { it.chapterId in currentChapterIds }
@@ -207,7 +209,9 @@ class EHentaiUpdateHelper(context: Context) {
                                 lastPageRead = lastPageRead,
                                 bookmark = bookmark,
                             )
-                        } else it
+                        } else {
+                            it
+                        }
                     }
                 } else {
                     new = true
@@ -220,7 +224,9 @@ class EHentaiUpdateHelper(context: Context) {
                         bookmark = chapter.bookmark,
                         lastPageRead = if (newLastPageRead != null && chapter.lastPageRead <= 0) {
                             newLastPageRead
-                        } else chapter.lastPageRead,
+                        } else {
+                            chapter.lastPageRead
+                        },
                         dateFetch = chapter.dateFetch,
                         dateUpload = chapter.dateUpload,
                         chapterNumber = -1F,

app/src/main/java/exh/log/EHLogLevel.kt

@@ -9,7 +9,8 @@ import eu.kanade.tachiyomi.data.preference.PreferenceKeys
 enum class EHLogLevel(@StringRes val nameRes: Int, @StringRes val description: Int) {
     MINIMAL(R.string.log_minimal, R.string.log_minimal_desc),
     EXTRA(R.string.log_extra, R.string.log_extra_desc),
-    EXTREME(R.string.log_extreme, R.string.log_extreme_desc);
+    EXTREME(R.string.log_extreme, R.string.log_extreme_desc),
+    ;
 
     companion object {
         private var curLogLevel: Int? = null

app/src/main/java/exh/md/handlers/ApiMangaParser.kt

@@ -49,7 +49,9 @@ class ApiMangaParser(
         val metadata = if (mangaId != null) {
             val flatMetadata = getFlatMetadataById.await(mangaId)
             flatMetadata?.raise(metaClass) ?: newMetaInstance()
-        } else newMetaInstance()
+        } else {
+            newMetaInstance()
+        }
 
         parseIntoMetadata(metadata, input, simpleChapters, statistics)
         if (mangaId != null) {
@@ -253,7 +255,9 @@ class ApiMangaParser(
             .map {
                 if (it == "no group") {
                     "No Group"
-                } else it
+                } else {
+                    it
+                }
             }
             .toSet()
             .ifEmpty { setOf("No Group") }

app/src/main/java/exh/md/utils/FollowStatus.kt

@@ -9,7 +9,8 @@ enum class FollowStatus(val int: Int) {
     ON_HOLD(3),
     PLAN_TO_READ(4),
     DROPPED(5),
-    RE_READING(6);
+    RE_READING(6),
+    ;
 
     fun toDex(): String = this.name.lowercase(Locale.US)
 

app/src/main/java/exh/md/utils/MangaDexRelation.kt

@@ -20,7 +20,8 @@ enum class MangaDexRelation(@StringRes val resId: Int, val mdString: String?) {
     PRESERIALIZATION(R.string.relation_preserialization, "preserialization"),
     COLORED(R.string.relation_colored, "colored"),
     SERIALIZATION(R.string.relation_serialization, "serialization"),
-    ALTERNATE_VERSION(R.string.relation_alternate_version, "alternate_version");
+    ALTERNATE_VERSION(R.string.relation_alternate_version, "alternate_version"),
+    ;
 
     companion object {
         fun fromDex(mdString: String) = values().find { it.mdString == mdString }

app/src/main/java/exh/md/utils/MdUtil.kt

@@ -291,7 +291,9 @@ class MdUtil {
                 ?: if (originalLanguage == "ja") {
                     langMap["ja-ro"]
                         ?: langMap["jp-ro"]
-                } else null
+                } else {
+                    null
+                }
         }
 
         fun getAltTitle(langMaps: List<Map<String, String>>, currentLang: String, originalLanguage: String): String? {
@@ -300,7 +302,9 @@ class MdUtil {
                 ?: if (originalLanguage == "ja") {
                     langMaps.firstNotNullOfOrNull { it["ja-ro"] }
                         ?: langMaps.firstNotNullOfOrNull { it["jp-ro"] }
-                } else null
+                } else {
+                    null
+                }
         }
 
         fun cdnCoverUrl(dexId: String, fileName: String): String {

app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt

@@ -28,7 +28,9 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
         // Guess thumbnail URL if manga does not have thumbnail URL
         val cover = if (manga.thumbnail_url.isNullOrBlank()) {
             guessThumbnailUrl(hbId.toString())
-        } else null
+        } else {
+            null
+        }
 
         val artist = tags.ofNamespace(ARTIST_NAMESPACE).joinToString { it.name }
 

app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt

@@ -45,7 +45,9 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
             typeToExtension(coverImageType)?.let {
                 "https://t.nhentai.net/galleries/$mediaId/cover.$it"
             }
-        } else null
+        } else {
+            null
+        }
 
         val title = when (preferredTitle) {
             TITLE_TYPE_SHORT -> shortTitle ?: englishTitle ?: japaneseTitle ?: manga.title

app/src/main/java/exh/patch/MangaDexLogin.kt

@@ -40,7 +40,9 @@ val MANGADEX_LOGIN_PATCH: EHInterceptor = { request, response, sourceId ->
                 )
             }
         }
-    } else response
+    } else {
+        response
+    }
 }
 
 val MANGADEX_SOURCE_IDS = listOf(

app/src/main/java/exh/patch/NetworkPatches.kt

@@ -20,8 +20,11 @@ fun OkHttpClient.Builder.injectPatches(sourceIdProducer: () -> Long): OkHttpClie
 
 fun findAndApplyPatches(sourceId: Long): EHInterceptor {
     // TODO make it so captcha doesnt auto open in manga eden while applying universal interceptors
-    return if (Injekt.get<PreferencesHelper>().autoSolveCaptcha().get()) (EH_INTERCEPTORS[sourceId].orEmpty() + EH_INTERCEPTORS[EH_UNIVERSAL_INTERCEPTOR].orEmpty()).merge()
-    else EH_INTERCEPTORS[sourceId].orEmpty().merge()
+    return if (Injekt.get<PreferencesHelper>().autoSolveCaptcha().get()) {
+        (EH_INTERCEPTORS[sourceId].orEmpty() + EH_INTERCEPTORS[EH_UNIVERSAL_INTERCEPTOR].orEmpty()).merge()
+    } else {
+        EH_INTERCEPTORS[sourceId].orEmpty().merge()
+    }
 }
 
 fun List<EHInterceptor>.merge(): EHInterceptor {

app/src/main/java/exh/patch/UniversalCaptchaDetection.kt

@@ -19,5 +19,7 @@ val CAPTCHA_DETECTION_PATCH: EHInterceptor = { request, response, sourceId ->
                 )
             }
         }
-    } else response
+    } else {
+        response
+    }
 }

app/src/main/java/exh/search/SearchEngine.kt

@@ -84,7 +84,9 @@ class SearchEngine {
                         textToSubQueries(component.namespace, null)
                     }
                 }
-            } else error("Unknown query component!")
+            } else {
+                error("Unknown query component!")
+            }
 
             if (query != null) {
                 (if (component.excluded) exclude else include) += query

app/src/main/java/exh/smartsearch/SmartSearchEngine.kt

@@ -34,7 +34,9 @@ class SmartSearchEngine(
                 async(Dispatchers.Default) {
                     val builtQuery = if (extraSearchParams != null) {
                         "$query ${extraSearchParams.trim()}"
-                    } else query
+                    } else {
+                        query
+                    }
 
                     val searchResults = source.fetchSearchManga(1, builtQuery, FilterList()).awaitSingle()
 
@@ -56,7 +58,9 @@ class SmartSearchEngine(
         val eligibleManga = supervisorScope {
             val searchQuery = if (extraSearchParams != null) {
                 "$title ${extraSearchParams.trim()}"
-            } else title
+            } else {
+                title
+            }
             val searchResults = source.fetchSearchManga(1, searchQuery, FilterList()).awaitSingle()
 
             if (searchResults.mangas.size == 1) {

app/src/main/java/exh/uconfig/EhUConfigBuilder.kt

@@ -82,7 +82,8 @@ object Entry {
     enum class UseHentaiAtHome(override val value: String) : ConfigItem {
         ANY("0"),
         DEFAULTONLY("1"),
-        NO("2");
+        NO("2"),
+        ;
 
         override val key = "uh"
     }
@@ -94,7 +95,8 @@ object Entry {
         `1600`("4"),
         `1280`("3"),
         `980`("2"),
-        `780`("1");
+        `780`("1"),
+        ;
 
         override val key = "xr"
     }
@@ -102,7 +104,8 @@ object Entry {
 
     enum class TitleDisplayLanguage(override val value: String) : ConfigItem {
         DEFAULT("0"),
-        JAPANESE("1");
+        JAPANESE("1"),
+        ;
 
         override val key = "tl"
     }
@@ -118,7 +121,8 @@ object Entry {
         `25`("0"),
         `50`("1"),
         `100`("2"),
-        `200`("3");
+        `200`("3"),
+        ;
 
         override val key = "rc"
     }
@@ -127,7 +131,8 @@ object Entry {
         `4`("0"),
         `10`("1"),
         `20`("2"),
-        `40`("3");
+        `40`("3"),
+        ;
 
         override val key = "tr"
     }
@@ -135,7 +140,8 @@ object Entry {
 
     enum class UseOriginalImages(override val value: String) : ConfigItem {
         NO("0"),
-        YES("1");
+        YES("1"),
+        ;
 
         override val key = "oi"
     }

app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt

@@ -76,7 +76,9 @@ class BrowserActionActivity : AppCompatActivity() {
                         NoopActionCompletionVerifier(it)
                     }
                 }
-        } else null
+        } else {
+            null
+        }
 
         @Suppress("UNCHECKED_CAST")
         val headers = (
@@ -94,7 +96,9 @@ class BrowserActionActivity : AppCompatActivity() {
         @Suppress("NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE", "UNCHECKED_CAST")
         val verifyComplete: ((String) -> Boolean)? = if (source != null) {
             source::verifyComplete!!
-        } else intent.getSerializableExtraCompat(VERIFY_LAMBDA_EXTRA)
+        } else {
+            intent.getSerializableExtraCompat(VERIFY_LAMBDA_EXTRA)
+        }
 
         if (verifyComplete == null || url == null) {
             finish()
@@ -105,7 +109,9 @@ class BrowserActionActivity : AppCompatActivity() {
 
         binding.toolbar.title = if (source != null) {
             "${source.name}: $actionStr"
-        } else actionStr
+        } else {
+            actionStr
+        }
 
         val parsedUrl = URL(url)
 

app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt

@@ -39,7 +39,9 @@ fun PervEdenDescription(state: MangaScreenState.Success, openMetadataViewer: ()
             binding.language.text = if (language != null) {
                 val local = Locale(language)
                 local.displayName
-            } else context.getString(R.string.unknown)
+            } else {
+                context.getString(R.string.unknown)
+            }
 
             binding.ratingBar.rating = meta.rating ?: 0F
             @SuppressLint("SetTextI18n")

app/src/main/java/exh/util/DataSaver.kt

@@ -55,7 +55,9 @@ private class DataSaverImpl(preferences: PreferencesHelper) : DataSaver {
                 imageUrl.contains(".gif", true) -> if (ignoreGif) imageUrl else getUrl(imageUrl)
                 else -> getUrl(imageUrl)
             }
-        } else imageUrl
+        } else {
+            imageUrl
+        }
     }
 
     private fun getUrl(imageUrl: String): String {

app/src/main/java/exh/util/MangaType.kt

@@ -80,7 +80,9 @@ fun DomainManga.mangaType(sourceName: String? = Injekt.get<SourceManager>().get(
 fun Manga.defaultReaderType(type: MangaType = mangaType()): Int? {
     return if (type == MangaType.TYPE_MANHWA || type == MangaType.TYPE_WEBTOON) {
         ReadingModeType.WEBTOON.prefValue
-    } else null
+    } else {
+        null
+    }
 }
 
 private fun isMangaTag(tag: String): Boolean {
@@ -184,5 +186,5 @@ enum class MangaType {
     TYPE_MANHWA,
     TYPE_MANHUA,
     TYPE_COMIC,
-    TYPE_WEBTOON
+    TYPE_WEBTOON,
 }

app/src/main/java/exh/util/OkHttpUtil.kt

@@ -26,5 +26,7 @@ fun Response.interceptAsHtml(block: (Document) -> Unit): Response {
         }
 
         rebuiltResponse
-    } else this
+    } else {
+        this
+    }
 }

app/src/main/java/exh/util/SourceTagsUtil.kt

@@ -41,8 +41,12 @@ object SourceTagsUtil {
                     TSUMINO_SOURCE_ID -> wrapTagTsumino(parsed.namespace, parsed.name.substringBefore('|').trim())
                     else -> wrapTag(parsed.namespace, parsed.name.substringBefore('|').trim())
                 }
-            } else null
-        } else null
+            } else {
+                null
+            }
+        } else {
+            null
+        }
     }
 
     private fun wrapTag(namespace: String, tag: String) = if (tag.contains(spaceRegex)) {
@@ -103,7 +107,8 @@ object SourceTagsUtil {
         IMAGE_SET_COLOR("#3f51b5"),
         COSPLAY_COLOR("#9c27b0"),
         ASIAN_PORN_COLOR("#9575cd"),
-        MISC_COLOR("#f06292");
+        MISC_COLOR("#f06292"),
+        ;
 
         constructor(color: String) : this(Color.parseColor(color))
     }