From cda1a14a7ce702b4b265e5b4a461a83039149250 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 16 May 2025 15:07:50 +0300 Subject: [PATCH] [cr138][Android] Fixed FieldCanBeFinal Prone checks This is an automated change, made by set `ERRORPRONE_CHECKS_TO_APPLY = ['FieldCanBeFinal']` at `src/build/android/gyp/errorprone.py` and run the build with --offline flag Chromium change: https://source.chromium.org/chromium/chromium/src/+/4f7d0b80759a7fd39de219f56984ec686d7aa257 Android: Enable Error Prone checks: FieldCanBeStatic, FieldCanBeFinal, FieldCanBeLocal Leaves FieldCanBeStatic off in tests, since it's arguably nicer to use non-statics in test classes for expected values. Bug: 40661145 Change-Id: I9fdbc6ebed5a6aa98f435dfeccb074715531be16 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6543826 --- .../BraveTabGroupUiCoordinator.java | 2 +- .../feed/BraveFeedSurfaceMediator.java | 2 +- .../chrome/browser/BraveRewardsHelper.java | 4 +-- .../browser/BraveRewardsNativeWorker.java | 4 +-- .../BraveRewardsOnboardingPagerAdapter.java | 4 +-- .../BraveRewardsUserWalletActivity.java | 2 +- .../browser/app/domain/CryptoModel.java | 4 +-- .../chrome/browser/app/domain/DappsModel.java | 6 ++-- .../browser/app/domain/KeyringModel.java | 2 +- .../browser/app/domain/WalletModel.java | 2 +- .../BraveTabbedAppMenuPropertiesDelegate.java | 4 +-- .../BraveAutofillBackgroundServiceImpl.java | 2 +- .../base/SplitCompatJobIntentService.java | 2 +- .../browser/billing/InAppPurchaseWrapper.java | 18 +++++------ .../chrome/browser/billing/PurchaseModel.java | 6 ++-- .../bookmarks/BraveBookmarkToolbar.java | 4 +-- .../BraveLeoVoiceRecognitionHandler.java | 6 ++-- .../BraveNewsConnectionErrorHandler.java | 2 +- .../browser/brave_news/BraveNewsUtils.java | 2 +- .../brave_news/CardBuilderFeedCard.java | 18 +++++------ .../BraveStatsBottomSheetDialogFragment.java | 2 +- .../layouts/BraveToolbarSwipeLayout.java | 2 +- .../adapters/CreateAccountAdapter.java | 2 +- .../adapters/NetworkSpinnerAdapter.java | 6 ++-- .../adapters/SignMessagePagerAdapter.java | 4 +-- .../TwoLineItemRecyclerViewAdapter.java | 2 +- .../fragments/TwoLineItemFragment.java | 2 +- .../fragments/dapps/DAppsMessageFragment.java | 2 +- .../crypto_wallet/modal/DAppsDialog.java | 2 +- .../model/WalletAccountCreationRequest.java | 2 +- .../BraveDappPermissionPromptDialog.java | 2 +- .../SolanaInstructionPresenter.java | 10 +++---- .../util/AccountsPermissionsHelper.java | 4 +-- .../crypto_wallet/util/AsyncUtils.java | 4 +-- .../util/SolanaTransactionsGasHelper.java | 4 +-- .../PopupWindowTooltip.java | 4 +-- ...uttonGroupDDnsResolveMethodPreference.java | 2 +- ...veMediaNotificationControllerDelegate.java | 2 +- ...veMediaNotificationControllerServices.java | 2 +- ...cAndroidMetricsConnectionErrorHandler.java | 2 +- .../BraveOnboardingNotification.java | 6 ++-- .../retention/RetentionNotification.java | 8 ++--- .../retention/RetentionNotificationUtil.java | 2 +- .../chrome/browser/ntp/BraveNewTabPage.java | 2 +- .../browser/ntp/BraveNewTabPageLayout.java | 10 +++---- .../chrome/browser/ntp/BraveNtpAdapter.java | 14 ++++----- .../ntp/SponsoredRichMediaWebView.java | 4 +-- .../NTPBackgroundImagesBridge.java | 2 +- .../model/BackgroundImage.java | 6 ++-- .../model/ImageCredit.java | 4 +-- .../model/SponsoredLogo.java | 8 ++--- .../model/SponsoredTab.java | 2 +- .../ntp_background_images/model/TopSite.java | 8 ++--- .../model/Wallpaper.java | 22 +++++++------- .../util/FetchWallpaperWorkerTask.java | 10 +++---- .../util/SponsoredImageUtil.java | 2 +- .../omnibox/BraveLocationBarLayout.java | 2 +- .../omnibox/BraveLocationBarMediator.java | 2 +- .../BraveAutocompleteMediator.java | 4 +-- .../v2/HighlightDialogFragment.java | 2 +- .../browser/onboarding/v2/HighlightItem.java | 8 ++--- .../browser/onboarding/v2/HighlightView.java | 4 +-- .../playlist/hls_content/HlsService.java | 2 +- .../playlist/hls_content/HlsServiceImpl.java | 2 +- .../BravePlaylistResetPreference.java | 4 +-- .../website/BraveShieldsContentSettings.java | 2 +- .../qrreader/BarcodeTrackerFactory.java | 2 +- .../chrome/browser/qrreader/CameraSource.java | 8 ++--- .../browser/qrreader/CameraSourcePreview.java | 4 +-- .../rate/BraveRateThanksFeedbackDialog.java | 2 +- .../browser/rate/RateFeedbackUtils.java | 6 ++-- .../browser/rewards/BraveRewardsPanel.java | 4 +-- .../rewards/onboarding/RewardsOnboarding.java | 2 +- .../tipping/MonthlyContributionToolTip.java | 2 +- .../tipping/RewardsTippingPanelFragment.java | 8 ++--- .../RewardsTippingSuccessContribution.java | 8 ++--- .../settings/NoGooglePlayServicesDialog.java | 2 +- .../settings/BraveSearchEnginePreference.java | 2 +- ...adioButtonGroupDefaultModelPreference.java | 2 +- .../BraveNewsPreferencesTypeAdapter.java | 14 ++++----- ...raveNewsSettingsDividerItemDecoration.java | 2 +- .../settings/BraveSettingsIntentUtil.java | 4 +-- .../settings/BraveStatsPreferences.java | 2 +- .../BraveWalletAutoLockPreferences.java | 2 +- .../settings/BraveWalletResetPreference.java | 2 +- ...alletResetTxHistoryAndNoncePreference.java | 2 +- .../settings/BraveWebrtcPolicyPreference.java | 2 +- ...tonGroupCustomHomepageThemePreference.java | 2 +- .../browser/shields/BraveShieldsHandler.java | 4 +-- .../shields/BraveShieldsScreenshotUtil.java | 2 +- .../browser/shields/BraveShieldsUtils.java | 6 ++-- .../shields/ContentFilteringAdapter.java | 4 +-- ...lletEthereumConnectedSitesListAdapter.java | 2 +- .../BraveTabbedRootUiCoordinator.java | 4 +-- .../browser/toolbar/BraveToolbarManager.java | 18 +++++------ .../bottom/BottomToolbarCoordinator.java | 16 +++++----- .../BraveBottomControlsCoordinator.java | 20 ++++++------- .../BraveMenuButtonCoordinator.java | 2 +- .../toolbar/top/BraveToolbarLayoutImpl.java | 2 +- .../top/BraveTopToolbarCoordinator.java | 8 ++--- .../chrome/browser/util/BraveReferrer.java | 6 ++-- .../browser/vpn/BraveVpnNativeWorker.java | 2 +- .../vpn/adapters/AlwaysOnPagerAdapter.java | 6 ++-- .../models/BraveVpnProfileCredentials.java | 6 ++-- .../BraveVpnWireguardProfileCredentials.java | 10 +++---- .../vpn/settings/VpnRegionPreference.java | 2 +- .../chrome/browser/vpn/timer/TimerUtils.java | 2 +- .../vpn/utils/BraveVpnProfileUtils.java | 2 +- .../browser/vpn/wireguard/TunnelModel.java | 2 +- .../vpn/wireguard/WireguardService.java | 2 +- .../vpn/wireguard/WireguardServiceImpl.java | 2 +- .../promo/SearchWidgetPromoPanel.java | 4 +-- .../dialogs/BraveAdsNotificationDialog.java | 6 ++-- .../browser/dialogs/BraveAdsSignupDialog.java | 4 +-- .../BraveAdsOnboardingFragment.java | 2 +- .../browser/hub/BraveHubManagerImpl.java | 6 ++-- .../settings/QuickSearchEnginesAdapter.java | 6 ++-- .../settings/QuickSearchEnginesModel.java | 8 ++--- .../views/QuickSearchEnginesViewAdapter.java | 4 +-- ...adioButtonGroupSafeBrowsingPreference.java | 2 +- .../BraveDropdownItemViewInfoListBuilder.java | 2 +- .../BraveLeoSuggestionProcessor.java | 2 +- .../bottom/BraveBottomControlsMediator.java | 8 ++--- .../org/brave/bytecode/BraveClassVisitor.java | 30 +++++++++---------- 124 files changed, 299 insertions(+), 299 deletions(-) diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java index 84dd5c83b4b..0f9d28ee79c 100644 --- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java +++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java @@ -38,7 +38,7 @@ public class BraveTabGroupUiCoordinator extends TabGroupUiCoordinator { private TabGroupUiToolbarView mToolbarView; // Own members. - private TabModelSelector mTabModelSelector; + private final TabModelSelector mTabModelSelector; public BraveTabGroupUiCoordinator( @NonNull Activity activity, diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java index 038945ddd46..45367f73b4a 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceMediator.java @@ -17,7 +17,7 @@ import org.chromium.ui.modelutil.PropertyModel; public class BraveFeedSurfaceMediator extends FeedSurfaceMediator { // Own members. - private Profile mProfile; + private final Profile mProfile; // To delete in bytecode, members from parent class will be used instead. private FeedSurfaceCoordinator mCoordinator; diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index 8ad98e47892..ba4c627261e 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -95,8 +95,8 @@ public class BraveRewardsHelper implements LargeIconBridge.LargeIconCallback { public static final int THANKYOU_FADE_IN_DURATION = 1500; //ms public static final int THANKYOU_STAY_DURATION = 2000; //ms private static final float DP_PER_INCH_MDPI = 160f; - private Tab mTab; - private Profile mProfile; + private final Tab mTab; + private final Profile mProfile; public static boolean isRewardsEnabled() { BraveRewardsNativeWorker worker = BraveRewardsNativeWorker.getInstance(); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index 67619a9deb5..491a4ac5f04 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -50,8 +50,8 @@ public class BraveRewardsNativeWorker { private String mFrontTabUrl; private static final Handler sHandler = new Handler(); - private List mObservers; - private List mFrontTabPublisherObservers; + private final List mObservers; + private final List mFrontTabPublisherObservers; private long mNativeBraveRewardsNativeWorker; private static BraveRewardsNativeWorker sInstance; diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java b/android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java index 919037a707e..e39757509d2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java @@ -31,8 +31,8 @@ public class BraveRewardsOnboardingPagerAdapter extends PagerAdapter { private static final String TAG = "RewardsOnboarding"; private boolean shouldShowMoreOptions; private TextView adsPerHourText; - private String countryCode = BraveRewardsNativeWorker.getInstance().getCountryCode(); - private List adsPerHourValues = Arrays.asList(0, 1, 2, 3, 4, 5, 10); + private final String countryCode = BraveRewardsNativeWorker.getInstance().getCountryCode(); + private final List adsPerHourValues = Arrays.asList(0, 1, 2, 3, 4, 5, 10); public void setOnboardingType(boolean shouldShowMoreOptions) { this.shouldShowMoreOptions = shouldShowMoreOptions; diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java index 935df6723c8..e7330fef4e0 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java @@ -30,7 +30,7 @@ public class BraveRewardsUserWalletActivity private static final String TAG = "BraveRewards"; public static final int UNDEFINED_WALLET_STATUS = -1; - private String mWalletType = BraveRewardsNativeWorker.getInstance().getExternalWalletType(); + private final String mWalletType = BraveRewardsNativeWorker.getInstance().getExternalWalletType(); @Override protected void triggerLayoutInflation() { diff --git a/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java b/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java index 08c42a91dc7..1596724649f 100644 --- a/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java +++ b/android/java/org/chromium/chrome/browser/app/domain/CryptoModel.java @@ -52,8 +52,8 @@ public class CryptoModel { private SolanaTxManagerProxy mSolanaTxManagerProxy; private BraveWalletService mBraveWalletService; private AssetRatioService mAssetRatioService; - private SwapService mSwapService; - private CryptoSharedActions mCryptoSharedActions; + private final SwapService mSwapService; + private final CryptoSharedActions mCryptoSharedActions; private final CryptoSharedData mSharedData; private final MutableLiveData _mCoinTypeMutableLiveData = new MutableLiveData<>(CoinType.ETH); diff --git a/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java b/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java index 33cfa094e24..55c21121fb5 100644 --- a/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java +++ b/android/java/org/chromium/chrome/browser/app/domain/DappsModel.java @@ -34,7 +34,7 @@ import java.util.List; public class DappsModel implements KeyringServiceObserver { private JsonRpcService mJsonRpcService; - private KeyringService mKeyringService; + private final KeyringService mKeyringService; private BraveWalletService mBraveWalletService; private PendingTxHelper mPendingTxHelper; private final MutableLiveData _mWalletIconNotificationVisible = @@ -44,8 +44,8 @@ public class DappsModel implements KeyringServiceObserver { new MutableLiveData<>(); private final MutableLiveData> _mSignSolTransactionsRequests; private final LiveData> mSignSolTransactionsRequests; - private List mPendingWalletAccountCreationRequests; - private MutableLiveData _mPendingWalletAccountCreationRequest; + private final List mPendingWalletAccountCreationRequests; + private final MutableLiveData _mPendingWalletAccountCreationRequest; public LiveData mPendingWalletAccountCreationRequest; public final LiveData mWalletIconNotificationVisible = _mWalletIconNotificationVisible; public final LiveData mProcessNextDAppsRequest = diff --git a/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java b/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java index 35c72c635aa..2a833d195a3 100644 --- a/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java +++ b/android/java/org/chromium/chrome/browser/app/domain/KeyringModel.java @@ -49,7 +49,7 @@ public class KeyringModel implements KeyringServiceObserver { private final MutableLiveData _mSelectedAccount; private final MutableLiveData _mAllAccountsInfo; private final MutableLiveData> _mAccountInfos; - private CryptoSharedActions mCryptoSharedActions; + private final CryptoSharedActions mCryptoSharedActions; public LiveData> mAccountInfos; public LiveData mSelectedAccount; public LiveData mAllAccountsInfo; diff --git a/android/java/org/chromium/chrome/browser/app/domain/WalletModel.java b/android/java/org/chromium/chrome/browser/app/domain/WalletModel.java index 6b663df0502..41df22fb79e 100644 --- a/android/java/org/chromium/chrome/browser/app/domain/WalletModel.java +++ b/android/java/org/chromium/chrome/browser/app/domain/WalletModel.java @@ -36,7 +36,7 @@ public class WalletModel { @NonNull private final DappsModel mDappsModel; private final KeyringModel mKeyringModel; private Context mContext; - private CryptoActions mCryptoActions; + private final CryptoActions mCryptoActions; public WalletModel(Context context, KeyringService keyringService, BlockchainRegistry blockchainRegistry, JsonRpcService jsonRpcService, diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 4fb10b7d156..a34b619c892 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -70,8 +70,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager; @NullMarked public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate { private @MonotonicNonNull Menu mMenu; - private AppMenuDelegate mAppMenuDelegate; - private ObservableSupplier mBookmarkModelSupplier; + private final AppMenuDelegate mAppMenuDelegate; + private final ObservableSupplier mBookmarkModelSupplier; public BraveTabbedAppMenuPropertiesDelegate( Context context, diff --git a/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java b/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java index 3dc9bbdf40d..e3e4e62038e 100644 --- a/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java +++ b/android/java/org/chromium/chrome/browser/autofill/BraveAutofillBackgroundServiceImpl.java @@ -45,7 +45,7 @@ import java.util.Map; public class BraveAutofillBackgroundServiceImpl extends ChromeBackgroundServiceImpl { - private String mPackageName = ContextUtils.getApplicationContext().getPackageName(); + private final String mPackageName = ContextUtils.getApplicationContext().getPackageName(); private FillRequest mFillRequest; private FillCallback mFillCallback; private SaveRequest mSaveRequest; diff --git a/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java b/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java index 986f100505a..9a5ed26481e 100644 --- a/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java +++ b/android/java/org/chromium/chrome/browser/base/SplitCompatJobIntentService.java @@ -17,7 +17,7 @@ import org.chromium.base.BundleUtils; * present in the base module, while the Impl can be in the chrome module. */ public class SplitCompatJobIntentService extends JobIntentService { - private String mServiceClassName; + private final String mServiceClassName; private String mSplitName; private Impl mImpl; diff --git a/android/java/org/chromium/chrome/browser/billing/InAppPurchaseWrapper.java b/android/java/org/chromium/chrome/browser/billing/InAppPurchaseWrapper.java index 423c2ba9220..49120f45775 100644 --- a/android/java/org/chromium/chrome/browser/billing/InAppPurchaseWrapper.java +++ b/android/java/org/chromium/chrome/browser/billing/InAppPurchaseWrapper.java @@ -68,7 +68,7 @@ public class InAppPurchaseWrapper { 1000000; // 1,000,000 micro-units equal one unit of the currency private static volatile InAppPurchaseWrapper sInAppPurchaseWrapper; - private static Object sMutex = new Object(); + private static final Object sMutex = new Object(); public enum SubscriptionType { MONTHLY, @@ -80,12 +80,12 @@ public class InAppPurchaseWrapper { LEO } - private MutableLiveData mMutableMonthlyProductDetailsVPN = + private final MutableLiveData mMutableMonthlyProductDetailsVPN = new MutableLiveData(); - private LiveData mMonthlyProductDetailsVPN = mMutableMonthlyProductDetailsVPN; - private MutableLiveData mMutableMonthlyProductDetailsLeo = + private final LiveData mMonthlyProductDetailsVPN = mMutableMonthlyProductDetailsVPN; + private final MutableLiveData mMutableMonthlyProductDetailsLeo = new MutableLiveData(); - private LiveData mMonthlyProductDetailsLeo = mMutableMonthlyProductDetailsLeo; + private final LiveData mMonthlyProductDetailsLeo = mMutableMonthlyProductDetailsLeo; private void setMonthlyProductDetails( ProductDetails productDetails, SubscriptionProduct product) { @@ -104,10 +104,10 @@ public class InAppPurchaseWrapper { return mMonthlyProductDetailsVPN; } - private MutableLiveData mMutableYearlyProductDetailsVPN = new MutableLiveData(); - private LiveData mYearlyProductDetailsVPN = mMutableYearlyProductDetailsVPN; - private MutableLiveData mMutableYearlyProductDetailsLeo = new MutableLiveData(); - private LiveData mYearlyProductDetailsLeo = mMutableYearlyProductDetailsLeo; + private final MutableLiveData mMutableYearlyProductDetailsVPN = new MutableLiveData(); + private final LiveData mYearlyProductDetailsVPN = mMutableYearlyProductDetailsVPN; + private final MutableLiveData mMutableYearlyProductDetailsLeo = new MutableLiveData(); + private final LiveData mYearlyProductDetailsLeo = mMutableYearlyProductDetailsLeo; private void setYearlyProductDetails( ProductDetails productDetails, SubscriptionProduct product) { diff --git a/android/java/org/chromium/chrome/browser/billing/PurchaseModel.java b/android/java/org/chromium/chrome/browser/billing/PurchaseModel.java index ff17690f8d8..2080f11d3d5 100644 --- a/android/java/org/chromium/chrome/browser/billing/PurchaseModel.java +++ b/android/java/org/chromium/chrome/browser/billing/PurchaseModel.java @@ -8,9 +8,9 @@ package org.chromium.chrome.browser.billing; import com.android.billingclient.api.Purchase; public class PurchaseModel { - private String mPurchaseToken; - private String mProductId; - private Purchase mPurchase; + private final String mPurchaseToken; + private final String mProductId; + private final Purchase mPurchase; public PurchaseModel(String purchaseToken, String productId, Purchase purchase) { this.mPurchaseToken = purchaseToken; diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java index d78cf676197..b7396e6a95b 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbar.java @@ -13,8 +13,8 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.R; public class BraveBookmarkToolbar extends BookmarkToolbar { - private int MENU_IMPORT_ID = 100; - private int MENU_EXPORT_ID = 101; + private final int MENU_IMPORT_ID = 100; + private final int MENU_EXPORT_ID = 101; private BraveBookmarkDelegate mBraveBookmarkDelegate; diff --git a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoVoiceRecognitionHandler.java b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoVoiceRecognitionHandler.java index 727d47eaca4..03e94350eb5 100644 --- a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoVoiceRecognitionHandler.java +++ b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoVoiceRecognitionHandler.java @@ -24,9 +24,9 @@ import java.util.List; public class BraveLeoVoiceRecognitionHandler { private static final String TAG = "LeoVoiceRecognition"; - private WindowAndroid mWindowAndroid; - private WebContents mContextWebContents; - private String mConversationUuid; + private final WindowAndroid mWindowAndroid; + private final WebContents mContextWebContents; + private final String mConversationUuid; /** Callback for when we receive voice search results after initiating voice recognition. */ class VoiceRecognitionCompleteCallback implements WindowAndroid.IntentCallback { diff --git a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsConnectionErrorHandler.java b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsConnectionErrorHandler.java index 37fb0afc36d..8e4b069bcc5 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsConnectionErrorHandler.java +++ b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsConnectionErrorHandler.java @@ -17,7 +17,7 @@ public class BraveNewsConnectionErrorHandler implements ConnectionErrorHandler { default void cleanUpBraveNewsController() {} } - private BraveNewsConnectionErrorHandlerDelegate mDelegate; + private final BraveNewsConnectionErrorHandlerDelegate mDelegate; public BraveNewsConnectionErrorHandler(BraveNewsConnectionErrorHandlerDelegate delegate) { assert delegate != null : "delegate has to be initialized"; diff --git a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java index a9cd61a19d5..6a137999ae5 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java +++ b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java @@ -53,7 +53,7 @@ public class BraveNewsUtils { private static @Nullable List sFollowingChannelList; private static @Nullable List sFollowingPublisherList; private static @Nullable List sSuggestionsList; - private static HashMap sChannelIcons = new HashMap<>(); + private static final HashMap sChannelIcons = new HashMap<>(); public static String getPromotionIdItem(FeedItemsCard items) { String creativeInstanceId = "null"; diff --git a/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java b/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java index 4fbd92cb00e..634f4e2c358 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java +++ b/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java @@ -90,18 +90,18 @@ public class CardBuilderFeedCard { public static final int CARDTYPE_BRAVE_RATING = 100; - private LinearLayout mLinearLayout; - private Activity mActivity; - private FeedItemsCard mNewsItem; - private BraveNewsController mBraveNewsController; - private int mType; - private int mPosition; - private int mHorizontalMargin; - private int mDeviceWidth; + private final LinearLayout mLinearLayout; + private final Activity mActivity; + private final FeedItemsCard mNewsItem; + private final BraveNewsController mBraveNewsController; + private final int mType; + private final int mPosition; + private final int mHorizontalMargin; + private final int mDeviceWidth; private boolean mIsPromo; private String mCreativeInstanceId; private String mOffersCategory; - private RequestManager mGlide; + private final RequestManager mGlide; private static final String TAG = "BN"; private static final int MARGIN_VERTICAL = 10; diff --git a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java index aa5dcc19b33..8be48ad9693 100644 --- a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java @@ -46,7 +46,7 @@ import java.util.List; public class BraveStatsBottomSheetDialogFragment extends BottomSheetDialogFragment { public static final String TAG_FRAGMENT = "BRAVESTATS_FRAG"; - private DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); + private final DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); private static final int WEBSITES = 0; private static final int TRACKERS = 1; diff --git a/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java b/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java index 0e2321ab68e..cc34911fca7 100644 --- a/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java +++ b/android/java/org/chromium/chrome/browser/compositor/layouts/BraveToolbarSwipeLayout.java @@ -20,7 +20,7 @@ public class BraveToolbarSwipeLayout extends ToolbarSwipeLayout { * parent class will be used instead. */ @SuppressWarnings("UnusedVariable") - private boolean mMoveToolbar; + private final boolean mMoveToolbar; public BraveToolbarSwipeLayout( Context context, diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/CreateAccountAdapter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/CreateAccountAdapter.java index 625bf240c99..dde94744373 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/CreateAccountAdapter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/CreateAccountAdapter.java @@ -23,7 +23,7 @@ import java.util.List; public class CreateAccountAdapter extends RecyclerView.Adapter { private final LayoutInflater inflater; private OnCreateAccountClickListener mCreateAccountClickListener; - private List mCryptoAccountTypeInfos; + private final List mCryptoAccountTypeInfos; public CreateAccountAdapter( Context context, List cryptoAccountTypeInfos) { diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/NetworkSpinnerAdapter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/NetworkSpinnerAdapter.java index ea6409b7726..ee141ef1f4c 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/NetworkSpinnerAdapter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/NetworkSpinnerAdapter.java @@ -26,10 +26,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; public class NetworkSpinnerAdapter extends BaseAdapter implements SpinnerAdapter { - private LayoutInflater mInflater; + private final LayoutInflater mInflater; private List mNetworkInfoList; - private ExecutorService mExecutor; - private Handler mHandler; + private final ExecutorService mExecutor; + private final Handler mHandler; public NetworkSpinnerAdapter(Context context, List networkInfoList) { mInflater = LayoutInflater.from(context); diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/SignMessagePagerAdapter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/SignMessagePagerAdapter.java index ada59bc4b0c..94c1ce643ed 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/SignMessagePagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/SignMessagePagerAdapter.java @@ -15,8 +15,8 @@ import org.chromium.chrome.browser.crypto_wallet.fragments.dapps.DAppsMessageFra import java.util.List; public class SignMessagePagerAdapter extends FragmentStateAdapter { - private List mTabTitles; - private SignMessageRequest mCurrentSignMessageRequest; + private final List mTabTitles; + private final SignMessageRequest mCurrentSignMessageRequest; public SignMessagePagerAdapter( Fragment fragment, diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/TwoLineItemRecyclerViewAdapter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/TwoLineItemRecyclerViewAdapter.java index 353eb79309c..81c155050d6 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/TwoLineItemRecyclerViewAdapter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/adapters/TwoLineItemRecyclerViewAdapter.java @@ -31,7 +31,7 @@ public class TwoLineItemRecyclerViewAdapter extends RecyclerView.Adapter mValues; private final ExecutorService mExecutor; private final Handler mHandler; - private AdapterViewOrientation mItemViewOrientation; + private final AdapterViewOrientation mItemViewOrientation; private LayoutInflater mLayoutInflater; public int mSubTextAlignment; public int mDividerMargin; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemFragment.java index 7ed97aa0708..f515a0fa532 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemFragment.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemFragment.java @@ -26,7 +26,7 @@ import java.util.List; * sub-title. */ public class TwoLineItemFragment extends Fragment { - private List items; + private final List items; private TwoLineItemRecyclerViewAdapter adapter; public TwoLineItemFragment(List items) { diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/DAppsMessageFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/DAppsMessageFragment.java index 5567d4ffd58..f8d7a977491 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/DAppsMessageFragment.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/DAppsMessageFragment.java @@ -24,7 +24,7 @@ import org.chromium.chrome.browser.crypto_wallet.util.Validations; /** Fragment to show DApps-related messages */ public class DAppsMessageFragment extends BaseDAppsFragment { private static final String TAG = "DAppsMessageFragment"; - private SignMessageRequest mCurrentSignMessageRequest; + private final SignMessageRequest mCurrentSignMessageRequest; private boolean mUnicodeEscapeVersion; private TextView mSignMessageText; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/modal/DAppsDialog.java b/android/java/org/chromium/chrome/browser/crypto_wallet/modal/DAppsDialog.java index 54c0e48cb50..a7061011ee5 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/modal/DAppsDialog.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/modal/DAppsDialog.java @@ -41,7 +41,7 @@ public class DAppsDialog extends Dialog implements ConnectionErrorHandler { private View mRootView; private boolean mShowOnboarding; private KeyringService mKeyringService; - private DialogInterface.OnDismissListener mOnDismissListener; + private final DialogInterface.OnDismissListener mOnDismissListener; private boolean mDismissed; private final Handler mHandler; @DAppsDialogStyle private final int mStyle; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/model/WalletAccountCreationRequest.java b/android/java/org/chromium/chrome/browser/crypto_wallet/model/WalletAccountCreationRequest.java index 33638a10699..7bed2424b8b 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/model/WalletAccountCreationRequest.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/model/WalletAccountCreationRequest.java @@ -8,7 +8,7 @@ package org.chromium.chrome.browser.crypto_wallet.model; import org.chromium.brave_wallet.mojom.CoinType; public class WalletAccountCreationRequest { - private @CoinType.EnumType int mCoinType; + private final @CoinType.EnumType int mCoinType; public WalletAccountCreationRequest(@CoinType.EnumType int coinType) { mCoinType = coinType; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java b/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java index 13556a6474a..5a3ae0c1025 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java @@ -64,7 +64,7 @@ public class BraveDappPermissionPromptDialog private final Window mWindow; private long mNativeDialogController; private PropertyModel mPropertyModel; - private String mFavIconURL; + private final String mFavIconURL; private MaterialCardView mCvFavContainer; private ImageView mFavIconImage; private RecyclerView mRecyclerView; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/SolanaInstructionPresenter.java b/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/SolanaInstructionPresenter.java index b4cafcf030b..e3f05118c01 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/SolanaInstructionPresenter.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/SolanaInstructionPresenter.java @@ -31,7 +31,7 @@ public class SolanaInstructionPresenter { public List mAccountDatas; public boolean mIsUnknown; private boolean isDecodedDataPresent; - private SolanaInstruction mSolanaInstruction; + private final SolanaInstruction mSolanaInstruction; private Integer mInstructionType; private String mFromPubKey; private String mToPubKey; @@ -292,12 +292,12 @@ public class SolanaInstructionPresenter { } private static class SolanaInstructionAccountPresenter { - private String mPubKey; - private SolanaAccountMeta mSolanaAccountMeta; - private String mLocalizeAccountHeader; + private final String mPubKey; + private final SolanaAccountMeta mSolanaAccountMeta; + private final String mLocalizeAccountHeader; @SuppressWarnings("UnusedVariable") - private String mAccountHeader; + private final String mAccountHeader; private SolanaInstructionAccountPresenter( String pubKey, diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AccountsPermissionsHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AccountsPermissionsHelper.java index 12b1c8093e5..3e9bf6a82f9 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AccountsPermissionsHelper.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AccountsPermissionsHelper.java @@ -14,8 +14,8 @@ import java.util.HashSet; import java.util.stream.Collectors; public class AccountsPermissionsHelper { - private BraveWalletService mBraveWalletService; - private AccountInfo[] mAccounts; + private final BraveWalletService mBraveWalletService; + private final AccountInfo[] mAccounts; private HashSet mAccountsWithPermissions; public AccountsPermissionsHelper( diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AsyncUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AsyncUtils.java index 0345a63fbaa..3d48f93aa85 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/AsyncUtils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/AsyncUtils.java @@ -30,7 +30,7 @@ public class AsyncUtils { // Helper to track multiple wallet services responses public static class MultiResponseHandler { private Runnable mWhenAllCompletedRunnable; - private int mTotalElements; + private final int mTotalElements; private int mCurrentElements; private final Object mLock = new Object(); @@ -70,7 +70,7 @@ public class AsyncUtils { } public static class SingleResponseBaseContext { - private Runnable mResponseCompleteCallback; + private final Runnable mResponseCompleteCallback; public SingleResponseBaseContext(Runnable responseCompleteCallback) { mResponseCompleteCallback = responseCompleteCallback; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/SolanaTransactionsGasHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/SolanaTransactionsGasHelper.java index 748978e23d0..b9bda28b5d2 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/SolanaTransactionsGasHelper.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/SolanaTransactionsGasHelper.java @@ -16,8 +16,8 @@ import java.util.HashMap; public class SolanaTransactionsGasHelper { private final WeakReference mActivity; - private TransactionInfo[] mTransactionInfos; - private HashMap mPerTxFee; + private final TransactionInfo[] mTransactionInfos; + private final HashMap mPerTxFee; public SolanaTransactionsGasHelper( BraveWalletBaseActivity activity, TransactionInfo[] transactionInfos) { diff --git a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java index 553683ccb95..ef15886a10d 100644 --- a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java +++ b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java @@ -73,8 +73,8 @@ public class PopupWindowTooltip implements PopupWindow.OnDismissListener { private final int mParentPaddingHorizontal; private final int mParentPaddingVertical; private boolean dismissed; - private int width; - private int height; + private final int width; + private final int height; private PopupWindowTooltip(Builder builder) { mContext = builder.context; diff --git a/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupDDnsResolveMethodPreference.java b/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupDDnsResolveMethodPreference.java index 09d84931594..0be2244ca29 100644 --- a/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupDDnsResolveMethodPreference.java +++ b/android/java/org/chromium/chrome/browser/decentralized_dns/settings/RadioButtonGroupDDnsResolveMethodPreference.java @@ -27,7 +27,7 @@ public class RadioButtonGroupDDnsResolveMethodPreference private @ResolveMethodTypes int mSetting; private RadioButtonWithDescription mSettingRadioButton; private RadioButtonWithDescriptionLayout mGroup; - private ArrayList mButtons; + private final ArrayList mButtons; public RadioButtonGroupDDnsResolveMethodPreference(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerDelegate.java b/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerDelegate.java index ad084c3b32c..c777d068323 100644 --- a/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerDelegate.java +++ b/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerDelegate.java @@ -56,7 +56,7 @@ public class BraveMediaNotificationControllerDelegate super.onDestroy(); } - private BroadcastReceiver mAudioBecomingNoisyReceiver = + private final BroadcastReceiver mAudioBecomingNoisyReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerServices.java b/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerServices.java index 476acb42cc3..de25a34f9f3 100644 --- a/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerServices.java +++ b/android/java/org/chromium/chrome/browser/media/ui/BraveMediaNotificationControllerServices.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.base.SplitCompatService; public class BraveMediaNotificationControllerServices { public static class PlaybackListenerMicService extends SplitCompatService { - private static @IdentifierNameString String sImplClassName = + private static final @IdentifierNameString String sImplClassName = "org.chromium.chrome.browser.media.ui." + "BraveMediaNotificationControllerDelegate$PlaybackListenerMicServiceImpl"; diff --git a/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsConnectionErrorHandler.java b/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsConnectionErrorHandler.java index 2e182b38b55..9f94c87ba9f 100644 --- a/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsConnectionErrorHandler.java +++ b/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsConnectionErrorHandler.java @@ -21,7 +21,7 @@ public class MiscAndroidMetricsConnectionErrorHandler implements ConnectionError default void cleanUpMiscAndroidMetrics() {} } - private MiscAndroidMetricsConnectionErrorHandlerDelegate mDelegate; + private final MiscAndroidMetricsConnectionErrorHandlerDelegate mDelegate; public MiscAndroidMetricsConnectionErrorHandler( MiscAndroidMetricsConnectionErrorHandlerDelegate delegate) { diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java b/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java index bcd23e3c2cd..3ac6a2774d9 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java @@ -34,9 +34,9 @@ public class BraveOnboardingNotification extends BroadcastReceiver { private static final int BRAVE_ONBOARDING_NOTIFICATION_ID = -2; public static String BRAVE_ONBOARDING_NOTIFICATION_TAG = "brave_onboarding_notification_tag"; - private static String BRAVE_ONBOARDING_ORIGIN_EN = "https://brave.com/my-first-ad/"; - private static String BRAVE_ONBOARDING_ORIGIN_DE = "https://brave.com/de/my-first-ad/"; - private static String BRAVE_ONBOARDING_ORIGIN_FR = "https://brave.com/fr/my-first-ad/"; + private static final String BRAVE_ONBOARDING_ORIGIN_EN = "https://brave.com/my-first-ad/"; + private static final String BRAVE_ONBOARDING_ORIGIN_DE = "https://brave.com/de/my-first-ad/"; + private static final String BRAVE_ONBOARDING_ORIGIN_FR = "https://brave.com/fr/my-first-ad/"; public static final String DEEP_LINK = "deep_link"; public static final String USE_CUSTOM_NOTIFICATION = "use_custom_notification"; diff --git a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java index 2780c217246..b17e18e3b71 100644 --- a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java +++ b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java @@ -7,10 +7,10 @@ package org.chromium.chrome.browser.notifications.retention; public class RetentionNotification { - private int notificationId; - private int notificationTime; // In minutes - private String channelId; - private String notificationTitle; + private final int notificationId; + private final int notificationTime; // In minutes + private final String channelId; + private final String notificationTitle; public RetentionNotification(int notificationId, int notificationTime, String channelId, String notificationTitle) { this.notificationId = notificationId; diff --git a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java index 0e59e2717ca..89bf3088f03 100644 --- a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java +++ b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java @@ -42,7 +42,7 @@ public class RetentionNotificationUtil { public static final String DORMANT_USERS_DAY_25 = "dormant_users_days_25"; public static final String DORMANT_USERS_DAY_40 = "dormant_users_days_40"; - private static Map sNotificationMap = + private static final Map sNotificationMap = Map.ofEntries( Map.entry( HOUR_3, diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index 77fda68020b..b5428f0f8a3 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -42,7 +42,7 @@ import org.chromium.ui.base.WindowAndroid; @NullUnmarked // Waiting for upstream parent class to be NullMarked public class BraveNewTabPage extends NewTabPage { - private JankTracker mJankTracker; + private final JankTracker mJankTracker; // To delete in bytecode, members from parent class will be used instead. private BrowserControlsStateProvider mBrowserControlsStateProvider; diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 081392802b4..374cf12db6e 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -153,7 +153,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout private boolean mIsFromBottomSheet; private NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; private ViewGroup mMainLayout; - private DatabaseHelper mDatabaseHelper; + private final DatabaseHelper mDatabaseHelper; private LottieAnimationView mBadgeAnimationView; @@ -311,7 +311,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout // Double tap on the settings bar to scroll back up mNewsSettingsBar.setOnTouchListener(new OnTouchListener() { - private GestureDetector mGestureDetector = + private final GestureDetector mGestureDetector = new GestureDetector(mActivity, new GestureDetector.SimpleOnGestureListener() { @Override public boolean onDoubleTap(MotionEvent e) { @@ -1333,7 +1333,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout if (shouldShowSuperReferral()) mNTPBackgroundImagesBridge.getTopSites(); } - private NewTabPageListener mNewTabPageListener = + private final NewTabPageListener mNewTabPageListener = new NewTabPageListener() { @Override public void updateInteractableFlag(boolean isBottomSheet) { @@ -1369,7 +1369,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout } }; - private NTPBackgroundImagesBridge.NTPBackgroundImageServiceObserver + private final NTPBackgroundImagesBridge.NTPBackgroundImageServiceObserver mNTPBackgroundImageServiceObserver = new NTPBackgroundImagesBridge.NTPBackgroundImageServiceObserver() { @Override @@ -1383,7 +1383,7 @@ public class BraveNewTabPageLayout extends NewTabPageLayout } }; - private FetchWallpaperWorkerTask.WallpaperRetrievedCallback mWallpaperRetrievedCallback = + private final FetchWallpaperWorkerTask.WallpaperRetrievedCallback mWallpaperRetrievedCallback = new FetchWallpaperWorkerTask.WallpaperRetrievedCallback() { @Override public void bgWallpaperRetrieved(Bitmap bgWallpaper) { diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java index a6b916739cd..6c5832b42c7 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java @@ -61,17 +61,17 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; public class BraveNtpAdapter extends RecyclerView.Adapter { - private Activity mActivity; - private RequestManager mGlide; + private final Activity mActivity; + private final RequestManager mGlide; private BraveNewsController mBraveNewsController; - private View mMvTilesContainerLayout; - private CopyOnWriteArrayList mNewsItems; + private final View mMvTilesContainerLayout; + private final CopyOnWriteArrayList mNewsItems; private NTPImage mNtpImage; - private SponsoredTab mSponsoredTab; + private final SponsoredTab mSponsoredTab; private Bitmap mSponsoredLogo; private Wallpaper mWallpaper; - private NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; - private OnBraveNtpListener mOnBraveNtpListener; + private final NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; + private final OnBraveNtpListener mOnBraveNtpListener; private boolean mIsDisplayNewsFeed; private boolean mIsDisplayNewsOptin; private boolean mIsNewsLoading; diff --git a/android/java/org/chromium/chrome/browser/ntp/SponsoredRichMediaWebView.java b/android/java/org/chromium/chrome/browser/ntp/SponsoredRichMediaWebView.java index 504af482f27..6f0857cfab0 100644 --- a/android/java/org/chromium/chrome/browser/ntp/SponsoredRichMediaWebView.java +++ b/android/java/org/chromium/chrome/browser/ntp/SponsoredRichMediaWebView.java @@ -26,8 +26,8 @@ import org.chromium.ui.base.WindowAndroid; public class SponsoredRichMediaWebView { private static final String NEW_TAB_TAKEOVER_URL = "chrome://new-tab-takeover"; - private WebContents mWebContents; - private ThinWebView mWebView; + private final WebContents mWebContents; + private final ThinWebView mWebView; public SponsoredRichMediaWebView( Activity activity, WindowAndroid windowAndroid, Profile profile) { diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java b/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java index ce7c624a0a8..71cd5104468 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java @@ -28,7 +28,7 @@ public class NTPBackgroundImagesBridge { private long mNativeNTPBackgroundImagesBridge; private final ObserverList mObservers = new ObserverList(); - private static List mTopSites = new ArrayList<>(); + private static final List mTopSites = new ArrayList<>(); private static NewTabPageListener mNewTabPageListener; public abstract static class NTPBackgroundImageServiceObserver { diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/BackgroundImage.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/BackgroundImage.java index ba7c2479cfd..f427d88176c 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/BackgroundImage.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/BackgroundImage.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.ntp_background_images.model; public class BackgroundImage extends NTPImage{ - private int imageDrawable; - private int centerPointX; - private int centerPointY; + private final int imageDrawable; + private final int centerPointX; + private final int centerPointY; private String imagePath; private ImageCredit imageCredit; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/ImageCredit.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/ImageCredit.java index e8f85ac907b..4eb1f903a5f 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/ImageCredit.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/ImageCredit.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.ntp_background_images.model; public class ImageCredit { - private String name; - private String url; + private final String name; + private final String url; public ImageCredit(String name, String url) { this.name = name; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredLogo.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredLogo.java index b6b24af7aaf..70851ec4d24 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredLogo.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredLogo.java @@ -6,10 +6,10 @@ package org.chromium.chrome.browser.ntp_background_images.model; public class SponsoredLogo { - private String imageUrl; - private String alt; - private String companyName; - private String destinationUrl; + private final String imageUrl; + private final String alt; + private final String companyName; + private final String destinationUrl; public SponsoredLogo(String imageUrl, String alt, String companyName, String destinationUrl) { this.imageUrl = imageUrl; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredTab.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredTab.java index d80b0f99b18..fffa98d66b2 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredTab.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/SponsoredTab.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.ntp_background_images.util.NTPImageUtil; import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil; public class SponsoredTab { - private NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; + private final NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; private NTPImage mNtpImage; private int mTabIndex; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/TopSite.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/TopSite.java index fc384ab464e..f78d0ddb0a7 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/TopSite.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/TopSite.java @@ -6,10 +6,10 @@ package org.chromium.chrome.browser.ntp_background_images.model; public class TopSite { - private String mName; - private String mDestinationUrl; - private String mBackgroundColor; - private String mImagePath; + private final String mName; + private final String mDestinationUrl; + private final String mBackgroundColor; + private final String mImagePath; public TopSite(String name, String destinationUrl, String backgroundColor, String imagePath) { mName = name; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/model/Wallpaper.java b/android/java/org/chromium/chrome/browser/ntp_background_images/model/Wallpaper.java index 1a5ec844657..e039cc51d7a 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/model/Wallpaper.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/model/Wallpaper.java @@ -6,17 +6,17 @@ package org.chromium.chrome.browser.ntp_background_images.model; public class Wallpaper extends NTPImage { - private String mImagePath; - private int mFocalPointX; - private int mFocalPointY; - private String mLogoPath; - private String mLogoDestinationUrl; - private String mThemeName; - private boolean mIsSponsored; - private String mCreativeInstanceId; - private String mWallpaperId; - private boolean mIsRichMedia; - private boolean mShouldMetricsFallbackToP3a; + private final String mImagePath; + private final int mFocalPointX; + private final int mFocalPointY; + private final String mLogoPath; + private final String mLogoDestinationUrl; + private final String mThemeName; + private final boolean mIsSponsored; + private final String mCreativeInstanceId; + private final String mWallpaperId; + private final boolean mIsRichMedia; + private final boolean mShouldMetricsFallbackToP3a; public Wallpaper( String imagePath, diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/util/FetchWallpaperWorkerTask.java b/android/java/org/chromium/chrome/browser/ntp_background_images/util/FetchWallpaperWorkerTask.java index 0e814cca3a3..fa019b4742b 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/util/FetchWallpaperWorkerTask.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/util/FetchWallpaperWorkerTask.java @@ -28,13 +28,13 @@ public class FetchWallpaperWorkerTask extends AsyncTask> { void logoRetrieved(Wallpaper wallpaper, Bitmap logoWallpaper); } - private Context mContext; - private NTPImage mNTPImage; - private int mLayoutWidth; - private int mLayoutHeight; + private final Context mContext; + private final NTPImage mNTPImage; + private final int mLayoutWidth; + private final int mLayoutHeight; // The callback to use to communicate the results. - private WallpaperRetrievedCallback mCallback; + private final WallpaperRetrievedCallback mCallback; public FetchWallpaperWorkerTask(NTPImage ntpImage, int layoutWidth, int layoutHeight,WallpaperRetrievedCallback callback) { mNTPImage = ntpImage; diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/util/SponsoredImageUtil.java b/android/java/org/chromium/chrome/browser/ntp_background_images/util/SponsoredImageUtil.java index 7e30933708c..366f19f7f33 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/util/SponsoredImageUtil.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/util/SponsoredImageUtil.java @@ -26,7 +26,7 @@ public class SponsoredImageUtil { public static final int MAX_TABS = 10; - private static List backgroundImages = new ArrayList( + private static final List backgroundImages = new ArrayList( Arrays.asList(new BackgroundImage(R.drawable.dylan_malval_sea_min, 1300, 720, new ImageCredit("Dylan Malval", "https://www.instagram.com/vass_captures/")))); diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarLayout.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarLayout.java index e3c5ab8b4d3..86ddd4e5982 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarLayout.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarLayout.java @@ -15,7 +15,7 @@ import androidx.core.widget.ImageViewCompat; import org.chromium.chrome.browser.omnibox.status.StatusView; public class BraveLocationBarLayout extends LocationBarLayout { - private ImageButton mQRButton; + private final ImageButton mQRButton; public BraveLocationBarLayout(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java index 08331e938ff..d4c74b35980 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java @@ -41,7 +41,7 @@ public class BraveLocationBarMediator extends LocationBarMediator { private boolean mNativeInitialized; private boolean mIsLocationBarFocusedFromNtpScroll; private Context mContext; - private @BrandedColorScheme int mBrandedColorScheme = BrandedColorScheme.APP_DEFAULT; + private final @BrandedColorScheme int mBrandedColorScheme = BrandedColorScheme.APP_DEFAULT; private OneshotSupplier mTemplateUrlServiceSupplier; public BraveLocationBarMediator( 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 2364ea0b0b7..e76d479e70a 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -42,8 +42,8 @@ class BraveAutocompleteMediator extends AutocompleteMediator private static final String AUTOCOMPLETE_ENABLED = "brave.autocomplete_enabled"; private static final String LEO_START_WORD_UPPER_CASE = "LEO"; - private AutocompleteDelegate mDelegate; - private Supplier<@Nullable Tab> mActivityTabSupplier; + private final AutocompleteDelegate mDelegate; + private final Supplier<@Nullable Tab> mActivityTabSupplier; /** Will be deleted in bytecode, value from the parent class will be used instead. */ @SuppressWarnings("NullAway") // Actual instance is at the parent diff --git a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java index e18d3bb2748..9e4065d5ea5 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java @@ -170,7 +170,7 @@ public class HighlightDialogFragment extends DialogFragment { } } - private HighlightDialogListener highlightDialogListener = new HighlightDialogListener() { + private final HighlightDialogListener highlightDialogListener = new HighlightDialogListener() { @Override public void onNextPage() { if (viewpager != null) { diff --git a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightItem.java b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightItem.java index 34d20ebdcd4..44a3e630362 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightItem.java +++ b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightItem.java @@ -10,10 +10,10 @@ package org.chromium.chrome.browser.onboarding.v2; import android.view.View; public class HighlightItem { - private int screenLeft; - private int screenTop; - private int screenRight; - private int screenBottom; + private final int screenLeft; + private final int screenTop; + private final int screenRight; + private final int screenBottom; public HighlightItem(View highlightView) { int[] location = new int[2]; diff --git a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java index b8e0d066ff6..7ad347847bc 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java +++ b/android/java/org/chromium/chrome/browser/onboarding/v2/HighlightView.java @@ -29,8 +29,8 @@ public class HighlightView extends FrameLayout { private static final int ALPHA_60_PERCENT = 153; private static final int DEFAULT_ANIMATION_DURATION = 1000; - private Paint mEraserPaint; - private Paint mBasicPaint; + private final Paint mEraserPaint; + private final Paint mBasicPaint; private HighlightItem mItem; private int mItemWidth; diff --git a/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java b/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java index 4c98dd1b48d..4aa67446dd9 100644 --- a/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java +++ b/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsService.java @@ -11,7 +11,7 @@ import org.chromium.chrome.browser.base.SplitCompatService; /** See {@link HlsServiceImpl}. */ public class HlsService extends SplitCompatService { @IdentifierNameString - private static String sImplClassName = + private static final String sImplClassName = "org.chromium.chrome.browser.playlist.hls_content.HlsServiceImpl"; public HlsService() { diff --git a/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java b/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java index e72664d46b3..d27dea947d1 100644 --- a/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java +++ b/android/java/org/chromium/chrome/browser/playlist/hls_content/HlsServiceImpl.java @@ -39,7 +39,7 @@ import java.util.Queue; public class HlsServiceImpl extends HlsService.Impl implements ConnectionErrorHandler { private static final String TAG = "Playlist/HlsServiceImpl"; private final IBinder mBinder = new LocalBinder(); - private Context mContext = ContextUtils.getApplicationContext(); + private final Context mContext = ContextUtils.getApplicationContext(); private PlaylistService mPlaylistService; public static String currentDownloadingPlaylistItemId = ""; diff --git a/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java b/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java index 368c7e594b0..9330fae9585 100644 --- a/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java +++ b/android/java/org/chromium/chrome/browser/playlist/settings/BravePlaylistResetPreference.java @@ -19,9 +19,9 @@ import org.chromium.chrome.R; */ public class BravePlaylistResetPreference extends Preference implements Preference.OnPreferenceClickListener { - private String TAG = "BravePlaylistResetPreference"; + private final String TAG = "BravePlaylistResetPreference"; - private int mPrefAccentColor; + private final int mPrefAccentColor; /** Constructor for BravePlaylistResetPreference. */ public BravePlaylistResetPreference(Context context, AttributeSet attrs) { 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 c08ace3f515..c81c6931dda 100644 --- a/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java +++ b/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java @@ -40,7 +40,7 @@ public class BraveShieldsContentSettings { public static final int NEVER = 2; private long mNativeBraveShieldsContentSettings; - private List mBraveShieldsContentSettingsObservers; + private final List mBraveShieldsContentSettingsObservers; private static BraveShieldsContentSettings sInstance; public static BraveShieldsContentSettings getInstance() { diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java index 78e85913855..00a4f3b93d5 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java +++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java @@ -24,7 +24,7 @@ import com.google.android.gms.vision.barcode.Barcode; * multi-processor uses this factory to create barcode trackers as needed -- one for each barcode. */ public class BarcodeTrackerFactory implements MultiProcessor.Factory { - private BarcodeTracker.BarcodeGraphicTrackerCallback mContext; + private final BarcodeTracker.BarcodeGraphicTrackerCallback mContext; public BarcodeTrackerFactory(BarcodeTracker.BarcodeGraphicTrackerCallback context) { mContext = context; diff --git a/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java b/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java index 75a6cc3a9e6..77e921241aa 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java +++ b/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java @@ -162,7 +162,7 @@ public class CameraSource { * native code later (avoids a potential copy). */ @SuppressWarnings("ArrayAsKeyOfSetOrMap") - private Map mBytesToByteBuffer = new HashMap<>(); + private final Map mBytesToByteBuffer = new HashMap<>(); //============================================================================================== // Builder @@ -173,7 +173,7 @@ public class CameraSource { */ public static class Builder { private final Detector mDetector; - private CameraSource mCameraSource = new CameraSource(); + private final CameraSource mCameraSource = new CameraSource(); /** * Creates a camera source builder with the supplied context and detector. Camera preview @@ -857,7 +857,7 @@ public class CameraSource { * size is null, then there is no picture size with the same aspect ratio as the preview size. */ private static class SizePair { - private Size mPreview; + private final Size mPreview; private Size mPicture; public SizePair(Camera.Size previewSize, @@ -1061,7 +1061,7 @@ public class CameraSource { */ private class FrameProcessingRunnable implements Runnable { private Detector mDetector; - private long mStartTimeMillis = SystemClock.elapsedRealtime(); + private final long mStartTimeMillis = SystemClock.elapsedRealtime(); // This lock guards all of the member variables below. private final Object mLock = new Object(); diff --git a/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java b/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java index 35ae239f5cc..263062c548d 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java +++ b/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java @@ -34,8 +34,8 @@ public class CameraSourcePreview extends ViewGroup { public boolean mCameraExist = true; - private Context mContext; - private SurfaceView mSurfaceView; + private final Context mContext; + private final SurfaceView mSurfaceView; private boolean mStartRequested; private boolean mSurfaceAvailable; private CameraSource mCameraSource; diff --git a/android/java/org/chromium/chrome/browser/rate/BraveRateThanksFeedbackDialog.java b/android/java/org/chromium/chrome/browser/rate/BraveRateThanksFeedbackDialog.java index 8a867b976b6..411ac90afe0 100644 --- a/android/java/org/chromium/chrome/browser/rate/BraveRateThanksFeedbackDialog.java +++ b/android/java/org/chromium/chrome/browser/rate/BraveRateThanksFeedbackDialog.java @@ -94,7 +94,7 @@ public class BraveRateThanksFeedbackDialog extends BottomSheetDialogFragment { } } - private RateFeedbackUtils.RateFeedbackCallback rateFeedbackCallback = + private final RateFeedbackUtils.RateFeedbackCallback rateFeedbackCallback = new RateFeedbackUtils.RateFeedbackCallback() { @Override public void rateFeedbackSubmitted() { diff --git a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java index caa95201b4e..bdba1fe543f 100644 --- a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java +++ b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java @@ -42,9 +42,9 @@ public class RateFeedbackUtils { } public static class RateFeedbackWorkerTask extends AsyncTask { - private String mUserSelection; - private String mUserFeedback; - private RateFeedbackCallback mCallback; + private final String mUserSelection; + private final String mUserFeedback; + private final RateFeedbackCallback mCallback; public RateFeedbackWorkerTask( String userSelection, String userFeedback, RateFeedbackCallback callback) { diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index f0ce5068407..807345adc9a 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -162,7 +162,7 @@ public class BraveRewardsPanel private LinearLayout mRewardsMainLayout; private @Nullable BraveActivity mBraveActivity; private final ChromeTabbedActivity mActivity; - private BraveRewardsHelper mIconFetcher; + private final BraveRewardsHelper mIconFetcher; private LinearLayout mRewardsSummaryDetailLayout; private LinearLayout mPayoutStatusBannerLayout; @@ -180,7 +180,7 @@ public class BraveRewardsPanel private String mCurrentNotificationId; - private BraveRewardsNativeWorker mBraveRewardsNativeWorker; + private final BraveRewardsNativeWorker mBraveRewardsNativeWorker; private int mCurrentTabId; private @Nullable TextView mPublisherAttention; diff --git a/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java b/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java index 83542041080..3254b8ab029 100644 --- a/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java +++ b/android/java/org/chromium/chrome/browser/rewards/onboarding/RewardsOnboarding.java @@ -64,7 +64,7 @@ public class RewardsOnboarding implements BraveRewardsObserver { private BraveRewardsNativeWorker mBraveRewardsNativeWorker; - private ChromeTabbedActivity mActivity; + private final ChromeTabbedActivity mActivity; private static final String SUCCESS = "success"; diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/MonthlyContributionToolTip.java b/android/java/org/chromium/chrome/browser/rewards/tipping/MonthlyContributionToolTip.java index 9c805a6ae9d..e631441f256 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/MonthlyContributionToolTip.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/MonthlyContributionToolTip.java @@ -26,7 +26,7 @@ import org.chromium.ui.base.DeviceFormFactor; public class MonthlyContributionToolTip { private PopupWindow mPopupWindow; View mContentView; - private boolean mIsTablet; + private final boolean mIsTablet; public MonthlyContributionToolTip(@NonNull Context context) { mIsTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(context); diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java index 4d411d800cb..1d03a970c3c 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java @@ -60,9 +60,9 @@ public class RewardsTippingPanelFragment extends Fragment implements BraveReward private static final String TAG = "TippingPanelFragment"; private BraveRewardsNativeWorker mBraveRewardsNativeWorker; - private String mWalletType = BraveRewardsNativeWorker.getInstance().getExternalWalletType(); + private final String mWalletType = BraveRewardsNativeWorker.getInstance().getExternalWalletType(); - private TextView mRadioTipAmount[] = new TextView[4]; + private final TextView mRadioTipAmount[] = new TextView[4]; private double[] mTipChoices; private TextView mCurrency1TextView; private TextView mCurrency2TextView; @@ -465,7 +465,7 @@ public class RewardsTippingPanelFragment extends Fragment implements BraveReward }); } - private TextWatcher mTextChangeListener = new TextWatcher() { + private final TextWatcher mTextChangeListener = new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {} @@ -610,7 +610,7 @@ public class RewardsTippingPanelFragment extends Fragment implements BraveReward } } - private View.OnClickListener mRadioClicker = view -> { + private final View.OnClickListener mRadioClicker = view -> { if (mFetchBalanceProgressBar.getVisibility() == View.VISIBLE) { return; } diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingSuccessContribution.java b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingSuccessContribution.java index 21babcfb327..1b34331ccd3 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingSuccessContribution.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingSuccessContribution.java @@ -21,10 +21,10 @@ import org.chromium.ui.base.DeviceFormFactor; public class RewardsTippingSuccessContribution { private static final String TAG = "TippingSuccess"; - private View mContentView; - private double mAmountSelected; - private Activity mActivity; - private boolean mIsTablet; + private final View mContentView; + private final double mAmountSelected; + private final Activity mActivity; + private final boolean mIsTablet; public RewardsTippingSuccessContribution( @NonNull Activity activity, View rootView, double amountSelected) { diff --git a/android/java/org/chromium/chrome/browser/safe_browsing/settings/NoGooglePlayServicesDialog.java b/android/java/org/chromium/chrome/browser/safe_browsing/settings/NoGooglePlayServicesDialog.java index 076420e584f..f7e6058f7c6 100644 --- a/android/java/org/chromium/chrome/browser/safe_browsing/settings/NoGooglePlayServicesDialog.java +++ b/android/java/org/chromium/chrome/browser/safe_browsing/settings/NoGooglePlayServicesDialog.java @@ -21,7 +21,7 @@ import org.chromium.ui.modelutil.PropertyModel; * available. */ public class NoGooglePlayServicesDialog { - private Context mContext; + private final Context mContext; private ModalDialogManager mManager; private PropertyModel mModel; diff --git a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePreference.java b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePreference.java index a1219ee4302..198b97f240c 100644 --- a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePreference.java +++ b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePreference.java @@ -15,7 +15,7 @@ public class BraveSearchEnginePreference extends SearchEngineSettings { private SearchEngineAdapter mSearchEngineAdapter; // Own members. - private boolean mPrivate; + private final boolean mPrivate; private Profile mProfile; public BraveSearchEnginePreference(boolean isPrivate) { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveLeoRadioButtonGroupDefaultModelPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveLeoRadioButtonGroupDefaultModelPreference.java index 6740df49015..ff62c82aee0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveLeoRadioButtonGroupDefaultModelPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveLeoRadioButtonGroupDefaultModelPreference.java @@ -32,7 +32,7 @@ public class BraveLeoRadioButtonGroupDefaultModelPreference extends Preference private RadioButtonWithDescriptionLayout mGroup; private ModelWithSubtitle[] mModels; private String mDefaultModelKey; - private Context mContext; + private final Context mContext; RadioButtonsDelegate mDelegate; public BraveLeoRadioButtonGroupDefaultModelPreference(Context context, AttributeSet attrs) { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java index 240d7229e4e..ad63e22b335 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java @@ -37,21 +37,21 @@ import java.util.HashMap; import java.util.List; public class BraveNewsPreferencesTypeAdapter extends RecyclerView.Adapter { - private BraveNewsController mBraveNewsController; - private BraveNewsPreferencesListener mBraveNewsPreferencesListener; + private final BraveNewsController mBraveNewsController; + private final BraveNewsPreferencesListener mBraveNewsPreferencesListener; private BraveNewsPreferencesSearchType mBraveNewsPreferencesSearchType; - private Context mContext; + private final Context mContext; private HashMap mChannelIcons = new HashMap<>(); private List mChannelList; private List mPublisherList; private List mFeedSearchResultItemList; private HashMap mFeedSearchResultItemFollowMap; - private RequestManager mGlide; - private String mBraveNewsPreferencesType; + private final RequestManager mGlide; + private final String mBraveNewsPreferencesType; private String mSearchUrl; - private static int TYPE_SECTION = 1; - private static int TYPE_ITEMS = 2; + private static final int TYPE_SECTION = 1; + private static final int TYPE_ITEMS = 2; private static final int ONE_ITEM_SPACE = 1; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsSettingsDividerItemDecoration.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsSettingsDividerItemDecoration.java index 0b1955747ba..aed1473f2dc 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsSettingsDividerItemDecoration.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsSettingsDividerItemDecoration.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; public class BraveNewsSettingsDividerItemDecoration extends RecyclerView.ItemDecoration { - private Drawable mDivider; + private final Drawable mDivider; public BraveNewsSettingsDividerItemDecoration(Drawable divider) { mDivider = divider; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsIntentUtil.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsIntentUtil.java index f5b5de34f93..0523fb42734 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsIntentUtil.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsIntentUtil.java @@ -15,9 +15,9 @@ import androidx.annotation.Nullable; import org.chromium.chrome.browser.flags.ChromeFeatureList; public class BraveSettingsIntentUtil { - private static String PASSWORD_SETTINGS_FRAGMENT = + private static final String PASSWORD_SETTINGS_FRAGMENT = "org.chromium.chrome.browser.password_manager.settings.PasswordSettings"; - private static String CREDENTIAL_EDIT_FRAGMENT = + private static final String CREDENTIAL_EDIT_FRAGMENT = "org.chromium.chrome.browser.password_entry_edit.CredentialEditFragmentView"; public static Intent createIntent( diff --git a/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java index fb4a578d165..5a1ea67ff38 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java @@ -37,7 +37,7 @@ public class BraveStatsPreferences extends BravePreferenceFragment private ChromeSwitchPreference mBraveStatsPref; private ChromeSwitchPreference mBraveStatsNotificationPref; - private DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); + private final DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletAutoLockPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletAutoLockPreferences.java index 28e40154268..a8f0155b7ea 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletAutoLockPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletAutoLockPreferences.java @@ -28,7 +28,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate; public class BraveWalletAutoLockPreferences extends Preference implements Preference.OnPreferenceClickListener, ConnectionErrorHandler { - private String TAG = "BraveWalletAutoLockPreferences"; + private final String TAG = "BraveWalletAutoLockPreferences"; public static final int WALLET_AUTOLOCK_DEFAULT_TIME = 5; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java index ed5d0ba6ef6..13f0c24f678 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetPreference.java @@ -44,7 +44,7 @@ public class BraveWalletResetPreference extends Preference implements Preference.OnPreferenceClickListener { private static final String TAG = "BraveWalletResetPref"; - private int mPrefAccentColor; + private final int mPrefAccentColor; private final String mConfirmationPhrase; private Profile mProfile; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java index 16b88abca2a..0766e09703d 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java @@ -32,7 +32,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate; */ public class BraveWalletResetTxHistoryAndNoncePreference extends Preference implements Preference.OnPreferenceClickListener, ConnectionErrorHandler { - private String TAG = "BraveWalletResetTxHistoryAndNoncePreference"; + private final String TAG = "BraveWalletResetTxHistoryAndNoncePreference"; private TxService mTxService; private final String mConfirmationPhrase; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreference.java index 40c454ac5f4..0ca35081097 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreference.java @@ -43,7 +43,7 @@ public class BraveWebrtcPolicyPreference private RadioButtonWithDescription mSettingRadioButton; private RadioButtonWithDescriptionLayout mGroup; private TextView mLearnMore; - private ArrayList mButtons; + private final ArrayList mButtons; protected static final String FALLBACK_SUPPORT_URL = "https://support.brave.com/hc/en-us/articles/360017989132-How-do-I-change-my-Privacy-Settings-#webrtc"; 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 0c02928f270..279b7bf32f3 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java @@ -25,7 +25,7 @@ import org.chromium.components.user_prefs.UserPrefs; public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioButtonGroupThemePreference { - private NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; + private final NTPBackgroundImagesBridge mNTPBackgroundImagesBridge; public BraveRadioButtonGroupCustomHomepageThemePreference(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java index 178a85fb6ad..9d47a3f8cb2 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java @@ -89,7 +89,7 @@ public class BraveShieldsHandler implements BraveRewardsHelper.LargeIconReadyCal public int mTrackersBlocked; public int mScriptsBlocked; public int mFingerprintsBlocked; - public ArrayList mBlockerNames; + public final ArrayList mBlockerNames; } private Context mContext; @@ -1277,7 +1277,7 @@ public class BraveShieldsHandler implements BraveRewardsHelper.LargeIconReadyCal } } - private View.OnClickListener mDoneClickListener = new View.OnClickListener() { + private final View.OnClickListener mDoneClickListener = new View.OnClickListener() { @Override public void onClick(View view) { hideBraveShieldsMenu(); diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsScreenshotUtil.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsScreenshotUtil.java index 072e14eba4b..a2babd2790d 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsScreenshotUtil.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsScreenshotUtil.java @@ -26,7 +26,7 @@ public class BraveShieldsScreenshotUtil { private static class PngConvertorTask implements Runnable { private static final int PNG_QUALITY = 100; - private Bitmap mBitmap; + private final Bitmap mBitmap; private final BraveShieldsScreenshotUtilCallback mCallback; public PngConvertorTask( diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java index 3561684b112..cedc0fd0953 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java @@ -66,9 +66,9 @@ public class BraveShieldsUtils { } public static class BraveShieldsWorkerTask extends AsyncTask { - private String mDomain; - private String mApiKey; - private byte[] mScreenshotBytes; + private final String mDomain; + private final String mApiKey; + private final byte[] mScreenshotBytes; public BraveShieldsWorkerTask(String domain, String apiKey, byte[] pngBytes) { mDomain = domain; diff --git a/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java b/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java index 3d1e455a560..47a09d7fa3c 100644 --- a/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java +++ b/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java @@ -35,10 +35,10 @@ public class ContentFilteringAdapter extends RecyclerView.Adapter mSubscriptionFilterLists; private Value mFilterLists[]; - private Context mContext; + private final Context mContext; private boolean mIsEdit; public ContentFilteringAdapter( diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java index 4255a35c554..fb2f68a8417 100644 --- a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java +++ b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java @@ -21,7 +21,7 @@ public class BraveWalletEthereumConnectedSitesListAdapter extends RecyclerView.Adapter { private String[] mWebSites = new String[0]; private Context mContext; - private BraveEthereumPermissionConnectedSitesDelegate mDelegate; + private final BraveEthereumPermissionConnectedSitesDelegate mDelegate; public interface BraveEthereumPermissionConnectedSitesDelegate { default void removePermission(String webSite){}; diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java index 9c20d21b09a..c68adc748c0 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -61,8 +61,8 @@ import java.util.function.BooleanSupplier; import java.util.function.Function; public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator { - private AppCompatActivity mActivity; - private OneshotSupplier mHubManagerSupplier; + private final AppCompatActivity mActivity; + private final OneshotSupplier mHubManagerSupplier; private final ObservableSupplier mEdgeToEdgeControllerSupplier; public BraveTabbedRootUiCoordinator( diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index a50d193481a..48393af7237 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -135,20 +135,20 @@ public class BraveToolbarManager extends ToolbarManager // Own members. private boolean mIsBraveBottomControlsVisible; - private ObservableSupplier mOmniboxFocusStateSupplier; - private OneshotSupplier mLayoutStateProviderSupplier; - private HomepageManager.HomepageStateListener mBraveHomepageStateListener; - private AppCompatActivity mActivity; - private WindowAndroid mWindowAndroid; - private CompositorViewHolder mCompositorViewHolder; + private final ObservableSupplier mOmniboxFocusStateSupplier; + private final OneshotSupplier mLayoutStateProviderSupplier; + private final HomepageManager.HomepageStateListener mBraveHomepageStateListener; + private final AppCompatActivity mActivity; + private final WindowAndroid mWindowAndroid; + private final CompositorViewHolder mCompositorViewHolder; private final Object mLock = new Object(); private boolean mBottomControlsEnabled; private BraveScrollingBottomViewResourceFrameLayout mBottomControls; - private ObservableSupplier mEdgeToEdgeControllerSupplier; - private ObservableSupplier mProfileSupplier; + private final ObservableSupplier mEdgeToEdgeControllerSupplier; + private final ObservableSupplier mProfileSupplier; private final BrowserControlsSizer mBrowserControlsSizer; private final DataSharingTabManager mDataSharingTabManager; - private ObservableSupplier mTabModelSelectorSupplier; + private final ObservableSupplier mTabModelSelectorSupplier; private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver; private Runnable mOpenGridTabSwitcherHandler; private final ObservableSupplier mTabBookmarkerSupplier; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index eda78621816..1d932b289ef 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -66,21 +66,21 @@ class BottomToolbarCoordinator implements View.OnLongClickListener { private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver; private LayoutStateProvider mLayoutStateProvider; - private ObservableSupplierImpl mShareButtonListenerSupplier = + private final ObservableSupplierImpl mShareButtonListenerSupplier = new ObservableSupplierImpl<>(); - private CallbackController mCallbackController = new CallbackController(); + private final CallbackController mCallbackController = new CallbackController(); ObservableSupplier mMenuButtonHelperSupplier; - private Runnable mOriginalHomeButtonRunnable; + private final Runnable mOriginalHomeButtonRunnable; private final BraveScrollingBottomViewResourceFrameLayout mScrollingBottomView; private HomeButton mHomeButton; private BookmarksButton mBookmarksButton; private BottomToolbarNewTabButton mNewTabButton; - private View mBottomContainerTopShadow; + private final View mBottomContainerTopShadow; private boolean mBookmarkButtonFilled; - private ObservableSupplier mBookmarkModelSupplier; - private LocationBarModel mLocationBarModel; - private HomepageManager mHomepageManager; - private BookmarkManagerOpener mBookmarkManagerOpener; + private final ObservableSupplier mBookmarkModelSupplier; + private final LocationBarModel mLocationBarModel; + private final HomepageManager mHomepageManager; + private final BookmarkManagerOpener mBookmarkManagerOpener; private final Context mContext = ContextUtils.getApplicationContext(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java index 52c2631d229..3a25a7be269 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java @@ -42,16 +42,16 @@ public class BraveBottomControlsCoordinator extends BottomControlsCoordinator { // Own members. private @Nullable BottomToolbarCoordinator mBottomToolbarCoordinator; - private OnLongClickListener mTabSwitcherLongclickListener; - private ActivityTabProvider mTabProvider; - private ThemeColorProvider mThemeColorProvider; - private ObservableSupplier mMenuButtonHelperSupplier; - private Runnable mOpenHomepageAction; - private Callback mSetUrlBarFocusAction; - private OneshotSupplier mLayoutStateProviderSupplier; - private ScrollingBottomViewResourceFrameLayout mRoot; - private ObservableSupplier mBookmarkModelSupplier; - private LocationBarModel mLocationBarModel; + private final OnLongClickListener mTabSwitcherLongclickListener; + private final ActivityTabProvider mTabProvider; + private final ThemeColorProvider mThemeColorProvider; + private final ObservableSupplier mMenuButtonHelperSupplier; + private final Runnable mOpenHomepageAction; + private final Callback mSetUrlBarFocusAction; + private final OneshotSupplier mLayoutStateProviderSupplier; + private final ScrollingBottomViewResourceFrameLayout mRoot; + private final ObservableSupplier mBookmarkModelSupplier; + private final LocationBarModel mLocationBarModel; public BraveBottomControlsCoordinator( OneshotSupplier layoutStateProviderSupplier, diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java index ea3247b259b..a304b3c43af 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -26,7 +26,7 @@ import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { - private Activity mActivity; + private final Activity mActivity; public BraveMenuButtonCoordinator( OneshotSupplier appMenuCoordinatorSupplier, diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index e01d09f02d7..2bdd0829f08 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -150,7 +150,7 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout private PlaylistServiceObserverImpl mPlaylistServiceObserver; - private DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); + private final DatabaseHelper mDatabaseHelper = DatabaseHelper.getInstance(); private ImageButton mBraveWalletButton; private ImageButton mBraveShieldsButton; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 376f7dfef45..4bf586c9a33 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -45,11 +45,11 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { private OptionalBrowsingModeButtonController mOptionalButtonController; // Own members. - private ToolbarLayout mBraveToolbarLayout; - private MenuButtonCoordinator mBraveMenuButtonCoordinator; + private final ToolbarLayout mBraveToolbarLayout; + private final MenuButtonCoordinator mBraveMenuButtonCoordinator; private boolean mIsBottomControlsVisible; - private ObservableSupplier mConstraintsProxy; - private ToolbarControlContainer mControlContainer; + private final ObservableSupplier mConstraintsProxy; + private final ToolbarControlContainer mControlContainer; private boolean mInTabSwitcherMode; public BraveTopToolbarCoordinator( diff --git a/android/java/org/chromium/chrome/browser/util/BraveReferrer.java b/android/java/org/chromium/chrome/browser/util/BraveReferrer.java index 18232540b89..6551676c8a0 100644 --- a/android/java/org/chromium/chrome/browser/util/BraveReferrer.java +++ b/android/java/org/chromium/chrome/browser/util/BraveReferrer.java @@ -60,8 +60,8 @@ public class BraveReferrer implements InstallReferrerStateListener { } private class InitReferrerRunnable implements Runnable { - private Context mContext; - private BraveReferrer mBraveReferrer; + private final Context mContext; + private final BraveReferrer mBraveReferrer; public InitReferrerRunnable(Context context, BraveReferrer braveReferrer) { mContext = context; mBraveReferrer = braveReferrer; @@ -96,7 +96,7 @@ public class BraveReferrer implements InstallReferrerStateListener { } private class SaveReferrerRunnable implements Runnable { - private String mUrpc; + private final String mUrpc; public SaveReferrerRunnable(String urpc) { mUrpc = urpc; } diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java index 6c92ee38ff0..bb82f704be5 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java @@ -20,7 +20,7 @@ public class BraveVpnNativeWorker { private static final Object sLock = new Object(); private static BraveVpnNativeWorker sInstance; - private List mObservers; + private final List mObservers; public static BraveVpnNativeWorker getInstance() { synchronized (sLock) { diff --git a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java index 2eb1ae4304b..57aa6b8abf5 100644 --- a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java @@ -32,17 +32,17 @@ import java.util.List; @NullMarked public class AlwaysOnPagerAdapter extends PagerAdapter { - private Context mContext; + private final Context mContext; private static final String AUTO_RECONNECT_VPN_LINK = "https://support.brave.com/hc/en-us/articles/29918727663373-How-do-I-connect-to-Brave-VPN-automatically#tab-2"; - private List mImageResources = + private final List mImageResources = Arrays.asList( R.drawable.ic_vpn_always_on_1, R.drawable.ic_vpn_always_on_2, R.drawable.ic_vpn_always_on_3); - private List mTexts = + private final List mTexts = Arrays.asList( R.string.auto_reconnect_vpn_tutorial_text_1, R.string.auto_reconnect_vpn_tutorial_text_2, diff --git a/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnProfileCredentials.java b/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnProfileCredentials.java index 5513ba72730..a0e6865b8d1 100644 --- a/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnProfileCredentials.java +++ b/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnProfileCredentials.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.vpn.models; public class BraveVpnProfileCredentials { - private String mApiAuthToken; - private String mUsername; - private String mPassword; + private final String mApiAuthToken; + private final String mUsername; + private final String mPassword; public BraveVpnProfileCredentials(String apiAuthToken, String username, String password) { this.mApiAuthToken = apiAuthToken; diff --git a/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnWireguardProfileCredentials.java b/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnWireguardProfileCredentials.java index b5bef462ae8..fb810c9e42f 100644 --- a/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnWireguardProfileCredentials.java +++ b/android/java/org/chromium/chrome/browser/vpn/models/BraveVpnWireguardProfileCredentials.java @@ -6,11 +6,11 @@ package org.chromium.chrome.browser.vpn.models; public class BraveVpnWireguardProfileCredentials { - private String mApiAuthToken; - private String mClientId; - private String mMappedIpv4Address; - private String mMappedIpv6Address; - private String mServerPublicKey; + private final String mApiAuthToken; + private final String mClientId; + private final String mMappedIpv4Address; + private final String mMappedIpv6Address; + private final String mServerPublicKey; public BraveVpnWireguardProfileCredentials(String apiAuthToken, String clientId, String mappedIpv4Address, String mappedIpv6Address, String serverPublicKey) { diff --git a/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java b/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java index c774a806a67..f5c8374c104 100644 --- a/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java +++ b/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java @@ -19,7 +19,7 @@ import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils; import org.chromium.chrome.browser.vpn.utils.BraveVpnUtils; public class VpnRegionPreference extends Preference { - private Context mContext; + private final Context mContext; public VpnRegionPreference(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/android/java/org/chromium/chrome/browser/vpn/timer/TimerUtils.java b/android/java/org/chromium/chrome/browser/vpn/timer/TimerUtils.java index 10854c44662..f6e77949d65 100644 --- a/android/java/org/chromium/chrome/browser/vpn/timer/TimerUtils.java +++ b/android/java/org/chromium/chrome/browser/vpn/timer/TimerUtils.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Date; public class TimerUtils { - private static int sVpnActionRequestCode = 1001; + private static final int sVpnActionRequestCode = 1001; public static void scheduleVpnAction(Context context, int minutes) { Intent vpnActionIntent = new Intent(context, TimerVpnActionReceiver.class); diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnProfileUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnProfileUtils.java index 819da298b24..7deb7882e35 100644 --- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnProfileUtils.java +++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnProfileUtils.java @@ -21,7 +21,7 @@ import org.chromium.chrome.browser.vpn.wireguard.WireguardUtils; public class BraveVpnProfileUtils { private static volatile BraveVpnProfileUtils sBraveVpnProfileUtils; - private static Object sMutex = new Object(); + private static final Object sMutex = new Object(); private BraveVpnProfileUtils() {} diff --git a/android/java/org/chromium/chrome/browser/vpn/wireguard/TunnelModel.java b/android/java/org/chromium/chrome/browser/vpn/wireguard/TunnelModel.java index f51c8c8a16a..4b30a2e164f 100644 --- a/android/java/org/chromium/chrome/browser/vpn/wireguard/TunnelModel.java +++ b/android/java/org/chromium/chrome/browser/vpn/wireguard/TunnelModel.java @@ -17,7 +17,7 @@ public class TunnelModel implements Tunnel { private final String name; @SuppressWarnings("UnusedVariable") - private Config config; + private final Config config; private final TunnelStateUpdateListener tunnelStateUpdateListener; diff --git a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java index 94ca94588e5..517a8cc665c 100644 --- a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java +++ b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java @@ -11,7 +11,7 @@ import org.chromium.chrome.browser.base.SplitCompatService; /** See {@link WireguardServiceImpl}. */ public class WireguardService extends SplitCompatService { @IdentifierNameString - private static String sImplClassName = + private static final String sImplClassName = "org.chromium.chrome.browser.vpn.wireguard.WireguardServiceImpl"; public WireguardService() { diff --git a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardServiceImpl.java b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardServiceImpl.java index 491d02dba31..3a1969c83d4 100644 --- a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardServiceImpl.java +++ b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardServiceImpl.java @@ -44,7 +44,7 @@ public class WireguardServiceImpl private Timer mVpnStatisticsTimer; private Timer mVpnRecordStatisticsTimer; private static final int BRAVE_VPN_NOTIFICATION_ID = 801; - private Context mContext = ContextUtils.getApplicationContext(); + private final Context mContext = ContextUtils.getApplicationContext(); class LocalBinder extends Binder { WireguardServiceImpl getService() { diff --git a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java index f66acb43aea..1dad01e5709 100644 --- a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java +++ b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/promo/SearchWidgetPromoPanel.java @@ -18,8 +18,8 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.widget.quickactionsearchandbookmark.utils.BraveSearchWidgetUtils; public class SearchWidgetPromoPanel implements View.OnClickListener { - private PopupWindow mPopupWindow; - private Context mContext; + private final PopupWindow mPopupWindow; + private final Context mContext; public SearchWidgetPromoPanel(@NonNull Context context) { mContext = context; 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 75c429cdde0..dbf18895d2e 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 @@ -41,13 +41,13 @@ public class BraveAdsNotificationDialog { private static final int MIN_DISTANCE_FOR_DISMISS = 40; private static final int MAX_DISTANCE_FOR_TAP = 5; - private Context mContext; + private final Context mContext; private final String mOrigin; - private WindowManager.LayoutParams mLayoutParams; + private final WindowManager.LayoutParams mLayoutParams; private ValueAnimator mAnimator; // Track when touch events on the dialog are down and when they are up private int mXDown; - private int mWindowInitialPos; + private final int mWindowInitialPos; public AdsNotificationTouchListener(Context context, final String origin) { mContext = context; diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java index 8b8c69a5c8a..44c6e3b1be3 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java @@ -34,9 +34,9 @@ import org.chromium.chrome.browser.util.PackageUtils; public class BraveAdsSignupDialog { private static final String TAG = "BraveAdsSignupDialog"; - private static String SHOULD_SHOW_ONBOARDING_DIALOG_VIEW_COUNTER = + private static final String SHOULD_SHOW_ONBOARDING_DIALOG_VIEW_COUNTER = "should_show_onboarding_dialog_view_counter"; - private static String SHOULD_SHOW_ONBOARDING_DIALOG = "should_show_onboarding_dialog"; + private static final String SHOULD_SHOW_ONBOARDING_DIALOG = "should_show_onboarding_dialog"; private static final long TWENTY_FOUR_HOURS = 86_400_000; private static final long MOMENT_LATER = 2_500; diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java index 8a93dae1047..b688c5882a1 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/onboarding/BraveAdsOnboardingFragment.java @@ -31,7 +31,7 @@ public class BraveAdsOnboardingFragment extends Fragment implements FirstRunFrag private OnViewPagerAction onViewPagerAction; private int progress; - private int endTime = 3; + private final int endTime = 3; private boolean mNativeInitialized; private LottieAnimationView animatedView; diff --git a/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java b/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java index 30f8ce1b110..813901d34fb 100644 --- a/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java +++ b/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java @@ -32,10 +32,10 @@ import org.chromium.ui.base.DeviceFormFactor; * toolbar, when it is visible. */ public class BraveHubManagerImpl extends HubManagerImpl { - private Activity mActivity; + private final Activity mActivity; private int mBottomToolbarHeight; - private boolean mIsTablet; - private ComponentCallbacks mComponentCallbacks; + private final boolean mIsTablet; + private final ComponentCallbacks mComponentCallbacks; public BraveHubManagerImpl( @NonNull Activity activity, diff --git a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java index 70d8cd1044e..9838b807469 100644 --- a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java +++ b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesAdapter.java @@ -25,9 +25,9 @@ import java.util.List; public class QuickSearchEnginesAdapter extends RecyclerView.Adapter { - private List mSearchEngines; - private QuickSearchEnginesCallback mQuickSearchEnginesCallback; - private ItemTouchHelperCallback.OnStartDragListener mDragStartListener; + private final List mSearchEngines; + private final QuickSearchEnginesCallback mQuickSearchEnginesCallback; + private final ItemTouchHelperCallback.OnStartDragListener mDragStartListener; private boolean mIsEditMode; public QuickSearchEnginesAdapter( diff --git a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesModel.java b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesModel.java index 4d6d8ef3d03..e6005d0c297 100644 --- a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesModel.java +++ b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/settings/QuickSearchEnginesModel.java @@ -17,11 +17,11 @@ public class QuickSearchEnginesModel { int AI_ASSISTANT = 1; } - private String mShortName; - private String mKeyword; - private String mUrl; + private final String mShortName; + private final String mKeyword; + private final String mUrl; private boolean mIsEnabled; - private @QuickSearchEnginesModelType int mType; + private final @QuickSearchEnginesModelType int mType; public QuickSearchEnginesModel( String shortName, diff --git a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java index 75427b1c9fb..ad8975cb224 100644 --- a/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java +++ b/browser/quick_search_engines/android/java/src/org/chromium/brave/browser/quick_search_engines/views/QuickSearchEnginesViewAdapter.java @@ -22,8 +22,8 @@ import java.util.List; public class QuickSearchEnginesViewAdapter extends RecyclerView.Adapter { - private List mSearchEngines; - private QuickSearchEnginesCallback mQuickSearchEnginesCallback; + private final List mSearchEngines; + private final QuickSearchEnginesCallback mQuickSearchEnginesCallback; public QuickSearchEnginesViewAdapter( Context context, diff --git a/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/BraveRadioButtonGroupSafeBrowsingPreference.java b/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/BraveRadioButtonGroupSafeBrowsingPreference.java index e96c179cb3b..2c94dfb8dc8 100644 --- a/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/BraveRadioButtonGroupSafeBrowsingPreference.java +++ b/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/BraveRadioButtonGroupSafeBrowsingPreference.java @@ -16,7 +16,7 @@ import org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionAndAu public class BraveRadioButtonGroupSafeBrowsingPreference extends RadioButtonGroupSafeBrowsingPreference { - private String noProtectionSummary; + private final String noProtectionSummary; public BraveRadioButtonGroupSafeBrowsingPreference(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java index 7a5889ff0b6..9d83e0a120c 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveDropdownItemViewInfoListBuilder.java @@ -42,7 +42,7 @@ class BraveDropdownItemViewInfoListBuilder extends DropdownItemViewInfoListBuild private @Nullable BraveSearchBannerProcessor mBraveSearchBannerProcessor; private @Nullable BraveLeoSuggestionProcessor mBraveLeoSuggestionProcessor; private UrlBarEditingTextStateProvider mUrlBarEditingTextProvider; - private @NonNull Supplier mActivityTabSupplier; + private final @NonNull Supplier mActivityTabSupplier; private static final List sBraveSearchEngineDefaultRegions = Arrays.asList("CA", "DE", "FR", "GB", "US", "AT", "ES", "MX"); private AutocompleteDelegate mAutocompleteDelegate; diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_leo/BraveLeoSuggestionProcessor.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_leo/BraveLeoSuggestionProcessor.java index af17a2a6ead..067260718e9 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_leo/BraveLeoSuggestionProcessor.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_leo/BraveLeoSuggestionProcessor.java @@ -32,7 +32,7 @@ public class BraveLeoSuggestionProcessor extends BaseSuggestionViewProcessor { private final UrlBarEditingTextStateProvider mUrlBarEditingTextProvider; private final BraveLeoAutocompleteDelegate mDelegate; private final String mAskLeo; - private @NonNull Supplier mActivityTabSupplier; + private final @NonNull Supplier mActivityTabSupplier; public BraveLeoSuggestionProcessor( Context context, diff --git a/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java index 64a784fe5a7..18b10c3a412 100644 --- a/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java +++ b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java @@ -22,12 +22,12 @@ class BraveBottomControlsMediator extends BottomControlsMediator { private BottomControlsStacker mBottomControlsStacker; // Own members. - private ObservableSupplierImpl mTabGroupUiVisibleSupplier = + private final ObservableSupplierImpl mTabGroupUiVisibleSupplier = new ObservableSupplierImpl<>(); - private ObservableSupplierImpl mBottomToolbarVisibleSupplier = + private final ObservableSupplierImpl mBottomToolbarVisibleSupplier = new ObservableSupplierImpl<>(); - private int mBottomControlsHeightSingle; - private int mBottomControlsHeightDouble; + private final int mBottomControlsHeightSingle; + private final int mBottomControlsHeightDouble; BraveBottomControlsMediator( WindowAndroid windowAndroid, diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java index ca1eecdb4c0..8ec8bf59f97 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java @@ -28,7 +28,7 @@ import java.util.Map; class BraveClassVisitor extends ClassVisitor { - private ClassVisitor mTarget; + private final ClassVisitor mTarget; static class Method { public int access; @@ -59,7 +59,7 @@ class BraveClassVisitor extends ClassVisitor { class BraveMethodVisitor extends MethodVisitor { - private Method mMethod; + private final Method mMethod; public BraveMethodVisitor(Method method, MethodVisitor mv) { super(ASM7, mv); @@ -106,29 +106,29 @@ class BraveClassVisitor extends ClassVisitor { protected String mName = ""; protected String mSuperName = ""; - private Map mSuperNames = new HashMap(); - private Map> mDeleteMethods = + private final Map mSuperNames = new HashMap(); + private final Map> mDeleteMethods = new HashMap>(); - private Map> mDeleteFields = + private final Map> mDeleteFields = new HashMap>(); - private Map> mDeleteInnerClasses = + private final Map> mDeleteInnerClasses = new HashMap>(); - private Map> mMakePublicMethods = + private final Map> mMakePublicMethods = new HashMap>(); - private Map> mMakePrivateMethods = + private final Map> mMakePrivateMethods = new HashMap>(); - private Map> mMakePublicInnerClasses = + private final Map> mMakePublicInnerClasses = new HashMap>(); - private Map> mChangeOwnerMethods = + private final Map> mChangeOwnerMethods = new HashMap>(); - private Map> mMakeProtectedFields = + private final Map> mMakeProtectedFields = new HashMap>(); - private Map>> mAddAnnotations = + private final Map>> mAddAnnotations = new HashMap>>(); - private Map mRedirectConstructors = new HashMap(); - private Map>> mRedirectMethodType = + private final Map mRedirectConstructors = new HashMap(); + private final Map>> mRedirectMethodType = new HashMap>>(); - private ArrayList mMakeNonFinalClasses = new ArrayList(); + private final ArrayList mMakeNonFinalClasses = new ArrayList(); public BraveClassVisitor(ClassVisitor visitor) { super(ASM7, null);