diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 470a71779..08d4888ea 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -8,6 +8,15 @@
             file="..\..\..\.android\lint\customlint.jar"/>
     </issue>
 
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Lint found an issue registry (`butterknife.lint.LintRegistry`) which is older than the current API level; these checks may not work correctly.&#xA;&#xA;Recompile the checks against the latest version. Custom check API version is 2 (3.2), current lint API level is 5 (3.5+)"
+        includedVariants="debug"
+        excludedVariants="release">
+        <location
+            file="..\..\..\.gradle\caches\transforms-2\files-2.1\155b1c6c67a15ea2c33b631c0e6e3dd4\butterknife-runtime-10.1.0\jars\lint.jar"/>
+    </issue>
+
     <issue
         id="OldTargetApi"
         message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the android.os.Build.VERSION_CODES javadoc for details."
diff --git a/core/lint-baseline.xml b/core/lint-baseline.xml
index 1b939ed45..c21c94da8 100644
--- a/core/lint-baseline.xml
+++ b/core/lint-baseline.xml
@@ -15,7 +15,7 @@
         errorLine2="              ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\extensions\ConnectivityManagerExtensions.kt"
-            line="9"
+            line="27"
             column="15"/>
     </issue>
 
@@ -81,7 +81,7 @@
         errorLine2="                                                ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="62"
+            line="80"
             column="49"/>
     </issue>
 
@@ -92,7 +92,7 @@
         errorLine2="                                                                               ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="62"
+            line="80"
             column="80"/>
     </issue>
 
@@ -103,7 +103,7 @@
         errorLine2="                                              ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="68"
+            line="86"
             column="47"/>
     </issue>
 
@@ -114,7 +114,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="69"
+            line="87"
             column="33"/>
     </issue>
 
@@ -198,7 +198,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1830"
+            line="1832"
             column="34"/>
     </issue>
 
@@ -576,7 +576,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1456"
+            line="1458"
             column="5"/>
     </issue>
 
@@ -664,7 +664,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\AddNoteDialog.java"
-            line="154"
+            line="172"
             column="9"/>
     </issue>
 
@@ -675,7 +675,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\AddNoteDialog.java"
-            line="155"
+            line="173"
             column="9"/>
     </issue>
 
@@ -686,7 +686,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\AddNoteDialog.java"
-            line="156"
+            line="174"
             column="9"/>
     </issue>
 
@@ -697,7 +697,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\AddNoteDialog.java"
-            line="213"
+            line="231"
             column="9"/>
     </issue>
 
@@ -752,7 +752,7 @@
         errorLine2="      ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="65"
+            line="83"
             column="7"/>
     </issue>
 
@@ -763,7 +763,7 @@
         errorLine2="        ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="67"
+            line="85"
             column="9"/>
     </issue>
 
@@ -774,7 +774,7 @@
         errorLine2="                               ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="67"
+            line="85"
             column="32"/>
     </issue>
 
@@ -785,7 +785,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="68"
+            line="86"
             column="38"/>
     </issue>
 
@@ -796,7 +796,7 @@
         errorLine2="                         ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="69"
+            line="87"
             column="26"/>
     </issue>
 
@@ -807,7 +807,7 @@
         errorLine2="          ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="70"
+            line="88"
             column="11"/>
     </issue>
 
@@ -818,7 +818,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="71"
+            line="89"
             column="11"/>
     </issue>
 
@@ -829,7 +829,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="72"
+            line="90"
             column="11"/>
     </issue>
 
@@ -840,7 +840,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="72"
+            line="90"
             column="61"/>
     </issue>
 
@@ -851,7 +851,7 @@
         errorLine2="                                                  ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="74"
+            line="92"
             column="51"/>
     </issue>
 
@@ -862,7 +862,7 @@
         errorLine2="          ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="83"
+            line="101"
             column="11"/>
     </issue>
 
@@ -873,7 +873,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="84"
+            line="102"
             column="9"/>
     </issue>
 
@@ -884,7 +884,7 @@
         errorLine2="      ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="86"
+            line="104"
             column="7"/>
     </issue>
 
@@ -895,7 +895,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="87"
+            line="105"
             column="11"/>
     </issue>
 
@@ -906,7 +906,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="88"
+            line="106"
             column="9"/>
     </issue>
 
@@ -917,7 +917,7 @@
         errorLine2="        ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="132"
+            line="150"
             column="9"/>
     </issue>
 
@@ -928,7 +928,7 @@
         errorLine2="                             ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="133"
+            line="151"
             column="30"/>
     </issue>
 
@@ -939,7 +939,7 @@
         errorLine2="        ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="133"
+            line="151"
             column="9"/>
     </issue>
 
@@ -950,7 +950,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="135"
+            line="153"
             column="11"/>
     </issue>
 
@@ -961,7 +961,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="138"
+            line="156"
             column="35"/>
     </issue>
 
@@ -972,7 +972,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="39"
+            line="57"
             column="15"/>
     </issue>
 
@@ -983,7 +983,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="39"
+            line="57"
             column="38"/>
     </issue>
 
@@ -994,7 +994,7 @@
         errorLine2="            ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="40"
+            line="58"
             column="13"/>
     </issue>
 
@@ -1005,7 +1005,7 @@
         errorLine2="          ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksPresenter.java"
-            line="42"
+            line="60"
             column="11"/>
     </issue>
 
@@ -1170,7 +1170,7 @@
         errorLine2="      ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="69"
+            line="87"
             column="7"/>
     </issue>
 
@@ -1181,7 +1181,7 @@
         errorLine2="                              ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="71"
+            line="89"
             column="31"/>
     </issue>
 
@@ -1192,7 +1192,7 @@
         errorLine2="        ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="71"
+            line="89"
             column="9"/>
     </issue>
 
@@ -1203,7 +1203,7 @@
         errorLine2="                                       ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="72"
+            line="90"
             column="40"/>
     </issue>
 
@@ -1214,7 +1214,7 @@
         errorLine2="                         ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="73"
+            line="91"
             column="26"/>
     </issue>
 
@@ -1225,7 +1225,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="78"
+            line="96"
             column="36"/>
     </issue>
 
@@ -1236,7 +1236,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="79"
+            line="97"
             column="30"/>
     </issue>
 
@@ -1247,7 +1247,7 @@
         errorLine2="                              ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="80"
+            line="98"
             column="31"/>
     </issue>
 
@@ -1258,7 +1258,7 @@
         errorLine2="                                                    ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="80"
+            line="98"
             column="53"/>
     </issue>
 
@@ -1269,7 +1269,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="81"
+            line="99"
             column="13"/>
     </issue>
 
@@ -1280,7 +1280,7 @@
         errorLine2="            ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="82"
+            line="100"
             column="13"/>
     </issue>
 
@@ -1291,7 +1291,7 @@
         errorLine2="                     ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="84"
+            line="102"
             column="22"/>
     </issue>
 
@@ -1302,7 +1302,7 @@
         errorLine2="          ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="85"
+            line="103"
             column="11"/>
     </issue>
 
@@ -1313,7 +1313,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="86"
+            line="104"
             column="11"/>
     </issue>
 
@@ -1324,7 +1324,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="87"
+            line="105"
             column="11"/>
     </issue>
 
@@ -1335,7 +1335,7 @@
         errorLine2="                                                          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="87"
+            line="105"
             column="59"/>
     </issue>
 
@@ -1346,7 +1346,7 @@
         errorLine2="                                                ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="89"
+            line="107"
             column="49"/>
     </issue>
 
@@ -1357,7 +1357,7 @@
         errorLine2="          ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="98"
+            line="116"
             column="11"/>
     </issue>
 
@@ -1368,7 +1368,7 @@
         errorLine2="        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="99"
+            line="117"
             column="9"/>
     </issue>
 
@@ -1379,7 +1379,7 @@
         errorLine2="      ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="101"
+            line="119"
             column="7"/>
     </issue>
 
@@ -1390,7 +1390,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="102"
+            line="120"
             column="11"/>
     </issue>
 
@@ -1401,7 +1401,7 @@
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="103"
+            line="121"
             column="9"/>
     </issue>
 
@@ -1412,7 +1412,7 @@
         errorLine2="        ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="167"
+            line="185"
             column="9"/>
     </issue>
 
@@ -1423,7 +1423,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="168"
+            line="186"
             column="28"/>
     </issue>
 
@@ -1434,7 +1434,7 @@
         errorLine2="        ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="168"
+            line="186"
             column="9"/>
     </issue>
 
@@ -1445,7 +1445,7 @@
         errorLine2="          ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="170"
+            line="188"
             column="11"/>
     </issue>
 
@@ -1456,7 +1456,7 @@
         errorLine2="                                ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="173"
+            line="191"
             column="33"/>
     </issue>
 
@@ -1467,7 +1467,7 @@
         errorLine2="              ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="40"
+            line="58"
             column="15"/>
     </issue>
 
@@ -1478,7 +1478,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="40"
+            line="58"
             column="38"/>
     </issue>
 
@@ -1489,7 +1489,7 @@
         errorLine2="            ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="41"
+            line="59"
             column="13"/>
     </issue>
 
@@ -1500,7 +1500,7 @@
         errorLine2="          ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryPresenter.java"
-            line="43"
+            line="61"
             column="11"/>
     </issue>
 
@@ -1511,7 +1511,7 @@
         errorLine2="          ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="43"
+            line="61"
             column="11"/>
     </issue>
 
@@ -1522,7 +1522,7 @@
         errorLine2="          ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="44"
+            line="62"
             column="11"/>
     </issue>
 
@@ -1533,7 +1533,7 @@
         errorLine2="                          ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="45"
+            line="63"
             column="27"/>
     </issue>
 
@@ -1544,7 +1544,7 @@
         errorLine2="          ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="48"
+            line="66"
             column="11"/>
     </issue>
 
@@ -1555,7 +1555,7 @@
         errorLine2="          ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="49"
+            line="67"
             column="11"/>
     </issue>
 
@@ -1566,7 +1566,7 @@
         errorLine2="                           ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="50"
+            line="68"
             column="28"/>
     </issue>
 
@@ -1577,7 +1577,7 @@
         errorLine2="        ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="52"
+            line="70"
             column="9"/>
     </issue>
 
@@ -1588,7 +1588,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="58"
+            line="76"
             column="11"/>
     </issue>
 
@@ -1599,7 +1599,7 @@
         errorLine2="        ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="83"
+            line="101"
             column="9"/>
     </issue>
 
@@ -1610,7 +1610,7 @@
         errorLine2="              ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="84"
+            line="102"
             column="15"/>
     </issue>
 
@@ -1621,7 +1621,7 @@
         errorLine2="                             ~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="84"
+            line="102"
             column="30"/>
     </issue>
 
@@ -1632,7 +1632,7 @@
         errorLine2="            ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="85"
+            line="103"
             column="13"/>
     </issue>
 
@@ -1643,7 +1643,7 @@
         errorLine2="                                   ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="87"
+            line="105"
             column="36"/>
     </issue>
 
@@ -1797,7 +1797,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\LanguageContainer.kt"
-            line="7"
+            line="25"
             column="5"/>
     </issue>
 
@@ -1808,7 +1808,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\LanguageUtils.kt"
-            line="217"
+            line="216"
             column="19"/>
     </issue>
 
@@ -1819,7 +1819,7 @@
         errorLine2="      ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\LanguageUtils.kt"
-            line="224"
+            line="223"
             column="7"/>
     </issue>
 
@@ -2094,7 +2094,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="39"
+            line="57"
             column="25"/>
     </issue>
 
@@ -2105,7 +2105,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="41"
+            line="59"
             column="25"/>
     </issue>
 
@@ -2116,7 +2116,7 @@
         errorLine2="                   ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\local_file_transfer\WifiDirectManager.java"
-            line="128"
+            line="146"
             column="20"/>
     </issue>
 
@@ -2127,7 +2127,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\local_file_transfer\WifiDirectManager.java"
-            line="229"
+            line="247"
             column="11"/>
     </issue>
 
@@ -2138,7 +2138,7 @@
         errorLine2="                   ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\local_file_transfer\WifiDirectManager.java"
-            line="255"
+            line="273"
             column="20"/>
     </issue>
 
@@ -2149,7 +2149,7 @@
         errorLine2="        ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\local_file_transfer\WifiDirectManager.java"
-            line="377"
+            line="395"
             column="9"/>
     </issue>
 
@@ -2160,7 +2160,7 @@
         errorLine2="        ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\local_file_transfer\WifiDirectManager.java"
-            line="383"
+            line="401"
             column="9"/>
     </issue>
 
@@ -2171,7 +2171,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="112"
+            line="117"
             column="34"/>
     </issue>
 
@@ -2182,7 +2182,7 @@
         errorLine2="       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="113"
+            line="118"
             column="8"/>
     </issue>
 
@@ -2193,7 +2193,7 @@
         errorLine2="                                                                             ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="116"
+            line="121"
             column="78"/>
     </issue>
 
@@ -2204,7 +2204,7 @@
         errorLine2="                                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="126"
+            line="131"
             column="56"/>
     </issue>
 
@@ -2215,7 +2215,7 @@
         errorLine2="                                                                 ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="138"
+            line="143"
             column="66"/>
     </issue>
 
@@ -2226,7 +2226,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="142"
+            line="147"
             column="25"/>
     </issue>
 
@@ -2237,7 +2237,7 @@
         errorLine2="                                           ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="168"
+            line="173"
             column="44"/>
     </issue>
 
@@ -2248,7 +2248,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="168"
+            line="173"
             column="40"/>
     </issue>
 
@@ -2259,7 +2259,7 @@
         errorLine2="                                                                   ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="187"
+            line="192"
             column="68"/>
     </issue>
 
@@ -2270,7 +2270,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\zim_manager\ZimFileReader.kt"
-            line="187"
+            line="192"
             column="64"/>
     </issue>
 
@@ -2281,7 +2281,7 @@
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\webserver\ZimHostActivity.java"
-            line="99"
+            line="117"
             column="9"/>
     </issue>
 
@@ -2292,7 +2292,7 @@
         errorLine2="        ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\webserver\ZimHostActivity.java"
-            line="100"
+            line="118"
             column="9"/>
     </issue>
 
@@ -2669,7 +2669,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1301"
+            line="1303"
             column="50"/>
     </issue>
 
@@ -2680,7 +2680,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1491"
+            line="1493"
             column="41"/>
     </issue>
 
@@ -2728,7 +2728,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="67"
+            line="66"
             column="18"/>
     </issue>
 
@@ -2922,7 +2922,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="34"
+            line="52"
             column="19"/>
     </issue>
 
@@ -2933,7 +2933,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="38"
+            line="56"
             column="19"/>
     </issue>
 
@@ -2944,7 +2944,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="42"
+            line="60"
             column="19"/>
     </issue>
 
@@ -2955,7 +2955,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="46"
+            line="64"
             column="19"/>
     </issue>
 
@@ -2966,7 +2966,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="50"
+            line="68"
             column="19"/>
     </issue>
 
@@ -2977,7 +2977,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="54"
+            line="72"
             column="19"/>
     </issue>
 
@@ -2988,7 +2988,7 @@
         errorLine2="                  ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="58"
+            line="76"
             column="19"/>
     </issue>
 
@@ -2999,7 +2999,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="62"
+            line="80"
             column="19"/>
     </issue>
 
@@ -3010,7 +3010,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="66"
+            line="84"
             column="19"/>
     </issue>
 
@@ -3021,7 +3021,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="70"
+            line="88"
             column="19"/>
     </issue>
 
@@ -3032,7 +3032,7 @@
         errorLine2="                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="74"
+            line="92"
             column="19"/>
     </issue>
 
@@ -3043,7 +3043,7 @@
         errorLine2="                  ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\di\modules\ActivityBindingModule.java"
-            line="78"
+            line="96"
             column="19"/>
     </issue>
 
@@ -3131,7 +3131,7 @@
         errorLine2="                                  ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\AnimationUtils.java"
-            line="13"
+            line="31"
             column="35"/>
     </issue>
 
@@ -3142,7 +3142,7 @@
         errorLine2="                                    ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\AnimationUtils.java"
-            line="43"
+            line="61"
             column="37"/>
     </issue>
 
@@ -3153,7 +3153,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\AnimationUtils.java"
-            line="70"
+            line="88"
             column="29"/>
     </issue>
 
@@ -3406,7 +3406,7 @@
         errorLine2="                    ~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\base\BaseContract.java"
-            line="21"
+            line="39"
             column="21"/>
     </issue>
 
@@ -3483,7 +3483,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="27"
+            line="26"
             column="10"/>
     </issue>
 
@@ -3494,7 +3494,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="29"
+            line="28"
             column="10"/>
     </issue>
 
@@ -3505,7 +3505,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="31"
+            line="30"
             column="10"/>
     </issue>
 
@@ -3516,7 +3516,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="33"
+            line="32"
             column="10"/>
     </issue>
 
@@ -3527,7 +3527,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="35"
+            line="34"
             column="10"/>
     </issue>
 
@@ -3538,7 +3538,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="37"
+            line="36"
             column="10"/>
     </issue>
 
@@ -3549,7 +3549,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="39"
+            line="38"
             column="10"/>
     </issue>
 
@@ -3560,7 +3560,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="41"
+            line="40"
             column="10"/>
     </issue>
 
@@ -3571,7 +3571,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="43"
+            line="42"
             column="10"/>
     </issue>
 
@@ -3582,7 +3582,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="45"
+            line="44"
             column="10"/>
     </issue>
 
@@ -3593,7 +3593,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="47"
+            line="46"
             column="10"/>
     </issue>
 
@@ -3604,7 +3604,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="49"
+            line="48"
             column="10"/>
     </issue>
 
@@ -3615,7 +3615,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="51"
+            line="50"
             column="10"/>
     </issue>
 
@@ -3626,7 +3626,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\BookDataSource.java"
-            line="53"
+            line="52"
             column="10"/>
     </issue>
 
@@ -3659,7 +3659,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="94"
+            line="112"
             column="27"/>
     </issue>
 
@@ -3670,7 +3670,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="117"
+            line="135"
             column="38"/>
     </issue>
 
@@ -3681,7 +3681,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="146"
+            line="164"
             column="40"/>
     </issue>
 
@@ -3692,7 +3692,7 @@
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="167"
+            line="185"
             column="35"/>
     </issue>
 
@@ -3703,7 +3703,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="174"
+            line="192"
             column="43"/>
     </issue>
 
@@ -3714,7 +3714,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="181"
+            line="199"
             column="27"/>
     </issue>
 
@@ -3725,7 +3725,7 @@
         errorLine2="                                             ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="181"
+            line="199"
             column="46"/>
     </issue>
 
@@ -3736,7 +3736,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="206"
+            line="224"
             column="34"/>
     </issue>
 
@@ -3747,7 +3747,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksActivity.java"
-            line="206"
+            line="224"
             column="53"/>
     </issue>
 
@@ -3758,7 +3758,7 @@
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksContract.java"
-            line="8"
+            line="26"
             column="30"/>
     </issue>
 
@@ -3769,7 +3769,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksContract.java"
-            line="10"
+            line="28"
             column="38"/>
     </issue>
 
@@ -3780,7 +3780,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksContract.java"
-            line="16"
+            line="34"
             column="26"/>
     </issue>
 
@@ -3791,7 +3791,7 @@
         errorLine2="                                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksContract.java"
-            line="16"
+            line="34"
             column="60"/>
     </issue>
 
@@ -3802,7 +3802,7 @@
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\bookmark\BookmarksContract.java"
-            line="18"
+            line="36"
             column="26"/>
     </issue>
 
@@ -4000,7 +4000,7 @@
         errorLine2="                      ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="78"
+            line="77"
             column="23"/>
     </issue>
 
@@ -4011,7 +4011,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="94"
+            line="93"
             column="26"/>
     </issue>
 
@@ -4022,7 +4022,7 @@
         errorLine2="                      ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="178"
+            line="177"
             column="23"/>
     </issue>
 
@@ -4033,7 +4033,7 @@
         errorLine2="                                    ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="183"
+            line="182"
             column="37"/>
     </issue>
 
@@ -4044,7 +4044,7 @@
         errorLine2="                                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="183"
+            line="182"
             column="54"/>
     </issue>
 
@@ -4055,7 +4055,7 @@
         errorLine2="                                  ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="194"
+            line="193"
             column="35"/>
     </issue>
 
@@ -4066,7 +4066,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="202"
+            line="201"
             column="38"/>
     </issue>
 
@@ -4077,7 +4077,7 @@
         errorLine2="                                                      ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="202"
+            line="201"
             column="55"/>
     </issue>
 
@@ -4088,7 +4088,7 @@
         errorLine2="                                     ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="207"
+            line="206"
             column="38"/>
     </issue>
 
@@ -4099,7 +4099,7 @@
         errorLine2="                                                      ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="207"
+            line="206"
             column="55"/>
     </issue>
 
@@ -4110,7 +4110,7 @@
         errorLine2="                                ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="227"
+            line="226"
             column="33"/>
     </issue>
 
@@ -4121,7 +4121,7 @@
         errorLine2="                            ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="232"
+            line="231"
             column="29"/>
     </issue>
 
@@ -4132,7 +4132,7 @@
         errorLine2="                               ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\CompatFindActionModeCallback.java"
-            line="237"
+            line="236"
             column="32"/>
     </issue>
 
@@ -4143,7 +4143,7 @@
         errorLine2="                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ConfirmationAlertDialogFragment.java"
-            line="28"
+            line="46"
             column="17"/>
     </issue>
 
@@ -4154,7 +4154,7 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ConfirmationAlertDialogFragment.java"
-            line="34"
+            line="52"
             column="42"/>
     </issue>
 
@@ -4165,7 +4165,7 @@
         errorLine2="    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ConfirmationAlertDialogFragment.java"
-            line="35"
+            line="53"
             column="5"/>
     </issue>
 
@@ -4176,7 +4176,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ConfirmationAlertDialogFragment.java"
-            line="42"
+            line="60"
             column="10"/>
     </issue>
 
@@ -4187,7 +4187,7 @@
         errorLine2="                               ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ConfirmationAlertDialogFragment.java"
-            line="42"
+            line="60"
             column="32"/>
     </issue>
 
@@ -4198,7 +4198,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="38"
+            line="37"
             column="33"/>
     </issue>
 
@@ -4209,7 +4209,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="38"
+            line="37"
             column="50"/>
     </issue>
 
@@ -4220,7 +4220,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="48"
+            line="47"
             column="33"/>
     </issue>
 
@@ -4231,7 +4231,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="48"
+            line="47"
             column="50"/>
     </issue>
 
@@ -4242,7 +4242,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="57"
+            line="56"
             column="33"/>
     </issue>
 
@@ -4253,7 +4253,7 @@
         errorLine2="                            ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\CustomSwitchPreference.java"
-            line="62"
+            line="61"
             column="29"/>
     </issue>
 
@@ -4264,7 +4264,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\CustomViewPager.java"
-            line="18"
+            line="36"
             column="26"/>
     </issue>
 
@@ -4275,7 +4275,7 @@
         errorLine2="                         ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\CustomViewPager.java"
-            line="23"
+            line="41"
             column="26"/>
     </issue>
 
@@ -4286,7 +4286,7 @@
         errorLine2="                                          ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\CustomViewPager.java"
-            line="23"
+            line="41"
             column="43"/>
     </issue>
 
@@ -4297,7 +4297,7 @@
         errorLine2="         ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataModule.java"
-            line="11"
+            line="29"
             column="10"/>
     </issue>
 
@@ -4308,7 +4308,7 @@
         errorLine2="                                      ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataModule.java"
-            line="11"
+            line="29"
             column="39"/>
     </issue>
 
@@ -4319,7 +4319,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="17"
+            line="35"
             column="3"/>
     </issue>
 
@@ -4330,7 +4330,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="19"
+            line="37"
             column="3"/>
     </issue>
 
@@ -4341,7 +4341,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="19"
+            line="37"
             column="24"/>
     </issue>
 
@@ -4352,7 +4352,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="21"
+            line="39"
             column="3"/>
     </issue>
 
@@ -4363,7 +4363,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="21"
+            line="39"
             column="25"/>
     </issue>
 
@@ -4374,7 +4374,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="23"
+            line="41"
             column="3"/>
     </issue>
 
@@ -4385,7 +4385,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="23"
+            line="41"
             column="29"/>
     </issue>
 
@@ -4396,7 +4396,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="25"
+            line="43"
             column="3"/>
     </issue>
 
@@ -4407,7 +4407,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="27"
+            line="45"
             column="3"/>
     </issue>
 
@@ -4418,7 +4418,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="27"
+            line="45"
             column="27"/>
     </issue>
 
@@ -4429,7 +4429,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="29"
+            line="47"
             column="3"/>
     </issue>
 
@@ -4440,7 +4440,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="29"
+            line="47"
             column="29"/>
     </issue>
 
@@ -4451,7 +4451,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="31"
+            line="49"
             column="3"/>
     </issue>
 
@@ -4462,7 +4462,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="33"
+            line="51"
             column="3"/>
     </issue>
 
@@ -4473,7 +4473,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="35"
+            line="53"
             column="3"/>
     </issue>
 
@@ -4484,7 +4484,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="37"
+            line="55"
             column="3"/>
     </issue>
 
@@ -4495,7 +4495,7 @@
         errorLine2="                           ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="37"
+            line="55"
             column="28"/>
     </issue>
 
@@ -4506,7 +4506,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="39"
+            line="57"
             column="3"/>
     </issue>
 
@@ -4517,7 +4517,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="39"
+            line="57"
             column="31"/>
     </issue>
 
@@ -4528,7 +4528,7 @@
         errorLine2="  ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="41"
+            line="59"
             column="3"/>
     </issue>
 
@@ -4539,7 +4539,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="41"
+            line="59"
             column="30"/>
     </issue>
 
@@ -4550,7 +4550,7 @@
         errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\DataSource.java"
-            line="43"
+            line="61"
             column="3"/>
     </issue>
 
@@ -4627,7 +4627,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\error\ErrorActivity.java"
-            line="63"
+            line="81"
             column="27"/>
     </issue>
 
@@ -4638,7 +4638,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\error\ErrorActivity.java"
-            line="170"
+            line="188"
             column="65"/>
     </issue>
 
@@ -4693,7 +4693,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="109"
+            line="127"
             column="27"/>
     </issue>
 
@@ -4704,7 +4704,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="137"
+            line="155"
             column="38"/>
     </issue>
 
@@ -4715,7 +4715,7 @@
         errorLine2="                                        ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="144"
+            line="162"
             column="41"/>
     </issue>
 
@@ -4726,7 +4726,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="152"
+            line="170"
             column="38"/>
     </issue>
 
@@ -4737,7 +4737,7 @@
         errorLine2="                                       ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="181"
+            line="199"
             column="40"/>
     </issue>
 
@@ -4748,7 +4748,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="210"
+            line="228"
             column="33"/>
     </issue>
 
@@ -4759,7 +4759,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="217"
+            line="235"
             column="41"/>
     </issue>
 
@@ -4770,7 +4770,7 @@
         errorLine2="                          ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="224"
+            line="242"
             column="27"/>
     </issue>
 
@@ -4781,7 +4781,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="224"
+            line="242"
             column="46"/>
     </issue>
 
@@ -4792,7 +4792,7 @@
         errorLine2="                                 ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="245"
+            line="263"
             column="34"/>
     </issue>
 
@@ -4803,7 +4803,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryActivity.java"
-            line="245"
+            line="263"
             column="53"/>
     </issue>
 
@@ -4814,7 +4814,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryContract.java"
-            line="8"
+            line="26"
             column="28"/>
     </issue>
 
@@ -4825,7 +4825,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryContract.java"
-            line="10"
+            line="28"
             column="36"/>
     </issue>
 
@@ -4836,7 +4836,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryContract.java"
-            line="16"
+            line="34"
             column="24"/>
     </issue>
 
@@ -4847,7 +4847,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryContract.java"
-            line="16"
+            line="34"
             column="59"/>
     </issue>
 
@@ -4858,7 +4858,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\history\HistoryContract.java"
-            line="18"
+            line="36"
             column="24"/>
     </issue>
 
@@ -4869,7 +4869,7 @@
         errorLine2="                          ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\intro\IntroActivity.java"
-            line="65"
+            line="83"
             column="27"/>
     </issue>
 
@@ -4946,7 +4946,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="64"
+            line="63"
             column="24"/>
     </issue>
 
@@ -4957,7 +4957,7 @@
         errorLine2="                                        ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="64"
+            line="63"
             column="41"/>
     </issue>
 
@@ -4968,7 +4968,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="64"
+            line="63"
             column="61"/>
     </issue>
 
@@ -4979,7 +4979,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="65"
+            line="64"
             column="5"/>
     </issue>
 
@@ -4990,7 +4990,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="66"
+            line="65"
             column="5"/>
     </issue>
 
@@ -5001,7 +5001,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="76"
+            line="75"
             column="10"/>
     </issue>
 
@@ -5012,7 +5012,7 @@
         errorLine2="            ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="81"
+            line="80"
             column="13"/>
     </issue>
 
@@ -5023,7 +5023,7 @@
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\KiwixDatabase.java"
-            line="91"
+            line="90"
             column="31"/>
     </issue>
 
@@ -5034,7 +5034,7 @@
         errorLine2="                       ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixSearchWidget.java"
-            line="42"
+            line="41"
             column="24"/>
     </issue>
 
@@ -5045,7 +5045,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixSearchWidget.java"
-            line="42"
+            line="41"
             column="41"/>
     </issue>
 
@@ -5056,7 +5056,7 @@
         errorLine2="                                                                           ~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixSearchWidget.java"
-            line="42"
+            line="41"
             column="76"/>
     </issue>
 
@@ -5133,7 +5133,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\KiwixSettingsActivity.java"
-            line="36"
+            line="35"
             column="24"/>
     </issue>
 
@@ -5188,7 +5188,7 @@
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\KiwixViewModelFactory.java"
-            line="32"
+            line="33"
             column="32"/>
     </issue>
 
@@ -5199,7 +5199,7 @@
         errorLine2="                               ~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\KiwixViewModelFactory.java"
-            line="38"
+            line="39"
             column="32"/>
     </issue>
 
@@ -5210,7 +5210,7 @@
         errorLine2="                                        ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\KiwixViewModelFactory.java"
-            line="38"
+            line="39"
             column="41"/>
     </issue>
 
@@ -5298,7 +5298,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="64"
+            line="63"
             column="23"/>
     </issue>
 
@@ -5309,7 +5309,7 @@
         errorLine2="                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="67"
             column="23"/>
     </issue>
 
@@ -5320,7 +5320,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="67"
             column="40"/>
     </issue>
 
@@ -5331,7 +5331,7 @@
         errorLine2="                                                                 ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="68"
+            line="67"
             column="66"/>
     </issue>
 
@@ -5342,7 +5342,7 @@
         errorLine2="    ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="69"
+            line="68"
             column="5"/>
     </issue>
 
@@ -5353,7 +5353,7 @@
         errorLine2="                            ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="69"
+            line="68"
             column="29"/>
     </issue>
 
@@ -5364,7 +5364,7 @@
         errorLine2="                                     ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\KiwixWebView.java"
-            line="127"
+            line="126"
             column="38"/>
     </issue>
 
@@ -5452,7 +5452,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\LibraryDataSource.java"
-            line="26"
+            line="25"
             column="10"/>
     </issue>
 
@@ -5463,7 +5463,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="32"
+            line="31"
             column="10"/>
     </issue>
 
@@ -5474,7 +5474,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="37"
+            line="36"
             column="10"/>
     </issue>
 
@@ -5485,7 +5485,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="41"
+            line="40"
             column="10"/>
     </issue>
 
@@ -5496,7 +5496,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="49"
+            line="48"
             column="12"/>
     </issue>
 
@@ -5507,7 +5507,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="52"
+            line="51"
             column="12"/>
     </issue>
 
@@ -5518,7 +5518,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="55"
+            line="54"
             column="12"/>
     </issue>
 
@@ -5529,7 +5529,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="58"
+            line="57"
             column="12"/>
     </issue>
 
@@ -5540,7 +5540,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="61"
+            line="60"
             column="12"/>
     </issue>
 
@@ -5551,7 +5551,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="64"
+            line="63"
             column="12"/>
     </issue>
 
@@ -5562,7 +5562,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="67"
+            line="66"
             column="12"/>
     </issue>
 
@@ -5573,7 +5573,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="70"
+            line="69"
             column="12"/>
     </issue>
 
@@ -5584,7 +5584,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="73"
+            line="72"
             column="12"/>
     </issue>
 
@@ -5595,7 +5595,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="76"
+            line="75"
             column="12"/>
     </issue>
 
@@ -5606,7 +5606,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="79"
+            line="78"
             column="12"/>
     </issue>
 
@@ -5617,7 +5617,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="82"
+            line="81"
             column="12"/>
     </issue>
 
@@ -5628,7 +5628,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="85"
+            line="84"
             column="12"/>
     </issue>
 
@@ -5639,7 +5639,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="88"
+            line="87"
             column="12"/>
     </issue>
 
@@ -5650,7 +5650,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="91"
+            line="90"
             column="12"/>
     </issue>
 
@@ -5661,7 +5661,7 @@
         errorLine2="           ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="95"
+            line="94"
             column="12"/>
     </issue>
 
@@ -5672,7 +5672,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="97"
+            line="96"
             column="12"/>
     </issue>
 
@@ -5683,7 +5683,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="99"
+            line="98"
             column="12"/>
     </issue>
 
@@ -5694,7 +5694,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="103"
+            line="102"
             column="12"/>
     </issue>
 
@@ -5705,7 +5705,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="107"
+            line="106"
             column="12"/>
     </issue>
 
@@ -5716,7 +5716,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="111"
+            line="110"
             column="12"/>
     </issue>
 
@@ -5727,7 +5727,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="115"
+            line="114"
             column="12"/>
     </issue>
 
@@ -5738,7 +5738,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="119"
+            line="118"
             column="12"/>
     </issue>
 
@@ -5749,7 +5749,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="123"
+            line="122"
             column="12"/>
     </issue>
 
@@ -5760,7 +5760,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="127"
+            line="126"
             column="12"/>
     </issue>
 
@@ -5771,7 +5771,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="131"
+            line="130"
             column="12"/>
     </issue>
 
@@ -5782,7 +5782,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="135"
+            line="134"
             column="12"/>
     </issue>
 
@@ -5793,7 +5793,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="139"
+            line="138"
             column="12"/>
     </issue>
 
@@ -5804,7 +5804,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="143"
+            line="142"
             column="12"/>
     </issue>
 
@@ -5815,7 +5815,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="147"
+            line="146"
             column="12"/>
     </issue>
 
@@ -5826,7 +5826,7 @@
         errorLine2="           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\entity\LibraryNetworkEntity.java"
-            line="151"
+            line="150"
             column="12"/>
     </issue>
 
@@ -5914,7 +5914,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1388"
+            line="1390"
             column="30"/>
     </issue>
 
@@ -5925,7 +5925,7 @@
         errorLine2="                                  ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1406"
+            line="1408"
             column="35"/>
     </issue>
 
@@ -5936,7 +5936,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1480"
+            line="1482"
             column="38"/>
     </issue>
 
@@ -5947,7 +5947,7 @@
         errorLine2="                                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1510"
+            line="1512"
             column="65"/>
     </issue>
 
@@ -5958,7 +5958,7 @@
         errorLine2="                                     ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1604"
+            line="1606"
             column="38"/>
     </issue>
 
@@ -5969,7 +5969,7 @@
         errorLine2="                                      ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1637"
+            line="1639"
             column="39"/>
     </issue>
 
@@ -5980,7 +5980,7 @@
         errorLine2="                                   ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1940"
+            line="1942"
             column="36"/>
     </issue>
 
@@ -5991,7 +5991,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1963"
+            line="1965"
             column="35"/>
     </issue>
 
@@ -6002,7 +6002,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="1987"
+            line="1989"
             column="38"/>
     </issue>
 
@@ -6013,7 +6013,7 @@
         errorLine2="                          ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="2023"
+            line="2025"
             column="27"/>
     </issue>
 
@@ -6024,7 +6024,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="2031"
+            line="2033"
             column="20"/>
     </issue>
 
@@ -6035,7 +6035,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="2040"
+            line="2042"
             column="24"/>
     </issue>
 
@@ -6046,7 +6046,7 @@
         errorLine2="                           ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\MainActivity.java"
-            line="2056"
+            line="2058"
             column="28"/>
     </issue>
 
@@ -6266,7 +6266,7 @@
         errorLine2="                            ~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\dao\NetworkLanguageDao.java"
-            line="35"
+            line="34"
             column="29"/>
     </issue>
 
@@ -6277,7 +6277,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\dao\NetworkLanguageDao.java"
-            line="39"
+            line="38"
             column="10"/>
     </issue>
 
@@ -6288,7 +6288,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\local\entity\NetworkLanguageSpec.java"
-            line="26"
+            line="25"
             column="10"/>
     </issue>
 
@@ -6376,7 +6376,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\OnSwipeTouchListener.java"
-            line="13"
+            line="31"
             column="31"/>
     </issue>
 
@@ -6387,7 +6387,7 @@
         errorLine2="                         ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\OnSwipeTouchListener.java"
-            line="19"
+            line="37"
             column="26"/>
     </issue>
 
@@ -6398,7 +6398,7 @@
         errorLine2="                                 ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\OnSwipeTouchListener.java"
-            line="19"
+            line="37"
             column="34"/>
     </issue>
 
@@ -6409,7 +6409,7 @@
         errorLine2="                       ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\PrefsFragment.java"
-            line="68"
+            line="86"
             column="24"/>
     </issue>
 
@@ -6420,7 +6420,7 @@
         errorLine2="                                        ~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\PrefsFragment.java"
-            line="192"
+            line="210"
             column="41"/>
     </issue>
 
@@ -6431,7 +6431,7 @@
         errorLine2="                                                                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\PrefsFragment.java"
-            line="192"
+            line="210"
             column="78"/>
     </issue>
 
@@ -6442,7 +6442,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\PrefsFragment.java"
-            line="294"
+            line="312"
             column="40"/>
     </issue>
 
@@ -6453,7 +6453,7 @@
         errorLine2="    ~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\settings\PrefsFragment.java"
-            line="295"
+            line="313"
             column="5"/>
     </issue>
 
@@ -6640,7 +6640,7 @@
         errorLine2="                              ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="44"
+            line="62"
             column="31"/>
     </issue>
 
@@ -6651,7 +6651,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="84"
+            line="102"
             column="10"/>
     </issue>
 
@@ -6662,7 +6662,7 @@
         errorLine2="                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="84"
+            line="102"
             column="33"/>
     </issue>
 
@@ -6673,7 +6673,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="88"
+            line="106"
             column="10"/>
     </issue>
 
@@ -6684,7 +6684,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="106"
+            line="124"
             column="10"/>
     </issue>
 
@@ -6695,7 +6695,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="106"
+            line="124"
             column="37"/>
     </issue>
 
@@ -6706,7 +6706,7 @@
         errorLine2="                              ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="115"
+            line="133"
             column="31"/>
     </issue>
 
@@ -6717,7 +6717,7 @@
         errorLine2="                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="127"
+            line="145"
             column="35"/>
     </issue>
 
@@ -6728,7 +6728,7 @@
         errorLine2="                             ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="131"
+            line="149"
             column="30"/>
     </issue>
 
@@ -6739,7 +6739,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\SharedPreferenceUtil.java"
-            line="136"
+            line="154"
             column="10"/>
     </issue>
 
@@ -6937,7 +6937,7 @@
         errorLine2="                ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="42"
+            line="41"
             column="17"/>
     </issue>
 
@@ -6948,7 +6948,7 @@
         errorLine2="                                           ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="42"
+            line="41"
             column="44"/>
     </issue>
 
@@ -6959,7 +6959,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="54"
+            line="53"
             column="17"/>
     </issue>
 
@@ -6970,7 +6970,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="54"
+            line="53"
             column="38"/>
     </issue>
 
@@ -6981,7 +6981,7 @@
         errorLine2="                                                  ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="54"
+            line="53"
             column="51"/>
     </issue>
 
@@ -6992,7 +6992,7 @@
         errorLine2="                ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="59"
+            line="58"
             column="17"/>
     </issue>
 
@@ -7003,7 +7003,7 @@
         errorLine2="                                 ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\StyleUtils.java"
-            line="59"
+            line="58"
             column="34"/>
     </issue>
 
@@ -7124,7 +7124,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="36"
+            line="35"
             column="39"/>
     </issue>
 
@@ -7135,7 +7135,7 @@
         errorLine2="                                      ~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
+            line="39"
             column="39"/>
     </issue>
 
@@ -7146,7 +7146,7 @@
         errorLine2="                                                       ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
+            line="39"
             column="56"/>
     </issue>
 
@@ -7157,7 +7157,7 @@
         errorLine2="                                                                                 ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="40"
+            line="39"
             column="82"/>
     </issue>
 
@@ -7168,7 +7168,7 @@
         errorLine2="    ~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="41"
+            line="40"
             column="5"/>
     </issue>
 
@@ -7179,7 +7179,7 @@
         errorLine2="                        ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="41"
+            line="40"
             column="25"/>
     </issue>
 
@@ -7190,7 +7190,7 @@
         errorLine2="                                                ~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="41"
+            line="40"
             column="49"/>
     </issue>
 
@@ -7201,7 +7201,7 @@
         errorLine2="    ~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="42"
+            line="41"
             column="5"/>
     </issue>
 
@@ -7212,7 +7212,7 @@
         errorLine2="                              ~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\main\ToolbarScrollingKiwixWebView.java"
-            line="67"
+            line="66"
             column="31"/>
     </issue>
 
@@ -7289,7 +7289,7 @@
         errorLine2="                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\UpdateUtils.java"
-            line="8"
+            line="26"
             column="17"/>
     </issue>
 
@@ -7300,7 +7300,7 @@
         errorLine2="                                           ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\utils\UpdateUtils.java"
-            line="8"
+            line="26"
             column="44"/>
     </issue>
 
@@ -7344,7 +7344,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="60"
+            line="78"
             column="40"/>
     </issue>
 
@@ -7355,7 +7355,7 @@
         errorLine2="                                                                  ~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="60"
+            line="78"
             column="67"/>
     </issue>
 
@@ -7366,7 +7366,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="76"
+            line="94"
             column="40"/>
     </issue>
 
@@ -7377,7 +7377,7 @@
         errorLine2="                                                                  ~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="76"
+            line="94"
             column="67"/>
     </issue>
 
@@ -7388,7 +7388,7 @@
         errorLine2="                                                                                               ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="76"
+            line="94"
             column="96"/>
     </issue>
 
@@ -7399,7 +7399,7 @@
         errorLine2="                                       ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="94"
+            line="112"
             column="40"/>
     </issue>
 
@@ -7410,7 +7410,7 @@
         errorLine2="                                                                  ~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="94"
+            line="112"
             column="67"/>
     </issue>
 
@@ -7421,7 +7421,7 @@
         errorLine2="                                                                                               ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="94"
+            line="112"
             column="96"/>
     </issue>
 
@@ -7432,7 +7432,7 @@
         errorLine2="                                                                                                                 ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="94"
+            line="112"
             column="114"/>
     </issue>
 
@@ -7443,7 +7443,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="117"
+            line="135"
             column="40"/>
     </issue>
 
@@ -7454,7 +7454,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="123"
+            line="141"
             column="34"/>
     </issue>
 
@@ -7465,7 +7465,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="123"
+            line="141"
             column="45"/>
     </issue>
 
@@ -7476,7 +7476,7 @@
         errorLine2="                                 ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="190"
+            line="208"
             column="34"/>
     </issue>
 
@@ -7487,7 +7487,7 @@
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="190"
+            line="208"
             column="71"/>
     </issue>
 
@@ -7498,7 +7498,7 @@
         errorLine2="           ~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="228"
+            line="246"
             column="12"/>
     </issue>
 
@@ -7509,7 +7509,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="242"
+            line="260"
             column="28"/>
     </issue>
 
@@ -7520,7 +7520,7 @@
         errorLine2="                             ~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="251"
+            line="269"
             column="30"/>
     </issue>
 
@@ -7531,7 +7531,7 @@
         errorLine2="                           ~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebChromeClient.java"
-            line="257"
+            line="275"
             column="28"/>
     </issue>
 
@@ -7542,7 +7542,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="52"
+            line="70"
             column="32"/>
     </issue>
 
@@ -7553,7 +7553,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="59"
+            line="77"
             column="32"/>
     </issue>
 
@@ -7564,7 +7564,7 @@
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="59"
+            line="77"
             column="49"/>
     </issue>
 
@@ -7575,7 +7575,7 @@
         errorLine2="                               ~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="66"
+            line="84"
             column="32"/>
     </issue>
 
@@ -7586,7 +7586,7 @@
         errorLine2="                                                ~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="66"
+            line="84"
             column="49"/>
     </issue>
 
@@ -7597,7 +7597,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="86"
+            line="104"
             column="36"/>
     </issue>
 
@@ -7608,7 +7608,7 @@
         errorLine2="                         ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="99"
+            line="117"
             column="26"/>
     </issue>
 
@@ -7619,7 +7619,7 @@
         errorLine2="                                      ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="99"
+            line="117"
             column="39"/>
     </issue>
 
@@ -7630,7 +7630,7 @@
         errorLine2="                                                       ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="99"
+            line="117"
             column="56"/>
     </issue>
 
@@ -7641,7 +7641,7 @@
         errorLine2="                                    ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="106"
+            line="124"
             column="37"/>
     </issue>
 
@@ -7652,7 +7652,7 @@
         errorLine2="                                                    ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="106"
+            line="124"
             column="53"/>
     </issue>
 
@@ -7663,7 +7663,7 @@
         errorLine2="                                                                 ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="106"
+            line="124"
             column="66"/>
     </issue>
 
@@ -7674,7 +7674,7 @@
         errorLine2="                                                                                  ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="106"
+            line="124"
             column="83"/>
     </issue>
 
@@ -7685,7 +7685,7 @@
         errorLine2="                                                                                                   ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="106"
+            line="124"
             column="100"/>
     </issue>
 
@@ -7696,7 +7696,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="113"
+            line="131"
             column="25"/>
     </issue>
 
@@ -7707,7 +7707,7 @@
         errorLine2="                        ~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="120"
+            line="138"
             column="25"/>
     </issue>
 
@@ -7718,7 +7718,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\com\cprcrack\videowebview\VideoEnabledWebView.java"
-            line="120"
+            line="138"
             column="37"/>
     </issue>
 
@@ -7784,7 +7784,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="40"
+            line="39"
             column="10"/>
     </issue>
 
@@ -7795,7 +7795,7 @@
         errorLine2="         ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="52"
+            line="51"
             column="10"/>
     </issue>
 
@@ -7806,7 +7806,7 @@
         errorLine2="                        ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="52"
+            line="51"
             column="25"/>
     </issue>
 
@@ -7817,7 +7817,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="57"
+            line="56"
             column="10"/>
     </issue>
 
@@ -7828,7 +7828,7 @@
         errorLine2="                                       ~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="57"
+            line="56"
             column="40"/>
     </issue>
 
@@ -7839,7 +7839,7 @@
         errorLine2="                                                ~~~~~~">
         <location
             file="src\main\java\org\kiwix\kiwixmobile\core\data\ZimContentProvider.java"
-            line="57"
+            line="56"
             column="49"/>
     </issue>