From e00abf7e2e57ee4540b62d844d812b38f4a985e5 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 29 Jan 2020 10:19:52 +0000 Subject: [PATCH] #1721 CrashReport 3.1.3: IllegalStateException: jniKiwixReader.favicon must not be null - make favicon nullable --- .../org/kiwix/kiwixmobile/core/dao/entities/HistoryEntity.kt | 2 +- .../java/org/kiwix/kiwixmobile/core/history/HistoryListItem.kt | 2 +- .../java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryEntity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryEntity.kt index 7666c4ce8..db7f4f763 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryEntity.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/entities/HistoryEntity.kt @@ -27,7 +27,7 @@ data class HistoryEntity( val zimId: String, val zimName: String, val zimFilePath: String, - val favicon: String, + val favicon: String?, val historyUrl: String, val historyTitle: String, val dateString: String, diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryListItem.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryListItem.kt index 98f75a7e7..897c0a342 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryListItem.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryListItem.kt @@ -28,7 +28,7 @@ sealed class HistoryListItem { val zimId: String, val zimName: String, val zimFilePath: String, - val favicon: String, + val favicon: String?, val historyUrl: String, val historyTitle: String, val dateString: String, diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt index 9d0050cf6..acb01b2ed 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt @@ -78,7 +78,7 @@ class ZimFileReader constructor( val name: String get() = jniKiwixReader.name?.takeIf(String::isNotEmpty) ?: id val date: String get() = jniKiwixReader.date val description: String get() = jniKiwixReader.description - val favicon: String get() = jniKiwixReader.favicon + val favicon: String? get() = jniKiwixReader.favicon val language: String get() = jniKiwixReader.language val tags: String get() = "${getContent(Uri.parse("M/Tags"))}" private val mediaCount: Int?