From 6eac6e5e9dd21306715f14cf92956b11c646857d Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Wed, 28 Dec 2022 20:58:27 -0500 Subject: [PATCH] Update against foxcompat changes Signed-off-by: androidacy-user --- .../java/com/fox2code/mmm/MainActivity.java | 4 +- .../com/fox2code/mmm/MainApplication.java | 8 +- .../com/fox2code/mmm/NotificationType.java | 2 +- .../mmm/androidacy/AndroidacyActivity.java | 12 +- .../mmm/androidacy/AndroidacyWebAPI.java | 2 +- .../mmm/installer/InstallerActivity.java | 9 +- .../mmm/markdown/MarkdownActivity.java | 10 +- .../fox2code/mmm/module/ActionButtonType.java | 159 +++++++----------- .../mmm/module/ModuleViewAdapter.java | 2 +- .../mmm/settings/SettingsActivity.java | 8 +- .../com/fox2code/mmm/utils/IntentHelper.java | 25 +-- .../com/fox2code/mmm/utils/ZipFileOpener.java | 2 +- 12 files changed, 80 insertions(+), 163 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index 69bab06..e1a3512 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -39,8 +39,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.fox2code.foxcompat.FoxActivity; -import com.fox2code.foxcompat.FoxDisplay; +import com.fox2code.foxcompat.app.FoxActivity; +import com.fox2code.foxcompat.view.FoxDisplay; import com.fox2code.mmm.background.BackgroundUpdateChecker; import com.fox2code.mmm.installer.InstallerInitializer; import com.fox2code.mmm.manager.LocalModuleInfo; diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java index 4de0d5e..7ca9e64 100644 --- a/app/src/main/java/com/fox2code/mmm/MainApplication.java +++ b/app/src/main/java/com/fox2code/mmm/MainApplication.java @@ -22,10 +22,10 @@ import androidx.emoji2.text.DefaultEmojiCompatConfig; import androidx.emoji2.text.EmojiCompat; import androidx.emoji2.text.FontRequestEmojiCompatConfig; -import com.fox2code.foxcompat.FoxActivity; -import com.fox2code.foxcompat.FoxApplication; -import com.fox2code.foxcompat.FoxThemeWrapper; -import com.fox2code.foxcompat.internal.FoxProcessExt; +import com.fox2code.foxcompat.app.FoxActivity; +import com.fox2code.foxcompat.app.FoxApplication; +import com.fox2code.foxcompat.app.internal.FoxProcessExt; +import com.fox2code.foxcompat.view.FoxThemeWrapper; import com.fox2code.mmm.installer.InstallerInitializer; import com.fox2code.mmm.utils.GMSProviderInstaller; import com.fox2code.mmm.utils.Http; diff --git a/app/src/main/java/com/fox2code/mmm/NotificationType.java b/app/src/main/java/com/fox2code/mmm/NotificationType.java index 3d0017a..be73c83 100644 --- a/app/src/main/java/com/fox2code/mmm/NotificationType.java +++ b/app/src/main/java/com/fox2code/mmm/NotificationType.java @@ -8,7 +8,7 @@ import androidx.annotation.AttrRes; import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.installer.InstallerInitializer; import com.fox2code.mmm.module.ModuleViewListBuilder; import com.fox2code.mmm.repo.RepoManager; diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java index 5b4a4c2..d65d46e 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyActivity.java @@ -26,7 +26,7 @@ import androidx.webkit.WebSettingsCompat; import androidx.webkit.WebViewClientCompat; import androidx.webkit.WebViewFeature; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.Constants; import com.fox2code.mmm.MainApplication; @@ -310,16 +310,6 @@ public final class AndroidacyActivity extends FoxActivity { this.webView.loadUrl(url, headers); } - @Override - public void onBackPressed() { - WebView webView = this.webView; - if (webView != null && webView.canGoBack()) { - webView.goBack(); - } else { - super.onBackPressed(); - } - } - @Override protected void onResume() { super.onResume(); diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java index 390e34b..cbd475e 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyWebAPI.java @@ -16,7 +16,7 @@ import androidx.annotation.Keep; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; -import com.fox2code.foxcompat.FoxDisplay; +import com.fox2code.foxcompat.view.FoxDisplay; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.MainApplication; import com.fox2code.mmm.R; diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java index 0eb3143..135061a 100644 --- a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java +++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java @@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.fox2code.androidansi.AnsiConstants; import com.fox2code.androidansi.AnsiParser; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.AppUpdateManager; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.Constants; @@ -393,13 +393,6 @@ public class InstallerActivity extends FoxActivity { } if (anyKernel3) { installerController.useRecoveryExt(); - } else if (Build.SUPPORTED_32_BIT_ABIS.length == 0) { - if (needs32bit) { - this.setInstallStateFinished(false, - "! This module can't be installed on a 64bit only system", - null); - return; - } } else if (needs32bit || (compatFlags & AppUpdateManager.FLAG_COMPAT_NO_EXT) == 0) { // Restore Magisk legacy stuff for retro compatibility if (Build.SUPPORTED_32_BIT_ABIS[0].contains("arm")) diff --git a/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java b/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java index 56b5f03..ce88c04 100644 --- a/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java +++ b/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java @@ -18,7 +18,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.core.graphics.ColorUtils; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.Constants; import com.fox2code.mmm.MainApplication; import com.fox2code.mmm.R; @@ -157,16 +157,12 @@ public class MarkdownActivity extends FoxActivity { textView, MarkdownUrlLinker.urlLinkify(markdown)); if (markdownBackground != null) { markdownBackground.setClickable(true); - markdownBackground.setOnClickListener(v -> this.onBackPressed()); } }); } catch (Exception e) { Log.e(TAG, "Failed download", e); - runOnUiThread(() -> { - Toast.makeText(this, R.string.failed_download, - Toast.LENGTH_SHORT).show(); - this.onBackPressed(); - }); + runOnUiThread(() -> Toast.makeText(this, R.string.failed_download, + Toast.LENGTH_SHORT).show()); } }, "Markdown load thread").start(); } diff --git a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java index e3031bd..43e0436 100644 --- a/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java +++ b/app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java @@ -12,8 +12,8 @@ import android.widget.Toast; import androidx.annotation.DrawableRes; import androidx.appcompat.app.AlertDialog; -import com.fox2code.foxcompat.FoxActivity; -import com.fox2code.foxcompat.FoxDisplay; +import com.fox2code.foxcompat.app.FoxActivity; +import com.fox2code.foxcompat.view.FoxDisplay; import com.fox2code.mmm.MainApplication; import com.fox2code.mmm.R; import com.fox2code.mmm.androidacy.AndroidacyUtil; @@ -41,36 +41,22 @@ public enum ActionButtonType { public void doAction(Chip button, ModuleHolder moduleHolder) { String notesUrl = moduleHolder.repoModule.notesUrl; if (AndroidacyUtil.isAndroidacyLink(notesUrl)) { - IntentHelper.openUrlAndroidacy(button.getContext(), notesUrl, false, - moduleHolder.repoModule.moduleInfo.name, - moduleHolder.getMainModuleConfig()); + IntentHelper.openUrlAndroidacy(button.getContext(), notesUrl, false, moduleHolder.repoModule.moduleInfo.name, moduleHolder.getMainModuleConfig()); } else { - IntentHelper.openMarkdown(button.getContext(), notesUrl, - moduleHolder.repoModule.moduleInfo.name, - moduleHolder.getMainModuleConfig(), - moduleHolder.repoModule.moduleInfo.changeBoot, - moduleHolder.repoModule.moduleInfo.needRamdisk, - moduleHolder.repoModule.moduleInfo.minMagisk, - moduleHolder.repoModule.moduleInfo.minApi, - moduleHolder.repoModule.moduleInfo.maxApi - ); + IntentHelper.openMarkdown(button.getContext(), notesUrl, moduleHolder.repoModule.moduleInfo.name, moduleHolder.getMainModuleConfig(), moduleHolder.repoModule.moduleInfo.changeBoot, moduleHolder.repoModule.moduleInfo.needRamdisk, moduleHolder.repoModule.moduleInfo.minMagisk, moduleHolder.repoModule.moduleInfo.minApi, moduleHolder.repoModule.moduleInfo.maxApi); } } @Override public boolean doActionLong(Chip button, ModuleHolder moduleHolder) { Context context = button.getContext(); - Toast.makeText(context, context.getString(R.string.module_id_prefix) + - moduleHolder.moduleId, Toast.LENGTH_SHORT).show(); + Toast.makeText(context, context.getString(R.string.module_id_prefix) + moduleHolder.moduleId, Toast.LENGTH_SHORT).show(); return true; } - }, - UPDATE_INSTALL() { + }, UPDATE_INSTALL() { @Override public void update(Chip button, ModuleHolder moduleHolder) { - int icon = moduleHolder.hasUpdate() ? - R.drawable.ic_baseline_update_24 : - R.drawable.ic_baseline_system_update_24; + int icon = moduleHolder.hasUpdate() ? R.drawable.ic_baseline_update_24 : R.drawable.ic_baseline_system_update_24; button.setChipIcon(button.getContext().getDrawable(icon)); if (moduleHolder.hasUpdate()) { button.setText(R.string.update); @@ -82,22 +68,19 @@ public enum ActionButtonType { @Override public void doAction(Chip button, ModuleHolder moduleHolder) { ModuleInfo moduleInfo = moduleHolder.getMainModuleInfo(); - if (moduleInfo == null) return; + if (moduleInfo == null) + return; String updateZipUrl = moduleHolder.getUpdateZipUrl(); - if (updateZipUrl == null) return; + if (updateZipUrl == null) + return; // Androidacy manage the selection between download and install if (AndroidacyUtil.isAndroidacyLink(updateZipUrl)) { - IntentHelper.openUrlAndroidacy( - button.getContext(), updateZipUrl, true, - moduleInfo.name, moduleInfo.config); + IntentHelper.openUrlAndroidacy(button.getContext(), updateZipUrl, true, moduleInfo.name, moduleInfo.config); return; } - boolean hasRoot = InstallerInitializer.peekMagiskPath() != null - && !MainApplication.isShowcaseMode(); - MaterialAlertDialogBuilder builder = - new MaterialAlertDialogBuilder(button.getContext()); - builder.setTitle(moduleInfo.name).setCancelable(true) - .setIcon(R.drawable.ic_baseline_extension_24); + boolean hasRoot = InstallerInitializer.peekMagiskPath() != null && !MainApplication.isShowcaseMode(); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(button.getContext()); + builder.setTitle(moduleInfo.name).setCancelable(true).setIcon(R.drawable.ic_baseline_extension_24); CharSequence desc = moduleInfo.description; Markwon markwon = null; LocalModuleInfo localModuleInfo = moduleHolder.moduleInfo; @@ -113,20 +96,14 @@ public enum ActionButtonType { builder.setMessage(desc); } Log.i("Test", "URL: " + updateZipUrl); - builder.setNegativeButton(R.string.download_module, (x, y) -> { - IntentHelper.openCustomTab(button.getContext(), updateZipUrl); - }); + builder.setNegativeButton(R.string.download_module, (x, y) -> IntentHelper.openCustomTab(button.getContext(), updateZipUrl)); if (hasRoot) { - builder.setPositiveButton(moduleHolder.hasUpdate() ? - R.string.update_module : R.string.install_module, (x, y) -> { + builder.setPositiveButton(moduleHolder.hasUpdate() ? R.string.update_module : R.string.install_module, (x, y) -> { String updateZipChecksum = moduleHolder.getUpdateZipChecksum(); - IntentHelper.openInstaller(button.getContext(), updateZipUrl, - moduleInfo.name, moduleInfo.config, updateZipChecksum, - moduleInfo.mmtReborn); + IntentHelper.openInstaller(button.getContext(), updateZipUrl, moduleInfo.name, moduleInfo.config, updateZipChecksum, moduleInfo.mmtReborn); }); } - ExternalHelper.INSTANCE.injectButton(builder, - () -> Uri.parse(updateZipUrl), moduleHolder.getUpdateZipRepo()); + ExternalHelper.INSTANCE.injectButton(builder, () -> Uri.parse(updateZipUrl), moduleHolder.getUpdateZipRepo()); int dim5dp = FoxDisplay.dpToPixel(5); builder.setBackgroundInsetStart(dim5dp).setBackgroundInsetEnd(dim5dp); AlertDialog alertDialog = builder.show(); @@ -137,36 +114,26 @@ public enum ActionButtonType { } } if (markwon != null) { - TextView messageView = alertDialog.getWindow() - .findViewById(android.R.id.message); + TextView messageView = alertDialog.getWindow().findViewById(android.R.id.message); markwon.setParsedMarkdown(messageView, (Spanned) desc); } } - }, - UNINSTALL() { + }, UNINSTALL() { @Override public void update(Chip button, ModuleHolder moduleHolder) { - int icon = moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UNINSTALLING) ? - R.drawable.ic_baseline_delete_outline_24 : ( - !moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UPDATING) || - moduleHolder.hasFlag(ModuleInfo.FLAGS_MODULE_ACTIVE)) ? - R.drawable.ic_baseline_delete_24 : - R.drawable.ic_baseline_delete_forever_24; + int icon = moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UNINSTALLING) ? R.drawable.ic_baseline_delete_outline_24 : (!moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UPDATING) || moduleHolder.hasFlag(ModuleInfo.FLAGS_MODULE_ACTIVE)) ? R.drawable.ic_baseline_delete_24 : R.drawable.ic_baseline_delete_forever_24; button.setChipIcon(button.getContext().getDrawable(icon)); button.setText(R.string.uninstall); } @Override public void doAction(Chip button, ModuleHolder moduleHolder) { - if (!moduleHolder.hasFlag(ModuleInfo.FLAGS_MODULE_ACTIVE | - ModuleInfo.FLAG_MODULE_UNINSTALLING) && - moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UPDATING)) { + if (!moduleHolder.hasFlag(ModuleInfo.FLAGS_MODULE_ACTIVE | ModuleInfo.FLAG_MODULE_UNINSTALLING) && moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UPDATING)) { doActionLong(button, moduleHolder); return; } Log.i("ActionButtonType", Integer.toHexString(moduleHolder.moduleInfo.flags)); - if (!ModuleManager.getINSTANCE().setUninstallState(moduleHolder.moduleInfo, - !moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UNINSTALLING))) { + if (!ModuleManager.getINSTANCE().setUninstallState(moduleHolder.moduleInfo, !moduleHolder.hasFlag(ModuleInfo.FLAG_MODULE_UNINSTALLING))) { Log.e("ActionButtonType", "Failed to switch uninstalled state!"); } update(button, moduleHolder); @@ -177,23 +144,20 @@ public enum ActionButtonType { // Actually a module having mount is the only issue when deleting module if (moduleHolder.moduleInfo.hasFlag(ModuleInfo.FLAG_MODULE_HAS_ACTIVE_MOUNT)) return false; // We can't trust active flag on first boot - new AlertDialog.Builder(button.getContext()).setTitle(R.string.master_delete) - .setPositiveButton(R.string.master_delete_yes, (v, i) -> { - String moduleId = moduleHolder.moduleInfo.id; - if (!ModuleManager.getINSTANCE().masterClear(moduleHolder.moduleInfo)) { - Toast.makeText(button.getContext(), R.string.master_delete_fail, - Toast.LENGTH_SHORT).show(); - } else { - moduleHolder.moduleInfo = null; - FoxActivity.getFoxActivity(button).refreshUI(); - Log.e("ActionButtonType", "Cleared: " + moduleId); - } - }).setNegativeButton(R.string.master_delete_no, (v, i) -> { - }).create().show(); + new AlertDialog.Builder(button.getContext()).setTitle(R.string.master_delete).setPositiveButton(R.string.master_delete_yes, (v, i) -> { + String moduleId = moduleHolder.moduleInfo.id; + if (!ModuleManager.getINSTANCE().masterClear(moduleHolder.moduleInfo)) { + Toast.makeText(button.getContext(), R.string.master_delete_fail, Toast.LENGTH_SHORT).show(); + } else { + moduleHolder.moduleInfo = null; + FoxActivity.getFoxActivity(button).refreshUI(); + Log.e("ActionButtonType", "Cleared: " + moduleId); + } + }).setNegativeButton(R.string.master_delete_no, (v, i) -> { + }).create().show(); return true; } - }, - CONFIG() { + }, CONFIG() { @Override public void update(Chip button, ModuleHolder moduleHolder) { button.setChipIcon(button.getContext().getDrawable(R.drawable.ic_baseline_app_settings_alt_24)); @@ -203,35 +167,31 @@ public enum ActionButtonType { @Override public void doAction(Chip button, ModuleHolder moduleHolder) { String config = moduleHolder.getMainModuleConfig(); - if (config == null) return; + if (config == null) + return; if (AndroidacyUtil.isAndroidacyLink(config)) { IntentHelper.openUrlAndroidacy(button.getContext(), config, true); } else { IntentHelper.openConfig(button.getContext(), config); } } - }, - SUPPORT() { + }, SUPPORT() { @Override public void update(Chip button, ModuleHolder moduleHolder) { ModuleInfo moduleInfo = moduleHolder.getMainModuleInfo(); - button.setChipIcon(button.getContext().getDrawable( - supportIconForUrl(moduleInfo.support))); + button.setChipIcon(button.getContext().getDrawable(supportIconForUrl(moduleInfo.support))); button.setText(R.string.support); } @Override public void doAction(Chip button, ModuleHolder moduleHolder) { - IntentHelper.openUrl(button.getContext(), - moduleHolder.getMainModuleInfo().support); + IntentHelper.openUrl(button.getContext(), moduleHolder.getMainModuleInfo().support); } - }, - DONATE() { + }, DONATE() { @Override public void update(Chip button, ModuleHolder moduleHolder) { ModuleInfo moduleInfo = moduleHolder.getMainModuleInfo(); - button.setChipIcon(button.getContext().getDrawable( - donateIconForUrl(moduleInfo.donate))); + button.setChipIcon(button.getContext().getDrawable(donateIconForUrl(moduleInfo.donate))); button.setText(R.string.donate); } @@ -241,6 +201,18 @@ public enum ActionButtonType { } }; + @DrawableRes + private final int iconId; + + ActionButtonType() { + this.iconId = 0; + } + + @SuppressWarnings("unused") + ActionButtonType(int iconId) { + this.iconId = iconId; + } + @DrawableRes public static int supportIconForUrl(String url) { int icon = R.drawable.ic_baseline_support_24; @@ -248,8 +220,7 @@ public enum ActionButtonType { return icon; } else if (url.startsWith("https://t.me/")) { icon = R.drawable.ic_baseline_telegram_24; - } else if (url.startsWith("https://discord.gg/") || - url.startsWith("https://discord.com/invite/")) { + } else if (url.startsWith("https://discord.gg/") || url.startsWith("https://discord.com/invite/")) { icon = R.drawable.ic_baseline_discord_24; } else if (url.startsWith("https://github.com/")) { icon = R.drawable.ic_github; @@ -266,28 +237,14 @@ public enum ActionButtonType { int icon = R.drawable.ic_baseline_monetization_on_24; if (url == null) { return icon; - } else if (url.startsWith("https://www.paypal.me/") || - url.startsWith("https://www.paypal.com/paypalme/") || - url.startsWith("https://www.paypal.com/donate/")) { + } else if (url.startsWith("https://www.paypal.me/") || url.startsWith("https://www.paypal.com/paypalme/") || url.startsWith("https://www.paypal.com/donate/")) { icon = R.drawable.ic_baseline_paypal_24; - } else if (url.startsWith("https://patreon.com/") || - url.startsWith("https://www.patreon.com/")) { + } else if (url.startsWith("https://patreon.com/") || url.startsWith("https://www.patreon.com/")) { icon = R.drawable.ic_patreon; } return icon; } - @DrawableRes - private final int iconId; - - ActionButtonType() { - this.iconId = 0; - } - - ActionButtonType(int iconId) { - this.iconId = iconId; - } - public void update(Chip button, ModuleHolder moduleHolder) { button.setChipIcon(button.getContext().getDrawable(this.iconId)); } diff --git a/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java index 29704f6..894df8f 100644 --- a/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java +++ b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java @@ -21,7 +21,7 @@ import androidx.cardview.widget.CardView; import androidx.core.graphics.ColorUtils; import androidx.recyclerview.widget.RecyclerView; -import com.fox2code.foxcompat.FoxDisplay; +import com.fox2code.foxcompat.view.FoxDisplay; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.MainApplication; import com.fox2code.mmm.NotificationType; diff --git a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java index a15ccf7..f792370 100644 --- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java +++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java @@ -39,10 +39,10 @@ import androidx.preference.PreferenceGroup; import androidx.preference.SwitchPreferenceCompat; import androidx.preference.TwoStatePreference; -import com.fox2code.foxcompat.FoxActivity; -import com.fox2code.foxcompat.FoxDisplay; -import com.fox2code.foxcompat.FoxViewCompat; -import com.fox2code.foxcompat.internal.FoxProcessExt; +import com.fox2code.foxcompat.app.FoxActivity; +import com.fox2code.foxcompat.app.internal.FoxProcessExt; +import com.fox2code.foxcompat.view.FoxDisplay; +import com.fox2code.foxcompat.view.FoxViewCompat; import com.fox2code.mmm.AppUpdateManager; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.Constants; diff --git a/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java b/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java index 4c89330..5c02346 100644 --- a/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java +++ b/app/src/main/java/com/fox2code/mmm/utils/IntentHelper.java @@ -3,13 +3,11 @@ package com.fox2code.mmm.utils; import android.annotation.SuppressLint; import android.app.Activity; import android.content.ActivityNotFoundException; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.util.Log; @@ -19,7 +17,7 @@ import android.widget.Toast; import androidx.core.app.ActivityOptionsCompat; import androidx.core.app.BundleCompat; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.Constants; import com.fox2code.mmm.MainApplication; @@ -50,11 +48,7 @@ public class IntentHelper { "android.support.customtabs.extra.TOOLBAR_COLOR"; private static final String EXTRA_TAB_EXIT_ANIMATION_BUNDLE = "android.support.customtabs.extra.EXIT_ANIMATION_BUNDLE"; - static final int FLAG_GRANT_URI_PERMISSION = - Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP ? - Intent.FLAG_GRANT_READ_URI_PERMISSION | - Intent.FLAG_GRANT_WRITE_URI_PERMISSION : - Intent.FLAG_GRANT_READ_URI_PERMISSION; + static final int FLAG_GRANT_URI_PERMISSION = Intent.FLAG_GRANT_READ_URI_PERMISSION; public static void openUri(Context context, String uri) { if (uri.startsWith("intent://")) { @@ -152,7 +146,7 @@ public class IntentHelper { "am start -a android.intent.action.MAIN " + "-c org.lsposed.manager.LAUNCH_MANAGER " + "com.android.shell/.BugreportWarningActivity") - .to(new CallbackList() { + .to(new CallbackList<>() { @Override public void onAddElement(String str) { Log.i(TAG, "LSPosed: " + str); @@ -193,11 +187,6 @@ public class IntentHelper { } } - public static void openInstaller(Context context, String url, String title, - String config, String checksum) { - openInstaller(context, url, title, config, checksum, false); - } - public static void openInstaller(Context context, String url, String title, String config, String checksum, boolean mmtReborn) { openInstaller(context, url, title, config, checksum, mmtReborn, false); @@ -227,14 +216,6 @@ public class IntentHelper { } } - public static void startActivity(Context context, Intent intent) { - ComponentName componentName = intent.getComponent(); - String packageName = context.getPackageName(); - startActivity(context, intent, packageName.equals(intent.getPackage()) || - (componentName != null && - packageName.equals(componentName.getPackageName()))); - } - public static void startActivity(Context context, Class activityClass) { startActivity(context, new Intent(context, activityClass), true); } diff --git a/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java b/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java index c22e510..30e697b 100644 --- a/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java +++ b/app/src/main/java/com/fox2code/mmm/utils/ZipFileOpener.java @@ -8,7 +8,7 @@ import android.os.Bundle; import android.util.Log; import android.widget.Toast; -import com.fox2code.foxcompat.FoxActivity; +import com.fox2code.foxcompat.app.FoxActivity; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.R; import com.fox2code.mmm.installer.InstallerInitializer;