diff --git a/app/src/main/java/app/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch.java b/app/src/main/java/app/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch.java deleted file mode 100644 index ec478d8d76..0000000000 --- a/app/src/main/java/app/revanced/integrations/twitter/patches/links/OpenLinksWithAppChooserPatch.java +++ /dev/null @@ -1,24 +0,0 @@ -package app.revanced.integrations.twitter.patches.links; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import app.revanced.integrations.twitter.Utils; -import app.revanced.integrations.twitter.settings.Settings; - -import java.util.Set; - -public final class OpenLinksWithAppChooserPatch { - public static void openWithChooser(final Context context, final Intent originalIntent, final Bundle bundle) { - Set categories = originalIntent.getCategories(); - - // original credit: TwiFucker, updated for newer build - if (originalIntent.getAction() == null || !Utils.getBooleanPerf(Settings.MISC_BROWSER_CHOOSER)) { - context.startActivity(originalIntent, bundle); - return; - } - - final Intent intent = new Intent("android.intent.action.VIEW", originalIntent.getData()); - context.startActivity(Intent.createChooser(intent, null)); - } -} diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java b/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java index 60076635a4..221452cb3d 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java @@ -307,9 +307,15 @@ public void buildAdsSection(boolean buildCategory){ } } - public void buildNativeSection(){ + public void buildNativeSection(boolean buildCategory){ if (!(SettingsStatus.enableNativeSection())) return; + if (!buildCategory) { + Preference nativePageDescription = new Preference(context); + nativePageDescription.setSummary(strRes("piko_pref_native_page_desc")); + addPreference(nativePageDescription); + } + LegacyTwitterPreferenceCategory category = preferenceCategory(strRes("piko_title_native_downloader")); if (SettingsStatus.nativeDownloader) { addPreference(category, @@ -423,16 +429,6 @@ public void buildMiscSection(boolean buildCategory){ ); } - if (SettingsStatus.browserChooserEnabled) { - addPreference(category, - helper.switchPreference( - strRes("piko_pref_browser_chooser"), - strRes("piko_pref_browser_chooser_desc"), - Settings.MISC_BROWSER_CHOOSER - ) - ); - } - if (SettingsStatus.roundOffNumbers) { addPreference(category, helper.switchPreference( diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java b/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java index 0a009f3368..3623519923 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java @@ -19,7 +19,6 @@ public class Settings extends BaseSettings { public static final BooleanSetting MISC_HIDE_RECOMMENDED_USERS = new BooleanSetting("misc_hide_recommended_users", true); public static final BooleanSetting MISC_HIDE_COMM_NOTES = new BooleanSetting("misc_hide_comm_notes", false); public static final BooleanSetting MISC_HIDE_VIEW_COUNT = new BooleanSetting("misc_hide_view_count", true); - public static final BooleanSetting MISC_BROWSER_CHOOSER = new BooleanSetting("misc_browser_chooser", false); public static final StringSetting MISC_FEATURE_FLAGS = new StringSetting("misc_feature_flags", ""); public static final StringSetting MISC_FEATURE_FLAGS_SEARCH = new StringSetting("misc_feature_flags_search", ""); public static final BooleanSetting MISC_ROUND_OFF_NUMBERS = new BooleanSetting("misc_round_off_numbers", true); diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java b/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java index f54c350e4a..3d7af9b175 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java @@ -17,7 +17,6 @@ public class SettingsStatus { public static boolean hideLiveThreads = false; public static boolean hideBanner = false; public static boolean showPollResultsEnabled = false; - public static boolean browserChooserEnabled = false; public static boolean featureFlagsEnabled = false; public static boolean forceTranslate = false; public static boolean enableForceHD = false; @@ -146,10 +145,6 @@ public static void enableFeatureFlags() { FeatureSwitchPatch.getFeatureFlagSearchItems(); } - public static void enableBrowserChooser() { - browserChooserEnabled = true; - } - public static void hideRecommendedUsers() { hideRecommendedUsers = true; } diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/PageFragment.java b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/PageFragment.java index 8af9ab174e..2c43bec9e1 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/PageFragment.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/PageFragment.java @@ -62,7 +62,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { screenBuilder.buildExportSection(false); toolbarText = "piko_title_backup"; }else if (bundle.getBoolean(Settings.NATIVE_SECTION.key, false)) { - screenBuilder.buildNativeSection(); + screenBuilder.buildNativeSection(false); toolbarText = "piko_title_native"; } diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsAboutFragment.java b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsAboutFragment.java index 1861502f92..8fe1b4de57 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsAboutFragment.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsAboutFragment.java @@ -80,7 +80,6 @@ public void onCreate(@org.jetbrains.annotations.Nullable Bundle savedInstanceSta flags.put(strRes("piko_pref_show_sensitive_media"),SettingsStatus.showSensitiveMedia); flags.put(strRes("piko_pref_selectable_text"),SettingsStatus.selectableText); flags.put(strRemoveRes("piko_pref_rec_users"),SettingsStatus.hideRecommendedUsers); - flags.put(strRes("piko_pref_browser_chooser"),SettingsStatus.browserChooserEnabled); flags.put(strRes("piko_pref_custom_share_domain"),SettingsStatus.customSharingDomainEnabled); flags.put(strRes("piko_pref_feature_flags"),SettingsStatus.featureFlagsEnabled); flags.put(strRes("piko_pref_customisation_profiletabs"),SettingsStatus.profileTabCustomisation); diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsFragment.java b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsFragment.java index 0133119b54..b480542753 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsFragment.java +++ b/app/src/main/java/app/revanced/integrations/twitter/settings/fragments/SettingsFragment.java @@ -41,7 +41,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { screenBuilder.buildDownloadSection(buildCategory); screenBuilder.buildFeatureFlagsSection(buildCategory); screenBuilder.buildAdsSection(buildCategory); - screenBuilder.buildNativeSection(); + screenBuilder.buildNativeSection(buildCategory); screenBuilder.buildMiscSection(buildCategory); screenBuilder.buildCustomiseSection(buildCategory); screenBuilder.buildTimelineSection(buildCategory);