Remove SafetyNet changes android #26719

deeppandya · 2024-11-25T01:18:53Z

Resolves brave/brave-browser#42499

Submitter Checklist:

I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally:
- npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
- npm run presubmit wiki, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on
All relevant documentation has been updated, for instance:

Test Plan:

samartnik · 2024-11-25T17:38:00Z

What about removing safetynet_check.cc/h files? Do we still need them?

deeppandya · 2024-11-25T19:59:34Z

What about removing safetynet_check.cc/h files? Do we still need them?

Sorry i meant to delete the whole directory. updating now.

samartnik

lgtm

simonhong · 2024-11-26T11:33:16Z

components/brave_referrals/browser/brave_referrals_service.cc

@@ -618,7 +591,6 @@ void RegisterPrefsForBraveReferralsService(PrefRegistrySimple* registry) {
  registry->RegisterIntegerPref(kReferralAttemptCount, 0);
 #if BUILDFLAG(IS_ANDROID)
  registry->RegisterTimePref(kReferralAndroidFirstRunTimestamp, base::Time());
-  registry->RegisterStringPref(kSafetynetStatus, std::string());


whenever deprecates prefs, we need to clear its existing value from preferences.
You can refer kNewTabPageShowGemini how it's cleared after its usage is deleted.

chromium_src/chrome/browser/prefs/browser_prefs.cc

AlexeyBarabash

++

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java

SergeyZhukovsky · 2024-11-28T16:38:56Z

android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentServiceImpl.java

-                                                    && braveRewardsNativeWorker.isSupported()
-                                                    && BravePrefServiceBridge.getInstance()
-                                                            .getSafetynetCheckFailed()) {
+                                                    && braveRewardsNativeWorker.isSupported()) {


I don't think we need BraveUpgradeJobIntentServiceImpl class at all. The whole it's purpose was to re-perform the SafetyNet check

@SergeyZhukovsky we are still checking for braveRewardsNativeWorker.isSupported() to decide if we need to show the rewrads icon. i.e. it would be useful for not showing rewards icon for OFAC countries.

Do we need to do that on every upgrade?

We can remove the change on upgrade as we are already checking for rewards icon here :

brave-core/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java

Line 451 in 4c8295d

&& mBraveRewardsNativeWorker.isSupported()

i am going to remove in a follow up commit.

SergeyZhukovsky

++

github-actions · 2024-12-02T12:30:08Z

Chromium major version is behind target branch (131.0.6778.85 vs 132.0.6834.15). Please rebase.

zenparsing

Rewards 👍

Resolve presubmit issue Remove safetynet directory

Register kSafetynetStatus in brave_prodfile_prefs

github-actions · 2024-12-02T22:38:33Z

[puLL-Merge] - brave/brave-core@26719

Here's my review of the pull request:

Description

This PR removes SafetyNet checks from the Brave Android app. It eliminates the SafetyNet-related code, including the safetynet component, and removes references to SafetyNet checks throughout the codebase. This change simplifies the app by removing a dependency on Google Play Services for device attestation.

Changes

Changes

android/brave_java_sources.gni:
- Removed import for safetynet java sources
- Removed brave_rewards_java_sources from brave_java_sources
android/java/AndroidManifest.xml:
- Removed service declaration for BraveUpgradeJobIntentService
android/java/org/chromium/chrome/browser/app/BraveActivity.java:
- Removed check for SafetyNet failure in maybeSolveAdaptiveCaptcha method
android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java:
- Removed SafetyNet check when preparing menu items
android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java:
- Removed SafetyNet check in enableSponsoredImages method
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java:
- Removed methods related to SafetyNet check
android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java:
- Removed SafetyNet check when showing Brave Rewards debug preferences
android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java:
- Removed resetting of SafetyNet check failure flag
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java:
- Removed resetting of SafetyNet check failure flag
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java:
- Removed SafetyNet checks when updating Brave Rewards button visibility
android/java/org/chromium/chrome/browser/upgrade/BravePackageReplacedBroadcastReceiver.java:
- Removed call to BraveUpgradeJobIntentServiceImpl.maybePerformUpgradeTasks
Removed files:
- BraveUpgradeJobIntentService.java
- BraveUpgradeJobIntentServiceImpl.java
browser/android/preferences/brave_pref_service_bridge.cc:
- Removed methods related to SafetyNet check
browser/brave_profile_prefs.cc:
- Added migration to clear SafetyNet-related preferences
browser/ui/webui/brave_rewards/rewards_web_ui_utils.cc:
- Removed SafetyNet check when blocking Rewards WebUI
build/android/config.gni:
- Removed SafetyNet-related Java source
components/brave_referrals/browser/:
- Removed SafetyNet-related code from BraveReferralsService
components/brave_rewards/browser/:
- Removed SafetyNet-related dependencies
Removed entire safetynet component

This sequence diagram illustrates the high-level changes made by removing SafetyNet checks from the Brave Android app. The app removes SafetyNet-related preferences, eliminates SafetyNet checks in the Brave Rewards system, updates the UI to remove SafetyNet-related elements, and displays the updated interface without SafetyNet restrictions.```mermaid
sequenceDiagram
participant App as Brave Android App
participant Prefs as Preferences
participant Rewards as Brave Rewards
participant UI as User Interface
App->>Prefs: Remove SafetyNet-related preferences
App->>Rewards: Remove SafetyNet checks
Rewards-->>UI: Update UI without SafetyNet restrictions
App->>UI: Remove SafetyNet-related UI elements
UI-->>App: Display updated interface

</details>

<!-- Generated by claude-3-5-sonnet-20240620 -->

github-actions bot assigned deeppandya Nov 25, 2024

deeppandya added this to the 1.75.x - Nightly milestone Nov 25, 2024

deeppandya force-pushed the remove_safetynet_changes_android branch from 1bbcf67 to af4cdc5 Compare November 25, 2024 02:50

deeppandya requested review from samartnik, cdesouza-chromium and atuchin-m November 25, 2024 16:37

deeppandya marked this pull request as ready for review November 25, 2024 16:40

deeppandya requested review from simonhong and a team as code owners November 25, 2024 16:40

deeppandya requested a review from clD11 November 25, 2024 16:57

iefremov approved these changes Nov 25, 2024

View reviewed changes

deeppandya force-pushed the remove_safetynet_changes_android branch from af4cdc5 to 3d1f26b Compare November 25, 2024 20:35

samartnik approved these changes Nov 25, 2024

View reviewed changes

atuchin-m approved these changes Nov 26, 2024

View reviewed changes

simonhong reviewed Nov 26, 2024

View reviewed changes

deeppandya force-pushed the remove_safetynet_changes_android branch 2 times, most recently from 1cfdefa to cec20e0 Compare November 27, 2024 21:29

deeppandya requested a review from a team as a code owner November 27, 2024 21:29

deeppandya force-pushed the remove_safetynet_changes_android branch from cec20e0 to d039b5d Compare November 27, 2024 21:31

deeppandya commented Nov 27, 2024

View reviewed changes

chromium_src/chrome/browser/prefs/browser_prefs.cc Show resolved Hide resolved

simonhong approved these changes Nov 27, 2024

View reviewed changes

deeppandya force-pushed the remove_safetynet_changes_android branch from d039b5d to fc8b8de Compare November 28, 2024 15:26

deeppandya requested review from AlexeyBarabash, SergeyZhukovsky and bridiver as code owners November 28, 2024 15:26

deeppandya force-pushed the remove_safetynet_changes_android branch from fc8b8de to 4c8295d Compare November 28, 2024 15:31

github-actions bot added the puLL-Merge label Nov 28, 2024

AlexeyBarabash approved these changes Nov 28, 2024

View reviewed changes

SergeyZhukovsky reviewed Nov 28, 2024

View reviewed changes

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java Show resolved Hide resolved

SergeyZhukovsky reviewed Nov 28, 2024

View reviewed changes

android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java Show resolved Hide resolved

SergeyZhukovsky reviewed Nov 28, 2024

View reviewed changes

deeppandya force-pushed the remove_safetynet_changes_android branch from 4c8295d to d0de924 Compare November 28, 2024 21:35

SergeyZhukovsky approved these changes Nov 28, 2024

View reviewed changes

github-actions bot added the chromium-version-mismatch The Chromium version on the PR branch does not match the version on the target branch label Dec 2, 2024

zenparsing approved these changes Dec 2, 2024

View reviewed changes

deeppandya added 4 commits December 2, 2024 17:37

Remove safetynet changes android

e815332

Resolve presubmit issue Remove safetynet directory

Clear kSafetynetStatus pref

764baa1

Remove and clear kSafetynetCheckFailed pref

cd6bd45

Register kSafetynetStatus in brave_prodfile_prefs

Remove BraveUpgradeJobIntentService

f89dae0

deeppandya force-pushed the remove_safetynet_changes_android branch from d0de924 to f89dae0 Compare December 2, 2024 22:37

github-actions bot removed the chromium-version-mismatch The Chromium version on the PR branch does not match the version on the target branch label Dec 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove SafetyNet changes android #26719

Remove SafetyNet changes android #26719

deeppandya commented Nov 25, 2024 •

edited

Loading

samartnik commented Nov 25, 2024

deeppandya commented Nov 25, 2024

samartnik left a comment

simonhong Nov 26, 2024

AlexeyBarabash left a comment

SergeyZhukovsky Nov 28, 2024

deeppandya Nov 28, 2024

SergeyZhukovsky Nov 28, 2024

deeppandya Nov 28, 2024

deeppandya Nov 28, 2024

SergeyZhukovsky left a comment

github-actions bot commented Dec 2, 2024

zenparsing left a comment

github-actions bot commented Dec 2, 2024

Changes

Remove SafetyNet changes android #26719

Are you sure you want to change the base?

Remove SafetyNet changes android #26719

Conversation

deeppandya commented Nov 25, 2024 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

samartnik commented Nov 25, 2024

deeppandya commented Nov 25, 2024

samartnik left a comment

Choose a reason for hiding this comment

simonhong Nov 26, 2024

Choose a reason for hiding this comment

AlexeyBarabash left a comment

Choose a reason for hiding this comment

SergeyZhukovsky Nov 28, 2024

Choose a reason for hiding this comment

deeppandya Nov 28, 2024

Choose a reason for hiding this comment

SergeyZhukovsky Nov 28, 2024

Choose a reason for hiding this comment

deeppandya Nov 28, 2024

Choose a reason for hiding this comment

deeppandya Nov 28, 2024

Choose a reason for hiding this comment

SergeyZhukovsky left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 2, 2024

zenparsing left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 2, 2024

Description

Changes

deeppandya commented Nov 25, 2024 •

edited

Loading