From b7e6b4c28a2dc1a14aebfadf7c6aabb29f96d0dc Mon Sep 17 00:00:00 2001 From: beerpsi <92439990+beerpiss@users.noreply.github.com> Date: Tue, 17 Jan 2023 09:59:07 +0700 Subject: [PATCH] [MyAnimeList] Handle cases where my_list_status.status is not present (#8931) --- .../kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt | 2 +- .../tachiyomi/data/track/myanimelist/MyAnimeListModels.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt index 4ac3884a4a..ecbb8449c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt @@ -208,7 +208,7 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI val obj = response.jsonObject return track.apply { val isRereading = obj["is_rereading"]!!.jsonPrimitive.boolean - status = if (isRereading) MyAnimeList.REREADING else getStatus(obj["status"]!!.jsonPrimitive.content) + status = if (isRereading) MyAnimeList.REREADING else getStatus(obj["status"]?.jsonPrimitive?.content) last_chapter_read = obj["num_chapters_read"]!!.jsonPrimitive.float score = obj["score"]!!.jsonPrimitive.int.toFloat() obj["start_date"]?.let { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListModels.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListModels.kt index 70401313cd..dea4231b30 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListModels.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListModels.kt @@ -24,7 +24,7 @@ fun Track.toMyAnimeListStatus() = when (status) { else -> null } -fun getStatus(status: String) = when (status) { +fun getStatus(status: String?) = when (status) { "reading" -> MyAnimeList.READING "completed" -> MyAnimeList.COMPLETED "on_hold" -> MyAnimeList.ON_HOLD