Fixed: Create only one reader and use it everywhere.

* Now we are creating only one reader for both `zimFile`, `assetFileDescriptor` and using for all the features.

app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/KiwixReaderFragment.kt

@@ -134,7 +134,7 @@ class KiwixReaderFragment : CoreReaderFragment() {
   }
 
   private fun closeZimBook() {
-    zimReaderContainer?.setZimFile(null)
+    zimReaderContainer?.setZimFileOrFileDescriptor(null, null, null)
   }
 
   override fun openHomeScreen() {
@@ -205,9 +205,7 @@ class KiwixReaderFragment : CoreReaderFragment() {
 
   override fun onResume() {
     super.onResume()
-    if (zimReaderContainer?.zimFile == null &&
-      zimReaderContainer?.zimFileReader?.assetFileDescriptor == null
-    ) {
+    if (zimReaderContainer?.isValidZimFileReader == false) {
       exitBook()
     }
     if (isFullScreenVideo) {
@@ -299,7 +297,11 @@ class KiwixReaderFragment : CoreReaderFragment() {
           // pass this uri to zimFileReader, which is necessary for saving
           // notes, bookmarks, history, and reopening the same ZIM file after the app closes.
           getAssetFileDescriptorFromUri(activity, it)?.let { assetFileDescriptor ->
-            openZimFile(null, assetFileDescriptor = assetFileDescriptor, filePath = "$it")
+            openZimFile(
+              null,
+              assetFileDescriptor = assetFileDescriptor,
+              assetFileDescriptorPath = "$it"
+            )
           } ?: kotlin.run {
             activity.toast(R.string.cannot_open_file)
           }

app/src/main/java/org/kiwix/kiwixmobile/zimManager/fileselectView/effects/DeleteFiles.kt

@@ -60,7 +60,7 @@ data class DeleteFiles(private val booksOnDiskListItems: List<BookOnDisk>) :
     return fold(true) { acc, book ->
       acc && deleteSpecificZimFile(book).also {
         if (it && book.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
-          zimReaderContainer.setZimFile(null)
+          zimReaderContainer.setZimFileOrFileDescriptor(null)
         }
       }
     }

core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt

@@ -1228,7 +1228,7 @@ abstract class CoreReaderFragment :
       reopenBook()
     }
     tempWebViewForUndo?.let {
-      zimReaderContainer?.setZimFile(tempZimFileForUndo)
+      zimReaderContainer?.setZimFileOrFileDescriptor(tempZimFileForUndo)
       webViewList.add(index, it)
       tabsAdapter?.notifyDataSetChanged()
       snackBarRoot?.let { root ->
@@ -1479,17 +1479,11 @@ abstract class CoreReaderFragment :
     file: File?,
     isCustomApp: Boolean = false,
     assetFileDescriptor: AssetFileDescriptor? = null,
-    filePath: String? = null
+    assetFileDescriptorPath: String? = null
   ) {
     if (hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE) || isCustomApp) {
-      if (file?.isFileExist() == true) {
-        openAndSetInContainer(file = file)
-        updateTitle()
-      } else if (assetFileDescriptor != null) {
-        openAndSetInContainer(
-          assetFileDescriptor = assetFileDescriptor,
-          filePath = filePath
-        )
+      if (file?.isFileExist() == true || assetFileDescriptor != null) {
+        openAndSetInContainer(file = file, assetFileDescriptor, assetFileDescriptorPath)
         updateTitle()
       } else {
         Log.w(TAG_KIWIX, "ZIM file doesn't exist at " + file?.absolutePath)
@@ -1522,24 +1516,23 @@ abstract class CoreReaderFragment :
   private fun openAndSetInContainer(
     file: File? = null,
     assetFileDescriptor: AssetFileDescriptor? = null,
-    filePath: String? = null
+    assetFileDescriptorPath: String? = null
   ) {
     try {
-      if (isNotPreviouslyOpenZim(file?.canonicalPath)) {
+      if (isNotPreviouslyOpenZim(file?.canonicalPath) &&
+        isNotPreviouslyOpenZim(assetFileDescriptorPath)
+      ) {
         webViewList.clear()
       }
     } catch (e: IOException) {
       e.printStackTrace()
     }
     zimReaderContainer?.let { zimReaderContainer ->
-      if (assetFileDescriptor != null) {
-        zimReaderContainer.setZimFileDescriptor(
-          assetFileDescriptor,
-          filePath = filePath
-        )
-      } else {
-        zimReaderContainer.setZimFile(file)
-      }
+      zimReaderContainer.setZimFileOrFileDescriptor(
+        file,
+        assetFileDescriptor,
+        assetFileDescriptorPath
+      )
 
       val zimFileReader = zimReaderContainer.zimFileReader
       zimFileReader?.let { zimFileReader ->
@@ -1632,7 +1625,7 @@ abstract class CoreReaderFragment :
 
   private fun restoreDeletedTabs() {
     if (tempWebViewListForUndo.isNotEmpty()) {
-      zimReaderContainer?.setZimFile(tempZimFileForUndo)
+      zimReaderContainer?.setZimFileOrFileDescriptor(tempZimFileForUndo)
       webViewList.addAll(tempWebViewListForUndo)
       tabsAdapter?.notifyDataSetChanged()
       snackBarRoot?.let { root ->

core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/adapter/BookmarkItem.kt

@@ -51,7 +51,7 @@ data class BookmarkItem(
   ) : this(
     zimId = zimFileReader.id,
     zimName = zimFileReader.name,
-    zimFilePath = zimFileReader.zimFile?.canonicalPath ?: zimFileReader.assetDescriptorFilePath,
+    zimFilePath = zimFileReader.zimCanonicalPath,
     bookmarkUrl = url,
     title = title,
     favicon = zimFileReader.favicon

core/src/main/java/org/kiwix/kiwixmobile/core/page/history/adapter/HistoryListItem.kt

@@ -48,9 +48,7 @@ sealed class HistoryListItem : PageRelated {
     ) : this(
       zimId = zimFileReader.id,
       zimName = zimFileReader.name,
-      zimFilePath = zimFileReader.zimFile?.canonicalPath
-        ?: zimFileReader.assetDescriptorFilePath
-        ?: "",
+      zimFilePath = zimFileReader.zimCanonicalPath ?: "",
       favicon = zimFileReader.favicon,
       historyUrl = url,
       title = title,

core/src/main/java/org/kiwix/kiwixmobile/core/page/notes/adapter/NoteListItem.kt

@@ -35,7 +35,7 @@ data class NoteListItem(
   ) : this(
     zimId = zimFileReader.id,
     title = title,
-    zimFilePath = zimFileReader.zimFile?.canonicalPath ?: zimFileReader.assetDescriptorFilePath,
+    zimFilePath = zimFileReader.zimCanonicalPath,
     zimUrl = url,
     favicon = zimFileReader.favicon,
     noteFilePath = noteFilePath

core/src/main/java/org/kiwix/kiwixmobile/core/page/notes/viewmodel/effects/ShowOpenNoteDialog.kt

@@ -50,7 +50,7 @@ data class ShowOpenNoteDialog(
         // which is already set in zimReaderContainer, so there's no need to set it again.
         item.zimFilePath?.let {
           val file = File(it)
-          zimReaderContainer.setZimFile(file)
+          zimReaderContainer.setZimFileOrFileDescriptor(file)
         }
         effects.offer(OpenNote(item.noteFilePath, item.zimUrl, item.title))
       }

core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt

@@ -29,6 +29,7 @@ import io.reactivex.schedulers.Schedulers
 import org.kiwix.kiwixmobile.core.CoreApp
 import org.kiwix.kiwixmobile.core.NightModeConfig
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
+import org.kiwix.kiwixmobile.core.extensions.isFileExist
 import org.kiwix.kiwixmobile.core.main.UNINITIALISER_ADDRESS
 import org.kiwix.kiwixmobile.core.main.UNINITIALISE_HTML
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Companion.CONTENT_PREFIX
@@ -61,34 +62,57 @@ class ZimFileReader constructor(
   private val searcher: SuggestionSearcher = SuggestionSearcher(jniKiwixReader)
 ) {
   interface Factory {
-    fun create(file: File): ZimFileReader?
     fun create(
-      assetFileDescriptor: AssetFileDescriptor,
+      file: File? = null,
+      assetFileDescriptor: AssetFileDescriptor? = null,
       filePath: String? = null
     ): ZimFileReader?
 
     class Impl @Inject constructor(private val nightModeConfig: NightModeConfig) :
       Factory {
-      override fun create(file: File) =
+      override fun create(
+        file: File?,
+        assetFileDescriptor: AssetFileDescriptor?,
+        filePath: String?
+      ) =
         try {
+          when {
+            file != null -> createArchiveWithFile(file)
+            assetFileDescriptor != null -> {
+              createArchiveWithAssetFileDescriptor(assetFileDescriptor, filePath)
+            }
+
+            else -> null
+          }
+        } catch (ignore: JNIKiwixException) {
+          null
+        } catch (ignore: Exception) { // for handing the error, if any zim file is corrupted
+          null
+        }
+
+      private fun createArchiveWithFile(file: File): ZimFileReader? =
+        if (file.isFileExist()) {
           ZimFileReader(
-            file,
+            zimFile = file,
             nightModeConfig = nightModeConfig,
             jniKiwixReader = Archive(file.canonicalPath)
           ).also {
             Log.e(TAG, "create: ${file.path}")
           }
-        } catch (ignore: JNIKiwixException) {
-          null
-        } catch (ignore: Exception) { // for handing the error, if any zim file is corrupted
+        } else {
+          Log.e(
+            TAG,
+            "Error in creating ZimFileReader," +
+              " because file does not exist on path: ${file.path}"
+          )
           null
         }
 
-      override fun create(
+      private fun createArchiveWithAssetFileDescriptor(
         assetFileDescriptor: AssetFileDescriptor,
         filePath: String?
       ): ZimFileReader? =
-        try {
+        if (assetFileDescriptor.parcelFileDescriptor.dup().fileDescriptor.valid()) {
           ZimFileReader(
             null,
             assetFileDescriptor,
@@ -100,11 +124,14 @@ class ZimFileReader constructor(
               assetFileDescriptor.length
             )
           ).also {
-            Log.e(TAG, "create: with fileDescriptor")
+            Log.e(TAG, "created: with assetFileDescriptor $assetFileDescriptor}")
           }
-        } catch (ignore: JNIKiwixException) {
-          null
-        } catch (ignore: Exception) { // for handing the error, if any zim file is corrupted
+        } else {
+          Log.e(
+            TAG,
+            "Error in creating ZimFileReader," +
+              " because provided assetFileDescriptor is not valid"
+          )
           null
         }
     }
@@ -163,6 +190,15 @@ class ZimFileReader constructor(
       null
     }
 
+  /**
+   * Return the zimFile path if opened from file else return the filePath of assetFileDescriptor
+   */
+  val zimCanonicalPath
+    get() = zimFile?.canonicalPath ?: assetDescriptorFilePath
+
+  val isValidZimFileReader
+    get() = zimFile != null || assetFileDescriptor != null
+
   fun searchSuggestions(prefix: String): SuggestionSearch? =
     try {
       searcher.suggest(prefix)

core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt

@@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.core.reader
 
 import android.content.res.AssetFileDescriptor
 import android.webkit.WebResourceResponse
-import org.kiwix.kiwixmobile.core.extensions.isFileExist
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Factory
 import java.io.File
 import java.net.HttpURLConnection
@@ -34,23 +33,18 @@ class ZimReaderContainer @Inject constructor(private val zimFileReaderFactory: F
       field = value
     }
 
-  fun setZimFile(file: File?) {
-    if (file?.canonicalPath == zimFileReader?.zimFile?.canonicalPath) {
-      return
-    }
-    zimFileReader =
-      if (file?.isFileExist() == true) zimFileReaderFactory.create(file)
-      else null
-  }
-
-  fun setZimFileDescriptor(
-    assetFileDescriptor: AssetFileDescriptor,
+  fun setZimFileOrFileDescriptor(
+    file: File? = null,
+    assetFileDescriptor: AssetFileDescriptor? = null,
     filePath: String? = null
   ) {
+    if (isValidZimFileReader == true &&
+      file?.canonicalPath == zimFileReader?.zimFile?.canonicalPath
+    ) {
+      return
+    }
     zimFileReader =
-      if (assetFileDescriptor.parcelFileDescriptor.dup().fileDescriptor.valid())
-        zimFileReaderFactory.create(assetFileDescriptor, filePath)
-      else null
+      zimFileReaderFactory.create(file, assetFileDescriptor, filePath)
   }
 
   fun getPageUrlFromTitle(title: String) = zimFileReader?.getPageUrlFrom(title)
@@ -83,18 +77,23 @@ class ZimReaderContainer @Inject constructor(private val zimFileReaderFactory: F
       }
   }
 
-  fun copyReader(): ZimFileReader? = zimFile?.let(zimFileReaderFactory::create)
-    ?: assetFileDescriptor?.let(zimFileReaderFactory::create)
+  fun copyReader(): ZimFileReader? =
+    zimFileReaderFactory.create(
+      file = zimFile,
+      assetFileDescriptor = assetFileDescriptor,
+      filePath = assetDescriptorPath
+    )
 
   val zimFile get() = zimFileReader?.zimFile
 
   val assetFileDescriptor get() = zimFileReader?.assetFileDescriptor
 
-  /**
-   * Return the zimFile path if opened from file else return the filePath of assetFileDescriptor
-   */
+  val assetDescriptorPath get() = zimFileReader?.assetDescriptorFilePath
+
+  val isValidZimFileReader get() = zimFileReader?.isValidZimFileReader
+
   val zimCanonicalPath
-    get() = zimFileReader?.zimFile?.canonicalPath ?: zimFileReader?.assetDescriptorFilePath
+    get() = zimFileReader?.zimCanonicalPath
   val zimFileTitle get() = zimFileReader?.title
   val mainPage get() = zimFileReader?.mainPage
   val id get() = zimFileReader?.id

custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt

@@ -181,11 +181,7 @@ class CustomReaderFragment : CoreReaderFragment() {
       onFilesFound = {
         when (it) {
           is ValidationState.HasFile -> {
-            if (it.assetFileDescriptor != null) {
-              openZimFile(null, true, it.assetFileDescriptor)
-            } else {
-              openZimFile(it.file, true)
-            }
+            openZimFile(it.file, true, it.assetFileDescriptor)
             // Save book in the database to display it in `ZimHostFragment`.
             zimReaderContainer?.zimFileReader?.let { zimFileReader ->
               // Check if the file is not null. If the file is null,