availableClients = List.of(
+ ANDROID_REEL,
+ ANDROID_VR_1_43_32,
+ VISIONOS,
+ ANDROID_VR_1_61_48
+ );
+
+ app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.setClientsToUse(
+ availableClients, SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get());
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/patches/theme/ThemePatch.java b/extensions/music/src/main/java/app/revanced/extension/music/patches/theme/ThemePatch.java
new file mode 100644
index 0000000000..3f4e396699
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/patches/theme/ThemePatch.java
@@ -0,0 +1,27 @@
+package app.revanced.extension.music.patches.theme;
+
+import app.revanced.extension.shared.theme.BaseThemePatch;
+
+@SuppressWarnings("unused")
+public class ThemePatch extends BaseThemePatch {
+
+ // Color constants used in relation with litho components.
+ private static final int[] DARK_VALUES = {
+ 0xFF212121, // Comments box background.
+ 0xFF030303, // Button container background in album.
+ 0xFF000000, // Button container background in playlist.
+ };
+
+ /**
+ * Injection point.
+ *
+ * Change the color of Litho components.
+ * If the color of the component matches one of the values, return the background color.
+ *
+ * @param originalValue The original color value.
+ * @return The new or original color value.
+ */
+ public static int getValue(int originalValue) {
+ return processColorValue(originalValue, DARK_VALUES, null);
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
new file mode 100644
index 0000000000..c3874f655c
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java
@@ -0,0 +1,148 @@
+package app.revanced.extension.music.settings;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceFragment;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.VersionCheckUtils;
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.music.settings.search.MusicSearchViewController;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseActivityHook;
+
+/**
+ * Hooks GoogleApiActivity to inject a custom {@link MusicPreferenceFragment} with a toolbar and search.
+ */
+public class MusicActivityHook extends BaseActivityHook {
+
+ @SuppressLint("StaticFieldLeak")
+ public static MusicSearchViewController searchViewController;
+
+ /**
+ * How much time has passed since the first launch of the app. Simple check to prevent
+ * forcing bold icons on first launch where the settings menu is partially broken
+ * due to missing icon resources the client has not yet received.
+ *
+ * @see app.revanced.extension.youtube.settings.YouTubeActivityHook#MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS
+ */
+ private static final long MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS = 30 * 1000; // 30 seconds.
+
+ static {
+ final boolean useBoldIcons = VersionCheckUtils.IS_8_40_OR_GREATER
+ && !Settings.SETTINGS_DISABLE_BOLD_ICONS.get()
+ && (System.currentTimeMillis() - Settings.FIRST_TIME_APP_LAUNCHED.get())
+ > MINIMUM_TIME_AFTER_FIRST_LAUNCH_BEFORE_ALLOWING_BOLD_ICONS;
+
+ Utils.setAppIsUsingBoldIcons(useBoldIcons);
+ }
+
+ /**
+ * Injection point.
+ */
+ @SuppressWarnings("unused")
+ public static void initialize(Activity parentActivity) {
+ // Must touch the Music settings to ensure the class is loaded and
+ // the values can be found when setting the UI preferences.
+ // Logging anything under non debug ensures this is set.
+ Logger.printInfo(() -> "Permanent repeat enabled: " + Settings.PERMANENT_REPEAT.get());
+
+ // YT Music always uses dark mode.
+ Utils.setIsDarkModeEnabled(true);
+
+ BaseActivityHook.initialize(new MusicActivityHook(), parentActivity);
+ }
+
+ /**
+ * Sets the fixed theme for the activity.
+ */
+ @Override
+ protected void customizeActivityTheme(Activity activity) {
+ // Override the default YouTube Music theme to increase start padding of list items.
+ // Custom style located in resources/music/values/style.xml
+ activity.setTheme(Utils.getResourceIdentifierOrThrow(
+ ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings"));
+ }
+
+ /**
+ * Returns the fixed background color for the toolbar.
+ */
+ @Override
+ protected int getToolbarBackgroundColor() {
+ return Utils.getResourceColor("ytm_color_black");
+ }
+
+ /**
+ * Returns the navigation icon with a color filter applied.
+ */
+ @Override
+ protected Drawable getNavigationIcon() {
+ Drawable navigationIcon = MusicPreferenceFragment.getBackButtonDrawable();
+ navigationIcon.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
+ return navigationIcon;
+ }
+
+ /**
+ * Returns the click listener that finishes the activity when the navigation icon is clicked.
+ */
+ @Override
+ protected View.OnClickListener getNavigationClickListener(Activity activity) {
+ return view -> {
+ if (searchViewController != null && searchViewController.isSearchActive()) {
+ searchViewController.closeSearch();
+ } else {
+ activity.finish();
+ }
+ };
+ }
+
+ /**
+ * Adds search view components to the toolbar for {@link MusicPreferenceFragment}.
+ *
+ * @param activity The activity hosting the toolbar.
+ * @param toolbar The configured toolbar.
+ * @param fragment The PreferenceFragment associated with the activity.
+ */
+ @Override
+ protected void onPostToolbarSetup(Activity activity, Toolbar toolbar, PreferenceFragment fragment) {
+ if (fragment instanceof MusicPreferenceFragment) {
+ searchViewController = MusicSearchViewController.addSearchViewComponents(
+ activity, toolbar, (MusicPreferenceFragment) fragment);
+ }
+ }
+
+ /**
+ * Creates a new {@link MusicPreferenceFragment} for the activity.
+ */
+ @Override
+ protected PreferenceFragment createPreferenceFragment() {
+ return new MusicPreferenceFragment();
+ }
+
+ /**
+ * Injection point.
+ *
+ * Overrides {@link Activity#finish()} of the injection Activity.
+ *
+ * @return if the original activity finish method should be allowed to run.
+ */
+ @SuppressWarnings("unused")
+ public static boolean handleFinish() {
+ return MusicSearchViewController.handleFinish(searchViewController);
+ }
+
+ /**
+ * Injection point.
+ *
+ * Decides whether to use bold icons.
+ */
+ @SuppressWarnings("unused")
+ public static boolean useBoldIcons(boolean original) {
+ return Utils.appIsUsingBoldIcons();
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
new file mode 100644
index 0000000000..7decd29b8a
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java
@@ -0,0 +1,41 @@
+package app.revanced.extension.music.settings;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+import static app.revanced.extension.shared.settings.Setting.parent;
+
+import app.revanced.extension.shared.settings.YouTubeAndMusicSettings;
+import app.revanced.extension.shared.settings.BooleanSetting;
+import app.revanced.extension.shared.settings.EnumSetting;
+import app.revanced.extension.shared.spoof.ClientType;
+
+public class Settings extends YouTubeAndMusicSettings {
+
+ // Ads
+ public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);
+ public static final BooleanSetting HIDE_GET_PREMIUM_LABEL = new BooleanSetting("revanced_music_hide_get_premium_label", TRUE, true);
+
+ // General
+ public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, true);
+ public static final BooleanSetting HIDE_CATEGORY_BAR = new BooleanSetting("revanced_music_hide_category_bar", FALSE, true);
+ public static final BooleanSetting HIDE_HISTORY_BUTTON = new BooleanSetting("revanced_music_hide_history_button", FALSE, true);
+ public static final BooleanSetting HIDE_SEARCH_BUTTON = new BooleanSetting("revanced_music_hide_search_button", FALSE, true);
+ public static final BooleanSetting HIDE_NOTIFICATION_BUTTON = new BooleanSetting("revanced_music_hide_notification_button", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_HOME_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_home_button", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_SAMPLES_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_samples_button", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_EXPLORE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_explore_button", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_LIBRARY_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_library_button", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_upgrade_button", TRUE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_music_hide_navigation_bar", FALSE, true);
+ public static final BooleanSetting HIDE_NAVIGATION_BAR_LABEL = new BooleanSetting("revanced_music_hide_navigation_bar_labels", FALSE, true);
+
+ // Player
+ public static final BooleanSetting CHANGE_MINIPLAYER_COLOR = new BooleanSetting("revanced_music_change_miniplayer_color", FALSE, true);
+ public static final BooleanSetting PERMANENT_REPEAT = new BooleanSetting("revanced_music_play_permanent_repeat", FALSE, true);
+
+ // Miscellaneous
+ public static final EnumSetting SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type",
+ ClientType.ANDROID_REEL, true, parent(SPOOF_VIDEO_STREAMS));
+
+ public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", TRUE, true);
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java
new file mode 100644
index 0000000000..86e5173420
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java
@@ -0,0 +1,93 @@
+package app.revanced.extension.music.settings.preference;
+
+import android.app.Dialog;
+import android.preference.PreferenceScreen;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.MusicActivityHook;
+import app.revanced.extension.shared.GmsCoreSupport;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+
+/**
+ * Preference fragment for ReVanced settings.
+ */
+@SuppressWarnings("deprecation")
+public class MusicPreferenceFragment extends ToolbarPreferenceFragment {
+ /**
+ * The main PreferenceScreen used to display the current set of preferences.
+ */
+ private PreferenceScreen preferenceScreen;
+
+ /**
+ * Initializes the preference fragment.
+ */
+ @Override
+ protected void initialize() {
+ super.initialize();
+
+ try {
+ preferenceScreen = getPreferenceScreen();
+ Utils.sortPreferenceGroups(preferenceScreen);
+ setPreferenceScreenToolbar(preferenceScreen);
+
+ // Clunky work around until preferences are custom classes that manage themselves.
+ // Custom branding only works with non-root install. But the preferences must be
+ // added during patched because of difficulties detecting during patching if it's
+ // a root install. So instead the non-functional preferences are removed during
+ // runtime if the app is mount (root) installation.
+ if (GmsCoreSupport.isPackageNameOriginal()) {
+ removePreferences(
+ BaseSettings.CUSTOM_BRANDING_ICON.key,
+ BaseSettings.CUSTOM_BRANDING_NAME.key);
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "initialize failure", ex);
+ }
+ }
+
+ /**
+ * Called when the fragment starts.
+ */
+ @Override
+ public void onStart() {
+ super.onStart();
+ try {
+ // Initialize search controller if needed
+ if (MusicActivityHook.searchViewController != null) {
+ // Trigger search data collection after fragment is ready.
+ MusicActivityHook.searchViewController.initializeSearchData();
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "onStart failure", ex);
+ }
+ }
+
+ /**
+ * Sets toolbar for all nested preference screens.
+ */
+ @Override
+ protected void customizeToolbar(Toolbar toolbar) {
+ MusicActivityHook.setToolbarLayoutParams(toolbar);
+ }
+
+ /**
+ * Perform actions after toolbar setup.
+ */
+ @Override
+ protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {
+ if (MusicActivityHook.searchViewController != null
+ && MusicActivityHook.searchViewController.isSearchActive()) {
+ toolbar.post(() -> MusicActivityHook.searchViewController.closeSearch());
+ }
+ }
+
+ /**
+ * Returns the preference screen for external access by SearchViewController.
+ */
+ public PreferenceScreen getPreferenceScreenForSearch() {
+ return preferenceScreen;
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java
new file mode 100644
index 0000000000..65ccd4ea1a
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java
@@ -0,0 +1,28 @@
+package app.revanced.extension.music.settings.search;
+
+import android.content.Context;
+import android.preference.PreferenceScreen;
+
+import app.revanced.extension.shared.settings.search.BaseSearchResultsAdapter;
+import app.revanced.extension.shared.settings.search.BaseSearchViewController;
+import app.revanced.extension.shared.settings.search.BaseSearchResultItem;
+
+import java.util.List;
+
+/**
+ * Music-specific search results adapter.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchResultsAdapter extends BaseSearchResultsAdapter {
+
+ public MusicSearchResultsAdapter(Context context, List items,
+ BaseSearchViewController.BasePreferenceFragment fragment,
+ BaseSearchViewController searchViewController) {
+ super(context, items, fragment, searchViewController);
+ }
+
+ @Override
+ protected PreferenceScreen getMainPreferenceScreen() {
+ return fragment.getPreferenceScreenForSearch();
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java
new file mode 100644
index 0000000000..6681a2f027
--- /dev/null
+++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java
@@ -0,0 +1,71 @@
+package app.revanced.extension.music.settings.search;
+
+import android.app.Activity;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.shared.settings.search.*;
+
+/**
+ * Music-specific search view controller implementation.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchViewController extends BaseSearchViewController {
+
+ public static MusicSearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar,
+ MusicPreferenceFragment fragment) {
+ return new MusicSearchViewController(activity, toolbar, fragment);
+ }
+
+ private MusicSearchViewController(Activity activity, Toolbar toolbar, MusicPreferenceFragment fragment) {
+ super(activity, toolbar, new PreferenceFragmentAdapter(fragment));
+ }
+
+ @Override
+ protected BaseSearchResultsAdapter createSearchResultsAdapter() {
+ return new MusicSearchResultsAdapter(activity, filteredSearchItems, fragment, this);
+ }
+
+ @Override
+ protected boolean isSpecialPreferenceGroup(Preference preference) {
+ // Music doesn't have SponsorBlock, so no special groups.
+ return false;
+ }
+
+ @Override
+ protected void setupSpecialPreferenceListeners(BaseSearchResultItem item) {
+ // Music doesn't have special preferences.
+ // This method can be empty or handle music-specific preferences if any.
+ }
+
+ // Static method for handling Activity finish
+ public static boolean handleFinish(MusicSearchViewController searchViewController) {
+ if (searchViewController != null && searchViewController.isSearchActive()) {
+ searchViewController.closeSearch();
+ return true;
+ }
+ return false;
+ }
+
+ // Adapter to wrap MusicPreferenceFragment to BasePreferenceFragment interface.
+ private record PreferenceFragmentAdapter(MusicPreferenceFragment fragment) implements BasePreferenceFragment {
+
+ @Override
+ public PreferenceScreen getPreferenceScreenForSearch() {
+ return fragment.getPreferenceScreenForSearch();
+ }
+
+ @Override
+ public View getView() {
+ return fragment.getView();
+ }
+
+ @Override
+ public Activity getActivity() {
+ return fragment.getActivity();
+ }
+ }
+}
diff --git a/extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java b/extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java
deleted file mode 100644
index 05c14bb304..0000000000
--- a/extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package app.revanced.extension.music.spoof;
-
-/**
- * @noinspection unused
- */
-public class SpoofClientPatch {
- private static final int CLIENT_TYPE_ID = 26;
- private static final String CLIENT_VERSION = "6.21";
- private static final String DEVICE_MODEL = "iPhone16,2";
- private static final String OS_VERSION = "17.7.2.21H221";
-
- public static int getClientId() {
- return CLIENT_TYPE_ID;
- }
-
- public static String getClientVersion() {
- return CLIENT_VERSION;
- }
-
- public static String getClientModel() {
- return DEVICE_MODEL;
- }
-
- public static String getOsVersion() {
- return OS_VERSION;
- }
-}
\ No newline at end of file
diff --git a/extensions/nothingx/build.gradle.kts b/extensions/nothingx/build.gradle.kts
new file mode 100644
index 0000000000..ed2b78c5f6
--- /dev/null
+++ b/extensions/nothingx/build.gradle.kts
@@ -0,0 +1,10 @@
+dependencies {
+ compileOnly(project(":extensions:shared:library"))
+ compileOnly(project(":extensions:nothingx:stub"))
+}
+
+android {
+ defaultConfig {
+ minSdk = 23
+ }
+}
\ No newline at end of file
diff --git a/extensions/nothingx/src/main/AndroidManifest.xml b/extensions/nothingx/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/nothingx/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java b/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java
new file mode 100644
index 0000000000..c301ae2fb3
--- /dev/null
+++ b/extensions/nothingx/src/main/java/app/revanced/extension/nothingx/patches/ShowK1TokensPatch.java
@@ -0,0 +1,590 @@
+package app.revanced.extension.nothingx.patches;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Application;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Patches to expose the K1 token for Nothing X app to enable pairing with GadgetBridge.
+ */
+@SuppressWarnings("unused")
+public class ShowK1TokensPatch {
+
+ private static final String TAG = "ReVanced";
+ private static final String PACKAGE_NAME = "com.nothing.smartcenter";
+ private static final String EMPTY_MD5 = "d41d8cd98f00b204e9800998ecf8427e";
+ private static final String PREFS_NAME = "revanced_nothingx_prefs";
+ private static final String KEY_DONT_SHOW_DIALOG = "dont_show_k1_dialog";
+
+ // Colors
+ private static final int COLOR_BG = 0xFF1E1E1E;
+ private static final int COLOR_CARD = 0xFF2D2D2D;
+ private static final int COLOR_TEXT_PRIMARY = 0xFFFFFFFF;
+ private static final int COLOR_TEXT_SECONDARY = 0xFFB0B0B0;
+ private static final int COLOR_ACCENT = 0xFFFF9500;
+ private static final int COLOR_TOKEN_BG = 0xFF3A3A3A;
+ private static final int COLOR_BUTTON_POSITIVE = 0xFFFF9500;
+ private static final int COLOR_BUTTON_NEGATIVE = 0xFFFF6B6B;
+
+ // Match standalone K1: k1:, K1:, k1>, etc.
+ private static final Pattern K1_STANDALONE_PATTERN = Pattern.compile("(?i)(?:k1\\s*[:>]\\s*)([0-9a-f]{32})");
+ // Match combined r3+k1: format (64 chars = r3(32) + k1(32))
+ private static final Pattern K1_COMBINED_PATTERN = Pattern.compile("(?i)r3\\+k1\\s*:\\s*([0-9a-f]{64})");
+
+ private static volatile boolean k1Logged = false;
+ private static volatile boolean lifecycleCallbacksRegistered = false;
+ private static Context appContext;
+
+ /**
+ * Get K1 tokens from database and log files.
+ * Call this after the app initializes.
+ *
+ * @param context Application context
+ */
+ public static void showK1Tokens(Context context) {
+ if (k1Logged) {
+ return;
+ }
+
+ appContext = context.getApplicationContext();
+
+ Set allTokens = new LinkedHashSet<>();
+
+ // First try to get from database.
+ String dbToken = getK1TokensFromDatabase();
+ if (dbToken != null) {
+ allTokens.add(dbToken);
+ }
+
+ // Then get from log files.
+ Set logTokens = getK1TokensFromLogFiles();
+ allTokens.addAll(logTokens);
+
+ if (allTokens.isEmpty()) {
+ return;
+ }
+
+ // Log all found tokens.
+ int index = 1;
+ for (String token : allTokens) {
+ Log.i(TAG, "#" + index++ + ": " + token.toUpperCase());
+ }
+
+ // Register lifecycle callbacks to show dialog when an Activity is ready.
+ registerLifecycleCallbacks(allTokens);
+
+ k1Logged = true;
+ }
+
+ /**
+ * Register ActivityLifecycleCallbacks to show dialog when first Activity resumes.
+ *
+ * @param tokens Set of K1 tokens to display
+ */
+ private static void registerLifecycleCallbacks(Set tokens) {
+ if (lifecycleCallbacksRegistered || !(appContext instanceof Application)) {
+ return;
+ }
+
+ Application application = (Application) appContext;
+ application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+ @Override
+ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+ }
+
+ @Override
+ public void onActivityStarted(Activity activity) {
+ }
+
+ @Override
+ public void onActivityResumed(Activity activity) {
+ // Check if user chose not to show dialog.
+ SharedPreferences prefs = activity.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ if (prefs.getBoolean(KEY_DONT_SHOW_DIALOG, false)) {
+ application.unregisterActivityLifecycleCallbacks(this);
+ lifecycleCallbacksRegistered = false;
+ return;
+ }
+
+ // Show dialog on first Activity resume.
+ if (tokens != null && !tokens.isEmpty()) {
+ activity.runOnUiThread(() -> showK1TokensDialog(activity, tokens));
+ // Unregister after showing
+ application.unregisterActivityLifecycleCallbacks(this);
+ lifecycleCallbacksRegistered = false;
+ }
+ }
+
+ @Override
+ public void onActivityPaused(Activity activity) {
+ }
+
+ @Override
+ public void onActivityStopped(Activity activity) {
+ }
+
+ @Override
+ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+ }
+
+ @Override
+ public void onActivityDestroyed(Activity activity) {
+ }
+ });
+
+ lifecycleCallbacksRegistered = true;
+ }
+
+ /**
+ * Show dialog with K1 tokens.
+ *
+ * @param activity Activity context
+ * @param tokens Set of K1 tokens
+ */
+ private static void showK1TokensDialog(Activity activity, Set tokens) {
+ try {
+ // Create main container.
+ LinearLayout mainLayout = new LinearLayout(activity);
+ mainLayout.setOrientation(LinearLayout.VERTICAL);
+ mainLayout.setBackgroundColor(COLOR_BG);
+ mainLayout.setPadding(dpToPx(activity, 24), dpToPx(activity, 16),
+ dpToPx(activity, 24), dpToPx(activity, 16));
+
+ // Title.
+ TextView titleView = new TextView(activity);
+ titleView.setText("K1 Token(s) Found");
+ titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+ titleView.setTypeface(Typeface.DEFAULT_BOLD);
+ titleView.setTextColor(COLOR_TEXT_PRIMARY);
+ titleView.setGravity(Gravity.CENTER);
+ mainLayout.addView(titleView, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ ));
+
+ // Subtitle.
+ TextView subtitleView = new TextView(activity);
+ subtitleView.setText(tokens.size() == 1 ? "1 token found • Tap to copy" : tokens.size() + " tokens found • Tap to copy");
+ subtitleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ subtitleView.setTextColor(COLOR_TEXT_SECONDARY);
+ subtitleView.setGravity(Gravity.CENTER);
+ LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ subtitleParams.topMargin = dpToPx(activity, 4);
+ subtitleParams.bottomMargin = dpToPx(activity, 16);
+ mainLayout.addView(subtitleView, subtitleParams);
+
+ // Scrollable content.
+ ScrollView scrollView = new ScrollView(activity);
+ scrollView.setVerticalScrollBarEnabled(false);
+ LinearLayout.LayoutParams scrollParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ 0,
+ 1.0f
+ );
+ scrollParams.topMargin = dpToPx(activity, 8);
+ scrollParams.bottomMargin = dpToPx(activity, 16);
+ mainLayout.addView(scrollView, scrollParams);
+
+ LinearLayout tokensContainer = new LinearLayout(activity);
+ tokensContainer.setOrientation(LinearLayout.VERTICAL);
+ scrollView.addView(tokensContainer);
+
+ // Add each token as a card.
+ boolean singleToken = tokens.size() == 1;
+ int index = 1;
+ for (String token : tokens) {
+ LinearLayout tokenCard = createTokenCard(activity, token, index++, singleToken);
+ LinearLayout.LayoutParams cardParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ cardParams.bottomMargin = dpToPx(activity, 12);
+ tokensContainer.addView(tokenCard, cardParams);
+ }
+
+ // Info text.
+ TextView infoView = new TextView(activity);
+ infoView.setText(tokens.size() == 1 ? "Tap the token to copy it" : "Tap any token to copy it");
+ infoView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+ infoView.setTextColor(COLOR_TEXT_SECONDARY);
+ infoView.setGravity(Gravity.CENTER);
+ infoView.setAlpha(0.7f);
+ LinearLayout.LayoutParams infoParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ infoParams.topMargin = dpToPx(activity, 8);
+ mainLayout.addView(infoView, infoParams);
+
+ // Button row.
+ LinearLayout buttonRow = new LinearLayout(activity);
+ buttonRow.setOrientation(LinearLayout.HORIZONTAL);
+ buttonRow.setGravity(Gravity.END);
+ LinearLayout.LayoutParams buttonRowParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ buttonRowParams.topMargin = dpToPx(activity, 16);
+ mainLayout.addView(buttonRow, buttonRowParams);
+
+ // "Don't show again" button.
+ Button dontShowButton = new Button(activity);
+ dontShowButton.setText("Don't show again");
+ dontShowButton.setTextColor(Color.WHITE);
+ dontShowButton.setBackgroundColor(Color.TRANSPARENT);
+ dontShowButton.setAllCaps(false);
+ dontShowButton.setTypeface(Typeface.DEFAULT);
+ dontShowButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ dontShowButton.setPadding(dpToPx(activity, 16), dpToPx(activity, 8),
+ dpToPx(activity, 16), dpToPx(activity, 8));
+ LinearLayout.LayoutParams dontShowParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ dontShowParams.rightMargin = dpToPx(activity, 8);
+ buttonRow.addView(dontShowButton, dontShowParams);
+
+ // "OK" button.
+ Button okButton = new Button(activity);
+ okButton.setText("OK");
+ okButton.setTextColor(Color.BLACK);
+ okButton.setBackgroundColor(COLOR_BUTTON_POSITIVE);
+ okButton.setAllCaps(false);
+ okButton.setTypeface(Typeface.DEFAULT_BOLD);
+ okButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+ okButton.setPadding(dpToPx(activity, 24), dpToPx(activity, 12),
+ dpToPx(activity, 24), dpToPx(activity, 12));
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ okButton.setElevation(dpToPx(activity, 4));
+ }
+ buttonRow.addView(okButton, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ ));
+
+ // Build dialog.
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ builder.setView(mainLayout);
+
+ final AlertDialog dialog = builder.create();
+
+ // Style the dialog with dark background.
+ if (dialog.getWindow() != null) {
+ dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+ }
+
+ dialog.show();
+
+ // Set button click listeners after dialog is created.
+ dontShowButton.setOnClickListener(v -> {
+ SharedPreferences prefs = activity.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ prefs.edit().putBoolean(KEY_DONT_SHOW_DIALOG, true).apply();
+ Toast.makeText(activity, "Dialog disabled. Clear app data to re-enable.",
+ Toast.LENGTH_SHORT).show();
+ dialog.dismiss();
+ });
+
+ okButton.setOnClickListener(v -> {
+ dialog.dismiss();
+ });
+
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to show K1 dialog", e);
+ }
+ }
+
+ /**
+ * Create a card view for a single token.
+ */
+ private static LinearLayout createTokenCard(Activity activity, String token, int index, boolean singleToken) {
+ LinearLayout card = new LinearLayout(activity);
+ card.setOrientation(LinearLayout.VERTICAL);
+ card.setBackgroundColor(COLOR_TOKEN_BG);
+ card.setPadding(dpToPx(activity, 16), dpToPx(activity, 12),
+ dpToPx(activity, 16), dpToPx(activity, 12));
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ card.setElevation(dpToPx(activity, 2));
+ }
+ card.setClickable(true);
+ card.setFocusable(true);
+
+ // Token label (only show if multiple tokens).
+ if (!singleToken) {
+ TextView labelView = new TextView(activity);
+ labelView.setText("Token #" + index);
+ labelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+ labelView.setTextColor(COLOR_ACCENT);
+ labelView.setTypeface(Typeface.DEFAULT_BOLD);
+ card.addView(labelView);
+ }
+
+ // Token value.
+ TextView tokenView = new TextView(activity);
+ tokenView.setText(token.toUpperCase());
+ tokenView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+ tokenView.setTextColor(COLOR_TEXT_PRIMARY);
+ tokenView.setTypeface(Typeface.MONOSPACE);
+ tokenView.setLetterSpacing(0.05f);
+ LinearLayout.LayoutParams tokenParams = new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ );
+ if (!singleToken) {
+ tokenParams.topMargin = dpToPx(activity, 8);
+ }
+ card.addView(tokenView, tokenParams);
+
+ // Click to copy.
+ card.setOnClickListener(v -> {
+ ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
+ if (clipboard != null) {
+ clipboard.setText(token.toUpperCase());
+ Toast.makeText(activity, "Token copied!", Toast.LENGTH_SHORT).show();
+ }
+ });
+
+ return card;
+ }
+
+ /**
+ * Convert dp to pixels.
+ */
+ private static int dpToPx(Context context, float dp) {
+ return (int) TypedValue.applyDimension(
+ TypedValue.COMPLEX_UNIT_DIP,
+ dp,
+ context.getResources().getDisplayMetrics()
+ );
+ }
+
+ /**
+ * Get K1 tokens from log files.
+ * Prioritizes pairing K1 tokens over reconnect tokens.
+ */
+ private static Set getK1TokensFromLogFiles() {
+ Set pairingTokens = new LinkedHashSet<>();
+ Set reconnectTokens = new LinkedHashSet<>();
+ try {
+ File logDir = new File("/data/data/" + PACKAGE_NAME + "/files/log");
+ if (!logDir.exists() || !logDir.isDirectory()) {
+ return pairingTokens;
+ }
+
+ File[] logFiles = logDir.listFiles((dir, name) ->
+ name.endsWith(".log") || name.endsWith(".log.") || name.matches(".*\\.log\\.\\d+"));
+
+ if (logFiles == null || logFiles.length == 0) {
+ return pairingTokens;
+ }
+
+ for (File logFile : logFiles) {
+ try (BufferedReader reader = new BufferedReader(new FileReader(logFile))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ // Determine if this is a pairing or reconnect context.
+ boolean isPairingContext = line.toLowerCase().contains("watchbind");
+ boolean isReconnectContext = line.toLowerCase().contains("watchreconnect");
+
+ String k1Token = null;
+
+ // First check for combined r3+k1 format (priority).
+ Matcher combinedMatcher = K1_COMBINED_PATTERN.matcher(line);
+ if (combinedMatcher.find()) {
+ String combined = combinedMatcher.group(1);
+ if (combined.length() == 64) {
+ // Second half is the actual K1
+ k1Token = combined.substring(32).toLowerCase();
+ }
+ }
+
+ // Then check for standalone K1 format (only if not found in combined).
+ if (k1Token == null) {
+ Matcher standaloneMatcher = K1_STANDALONE_PATTERN.matcher(line);
+ if (standaloneMatcher.find()) {
+ String token = standaloneMatcher.group(1);
+ if (token != null && token.length() == 32) {
+ k1Token = token.toLowerCase();
+ }
+ }
+ }
+
+ // Add to appropriate set.
+ if (k1Token != null) {
+ if (isPairingContext && !isReconnectContext) {
+ pairingTokens.add(k1Token);
+ } else {
+ reconnectTokens.add(k1Token);
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Skip unreadable files.
+ }
+ }
+ } catch (Exception ex) {
+ // Fail silently.
+ }
+
+ // Return pairing tokens first, add reconnect tokens if no pairing tokens found.
+ if (!pairingTokens.isEmpty()) {
+ Log.i(TAG, "Found " + pairingTokens.size() + " pairing K1 token(s)");
+ return pairingTokens;
+ }
+
+ if (!reconnectTokens.isEmpty()) {
+ Log.i(TAG, "Found " + reconnectTokens.size() + " reconnect K1 token(s) (may not work for initial pairing)");
+ }
+ return reconnectTokens;
+ }
+
+ /**
+ * Try to get K1 tokens from the database.
+ */
+ private static String getK1TokensFromDatabase() {
+ try {
+ File dbDir = new File("/data/data/" + PACKAGE_NAME + "/databases");
+ if (!dbDir.exists() || !dbDir.isDirectory()) {
+ return null;
+ }
+
+ File[] dbFiles = dbDir.listFiles((dir, name) ->
+ name.endsWith(".db") && !name.startsWith("google_app_measurement") && !name.contains("firebase"));
+
+ if (dbFiles == null || dbFiles.length == 0) {
+ return null;
+ }
+
+ for (File dbFile : dbFiles) {
+ String token = getK1TokensFromDatabase(dbFile);
+ if (token != null) {
+ return token;
+ }
+ }
+
+ return null;
+ } catch (Exception ex) {
+ return null;
+ }
+ }
+
+ /**
+ * Extract K1 tokens from a database file.
+ */
+ private static String getK1TokensFromDatabase(File dbFile) {
+ SQLiteDatabase db = null;
+ try {
+ db = SQLiteDatabase.openDatabase(dbFile.getPath(), null, SQLiteDatabase.OPEN_READONLY);
+
+ // Get all tables.
+ Cursor cursor = db.rawQuery(
+ "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'",
+ null
+ );
+
+ List tables = new ArrayList<>();
+ while (cursor.moveToNext()) {
+ tables.add(cursor.getString(0));
+ }
+ cursor.close();
+
+ // Scan all columns for 32-char hex strings.
+ for (String table : tables) {
+ Cursor schemaCursor = null;
+ try {
+ schemaCursor = db.rawQuery("PRAGMA table_info(" + table + ")", null);
+ List columns = new ArrayList<>();
+ while (schemaCursor.moveToNext()) {
+ columns.add(schemaCursor.getString(1));
+ }
+ schemaCursor.close();
+
+ for (String column : columns) {
+ Cursor dataCursor = null;
+ try {
+ dataCursor = db.query(table, new String[]{column}, null, null, null, null, null);
+ while (dataCursor.moveToNext()) {
+ String value = dataCursor.getString(0);
+ if (value != null && value.length() == 32 && value.matches("[0-9a-fA-F]{32}")) {
+ // Skip obviously fake tokens (MD5 of empty string).
+ if (!value.equalsIgnoreCase(EMPTY_MD5)) {
+ dataCursor.close();
+ db.close();
+ return value.toLowerCase();
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Skip non-string columns.
+ } finally {
+ if (dataCursor != null) {
+ dataCursor.close();
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Continue to next table.
+ } finally {
+ if (schemaCursor != null && !schemaCursor.isClosed()) {
+ schemaCursor.close();
+ }
+ }
+ }
+
+ return null;
+ } catch (Exception ex) {
+ return null;
+ } finally {
+ if (db != null && db.isOpen()) {
+ db.close();
+ }
+ }
+ }
+
+ /**
+ * Reset the logged flag (useful for testing or re-pairing).
+ */
+ public static void resetK1Logged() {
+ k1Logged = false;
+ lifecycleCallbacksRegistered = false;
+ }
+
+ /**
+ * Reset the "don't show again" preference.
+ */
+ public static void resetDontShowPreference() {
+ if (appContext != null) {
+ SharedPreferences prefs = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+ prefs.edit().putBoolean(KEY_DONT_SHOW_DIALOG, false).apply();
+ }
+ }
+}
diff --git a/extensions/nothingx/stub/build.gradle.kts b/extensions/nothingx/stub/build.gradle.kts
new file mode 100644
index 0000000000..fcadc678c4
--- /dev/null
+++ b/extensions/nothingx/stub/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+ alias(libs.plugins.android.library)
+}
+
+android {
+ namespace = "app.revanced.extension"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 26
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
\ No newline at end of file
diff --git a/extensions/nothingx/stub/src/main/AndroidManifest.xml b/extensions/nothingx/stub/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/nothingx/stub/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/nunl/build.gradle.kts b/extensions/nunl/build.gradle.kts
index 6020de901a..ab48531bba 100644
--- a/extensions/nunl/build.gradle.kts
+++ b/extensions/nunl/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:nunl:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/primevideo/build.gradle.kts b/extensions/primevideo/build.gradle.kts
index 9a81cc3e89..17a3c31a21 100644
--- a/extensions/primevideo/build.gradle.kts
+++ b/extensions/primevideo/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
compileOnly(project(":extensions:shared:library"))
compileOnly(project(":extensions:primevideo:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 21
+ }
+}
diff --git a/extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java b/extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java
index ad7fd04c16..b11ec0875d 100644
--- a/extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java
+++ b/extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java
@@ -16,6 +16,7 @@ import java.util.Arrays;
import app.revanced.extension.shared.Logger;
import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.Dim;
import com.amazon.video.sdk.player.Player;
@@ -64,9 +65,8 @@ public class PlaybackSpeedPatch {
SpeedIconDrawable speedIcon = new SpeedIconDrawable();
speedButton.setImageDrawable(speedIcon);
- int buttonSize = Utils.dipToPixels(48);
- speedButton.setMinimumWidth(buttonSize);
- speedButton.setMinimumHeight(buttonSize);
+ speedButton.setMinimumWidth(Dim.dp48);
+ speedButton.setMinimumHeight(Dim.dp48);
return speedButton;
}
@@ -197,11 +197,11 @@ class SpeedIconDrawable extends Drawable {
@Override
public int getIntrinsicWidth() {
- return Utils.dipToPixels(32);
+ return Dim.dp32;
}
@Override
public int getIntrinsicHeight() {
- return Utils.dipToPixels(32);
+ return Dim.dp32;
}
-}
\ No newline at end of file
+}
diff --git a/extensions/reddit/build.gradle.kts b/extensions/reddit/build.gradle.kts
index 8693f97f53..75c8d7a179 100644
--- a/extensions/reddit/build.gradle.kts
+++ b/extensions/reddit/build.gradle.kts
@@ -1,3 +1,9 @@
dependencies {
compileOnly(project(":extensions:reddit:stub"))
}
+
+android {
+ defaultConfig {
+ minSdk = 28
+ }
+}
diff --git a/extensions/samsung/radio/build.gradle.kts b/extensions/samsung/radio/build.gradle.kts
new file mode 100644
index 0000000000..15d386efb3
--- /dev/null
+++ b/extensions/samsung/radio/build.gradle.kts
@@ -0,0 +1,10 @@
+dependencies {
+ compileOnly(project(":extensions:shared:library"))
+ compileOnly(project(":extensions:samsung:radio:stub"))
+}
+
+android {
+ defaultConfig {
+ minSdk = 26
+ }
+}
diff --git a/extensions/samsung/radio/src/main/AndroidManifest.xml b/extensions/samsung/radio/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9b65eb06cf
--- /dev/null
+++ b/extensions/samsung/radio/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
diff --git a/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/misc/fix/crash/FixCrashPatch.java b/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/misc/fix/crash/FixCrashPatch.java
new file mode 100644
index 0000000000..72c5addc4c
--- /dev/null
+++ b/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/misc/fix/crash/FixCrashPatch.java
@@ -0,0 +1,24 @@
+package app.revanced.extension.samsung.radio.misc.fix.crash;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class FixCrashPatch {
+ /**
+ * Injection point.
+ *
+ * Add the required permissions to the request list to avoid crashes on API 34+.
+ **/
+ public static final String[] fixPermissionRequestList(String[] perms) {
+ List permsList = new ArrayList<>(Arrays.asList(perms));
+ if (permsList.contains("android.permission.POST_NOTIFICATIONS")) {
+ permsList.addAll(Arrays.asList("android.permission.RECORD_AUDIO", "android.permission.READ_PHONE_STATE", "android.permission.FOREGROUND_SERVICE_MICROPHONE"));
+ }
+ if (permsList.contains("android.permission.RECORD_AUDIO")) {
+ permsList.add("android.permission.FOREGROUND_SERVICE_MICROPHONE");
+ }
+ return permsList.toArray(new String[0]);
+ }
+}
diff --git a/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/restrictions/device/BypassDeviceChecksPatch.java b/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/restrictions/device/BypassDeviceChecksPatch.java
new file mode 100644
index 0000000000..19b6c3e822
--- /dev/null
+++ b/extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/restrictions/device/BypassDeviceChecksPatch.java
@@ -0,0 +1,19 @@
+package app.revanced.extension.samsung.radio.restrictions.device;
+
+import android.os.SemSystemProperties;
+
+import java.util.Arrays;
+
+@SuppressWarnings("unused")
+public final class BypassDeviceChecksPatch {
+
+ /**
+ * Injection point.
+ *
+ * Check if the device has the required hardware
+ **/
+ public static final boolean checkIfDeviceIsIncompatible(String[] deviceList) {
+ String currentDevice = SemSystemProperties.getSalesCode();
+ return Arrays.asList(deviceList).contains(currentDevice);
+ }
+}
diff --git a/extensions/samsung/radio/stub/build.gradle.kts b/extensions/samsung/radio/stub/build.gradle.kts
new file mode 100644
index 0000000000..b4bee8809f
--- /dev/null
+++ b/extensions/samsung/radio/stub/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+ alias(libs.plugins.android.library)
+}
+
+android {
+ namespace = "app.revanced.extension"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 24
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
diff --git a/extensions/samsung/radio/stub/src/main/AndroidManifest.xml b/extensions/samsung/radio/stub/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..15e7c2ae67
--- /dev/null
+++ b/extensions/samsung/radio/stub/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/extensions/samsung/radio/stub/src/main/java/android/os/SemSystemProperties.java b/extensions/samsung/radio/stub/src/main/java/android/os/SemSystemProperties.java
new file mode 100644
index 0000000000..33a4b4400c
--- /dev/null
+++ b/extensions/samsung/radio/stub/src/main/java/android/os/SemSystemProperties.java
@@ -0,0 +1,7 @@
+package android.os;
+
+public class SemSystemProperties {
+ public static String getSalesCode() {
+ throw new UnsupportedOperationException("Stub");
+ }
+}
\ No newline at end of file
diff --git a/extensions/shared/build.gradle.kts b/extensions/shared/build.gradle.kts
index 8f037894ca..3eb6ff48c7 100644
--- a/extensions/shared/build.gradle.kts
+++ b/extensions/shared/build.gradle.kts
@@ -2,3 +2,9 @@ dependencies {
implementation(project(":extensions:shared:library"))
compileOnly(libs.okhttp)
}
+
+android {
+ defaultConfig {
+ minSdk = 23
+ }
+}
diff --git a/extensions/shared/library/build.gradle.kts b/extensions/shared/library/build.gradle.kts
index 100de7ae14..8215e513ad 100644
--- a/extensions/shared/library/build.gradle.kts
+++ b/extensions/shared/library/build.gradle.kts
@@ -1,5 +1,5 @@
plugins {
- alias(libs.plugins.android.library)
+ alias(libs.plugins.android.library)
}
android {
@@ -19,4 +19,6 @@ android {
dependencies {
compileOnly(libs.annotation)
compileOnly(libs.okhttp)
+ compileOnly(libs.protobuf.javalite)
+ implementation(project(":extensions:shared:protobuf", configuration = "shadowRuntimeElements"))
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ByteTrieSearch.java
similarity index 89%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/ByteTrieSearch.java
index 162e0b0405..c91de4a7aa 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/ByteTrieSearch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ByteTrieSearch.java
@@ -1,6 +1,4 @@
-package app.revanced.extension.youtube;
-
-import androidx.annotation.NonNull;
+package app.revanced.extension.shared;
import java.nio.charset.StandardCharsets;
@@ -39,7 +37,7 @@ public final class ByteTrieSearch extends TrieSearch {
return replacement;
}
- public ByteTrieSearch(@NonNull byte[]... patterns) {
+ public ByteTrieSearch(byte[]... patterns) {
super(new ByteTrieNode(), patterns);
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
index 3f9f0af11e..fb7e68963a 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java
@@ -1,8 +1,5 @@
package app.revanced.extension.shared;
-import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.requests.Route.Method.GET;
-
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
@@ -20,237 +17,396 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable;
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
+
+import org.json.JSONObject;
+
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Locale;
-import app.revanced.extension.shared.requests.Requester;
-import app.revanced.extension.shared.requests.Route;
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.requests.Route.Method.GET;
@SuppressWarnings("unused")
public class GmsCoreSupport {
- private static final String PACKAGE_NAME_YOUTUBE = "com.google.android.youtube";
- private static final String PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music";
+ private static GmsCore gmsCore = GmsCore.UNKNOWN;
- private static final String GMS_CORE_PACKAGE_NAME
- = getGmsCoreVendorGroupId() + ".android.gms";
- private static final Uri GMS_CORE_PROVIDER
- = Uri.parse("content://" + getGmsCoreVendorGroupId() + ".android.gsf.gservices/prefix");
- private static final String DONT_KILL_MY_APP_URL
- = "https://dontkillmyapp.com/";
- private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
- = new Route(GET, "/api/v2/{manufacturer}.json");
- private static final String DONT_KILL_MY_APP_NAME_PARAMETER
- = "?app=MicroG";
- private static final String BUILD_MANUFACTURER
- = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
-
- /**
- * If a manufacturer specific page exists on DontKillMyApp.
- */
- @Nullable
- private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
-
- private static void open(String queryOrLink) {
- Logger.printInfo(() -> "Opening link: " + queryOrLink);
-
- Intent intent;
- try {
- // Check if queryOrLink is a valid URL.
- new URL(queryOrLink);
-
- intent = new Intent(Intent.ACTION_VIEW, Uri.parse(queryOrLink));
- } catch (MalformedURLException e) {
- intent = new Intent(Intent.ACTION_WEB_SEARCH);
- intent.putExtra(SearchManager.QUERY, queryOrLink);
+ static {
+ for (GmsCore core : GmsCore.values()) {
+ if (core.getGroupId().equals(getGmsCoreVendorGroupId())) {
+ GmsCoreSupport.gmsCore = core;
+ break;
+ }
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Utils.getContext().startActivity(intent);
-
- // Gracefully exit, otherwise the broken app will continue to run.
- System.exit(0);
- }
-
- private static void showBatteryOptimizationDialog(Activity context,
- String dialogMessageRef,
- String positiveButtonTextRef,
- DialogInterface.OnClickListener onPositiveClickListener) {
- // Use a delay to allow the activity to finish initializing.
- // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
- Utils.runOnMainThreadDelayed(() -> {
- // Create the custom dialog.
- Pair dialogPair = Utils.createCustomDialog(
- context,
- str("gms_core_dialog_title"), // Title.
- str(dialogMessageRef), // Message.
- null, // No EditText.
- str(positiveButtonTextRef), // OK button text.
- () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
- null, // No Cancel button action.
- null, // No Neutral button text.
- null, // No Neutral button action.
- true // Dismiss dialog when onNeutralClick.
- );
-
- Dialog dialog = dialogPair.first;
-
- // Do not set cancelable to false, to allow using back button to skip the action,
- // just in case the battery change can never be satisfied.
- dialog.setCancelable(true);
-
- // Show the dialog
- Utils.showDialog(context, dialog);
- }, 100);
}
/**
* Injection point.
*/
public static void checkGmsCore(Activity context) {
- try {
- // Verify the user has not included GmsCore for a root installation.
- // GmsCore Support changes the package name, but with a mounted installation
- // all manifest changes are ignored and the original package name is used.
- String packageName = context.getPackageName();
- if (packageName.equals(PACKAGE_NAME_YOUTUBE) || packageName.equals(PACKAGE_NAME_YOUTUBE_MUSIC)) {
- Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
- // Cannot use localize text here, since the app will load
- // resources from the unpatched app and all patch strings are missing.
- Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
-
- // Do not exit. If the app exits before launch completes (and without
- // opening another activity), then on some devices such as Pixel phone Android 10
- // no toast will be shown and the app will continually relaunch
- // with the appearance of a hung app.
- }
-
- // Verify GmsCore is installed.
- try {
- PackageManager manager = context.getPackageManager();
- manager.getPackageInfo(GMS_CORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
- } catch (PackageManager.NameNotFoundException exception) {
- Logger.printInfo(() -> "GmsCore was not found");
- // Cannot show a dialog and must show a toast,
- // because on some installations the app crashes before a dialog can be displayed.
- Utils.showToastLong(str("gms_core_toast_not_installed_message"));
- open(getGmsCoreDownload());
- return;
- }
-
- // Check if GmsCore is whitelisted from battery optimizations.
- if (isAndroidAutomotive(context)) {
- // Ignore Android Automotive devices (Google built-in),
- // as there is no way to disable battery optimizations.
- Logger.printDebug(() -> "Device is Android Automotive");
- } else if (batteryOptimizationsEnabled(context)) {
- Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
-
- showBatteryOptimizationDialog(context,
- "gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
- "gms_core_dialog_continue_text",
- (dialog, id) -> openGmsCoreDisableBatteryOptimizationsIntent(context));
- return;
- }
-
- // Check if GmsCore is currently running in the background.
- var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER);
- //noinspection TryFinallyCanBeTryWithResources
- try {
- if (client == null) {
- Logger.printInfo(() -> "GmsCore is not running in the background");
- checkIfDontKillMyAppSupportsManufacturer();
-
- showBatteryOptimizationDialog(context,
- "gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
- "gms_core_dialog_open_website_text",
- (dialog, id) -> openDontKillMyApp());
- }
- } finally {
- if (client != null) client.close();
- }
- } catch (Exception ex) {
- Logger.printException(() -> "checkGmsCore failure", ex);
- }
+ gmsCore.check(context);
}
- @SuppressLint("BatteryLife") // Permission is part of GmsCore
- private static void openGmsCoreDisableBatteryOptimizationsIntent(Activity activity) {
- Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
- intent.setData(Uri.fromParts("package", GMS_CORE_PACKAGE_NAME, null));
- activity.startActivityForResult(intent, 0);
+ private static String getOriginalPackageName() {
+ return null; // Modified during patching.
}
- private static void checkIfDontKillMyAppSupportsManufacturer() {
- Utils.runOnBackgroundThread(() -> {
+ private static String getGmsCoreVendorGroupId() {
+ return "app.revanced"; // Modified during patching.
+ }
+
+
+ /**
+ * @return If the current package name is the same as the original unpatched app.
+ * If `GmsCore support` was not included during patching, this returns true;
+ */
+ public static boolean isPackageNameOriginal() {
+ String originalPackageName = getOriginalPackageName();
+ return originalPackageName == null
+ || originalPackageName.equals(Utils.getContext().getPackageName());
+ }
+
+ private enum GmsCore {
+ REVANCED("app.revanced", "https://github.com/revanced/gmscore/releases/latest", () -> {
try {
- final long start = System.currentTimeMillis();
HttpURLConnection connection = Requester.getConnectionFromRoute(
- DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+ "https://api.github.com",
+ new Route(GET, "/repos/revanced/gmscore/releases/latest")
+ );
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
- final boolean supported = connection.getResponseCode() == 200;
- Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
- + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
- + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
- DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = supported;
+ int responseCode = connection.getResponseCode();
+ if (responseCode != 200) {
+ Logger.printDebug(() -> "GitHub API returned status code: " + responseCode);
+ return null;
+ }
+
+ // Parse the response
+ JSONObject releaseData = Requester.parseJSONObject(connection);
+ String tagName = releaseData.optString("tag_name", "");
+ connection.disconnect();
+
+ if (tagName.isEmpty()) {
+ Logger.printDebug(() -> "No tag_name found in GitHub release data");
+ return null;
+ }
+
+ if (tagName.startsWith("v")) tagName = tagName.substring(1);
+
+ return tagName;
} catch (Exception ex) {
- Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
- + BUILD_MANUFACTURER, ex);
- DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = null;
+ Logger.printInfo(() -> "Failed to fetch latest GmsCore version from GitHub", ex);
+ return null;
}
- });
- }
+ }),
+ UNKNOWN(getGmsCoreVendorGroupId(), getGmsCoreVendorGroupId() + "android.gms", () -> null);
- private static void openDontKillMyApp() {
- final Boolean manufacturerSupported = DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
+ private static final String DONT_KILL_MY_APP_URL
+ = "https://dontkillmyapp.com/";
+ private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
+ = new Route(GET, "/api/v2/{manufacturer}.json");
+ private static final String DONT_KILL_MY_APP_NAME_PARAMETER
+ = "?app=MicroG";
+ private static final String BUILD_MANUFACTURER
+ = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
- String manufacturerPageToOpen;
- if (manufacturerSupported == null) {
- // Fetch has not completed yet. Only happens on extremely slow internet connections
- // and the user spends less than 1 second reading what's on screen.
- // Instead of waiting for the fetch (which may timeout),
- // open the website without a vendor.
- manufacturerPageToOpen = "";
- } else if (manufacturerSupported) {
- manufacturerPageToOpen = BUILD_MANUFACTURER;
- } else {
- // No manufacturer specific page exists. Open the general page.
- manufacturerPageToOpen = "general";
+ /**
+ * If a manufacturer specific page exists on DontKillMyApp.
+ */
+ @Nullable
+ private volatile Boolean dontKillMyAppManufacturerSupported;
+
+ private final String groupId;
+ private final String packageName;
+ private final String downloadQuery;
+ private final GetLatestVersion getLatestVersion;
+ private final Uri gmsCoreProvider;
+
+ GmsCore(String groupId, String downloadQuery, GetLatestVersion getLatestVersion) {
+ this.groupId = groupId;
+ this.packageName = groupId + ".android.gms";
+ this.gmsCoreProvider = Uri.parse("content://" + groupId + ".android.gsf.gservices/prefix");
+
+ this.downloadQuery = downloadQuery;
+ this.getLatestVersion = getLatestVersion;
}
- open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
- }
-
- /**
- * @return If GmsCore is not whitelisted from battery optimizations.
- */
- private static boolean batteryOptimizationsEnabled(Context context) {
- //noinspection ObsoleteSdkInt
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- // Android 5.0 does not have battery optimization settings.
- return false;
+ String getGroupId() {
+ return groupId;
+ }
+
+ void check(Activity context) {
+ checkInstallation(context);
+ checkUpdates(context);
+ }
+
+ private void checkInstallation(Activity context) {
+ try {
+ // Verify the user has not included GmsCore for a root installation.
+ // GmsCore Support changes the package name, but with a mounted installation
+ // all manifest changes are ignored and the original package name is used.
+ if (isPackageNameOriginal()) {
+ Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
+ // Cannot use localize text here, since the app will load resources
+ // from the unpatched app and all patch strings are missing.
+ Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
+
+ // Do not exit. If the app exits before launch completes (and without
+ // opening another activity), then on some devices such as Pixel phone Android 10
+ // no toast will be shown and the app will continually relaunch
+ // with the appearance of a hung app.
+ }
+
+ // Verify GmsCore is installed.
+ try {
+ PackageManager manager = context.getPackageManager();
+ manager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
+ } catch (PackageManager.NameNotFoundException exception) {
+ Logger.printInfo(() -> "GmsCore was not found");
+ // Cannot show a dialog and must show a toast,
+ // because on some installations the app crashes before a dialog can be displayed.
+ Utils.showToastLong(str("revanced_gms_core_toast_not_installed_message"));
+
+ open(downloadQuery);
+ return;
+ }
+
+ // Check if GmsCore is whitelisted from battery optimizations.
+ if (isAndroidAutomotive(context)) {
+ // Ignore Android Automotive devices (Google built-in),
+ // as there is no way to disable battery optimizations.
+ Logger.printDebug(() -> "Device is Android Automotive");
+ } else if (batteryOptimizationsEnabled(context)) {
+ Logger.printInfo(() -> "GmsCore is not whitelisted from battery optimizations");
+
+ showBatteryOptimizationDialog(context,
+ "revanced_gms_core_dialog_not_whitelisted_using_battery_optimizations_message",
+ "revanced_gms_core_dialog_continue_text",
+ (dialog, id) -> openGmsCoreDisableBatteryOptimizationsIntent(context));
+ return;
+ }
+
+ // Check if GmsCore is currently running in the background.
+ var client = context.getContentResolver().acquireContentProviderClient(gmsCoreProvider);
+ //noinspection TryFinallyCanBeTryWithResources
+ try {
+ if (client == null) {
+ Logger.printInfo(() -> "GmsCore is not running in the background");
+ checkIfDontKillMyAppSupportsManufacturer();
+
+ showBatteryOptimizationDialog(context,
+ "revanced_gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
+ "gmsrevanced_gms_core_log_open_website_text",
+ (dialog, id) -> openDontKillMyApp());
+ }
+ } finally {
+ if (client != null) client.close();
+ }
+ } catch (Exception ex) {
+ Logger.printException(() -> "checkGmsCore failure", ex);
+ }
+ }
+
+ private void checkUpdates(Activity context) {
+ if (!BaseSettings.GMS_CORE_CHECK_UPDATES.get()) {
+ Logger.printDebug(() -> "GmsCore update check is disabled in settings");
+ return;
+ }
+
+ Utils.runOnBackgroundThread(() -> {
+ try {
+ PackageManager manager = context.getPackageManager();
+ var installedVersion = manager.getPackageInfo(packageName, 0).versionName;
+
+ // GmsCore adds suffixes for flavor builds. Remove the suffix for version comparison.
+ int suffixIndex = installedVersion.indexOf('-');
+ if (suffixIndex != -1)
+ installedVersion = installedVersion.substring(0, suffixIndex);
+ String finalInstalledVersion = installedVersion;
+
+ Logger.printDebug(() -> "Installed GmsCore version: " + finalInstalledVersion);
+
+ var latestVersion = getLatestVersion.get();
+
+ if (latestVersion == null || latestVersion.isEmpty()) {
+ Logger.printDebug(() -> "Could not get latest GmsCore version");
+ Utils.showToastLong(str("revanced_gms_core_toast_update_check_failed_message"));
+ return;
+ }
+
+ Logger.printDebug(() -> "Latest GmsCore version on GitHub: " + latestVersion);
+
+ // Compare versions
+ if (!installedVersion.equals(latestVersion)) {
+ Logger.printInfo(() -> "GmsCore update available. Installed: " + finalInstalledVersion
+ + ", Latest: " + latestVersion);
+
+ showUpdateDialog(context, installedVersion, latestVersion);
+ } else {
+ Logger.printDebug(() -> "GmsCore is up to date");
+ }
+ } catch (Exception ex) {
+ Logger.printInfo(() -> "Could not check GmsCore updates", ex);
+ Utils.showToastLong(str("revanced_gms_core_toast_update_check_failed_message"));
+ }
+ });
+ }
+
+ private void open(String queryOrLink) {
+ Logger.printInfo(() -> "Opening link: " + queryOrLink);
+
+ Intent intent;
+ try {
+ // Check if queryOrLink is a valid URL.
+ new URL(queryOrLink);
+
+ intent = new Intent(Intent.ACTION_VIEW, Uri.parse(queryOrLink));
+ } catch (MalformedURLException e) {
+ intent = new Intent(Intent.ACTION_WEB_SEARCH);
+ intent.putExtra(SearchManager.QUERY, queryOrLink);
+ }
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ Utils.getContext().startActivity(intent);
+
+ // Gracefully exit, otherwise the broken app will continue to run.
+ System.exit(0);
+ }
+
+ private void showUpdateDialog(Activity context, String installedVersion, String latestVersion) {
+ // Use a delay to allow the activity to finish initializing.
+ // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
+ Utils.runOnMainThreadDelayed(() -> {
+ try {
+ Pair dialogPair = CustomDialog.create(
+ context,
+ str("revanced_gms_core_dialog_title"),
+ String.format(str("revanced_gms_core_update_available_message"), latestVersion, installedVersion),
+ null,
+ str("revanced_gms_core_dialog_open_website_text"),
+ () -> open(downloadQuery),
+ () -> {
+ },
+ str("revanced_gms_core_dialog_cancel_text"),
+ null,
+ true
+ );
+
+ Dialog dialog = dialogPair.first;
+ dialog.setCancelable(true);
+ Utils.showDialog(context, dialog);
+ } catch (Exception ex) {
+ Logger.printException(() -> "Failed to show GmsCore update dialog", ex);
+ }
+ }, 100);
+ }
+
+ private static void showBatteryOptimizationDialog(Activity context,
+ String dialogMessageRef,
+ String positiveButtonTextRef,
+ DialogInterface.OnClickListener onPositiveClickListener) {
+ // Use a delay to allow the activity to finish initializing.
+ // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
+ Utils.runOnMainThreadDelayed(() -> {
+ // Create the custom dialog.
+ Pair dialogPair = CustomDialog.create(
+ context,
+ str("revanced_gms_core_dialog_title"), // Title.
+ str(dialogMessageRef), // Message.
+ null, // No EditText.
+ str(positiveButtonTextRef), // OK button text.
+ () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
+ null, // No Cancel button action.
+ null, // No Neutral button text.
+ null, // No Neutral button action.
+ true // Dismiss dialog when onNeutralClick.
+ );
+
+ Dialog dialog = dialogPair.first;
+
+ // Do not set cancelable to false to allow using back button to skip the action,
+ // just in case the battery change can never be satisfied.
+ dialog.setCancelable(true);
+
+ // Show the dialog
+ Utils.showDialog(context, dialog);
+ }, 100);
+ }
+
+ @SuppressLint("BatteryLife") // Permission is part of GmsCore
+ private void openGmsCoreDisableBatteryOptimizationsIntent(Activity activity) {
+ Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+ intent.setData(Uri.fromParts("package", packageName, null));
+ activity.startActivityForResult(intent, 0);
+ }
+
+ private void checkIfDontKillMyAppSupportsManufacturer() {
+ Utils.runOnBackgroundThread(() -> {
+ try {
+ final long start = System.currentTimeMillis();
+ HttpURLConnection connection = Requester.getConnectionFromRoute(
+ DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+ connection.setConnectTimeout(5000);
+ connection.setReadTimeout(5000);
+
+ final boolean supported = connection.getResponseCode() == 200;
+ Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
+ + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
+ + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
+ dontKillMyAppManufacturerSupported = supported;
+ } catch (Exception ex) {
+ Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
+ + BUILD_MANUFACTURER, ex);
+ dontKillMyAppManufacturerSupported = null;
+ }
+ });
+ }
+
+ private void openDontKillMyApp() {
+ final Boolean manufacturerSupported = dontKillMyAppManufacturerSupported;
+
+ String manufacturerPageToOpen;
+ if (manufacturerSupported == null) {
+ // Fetch has not completed yet. Only happens on extremely slow internet connections
+ // and the user spends less than 1 second reading what's on screen.
+ // Instead of waiting for the fetch (which may timeout),
+ // open the website without a vendor.
+ manufacturerPageToOpen = "";
+ } else if (manufacturerSupported) {
+ manufacturerPageToOpen = BUILD_MANUFACTURER;
+ } else {
+ // No manufacturer specific page exists. Open the general page.
+ manufacturerPageToOpen = "general";
+ }
+
+ open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
+ }
+
+ /**
+ * @return If GmsCore is not whitelisted from battery optimizations.
+ */
+ private boolean batteryOptimizationsEnabled(Context context) {
+ //noinspection ObsoleteSdkInt
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+ // Android 5.0 does not have battery optimization settings.
+ return false;
+ }
+ var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+ return !powerManager.isIgnoringBatteryOptimizations(packageName);
+ }
+
+ private boolean isAndroidAutomotive(Context context) {
+ return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
}
- var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
- return !powerManager.isIgnoringBatteryOptimizations(GMS_CORE_PACKAGE_NAME);
}
- private static boolean isAndroidAutomotive(Context context) {
- return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
- }
-
- private static String getGmsCoreDownload() {
- final var vendorGroupId = getGmsCoreVendorGroupId();
- //noinspection SwitchStatementWithTooFewBranches
- return switch (vendorGroupId) {
- case "app.revanced" -> "https://github.com/revanced/gmscore/releases/latest";
- default -> vendorGroupId + ".android.gms";
- };
- }
-
- // Modified by a patch. Do not touch.
- private static String getGmsCoreVendorGroupId() {
- return "app.revanced";
+ @FunctionalInterface
+ private interface GetLatestVersion {
+ String get();
}
}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
index 47f6da3e3f..610cd3414f 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Logger.java
@@ -16,8 +16,8 @@ import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.settings.preference.LogBufferManager;
/**
- * ReVanced specific logger. Logging is done to standard device log (accessible thru ADB),
- * and additionally accessible thru {@link LogBufferManager}.
+ * ReVanced specific logger. Logging is done to standard device log (accessible through ADB),
+ * and additionally accessible through {@link LogBufferManager}.
*
* All methods are thread safe, and are safe to call even
* if {@link Utils#getContext()} is not available.
@@ -202,7 +202,7 @@ public class Logger {
/**
* Logs exceptions under the outer class name of the code calling this method.
*
- * If the calling code is showing it's own error toast,
+ * If the calling code is showing its own error toast,
* instead use {@link #printInfo(LogMessage, Exception)}
*
* @param message log message
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java
new file mode 100644
index 0000000000..48032017a4
--- /dev/null
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java
@@ -0,0 +1,57 @@
+package app.revanced.extension.shared;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ResourceType {
+ ANIM("anim"),
+ ANIMATOR("animator"),
+ ARRAY("array"),
+ ATTR("attr"),
+ BOOL("bool"),
+ COLOR("color"),
+ DIMEN("dimen"),
+ DRAWABLE("drawable"),
+ FONT("font"),
+ FRACTION("fraction"),
+ ID("id"),
+ INTEGER("integer"),
+ INTERPOLATOR("interpolator"),
+ LAYOUT("layout"),
+ MENU("menu"),
+ MIPMAP("mipmap"),
+ NAVIGATION("navigation"),
+ PLURALS("plurals"),
+ RAW("raw"),
+ STRING("string"),
+ STYLE("style"),
+ STYLEABLE("styleable"),
+ TRANSITION("transition"),
+ VALUES("values"),
+ XML("xml");
+
+ private static final Map VALUE_MAP;
+
+ static {
+ ResourceType[] values = values();
+ VALUE_MAP = new HashMap<>(2 * values.length);
+
+ for (ResourceType type : values) {
+ VALUE_MAP.put(type.value, type);
+ }
+ }
+
+ public final String value;
+
+ public static ResourceType fromValue(String value) {
+ ResourceType type = VALUE_MAP.get(value);
+ if (type == null) {
+ throw new IllegalArgumentException("Unknown resource type: " + value);
+ }
+ return type;
+ }
+
+ ResourceType(String value) {
+ this.value = value;
+ }
+}
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
index 4390137de7..c1c2c90d14 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringRef.java
@@ -70,7 +70,7 @@ public class StringRef {
}
/**
- * Creates a StringRef object that'll not change it's value
+ * Creates a StringRef object that'll not change its value
*
* @param value value which toString() method returns when invoked on returned object
* @return Unique StringRef instance, its value will never change
@@ -102,7 +102,7 @@ public class StringRef {
public String toString() {
if (!resolved) {
if (resources == null || packageName == null) {
- Context context = Utils.getContext();
+ var context = Utils.getContext();
resources = context.getResources();
packageName = context.getPackageName();
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringTrieSearch.java
similarity index 85%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/StringTrieSearch.java
index fbff9bebac..9c7b882138 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/StringTrieSearch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/StringTrieSearch.java
@@ -1,6 +1,4 @@
-package app.revanced.extension.youtube;
-
-import androidx.annotation.NonNull;
+package app.revanced.extension.shared;
/**
* Text pattern searching using a prefix tree (trie).
@@ -28,7 +26,7 @@ public final class StringTrieSearch extends TrieSearch {
}
}
- public StringTrieSearch(@NonNull String... patterns) {
+ public StringTrieSearch(String... patterns) {
super(new StringTrieNode(), patterns);
}
}
diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/TrieSearch.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
similarity index 90%
rename from extensions/youtube/src/main/java/app/revanced/extension/youtube/TrieSearch.java
rename to extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
index 74fb4685d2..97fa4605d8 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/TrieSearch.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/TrieSearch.java
@@ -1,6 +1,5 @@
-package app.revanced.extension.youtube;
+package app.revanced.extension.shared;
-import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
@@ -57,11 +56,13 @@ public abstract class TrieSearch {
if (searchTextLength - searchTextIndex < patternLength - patternStartIndex) {
return false; // Remaining search text is shorter than the remaining leaf pattern and they cannot match.
}
+
for (int i = searchTextIndex, j = patternStartIndex; j < patternLength; i++, j++) {
if (enclosingNode.getCharValue(searchText, i) != enclosingNode.getCharValue(pattern, j)) {
return false;
}
}
+
return callback == null || callback.patternMatched(searchText,
searchTextIndex - patternStartIndex, patternLength, callbackParameter);
}
@@ -105,14 +106,18 @@ public abstract class TrieSearch {
* Elements not contained can collide with elements the array does contain,
* so must compare the nodes character value.
*
- * Alternatively this array could be a sorted and densely packed array,
- * and lookup is done using binary search.
- * That would save a small amount of memory because there's no null children entries,
- * but would give a worst case search of O(nlog(m)) where n is the number of
- * characters in the searched text and m is the maximum size of the sorted character arrays.
- * Using a hash table array always gives O(n) search time.
- * The memory usage here is very small (all Litho filters use ~10KB of memory),
- * so the more performant hash implementation is chosen.
+ /*
+ * Alternatively, this could be implemented as a sorted, densely packed array
+ * with lookups performed via binary search.
+ * This approach would save a small amount of memory by eliminating null
+ * child entries. However, it would result in a worst-case lookup time of
+ * O(n log m), where:
+ * - n is the number of characters in the input text, and
+ * - m is the maximum size of the sorted character arrays.
+ * In contrast, using a hash-based array guarantees O(n) lookup time.
+ * Given that the total memory usage is already very small (all Litho filters
+ * together use approximately 10KB), the hash-based implementation is preferred
+ * for its superior performance.
*/
@Nullable
private TrieNode[] children;
@@ -136,7 +141,7 @@ public abstract class TrieSearch {
* @param patternLength Length of the pattern.
* @param callback Callback, where a value of NULL indicates to always accept a pattern match.
*/
- private void addPattern(@NonNull T pattern, int patternIndex, int patternLength,
+ private void addPattern(T pattern, int patternIndex, int patternLength,
@Nullable TriePatternMatchedCallback callback) {
if (patternIndex == patternLength) { // Reached the end of the pattern.
if (endOfPatternCallback == null) {
@@ -145,6 +150,7 @@ public abstract class TrieSearch {
endOfPatternCallback.add(callback);
return;
}
+
if (leaf != null) {
// Reached end of the graph and a leaf exist.
// Recursively call back into this method and push the existing leaf down 1 level.
@@ -159,6 +165,7 @@ public abstract class TrieSearch {
leaf = new TrieCompressedPath<>(pattern, patternIndex, patternLength, callback);
return;
}
+
final char character = getCharValue(pattern, patternIndex);
final int arrayIndex = hashIndexForTableSize(children.length, character);
TrieNode child = children[arrayIndex];
@@ -183,6 +190,7 @@ public abstract class TrieSearch {
//noinspection unchecked
TrieNode[] replacement = new TrieNode[replacementArraySize];
addNodeToArray(replacement, child);
+
boolean collision = false;
for (TrieNode existingChild : children) {
if (existingChild != null) {
@@ -195,6 +203,7 @@ public abstract class TrieSearch {
if (collision) {
continue;
}
+
children = replacement;
return;
}
@@ -234,6 +243,7 @@ public abstract class TrieSearch {
if (leaf != null && leaf.matches(startNode, searchText, searchTextEndIndex, searchTextIndex, callbackParameter)) {
return true; // Leaf exists and it matched the search text.
}
+
List> endOfPatternCallback = node.endOfPatternCallback;
if (endOfPatternCallback != null) {
final int matchStartIndex = searchTextIndex - currentMatchLength;
@@ -246,6 +256,7 @@ public abstract class TrieSearch {
}
}
}
+
TrieNode[] children = node.children;
if (children == null) {
return false; // Reached a graph end point and there's no further patterns to search.
@@ -278,9 +289,11 @@ public abstract class TrieSearch {
if (leaf != null) {
numberOfPointers += 4; // Number of fields in leaf node.
}
+
if (endOfPatternCallback != null) {
numberOfPointers += endOfPatternCallback.size();
}
+
if (children != null) {
numberOfPointers += children.length;
for (TrieNode child : children) {
@@ -308,13 +321,13 @@ public abstract class TrieSearch {
private final List patterns = new ArrayList<>();
@SafeVarargs
- TrieSearch(@NonNull TrieNode root, @NonNull T... patterns) {
+ TrieSearch(TrieNode root, T... patterns) {
this.root = Objects.requireNonNull(root);
addPatterns(patterns);
}
@SafeVarargs
- public final void addPatterns(@NonNull T... patterns) {
+ public final void addPatterns(T... patterns) {
for (T pattern : patterns) {
addPattern(pattern);
}
@@ -325,7 +338,7 @@ public abstract class TrieSearch {
*
* @param pattern Pattern to add. Calling this with a zero length pattern does nothing.
*/
- public void addPattern(@NonNull T pattern) {
+ public void addPattern(T pattern) {
addPattern(pattern, root.getTextLength(pattern), null);
}
@@ -333,31 +346,31 @@ public abstract class TrieSearch {
* @param pattern Pattern to add. Calling this with a zero length pattern does nothing.
* @param callback Callback to determine if searching should halt when a match is found.
*/
- public void addPattern(@NonNull T pattern, @NonNull TriePatternMatchedCallback callback) {
+ public void addPattern(T pattern, TriePatternMatchedCallback callback) {
addPattern(pattern, root.getTextLength(pattern), Objects.requireNonNull(callback));
}
- void addPattern(@NonNull T pattern, int patternLength, @Nullable TriePatternMatchedCallback callback) {
+ void addPattern(T pattern, int patternLength, @Nullable TriePatternMatchedCallback callback) {
if (patternLength == 0) return; // Nothing to match
patterns.add(pattern);
root.addPattern(pattern, 0, patternLength, callback);
}
- public final boolean matches(@NonNull T textToSearch) {
+ public final boolean matches(T textToSearch) {
return matches(textToSearch, 0);
}
- public boolean matches(@NonNull T textToSearch, @NonNull Object callbackParameter) {
+ public boolean matches(T textToSearch, Object callbackParameter) {
return matches(textToSearch, 0, root.getTextLength(textToSearch),
Objects.requireNonNull(callbackParameter));
}
- public boolean matches(@NonNull T textToSearch, int startIndex) {
+ public boolean matches(T textToSearch, int startIndex) {
return matches(textToSearch, startIndex, root.getTextLength(textToSearch));
}
- public final boolean matches(@NonNull T textToSearch, int startIndex, int endIndex) {
+ public final boolean matches(T textToSearch, int startIndex, int endIndex) {
return matches(textToSearch, startIndex, endIndex, null);
}
@@ -370,11 +383,11 @@ public abstract class TrieSearch {
* @param callbackParameter Optional parameter passed to the callbacks.
* @return If any pattern matched, and it's callback halted searching.
*/
- public boolean matches(@NonNull T textToSearch, int startIndex, int endIndex, @Nullable Object callbackParameter) {
+ public boolean matches(T textToSearch, int startIndex, int endIndex, @Nullable Object callbackParameter) {
return matches(textToSearch, root.getTextLength(textToSearch), startIndex, endIndex, callbackParameter);
}
- private boolean matches(@NonNull T textToSearch, int textToSearchLength, int startIndex, int endIndex,
+ private boolean matches(T textToSearch, int textToSearchLength, int startIndex, int endIndex,
@Nullable Object callbackParameter) {
if (endIndex > textToSearchLength) {
throw new IllegalArgumentException("endIndex: " + endIndex
diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
index db157c4a13..cf65db8a4c 100644
--- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
+++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.app.DialogFragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -12,10 +14,8 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
import android.net.ConnectivityManager;
+import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -23,12 +23,7 @@ import android.os.Looper;
import android.preference.Preference;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.util.DisplayMetrics;
import android.util.Pair;
-import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -37,25 +32,21 @@ import android.view.Window;
import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
import android.widget.Toast;
-import android.widget.Toolbar;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.text.Bidi;
+import java.text.Collator;
+import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -68,6 +59,7 @@ import app.revanced.extension.shared.settings.AppLanguage;
import app.revanced.extension.shared.settings.BaseSettings;
import app.revanced.extension.shared.settings.BooleanSetting;
import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
+import app.revanced.extension.shared.ui.Dim;
public class Utils {
@@ -85,6 +77,17 @@ public class Utils {
@Nullable
private static Boolean isDarkModeEnabled;
+ private static boolean appIsUsingBoldIcons;
+
+ // Cached Collator instance with its locale.
+ @Nullable
+ private static Locale cachedCollatorLocale;
+ @Nullable
+ private static Collator cachedCollator;
+
+ private static final Pattern PUNCTUATION_PATTERN = Pattern.compile("\\p{P}+");
+ private static final Pattern DIACRITICS_PATTERN = Pattern.compile("\\p{M}");
+
private Utils() {
} // utility class
@@ -116,7 +119,7 @@ public class Utils {
}
/**
- * @return The version name of the app, such as 19.11.43
+ * @return The version name of the app, such as 20.13.41
*/
public static String getAppVersionName() {
if (versionName == null) {
@@ -131,6 +134,7 @@ public class Utils {
return versionName;
}
+ @SuppressWarnings("unused")
public static String getApplicationName() {
if (applicationLabel == null) {
try {
@@ -148,12 +152,12 @@ public class Utils {
/**
* Hide a view by setting its layout height and width to 1dp.
*
- * @param condition The setting to check for hiding the view.
+ * @param setting The setting to check for hiding the view.
* @param view The view to hide.
*/
- public static void hideViewBy0dpUnderCondition(BooleanSetting condition, View view) {
- if (hideViewBy0dpUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewBy0dpUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewBy0dpUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
@@ -165,7 +169,7 @@ public class Utils {
*/
public static boolean hideViewBy0dpUnderCondition(boolean condition, View view) {
if (condition) {
- hideViewByLayoutParams(view);
+ hideViewBy0dp(view);
return true;
}
@@ -173,19 +177,33 @@ public class Utils {
}
/**
- * Hide a view by setting its visibility to GONE.
+ * Hide a view by setting its layout params to 0x0
+ * @param view The view to hide.
+ */
+ public static void hideViewBy0dp(View view) {
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+ if (params == null)
+ params = new ViewGroup.LayoutParams(0, 0);
+
+ params.width = 0;
+ params.height = 0;
+ view.setLayoutParams(params);
+ }
+
+ /**
+ * Hide a view by setting its visibility as GONE.
*
- * @param condition The setting to check for hiding the view.
+ * @param setting The setting to check for hiding the view.
* @param view The view to hide.
*/
- public static void hideViewUnderCondition(BooleanSetting condition, View view) {
- if (hideViewUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
/**
- * Hide a view by setting its visibility to GONE.
+ * Hide a view by setting its visibility as GONE.
*
* @param condition The setting to check for hiding the view.
* @param view The view to hide.
@@ -199,14 +217,14 @@ public class Utils {
return false;
}
- public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting condition, View view) {
- if (hideViewByRemovingFromParentUnderCondition(condition.get(), view)) {
- Logger.printDebug(() -> "View hidden by setting: " + condition);
+ public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting setting, View view) {
+ if (hideViewByRemovingFromParentUnderCondition(setting.get(), view)) {
+ Logger.printDebug(() -> "View hidden by setting: " + setting);
}
}
- public static boolean hideViewByRemovingFromParentUnderCondition(boolean setting, View view) {
- if (setting) {
+ public static boolean hideViewByRemovingFromParentUnderCondition(boolean condition, View view) {
+ if (condition) {
ViewParent parent = view.getParent();
if (parent instanceof ViewGroup parentGroup) {
parentGroup.removeView(view);
@@ -255,7 +273,7 @@ public class Utils {
// Could do a thread sleep, but that will trigger an exception if the thread is interrupted.
meaninglessValue += Long.numberOfLeadingZeros((long) Math.exp(Math.random()));
}
- // Return the value, otherwise the compiler or VM might optimize and remove the meaningless time wasting work,
+ // Return the value, otherwise the compiler or VM might optimize and remove the meaningless time-wasting work,
// leaving an empty loop that hammers on the System.currentTimeMillis native call.
return meaninglessValue;
}
@@ -265,10 +283,12 @@ public class Utils {
}
public static int indexOfFirstFound(String value, String... targets) {
- for (String string : targets) {
- if (!string.isEmpty()) {
- final int indexOf = value.indexOf(string);
- if (indexOf >= 0) return indexOf;
+ if (isNotEmpty(value)) {
+ for (String string : targets) {
+ if (!string.isEmpty()) {
+ final int indexOf = value.indexOf(string);
+ if (indexOf >= 0) return indexOf;
+ }
}
}
return -1;
@@ -278,41 +298,64 @@ public class Utils {
* @return zero, if the resource is not found.
*/
@SuppressLint("DiscouragedApi")
- public static int getResourceIdentifier(Context context, String resourceIdentifierName, String type) {
- return context.getResources().getIdentifier(resourceIdentifierName, type, context.getPackageName());
+ public static int getResourceIdentifier(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+ return context.getResources().getIdentifier(resourceIdentifierName,
+ type == null ? null : type.value, context.getPackageName());
+ }
+
+ public static int getResourceIdentifierOrThrow(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+ final int resourceId = getResourceIdentifier(context, type, resourceIdentifierName);
+ if (resourceId == 0) {
+ throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+ + " type: " + type);
+ }
+ return resourceId;
}
/**
* @return zero, if the resource is not found.
+ * @see #getResourceIdentifierOrThrow(ResourceType, String)
*/
- public static int getResourceIdentifier(String resourceIdentifierName, String type) {
- return getResourceIdentifier(getContext(), resourceIdentifierName, type);
+ public static int getResourceIdentifier(@Nullable ResourceType type, String resourceIdentifierName) {
+ return getResourceIdentifier(getContext(), type, resourceIdentifierName);
+ }
+
+ /**
+ * @return zero, if the resource is not found.
+ * @see #getResourceIdentifier(ResourceType, String)
+ */
+ public static int getResourceIdentifierOrThrow(@Nullable ResourceType type, String resourceIdentifierName) {
+ return getResourceIdentifierOrThrow(getContext(), type, resourceIdentifierName);
+ }
+
+ public static String getResourceString(int id) throws Resources.NotFoundException {
+ return getContext().getResources().getString(id);
}
public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getInteger(getResourceIdentifier(resourceIdentifierName, "integer"));
+ return getContext().getResources().getInteger(getResourceIdentifierOrThrow(ResourceType.INTEGER, resourceIdentifierName));
}
public static Animation getResourceAnimation(String resourceIdentifierName) throws Resources.NotFoundException {
- return AnimationUtils.loadAnimation(getContext(), getResourceIdentifier(resourceIdentifierName, "anim"));
+ return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(ResourceType.ANIM, resourceIdentifierName));
}
@ColorInt
public static int getResourceColor(String resourceIdentifierName) throws Resources.NotFoundException {
//noinspection deprecation
- return getContext().getResources().getColor(getResourceIdentifier(resourceIdentifierName, "color"));
+ return getContext().getResources().getColor(getResourceIdentifierOrThrow(ResourceType.COLOR, resourceIdentifierName));
}
public static int getResourceDimensionPixelSize(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getDimensionPixelSize(getResourceIdentifier(resourceIdentifierName, "dimen"));
+ return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
}
public static float getResourceDimension(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getDimension(getResourceIdentifier(resourceIdentifierName, "dimen"));
+ return getContext().getResources().getDimension(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
}
public static String[] getResourceStringArray(String resourceIdentifierName) throws Resources.NotFoundException {
- return getContext().getResources().getStringArray(getResourceIdentifier(resourceIdentifierName, "array"));
+ return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(ResourceType.ARRAY, resourceIdentifierName));
}
public interface MatchFilter {
@@ -323,13 +366,9 @@ public class Utils {
* Includes sub children.
*/
public static R getChildViewByResourceName(View view, String str) {
- var child = view.findViewById(Utils.getResourceIdentifier(str, "id"));
- if (child != null) {
- //noinspection unchecked
- return (R) child;
- }
-
- throw new IllegalArgumentException("View with resource name not found: " + str);
+ var child = view.findViewById(Utils.getResourceIdentifierOrThrow(ResourceType.ID, str));
+ //noinspection unchecked
+ return (R) child;
}
/**
@@ -415,12 +454,17 @@ public class Utils {
}
public static void setClipboard(CharSequence text) {
- android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context
+ ClipboardManager clipboard = (ClipboardManager) context
.getSystemService(Context.CLIPBOARD_SERVICE);
- android.content.ClipData clip = android.content.ClipData.newPlainText("ReVanced", text);
+ ClipData clip = ClipData.newPlainText("ReVanced", text);
clipboard.setPrimaryClip(clip);
}
+ public static boolean isNotEmpty(@Nullable String str) {
+ return str != null && !str.isEmpty();
+ }
+
+ @SuppressWarnings("unused")
public static boolean isTablet() {
return context.getResources().getConfiguration().smallestScreenWidthDp >= 600;
}
@@ -429,7 +473,7 @@ public class Utils {
private static Boolean isRightToLeftTextLayout;
/**
- * @return If the device language uses right to left text layout (Hebrew, Arabic, etc).
+ * @return If the device language uses right to left text layout (Hebrew, Arabic, etc.).
* If this should match any ReVanced language override then instead use
* {@link #isRightToLeftLocale(Locale)} with {@link BaseSettings#REVANCED_LANGUAGE}.
* This is the default locale of the device, which may differ if
@@ -443,7 +487,7 @@ public class Utils {
}
/**
- * @return If the locale uses right to left text layout (Hebrew, Arabic, etc).
+ * @return If the locale uses right to left text layout (Hebrew, Arabic, etc.).
*/
public static boolean isRightToLeftLocale(Locale locale) {
String displayLanguage = locale.getDisplayLanguage();
@@ -460,6 +504,7 @@ public class Utils {
return getTextDirectionString(isRightToLeftLocale());
}
+ @SuppressWarnings("unused")
public static String getTextDirectionString(Locale locale) {
return getTextDirectionString(isRightToLeftLocale(locale));
}
@@ -472,7 +517,7 @@ public class Utils {
/**
* @return if the text contains at least 1 number character,
- * including any unicode numbers such as Arabic.
+ * including any Unicode numbers such as Arabic.
*/
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
public static boolean containsNumber(CharSequence text) {
@@ -577,7 +622,13 @@ public class Utils {
showToast(messageToToast, Toast.LENGTH_LONG);
}
- private static void showToast(String messageToToast, int toastDuration) {
+ /**
+ * Safe to call from any thread.
+ *
+ * @param messageToToast Message to show.
+ * @param toastDuration Either {@link Toast#LENGTH_SHORT} or {@link Toast#LENGTH_LONG}.
+ */
+ public static void showToast(String messageToToast, int toastDuration) {
Objects.requireNonNull(messageToToast);
runOnMainThreadNowOrLater(() -> {
Context currentContext = context;
@@ -679,6 +730,18 @@ public class Utils {
}
}
+ public static void openLink(String url) {
+ try {
+ Intent intent = new Intent("android.intent.action.VIEW", Uri.parse(url));
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ Logger.printInfo(() -> "Opening link with external browser: " + intent);
+ getContext().startActivity(intent);
+ } catch (Exception ex) {
+ Logger.printException(() -> "openLink failure", ex);
+ }
+ }
+
public enum NetworkType {
NONE,
MOBILE,
@@ -719,436 +782,66 @@ public class Utils {
}
/**
- * Hide a view by setting its layout params to 0x0
- * @param view The view to hide.
+ * Hides a view by setting its layout width and height to 0dp.
+ * Handles null layout params safely.
+ *
+ * @param view The view to hide. If null, does nothing.
*/
- public static void hideViewByLayoutParams(View view) {
- if (view instanceof LinearLayout) {
- LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(0, 0);
- view.setLayoutParams(layoutParams);
- } else if (view instanceof FrameLayout) {
- FrameLayout.LayoutParams layoutParams2 = new FrameLayout.LayoutParams(0, 0);
- view.setLayoutParams(layoutParams2);
- } else if (view instanceof RelativeLayout) {
- RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(0, 0);
- view.setLayoutParams(layoutParams3);
- } else if (view instanceof Toolbar) {
- Toolbar.LayoutParams layoutParams4 = new Toolbar.LayoutParams(0, 0);
- view.setLayoutParams(layoutParams4);
- } else if (view instanceof ViewGroup) {
- ViewGroup.LayoutParams layoutParams5 = new ViewGroup.LayoutParams(0, 0);
- view.setLayoutParams(layoutParams5);
+ public static void hideViewByLayoutParams(@Nullable View view) {
+ if (view == null) return;
+
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+
+ if (params == null) {
+ // Create generic 0x0 layout params accepted by all ViewGroups.
+ params = new ViewGroup.LayoutParams(0, 0);
} else {
- ViewGroup.LayoutParams params = view.getLayoutParams();
params.width = 0;
params.height = 0;
- view.setLayoutParams(params);
}
+
+ view.setLayoutParams(params);
}
/**
- * Creates a custom dialog with a styled layout, including a title, message, buttons, and an
- * optional EditText. The dialog's appearance adapts to the app's dark mode setting, with
- * rounded corners and customizable button actions. Buttons adjust dynamically to their text
- * content and are arranged in a single row if they fit within 80% of the screen width,
- * with the Neutral button aligned to the left and OK/Cancel buttons centered on the right.
- * If buttons do not fit, each is placed on a separate row, all aligned to the right.
+ * Configures the parameters of a dialog window, including its width, gravity, vertical offset and background dimming.
+ * The width is calculated as a percentage of the screen's portrait width and the vertical offset is specified in DIP.
+ * The default dialog background is removed to allow for custom styling.
*
- * @param context Context used to create the dialog.
- * @param title Title text of the dialog.
- * @param message Message text of the dialog (supports Spanned for HTML), or null if replaced by EditText.
- * @param editText EditText to include in the dialog, or null if no EditText is needed.
- * @param okButtonText OK button text, or null to use the default "OK" string.
- * @param onOkClick Action to perform when the OK button is clicked.
- * @param onCancelClick Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
- * @param neutralButtonText Neutral button text, or null if no Neutral button is needed.
- * @param onNeutralClick Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
- * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
- * @return The Dialog and its main LinearLayout container.
+ * @param window The {@link Window} object to configure.
+ * @param gravity The gravity for positioning the dialog (e.g., {@link Gravity#BOTTOM}).
+ * @param yOffsetDip The vertical offset from the gravity position in DIP.
+ * @param widthPercentage The width of the dialog as a percentage of the screen's portrait width (0-100).
+ * @param dimAmount If true, sets the background dim amount to 0 (no dimming); if false, leaves the default dim amount.
*/
- @SuppressWarnings("ExtractMethodRecommender")
- public static Pair createCustomDialog(
- Context context, String title, CharSequence message, @Nullable EditText editText,
- String okButtonText, Runnable onOkClick, Runnable onCancelClick,
- @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
- boolean dismissDialogOnNeutralClick
- ) {
- Logger.printDebug(() -> "Creating custom dialog with title: " + title);
-
- Dialog dialog = new Dialog(context);
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
-
- // Preset size constants.
- final int dip4 = dipToPixels(4);
- final int dip8 = dipToPixels(8);
- final int dip16 = dipToPixels(16);
- final int dip24 = dipToPixels(24);
-
- // Create main layout.
- LinearLayout mainLayout = new LinearLayout(context);
- mainLayout.setOrientation(LinearLayout.VERTICAL);
- mainLayout.setPadding(dip24, dip16, dip24, dip24);
- // Set rounded rectangle background.
- ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
- createCornerRadii(28), null, null));
- mainBackground.getPaint().setColor(getDialogBackgroundColor()); // Dialog background.
- mainLayout.setBackground(mainBackground);
-
- // Title.
- if (!TextUtils.isEmpty(title)) {
- TextView titleView = new TextView(context);
- titleView.setText(title);
- titleView.setTypeface(Typeface.DEFAULT_BOLD);
- titleView.setTextSize(18);
- titleView.setTextColor(getAppForegroundColor());
- titleView.setGravity(Gravity.CENTER);
- LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT
- );
- layoutParams.setMargins(0, 0, 0, dip16);
- titleView.setLayoutParams(layoutParams);
- mainLayout.addView(titleView);
- }
-
- // Create content container (message/EditText) inside a ScrollView only if message or editText is provided.
- ScrollView contentScrollView = null;
- LinearLayout contentContainer;
- if (message != null || editText != null) {
- contentScrollView = new ScrollView(context);
- contentScrollView.setVerticalScrollBarEnabled(false); // Disable the vertical scrollbar.
- contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
- if (editText != null) {
- ShapeDrawable scrollViewBackground = new ShapeDrawable(new RoundRectShape(
- createCornerRadii(10), null, null));
- scrollViewBackground.getPaint().setColor(getEditTextBackground());
- contentScrollView.setPadding(dip8, dip8, dip8, dip8);
- contentScrollView.setBackground(scrollViewBackground);
- contentScrollView.setClipToOutline(true);
- }
- LinearLayout.LayoutParams contentParams = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- 0,
- 1.0f // Weight to take available space.
- );
- contentScrollView.setLayoutParams(contentParams);
- contentContainer = new LinearLayout(context);
- contentContainer.setOrientation(LinearLayout.VERTICAL);
- contentScrollView.addView(contentContainer);
-
- // Message (if not replaced by EditText).
- if (editText == null) {
- TextView messageView = new TextView(context);
- messageView.setText(message); // Supports Spanned (HTML).
- messageView.setTextSize(16);
- messageView.setTextColor(getAppForegroundColor());
- // Enable HTML link clicking if the message contains links.
- if (message instanceof Spanned) {
- messageView.setMovementMethod(LinkMovementMethod.getInstance());
- }
- LinearLayout.LayoutParams messageParams = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT
- );
- messageView.setLayoutParams(messageParams);
- contentContainer.addView(messageView);
- }
-
- // EditText (if provided).
- if (editText != null) {
- // Remove EditText from its current parent, if any.
- ViewGroup parent = (ViewGroup) editText.getParent();
- if (parent != null) {
- parent.removeView(editText);
- }
- // Style the EditText to match the dialog theme.
- editText.setTextColor(getAppForegroundColor());
- editText.setBackgroundColor(Color.TRANSPARENT);
- editText.setPadding(0, 0, 0, 0);
- LinearLayout.LayoutParams editTextParams = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.WRAP_CONTENT
- );
- contentContainer.addView(editText, editTextParams);
- }
- }
-
- // Button container.
- LinearLayout buttonContainer = new LinearLayout(context);
- buttonContainer.setOrientation(LinearLayout.VERTICAL);
- buttonContainer.removeAllViews();
- LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.WRAP_CONTENT
- );
- buttonContainerParams.setMargins(0, dip16, 0, 0);
- buttonContainer.setLayoutParams(buttonContainerParams);
-
- // Lists to track buttons.
- List