diff --git a/android/java/org/chromium/chrome/browser/BraveIntentHandler.java b/android/java/org/chromium/chrome/browser/BraveIntentHandler.java index 1594e6daefc..f003a23d321 100644 --- a/android/java/org/chromium/chrome/browser/BraveIntentHandler.java +++ b/android/java/org/chromium/chrome/browser/BraveIntentHandler.java @@ -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() { - @Override - public String call() { - return TemplateUrlServiceFactory - .getForProfile(ProfileManager.getLastUsedRegularProfile()) - .getUrlForSearchQuery(query); - } - }); + return ThreadUtils.runOnUiThreadBlocking( + new Callable() { + @Override + public String call() { + return TemplateUrlServiceFactory.getForProfile( + ProfileManager.getLastUsedRegularProfile()) + .getUrlForSearchQuery(query); + } + }); } catch (ExecutionException e) { Log.e(TAG, "Could not retrieve search query: " + e); } diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 1a9123709ba..118b39522fa 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -789,8 +789,11 @@ public abstract class BraveActivity extends ChromeActivity } if (isClearBrowsingDataOnExit()) { - List dataTypes = Arrays.asList( - BrowsingDataType.HISTORY, BrowsingDataType.SITE_DATA, BrowsingDataType.CACHE); + List 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)); } } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java index 96a70709781..b53bb10cb8a 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java @@ -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(); } diff --git a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java index 85168b5a02e..1c9e4fd1620 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java +++ b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java @@ -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; diff --git a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java index 305c63ecbf7..ea5bf1588ea 100644 --- a/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java +++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java @@ -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; + }); } } diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 54e2c72eff5..56ff9935bd6 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -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 diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java index cdc2aa7203b..6f382452563 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java @@ -199,19 +199,22 @@ public class BraveNtpAdapter extends RecyclerView.Adapter { - 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); diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java index d227962c1e9..5206486eb72 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -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; diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java index 23e9dd5eaa4..9126241f01d 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java +++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java @@ -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) { diff --git a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java index 4d0a5159dae..4d579ebde82 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java @@ -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); diff --git a/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java b/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java index 3d6778d522d..2011be98685 100644 --- a/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java +++ b/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java @@ -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); } diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index 3f904b73198..f2a0d6a8e0b 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -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( diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java index 2ee874e6477..85ce4bb7094 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsIPFSUtils.java @@ -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; diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index 648b020d169..d79dbefd007 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -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); } diff --git a/android/java/org/chromium/chrome/browser/rewards/adaptive_captcha/AdaptiveCaptchaHelper.java b/android/java/org/chromium/chrome/browser/rewards/adaptive_captcha/AdaptiveCaptchaHelper.java index ad7662c54e1..2487147eaeb 100644 --- a/android/java/org/chromium/chrome/browser/rewards/adaptive_captcha/AdaptiveCaptchaHelper.java +++ b/android/java/org/chromium/chrome/browser/rewards/adaptive_captcha/AdaptiveCaptchaHelper.java @@ -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); diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 5ab53f77319..57920b8158f 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -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)); } } } diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java index 15c51ec13a0..b316405f6f0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java @@ -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(); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 43868afdaa2..c62a6c1f163 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -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); diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java index 1bd033a20d7..a46ccfac147 100644 --- a/android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java @@ -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); diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java index 0efb5457229..c25913cf3ad 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java @@ -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); diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java index cc6e18b1565..0b53978c12e 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java @@ -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()); } } diff --git a/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java b/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java index 449a2ea4c63..363f703b345 100644 --- a/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java +++ b/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java @@ -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; } } diff --git a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java index 546b746ef7d..23a652473ab 100644 --- a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java +++ b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java @@ -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; diff --git a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java index 44ba735e7cf..4f3e3c30d6d 100644 --- a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java +++ b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java @@ -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"); diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java index 3f9f9386f8a..436ee996e47 100644 --- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java +++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java @@ -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()); } diff --git a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java index 87d82864a6f..efb3d5e226a 100644 --- a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java +++ b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java @@ -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); } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 67c0653495e..befbcc1d82b 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -850,20 +850,35 @@ public class BytecodeTest { OneshotSupplier.class, Supplier.class)); Assert.assertTrue( - constructorsMatch("org/chromium/chrome/browser/settings/SettingsLauncherImpl", + constructorsMatch( + "org/chromium/chrome/browser/settings/SettingsLauncherImpl", "org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl")); - Assert.assertTrue(constructorsMatch( - "org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator", - "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator", - Activity.class, ViewGroup.class, BrowserControlsStateProvider.class, - IncognitoStateProvider.class, ScrimCoordinator.class, ObservableSupplier.class, - BottomSheetController.class, ActivityLifecycleDispatcher.class, Supplier.class, - TabModelSelector.class, TabContentManager.class, ViewGroup.class, Supplier.class, - TabCreatorManager.class, OneshotSupplier.class, SnackbarManager.class)); - Assert.assertTrue(constructorsMatch( - "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate", - "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate", - Context.class, Profile.class)); + Assert.assertTrue( + constructorsMatch( + "org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator", + "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator", + Activity.class, + ViewGroup.class, + BrowserControlsStateProvider.class, + IncognitoStateProvider.class, + ScrimCoordinator.class, + ObservableSupplier.class, + BottomSheetController.class, + ActivityLifecycleDispatcher.class, + Supplier.class, + TabModelSelector.class, + TabContentManager.class, + ViewGroup.class, + Supplier.class, + TabCreatorManager.class, + OneshotSupplier.class, + SnackbarManager.class)); + Assert.assertTrue( + constructorsMatch( + "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate", + "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate", + Context.class, + Profile.class)); Assert.assertTrue( constructorsMatch( "org/chromium/components/browser_ui/notifications/NotificationManagerProxyImpl", diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java index cfcf88a1335..75c429cdde0 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java @@ -1,7 +1,7 @@ - /* Copyright (c) 2020 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) 2020 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.dialogs; diff --git a/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java b/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java index 3b551608da5..7a5f063fe55 100644 --- a/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java +++ b/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java @@ -4,7 +4,6 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.tasks.tab_groups; - import androidx.annotation.NonNull; import org.chromium.base.BravePreferenceKeys; @@ -16,13 +15,11 @@ import org.chromium.chrome.browser.tab.TabLaunchType; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelFilter; -/** - * Brave's super class for {@link TabGroupModelFilter} - */ +/** Brave's super class for {@link TabGroupModelFilter} */ public abstract class BraveTabGroupModelFilter extends TabModelFilter { /** - * This variable will be used instead of {@link - * TabGroupModelFilter}'s variable, that will be deleted in bytecode. + * This variable will be used instead of {@link TabGroupModelFilter}'s variable, that will be + * deleted in bytecode. */ protected boolean mIsResetting; @@ -45,9 +42,7 @@ public abstract class BraveTabGroupModelFilter extends TabModelFilter { TabGroupModelFilter.class, this, "shouldUseParentIds", Tab.class, tab); } - /** - * Determine if a launch type is the result of linked being clicked. - */ + /** Determine if a launch type is the result of linked being clicked. */ private boolean linkClicked(@TabLaunchType int type) { return type == TabLaunchType.FROM_LINK || type == TabLaunchType.FROM_LONGPRESS_FOREGROUND; } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java index 3fc59fe488e..c2b4a038eef 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java @@ -21,6 +21,8 @@ public class BraveTabGroupModelFilterClassAdapter extends BraveClassVisitor { deleteField(sTabGroupModelFilterClassName, "mIsResetting"); changeMethodOwner( - sTabGroupModelFilterClassName, "shouldUseParentIds", sBraveTabGroupModelFilterClassName); + sTabGroupModelFilterClassName, + "shouldUseParentIds", + sBraveTabGroupModelFilterClassName); } }