From 8e20649cca08754f09a5e8624dc4409707eeb530 Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Thu, 28 Jul 2022 17:24:09 +0530
Subject: [PATCH] Fix navigation back button

---
 .../java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt   | 2 +-
 .../org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 397d21e34..f3b41b302 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
@@ -229,7 +229,7 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
     }
     activeFragments().filterIsInstance<FragmentActivityExtensions>().forEach {
       if (it.onBackPressed(this) == FragmentActivityExtensions.Super.ShouldCall) {
-        super.onBackPressed()
+        finish()
       }
     }
   }
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 cc8f9455d..a14ab91ba 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
@@ -1065,8 +1065,7 @@ public abstract class CoreReaderFragment extends BaseFragment
       if (mainMenu != null) {
         mainMenu.onFileOpened(urlIsValid());
       }
-      openArticle(UNINITIALISER_ADDRESS);
-      webViewList.clear();
+      openArticle(zimFileReader.getMainPage());
       safeDispose();
       bookmarkingDisposable = Flowable.combineLatest(
           newBookmarksDao.bookmarkUrlsForCurrentBook(zimFileReader),