From 78490212479b64a05f41ffdd496ebfc5a48347ef Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechnoworld.mohit@gmail.com>
Date: Mon, 3 Jun 2024 15:19:30 +0530
Subject: [PATCH] Fixed: Saving bookmarks in the zim-split splitted ZIM files
 are crashing the application, when there is a 0 size extra zim chunk.

* Catching the exception thrown by the libkiwix with splitted ZIM files when there is an 0 size extra zim chunk.
---
 .../core/main/CoreReaderFragment.kt           | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
index 53dea6d099..8d43a36da5 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
@@ -1752,32 +1752,38 @@ abstract class CoreReaderFragment :
   @Suppress("NestedBlockDepth")
   @OnClick(R2.id.bottom_toolbar_bookmark)
   fun toggleBookmark() {
-    getCurrentWebView()?.url?.let { articleUrl ->
-      zimReaderContainer?.zimFileReader?.let { zimFileReader ->
-        val libKiwixBook = Book().apply {
-          update(zimFileReader.jniKiwixReader)
-        }
-        if (isBookmarked) {
-          repositoryActions?.deleteBookmark(libKiwixBook.id, articleUrl)
-          snackBarRoot?.snack(R.string.bookmark_removed)
-        } else {
-          getCurrentWebView()?.title?.let {
-            repositoryActions?.saveBookmark(
-              LibkiwixBookmarkItem(it, articleUrl, zimFileReader, libKiwixBook)
-            )
-            snackBarRoot?.snack(
-              stringId = R.string.bookmark_added,
-              actionStringId = R.string.open,
-              actionClick = {
-                goToBookmarks()
-                Unit
-              }
-            )
+    try {
+      getCurrentWebView()?.url?.let { articleUrl ->
+        zimReaderContainer?.zimFileReader?.let { zimFileReader ->
+          val libKiwixBook = Book().apply {
+            update(zimFileReader.jniKiwixReader)
+          }
+          if (isBookmarked) {
+            repositoryActions?.deleteBookmark(libKiwixBook.id, articleUrl)
+            snackBarRoot?.snack(R.string.bookmark_removed)
+          } else {
+            getCurrentWebView()?.title?.let {
+              repositoryActions?.saveBookmark(
+                LibkiwixBookmarkItem(it, articleUrl, zimFileReader, libKiwixBook)
+              )
+              snackBarRoot?.snack(
+                stringId = R.string.bookmark_added,
+                actionStringId = R.string.open,
+                actionClick = {
+                  goToBookmarks()
+                  Unit
+                }
+              )
+            }
           }
         }
       } ?: kotlin.run {
         requireActivity().toast(R.string.unable_to_add_to_bookmarks, Toast.LENGTH_SHORT)
       }
+    } catch (ignore: Exception) {
+      // Catch the exception while saving the bookmarks for splitted zim files.
+      // we have an issue with split zim files, see #3827
+      requireActivity().toast(R.string.unable_to_add_to_bookmarks, Toast.LENGTH_SHORT)
     }
   }