From 117c8fcce512fbb53b5e4ae23d428076d7b20406 Mon Sep 17 00:00:00 2001 From: kyori19 Date: Mon, 4 May 2020 13:13:19 +0900 Subject: [PATCH] Set default value for text arg of viewUrl --- app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt | 2 +- app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt | 2 +- .../main/java/com/keylesspalace/tusky/BottomSheetActivity.kt | 2 +- app/src/main/java/com/keylesspalace/tusky/MainActivity.kt | 2 +- .../com/keylesspalace/tusky/components/report/ReportActivity.kt | 2 +- .../tusky/components/search/fragments/SearchFragment.kt | 2 +- .../components/search/fragments/SearchNotestockFragment.kt | 2 +- .../main/java/com/keylesspalace/tusky/fragment/SFragment.java | 2 +- app/src/main/java/net/accelf/yuito/QuickTootHelper.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt index 618f59de7..979e4c504 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt @@ -47,7 +47,7 @@ class AboutActivity : BottomSheetActivity(), Injectable { aboutBugsFeaturesInfoTextView.setClickableTextWithoutUnderlines(R.string.about_bug_feature_request_site) tuskyProfileButton.setOnClickListener { - viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL, BuildConfig.SUPPORT_ACCOUNT_URL) + viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL) } aboutLicensesButton.setOnClickListener { diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index 65f67fb8f..be91c2d96 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -724,7 +724,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI } override fun onViewUrl(url: String, text: String) { - viewUrl(url, text) + viewUrl(url, text = text) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt b/app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt index 02fde50db..16121ba03 100644 --- a/app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt @@ -65,7 +65,7 @@ abstract class BottomSheetActivity : BaseActivity() { } - open fun viewUrl(url: String, text: String, lookupFallbackBehavior: PostLookupFallbackBehavior = PostLookupFallbackBehavior.OPEN_IN_BROWSER) { + open fun viewUrl(url: String, lookupFallbackBehavior: PostLookupFallbackBehavior = PostLookupFallbackBehavior.OPEN_IN_BROWSER, text: String = "") { if (forceBrowser.contains(text)) { openLink(url) return diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index cb1fee7d7..3013543d5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -321,7 +321,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje if (intent != null) { val statusUrl = intent.getStringExtra(STATUS_URL) if (statusUrl != null) { - viewUrl(statusUrl, statusUrl, PostLookupFallbackBehavior.DISPLAY_ERROR) + viewUrl(statusUrl, PostLookupFallbackBehavior.DISPLAY_ERROR) } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt index e9483e474..5daf584b9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt @@ -93,7 +93,7 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector { viewModel.checkUrl.observe(this, Observer { if (!it.isNullOrBlank()) { viewModel.urlChecked() - viewUrl(it, it) + viewUrl(it) } }) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt index 5088b1827..5ac44c55d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt @@ -125,7 +125,7 @@ abstract class SearchFragment : Fragment(), override fun onViewTag(tag: String) = startActivity(ViewTagActivity.getIntent(requireContext(), tag)) override fun onViewUrl(url: String, text: String) { - bottomSheetActivity?.viewUrl(url, text) + bottomSheetActivity?.viewUrl(url, text = text) } protected val bottomSheetActivity diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchNotestockFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchNotestockFragment.kt index c080ffec3..e698d9bbe 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchNotestockFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchNotestockFragment.kt @@ -139,7 +139,7 @@ class SearchNotestockFragment : SearchFragment val actionableStatus = status.actionableStatus - bottomSheetActivity?.viewUrl(actionableStatus.id, actionableStatus.id) + bottomSheetActivity?.viewUrl(actionableStatus.id) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java index 8c297817f..8a99ea15c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java @@ -138,7 +138,7 @@ public abstract class SFragment extends BaseFragment implements Injectable { } public void onViewUrl(String url, String text) { - bottomSheetActivity.viewUrl(url, text, PostLookupFallbackBehavior.OPEN_IN_BROWSER); + bottomSheetActivity.viewUrl(url, PostLookupFallbackBehavior.OPEN_IN_BROWSER, text); } protected void reply(Status status) { diff --git a/app/src/main/java/net/accelf/yuito/QuickTootHelper.java b/app/src/main/java/net/accelf/yuito/QuickTootHelper.java index 188181770..be091ffbb 100644 --- a/app/src/main/java/net/accelf/yuito/QuickTootHelper.java +++ b/app/src/main/java/net/accelf/yuito/QuickTootHelper.java @@ -116,7 +116,7 @@ public class QuickTootHelper { @Override public void onViewUrl(String url, String text) { - activity.viewUrl(url, text, PostLookupFallbackBehavior.OPEN_IN_BROWSER); + activity.viewUrl(url, PostLookupFallbackBehavior.OPEN_IN_BROWSER, text); } }; activity.mastodonApi.listAnnouncements()