From 61094edeed424b7b3b64816a447bc5360c30a9ef Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 5 Aug 2020 22:46:04 -0400
Subject: [PATCH] Cleanup some code

---
 .../java/eu/kanade/tachiyomi/data/database/models/Manga.kt  | 6 ++++++
 .../java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt    | 6 +++---
 app/src/main/java/exh/util/LewdMangaChecker.kt              | 3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
index 01b51935e..76d6d2cd4 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@@ -32,6 +32,12 @@ interface Manga : SManga {
         return genre?.split(", ")?.map { it.trim() }
     }
 
+    // SY -->
+    fun getOriginalGenres(): List<String>? {
+        return originalGenre?.split(", ")?.map { it.trim() }
+    }
+    // SY <--
+
     private fun setFlags(flag: Int, mask: Int) {
         chapter_flags = chapter_flags and mask.inv() or (flag and mask)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
index e4f86eb79..df3115a77 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@@ -100,7 +100,7 @@ class EditMangaDialog : DialogController {
             view.manga_author.append(manga.author ?: "")
             view.manga_artist.append(manga.artist ?: "")
             view.manga_description.append(manga.description ?: "")
-            view.manga_genres_tags.setChips(manga.genre?.split(",")?.map { it.trim() } ?: emptyList())
+            view.manga_genres_tags.setChips(manga.getGenres())
         } else {
             if (manga.title != manga.originalTitle) {
                 view.title.append(manga.title)
@@ -114,7 +114,7 @@ class EditMangaDialog : DialogController {
             if (manga.description != manga.originalDescription) {
                 view.manga_description.append(manga.description ?: "")
             }
-            view.manga_genres_tags.setChips(manga.genre?.split(",")?.map { it.trim() } ?: emptyList())
+            view.manga_genres_tags.setChips(manga.getGenres())
 
             view.title.hint = "${resources?.getString(R.string.title)}: ${manga.originalTitle}"
             if (manga.originalAuthor != null) {
@@ -147,7 +147,7 @@ class EditMangaDialog : DialogController {
         if (manga.genre.isNullOrBlank() || manga.source == LocalSource.ID) dialogView?.manga_genres_tags?.setChips(
             emptyList()
         )
-        else dialogView?.manga_genres_tags?.setChips(manga.originalGenre?.split(", "))
+        else dialogView?.manga_genres_tags?.setChips(manga.getOriginalGenres())
     }
 
     fun updateCover(uri: Uri) {
diff --git a/app/src/main/java/exh/util/LewdMangaChecker.kt b/app/src/main/java/exh/util/LewdMangaChecker.kt
index e5756d5b2..0264add3f 100644
--- a/app/src/main/java/exh/util/LewdMangaChecker.kt
+++ b/app/src/main/java/exh/util/LewdMangaChecker.kt
@@ -11,8 +11,7 @@ import uy.kohesive.injekt.api.get
 
 fun Manga.isLewd(): Boolean {
     val sourceName = Injekt.get<SourceManager>().getOrStub(source).name
-    val currentTags =
-        genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()
+    val currentTags = getGenres() ?: emptyList()
 
     if (source == EH_SOURCE_ID || source == EXH_SOURCE_ID || source == NHENTAI_SOURCE_ID) {
         return !currentTags.any { tag -> isNonHentaiTag(tag) }