From c649b08698191d8b39502a7ec8990c9da139b8e8 Mon Sep 17 00:00:00 2001 From: MohitMali Date: Thu, 4 Aug 2022 18:57:37 +0530 Subject: [PATCH 1/2] Search widget issue fix --- .../java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt | 6 +++--- .../org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt | 7 ++++--- .../kiwix/kiwixmobile/core/main/CoreReaderFragment.java | 3 +++ 3 files changed, 10 insertions(+), 6 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 234570a93..3f204920a 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt @@ -114,10 +114,10 @@ class KiwixMainActivity : CoreMainActivity() { actionMode = mode } - override fun onNewIntent(intent: Intent) { - super.onNewIntent(intent) + override fun onNewIntent(newIntent: Intent) { + super.onNewIntent(newIntent) supportFragmentManager.fragments.filterIsInstance().forEach { - it.onNewIntent(intent, this) + it.onNewIntent(newIntent, this) } } 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 4fe1c8c26..eb744d922 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 @@ -155,10 +155,11 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider { } } - override fun onNewIntent(intent: Intent) { - super.onNewIntent(intent) + override fun onNewIntent(newIntent: Intent) { + super.onNewIntent(newIntent) + intent.action = newIntent.action activeFragments().filterIsInstance().forEach { - it.onNewIntent(intent, this) + it.onNewIntent(newIntent, 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 a14ab91ba..01ffd5d02 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 @@ -1240,12 +1240,15 @@ public abstract class CoreReaderFragment extends BaseFragment } case CoreSearchWidget.TEXT_CLICKED: goToSearch(false); + intent.setAction(null); break; case CoreSearchWidget.STAR_CLICKED: goToBookmarks(); + intent.setAction(null); break; case CoreSearchWidget.MIC_CLICKED: goToSearch(true); + intent.setAction(null); break; case Intent.ACTION_VIEW: if (intent.getType() == null || !intent.getType().equals("application/octet-stream")) { From 78cba0325361834753a31ece33a9571eb2fb8a5a Mon Sep 17 00:00:00 2001 From: MohitMali Date: Mon, 8 Aug 2022 11:19:28 +0530 Subject: [PATCH 2/2] Changes after review --- .../java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt | 6 +++--- .../org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt | 8 ++++---- 2 files changed, 7 insertions(+), 7 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 3f204920a..234570a93 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt @@ -114,10 +114,10 @@ class KiwixMainActivity : CoreMainActivity() { actionMode = mode } - override fun onNewIntent(newIntent: Intent) { - super.onNewIntent(newIntent) + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) supportFragmentManager.fragments.filterIsInstance().forEach { - it.onNewIntent(newIntent, this) + it.onNewIntent(intent, this) } } 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 eb744d922..2567f5284 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 @@ -155,11 +155,11 @@ abstract class CoreMainActivity : BaseActivity(), WebViewProvider { } } - override fun onNewIntent(newIntent: Intent) { - super.onNewIntent(newIntent) - intent.action = newIntent.action + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + this.intent.action = intent.action activeFragments().filterIsInstance().forEach { - it.onNewIntent(newIntent, this) + it.onNewIntent(intent, this) } }