Merge pull request #3542 from kiwix/Issue#3541

Fixed, Bookmark toggle is not on when opening bookmarks for existing opened book.
kiwix · Nov 22, 2023 · 0dac73c · 0dac73c
2 parents 43e6ce6 + 68f811b
commit 0dac73c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/KiwixReaderFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/KiwixReaderFragment.kt
@@ -89,6 +89,12 @@ class KiwixReaderFragment : CoreReaderFragment() {
     if (args.pageUrl.isNotEmpty()) {
       if (args.zimFileUri.isNotEmpty()) {
         tryOpeningZimFile(args.zimFileUri)
+      } else {
+        // Set up bookmarks for the current book when opening bookmarks from the Bookmark screen.
+        // This is necessary because we are not opening the ZIM file again; the bookmark is
+        // inside the currently opened book. Bookmarks are set up when opening the ZIM file.
+        // See https://github.com/kiwix/kiwix-android/issues/3541
+        zimReaderContainer?.zimFileReader?.let(::setUpBookmarks)
       }
       loadUrlWithCurrentWebview(args.pageUrl)
     } else {

diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
@@ -81,6 +81,9 @@ class CustomReaderFragment : CoreReaderFragment() {
     val args = CustomReaderFragmentArgs.fromBundle(requireArguments())
     if (args.pageUrl.isNotEmpty()) {
       loadUrlWithCurrentWebview(args.pageUrl)
+      // Setup bookmark for current book
+      // See https://github.com/kiwix/kiwix-android/issues/3541
+      zimReaderContainer?.zimFileReader?.let(::setUpBookmarks)
     } else {
       openObbOrZim()
       manageExternalLaunchAndRestoringViewState()