Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes unneeded check for our pref keys

Browse Source
This commit is contained in:
Serg
2024-04-17 13:11:59 -04:00
parent 1b8b9fe7fd
commit cfecbee895
2 changed files with 9 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/base/BravePreferenceKeys.java
+4 -67
View File
@@ -5,9 +5,6 @@
package org.chromium.base;
import java.util.Arrays;
import java.util.List;
public final class BravePreferenceKeys {
public static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY =
"brave_bottom_toolbar_enabled_key";
@@ -48,13 +45,8 @@ public final class BravePreferenceKeys {
"org.chromium.chrome.browser.Brave_Biometrics_For_Wallet_Encrypted";
public static final String BRAVE_AD_FREE_CALLOUT_DIALOG = "brave_ad_free_callout_dialog";
public static final String BRAVE_OPENED_YOUTUBE = "brave_opened_youtube";
public static final String SHOULD_SHOW_COOKIE_CONSENT_NOTICE =
"should_show_cookie_consent_notice";
public static final String LOADED_SITE_COUNT = "loaded_site_count";
public static final String BRAVE_BACKGROUND_VIDEO_PLAYBACK_CONVERTED_TO_FEATURE =
"brave_background_video_playback_converted_to_feature";
public static final String BRAVE_APP_OPEN_COUNT_FOR_WIDGET_PROMO =
"brave_app_open_count_for_widget_promo";
public static final String BRAVE_DEFERRED_DEEPLINK_PLAYLIST =
"brave_deferred_deeplink_playlist";
public static final String BRAVE_DEFERRED_DEEPLINK_VPN = "brave_deferred_deeplink_vpn";
@@ -66,7 +58,7 @@ public final class BravePreferenceKeys {
public static final String BRAVE_LEO_AUTOCOMPLETE =
"org.chromium.chrome.browser.Brave_Leo_AutoComplete";
// Playlist prefrence keys
// Playlist preference keys
public static final String PREF_ENABLE_PLAYLIST = "enable_playlist";
public static final String PREF_ADD_TO_PLAYLIST_BUTTON = "add_to_playlist_button";
public static final String PREF_REMEMBER_FILE_PLAYBACK_POSITION =
@@ -80,67 +72,12 @@ public final class BravePreferenceKeys {
public static final String BRAVE_RECYCLERVIEW_POSITION = "recyclerview_visible_position_";
public static final String BRAVE_RECYCLERVIEW_OFFSET_POSITION = "recyclerview_offset_position_";
/*
* Returns the list of Brave's preference keys.
*/
private static List<String> getKeysInUse() {
return Arrays.asList(
BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY,
BRAVE_BOTTOM_TOOLBAR_SET_KEY,
BRAVE_USE_CUSTOM_TABS,
BRAVE_APP_OPEN_COUNT,
BRAVE_ROLE_MANAGER_DIALOG_COUNT,
BRAVE_IS_DEFAULT,
BRAVE_WAS_DEFAULT_ASK_COUNT,
BRAVE_SET_DEFAULT_BOTTOM_SHEET_COUNT,
BRAVE_DEFAULT_DONT_ASK,
BRAVE_UPDATE_EXTRA_PARAM,
BRAVE_NOTIFICATION_PREF_NAME,
BRAVE_MILLISECONDS_NAME,
BRAVE_DOWNLOADS_AUTOMATICALLY_OPEN_WHEN_POSSIBLE,
BRAVE_DOWNLOADS_DOWNLOAD_PROGRESS_NOTIFICATION_BUBBLE,
BRAVE_DOUBLE_RESTART,
BRAVE_TAB_GROUPS_ENABLED,
BRAVE_DISABLE_SHARING_HUB,
BRAVE_NEWS_CHANGE_SOURCE,
BRAVE_NEWS_FEED_HASH,
BRAVE_NEWS_PREF_SHOW_NEWS,
BRAVE_NEWS_PREF_TURN_ON_NEWS,
BRAVE_USE_BIOMETRICS_FOR_WALLET,
BRAVE_BIOMETRICS_FOR_WALLET_IV,
BRAVE_BIOMETRICS_FOR_WALLET_ENCRYPTED,
BRAVE_AD_FREE_CALLOUT_DIALOG,
BRAVE_OPENED_YOUTUBE,
SHOULD_SHOW_COOKIE_CONSENT_NOTICE,
LOADED_SITE_COUNT,
BRAVE_BACKGROUND_VIDEO_PLAYBACK_CONVERTED_TO_FEATURE,
BRAVE_APP_OPEN_COUNT_FOR_WIDGET_PROMO,
BRAVE_DEFERRED_DEEPLINK_PLAYLIST,
BRAVE_DEFERRED_DEEPLINK_VPN,
BRAVE_CLOSE_TABS_ON_EXIT,
BRAVE_CLEAR_ON_EXIT,
BRAVE_QUICK_ACTION_SEARCH_AND_BOOKMARK_WIDGET_TILES,
BRAVE_LEO_AUTOCOMPLETE,
PREF_ENABLE_PLAYLIST,
PREF_ADD_TO_PLAYLIST_BUTTON,
PREF_REMEMBER_FILE_PLAYBACK_POSITION,
PREF_REMEMBER_LIST_PLAYBACK_POSITION,
PREF_CONTINUOUS_LISTENING,
PREF_RESET_PLAYLIST);
}
/*
* Checks if preference key is among Brave's dynamic keys.
*/
private static boolean isBraveDynamicKeyInUse(String key) {
return key.startsWith(BRAVE_RECYCLERVIEW_POSITION)
|| key.startsWith(BRAVE_RECYCLERVIEW_OFFSET_POSITION);
}
/*
* Checks if preference key is used in Brave.
* It's no op currently. We might reconsider
* using it in the future for keys sanitation
*/
public static boolean isBraveKeyInUse(String key) {
return getKeysInUse().contains(key) || isBraveDynamicKeyInUse(key);
return true;
}
}