From f7f4d6e1f12ed873fd3f4fcaa2784883c9eb951c Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Tue, 3 Sep 2019 17:10:11 +0100
Subject: [PATCH] #1386 get tests compiling

---
 app/lint-baseline.xml                         | 2395 +++++++++++------
 app/objectbox-models/default.json.bak         |   88 +-
 .../downloader/DownloadViewHolder.kt          |    4 +-
 .../kiwixmobile/utils/files/FileSearchTest.kt |   14 +-
 .../zim_manager/ZimManageViewModelTest.kt     |   86 +-
 .../fileselect_view/StorageObserverTest.kt    |   10 +-
 .../kiwix/kiwixmobile/TestModelFunctions.kt   |   53 +-
 7 files changed, 1621 insertions(+), 1029 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 06946ce3b..3f75b5561 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -158,26 +158,15 @@
             file="..\..\..\.gradle\caches\modules-2\files-2.1\org.simpleframework\simple-xml\2.7.1\dd91fb744c2ff921407475cb29a1e3fee397d411\simple-xml-2.7.1.jar"/>
     </issue>
 
-    <issue
-        id="Registered"
-        message="The `&lt;service> org.kiwix.kiwixmobile.downloader.DownloadService` is not registered in the manifest"
-        errorLine1="public class DownloadService extends Service {"
-        errorLine2="             ~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="82"
-            column="14"/>
-    </issue>
-
     <issue
         id="SdCardPath"
         message="Do not hardcode &quot;`/data/`&quot;; use `Context.getFilesDir().getPath()` instead"
-        errorLine1="              filePath = String.format(&quot;/data/data/%s/lib/%s&quot;, BuildConfig.APPLICATION_ID,"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="          filePath = String.format(&quot;/data/data/%s/lib/%s&quot;, BuildConfig.APPLICATION_ID,"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1931"
-            column="40"/>
+            line="1932"
+            column="36"/>
     </issue>
 
     <issue
@@ -187,19 +176,19 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1222"
+            line="1245"
             column="11"/>
     </issue>
 
     <issue
         id="UnusedAttribute"
         message="Attribute `networkSecurityConfig` is only used in API level 24 and higher (current min is 15)"
-        errorLine1="      android:networkSecurityConfig=&quot;@xml/network_security_config&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    android:networkSecurityConfig=&quot;@xml/network_security_config&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="17"
-            column="7"/>
+            line="21"
+            column="5"/>
     </issue>
 
     <issue
@@ -341,7 +330,7 @@
         errorLine2="                                                     ^">
         <location
             file="src\main\res\values-tr\strings.xml"
-            line="103"
+            line="102"
             column="54"/>
     </issue>
 
@@ -352,7 +341,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="193"
+            line="192"
             column="3"/>
     </issue>
 
@@ -411,7 +400,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1534"
+            line="1556"
             column="5"/>
     </issue>
 
@@ -422,7 +411,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="157"
+            line="163"
             column="6"/>
     </issue>
 
@@ -433,7 +422,7 @@
         errorLine2="   ~~~~~~~~~~~">
         <location
             file="src\main\AndroidManifest.xml"
-            line="11"
+            line="15"
             column="4"/>
     </issue>
 
@@ -444,7 +433,7 @@
         errorLine2="  ^">
         <location
             file="src\main\AndroidManifest.xml"
-            line="11"
+            line="15"
             column="3"/>
     </issue>
 
@@ -580,6 +569,34 @@
             column="10"/>
     </issue>
 
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_pause_black_24dp` appears to be unused">
+        <location
+            file="src\main\res\drawable-hdpi\ic_pause_black_24dp.png"/>
+        <location
+            file="src\main\res\drawable-mdpi\ic_pause_black_24dp.png"/>
+        <location
+            file="src\main\res\drawable-xhdpi\ic_pause_black_24dp.png"/>
+        <location
+            file="src\main\res\drawable-xxhdpi\ic_pause_black_24dp.png"/>
+        <location
+            file="src\main\res\drawable-xxxhdpi\ic_pause_black_24dp.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.kiwix_notification` appears to be unused">
+        <location
+            file="src\main\res\drawable-hdpi\kiwix_notification.png"/>
+        <location
+            file="src\main\res\drawable-mdpi\kiwix_notification.png"/>
+        <location
+            file="src\main\res\drawable-xhdpi\kiwix_notification.png"/>
+        <location
+            file="src\main\res\drawable-xxhdpi\kiwix_notification.png"/>
+    </issue>
+
     <issue
         id="UnusedResources"
         message="The resource `R.layout.library_divider` appears to be unused"
@@ -777,6 +794,634 @@
             column="11"/>
     </issue>
 
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.zim_file_downloading` appears to be unused"
+        errorLine1="  &lt;string name=&quot;zim_file_downloading&quot;>Downloading&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="88"
+            column="11"/>
+        <location
+            file="src\main\res\values-ar\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-bg\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-bn\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-br\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-da\strings.xml"
+            line="80"
+            column="11"/>
+        <location
+            file="src\main\res\values-de\strings.xml"
+            line="79"
+            column="11"/>
+        <location
+            file="src\main\res\values-el\strings.xml"
+            line="74"
+            column="11"/>
+        <location
+            file="src\main\res\values-eo\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-es\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-eu\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-fa\strings.xml"
+            line="61"
+            column="11"/>
+        <location
+            file="src\main\res\values-fi\strings.xml"
+            line="77"
+            column="11"/>
+        <location
+            file="src\main\res\values-fr\strings.xml"
+            line="79"
+            column="11"/>
+        <location
+            file="src\main\res\values-gl\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-hi\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-hu\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-lb\strings.xml"
+            line="57"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-my\strings.xml"
+            line="59"
+            column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="65"
+            column="11"/>
+        <location
+            file="src\main\res\values-oc\strings.xml"
+            line="72"
+            column="11"/>
+        <location
+            file="src\main\res\values-pl\strings.xml"
+            line="79"
+            column="11"/>
+        <location
+            file="src\main\res\values-ps\strings.xml"
+            line="57"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-sl\strings.xml"
+            line="61"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-sv\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-sw\strings.xml"
+            line="44"
+            column="11"/>
+        <location
+            file="src\main\res\values-tr\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-uk\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-vi\strings.xml"
+            line="82"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.zim_file_downloaded` appears to be unused"
+        errorLine1="  &lt;string name=&quot;zim_file_downloaded&quot;>Downloaded&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="89"
+            column="11"/>
+        <location
+            file="src\main\res\values-ar\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-bg\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-bn\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-br\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-cs\strings.xml"
+            line="66"
+            column="11"/>
+        <location
+            file="src\main\res\values-da\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-de\strings.xml"
+            line="80"
+            column="11"/>
+        <location
+            file="src\main\res\values-el\strings.xml"
+            line="75"
+            column="11"/>
+        <location
+            file="src\main\res\values-eo\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-es\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-eu\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-fa\strings.xml"
+            line="62"
+            column="11"/>
+        <location
+            file="src\main\res\values-fi\strings.xml"
+            line="78"
+            column="11"/>
+        <location
+            file="src\main\res\values-fr\strings.xml"
+            line="80"
+            column="11"/>
+        <location
+            file="src\main\res\values-gl\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-hi\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-hu\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-ji\strings.xml"
+            line="36"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-lb\strings.xml"
+            line="58"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-my\strings.xml"
+            line="60"
+            column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="66"
+            column="11"/>
+        <location
+            file="src\main\res\values-oc\strings.xml"
+            line="73"
+            column="11"/>
+        <location
+            file="src\main\res\values-pl\strings.xml"
+            line="80"
+            column="11"/>
+        <location
+            file="src\main\res\values-ps\strings.xml"
+            line="58"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-sl\strings.xml"
+            line="62"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-sv\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-sw\strings.xml"
+            line="45"
+            column="11"/>
+        <location
+            file="src\main\res\values-tr\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-uk\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-vi\strings.xml"
+            line="83"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.download_pause` appears to be unused"
+        errorLine1="  &lt;string name=&quot;download_pause&quot;>Pause&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="90"
+            column="11"/>
+        <location
+            file="src\main\res\values-ar\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-bg\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-bn\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-br\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-ca\strings.xml"
+            line="58"
+            column="11"/>
+        <location
+            file="src\main\res\values-cs\strings.xml"
+            line="67"
+            column="11"/>
+        <location
+            file="src\main\res\values-de\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-el\strings.xml"
+            line="76"
+            column="11"/>
+        <location
+            file="src\main\res\values-eo\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-es\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-eu\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-fa\strings.xml"
+            line="63"
+            column="11"/>
+        <location
+            file="src\main\res\values-fi\strings.xml"
+            line="79"
+            column="11"/>
+        <location
+            file="src\main\res\values-gl\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-hi\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-hu\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-it\strings.xml"
+            line="67"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-lb\strings.xml"
+            line="59"
+            column="11"/>
+        <location
+            file="src\main\res\values-li\strings.xml"
+            line="64"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-my\strings.xml"
+            line="61"
+            column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="67"
+            column="11"/>
+        <location
+            file="src\main\res\values-oc\strings.xml"
+            line="74"
+            column="11"/>
+        <location
+            file="src\main\res\values-pl\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-sl\strings.xml"
+            line="63"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-su\strings.xml"
+            line="30"
+            column="11"/>
+        <location
+            file="src\main\res\values-sv\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-th\strings.xml"
+            line="39"
+            column="11"/>
+        <location
+            file="src\main\res\values-tr\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-uk\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-vi\strings.xml"
+            line="84"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.download_paused` appears to be unused"
+        errorLine1="  &lt;string name=&quot;download_paused&quot;>paused&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="92"
+            column="11"/>
+        <location
+            file="src\main\res\values-ar\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-bg\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-bn\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-br\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-ca\strings.xml"
+            line="60"
+            column="11"/>
+        <location
+            file="src\main\res\values-cs\strings.xml"
+            line="69"
+            column="11"/>
+        <location
+            file="src\main\res\values-da\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-de\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-el\strings.xml"
+            line="78"
+            column="11"/>
+        <location
+            file="src\main\res\values-eo\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-es\strings.xml"
+            line="86"
+            column="11"/>
+        <location
+            file="src\main\res\values-eu\strings.xml"
+            line="86"
+            column="11"/>
+        <location
+            file="src\main\res\values-fa\strings.xml"
+            line="65"
+            column="11"/>
+        <location
+            file="src\main\res\values-fi\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-fr\strings.xml"
+            line="81"
+            column="11"/>
+        <location
+            file="src\main\res\values-gl\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-hi\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-hu\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-it\strings.xml"
+            line="69"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-li\strings.xml"
+            line="66"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-my\strings.xml"
+            line="63"
+            column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="69"
+            column="11"/>
+        <location
+            file="src\main\res\values-oc\strings.xml"
+            line="76"
+            column="11"/>
+        <location
+            file="src\main\res\values-pl\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="86"
+            column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="86"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-su\strings.xml"
+            line="32"
+            column="11"/>
+        <location
+            file="src\main\res\values-sv\strings.xml"
+            line="85"
+            column="11"/>
+        <location
+            file="src\main\res\values-th\strings.xml"
+            line="41"
+            column="11"/>
+        <location
+            file="src\main\res\values-tr\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-uk\strings.xml"
+            line="87"
+            column="11"/>
+        <location
+            file="src\main\res\values-vi\strings.xml"
+            line="86"
+            column="11"/>
+    </issue>
+
     <issue
         id="UnusedResources"
         message="The resource `R.string.download_no_space` appears to be unused"
@@ -1230,6 +1875,117 @@
             column="11"/>
     </issue>
 
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.path_not_writable` appears to be unused"
+        errorLine1="  &lt;string name=&quot;path_not_writable&quot;>Can not access desired directory, using default. To fix this reselect the desired directory in app settings.&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="121"
+            column="11"/>
+        <location
+            file="src\main\res\values-ar\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-bg\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-bn\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-br\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-ca\strings.xml"
+            line="82"
+            column="11"/>
+        <location
+            file="src\main\res\values-da\strings.xml"
+            line="110"
+            column="11"/>
+        <location
+            file="src\main\res\values-de\strings.xml"
+            line="111"
+            column="11"/>
+        <location
+            file="src\main\res\values-eo\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-es\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-eu\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-fr\strings.xml"
+            line="108"
+            column="11"/>
+        <location
+            file="src\main\res\values-gl\strings.xml"
+            line="112"
+            column="11"/>
+        <location
+            file="src\main\res\values-hi\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-hu\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-li\strings.xml"
+            line="83"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="114"
+            column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="111"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="114"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-sv\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-tr\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-uk\strings.xml"
+            line="115"
+            column="11"/>
+    </issue>
+
     <issue
         id="UnusedResources"
         message="The resource `R.string.delete_zim_failed` appears to be unused"
@@ -1237,51 +1993,51 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="124"
+            line="123"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-bg\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-bn\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-br\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-ca\strings.xml"
-            line="84"
+            line="83"
             column="11"/>
         <location
             file="src\main\res\values-da\strings.xml"
-            line="113"
+            line="112"
             column="11"/>
         <location
             file="src\main\res\values-de\strings.xml"
-            line="114"
+            line="113"
             column="11"/>
         <location
             file="src\main\res\values-el\strings.xml"
-            line="100"
+            line="99"
             column="11"/>
         <location
             file="src\main\res\values-eo\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-es\strings.xml"
-            line="116"
+            line="115"
             column="11"/>
         <location
             file="src\main\res\values-eu\strings.xml"
-            line="116"
+            line="115"
             column="11"/>
         <location
             file="src\main\res\values-fa\strings.xml"
@@ -1289,91 +2045,91 @@
             column="11"/>
         <location
             file="src\main\res\values-fi\strings.xml"
-            line="100"
+            line="99"
             column="11"/>
         <location
             file="src\main\res\values-fr\strings.xml"
-            line="111"
+            line="110"
             column="11"/>
         <location
             file="src\main\res\values-gl\strings.xml"
-            line="115"
-            column="11"/>
-        <location
-            file="src\main\res\values-hi\strings.xml"
-            line="118"
-            column="11"/>
-        <location
-            file="src\main\res\values-hu\strings.xml"
-            line="116"
-            column="11"/>
-        <location
-            file="src\main\res\values-it\strings.xml"
-            line="79"
-            column="11"/>
-        <location
-            file="src\main\res\values-ko\strings.xml"
-            line="118"
-            column="11"/>
-        <location
-            file="src\main\res\values-li\strings.xml"
-            line="85"
-            column="11"/>
-        <location
-            file="src\main\res\values-mk\strings.xml"
-            line="118"
-            column="11"/>
-        <location
-            file="src\main\res\values-ne\strings.xml"
-            line="80"
-            column="11"/>
-        <location
-            file="src\main\res\values-pl\strings.xml"
-            line="98"
-            column="11"/>
-        <location
-            file="src\main\res\values-pt\strings.xml"
-            line="117"
-            column="11"/>
-        <location
-            file="src\main\res\values-ro\strings.xml"
             line="114"
             column="11"/>
         <location
-            file="src\main\res\values-ru\strings.xml"
-            line="118"
-            column="11"/>
-        <location
-            file="src\main\res\values-sc\strings.xml"
+            file="src\main\res\values-hi\strings.xml"
             line="117"
             column="11"/>
         <location
-            file="src\main\res\values-sq\strings.xml"
+            file="src\main\res\values-hu\strings.xml"
+            line="115"
+            column="11"/>
+        <location
+            file="src\main\res\values-it\strings.xml"
+            line="78"
+            column="11"/>
+        <location
+            file="src\main\res\values-ko\strings.xml"
+            line="117"
+            column="11"/>
+        <location
+            file="src\main\res\values-li\strings.xml"
+            line="84"
+            column="11"/>
+        <location
+            file="src\main\res\values-mk\strings.xml"
+            line="117"
+            column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="79"
+            column="11"/>
+        <location
+            file="src\main\res\values-pl\strings.xml"
+            line="97"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
             line="116"
             column="11"/>
+        <location
+            file="src\main\res\values-ro\strings.xml"
+            line="113"
+            column="11"/>
+        <location
+            file="src\main\res\values-ru\strings.xml"
+            line="117"
+            column="11"/>
+        <location
+            file="src\main\res\values-sc\strings.xml"
+            line="116"
+            column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="115"
+            column="11"/>
         <location
             file="src\main\res\values-su\strings.xml"
             line="37"
             column="11"/>
         <location
             file="src\main\res\values-sv\strings.xml"
-            line="116"
+            line="115"
             column="11"/>
         <location
             file="src\main\res\values-th\strings.xml"
-            line="47"
+            line="46"
             column="11"/>
         <location
             file="src\main\res\values-tr\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-uk\strings.xml"
-            line="118"
+            line="117"
             column="11"/>
         <location
             file="src\main\res\values-vi\strings.xml"
-            line="115"
+            line="114"
             column="11"/>
     </issue>
 
@@ -1384,51 +2140,51 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="134"
+            line="133"
             column="11"/>
         <location
             file="src\main\res\values-ar\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-bg\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-bn\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-br\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-ca\strings.xml"
-            line="90"
+            line="89"
             column="11"/>
         <location
             file="src\main\res\values-da\strings.xml"
-            line="121"
+            line="120"
             column="11"/>
         <location
             file="src\main\res\values-de\strings.xml"
-            line="124"
+            line="123"
             column="11"/>
         <location
             file="src\main\res\values-el\strings.xml"
-            line="110"
+            line="109"
             column="11"/>
         <location
             file="src\main\res\values-eo\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-es\strings.xml"
-            line="125"
+            line="124"
             column="11"/>
         <location
             file="src\main\res\values-eu\strings.xml"
-            line="126"
+            line="125"
             column="11"/>
         <location
             file="src\main\res\values-fa\strings.xml"
@@ -1436,87 +2192,87 @@
             column="11"/>
         <location
             file="src\main\res\values-fi\strings.xml"
-            line="110"
+            line="109"
             column="11"/>
         <location
             file="src\main\res\values-fr\strings.xml"
-            line="119"
+            line="118"
             column="11"/>
         <location
             file="src\main\res\values-gl\strings.xml"
-            line="125"
+            line="124"
             column="11"/>
         <location
             file="src\main\res\values-hi\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-hu\strings.xml"
-            line="126"
+            line="125"
             column="11"/>
         <location
             file="src\main\res\values-it\strings.xml"
-            line="85"
+            line="84"
             column="11"/>
         <location
             file="src\main\res\values-ko\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-li\strings.xml"
-            line="91"
-            column="11"/>
-        <location
-            file="src\main\res\values-mk\strings.xml"
-            line="128"
-            column="11"/>
-        <location
-            file="src\main\res\values-ne\strings.xml"
             line="90"
             column="11"/>
         <location
-            file="src\main\res\values-pt\strings.xml"
+            file="src\main\res\values-mk\strings.xml"
             line="127"
             column="11"/>
+        <location
+            file="src\main\res\values-ne\strings.xml"
+            line="89"
+            column="11"/>
+        <location
+            file="src\main\res\values-pt\strings.xml"
+            line="126"
+            column="11"/>
         <location
             file="src\main\res\values-ro\strings.xml"
-            line="123"
+            line="122"
             column="11"/>
         <location
             file="src\main\res\values-ru\strings.xml"
-            line="128"
-            column="11"/>
-        <location
-            file="src\main\res\values-sc\strings.xml"
             line="127"
             column="11"/>
         <location
-            file="src\main\res\values-sq\strings.xml"
+            file="src\main\res\values-sc\strings.xml"
             line="126"
             column="11"/>
+        <location
+            file="src\main\res\values-sq\strings.xml"
+            line="125"
+            column="11"/>
         <location
             file="src\main\res\values-su\strings.xml"
             line="40"
             column="11"/>
         <location
             file="src\main\res\values-sv\strings.xml"
-            line="126"
+            line="125"
             column="11"/>
         <location
             file="src\main\res\values-th\strings.xml"
-            line="51"
+            line="50"
             column="11"/>
         <location
             file="src\main\res\values-tr\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-uk\strings.xml"
-            line="128"
+            line="127"
             column="11"/>
         <location
             file="src\main\res\values-vi\strings.xml"
-            line="125"
+            line="124"
             column="11"/>
     </issue>
 
@@ -1525,12 +2281,34 @@
         message="The resource `R.string.no_items_msg` appears to be unused"
         errorLine1="  &lt;string name=&quot;no_items_msg&quot;>No items available&lt;/string>"
         errorLine2="          ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="156"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.ongoing_download_channel_name` appears to be unused"
+        errorLine1="  &lt;string name=&quot;ongoing_download_channel_name&quot;>Ongoing Downloads&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
             line="157"
             column="11"/>
     </issue>
 
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.ongoing_download_channel_desc` appears to be unused"
+        errorLine1="  &lt;string name=&quot;ongoing_download_channel_desc&quot;>Category for ongoing zim file downloads.&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="158"
+            column="11"/>
+    </issue>
+
     <issue
         id="UnusedResources"
         message="The resource `R.string.articleCount` appears to be unused"
@@ -1538,10 +2316,208 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\values\strings.xml"
-            line="175"
+            line="174"
             column="11"/>
     </issue>
 
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.paused_wifi` appears to be unused"
+        errorLine1="  &lt;string name=&quot;paused_wifi&quot;>Waiting for Wifi&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="225"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.paused_connectivity` appears to be unused"
+        errorLine1="  &lt;string name=&quot;paused_connectivity&quot;>Waiting to connect to a network&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="226"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.paused_retry` appears to be unused"
+        errorLine1="  &lt;string name=&quot;paused_retry&quot;>Waiting to retry&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="227"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.paused_unknown` appears to be unused"
+        errorLine1="  &lt;string name=&quot;paused_unknown&quot;>Unknown&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="228"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_cannot_resume` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_cannot_resume&quot;>Cannot resume due to unknown reason&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="229"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_storage_not_found` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_storage_not_found&quot;>Could not find storage&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="230"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_file_already_exists` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_file_already_exists&quot;>File already exists&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="231"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_unknown_file_error` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_unknown_file_error&quot;>Unknown file system error&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="232"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_http_error` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_http_error&quot;>HTTP data error&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="233"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_insufficient_space` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_insufficient_space&quot;>Not enough space on storage&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="234"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_too_many_redirects` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_too_many_redirects&quot;>Too many redirects&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="235"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_unhandled_http_code` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_unhandled_http_code&quot;>Unknown HTTP code received&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="236"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_unknown` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_unknown&quot;>Unknown&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="237"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.failed_http_code` appears to be unused"
+        errorLine1="  &lt;string name=&quot;failed_http_code&quot;>HTTP code %s&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="238"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `noteEdited` of class `AddNoteDialog` requires synthetic accessor"
+        errorLine1="        noteEdited = true;"
+        errorLine2="        ~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\main\AddNoteDialog.java"
+            line="157"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `enableSaveNoteMenuItem` of class `AddNoteDialog` requires synthetic accessor"
+        errorLine1="        enableSaveNoteMenuItem();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\main\AddNoteDialog.java"
+            line="158"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `enableShareNoteMenuItem` of class `AddNoteDialog` requires synthetic accessor"
+        errorLine1="        enableShareNoteMenuItem();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\main\AddNoteDialog.java"
+            line="159"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `exitAddNoteDialog` of class `AddNoteDialog` requires synthetic accessor"
+        errorLine1="        exitAddNoteDialog();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\main\AddNoteDialog.java"
+            line="216"
+            column="9"/>
+    </issue>
+
     <issue
         id="SyntheticAccessor"
         message="Access to `private` field `mDrawWidth` of class `AnimatedProgressBar` requires synthetic accessor"
@@ -1938,116 +2914,6 @@
             column="78"/>
     </issue>
 
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              notification.get(notificationID).setOngoing(false);"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="343"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              Bundle b = notification.get(notificationID).getExtras();"
-        errorLine2="                         ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="344"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              notification.get(notificationID)"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="345"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              notification.get(notificationID).getExtras();"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="349"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              notification.get(notificationID)"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="350"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              notification.get(notificationID).setContentIntent(pendingIntent);"
-        errorLine2="              ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="407"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="            notification.get(notificationID).setProgress(100, progress, false);"
-        errorLine2="            ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="411"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `notification` of class `DownloadService` requires synthetic accessor"
-        errorLine1="            notificationManager.notify(notificationID, notification.get(notificationID).build());"
-        errorLine2="                                                       ~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="417"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `updateForeground` of class `DownloadService` requires synthetic accessor"
-        errorLine1="              updateForeground();"
-        errorLine2="              ~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="420"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` method `updateDownloadFragmentProgress` of class `DownloadService` requires synthetic accessor"
-        errorLine1="            updateDownloadFragmentProgress(progress, notificationID);"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="422"
-            column="13"/>
-    </issue>
-
     <issue
         id="SyntheticAccessor"
         message="Access to `private` field `requestCheckSystemFileType` of class `Fat32Checker` requires synthetic accessor"
@@ -2055,10 +2921,65 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\zim_manager\Fat32Checker.kt"
-            line="79"
+            line="66"
             column="9"/>
     </issue>
 
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `deleteIfExists` of class `Fat32CheckerKt` requires synthetic accessor"
+        errorLine1="    File(path).deleteIfExists()"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\Fat32Checker.kt"
+            line="81"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `deleteIfExists` of class `Fat32CheckerKt` requires synthetic accessor"
+        errorLine1="      File(path).deleteIfExists()"
+        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\Fat32Checker.kt"
+            line="92"
+            column="7"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `updater` of class `FetchDownloadMonitor` requires synthetic accessor"
+        errorLine1="      updater.onNext { fetchDownloadDao.update(download) }"
+        errorLine2="      ~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\downloader\FetchDownloadMonitor.kt"
+            line="97"
+            column="7"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `updater` of class `FetchDownloadMonitor` requires synthetic accessor"
+        errorLine1="      updater.onNext { fetchDownloadDao.delete(download) }"
+        errorLine2="      ~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\downloader\FetchDownloadMonitor.kt"
+            line="101"
+            column="7"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `toFetchRequest` of class `FetchDownloadRequesterKt` requires synthetic accessor"
+        errorLine1="    val request = downloadRequest.toFetchRequest(sharedPreferenceUtil)"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\downloader\fetch\FetchDownloadRequester.kt"
+            line="36"
+            column="19"/>
+    </issue>
+
     <issue
         id="SyntheticAccessor"
         message="Access to `private` field `refreshAdapter` of class `HistoryActivity` requires synthetic accessor"
@@ -2693,7 +3614,7 @@
         errorLine2="      ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="276"
+            line="279"
             column="7"/>
     </issue>
 
@@ -2704,7 +3625,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="427"
+            line="447"
             column="9"/>
     </issue>
 
@@ -2715,7 +3636,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="429"
+            line="449"
             column="11"/>
     </issue>
 
@@ -2726,7 +3647,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="431"
+            line="451"
             column="11"/>
     </issue>
 
@@ -2737,7 +3658,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="433"
+            line="453"
             column="40"/>
     </issue>
 
@@ -2748,7 +3669,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="433"
+            line="453"
             column="9"/>
     </issue>
 
@@ -2759,7 +3680,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="434"
+            line="454"
             column="9"/>
     </issue>
 
@@ -2770,7 +3691,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="439"
+            line="459"
             column="9"/>
     </issue>
 
@@ -2781,7 +3702,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="440"
+            line="460"
             column="9"/>
     </issue>
 
@@ -2792,7 +3713,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="449"
+            line="469"
             column="9"/>
     </issue>
 
@@ -2803,7 +3724,7 @@
         errorLine2="        ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="450"
+            line="470"
             column="9"/>
     </issue>
 
@@ -2814,7 +3735,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="453"
+            line="473"
             column="9"/>
     </issue>
 
@@ -2825,7 +3746,7 @@
         errorLine2="        ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="458"
+            line="478"
             column="9"/>
     </issue>
 
@@ -2836,7 +3757,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="475"
+            line="495"
             column="9"/>
     </issue>
 
@@ -2847,7 +3768,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="497"
+            line="517"
             column="15"/>
     </issue>
 
@@ -2858,7 +3779,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="666"
+            line="686"
             column="9"/>
     </issue>
 
@@ -2869,7 +3790,7 @@
         errorLine2="          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="668"
+            line="688"
             column="11"/>
     </issue>
 
@@ -2880,7 +3801,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="669"
+            line="689"
             column="25"/>
     </issue>
 
@@ -2891,7 +3812,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="676"
+            line="696"
             column="9"/>
     </issue>
 
@@ -2902,7 +3823,7 @@
         errorLine2="          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="678"
+            line="698"
             column="11"/>
     </issue>
 
@@ -2913,32 +3834,10 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="679"
+            line="699"
             column="25"/>
     </issue>
 
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `urls` of class `FileElement` requires synthetic accessor"
-        errorLine1="    return file.urls;"
-        errorLine2="                ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
-            line="36"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `urls` of class `FileElement` requires synthetic accessor"
-        errorLine1="    return file.urls.get(0);"
-        errorLine2="                ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
-            line="40"
-            column="17"/>
-    </issue>
-
     <issue
         id="SyntheticAccessor"
         message="Access to `private` field `length` of class `Pieces` requires synthetic accessor"
@@ -2950,28 +3849,6 @@
             column="21"/>
     </issue>
 
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `hashType` of class `Pieces` requires synthetic accessor"
-        errorLine1="      return pieces.hashType;"
-        errorLine2="                    ~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
-            line="73"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="SyntheticAccessor"
-        message="Access to `private` field `pieceHashes` of class `Pieces` requires synthetic accessor"
-        errorLine1="      return pieces.pieceHashes;"
-        errorLine2="                    ~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
-            line="77"
-            column="21"/>
-    </issue>
-
     <issue
         id="SyntheticAccessor"
         message="Access to `private` field `autoAdapter` of class `SearchActivity` requires synthetic accessor"
@@ -2994,6 +3871,61 @@
             column="11"/>
     </issue>
 
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `activity` of class `WifiDirectManager` requires synthetic accessor"
+        errorLine1="        Log.d(TAG, activity.getString(R.string.discovery_failed) + &quot;: &quot; + errorMessage);"
+        errorLine2="                   ~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\local_file_transfer\WifiDirectManager.java"
+            line="128"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `hasSenderStartedConnection` of class `WifiDirectManager` requires synthetic accessor"
+        errorLine1="          hasSenderStartedConnection = true;"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\local_file_transfer\WifiDirectManager.java"
+            line="229"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` field `activity` of class `WifiDirectManager` requires synthetic accessor"
+        errorLine1="        Log.d(TAG, activity.getString(R.string.connection_failed) + &quot;: &quot; + errorMessage);"
+        errorLine2="                   ~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\local_file_transfer\WifiDirectManager.java"
+            line="255"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `closeChannel` of class `WifiDirectManager` requires synthetic accessor"
+        errorLine1="        closeChannel();"
+        errorLine2="        ~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\local_file_transfer\WifiDirectManager.java"
+            line="377"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="SyntheticAccessor"
+        message="Access to `private` method `closeChannel` of class `WifiDirectManager` requires synthetic accessor"
+        errorLine1="        closeChannel();"
+        errorLine2="        ~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\zim_manager\local_file_transfer\WifiDirectManager.java"
+            line="383"
+            column="9"/>
+    </issue>
+
     <issue
         id="SyntheticAccessor"
         message="Access to `private` method `getFilePath` of class `ZimContentProvider` requires synthetic accessor"
@@ -3001,7 +3933,7 @@
         errorLine2="                        ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="467"
+            line="474"
             column="25"/>
     </issue>
 
@@ -3056,7 +3988,7 @@
         errorLine2="                               ^">
         <location
             file="src\main\res\values\strings.xml"
-            line="139"
+            line="138"
             column="32"/>
     </issue>
 
@@ -3095,6 +4027,24 @@
             file="src\main\res\drawable-xhdpi"/>
     </issue>
 
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-xxxhdpi`: ic_action_back.png, ic_action_delete.png, ic_action_forward.png, ic_action_plus.png, kiwix_notification.png">
+        <location
+            file="src\main\res\drawable-xxxhdpi"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="  &lt;TextView"
+        errorLine2="   ~~~~~~~~">
+        <location
+            file="src\main\res\layout\activity_library.xml"
+            line="11"
+            column="4"/>
+    </issue>
+
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
@@ -3135,7 +4085,7 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="33"
+            line="38"
             column="6"/>
     </issue>
 
@@ -3146,19 +4096,30 @@
         errorLine2="     ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="42"
+            line="46"
             column="6"/>
     </issue>
 
     <issue
         id="SelectableText"
         message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
-        errorLine1="    &lt;TextView"
-        errorLine2="     ~~~~~~~~">
+        errorLine1="      &lt;TextView"
+        errorLine2="       ~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="60"
-            column="6"/>
+            line="59"
+            column="8"/>
+    </issue>
+
+    <issue
+        id="SelectableText"
+        message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
+        errorLine1="      &lt;TextView"
+        errorLine2="       ~~~~~~~~">
+        <location
+            file="src\main\res\layout\download_item.xml"
+            line="67"
+            column="8"/>
     </issue>
 
     <issue
@@ -3344,7 +4305,7 @@
         errorLine2="   ~~~~~~~~">
         <location
             file="src\main\res\layout\storage_select_dialog.xml"
-            line="10"
+            line="9"
             column="4"/>
     </issue>
 
@@ -3366,7 +4327,7 @@
         errorLine2="             ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="157"
+            line="158"
             column="14"/>
     </issue>
 
@@ -3377,7 +4338,7 @@
         errorLine2="      ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\zim_manager\ZimManageActivity.kt"
-            line="45"
+            line="47"
             column="7"/>
     </issue>
 
@@ -3399,7 +4360,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1391"
+            line="1412"
             column="50"/>
     </issue>
 
@@ -3410,7 +4371,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1568"
+            line="1592"
             column="41"/>
     </issue>
 
@@ -3421,7 +4382,7 @@
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1569"
+            line="1593"
             column="39"/>
     </issue>
 
@@ -3491,7 +4452,7 @@
         errorLine2="   ~~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="13"
+            line="12"
             column="4"/>
     </issue>
 
@@ -3502,7 +4463,7 @@
         errorLine2="     ~~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="76"
+            line="82"
             column="6"/>
     </issue>
 
@@ -3586,12 +4547,12 @@
     <issue
         id="RtlHardcoded"
         message="Consider adding `android:layout_marginEnd=&quot;@dimen/favicon_margin_right&quot;` to better support right-to-left layouts"
-        errorLine1="      android:layout_marginRight=&quot;@dimen/favicon_margin_right&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    android:layout_marginRight=&quot;@dimen/favicon_margin_right&quot;"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\res\layout\download_item.xml"
-            line="18"
-            column="7"/>
+            line="17"
+            column="5"/>
     </issue>
 
     <issue
@@ -3935,17 +4896,6 @@
             column="15"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  void inject(DownloadService service);"
-        errorLine2="              ~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="57"
-            column="15"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -3953,7 +4903,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="59"
+            line="57"
             column="15"/>
     </issue>
 
@@ -3964,7 +4914,7 @@
         errorLine2="              ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="61"
+            line="59"
             column="15"/>
     </issue>
 
@@ -3975,7 +4925,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="63"
+            line="61"
             column="15"/>
     </issue>
 
@@ -3986,18 +4936,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="65"
-            column="15"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  void inject(DownloadNotificationClickedReceiver downloadNotificationClickedReceiver);"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\di\components\ApplicationComponent.java"
-            line="67"
+            line="63"
             column="15"/>
     </issue>
 
@@ -4008,7 +4947,7 @@
         errorLine2="         ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ApplicationModule.java"
-            line="76"
+            line="77"
             column="10"/>
     </issue>
 
@@ -4019,7 +4958,7 @@
         errorLine2="         ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ApplicationModule.java"
-            line="82"
+            line="83"
             column="10"/>
     </issue>
 
@@ -4030,7 +4969,7 @@
         errorLine2="         ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\ApplicationModule.java"
-            line="88"
+            line="89"
             column="10"/>
     </issue>
 
@@ -4118,7 +5057,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\base\BaseActivity.java"
-            line="48"
+            line="52"
             column="10"/>
     </issue>
 
@@ -5130,7 +6069,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="19"
+            line="17"
             column="3"/>
     </issue>
 
@@ -5141,7 +6080,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="21"
+            line="19"
             column="3"/>
     </issue>
 
@@ -5152,7 +6091,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="21"
+            line="19"
             column="24"/>
     </issue>
 
@@ -5163,7 +6102,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="23"
+            line="21"
             column="3"/>
     </issue>
 
@@ -5174,7 +6113,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="23"
+            line="21"
             column="25"/>
     </issue>
 
@@ -5185,7 +6124,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="25"
+            line="23"
             column="3"/>
     </issue>
 
@@ -5196,7 +6135,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="25"
+            line="23"
             column="29"/>
     </issue>
 
@@ -5207,7 +6146,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="27"
+            line="25"
             column="3"/>
     </issue>
 
@@ -5218,7 +6157,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="29"
+            line="27"
             column="3"/>
     </issue>
 
@@ -5229,7 +6168,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="29"
+            line="27"
             column="27"/>
     </issue>
 
@@ -5240,7 +6179,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="31"
+            line="29"
             column="3"/>
     </issue>
 
@@ -5251,7 +6190,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="31"
+            line="29"
             column="29"/>
     </issue>
 
@@ -5262,7 +6201,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="33"
+            line="31"
             column="3"/>
     </issue>
 
@@ -5273,7 +6212,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="35"
+            line="33"
             column="3"/>
     </issue>
 
@@ -5284,7 +6223,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="37"
+            line="35"
             column="3"/>
     </issue>
 
@@ -5295,7 +6234,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="39"
+            line="37"
             column="3"/>
     </issue>
 
@@ -5306,7 +6245,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="39"
+            line="37"
             column="28"/>
     </issue>
 
@@ -5317,7 +6256,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="41"
+            line="39"
             column="3"/>
     </issue>
 
@@ -5328,29 +6267,29 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="41"
+            line="39"
             column="31"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  Completable deleteBookmark(BookmarkItem bookmark);"
+        errorLine1="  Completable deleteBookmark(String bookmarkUrl);"
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="43"
+            line="41"
             column="3"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  Completable deleteBookmark(BookmarkItem bookmark);"
-        errorLine2="                             ~~~~~~~~~~~~">
+        errorLine1="  Completable deleteBookmark(String bookmarkUrl);"
+        errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="43"
+            line="41"
             column="30"/>
     </issue>
 
@@ -5361,7 +6300,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\DataSource.java"
-            line="45"
+            line="43"
             column="3"/>
     </issue>
 
@@ -5431,149 +6370,6 @@
             column="39"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static String KIWIX_ROOT;"
-        errorLine2="                ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="97"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static ArrayList&lt;String> notifications = new ArrayList&lt;>();"
-        errorLine2="                ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="98"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String notificationTitle;"
-        errorLine2="         ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="102"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public SparseIntArray downloadStatus = new SparseIntArray();"
-        errorLine2="         ~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="103"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public SparseIntArray downloadProgress = new SparseIntArray();"
-        errorLine2="         ~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="104"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public SparseIntArray timeRemaining = new SparseIntArray();"
-        errorLine2="         ~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="105"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static void setDownloadFragment(DownloadFragment dFragment) {"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="123"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public int onStartCommand(Intent intent, int flags, int startId) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="142"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String checkWritable(String path) {"
-        errorLine2="         ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="255"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String checkWritable(String path) {"
-        errorLine2="                              ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="255"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public IBinder onBind(Intent intent) {"
-        errorLine2="         ~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="706"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public IBinder onBind(Intent intent) {"
-        errorLine2="                        ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="706"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public DownloadService getService() {"
-        errorLine2="           ~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\downloader\DownloadService.java"
-            line="715"
-            column="12"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -5816,28 +6612,6 @@
             column="24"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static Bitmap getBitmapFromView(View view) {"
-        errorLine2="                ~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\utils\ImageUtils.java"
-            line="8"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static Bitmap getBitmapFromView(View view) {"
-        errorLine2="                                         ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\utils\ImageUtils.java"
-            line="8"
-            column="42"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -5852,14 +6626,25 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public JNIKiwix providesJNIKiwix() {"
+        errorLine1="  public JNIKiwix providesJNIKiwix(Context context) {"
         errorLine2="         ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\di\modules\JNIModule.java"
-            line="32"
+            line="33"
             column="10"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public JNIKiwix providesJNIKiwix(Context context) {"
+        errorLine2="                                   ~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\di\modules\JNIModule.java"
+            line="33"
+            column="36"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -5867,7 +6652,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\KiwixApplication.java"
-            line="51"
+            line="54"
             column="17"/>
     </issue>
 
@@ -5878,7 +6663,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\KiwixApplication.java"
-            line="55"
+            line="58"
             column="17"/>
     </issue>
 
@@ -5889,7 +6674,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\KiwixApplication.java"
-            line="59"
+            line="62"
             column="46"/>
     </issue>
 
@@ -5900,7 +6685,7 @@
         errorLine2="                                   ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\KiwixApplication.java"
-            line="64"
+            line="67"
             column="36"/>
     </issue>
 
@@ -5911,7 +6696,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\KiwixApplication.java"
-            line="159"
+            line="163"
             column="10"/>
     </issue>
 
@@ -6017,12 +6802,12 @@
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  @GET(&quot;/library/library_zim.xml&quot;) Single&lt;LibraryNetworkEntity> getLibrary();"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="  @GET(LIBRARY_NETWORK_PATH) Single&lt;LibraryNetworkEntity> getLibrary();"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="33"
-            column="36"/>
+            line="36"
+            column="30"/>
     </issue>
 
     <issue
@@ -6032,7 +6817,7 @@
         errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="35"
+            line="38"
             column="8"/>
     </issue>
 
@@ -6043,7 +6828,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="35"
+            line="38"
             column="60"/>
     </issue>
 
@@ -6054,7 +6839,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="40"
+            line="43"
             column="19"/>
     </issue>
 
@@ -6065,7 +6850,7 @@
         errorLine2="                                                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="40"
+            line="43"
             column="51"/>
     </issue>
 
@@ -6076,7 +6861,7 @@
         errorLine2="                                                                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\remote\KiwixService.java"
-            line="40"
+            line="43"
             column="78"/>
     </issue>
 
@@ -6146,17 +6931,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void selectionCallback(StorageDevice storageDevice) {"
-        errorLine2="                                  ~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\settings\KiwixSettingsActivity.java"
-            line="344"
-            column="35"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -6340,7 +7114,7 @@
         errorLine2="                                          ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="54"
+            line="55"
             column="43"/>
     </issue>
 
@@ -6351,7 +7125,7 @@
         errorLine2="                                                        ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="54"
+            line="55"
             column="57"/>
     </issue>
 
@@ -6362,7 +7136,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="88"
+            line="92"
             column="31"/>
     </issue>
 
@@ -6373,7 +7147,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="88"
+            line="92"
             column="60"/>
     </issue>
 
@@ -6384,7 +7158,7 @@
         errorLine2="                                                                               ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="88"
+            line="92"
             column="80"/>
     </issue>
 
@@ -6395,7 +7169,7 @@
         errorLine2="                             ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="93"
+            line="97"
             column="30"/>
     </issue>
 
@@ -6406,7 +7180,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\KiwixWebViewClient.java"
-            line="93"
+            line="97"
             column="44"/>
     </issue>
 
@@ -7154,7 +7928,7 @@
         errorLine2="                                  ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="294"
+            line="297"
             column="35"/>
     </issue>
 
@@ -7165,7 +7939,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="306"
+            line="309"
             column="36"/>
     </issue>
 
@@ -7176,7 +7950,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="326"
+            line="329"
             column="24"/>
     </issue>
 
@@ -7187,7 +7961,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="837"
+            line="857"
             column="40"/>
     </issue>
 
@@ -7198,7 +7972,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1097"
+            line="1117"
             column="31"/>
     </issue>
 
@@ -7209,7 +7983,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1294"
+            line="1317"
             column="41"/>
     </issue>
 
@@ -7220,7 +7994,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1477"
+            line="1499"
             column="30"/>
     </issue>
 
@@ -7231,7 +8005,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1495"
+            line="1517"
             column="35"/>
     </issue>
 
@@ -7242,7 +8016,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1558"
+            line="1580"
             column="38"/>
     </issue>
 
@@ -7253,7 +8027,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1589"
+            line="1613"
             column="65"/>
     </issue>
 
@@ -7264,7 +8038,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1674"
+            line="1698"
             column="38"/>
     </issue>
 
@@ -7275,7 +8049,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="1707"
+            line="1731"
             column="39"/>
     </issue>
 
@@ -7286,7 +8060,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2015"
+            line="2046"
             column="36"/>
     </issue>
 
@@ -7297,7 +8071,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2038"
+            line="2069"
             column="35"/>
     </issue>
 
@@ -7308,7 +8082,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2062"
+            line="2093"
             column="38"/>
     </issue>
 
@@ -7319,7 +8093,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2098"
+            line="2129"
             column="27"/>
     </issue>
 
@@ -7330,7 +8104,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2106"
+            line="2137"
             column="20"/>
     </issue>
 
@@ -7341,7 +8115,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2115"
+            line="2146"
             column="24"/>
     </issue>
 
@@ -7352,10 +8126,21 @@
         errorLine2="                           ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\main\MainActivity.java"
-            line="2131"
+            line="2162"
             column="28"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public FileElement file;"
+        errorLine2="         ~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="33"
+            column="10"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -7389,6 +8174,50 @@
             column="10"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public String name;"
+        errorLine2="           ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="50"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;Url> urls;"
+        errorLine2="           ~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="52"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public Map&lt;String, String> hashes;"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="56"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public Pieces pieces;"
+        errorLine2="           ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="58"
+            column="12"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -7444,6 +8273,50 @@
             column="27"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public String hashType;"
+        errorLine2="           ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="96"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public List&lt;String> pieceHashes;"
+        errorLine2="           ~~~~~~~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="99"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public String location;"
+        errorLine2="           ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="104"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public String value;"
+        errorLine2="           ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\library\entity\MetaLinkNetworkEntity.java"
+            line="110"
+            column="12"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -7825,7 +8698,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="83"
+            line="82"
             column="10"/>
     </issue>
 
@@ -7836,7 +8709,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="83"
+            line="82"
             column="33"/>
     </issue>
 
@@ -7847,7 +8720,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="87"
+            line="86"
             column="10"/>
     </issue>
 
@@ -7858,7 +8731,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="100"
+            line="106"
             column="10"/>
     </issue>
 
@@ -7869,7 +8742,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="100"
+            line="106"
             column="37"/>
     </issue>
 
@@ -7880,7 +8753,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="109"
+            line="115"
             column="31"/>
     </issue>
 
@@ -7891,7 +8764,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="121"
+            line="127"
             column="35"/>
     </issue>
 
@@ -7902,18 +8775,18 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="125"
+            line="131"
             column="30"/>
     </issue>
 
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public Flowable&lt;String> getPrefStorages(){"
+        errorLine1="  public Flowable&lt;String> getPrefStorages() {"
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\utils\SharedPreferenceUtil.java"
-            line="130"
+            line="136"
             column="10"/>
     </issue>
 
@@ -8082,215 +8955,6 @@
             column="27"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public StorageDevice(String path, boolean internal) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="41"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public StorageDevice(File file, boolean internal) {"
-        errorLine2="                       ~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="49"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String getName() {"
-        errorLine2="         ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="58"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String getSize() {"
-        errorLine2="         ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="63"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public String getTotalSize() {"
-        errorLine2="         ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="76"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public File getPath() {"
-        errorLine2="         ~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDevice.java"
-            line="114"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static ArrayList&lt;StorageDevice> getStorageDevices(Context context, boolean writable) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDeviceUtils.java"
-            line="33"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public static ArrayList&lt;StorageDevice> getStorageDevices(Context context, boolean writable) {"
-        errorLine2="                                                           ~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageDeviceUtils.java"
-            line="33"
-            column="60"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void onCreate(Bundle savedInstanceState) {"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="56"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public View onCreateView(LayoutInflater inflater, ViewGroup container,"
-        errorLine2="         ~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="70"
-            column="10"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public View onCreateView(LayoutInflater inflater, ViewGroup container,"
-        errorLine2="                           ~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="70"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public View onCreateView(LayoutInflater inflater, ViewGroup container,"
-        errorLine2="                                                    ~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="70"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="      Bundle savedInstanceState) {"
-        errorLine2="      ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="71"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void onItemClick(AdapterView&lt;?> parent, View view, int position, long id) {"
-        errorLine2="                          ~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="94"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void onItemClick(AdapterView&lt;?> parent, View view, int position, long id) {"
-        errorLine2="                                                 ~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="94"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void setOnSelectListener(OnSelectListener selectListener) {"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="101"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void selectionCallback(StorageDevice s);"
-        errorLine2="                           ~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="106"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void show(FragmentManager fm, String text) {"
-        errorLine2="                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="110"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="  public void show(FragmentManager fm, String text) {"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src\main\java\eu\mhutti1\utils\storage\StorageSelectDialog.java"
-            line="110"
-            column="40"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -8467,28 +9131,6 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void onSelectTab(View view, int position);"
-        errorLine2="                     ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\main\TabsAdapter.java"
-            line="162"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void onCloseTab(View view, int position);"
-        errorLine2="                    ~~~~">
-        <location
-            file="src\main\java\org\kiwix\kiwixmobile\main\TabsAdapter.java"
-            line="164"
-            column="21"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -9039,6 +9681,39 @@
             column="25"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public static String getRedirect(String url) {"
+        errorLine2="                ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
+            line="368"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public static String getRedirect(String url) {"
+        errorLine2="                                   ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
+            line="368"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="  public static boolean isRedirect(String url) {"
+        errorLine2="                                   ~~~~~~">
+        <location
+            file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
+            line="373"
+            column="36"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -9046,7 +9721,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="369"
+            line="378"
             column="10"/>
     </issue>
 
@@ -9057,7 +9732,7 @@
         errorLine2="                                       ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="369"
+            line="378"
             column="40"/>
     </issue>
 
@@ -9068,7 +9743,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="369"
+            line="378"
             column="49"/>
     </issue>
 
@@ -9079,7 +9754,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="423"
+            line="430"
             column="10"/>
     </issue>
 
@@ -9090,7 +9765,7 @@
         errorLine2="                      ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="423"
+            line="430"
             column="23"/>
     </issue>
 
@@ -9101,7 +9776,7 @@
         errorLine2="                               ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="423"
+            line="430"
             column="32"/>
     </issue>
 
@@ -9112,7 +9787,7 @@
         errorLine2="                                                    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="423"
+            line="430"
             column="53"/>
     </issue>
 
@@ -9123,7 +9798,7 @@
         errorLine2="      ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="424"
+            line="431"
             column="7"/>
     </issue>
 
@@ -9134,7 +9809,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="424"
+            line="431"
             column="31"/>
     </issue>
 
@@ -9145,7 +9820,7 @@
         errorLine2="         ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="429"
+            line="436"
             column="10"/>
     </issue>
 
@@ -9156,7 +9831,7 @@
         errorLine2="                    ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="429"
+            line="436"
             column="21"/>
     </issue>
 
@@ -9167,7 +9842,7 @@
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="429"
+            line="436"
             column="30"/>
     </issue>
 
@@ -9178,7 +9853,7 @@
         errorLine2="                    ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="434"
+            line="441"
             column="21"/>
     </issue>
 
@@ -9189,7 +9864,7 @@
         errorLine2="                             ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="434"
+            line="441"
             column="30"/>
     </issue>
 
@@ -9200,7 +9875,7 @@
         errorLine2="                                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="434"
+            line="441"
             column="52"/>
     </issue>
 
@@ -9211,7 +9886,7 @@
         errorLine2="      ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="435"
+            line="442"
             column="7"/>
     </issue>
 
@@ -9222,7 +9897,7 @@
         errorLine2="                    ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="440"
+            line="447"
             column="21"/>
     </issue>
 
@@ -9233,7 +9908,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="440"
+            line="447"
             column="30"/>
     </issue>
 
@@ -9244,7 +9919,7 @@
         errorLine2="                                           ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\data\ZimContentProvider.java"
-            line="440"
+            line="447"
             column="44"/>
     </issue>
 
diff --git a/app/objectbox-models/default.json.bak b/app/objectbox-models/default.json.bak
index 667cdafb9..9ed3079c0 100644
--- a/app/objectbox-models/default.json.bak
+++ b/app/objectbox-models/default.json.bak
@@ -3,74 +3,6 @@
   "_note2": "ObjectBox manages crucial IDs for your object model. See docs for details.",
   "_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
   "entities": [
-    {
-      "id": "1:7257718270326155947",
-      "lastPropertyId": "17:8085320504542486236",
-      "name": "DownloadEntity",
-      "properties": [
-        {
-          "id": "1:2266566996008201697",
-          "name": "id"
-        },
-        {
-          "id": "2:1953917250527765737",
-          "name": "downloadId"
-        },
-        {
-          "id": "5:6575412958851693470",
-          "name": "bookId"
-        },
-        {
-          "id": "6:1075612111256674117",
-          "name": "title"
-        },
-        {
-          "id": "7:2831524841121029990",
-          "name": "description"
-        },
-        {
-          "id": "8:2334902404590133038",
-          "name": "language"
-        },
-        {
-          "id": "9:5087250349738158996",
-          "name": "creator"
-        },
-        {
-          "id": "10:6128960350043895299",
-          "name": "publisher"
-        },
-        {
-          "id": "11:3850323036475883785",
-          "name": "date"
-        },
-        {
-          "id": "12:5288623325038033644",
-          "name": "url"
-        },
-        {
-          "id": "13:2501711400901908648",
-          "name": "articleCount"
-        },
-        {
-          "id": "14:3550975911715416030",
-          "name": "mediaCount"
-        },
-        {
-          "id": "15:8949996430663588693",
-          "name": "size"
-        },
-        {
-          "id": "16:7554483297276446029",
-          "name": "name"
-        },
-        {
-          "id": "17:8085320504542486236",
-          "name": "favIcon"
-        }
-      ],
-      "relations": []
-    },
     {
       "id": "3:5536749840871435068",
       "lastPropertyId": "16:6142333908132117423",
@@ -367,7 +299,8 @@
   "modelVersion": 4,
   "modelVersionParserMinimum": 4,
   "retiredEntityUids": [
-    349148274283701276
+    349148274283701276,
+    7257718270326155947
   ],
   "retiredIndexUids": [
     1293695782925933448,
@@ -394,7 +327,22 @@
     7273406943564025911,
     428251106490095982,
     5162677841083528491,
-    7886541039889727771
+    7886541039889727771,
+    2266566996008201697,
+    1953917250527765737,
+    6575412958851693470,
+    1075612111256674117,
+    2831524841121029990,
+    2334902404590133038,
+    5087250349738158996,
+    6128960350043895299,
+    3850323036475883785,
+    5288623325038033644,
+    2501711400901908648,
+    3550975911715416030,
+    8949996430663588693,
+    7554483297276446029,
+    8085320504542486236
   ],
   "retiredRelationUids": [],
   "version": 1
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadViewHolder.kt b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadViewHolder.kt
index ebcad6933..28f1330f4 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadViewHolder.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadViewHolder.kt
@@ -51,9 +51,7 @@ class DownloadViewHolder(override val containerView: View) : RecyclerView.ViewHo
     stop.setOnClickListener {
       itemClickListener.invoke(downloadItem)
     }
-    downloadState.text = toReadableState(
-      downloadItem.downloadState, containerView.context
-    )
+    downloadState.text = toReadableState(downloadItem.downloadState, containerView.context)
     eta.text = downloadItem.eta.takeIf { it.seconds > 0L }?.toHumanReadableTime() ?: ""
   }
 
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
index 8dd40bec5..8e9f2394e 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/utils/files/FileSearchTest.kt
@@ -61,7 +61,7 @@ class FileSearchTest {
     every { Environment.getExternalStorageDirectory() } returns externalStorageDirectory
     every { externalStorageDirectory.absolutePath } returns "/externalStorageDirectory"
     every { context.contentResolver } returns contentResolver
-    every { StorageDeviceUtils.getReadableStorage(context, false) } returns arrayListOf(
+    every { StorageDeviceUtils.getReadableStorage(context) } returns arrayListOf(
       storageDevice
     )
     every { storageDevice.name } returns "/deviceDir"
@@ -80,7 +80,7 @@ class FileSearchTest {
     @Test
     fun `scan of directory that doesn't exist returns nothing`() {
       every { contentResolver.query(any(), any(), any(), any(), any()) } returns null
-      fileSearch.scan("doesNotExist")
+      fileSearch.scan()
         .test()
         .assertValue(listOf())
     }
@@ -91,7 +91,8 @@ class FileSearchTest {
       val zimaaFile = File.createTempFile("fileToFind2", ".zimaa")
       File.createTempFile("willNotFind", ".txt")
       every { contentResolver.query(any(), any(), any(), any(), any()) } returns null
-      val fileList = fileSearch.scan(zimFile.parent)
+      every { storageDevice.name } returns zimFile.parent
+      val fileList = fileSearch.scan()
         .test()
         .values()[0]
       assertThat(fileList).containsExactlyInAnyOrder(zimFile, zimaaFile)
@@ -106,7 +107,8 @@ class FileSearchTest {
         ".zim",
         File("$tempRoot${File.separator}dir").apply { mkdirs() })
       every { contentResolver.query(any(), any(), any(), any(), any()) } returns null
-      val fileList = fileSearch.scan(zimFile.parentFile.parent)
+      every { storageDevice.name } returns tempRoot
+      val fileList = fileSearch.scan()
         .test()
         .values()[0]
       assertThat(fileList).containsExactlyInAnyOrder(zimFile)
@@ -120,7 +122,7 @@ class FileSearchTest {
     fun `scan media store, if files are readable they are returned`() {
       val fileToFind = File.createTempFile("fileToFind", ".zim")
       expectFromMediaStore(fileToFind)
-      fileSearch.scan("")
+      fileSearch.scan()
         .test()
         .assertValue(listOf(fileToFind))
     }
@@ -130,7 +132,7 @@ class FileSearchTest {
       val unreadableFile = File.createTempFile("fileToFind", ".zim")
       expectFromMediaStore(unreadableFile)
       unreadableFile.delete()
-      fileSearch.scan("")
+      fileSearch.scan()
         .test()
         .assertValue(listOf())
     }
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
index ede3385c1..6b44358a0 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
@@ -25,6 +25,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import io.reactivex.Single
+import io.reactivex.processors.BehaviorProcessor
 import io.reactivex.processors.PublishProcessor
 import io.reactivex.schedulers.TestScheduler
 import org.junit.jupiter.api.AfterAll
@@ -38,17 +39,12 @@ import org.kiwix.kiwixmobile.book
 import org.kiwix.kiwixmobile.bookOnDisk
 import org.kiwix.kiwixmobile.data.DataSource
 import org.kiwix.kiwixmobile.data.remote.KiwixService
+import org.kiwix.kiwixmobile.database.newdb.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.database.newdb.dao.NewBookDao
-import org.kiwix.kiwixmobile.database.newdb.dao.NewDownloadDao
 import org.kiwix.kiwixmobile.database.newdb.dao.NewLanguagesDao
+import org.kiwix.kiwixmobile.downloadItem
 import org.kiwix.kiwixmobile.downloadModel
-import org.kiwix.kiwixmobile.downloadStatus
-import org.kiwix.kiwixmobile.downloader.Downloader
-import org.kiwix.kiwixmobile.downloader.model.DownloadItem
 import org.kiwix.kiwixmobile.downloader.model.DownloadModel
-import org.kiwix.kiwixmobile.downloader.model.DownloadState
-import org.kiwix.kiwixmobile.downloader.model.DownloadStatus
-import org.kiwix.kiwixmobile.downloader.model.UriToFileConverter
 import org.kiwix.kiwixmobile.language
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book
 import org.kiwix.kiwixmobile.libraryNetworkEntity
@@ -65,7 +61,6 @@ import org.kiwix.kiwixmobile.zim_manager.fileselect_view.StorageObserver
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem
-import java.io.File
 import java.util.Locale
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.util.concurrent.TimeUnit.SECONDS
@@ -73,17 +68,15 @@ import java.util.concurrent.TimeUnit.SECONDS
 @ExtendWith(InstantExecutorExtension::class)
 class ZimManageViewModelTest {
 
-  private val newDownloadDao: NewDownloadDao = mockk()
+  private val downloadDao: FetchDownloadDao = mockk()
   private val newBookDao: NewBookDao = mockk()
   private val newLanguagesDao: NewLanguagesDao = mockk()
-  private val downloader: Downloader = mockk()
   private val storageObserver: StorageObserver = mockk()
   private val kiwixService: KiwixService = mockk()
   private val application: Application = mockk()
   private val connectivityBroadcastReceiver: ConnectivityBroadcastReceiver = mockk()
   private val bookUtils: BookUtils = mockk()
   private val fat32Checker: Fat32Checker = mockk()
-  private val uriToFileConverter: UriToFileConverter = mockk()
   private val defaultLanguageProvider: DefaultLanguageProvider = mockk()
   private val dataSource: DataSource = mockk()
   lateinit var viewModel: ZimManageViewModel
@@ -92,7 +85,7 @@ class ZimManageViewModelTest {
   private val booksOnFileSystem: PublishProcessor<List<BookOnDisk>> = PublishProcessor.create()
   private val books: PublishProcessor<List<BookOnDisk>> = PublishProcessor.create()
   private val languages: PublishProcessor<List<Language>> = PublishProcessor.create()
-  private val fileSystemStates: PublishProcessor<FileSystemState> = PublishProcessor.create()
+  private val fileSystemStates: BehaviorProcessor<FileSystemState> = BehaviorProcessor.create()
   private val networkStates: PublishProcessor<NetworkState> = PublishProcessor.create()
   private val booksOnDiskListItems: PublishProcessor<List<BooksOnDiskListItem>> =
     PublishProcessor.create()
@@ -112,7 +105,7 @@ class ZimManageViewModelTest {
   fun init() {
     clearAllMocks()
     every { connectivityBroadcastReceiver.action } returns "test"
-    every { newDownloadDao.downloads() } returns downloads
+    every { downloadDao.downloads() } returns downloads
     every { newBookDao.books() } returns books
     every { storageObserver.booksOnFileSystem } returns booksOnFileSystem
     every { newLanguagesDao.languages() } returns languages
@@ -121,9 +114,17 @@ class ZimManageViewModelTest {
     every { application.registerReceiver(any(), any()) } returns mockk()
     every { dataSource.booksOnDiskAsListItems() } returns booksOnDiskListItems
     viewModel = ZimManageViewModel(
-      newDownloadDao, newBookDao, newLanguagesDao, downloader,
-      storageObserver, kiwixService, application, connectivityBroadcastReceiver, bookUtils,
-      fat32Checker, uriToFileConverter, defaultLanguageProvider, dataSource
+      downloadDao,
+      newBookDao,
+      newLanguagesDao,
+      storageObserver,
+      kiwixService,
+      application,
+      connectivityBroadcastReceiver,
+      bookUtils,
+      fat32Checker,
+      defaultLanguageProvider,
+      dataSource
     )
     testScheduler.triggerActions()
   }
@@ -150,63 +151,19 @@ class ZimManageViewModelTest {
   @Nested
   inner class Downloads {
     @Test
-    fun `on emission from database query and render downloads`() {
-      val expectedStatus = downloadStatus()
-      expectStatusWith(listOf(expectedStatus))
+    fun `on emission from database render downloads`() {
+      expectDownloads()
       viewModel.downloadItems
         .test()
-        .assertValue(listOf(DownloadItem(expectedStatus)))
+        .assertValue(listOf(downloadItem()))
     }
 
-    @Test
-    fun `on emission of successful status create a book and delete the download`() {
-      every { uriToFileConverter.convert(any()) } returns File("test")
-      val expectedStatus = downloadStatus(
-        downloadId = 10L,
-        downloadState = DownloadState.Successful
-      )
-      expectStatusWith(listOf(expectedStatus))
-      val element = expectedStatus.toBookOnDisk(uriToFileConverter)
-      verify {
-        newBookDao.insert(listOf(element))
-        newDownloadDao.delete(10L)
-      }
-    }
-
-    @Test
-    fun `if statuses don't have a matching Id for download in db over 3 secs then delete`() {
-      expectStatusWith(
-        listOf(downloadStatus(downloadId = 1)),
-        listOf(downloadModel(downloadId = 1), downloadModel(downloadId = 3))
-      )
-      testScheduler.advanceTimeBy(3, SECONDS)
-      testScheduler.triggerActions()
-      verify {
-        newDownloadDao.delete(3)
-      }
-    }
-
-    @Test
-    fun `if statuses do have a matching Id for download in db over 3 secs then don't delete`() {
-      expectStatusWith(
-        listOf(downloadStatus(downloadId = 1)),
-        listOf(downloadModel(downloadId = 1))
-      )
-      testScheduler.advanceTimeBy(3, SECONDS)
-      testScheduler.triggerActions()
-      verify(exactly = 0) {
-        newDownloadDao.delete(any())
-      }
-    }
-
-    private fun expectStatusWith(
-      expectedStatuses: List<DownloadStatus>,
+    private fun expectDownloads(
       expectedDownloads: List<DownloadModel> = listOf(
         downloadModel()
       )
     ) {
       every { application.getString(any()) } returns ""
-      every { downloader.queryStatus(expectedDownloads) } returns expectedStatuses
       downloads.offer(expectedDownloads)
       testScheduler.triggerActions()
       testScheduler.advanceTimeBy(1, SECONDS)
@@ -387,7 +344,6 @@ class ZimManageViewModelTest {
 
   @Test
   fun `library update removes from sources`() {
-    every { downloader.queryStatus(any()) } returns emptyList()
     every { application.getString(R.string.your_languages) } returns "1"
     every { application.getString(R.string.other_languages) } returns "2"
     val bookAlreadyOnDisk = book(
diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt
index 1b36f0156..9a6cf236e 100644
--- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserverTest.kt
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test
 import org.kiwix.kiwixmobile.book
 import org.kiwix.kiwixmobile.bookOnDisk
 import org.kiwix.kiwixmobile.data.ZimContentProvider
-import org.kiwix.kiwixmobile.database.newdb.dao.NewDownloadDao
+import org.kiwix.kiwixmobile.database.newdb.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book
 import org.kiwix.kiwixmobile.resetSchedulers
@@ -44,7 +44,7 @@ import java.io.File
 class StorageObserverTest {
 
   private val sharedPreferenceUtil: SharedPreferenceUtil = mockk()
-  private val newDownloadDao: NewDownloadDao = mockk()
+  private val downloadDao: FetchDownloadDao = mockk()
   private val fileSearch: FileSearch = mockk()
   private val downloadModel = mockk<DownloadModel>()
   private val file = mockk<File>()
@@ -66,9 +66,9 @@ class StorageObserverTest {
   @BeforeEach fun init() {
     clearAllMocks()
     every { sharedPreferenceUtil.prefStorage } returns "a"
-    every { fileSearch.scan("a") } returns files
-    every { newDownloadDao.downloads() } returns downloads
-    storageObserver = StorageObserver(newDownloadDao, fileSearch)
+    every { fileSearch.scan() } returns files
+    every { downloadDao.downloads() } returns downloads
+    storageObserver = StorageObserver(downloadDao, fileSearch)
   }
 
   @Test
diff --git a/app/src/testShared/org/kiwix/kiwixmobile/TestModelFunctions.kt b/app/src/testShared/org/kiwix/kiwixmobile/TestModelFunctions.kt
index 2f521aeeb..e5790b345 100644
--- a/app/src/testShared/org/kiwix/kiwixmobile/TestModelFunctions.kt
+++ b/app/src/testShared/org/kiwix/kiwixmobile/TestModelFunctions.kt
@@ -17,10 +17,15 @@
  */
 package org.kiwix.kiwixmobile
 
+import com.tonyodev.fetch2.Error
+import com.tonyodev.fetch2.Status
+import com.tonyodev.fetch2.Status.NONE
+import org.kiwix.kiwixmobile.downloader.model.Base64String
+import org.kiwix.kiwixmobile.downloader.model.DownloadItem
 import org.kiwix.kiwixmobile.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.downloader.model.DownloadState
 import org.kiwix.kiwixmobile.downloader.model.DownloadState.Pending
-import org.kiwix.kiwixmobile.downloader.model.DownloadStatus
+import org.kiwix.kiwixmobile.downloader.model.Seconds
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.LanguageItem
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity
 import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity.Book
@@ -39,29 +44,37 @@ fun bookOnDisk(
   file: File = File("")
 ) = BookOnDisk(databaseId, book, file)
 
-fun downloadStatus(
-  downloadId: Long = 0L,
-  title: String = "",
-  description: String = "",
-  downloadState: DownloadState = Pending,
-  bytesDownloadedSoFar: Long = 0L,
-  totalSizeBytes: Long = 0L,
-  lastModified: String = "",
-  localUri: String? = null,
-  mediaProviderUri: String? = null,
-  mediaType: String? = null,
-  uri: String? = null,
+fun downloadModel(
+  databaseId: Long = 1L,
+  downloadId: Long = 1L,
+  file: String = "",
+  etaInMilliSeconds: Long = 0L,
+  bytesDownloaded: Long = 1L,
+  totalSizeOfDownload: Long = 1L,
+  status: Status = NONE,
+  error: Error = Error.NONE,
+  progress: Int = 1,
   book: Book = book()
-) = DownloadStatus(
-  downloadId, title, description, downloadState, bytesDownloadedSoFar,
-  totalSizeBytes, lastModified, localUri, mediaProviderUri, mediaType, uri, book
+) = DownloadModel(
+  databaseId, downloadId, file, etaInMilliSeconds, bytesDownloaded, totalSizeOfDownload,
+  status, error, progress, book
 )
 
-fun downloadModel(
-  databaseId: Long? = 1L,
+fun downloadItem(
   downloadId: Long = 1L,
-  book: Book = book()
-) = DownloadModel(databaseId, downloadId, book)
+  favIcon: Base64String = Base64String("favIcon"),
+  title: String = "title",
+  description: String = "description",
+  bytesDownloaded: Long = 1L,
+  totalSizeBytes: Long = 1L,
+  progress: Int = 1,
+  eta: Seconds = Seconds(0),
+  state: DownloadState = Pending
+) =
+  DownloadItem(
+    downloadId, favIcon, title, description, bytesDownloaded,
+    totalSizeBytes, progress, eta, state
+  )
 
 fun language(
   id: Long = 0,