From 21240cad066b2f6c96a1b66df5db2b780a73130f Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 11 Mar 2021 22:39:46 -0500
Subject: [PATCH] Cleanup

---
 .../tachiyomi/data/library/LibraryUpdateService.kt     |  4 ++--
 .../eu/kanade/tachiyomi/extension/ExtensionManager.kt  | 10 +++++-----
 app/src/main/java/exh/md/handlers/FollowsHandler.kt    | 10 +++-------
 3 files changed, 10 insertions(+), 14 deletions(-)

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 af94c14fa..1d9333037 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
@@ -41,7 +41,7 @@ import eu.kanade.tachiyomi.util.system.createFileInCacheDir
 import eu.kanade.tachiyomi.util.system.isServiceRunning
 import exh.md.utils.FollowStatus
 import exh.md.utils.MdUtil
-import exh.metadata.metadata.base.insertFlatMetadata
+import exh.metadata.metadata.base.insertFlatMetadataAsync
 import exh.source.LIBRARY_UPDATE_EXCLUDED_SOURCES
 import exh.source.MERGED_SOURCE_ID
 import exh.source.getMainSource
@@ -569,7 +569,7 @@ class LibraryUpdateService(
                 val id = db.insertManga(dbManga).executeOnIO().insertedId()
                 if (id != null) {
                     metadata.mangaId = id
-                    db.insertFlatMetadata(metadata.flatten()).await()
+                    db.insertFlatMetadataAsync(metadata.flatten()).await()
                 }
             }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
index 6d46200d8..24c70897d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
@@ -156,11 +156,11 @@ class ExtensionManager(
     // EXH -->
     private fun <T : Extension> Iterable<T>.filterNotBlacklisted(): List<T> {
         val blacklistEnabled = preferences.enableSourceBlacklist().get()
-        return filter {
-            if (it.isBlacklisted(blacklistEnabled)) {
-                xLogD("Removing blacklisted extension: (name: %s, pkgName: %s)!", it.name, it.pkgName)
-                false
-            } else true
+        return filterNot { extension ->
+            extension.isBlacklisted(blacklistEnabled)
+                .also {
+                    if (it) xLogD("Removing blacklisted extension: (name: %s, pkgName: %s)!", extension.name, extension.pkgName)
+                }
         }
     }
 
diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt
index be689acf5..7038c9273 100644
--- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt
+++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt
@@ -203,15 +203,11 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
      */
     suspend fun fetchAllFollows(forceHd: Boolean): List<Pair<SManga, MangaDexSearchMetadata>> {
         return withIOContext {
-            val listManga = mutableListOf<Pair<SManga, MangaDexSearchMetadata>>()
             val response = client.newCall(followsListRequest()).await()
             val mangasPage = followsParseMangaPage(response, forceHd)
-            listManga.addAll(
-                mangasPage.mangas.mapIndexed { index, sManga ->
-                    sManga to mangasPage.mangasMetadata[index] as MangaDexSearchMetadata
-                }
-            )
-            listManga
+            mangasPage.mangas.mapIndexed { index, sManga ->
+                sManga to mangasPage.mangasMetadata[index] as MangaDexSearchMetadata
+            }
         }
     }