From 34acf5bb55aff6eb07ed4c53a7962a7e03ba7977 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 26 Apr 2020 20:25:46 +0300 Subject: [PATCH] Fix json null string --- .../java/org/koitharu/kotatsu/domain/local/MangaIndex.kt | 5 +++-- app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/local/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/domain/local/MangaIndex.kt index 9ae396625..1306dfa24 100644 --- a/app/src/main/java/org/koitharu/kotatsu/domain/local/MangaIndex.kt +++ b/app/src/main/java/org/koitharu/kotatsu/domain/local/MangaIndex.kt @@ -7,6 +7,7 @@ import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.core.model.MangaChapter import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.core.model.MangaTag +import org.koitharu.kotatsu.utils.ext.getStringOrNull import org.koitharu.kotatsu.utils.ext.map import org.koitharu.kotatsu.utils.ext.safe @@ -44,12 +45,12 @@ class MangaIndex(source: String?) { Manga( id = json.getLong("id"), title = json.getString("title"), - altTitle = json.getString("title_alt"), + altTitle = json.getStringOrNull("title_alt"), url = json.getString("url"), source = source, rating = json.getDouble("rating").toFloat(), coverUrl = json.getString("cover"), - description = json.getString("description"), + description = json.getStringOrNull("description"), tags = json.getJSONArray("tags").map { x -> MangaTag( title = x.getString("title"), diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt index d47daf935..5723b2c10 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/JsonExt.kt @@ -21,4 +21,6 @@ fun JSONArray.mapIndexed(block: (Int, JSONObject) -> T): List { result.add(block(i, jo)) } return result -} \ No newline at end of file +} + +fun JSONObject.getStringOrNull(name: String): String? = opt(name)?.toString() \ No newline at end of file