From 2de87f8d29e5c65b5064c45b799cc070c163a27a Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:57:54 -0400
Subject: [PATCH] Cleanup

---
 .../main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt | 4 ++--
 app/src/main/java/exh/util/LewdMangaChecker.kt               | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
index daba3090b..cabeaff87 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
@@ -265,12 +265,12 @@ class MangaPresenter(
             manga.author = author?.trimOrNull()
             manga.artist = artist?.trimOrNull()
             manga.description = description?.trimOrNull()
-            val tagsString = tags?.joinToString(", ")
+            val tagsString = tags?.joinToString()
             manga.genre = if (tags.isNullOrEmpty()) null else tagsString?.trim()
             LocalSource(downloadManager.context).updateMangaInfo(manga)
             db.updateMangaInfo(manga).executeAsBlocking()
         } else {
-            val genre = if (!tags.isNullOrEmpty() && tags.joinToString(", ") != manga.genre) {
+            val genre = if (!tags.isNullOrEmpty() && tags.joinToString() != manga.genre) {
                 tags.toTypedArray()
             } else {
                 null
diff --git a/app/src/main/java/exh/util/LewdMangaChecker.kt b/app/src/main/java/exh/util/LewdMangaChecker.kt
index 0264add3f..0b1238e04 100644
--- a/app/src/main/java/exh/util/LewdMangaChecker.kt
+++ b/app/src/main/java/exh/util/LewdMangaChecker.kt
@@ -5,12 +5,11 @@ import eu.kanade.tachiyomi.source.SourceManager
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
 import exh.NHENTAI_SOURCE_ID
-import java.util.Locale
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 fun Manga.isLewd(): Boolean {
-    val sourceName = Injekt.get<SourceManager>().getOrStub(source).name
+    val sourceName = Injekt.get<SourceManager>().get(source)?.name
     val currentTags = getGenres() ?: emptyList()
 
     if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source == NHENTAI_SOURCE_ID) {
@@ -19,7 +18,7 @@ fun Manga.isLewd(): Boolean {
 
     return source in 6905L..6913L ||
         // source in lewdDelegatedSourceIds ||
-        isHentaiSource(sourceName) ||
+        (sourceName != null && isHentaiSource(sourceName)) ||
         currentTags.any { tag -> isHentaiTag(tag) }
 }