diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/shortcuts/GetContentShortcutTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/shortcuts/GetContentShortcutTest.kt index 4c97a13e0..9f34d9d22 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/shortcuts/GetContentShortcutTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/shortcuts/GetContentShortcutTest.kt @@ -128,7 +128,6 @@ class GetContentShortcutTest { clickSettingsOnSideNav(SettingsRobot::assertMenuSettingsDisplayed) clickHelpOnSideNav(HelpRobot::assertToolbarDisplayed) clickSupportKiwixOnSideNav() - assertExternalLinkDialogDisplayed() pressBack() } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt index 41dea06bf..9a1142926 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt @@ -1677,10 +1677,6 @@ abstract class CoreReaderFragment : externalLinkOpener?.openExternalUrl(intent) } - fun openExternalUrl(intent: Intent, showExternalLinkPopup: Boolean) { - externalLinkOpener?.openExternalUrl(intent, showExternalLinkPopup) - } - override fun showSaveOrOpenUnsupportedFilesDialog(url: String, documentType: String?) { unsupportedMimeTypeHandler?.showSaveOrOpenUnsupportedFilesDialog( url, diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ExternalLinkOpener.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ExternalLinkOpener.kt index de4c91931..7ce54860d 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ExternalLinkOpener.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/ExternalLinkOpener.kt @@ -33,14 +33,10 @@ class ExternalLinkOpener @Inject constructor( private val alertDialogShower: AlertDialogShower ) { - fun openExternalUrl(intent: Intent) { - // Show popup with warning that this url is external and could lead to additional costs - // or may event not work when the user is offline. - openExternalUrl(intent, sharedPreferenceUtil.prefExternalLinkPopup) - } - - // Overload for ignoring sharedPreferenceUtil.prefExternalLinkPopup - fun openExternalUrl(intent: Intent, showExternalLinkPopup: Boolean) { + fun openExternalUrl( + intent: Intent, + showExternalLinkPopup: Boolean = sharedPreferenceUtil.prefExternalLinkPopup + ) { if (intent.resolveActivity(activity.packageManager) != null) { if (showExternalLinkPopup) { requestOpenLink(intent) 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 81060ab4e..5721c21e6 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 @@ -170,12 +170,16 @@ class CustomMainActivity : CoreMainActivity() { override fun onNavigationItemSelected(item: MenuItem): Boolean { return when (item.itemId) { org.kiwix.kiwixmobile.core.R.id.menu_about_app -> { - openExternalUrl(BuildConfig.ABOUT_APP_URL) + if (BuildConfig.ABOUT_APP_URL.isNotEmpty()) { + externalLinkOpener.openExternalUrl(BuildConfig.ABOUT_APP_URL.toUri().browserIntent()) + } true } org.kiwix.kiwixmobile.core.R.id.menu_support_kiwix -> { - openExternalUrl(BuildConfig.SUPPORT_URL) + if (BuildConfig.SUPPORT_URL.isNotEmpty()) { + externalLinkOpener.openExternalUrl(BuildConfig.SUPPORT_URL.toUri().browserIntent(), false) + } true } @@ -183,13 +187,6 @@ class CustomMainActivity : CoreMainActivity() { } } - private fun openExternalUrl(url: String) { - // check if the provided url is not empty. - if (url.isNotEmpty()) { - externalLinkOpener.openExternalUrl(url.toUri().browserIntent(), false) - } - } - override fun getIconResId() = R.mipmap.ic_launcher override fun createApplicationShortcuts() { 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 07698c668..362bdc69b 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 @@ -348,7 +348,7 @@ class CustomReaderFragment : CoreReaderFragment() { override fun openKiwixSupportUrl() { if (BuildConfig.SUPPORT_URL.isNotEmpty()) { - openExternalUrl(BuildConfig.SUPPORT_URL.toUri().browserIntent(), false) + externalLinkOpener?.openExternalUrl(BuildConfig.SUPPORT_URL.toUri().browserIntent(), false) } }