Improved creation of ZimFileReader.

* If current file is same that is previously opened in the `ZimFileReader` then it will not create the reader again. * Improved the variable naming.
kiwix · Dec 27, 2023 · 7c59193 · 7c59193
1 parent d2505b7
commit 7c59193
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/...c/main/java/org/kiwix/kiwixmobile/core/page/notes/viewmodel/effects/ShowOpenNoteDialog.kt b/...c/main/java/org/kiwix/kiwixmobile/core/page/notes/viewmodel/effects/ShowOpenNoteDialog.kt
@@ -60,7 +60,7 @@ data class ShowOpenNoteDialog(
           )?.let { assetFileDescriptor ->
             zimReaderContainer.setZimFileOrFileDescriptor(
               assetFileDescriptor = assetFileDescriptor,
-              filePath = it
+              assetDescriptorFilePath = it
             )
           }
         }

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
@@ -65,21 +65,21 @@ class ZimFileReader constructor(
     fun create(
       file: File? = null,
       assetFileDescriptor: AssetFileDescriptor? = null,
-      filePath: String? = null
+      assetDescriptorFilePath: String? = null
     ): ZimFileReader?
 
     class Impl @Inject constructor(private val nightModeConfig: NightModeConfig) :
       Factory {
       override fun create(
         file: File?,
         assetFileDescriptor: AssetFileDescriptor?,
-        filePath: String?
+        assetDescriptorFilePath: String?
       ) =
         try {
           when {
             file != null -> createArchiveWithFile(file)
             assetFileDescriptor != null -> {
-              createArchiveWithAssetFileDescriptor(assetFileDescriptor, filePath)
+              createArchiveWithAssetFileDescriptor(assetFileDescriptor, assetDescriptorFilePath)
             }
 
             else -> null
@@ -110,13 +110,13 @@ class ZimFileReader constructor(
 
       private fun createArchiveWithAssetFileDescriptor(
         assetFileDescriptor: AssetFileDescriptor,
-        filePath: String?
+        assetFileDescriptorPath: String?
       ): ZimFileReader? =
         if (assetFileDescriptor.parcelFileDescriptor.dup().fileDescriptor.valid()) {
           ZimFileReader(
             null,
             assetFileDescriptor,
-            assetDescriptorFilePath = filePath,
+            assetDescriptorFilePath = assetFileDescriptorPath,
             nightModeConfig = nightModeConfig,
             jniKiwixReader = Archive(
               assetFileDescriptor.parcelFileDescriptor.dup().fileDescriptor,

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt
@@ -36,17 +36,31 @@ class ZimReaderContainer @Inject constructor(private val zimFileReaderFactory: F
   fun setZimFileOrFileDescriptor(
     file: File? = null,
     assetFileDescriptor: AssetFileDescriptor? = null,
-    filePath: String? = null
+    assetDescriptorFilePath: String? = null
   ) {
-    if (isValidZimFileReader == true &&
-      file?.canonicalPath == zimFileReader?.zimFile?.canonicalPath
-    ) {
+    if (shouldNotCreateZimFileReader(file, assetDescriptorFilePath)) {
       return
     }
     zimFileReader =
-      zimFileReaderFactory.create(file, assetFileDescriptor, filePath)
+      zimFileReaderFactory.create(file, assetFileDescriptor, assetDescriptorFilePath)
   }
 
+  private fun shouldNotCreateZimFileReader(
+    file: File?,
+    assetDescriptorFilePath: String?
+  ) =
+    when {
+      file != null -> {
+        file.canonicalPath == zimCanonicalPath
+      }
+
+      assetDescriptorFilePath != null -> {
+        assetDescriptorFilePath == zimCanonicalPath
+      }
+
+      else -> false
+    }
+
   fun getPageUrlFromTitle(title: String) = zimFileReader?.getPageUrlFrom(title)
 
   fun getRandomArticleUrl() = zimFileReader?.getRandomArticleUrl()
@@ -81,7 +95,7 @@ class ZimReaderContainer @Inject constructor(private val zimFileReaderFactory: F
     zimFileReaderFactory.create(
       file = zimFile,
       assetFileDescriptor = assetFileDescriptor,
-      filePath = assetDescriptorPath
+      assetDescriptorFilePath = assetDescriptorPath
     )
 
   val zimFile get() = zimFileReader?.zimFile