From d3a760ee81fedcc43490595121cc66f972734124 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Tue, 23 Jun 2020 10:41:12 +0200
Subject: [PATCH 1/8] #2147 lint and baseline fixes

---
 app/detekt_baseline.xml                       |   4 +-
 core/src/main/res/layout/activity_main.xml    |  30 -----
 .../main/res/layout/main_activity_content.xml | 115 ------------------
 custom/detekt_baseline.xml                    |   1 -
 4 files changed, 2 insertions(+), 148 deletions(-)
 delete mode 100644 core/src/main/res/layout/activity_main.xml
 delete mode 100644 core/src/main/res/layout/main_activity_content.xml

diff --git a/app/detekt_baseline.xml b/app/detekt_baseline.xml
index e3b08a56d..2252b3b5b 100644
--- a/app/detekt_baseline.xml
+++ b/app/detekt_baseline.xml
@@ -5,7 +5,7 @@
     <ID>EmptyFunctionBlock:None.kt$None${ }</ID>
     <ID>EmptyFunctionBlock:SimplePageChangeListener.kt$SimplePageChangeListener${ }</ID>
     <ID>EmptyFunctionBlock:ZimHostActivity.kt$ZimHostActivity.&lt;no name provided&gt;${}</ID>
-    <ID>ForbiddenComment:KiwixMainActivity.kt$KiwixMainActivity$// TODO: Show to user</ID>
+    <ID>ForbiddenComment:KiwixMainFragment.kt$KiwixMainFragment$// TODO: Show to user</ID>
     <ID>LongParameterList:ZimManageViewModel.kt$ZimManageViewModel$( booksOnFileSystem: List&lt;BookOnDisk&gt;, activeDownloads: List&lt;DownloadModel&gt;, allLanguages: List&lt;Language&gt;, libraryNetworkEntity: LibraryNetworkEntity, filter: String, fileSystemState: FileSystemState )</ID>
     <ID>MagicNumber:LibraryListItem.kt$LibraryListItem.LibraryDownloadItem$1000L</ID>
     <ID>MagicNumber:ShareFiles.kt$ShareFiles$24</ID>
@@ -44,7 +44,7 @@
     <ID>ReturnCount:Fat32Checker.kt$Fat32Checker$private fun canCreate4GbFile(storage: String): Boolean</ID>
     <ID>ReturnCount:LanguageActivity.kt$LanguageActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
     <ID>TooGenericExceptionCaught:FileWritingFileSystemChecker.kt$FileWritingFileSystemChecker$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:KiwixMainActivity.kt$KiwixMainActivity$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:KiwixMainFragment.kt$KiwixMainFragment$e: Exception</ID>
     <ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
     <ID>TooGenericExceptionThrown:LibraryViewHolder.kt$LibraryViewHolder.LibraryBookViewHolder$throw RuntimeException("impossible invalid state: ${item.fileSystemState}")</ID>
     <ID>TooGenericExceptionThrown:ZimManageViewModel.kt$ZimManageViewModel$throw RuntimeException("Impossible state")</ID>
diff --git a/core/src/main/res/layout/activity_main.xml b/core/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 0fc7d76c2..000000000
--- a/core/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/activity_main_drawer_layout"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:fitsSystemWindows="true">
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/main_activity_content" />
-
-    <RelativeLayout
-      android:id="@+id/fullscreen_video_container"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@android:color/black"
-      android:visibility="invisible" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-
-  <com.google.android.material.navigation.NavigationView
-    android:id="@+id/activity_main_nav_view"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_gravity="end"
-    android:fitsSystemWindows="true"
-    app:headerLayout="@layout/drawer_right" />
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/core/src/main/res/layout/main_activity_content.xml b/core/src/main/res/layout/main_activity_content.xml
deleted file mode 100644
index 497c896a7..000000000
--- a/core/src/main/res/layout/main_activity_content.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/activity_main_root"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:animateLayoutChanges="true"
-  tools:showIn="@layout/activity_main">
-
-  <com.google.android.material.appbar.AppBarLayout
-    android:id="@+id/activity_main_app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <include layout="@layout/layout_toolbar" />
-
-      <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/activity_main_progress_view"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_view_height"
-        android:indeterminate="false"
-        android:max="100"
-        android:theme="@style/ThemeOverlay.KiwixTheme.ProgressBar"
-        android:visibility="visible"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        tools:progress="70" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </com.google.android.material.appbar.AppBarLayout>
-
-  <FrameLayout
-    android:id="@+id/activity_main_content_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
-
-  <ImageButton
-    android:id="@+id/activity_main_fullscreen_button"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/fullscreen_control_button_margin"
-    android:alpha="0.6"
-    android:background="?colorOnSurface"
-    android:contentDescription="@string/menu_exit_full_screen"
-    android:tint="?colorSurface"
-    android:visibility="gone"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:srcCompat="@drawable/fullscreen_exit"
-    tools:visibility="visible" />
-
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    android:id="@+id/activity_main_back_to_top_fab"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/activity_horizontal_margin"
-    android:visibility="gone"
-    app:fabSize="mini"
-    app:layout_constraintBottom_toTopOf="@id/bottom_toolbar"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:srcCompat="@drawable/action_find_previous"
-    tools:visibility="visible" />
-
-  <Button
-    android:id="@+id/activity_main_button_pause_tts"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:alpha="0.6"
-    android:text="@string/tts_pause"
-    android:textStyle="bold"
-    android:visibility="gone"
-    app:layout_constraintBottom_toTopOf="@id/bottom_toolbar"
-    app:layout_constraintEnd_toStartOf="@id/activity_main_button_stop_tts"
-    app:layout_constraintHorizontal_chainStyle="packed"
-    app:layout_constraintStart_toStartOf="parent" />
-
-  <Button
-    android:id="@+id/activity_main_button_stop_tts"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:alpha="0.6"
-    android:text="@string/stop"
-    android:textStyle="bold"
-    android:visibility="gone"
-    app:layout_constraintBottom_toTopOf="@id/bottom_toolbar"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toEndOf="@id/activity_main_button_pause_tts" />
-
-  <androidx.constraintlayout.widget.Group
-    android:id="@+id/activity_main_tts_controls"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:visibility="gone"
-    app:constraint_referenced_ids="activity_main_button_pause_tts,activity_main_button_stop_tts"
-    tools:visibility="visible" />
-
-  <androidx.coordinatorlayout.widget.CoordinatorLayout
-    android:id="@+id/snackbar_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintBottom_toTopOf="@id/activity_main_button_pause_tts"
-    app:layout_constraintEnd_toEndOf="parent" />
-
-  <include layout="@layout/bottom_toolbar" />
-
-  <include
-    android:id="@+id/activity_main_tab_switcher"
-    layout="@layout/tab_switcher"
-    android:visibility="gone" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/custom/detekt_baseline.xml b/custom/detekt_baseline.xml
index bb90cbd4a..d14ae3a4d 100644
--- a/custom/detekt_baseline.xml
+++ b/custom/detekt_baseline.xml
@@ -4,7 +4,6 @@
   <Whitelist>
     <ID>LongParameterList:DownloadCustom.kt$DownloadCustom$( id: String = "", title: String = "", description: String = "", language: String = "", creator: String = "", publisher: String = "", date: String = "", url: String = "", articleCount: String = "", mediaCount: String = "", size: String = "", name: String = "", favIcon: String = "" )</ID>
     <ID>MagicNumber:CustomDownloadActivity.kt$CustomDownloadActivity$3</ID>
-    <ID>MagicNumber:CustomMainActivity.kt$CustomMainActivity$.25f</ID>
     <ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
   </Whitelist>
 </SmellBaseline>

From e0c3ec61866336e798c653d04a144085c372586c Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 09:38:18 +0200
Subject: [PATCH 2/8] #2147 newNavigation menu is now hidden if debug is on

---
 .../src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt
index 72d8143e8..37ba3cd1c 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt
@@ -23,6 +23,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.TextView
 import androidx.core.view.isVisible
+import org.kiwix.kiwixmobile.core.BuildConfig
 import org.kiwix.kiwixmobile.core.Intents.internal
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.intent
@@ -108,6 +109,9 @@ class MainMenu(
       tabSwitcher = null
       tabSwitcherTextView = null
     }
+
+    newNavigation.isVisible = BuildConfig.DEBUG
+
     randomArticle.setShowAsAction(
       if (activity.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
         MenuItem.SHOW_AS_ACTION_IF_ROOM

From 3d43ad151b91f01296d18c214a279fd8049f7632 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 09:47:23 +0200
Subject: [PATCH 3/8] #2147 renamed KiwixMainFragment -> KiwixReaderFragment
 and removed (FRAGMENT) title string

---
 app/detekt_baseline.xml                                       | 4 ++--
 .../kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt | 4 ++--
 .../main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt | 2 +-
 .../main/{KiwixMainFragment.kt => KiwixReaderFragment.kt}     | 2 +-
 .../org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename app/src/main/java/org/kiwix/kiwixmobile/main/{KiwixMainFragment.kt => KiwixReaderFragment.kt} (99%)

diff --git a/app/detekt_baseline.xml b/app/detekt_baseline.xml
index 2252b3b5b..0b71972bd 100644
--- a/app/detekt_baseline.xml
+++ b/app/detekt_baseline.xml
@@ -5,7 +5,7 @@
     <ID>EmptyFunctionBlock:None.kt$None${ }</ID>
     <ID>EmptyFunctionBlock:SimplePageChangeListener.kt$SimplePageChangeListener${ }</ID>
     <ID>EmptyFunctionBlock:ZimHostActivity.kt$ZimHostActivity.&lt;no name provided&gt;${}</ID>
-    <ID>ForbiddenComment:KiwixMainFragment.kt$KiwixMainFragment$// TODO: Show to user</ID>
+    <ID>ForbiddenComment:KiwixReaderFragment.kt$KiwixReaderFragment$// TODO: Show to user</ID>
     <ID>LongParameterList:ZimManageViewModel.kt$ZimManageViewModel$( booksOnFileSystem: List&lt;BookOnDisk&gt;, activeDownloads: List&lt;DownloadModel&gt;, allLanguages: List&lt;Language&gt;, libraryNetworkEntity: LibraryNetworkEntity, filter: String, fileSystemState: FileSystemState )</ID>
     <ID>MagicNumber:LibraryListItem.kt$LibraryListItem.LibraryDownloadItem$1000L</ID>
     <ID>MagicNumber:ShareFiles.kt$ShareFiles$24</ID>
@@ -44,7 +44,7 @@
     <ID>ReturnCount:Fat32Checker.kt$Fat32Checker$private fun canCreate4GbFile(storage: String): Boolean</ID>
     <ID>ReturnCount:LanguageActivity.kt$LanguageActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
     <ID>TooGenericExceptionCaught:FileWritingFileSystemChecker.kt$FileWritingFileSystemChecker$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:KiwixMainFragment.kt$KiwixMainFragment$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:KiwixReaderFragment.kt$KiwixReaderFragment$e: Exception</ID>
     <ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
     <ID>TooGenericExceptionThrown:LibraryViewHolder.kt$LibraryViewHolder.LibraryBookViewHolder$throw RuntimeException("impossible invalid state: ${item.fileSystemState}")</ID>
     <ID>TooGenericExceptionThrown:ZimManageViewModel.kt$ZimManageViewModel$throw RuntimeException("Impossible state")</ID>
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt
index b7365777c..d0ead37cc 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/di/components/KiwixActivityComponent.kt
@@ -27,7 +27,7 @@ import org.kiwix.kiwixmobile.intro.IntroModule
 import org.kiwix.kiwixmobile.language.LanguageActivity
 import org.kiwix.kiwixmobile.local_file_transfer.LocalFileTransferActivity
 import org.kiwix.kiwixmobile.main.KiwixMainActivity
-import org.kiwix.kiwixmobile.main.KiwixMainFragment
+import org.kiwix.kiwixmobile.main.KiwixReaderFragment
 import org.kiwix.kiwixmobile.settings.KiwixSettingsActivity
 import org.kiwix.kiwixmobile.splash.KiwixSplashActivity
 import org.kiwix.kiwixmobile.webserver.ZimHostActivity
@@ -57,7 +57,7 @@ interface KiwixActivityComponent {
   fun inject(zimHostActivity: ZimHostActivity)
   fun inject(introActivity: IntroActivity)
   fun inject(kiwixSplashActivity: KiwixSplashActivity)
-  fun inject(kiwixMainFragment: KiwixMainFragment)
+  fun inject(kiwixMainFragment: KiwixReaderFragment)
 
   @Subcomponent.Builder
   interface Builder {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
index 47e6c5af0..952c85ebd 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
@@ -68,6 +68,6 @@ class KiwixMainActivity : CoreMainActivity() {
       return
     }
     supportFragmentManager.beginTransaction()
-      .add(R.id.fragment_custom_app_container, KiwixMainFragment()).commit()
+      .add(R.id.fragment_custom_app_container, KiwixReaderFragment()).commit()
   }
 }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt
similarity index 99%
rename from app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt
rename to app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt
index 27bac4e68..82a47635a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixReaderFragment.kt
@@ -53,7 +53,7 @@ import org.kiwix.kiwixmobile.webserver.ZimHostActivity
 import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity
 import java.io.File
 
-class KiwixMainFragment : CoreReaderFragment() {
+class KiwixReaderFragment : CoreReaderFragment() {
 
   override fun inject(baseActivity: BaseActivity) {
     baseActivity.kiwixActivityComponent.inject(this)
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index 589c95dad..723ecead0 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -714,7 +714,7 @@ public abstract class CoreReaderFragment extends BaseFragment
   }
 
   private void updateTitle() {
-    actionBar.setTitle(getValidTitle(zimReaderContainer.getZimFileTitle()) + " (FRAGMENT)");
+    actionBar.setTitle(getValidTitle(zimReaderContainer.getZimFileTitle()));
   }
 
   private String getValidTitle(String zimFileTitle) {

From 2cef6ed57897b3d65bccf634f34a4cc8d3e3eaa3 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 09:57:31 +0200
Subject: [PATCH 4/8] #2147 converted CoreMainActivity to kotlin

---
 .../core/main/CoreMainActivity.java           | 51 -------------------
 .../kiwixmobile/core/main/CoreMainActivity.kt | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
 create mode 100644 core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
deleted file mode 100644
index f49e3f3c7..000000000
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Kiwix Android
- * Copyright (c) 2019 Kiwix <android.kiwix.org>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.kiwix.kiwixmobile.core.main;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import org.jetbrains.annotations.Nullable;
-import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.core.base.BaseActivity;
-
-public abstract class CoreMainActivity extends BaseActivity implements WebViewProvider {
-  @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_new_navigation);
-  }
-
-  @Override protected void onActivityResult(int requestCode, int resultCode,
-    @androidx.annotation.Nullable Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
-
-    for (Fragment it : getSupportFragmentManager().getFragments()) {
-      it.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
-  @androidx.annotation.Nullable @Override public KiwixWebView getCurrentWebView() {
-    for (Fragment frag : getSupportFragmentManager().getFragments()) {
-      if (frag instanceof WebViewProvider) {
-        return ((WebViewProvider) frag).getCurrentWebView();
-      }
-    }
-    return null;
-  }
-}
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
new file mode 100644
index 000000000..cb742d60e
--- /dev/null
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
@@ -0,0 +1,51 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2019 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.kiwix.kiwixmobile.core.main
+
+import android.content.Intent
+import android.os.Bundle
+import org.kiwix.kiwixmobile.core.R
+import org.kiwix.kiwixmobile.core.base.BaseActivity
+
+abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_new_navigation)
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    supportFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) }
+  }
+
+  override fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<out String>,
+    grantResults: IntArray
+  ) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    supportFragmentManager.fragments.forEach {
+      it.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    }
+  }
+
+  override fun getCurrentWebView(): KiwixWebView? {
+    return supportFragmentManager.fragments.filterIsInstance<WebViewProvider>().first()
+      .getCurrentWebView()
+  }
+}

From fe061b1cec7ecf0648fc5c262f65648ca9644bf9 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 10:02:12 +0200
Subject: [PATCH 5/8] #2147 converted
 CoreNewNavigationActivity/NewNavigationActivity to kotlin

---
 .../core/main/CoreNewNavigationActivity.java  | 47 -------------------
 .../core/main/NewNavigationActivity.kt        | 35 ++++++++++++++
 2 files changed, 35 insertions(+), 47 deletions(-)
 delete mode 100644 core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreNewNavigationActivity.java
 create mode 100644 core/src/main/java/org/kiwix/kiwixmobile/core/main/NewNavigationActivity.kt

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreNewNavigationActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreNewNavigationActivity.java
deleted file mode 100644
index b79510ec4..000000000
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreNewNavigationActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Kiwix Android
- * Copyright (c) 2020 Kiwix <android.kiwix.org>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.kiwix.kiwixmobile.core.main;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import org.jetbrains.annotations.Nullable;
-import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.core.base.BaseActivity;
-
-public abstract class CoreNewNavigationActivity extends BaseActivity {
-
-  @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_new_navigation);
-  }
-
-  @Override protected void onActivityResult(int requestCode, int resultCode,
-    @androidx.annotation.Nullable Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
-
-    for (Fragment it : getSupportFragmentManager().getFragments()) {
-      it.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
-  @Override public void setContentView(int layoutResID) {
-    super.setContentView(layoutResID);
-  }
-}
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/NewNavigationActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/NewNavigationActivity.kt
new file mode 100644
index 000000000..67c23980e
--- /dev/null
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/NewNavigationActivity.kt
@@ -0,0 +1,35 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2020 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.kiwix.kiwixmobile.core.main
+
+import android.content.Intent
+import android.os.Bundle
+import org.kiwix.kiwixmobile.core.R
+import org.kiwix.kiwixmobile.core.base.BaseActivity
+
+abstract class NewNavigationActivity : BaseActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_new_navigation)
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    supportFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) }
+  }
+}

From dd9c3f07ded377b465e7c2e3785c59639796db75 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 10:27:12 +0200
Subject: [PATCH 6/8] #2147 custom can now exit the app on back press from the
 main page

---
 .../custom/main/CustomReaderFragment.kt           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
index 9f3f271cb..6be9122ec 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
@@ -40,11 +40,13 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import org.kiwix.kiwixmobile.core.base.BaseActivity
-import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
+import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions.Super
+import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions.Super.ShouldCall
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.start
 import org.kiwix.kiwixmobile.core.main.CoreReaderFragment
 import org.kiwix.kiwixmobile.core.main.MainMenu
 import org.kiwix.kiwixmobile.core.main.WebViewCallback
+import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Companion.CONTENT_PREFIX
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
 import org.kiwix.kiwixmobile.core.utils.DialogShower
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog
@@ -120,6 +122,14 @@ class CustomReaderFragment : CoreReaderFragment() {
     )
   }
 
+  override fun onBackPressed(activity: AppCompatActivity): Super {
+    val result = super.onBackPressed(activity)
+    if (zimReaderContainer.mainPage == getCurrentWebView().url.substringAfter(CONTENT_PREFIX)) {
+      return ShouldCall
+    }
+    return result
+  }
+
   override fun onRequestPermissionsResult(
     requestCode: Int,
     permissions: Array<out String>,
@@ -151,7 +161,6 @@ class CustomReaderFragment : CoreReaderFragment() {
 
   override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
     super.onCreateOptionsMenu(menu, inflater)
-    val onCreateOptionsMenu = super.onCreateOptionsMenu(menu, requireActivity().menuInflater)
     menu.findItem(R.id.menu_help)?.isVisible = false
     menu.findItem(R.id.menu_new_navigation)?.isVisible = false
     menu.findItem(R.id.menu_openfile)?.isVisible = false
@@ -161,7 +170,7 @@ class CustomReaderFragment : CoreReaderFragment() {
   override fun onCreateOptionsMenu(
     menu: Menu,
     activity: AppCompatActivity
-  ): BaseFragmentActivityExtensions.Super = BaseFragmentActivityExtensions.Super.ShouldCall
+  ): Super = ShouldCall
 
   override fun getIconResId() = R.mipmap.ic_launcher
 

From d51575b056eee842d45539bd15e196929572d1b4 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 10:31:55 +0200
Subject: [PATCH 7/8] #2147 moved duplicated methods to CoreMainActivity

---
 .../kiwixmobile/main/KiwixMainActivity.kt     | 32 ------------------
 .../kiwixmobile/core/main/CoreMainActivity.kt | 31 +++++++++++++++++
 .../custom/main/CustomMainActivity.kt         | 33 -------------------
 3 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
index 952c85ebd..148b986b6 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
@@ -18,11 +18,8 @@
 
 package org.kiwix.kiwixmobile.main
 
-import android.content.Intent
 import android.os.Bundle
-import android.view.ActionMode
 import org.kiwix.kiwixmobile.R
-import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 import org.kiwix.kiwixmobile.kiwixActivityComponent
@@ -32,35 +29,6 @@ class KiwixMainActivity : CoreMainActivity() {
     kiwixActivityComponent.inject(this)
   }
 
-  override fun onActionModeStarted(mode: ActionMode) {
-    super.onActionModeStarted(mode)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onActionModeStarted(mode, this)
-    }
-  }
-
-  override fun onActionModeFinished(mode: ActionMode) {
-    super.onActionModeFinished(mode)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onActionModeFinished(mode, this)
-    }
-  }
-
-  override fun onBackPressed() {
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      if (it.onBackPressed(this) == BaseFragmentActivityExtensions.Super.ShouldCall) {
-        super.onBackPressed()
-      }
-    }
-  }
-
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onNewIntent(intent, this)
-    }
-  }
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
index cb742d60e..da0b3da86 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
@@ -19,8 +19,10 @@ package org.kiwix.kiwixmobile.core.main
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.ActionMode
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.base.BaseActivity
+import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
 
 abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,6 +46,35 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
     }
   }
 
+  override fun onActionModeStarted(mode: ActionMode) {
+    super.onActionModeStarted(mode)
+    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
+      it.onActionModeStarted(mode, this)
+    }
+  }
+
+  override fun onActionModeFinished(mode: ActionMode) {
+    super.onActionModeFinished(mode)
+    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
+      it.onActionModeFinished(mode, this)
+    }
+  }
+
+  override fun onBackPressed() {
+    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
+      if (it.onBackPressed(this) == BaseFragmentActivityExtensions.Super.ShouldCall) {
+        super.onBackPressed()
+      }
+    }
+  }
+
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
+      it.onNewIntent(intent, this)
+    }
+  }
+
   override fun getCurrentWebView(): KiwixWebView? {
     return supportFragmentManager.fragments.filterIsInstance<WebViewProvider>().first()
       .getCurrentWebView()
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
index 751a75425..511fbc975 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomMainActivity.kt
@@ -18,10 +18,7 @@
 
 package org.kiwix.kiwixmobile.custom.main
 
-import android.content.Intent
 import android.os.Bundle
-import android.view.ActionMode
-import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 import org.kiwix.kiwixmobile.custom.R
@@ -35,38 +32,8 @@ class CustomMainActivity : CoreMainActivity() {
     customActivityComponent.inject(this)
   }
 
-  override fun onActionModeStarted(mode: ActionMode) {
-    super.onActionModeStarted(mode)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onActionModeStarted(mode, this)
-    }
-  }
-
-  override fun onActionModeFinished(mode: ActionMode) {
-    super.onActionModeFinished(mode)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onActionModeFinished(mode, this)
-    }
-  }
-
-  override fun onBackPressed() {
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      if (it.onBackPressed(this) == BaseFragmentActivityExtensions.Super.ShouldCall) {
-        super.onBackPressed()
-      }
-    }
-  }
-
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      it.onNewIntent(intent, this)
-    }
-  }
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-
     if (savedInstanceState != null) {
       return
     }

From 34cbaa14474448a47fa4c6ad7edb847669dd7851 Mon Sep 17 00:00:00 2001
From: HissPirat <franslukas@gmail.com>
Date: Wed, 24 Jun 2020 10:43:41 +0200
Subject: [PATCH 8/8] #2147 made BaseFragmentActivityExtensions default to
 return ShouldCall

---
 .../core/base/BaseFragmentActivityExtensions.kt     | 13 +++++++------
 .../kiwix/kiwixmobile/core/main/CoreMainActivity.kt |  3 ++-
 .../kiwixmobile/core/main/CoreReaderFragment.java   |  8 +++-----
 .../kiwixmobile/custom/main/CustomReaderFragment.kt |  5 -----
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragmentActivityExtensions.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragmentActivityExtensions.kt
index a693f9a8a..8e013a715 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragmentActivityExtensions.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragmentActivityExtensions.kt
@@ -22,16 +22,17 @@ import android.content.Intent
 import android.view.ActionMode
 import android.view.Menu
 import androidx.appcompat.app.AppCompatActivity
+import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions.Super.ShouldCall
 
 interface BaseFragmentActivityExtensions {
   enum class Super {
     ShouldCall,
-    DontCall
+    ShouldNotCall
   }
 
-  fun onActionModeStarted(actionMode: ActionMode, activity: AppCompatActivity): Super
-  fun onActionModeFinished(actionMode: ActionMode, activity: AppCompatActivity): Super
-  fun onBackPressed(activity: AppCompatActivity): Super
-  fun onNewIntent(intent: Intent, activity: AppCompatActivity): Super
-  fun onCreateOptionsMenu(menu: Menu, activity: AppCompatActivity): Super
+  fun onActionModeStarted(actionMode: ActionMode, activity: AppCompatActivity): Super = ShouldCall
+  fun onActionModeFinished(actionMode: ActionMode, activity: AppCompatActivity): Super = ShouldCall
+  fun onBackPressed(activity: AppCompatActivity): Super = ShouldCall
+  fun onNewIntent(intent: Intent, activity: AppCompatActivity): Super = ShouldCall
+  fun onCreateOptionsMenu(menu: Menu, activity: AppCompatActivity): Super = ShouldCall
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
index da0b3da86..3bd979623 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
@@ -23,6 +23,7 @@ import android.view.ActionMode
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions
+import org.kiwix.kiwixmobile.core.base.BaseFragmentActivityExtensions.Super.ShouldCall
 
 abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -62,7 +63,7 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
 
   override fun onBackPressed() {
     supportFragmentManager.fragments.filterIsInstance<BaseFragmentActivityExtensions>().forEach {
-      if (it.onBackPressed(this) == BaseFragmentActivityExtensions.Super.ShouldCall) {
+      if (it.onBackPressed(this) == ShouldCall) {
         super.onBackPressed()
       }
     }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index 723ecead0..26ff0cdb9 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -108,7 +108,6 @@ import org.kiwix.kiwixmobile.core.extensions.ViewExtensionsKt;
 import org.kiwix.kiwixmobile.core.extensions.ViewGroupExtensions;
 import org.kiwix.kiwixmobile.core.page.bookmark.BookmarksActivity;
 import org.kiwix.kiwixmobile.core.page.bookmark.adapter.BookmarkItem;
-import org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem;
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader;
 import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer;
 import org.kiwix.kiwixmobile.core.search.SearchActivity;
@@ -130,7 +129,7 @@ import static android.app.Activity.RESULT_OK;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static org.kiwix.kiwixmobile.core.downloader.fetch.FetchDownloadNotificationManagerKt.DOWNLOAD_NOTIFICATION_TITLE;
 import static org.kiwix.kiwixmobile.core.page.history.HistoryActivityKt.USER_CLEARED_HISTORY;
-import static org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem.*;
+import static org.kiwix.kiwixmobile.core.page.history.adapter.HistoryListItem.HistoryItem;
 import static org.kiwix.kiwixmobile.core.utils.AnimationUtils.rotate;
 import static org.kiwix.kiwixmobile.core.utils.ConstantsKt.BOOKMARK_CHOSEN_REQUEST;
 import static org.kiwix.kiwixmobile.core.utils.ConstantsKt.EXTRA_CHOSE_X_FILE;
@@ -302,13 +301,12 @@ public abstract class CoreReaderFragment extends BaseFragment
       getActivity().getMenuInflater().inflate(R.menu.menu_webview_action, menu);
       configureWebViewSelectionHandler(menu);
     }
-
     return Super.ShouldCall;
   }
 
   @NotNull @Override public Super onActionModeFinished(@NotNull ActionMode actionMode,
     @NotNull AppCompatActivity activity) {
-    actionMode = null;
+    this.actionMode = null;
     return Super.ShouldCall;
   }
 
@@ -656,7 +654,7 @@ public abstract class CoreReaderFragment extends BaseFragment
     } else {
       return Super.ShouldCall;
     }
-    return Super.DontCall;
+    return Super.ShouldNotCall;
   }
 
   private void checkForRateDialog() {
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
index 6be9122ec..84f177bbe 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
@@ -167,11 +167,6 @@ class CustomReaderFragment : CoreReaderFragment() {
     menu.findItem(R.id.menu_host_books)?.isVisible = false
   }
 
-  override fun onCreateOptionsMenu(
-    menu: Menu,
-    activity: AppCompatActivity
-  ): Super = ShouldCall
-
   override fun getIconResId() = R.mipmap.ic_launcher
 
   override fun createWebClient(