diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index ab690a982..75fd7d71c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -284,7 +284,7 @@ class LibraryUpdateService( val trackingExtra = intent.getStringExtra(KEY_GROUP_EXTRA)?.toIntOrNull() ?: -1 libraryManga.filter { val loggedServices = trackManager.services.filter { it.isLogged } - val status: String = { + val status: String = run { val tracks = db.getTracks(it).executeAsBlocking() val track = tracks.find { track -> loggedServices.any { it.id == track?.sync_id } @@ -295,7 +295,7 @@ class LibraryUpdateService( } else { "not tracked" } - }() + } trackManager.mapTrackingOrder(status, applicationContext) == trackingExtra } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt index 85fb4c1f5..d93083391 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt @@ -69,10 +69,10 @@ class MergedSource : SuspendHttpSource() { val mergedManga = db.getManga(manga.url, id).await() ?: throw Exception("merged manga not in db") val mangaReferences = mergedManga.id?.let { withContext(Dispatchers.IO) { db.getMergedMangaReferences(it).await() } } ?: throw Exception("merged manga id is null") if (mangaReferences.isEmpty()) throw IllegalArgumentException("Manga references are empty, info unavailable, merge is likely corrupted") - if (mangaReferences.size == 1 || { + if (mangaReferences.size == 1 || run { val mangaReference = mangaReferences.firstOrNull() mangaReference == null || (mangaReference.mangaSourceId == MERGED_SOURCE_ID) - }() + } ) throw IllegalArgumentException("Manga references contain only the merged reference, merge is likely corrupted") emit( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index cbc7a1046..d255b78c1 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -684,7 +684,7 @@ class LibraryPresenter( libraryManga.forEach { libraryItem -> when (groupType) { LibraryGroup.BY_TRACK_STATUS -> { - val status: String = { + val status: String = run { val tracks = db.getTracks(libraryItem.manga).executeAsBlocking() val track = tracks.find { track -> loggedServices.any { it.id == track?.sync_id } @@ -695,7 +695,7 @@ class LibraryPresenter( } else { "not tracked" } - }() + } val group = grouping.find { it.first == trackManager.mapTrackingOrder(status, context).toString() } if (group != null) { map[group.second]?.plusAssign(libraryItem) ?: map.put(group.second, mutableListOf(libraryItem)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt index b6de5e9a9..80cc5f0a4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt @@ -35,7 +35,7 @@ object SettingsSearchHelper { * All subclasses of `SettingsController` should be listed here, in order to have their preferences searchable. */ // SY --> - private val settingControllersList: List> = { + private val settingControllersList: List> = run { val controllers = mutableListOf( SettingsAdvancedController::class, SettingsBackupController::class, @@ -55,7 +55,7 @@ object SettingsSearchHelper { controllers += SettingsEhController::class } controllers - }() + } // SY <-- /**