kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-25 22:12:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix navigation back button

Browse Source
This commit is contained in:
MohitMali 2022-07-28 17:24:09 +05:30 committed by Kelson
parent b1740499a0
commit 8e20649cca
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt
View File

@ -229,7 +229,7 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider {
} }
activeFragments().filterIsInstance<FragmentActivityExtensions>().forEach { activeFragments().filterIsInstance<FragmentActivityExtensions>().forEach {
if (it.onBackPressed(this) == FragmentActivityExtensions.Super.ShouldCall) { if (it.onBackPressed(this) == FragmentActivityExtensions.Super.ShouldCall) {
super.onBackPressed() finish()
} }
} }
} }

3
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -1065,8 +1065,7 @@ public abstract class CoreReaderFragment extends BaseFragment
if (mainMenu != null) { if (mainMenu != null) {
mainMenu.onFileOpened(urlIsValid()); mainMenu.onFileOpened(urlIsValid());
} }
openArticle(UNINITIALISER_ADDRESS); openArticle(zimFileReader.getMainPage());
webViewList.clear();
safeDispose(); safeDispose();
bookmarkingDisposable = Flowable.combineLatest( bookmarkingDisposable = Flowable.combineLatest(
newBookmarksDao.bookmarkUrlsForCurrentBook(zimFileReader), newBookmarksDao.bookmarkUrlsForCurrentBook(zimFileReader),