From 05217d2e95e26407983e42ff6f3ba4fd43f64bed Mon Sep 17 00:00:00 2001 From: sunilpaulmathew Date: Sat, 27 Feb 2021 09:05:35 +0100 Subject: [PATCH] launchURL: get view from activity Signed-off-by: sunilpaulmathew --- .../activities/NoRootActivity.java | 2 +- .../kernelmanager/activities/TextActivity.java | 8 +------- .../fragments/other/AboutFragment.java | 18 +++++++++--------- .../tools/CustomControlsFragment.java | 2 +- .../fragments/tools/ScriptMangerFragment.java | 3 +-- .../fragments/tools/SmartPackFragment.java | 12 ++++++------ .../smartpack/kernelmanager/utils/Utils.java | 8 ++++---- .../views/recyclerview/ContributorView.java | 3 ++- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/smartpack/kernelmanager/activities/NoRootActivity.java b/app/src/main/java/com/smartpack/kernelmanager/activities/NoRootActivity.java index e582dbd62..1b02882dc 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/activities/NoRootActivity.java +++ b/app/src/main/java/com/smartpack/kernelmanager/activities/NoRootActivity.java @@ -46,7 +46,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { LinearLayout bbi = findViewById(R.id.bbi); MaterialTextView mainTitle = findViewById(R.id.title_main); MaterialTextView mainMessage = findViewById(R.id.message_main); - bbi.setOnClickListener(v -> Utils.launchUrl(bbi, "https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller", this)); + bbi.setOnClickListener(v -> Utils.launchUrl("https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller", this)); if (Utils.mHasRoot && !Utils.mHasBusybox) { bbi.setVisibility(View.VISIBLE); mainTitle.setText(getString(R.string.no_busybox)); diff --git a/app/src/main/java/com/smartpack/kernelmanager/activities/TextActivity.java b/app/src/main/java/com/smartpack/kernelmanager/activities/TextActivity.java index 687a0f2e3..5371e6f69 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/activities/TextActivity.java +++ b/app/src/main/java/com/smartpack/kernelmanager/activities/TextActivity.java @@ -20,7 +20,6 @@ package com.smartpack.kernelmanager.activities; import android.os.Bundle; -import android.view.View; import androidx.annotation.Nullable; @@ -47,12 +46,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { if (message != null) ((MaterialTextView) findViewById(R.id.message_text)).setText(message); if (url != null) - findViewById(R.id.help_fab).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Utils.launchUrl(findViewById(android.R.id.content), url, TextActivity.this); - } - }); + findViewById(R.id.help_fab).setOnClickListener(v -> Utils.launchUrl(url, TextActivity.this)); } } diff --git a/app/src/main/java/com/smartpack/kernelmanager/fragments/other/AboutFragment.java b/app/src/main/java/com/smartpack/kernelmanager/fragments/other/AboutFragment.java index 65316be23..46e90fd25 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/fragments/other/AboutFragment.java +++ b/app/src/main/java/com/smartpack/kernelmanager/fragments/other/AboutFragment.java @@ -132,19 +132,19 @@ private void aboutInit(List items) { support.setDrawable(getResources().getDrawable(R.drawable.ic_support)); support.setTitle(getString(R.string.support)); support.setSummary(getString(R.string.support_summary)); - support.setOnItemClickListener(item -> Utils.launchUrl(getRootView(),"https://t.me/smartpack_kmanager", getActivity())); + support.setOnItemClickListener(item -> Utils.launchUrl("https://t.me/smartpack_kmanager", getActivity())); DescriptionView fdroid = new DescriptionView(); fdroid.setDrawable(getResources().getDrawable(R.drawable.ic_fdroid)); fdroid.setTitle(getString(R.string.fdroid)); fdroid.setSummary(getString(R.string.fdroid_summary)); - fdroid.setOnItemClickListener(item -> Utils.launchUrl(getRootView(),"https://f-droid.org/packages/com.smartpack.kernelmanager", getActivity())); + fdroid.setOnItemClickListener(item -> Utils.launchUrl("https://f-droid.org/packages/com.smartpack.kernelmanager", getActivity())); DescriptionView sourcecode = new DescriptionView(); sourcecode.setDrawable(getResources().getDrawable(R.drawable.ic_source)); sourcecode.setTitle(getString(R.string.source_code)); sourcecode.setSummary(getString(R.string.source_code_summary)); - sourcecode.setOnItemClickListener(item -> Utils.launchUrl(getRootView(),"https://github.com/SmartPack/SmartPack-Kernel-Manager/tree/beta", requireActivity())); + sourcecode.setOnItemClickListener(item -> Utils.launchUrl("https://github.com/SmartPack/SmartPack-Kernel-Manager/tree/beta", requireActivity())); DescriptionView changelogs = new DescriptionView(); changelogs.setDrawable(getResources().getDrawable(R.drawable.ic_changelog)); @@ -165,7 +165,7 @@ private void aboutInit(List items) { donatetome.setTitle(getString(R.string.donations)); donatetome.setSummary(getString(R.string.donate_me_summary)); donatetome.setOnItemClickListener(item -> { - Utils.launchUrl(getRootView(),"https://smartpack.github.io/donation/", getActivity()); + Utils.launchUrl("https://smartpack.github.io/donation/", getActivity()); }); DescriptionView share = new DescriptionView(); @@ -206,7 +206,7 @@ private void librariesInit(List items) { DescriptionView Grarak = new DescriptionView(); Grarak.setDrawable(getResources().getDrawable(R.drawable.ic_grarak)); Grarak.setSummary(getString(R.string.grarak_summary)); - Grarak.setOnItemClickListener(item -> Utils.launchUrl(getRootView(),"https://github.com/Grarak", getActivity())); + Grarak.setOnItemClickListener(item -> Utils.launchUrl("https://github.com/Grarak", getActivity())); GrarakCard.addItem(Grarak); items.add(GrarakCard); @@ -218,7 +218,7 @@ private void librariesInit(List items) { DescriptionView osm0sis = new DescriptionView(); osm0sis.setDrawable(getResources().getDrawable(R.drawable.ic_osm0sis)); osm0sis.setSummary(getString(R.string.osm0sis_summary)); - osm0sis.setOnItemClickListener(item -> Utils.launchUrl(getRootView(),"https://github.com/osm0sis", getActivity())); + osm0sis.setOnItemClickListener(item -> Utils.launchUrl("https://github.com/osm0sis", getActivity())); osm0sisCard.addItem(osm0sis); items.add(osm0sisCard); @@ -260,7 +260,7 @@ private void librariesInit(List items) { } descriptionView.setTitle(lib.split(",")[1]); descriptionView.setSummary(lib.split(",")[0]); - descriptionView.setOnItemClickListener(item -> Utils.launchUrl(getRootView(), sCredits.get(lib), getActivity())); + descriptionView.setOnItemClickListener(item -> Utils.launchUrl(sCredits.get(lib), getActivity())); items.add(descriptionView); } @@ -283,7 +283,7 @@ private void translationsInit(List items) { R.array.translator_options), (dialogInterface, i) -> { switch (i) { case 0: - Utils.launchUrl(getRootView(), "https://poeditor.com/join/project?hash=qWFlVfAlp5", requireActivity()); + Utils.launchUrl("https://poeditor.com/join/project?hash=qWFlVfAlp5", requireActivity()); break; case 1: new AsyncTask() { @@ -356,7 +356,7 @@ protected void onPostExecute(Void aVoid) { } descriptionView.setTitle(lib.split(",")[1]); descriptionView.setSummary(lib.split(",")[0]); - descriptionView.setOnItemClickListener(item -> Utils.launchUrl(getRootView(), sTranslations.get(lib), getActivity())); + descriptionView.setOnItemClickListener(item -> Utils.launchUrl(sTranslations.get(lib), getActivity())); items.add(descriptionView); } diff --git a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/CustomControlsFragment.java b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/CustomControlsFragment.java index fe6e31dd8..a0a185add 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/CustomControlsFragment.java +++ b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/CustomControlsFragment.java @@ -399,7 +399,7 @@ private void warningDialog() { .setCancelable(false) .setView(checkBoxView) .setNeutralButton(getString(R.string.documentation), (dialog, id) - -> Utils.launchUrl(getRootView(), "https://smartpack.github.io/spkm/customcontrols/", getActivity())) + -> Utils.launchUrl("https://smartpack.github.io/spkm/customcontrols/", getActivity())) .setPositiveButton(getString(R.string.got_it), (dialog, id) -> Prefs.saveBoolean("custom_control_warning", mAlertDialogue, getActivity())) diff --git a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/ScriptMangerFragment.java b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/ScriptMangerFragment.java index 726bc21f7..024f52f3c 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/ScriptMangerFragment.java +++ b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/ScriptMangerFragment.java @@ -36,7 +36,6 @@ import com.smartpack.kernelmanager.activities.ApplyScriptActivity; import com.smartpack.kernelmanager.activities.EditorActivity; import com.smartpack.kernelmanager.activities.ForegroundActivity; -import com.smartpack.kernelmanager.fragments.BaseFragment; import com.smartpack.kernelmanager.fragments.DescriptionFragment; import com.smartpack.kernelmanager.fragments.RecyclerViewFragment; import com.smartpack.kernelmanager.fragments.SwitcherFragment; @@ -250,7 +249,7 @@ private void load(List items) { sm.setSummary(getString(R.string.scripts_manager_message)); sm.setFullSpan(true); sm.setOnItemClickListener(item -> { - Utils.launchUrl(getRootView(), "https://play.google.com/store/apps/details?id=com.smartpack.scriptmanager", getActivity()); + Utils.launchUrl("https://play.google.com/store/apps/details?id=com.smartpack.scriptmanager", getActivity()); }); items.add(sm); } diff --git a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/SmartPackFragment.java b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/SmartPackFragment.java index e1d35b147..7ba03aa09 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/SmartPackFragment.java +++ b/app/src/main/java/com/smartpack/kernelmanager/fragments/tools/SmartPackFragment.java @@ -239,7 +239,7 @@ private void SmartPackInit(List items) { info.setDrawable(ViewUtils.getColoredIcon(R.drawable.ic_info, requireContext())); info.setMenuIcon(ViewUtils.getWhiteColoredIcon(R.drawable.ic_dots, requireActivity())); info.setTitle(getString(R.string.update_channel_info, Utils.getInternalDataStorage())); - info.setOnItemClickListener(item -> Utils.launchUrl(getRootView(), "https://smartpack.github.io/kerneldownloads/", getActivity())); + info.setOnItemClickListener(item -> Utils.launchUrl("https://smartpack.github.io/kerneldownloads/", getActivity())); info.setFullSpan(true); info.setOnMenuListener((info1, popupMenu) -> { Menu menu = popupMenu.getMenu(); @@ -273,7 +273,7 @@ private void SmartPackInit(List items) { changelogs.setOnItemClickListener(item -> { if (KernelUpdater.getChangeLog(requireActivity()).contains("https://") || KernelUpdater.getChangeLog(requireActivity()).contains("http://")) { - Utils.launchUrl(getRootView(), KernelUpdater.getChangeLog(requireActivity()), getActivity()); + Utils.launchUrl(KernelUpdater.getChangeLog(requireActivity()), getActivity()); } else { new Dialog(requireActivity()) .setTitle(KernelUpdater.getKernelName(requireActivity()) + " " + KernelUpdater.getLatestVersion(requireActivity())) @@ -294,7 +294,7 @@ private void SmartPackInit(List items) { support.setOnItemClickListener(item -> { if (KernelUpdater.getSupport(requireActivity()).contains("https://") || KernelUpdater.getSupport(requireActivity()).contains("http://")) { - Utils.launchUrl(getRootView(), KernelUpdater.getSupport(requireActivity()), getActivity()); + Utils.launchUrl(KernelUpdater.getSupport(requireActivity()), getActivity()); } else { Utils.snackbar(getRootView(), getString(R.string.unknown_link)); } @@ -325,8 +325,8 @@ private void SmartPackInit(List items) { donations.setOnItemClickListener(item -> { if (KernelUpdater.getDonationLink(requireActivity()).contains("https://") || KernelUpdater.getDonationLink(requireActivity()).contains("http://")) { - Utils.launchUrl(getRootView(), KernelUpdater.getSupport(requireActivity()), getActivity()); - Utils.launchUrl(getRootView(), KernelUpdater.getDonationLink(requireActivity()), getActivity()); + Utils.launchUrl(KernelUpdater.getSupport(requireActivity()), getActivity()); + Utils.launchUrl(KernelUpdater.getDonationLink(requireActivity()), getActivity()); } else { Utils.snackbar(getRootView(), getString(R.string.unknown_link)); } @@ -366,7 +366,7 @@ private void OtherOptionsInit(List items) { busybox.setSummary(getString(R.string.busybox_installer_summary)); busybox.setFullSpan(true); busybox.setOnItemClickListener(item -> { - Utils.launchUrl(getRootView(), "https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller", getActivity()); + Utils.launchUrl("https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller", getActivity()); }); items.add(busybox); } diff --git a/app/src/main/java/com/smartpack/kernelmanager/utils/Utils.java b/app/src/main/java/com/smartpack/kernelmanager/utils/Utils.java index a52e00f00..c7a678532 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/utils/Utils.java +++ b/app/src/main/java/com/smartpack/kernelmanager/utils/Utils.java @@ -430,15 +430,15 @@ public static void snackbar(View view, String message) { snackBar.show(); } - public static void launchUrl(View view, String url, Context context) { - if (!isNetworkAvailable(context)) { - snackbar(view, context.getString(R.string.no_internet)); + public static void launchUrl(String url, Activity activity) { + if (!isNetworkAvailable(activity)) { + snackbar(activity.findViewById(android.R.id.content), activity.getString(R.string.no_internet)); return; } try { Intent i = new Intent(Intent.ACTION_VIEW); i.setData(Uri.parse(url)); - context.startActivity(i); + activity.startActivity(i); } catch (ActivityNotFoundException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/smartpack/kernelmanager/views/recyclerview/ContributorView.java b/app/src/main/java/com/smartpack/kernelmanager/views/recyclerview/ContributorView.java index 853e1008f..4ee8666df 100644 --- a/app/src/main/java/com/smartpack/kernelmanager/views/recyclerview/ContributorView.java +++ b/app/src/main/java/com/smartpack/kernelmanager/views/recyclerview/ContributorView.java @@ -19,6 +19,7 @@ */ package com.smartpack.kernelmanager.views.recyclerview; +import android.app.Activity; import android.view.View; import androidx.appcompat.widget.AppCompatImageView; @@ -57,7 +58,7 @@ public void onCreateView(View view) { name.setText(mContributor.getLogin()); contributions.setText(view.getResources().getString(R.string.commits, mContributor.getContributions())); - view.setOnClickListener(v -> Utils.launchUrl(view, mContributor.getHtmlUrl(), v.getContext())); + view.setOnClickListener(v -> Utils.launchUrl(mContributor.getHtmlUrl(), (Activity) v.getContext())); } } \ No newline at end of file