Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against null chapterJson for isOneshot check (#810) 

Guard against null chapterJson for isOneshot check
This commit is contained in:
FlaminSarge 2019-02-11 04:29:19 -08:00 committed by Carlos
parent 5140c6b735
commit 279fb5ea24
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = 'all.mangadex'
extClass = '.MangadexFactory'
extVersionCode = 46
extVersionCode = 47
libVersion = '1.2'
}

6
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
View File

@ -287,9 +287,9 @@ open class Mangadex(override val lang: String, private val internalLang: String,
manga.artist = mangaJson.get("artist").string
val status = mangaJson.get("status").int
val finalChapterNumber = getFinalChapter(mangaJson)
if ((status == 2 || status == 3) && chapterJson != null && isMangaCompleted(finalChapterNumber, chapterJson)) {
if ((status == 2 || status == 3) && chapterJson != null && isMangaCompleted(chapterJson, finalChapterNumber)) {
manga.status = SManga.COMPLETED
} else if (status == 2 && isOneshot(chapterJson, finalChapterNumber)){
} else if (status == 2 && chapterJson != null && isOneshot(chapterJson, finalChapterNumber)){
manga.status = SManga.COMPLETED
} else {
manga.status = parseStatus(status)
@ -334,7 +334,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
}
}
private fun isMangaCompleted(finalChapterNumber: String, chapterJson: JsonObject): Boolean {
private fun isMangaCompleted(chapterJson: JsonObject, finalChapterNumber: String): Boolean {
val count = chapterJson.entrySet()
.filter { it -> it.value.asJsonObject.get("lang_code").string == internalLang }
.filter { it -> doesFinalChapterExist(finalChapterNumber, it.value) }.count()