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

Java formatting fixes.

Browse Source
This commit is contained in:
Max Karolinskiy
2024-04-08 23:09:41 -04:00
committed by mkarolin
parent f233ee693f
commit bc94bf3521
30 changed files with 334 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveIntentHandler.java
+9 -9
View File
@@ -12,7 +12,6 @@ import android.text.TextUtils;
import org.chromium.base.IntentUtils;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.content_public.browser.BrowserStartupController;
@@ -66,14 +65,15 @@ public class BraveIntentHandler {
}
try {
return ThreadUtils.runOnUiThreadBlocking(new Callable<String>() {
@Override
public String call() {
return TemplateUrlServiceFactory
.getForProfile(ProfileManager.getLastUsedRegularProfile())
.getUrlForSearchQuery(query);
}
});
return ThreadUtils.runOnUiThreadBlocking(
new Callable<String>() {
@Override
public String call() {
return TemplateUrlServiceFactory.getForProfile(
ProfileManager.getLastUsedRegularProfile())
.getUrlForSearchQuery(query);
}
});
} catch (ExecutionException e) {
Log.e(TAG, "Could not retrieve search query: " + e);
}
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+14 -7
View File
@@ -789,8 +789,11 @@ public abstract class BraveActivity extends ChromeActivity
}
if (isClearBrowsingDataOnExit()) {
List<Integer> dataTypes = Arrays.asList(
BrowsingDataType.HISTORY, BrowsingDataType.SITE_DATA, BrowsingDataType.CACHE);
List<Integer> dataTypes =
Arrays.asList(
BrowsingDataType.HISTORY,
BrowsingDataType.SITE_DATA,
BrowsingDataType.CACHE);
int[] dataTypesArray = CollectionUtil.integerCollectionToIntArray(dataTypes);
@@ -908,7 +911,8 @@ public abstract class BraveActivity extends ChromeActivity
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getString(BravePref.SCHEDULED_CAPTCHA_PAYMENT_ID);
if (BraveQAPreferences.shouldVlogRewards()) {
Log.e(AdaptiveCaptchaHelper.TAG,
Log.e(
AdaptiveCaptchaHelper.TAG,
"captchaID : " + captchaID + " Payment ID : " + paymentID);
}
maybeSolveAdaptiveCaptcha();
@@ -936,7 +940,8 @@ public abstract class BraveActivity extends ChromeActivity
String paymentID =
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getString(BravePref.SCHEDULED_CAPTCHA_PAYMENT_ID);
if (!TextUtils.isEmpty(captchaID) && !TextUtils.isEmpty(paymentID)
if (!TextUtils.isEmpty(captchaID)
&& !TextUtils.isEmpty(paymentID)
&& !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) {
AdaptiveCaptchaHelper.startAttestation(captchaID, paymentID);
}
@@ -1457,11 +1462,13 @@ public abstract class BraveActivity extends ChromeActivity
String countryCode = Locale.getDefault().getCountry();
if (sYandexRegions.contains(countryCode)) {
Profile lastUsedRegularProfile = ProfileManager.getLastUsedRegularProfile();
TemplateUrl yandexTemplateUrl = BraveSearchEngineUtils.getTemplateUrlByShortName(
lastUsedRegularProfile, OnboardingPrefManager.YANDEX);
TemplateUrl yandexTemplateUrl =
BraveSearchEngineUtils.getTemplateUrlByShortName(
lastUsedRegularProfile, OnboardingPrefManager.YANDEX);
if (yandexTemplateUrl != null) {
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl, lastUsedRegularProfile);
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl,
BraveSearchEngineUtils.setDSEPrefs(
yandexTemplateUrl,
lastUsedRegularProfile.getPrimaryOTRProfile(/* createIfNeeded= */ true));
}
}
android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
+2 -1
View File
@@ -1071,7 +1071,8 @@ public class Utils {
Log.e(TAG, "getProfile " + e);
}
if (chromeActivity == null) chromeActivity = BraveActivity.getChromeTabbedActivity();
if (chromeActivity == null) return ProfileManager.getLastUsedRegularProfile(); // Last resort
if (chromeActivity == null)
return ProfileManager.getLastUsedRegularProfile(); // Last resort
return chromeActivity.getTabModelSelector().getModel(isIncognito).getProfile();
}
android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java
-1
View File
@@ -5,7 +5,6 @@
package org.chromium.chrome.browser.firstrun;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.chrome.browser.profiles.ProfileProvider;
import org.chromium.components.signin.AccountManagerFacadeProvider;
android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java
+25 -20
View File
@@ -37,12 +37,14 @@ public class BraveThemePreferences extends ThemeSettingsFragment {
getActivity().setTitle(getResources().getString(R.string.theme_settings));
Profile mProfile = ProfileManager.getLastUsedRegularProfile();
NTPBackgroundImagesBridge mNTPBackgroundImagesBridge = NTPBackgroundImagesBridge.getInstance(mProfile);
NTPBackgroundImagesBridge mNTPBackgroundImagesBridge =
NTPBackgroundImagesBridge.getInstance(mProfile);
if (!NTPBackgroundImagesBridge.enableSponsoredImages()
|| (mNTPBackgroundImagesBridge != null
&& !mNTPBackgroundImagesBridge.isSuperReferral())
&& !mNTPBackgroundImagesBridge.isSuperReferral())
|| Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {
Preference superReferralPreference = getPreferenceScreen().findPreference(SUPER_REFERRAL);
Preference superReferralPreference =
getPreferenceScreen().findPreference(SUPER_REFERRAL);
if (superReferralPreference != null) {
getPreferenceScreen().removePreference(superReferralPreference);
}
@@ -59,26 +61,29 @@ public class BraveThemePreferences extends ThemeSettingsFragment {
: ThemeType.LIGHT;
}
mWebContentsDarkModeEnabled = WebContentsDarkModeController.isGlobalUserSettingsEnabled(
ProfileManager.getLastUsedRegularProfile());
mWebContentsDarkModeEnabled =
WebContentsDarkModeController.isGlobalUserSettingsEnabled(
ProfileManager.getLastUsedRegularProfile());
radioButtonGroupThemePreference.initialize(
sharedPreferencesManager.readInt(UI_THEME_SETTING, defaultThemePref),
mWebContentsDarkModeEnabled);
radioButtonGroupThemePreference.setOnPreferenceChangeListener((preference, newValue) -> {
if (ChromeFeatureList.isEnabled(
ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING)) {
if (radioButtonGroupThemePreference.isDarkenWebsitesEnabled()
!= mWebContentsDarkModeEnabled) {
mWebContentsDarkModeEnabled =
radioButtonGroupThemePreference.isDarkenWebsitesEnabled();
WebContentsDarkModeController.setGlobalUserSettings(
ProfileManager.getLastUsedRegularProfile(), mWebContentsDarkModeEnabled);
}
}
int theme = (int) newValue;
sharedPreferencesManager.writeInt(UI_THEME_SETTING, theme);
return true;
});
radioButtonGroupThemePreference.setOnPreferenceChangeListener(
(preference, newValue) -> {
if (ChromeFeatureList.isEnabled(
ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING)) {
if (radioButtonGroupThemePreference.isDarkenWebsitesEnabled()
!= mWebContentsDarkModeEnabled) {
mWebContentsDarkModeEnabled =
radioButtonGroupThemePreference.isDarkenWebsitesEnabled();
WebContentsDarkModeController.setGlobalUserSettings(
ProfileManager.getLastUsedRegularProfile(),
mWebContentsDarkModeEnabled);
}
}
int theme = (int) newValue;
sharedPreferencesManager.writeInt(UI_THEME_SETTING, theme);
return true;
});
}
}
android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+4 -3
View File
@@ -1233,8 +1233,9 @@ public class BraveNewTabPageLayout
setBackgroundImage(ntpImage);
} else if (UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)
&& mSponsoredTab != null && NTPUtil.shouldEnableNTPFeature()) {
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)
&& mSponsoredTab != null
&& NTPUtil.shouldEnableNTPFeature()) {
setBackgroundImage(ntpImage);
}
}
@@ -1489,7 +1490,7 @@ public class BraveNewTabPageLayout
return ChromeFeatureList.isEnabled(ChromeFeatureList.SHOW_SCROLLABLE_MVT_ON_NTP_ANDROID)
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)
&& UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE);
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE);
}
@Override
android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java
+14 -11
View File
@@ -199,19 +199,22 @@ public class BraveNtpAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
ImageViewCompat.setImageTintList(
imageCreditViewHolder.superReferralLogo,
ColorStateList.valueOf(mActivity.getColor(floatingButtonIconColor)));
imageCreditViewHolder.superReferralLogo.setOnClickListener(view -> {
QRCodeShareDialogFragment qRCodeShareDialogFragment =
new QRCodeShareDialogFragment();
qRCodeShareDialogFragment.setQRCodeText(BraveConstants.BRAVE_REF_URL
+ mNTPBackgroundImagesBridge.getSuperReferralCode());
qRCodeShareDialogFragment.show(
((BraveActivity) mActivity).getSupportFragmentManager(),
"QRCodeShareDialogFragment");
});
imageCreditViewHolder.superReferralLogo.setOnClickListener(
view -> {
QRCodeShareDialogFragment qRCodeShareDialogFragment =
new QRCodeShareDialogFragment();
qRCodeShareDialogFragment.setQRCodeText(
BraveConstants.BRAVE_REF_URL
+ mNTPBackgroundImagesBridge.getSuperReferralCode());
qRCodeShareDialogFragment.show(
((BraveActivity) mActivity).getSupportFragmentManager(),
"QRCodeShareDialogFragment");
});
} else if (UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)
&& mSponsoredTab != null && NTPUtil.shouldEnableNTPFeature()) {
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)
&& mSponsoredTab != null
&& NTPUtil.shouldEnableNTPFeature()) {
if (mNtpImage instanceof BackgroundImage) {
BackgroundImage backgroundImage = (BackgroundImage) mNtpImage;
imageCreditViewHolder.sponsoredLogo.setVisibility(View.GONE);
android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
-1
View File
@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.brave_leo.BraveLeoUtils;
import org.chromium.chrome.browser.omnibox.LocationBarDataProvider;
import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java
+2 -1
View File
@@ -216,7 +216,8 @@ public class OnboardingPrefManager {
}
public boolean isAdsAvailable() {
return BraveAdsNativeHelper.nativeIsSupportedRegion(ProfileManager.getLastUsedRegularProfile());
return BraveAdsNativeHelper.nativeIsSupportedRegion(
ProfileManager.getLastUsedRegularProfile());
}
public void showOnboarding(Context context) {
android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class SearchEngineOnboardingFragment extends Fragment {
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// Inflate the layout for this fragment
View root = inflater.inflate(R.layout.fragment_search_engine_onboarding, container, false);
android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java
+50 -17
View File
@@ -149,58 +149,91 @@ public class BraveShieldsContentSettings {
}
public static void setFingerprintingPref(String value) {
setShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING, value, false);
setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING,
value,
false);
}
public static void setHttpsUpgradePref(String value) {
setShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_HTTPS_UPGRADE, value, false);
setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_HTTPS_UPGRADE,
value,
false);
}
public static void setCookiesPref(String value) {
setShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_COOKIES, value, false);
setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_COOKIES,
value,
false);
}
public static void setTrackersPref(String value) {
setShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS, value, false);
setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS,
value,
false);
}
public static void setJavascriptPref(boolean value) {
setShields(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_JAVASCRIPTS, value, false);
setShields(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_JAVASCRIPTS,
value,
false);
}
public static void setForgetFirstPartyStoragePref(boolean value) {
setShields(ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FORGET_FIRST_PARTY_STORAGE, value,
setShields(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FORGET_FIRST_PARTY_STORAGE,
value,
false);
}
public static boolean getJavascriptPref() {
return getShields(ProfileManager.getLastUsedRegularProfile(), "",
return getShields(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_JAVASCRIPTS);
}
public static String getTrackersPref() {
return getShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
return getShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS);
}
public static String getFingerprintingPref() {
return getShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
return getShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING);
}
public static String getHttpsUpgradePref() {
return getShieldsValue(ProfileManager.getLastUsedRegularProfile(), "",
return getShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_HTTPS_UPGRADE);
}
public static boolean getForgetFirstPartyStoragePref() {
return getShields(ProfileManager.getLastUsedRegularProfile(), "",
return getShields(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FORGET_FIRST_PARTY_STORAGE);
}
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+25 -14
View File
@@ -745,23 +745,32 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
mClearBrowsingDataOnExit.setChecked(
sharedPreferences.getBoolean(BravePreferenceKeys.BRAVE_CLEAR_ON_EXIT, false));
boolean autocompleteEnabled = UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.AUTOCOMPLETE_ENABLED);
boolean autocompleteEnabled =
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.AUTOCOMPLETE_ENABLED);
mShowAutocompleteInAddressBar.setChecked(autocompleteEnabled);
mSearchSuggestions.setEnabled(autocompleteEnabled);
mAutocompleteTopSites.setEnabled(autocompleteEnabled);
mFingerprntLanguagePref.setChecked(UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.REDUCE_LANGUAGE_ENABLED));
mFingerprntLanguagePref.setChecked(
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.REDUCE_LANGUAGE_ENABLED));
if (mFilterListAndroidHandler != null) {
mFilterListAndroidHandler.isFilterListEnabled(FilterListConstants.COOKIE_LIST_UUID,
isEnabled -> { mBlockCookieConsentNoticesPref.setChecked(isEnabled); });
mFilterListAndroidHandler.isFilterListEnabled(FilterListConstants.SWITCH_TO_APP_UUID,
isEnabled -> { mBlockSwitchToAppNoticesPref.setChecked(isEnabled); });
mFilterListAndroidHandler.isFilterListEnabled(
FilterListConstants.COOKIE_LIST_UUID,
isEnabled -> {
mBlockCookieConsentNoticesPref.setChecked(isEnabled);
});
mFilterListAndroidHandler.isFilterListEnabled(
FilterListConstants.SWITCH_TO_APP_UUID,
isEnabled -> {
mBlockSwitchToAppNoticesPref.setChecked(isEnabled);
});
}
// Debounce
if (mDebouncePref != null) {
mDebouncePref.setChecked(UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.DEBOUNCE_ENABLED));
mDebouncePref.setChecked(
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.DEBOUNCE_ENABLED));
}
// Social blocking
@@ -787,8 +796,9 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
}
if (mDeAmpPref != null) {
mDeAmpPref.setChecked(UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.DE_AMP_PREF_ENABLED));
mDeAmpPref.setChecked(
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.DE_AMP_PREF_ENABLED));
}
if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REQUEST_OTR_TAB)) {
@@ -799,8 +809,9 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
}
private void updateRequestOtrPref() {
int requestOtrPrefValue = UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getInteger(BravePref.REQUEST_OTR_ACTION_OPTION);
int requestOtrPrefValue =
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getInteger(BravePref.REQUEST_OTR_ACTION_OPTION);
if (requestOtrPrefValue == BraveShieldsContentSettings.ALWAYS) {
mRequestOtrPref.setCheckedIndex(0);
mRequestOtrPref.setSummary(
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java
+6 -4
View File
@@ -14,16 +14,18 @@ public class BravePrivacySettingsIPFSUtils {
public static void setIPFSGatewayPref(boolean preference) {
if (BraveConfig.IPFS_ENABLED) {
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setInteger(BravePref.IPFS_RESOLVE_METHOD,
preference ? IPFSResolveMethodTypes.IPFS_ASK
: IPFSResolveMethodTypes.IPFS_DISABLED);
.setInteger(
BravePref.IPFS_RESOLVE_METHOD,
preference
? IPFSResolveMethodTypes.IPFS_ASK
: IPFSResolveMethodTypes.IPFS_DISABLED);
}
}
public static boolean getIPFSGatewayPref() {
if (BraveConfig.IPFS_ENABLED) {
return UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getInteger(BravePref.IPFS_RESOLVE_METHOD)
.getInteger(BravePref.IPFS_RESOLVE_METHOD)
!= IPFSResolveMethodTypes.IPFS_DISABLED;
} else {
return false;
android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+5 -5
View File
@@ -1,7 +1,7 @@
/* Copyright (c) 2021 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
/* Copyright (c) 2021 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.rewards;
@@ -1482,7 +1482,7 @@ public class BraveRewardsPanel
BraveTouchUtils.ensureMinTouchTarget(learnMoreUnverifiedText);
if (BraveAdsNativeHelper.nativeIsOptedInToNotificationAds(
ProfileManager.getLastUsedRegularProfile())) {
ProfileManager.getLastUsedRegularProfile())) {
if (mRewardsMainLayout != null) {
mRewardsMainLayout.setVisibility(View.GONE);
}
android/java/org/chromium/chrome/browser/rewards/adaptive_captcha/AdaptiveCaptchaHelper.java
+2 -1
View File
@@ -225,7 +225,8 @@ public class AdaptiveCaptchaHelper {
private static void recordFailureAttempt() {
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setInteger(BravePref.SCHEDULED_CAPTCHA_FAILED_ATTEMPTS,
.setInteger(
BravePref.SCHEDULED_CAPTCHA_FAILED_ATTEMPTS,
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getInteger(BravePref.SCHEDULED_CAPTCHA_FAILED_ATTEMPTS)
+ 1);
android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java
+3 -2
View File
@@ -147,8 +147,9 @@ public class AppearancePreferences extends BravePreferenceFragment
enableSpeedreader.setOnPreferenceChangeListener(this);
if (enableSpeedreader instanceof ChromeSwitchPreference) {
((ChromeSwitchPreference) enableSpeedreader)
.setChecked(UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.SPEEDREADER_PREF_ENABLED));
.setChecked(
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.SPEEDREADER_PREF_ENABLED));
}
}
}
android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java
+6 -2
View File
@@ -107,9 +107,13 @@ public class BackgroundImagesPreferences
public static void setOnPreferenceValue(String preferenceName, boolean newValue) {
if (PREF_SHOW_BACKGROUND_IMAGES.equals(preferenceName)) {
UserPrefs.get(ProfileManager.getLastUsedRegularProfile()).setBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE, newValue);
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE, newValue);
} else if (PREF_SHOW_SPONSORED_IMAGES.equals(preferenceName)) {
UserPrefs.get(ProfileManager.getLastUsedRegularProfile()).setBoolean(BravePref.NEW_TAB_PAGE_SHOW_SPONSORED_IMAGES_BACKGROUND_IMAGE, (boolean)newValue);
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setBoolean(
BravePref.NEW_TAB_PAGE_SHOW_SPONSORED_IMAGES_BACKGROUND_IMAGE,
(boolean) newValue);
} else {
SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
SharedPreferences.Editor sharedPreferencesEditor = sharedPreferences.edit();
android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java
+1 -1
View File
@@ -402,7 +402,7 @@ public class BraveMainPreferencesBase
private void updateSearchEnginePreference() {
if (!TemplateUrlServiceFactory.getForProfile(ProfileManager.getLastUsedRegularProfile())
.isLoaded()) {
.isLoaded()) {
ChromeBasePreference searchEnginePref =
(ChromeBasePreference) findPreference(PREF_BRAVE_SEARCH_ENGINES);
searchEnginePref.setEnabled(false);
android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java
+79 -56
View File
@@ -59,14 +59,18 @@ public class BravePreferenceDialogFragment extends PreferenceDialogFragmentCompa
if (onPreferenceChangeListener != null) {
SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
if (currentPreference.equals(BravePrivacySettings.PREF_FINGERPRINTING_PROTECTION)) {
onPreferenceChangeListener.onPreferenceChange(dialogPreference,
onPreferenceChangeListener.onPreferenceChange(
dialogPreference,
BraveShieldsContentSettings.getShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING));
} else if (currentPreference.equals(BravePrivacySettings.PREF_BLOCK_TRACKERS_ADS)) {
onPreferenceChangeListener.onPreferenceChange(dialogPreference,
onPreferenceChangeListener.onPreferenceChange(
dialogPreference,
BraveShieldsContentSettings.getShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS));
} else {
onPreferenceChangeListener.onPreferenceChange(
@@ -80,59 +84,78 @@ public class BravePreferenceDialogFragment extends PreferenceDialogFragmentCompa
super.onPrepareDialogBuilder(builder);
builder.setCancelable(false);
if (mRadioGroup != null) {
mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
newValue = checkedId;
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
if (currentPreference.equals(
BravePrivacySettings.PREF_FINGERPRINTING_PROTECTION)) {
if ((int) newValue == 0) {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.BLOCK_RESOURCE, false);
} else if ((int) newValue == 1) {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.DEFAULT, false);
} else {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.ALLOW_RESOURCE, false);
}
} else if (currentPreference.equals(
BravePrivacySettings.PREF_BLOCK_TRACKERS_ADS)) {
switch ((int) newValue) {
case 0:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.BLOCK_RESOURCE, false);
break;
case 1:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.DEFAULT, false);
break;
default:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(), "",
BraveShieldsContentSettings.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.ALLOW_RESOURCE, false);
break;
}
} else {
sharedPreferencesEditor.putInt(currentPreference, (int) newValue);
}
mRadioGroup.setOnCheckedChangeListener(
new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
newValue = checkedId;
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
if (currentPreference.equals(
BravePrivacySettings.PREF_FINGERPRINTING_PROTECTION)) {
if ((int) newValue == 0) {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.BLOCK_RESOURCE,
false);
} else if ((int) newValue == 1) {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.DEFAULT,
false);
} else {
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_FINGERPRINTING,
BraveShieldsContentSettings.ALLOW_RESOURCE,
false);
}
} else if (currentPreference.equals(
BravePrivacySettings.PREF_BLOCK_TRACKERS_ADS)) {
switch ((int) newValue) {
case 0:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.BLOCK_RESOURCE,
false);
break;
case 1:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.DEFAULT,
false);
break;
default:
BraveShieldsContentSettings.setShieldsValue(
ProfileManager.getLastUsedRegularProfile(),
"",
BraveShieldsContentSettings
.RESOURCE_IDENTIFIER_TRACKERS,
BraveShieldsContentSettings.ALLOW_RESOURCE,
false);
break;
}
} else {
sharedPreferencesEditor.putInt(currentPreference, (int) newValue);
}
sharedPreferencesEditor.apply();
}
});
sharedPreferencesEditor.apply();
}
});
}
builder.setPositiveButton(null, null);
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+3 -2
View File
@@ -110,8 +110,9 @@ public class BraveQAPreferences extends BravePreferenceFragment
if (mIsStagingServer != null) {
mIsStagingServer.setOnPreferenceChangeListener(this);
}
mIsStagingServer.setChecked(UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.USE_REWARDS_STAGING_SERVER));
mIsStagingServer.setChecked(
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.USE_REWARDS_STAGING_SERVER));
mIsSyncStagingServer =
(ChromeSwitchPreference) findPreference(PREF_USE_SYNC_STAGING_SERVER);
android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
+9 -2
View File
@@ -44,7 +44,11 @@ public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioBut
RadioButtonWithDescription refView = (RadioButtonWithDescription)holder.findViewById(R.id.dark);
if (mNTPBackgroundImagesBridge != null && mNTPBackgroundImagesBridge.isSuperReferral()) {
refView.setPrimaryText(mNTPBackgroundImagesBridge.getSuperReferralThemeName());
if(UserPrefs.get(ProfileManager.getLastUsedRegularProfile()).getInteger(BravePref.NEW_TAB_PAGE_SUPER_REFERRAL_THEMES_OPTION) == 1 ? true : false) {
if (UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getInteger(BravePref.NEW_TAB_PAGE_SUPER_REFERRAL_THEMES_OPTION)
== 1
? true
: false) {
refView.setChecked(true);
braveDefaultView.setChecked(false);
} else {
@@ -59,7 +63,10 @@ public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioBut
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
super.onCheckedChanged(group, checkedId);
UserPrefs.get(ProfileManager.getLastUsedRegularProfile()).setInteger(BravePref.NEW_TAB_PAGE_SUPER_REFERRAL_THEMES_OPTION, checkedId == R.id.light ? 0 : 1 );
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setInteger(
BravePref.NEW_TAB_PAGE_SUPER_REFERRAL_THEMES_OPTION,
checkedId == R.id.light ? 0 : 1);
BraveRelaunchUtils.askForRelaunch(getContext());
}
}
android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java
+3 -2
View File
@@ -174,8 +174,9 @@ public class BraveSpeedReaderManager extends EmptyTabObserver implements UserDat
boolean isFeatureEnabled = ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_SPEEDREADER);
if (!isFeatureEnabled) return false;
boolean isPrefEnabled = UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.SPEEDREADER_PREF_ENABLED);
boolean isPrefEnabled =
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.SPEEDREADER_PREF_ENABLED);
return isPrefEnabled;
}
}
android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java
-1
View File
@@ -13,7 +13,6 @@ import android.widget.TextView;
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.components.browser_ui.widget.tile.TileView;
import org.chromium.components.user_prefs.UserPrefs;
android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java
+5 -3
View File
@@ -66,9 +66,11 @@ public class BraveTabCreator extends ChromeTabCreator {
TabModel tabModel = chromeTabbedActivity.getCurrentTabModel();
if (tabModel.getCount() >= SponsoredImageUtil.MAX_TABS
&& UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)) {
Tab tab = BraveActivity.class.cast(chromeTabbedActivity)
.selectExistingTab(UrlConstants.NTP_URL);
.getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)) {
Tab tab =
BraveActivity.class
.cast(chromeTabbedActivity)
.selectExistingTab(UrlConstants.NTP_URL);
if (tab != null) {
BraveReflectionUtil.InvokeMethod(
ChromeTabbedActivity.class, chromeTabbedActivity, "hideOverview");
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
+2 -1
View File
@@ -139,7 +139,8 @@ public class BraveVpnPrefUtils {
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setString(BravePref.BRAVE_VPN_PURCHASE_TOKEN_ANDROID, value);
UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
.setString(BravePref.BRAVE_VPN_PACKAGE_ANDROID,
.setString(
BravePref.BRAVE_VPN_PACKAGE_ANDROID,
ContextUtils.getApplicationContext().getPackageName());
}
android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java
+25 -16
View File
@@ -293,11 +293,14 @@ public class QuickActionSearchAndBookmarkWidgetProvider extends AppWidgetProvide
private static void setDefaultSearchEngineString(RemoteViews views) {
final Profile profile = ProfileManager.getLastUsedRegularProfile();
TemplateUrl templateUrl = BraveSearchEngineUtils.getTemplateUrlByShortName(
profile, BraveSearchEngineUtils.getDSEShortName(profile, false));
TemplateUrl templateUrl =
BraveSearchEngineUtils.getTemplateUrlByShortName(
profile, BraveSearchEngineUtils.getDSEShortName(profile, false));
if (templateUrl != null) {
String searchWithDefaultSearchEngine = ContextUtils.getApplicationContext().getString(
R.string.search_with_search_engine, templateUrl.getShortName());
String searchWithDefaultSearchEngine =
ContextUtils.getApplicationContext()
.getString(
R.string.search_with_search_engine, templateUrl.getShortName());
views.setTextViewText(R.id.tvSearchWithBrave, searchWithDefaultSearchEngine);
}
}
@@ -344,18 +347,24 @@ public class QuickActionSearchAndBookmarkWidgetProvider extends AppWidgetProvide
}
private static void fetchGurlIcon(final int imageViewId, GURL gurl) {
LargeIconBridge largeIconBridge = new LargeIconBridge(ProfileManager.getLastUsedRegularProfile());
LargeIconCallback callback = new LargeIconCallback() {
@Override
public void onLargeIconAvailable(Bitmap icon, int fallbackColor,
boolean isFallbackColorDefault, @IconType int iconType) {
if (icon == null)
updateTileIcon(imageViewId,
getTileIconFromColor(gurl, fallbackColor, isFallbackColorDefault));
else
updateTileIcon(imageViewId, getRoundedTileIconFromBitmap(icon));
}
};
LargeIconBridge largeIconBridge =
new LargeIconBridge(ProfileManager.getLastUsedRegularProfile());
LargeIconCallback callback =
new LargeIconCallback() {
@Override
public void onLargeIconAvailable(
Bitmap icon,
int fallbackColor,
boolean isFallbackColorDefault,
@IconType int iconType) {
if (icon == null)
updateTileIcon(
imageViewId,
getTileIconFromColor(
gurl, fallbackColor, isFallbackColorDefault));
else updateTileIcon(imageViewId, getRoundedTileIconFromBitmap(icon));
}
};
largeIconBridge.getLargeIconForUrl(gurl, DESIRED_ICON_SIZE, callback);
}