Skip to content

[Android] Suppress Mobile “Switch to App” Annoyances #17024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 21, 2023
Merged

[Android] Suppress Mobile “Switch to App” Annoyances #17024

merged 1 commit into from
Feb 21, 2023

Conversation

sujitacharya2005
Copy link
Contributor

@sujitacharya2005 sujitacharya2005 commented Feb 3, 2023 •
edited
Loading

Resolves brave/brave-browser#25079

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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 lint, 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:

Test Plan:

https://user-images.githubusercontent.com/32419898/216681102-b63fefaf-b1c7-4ed2-b230-afe9ad9b6485.mp4
https://user-images.githubusercontent.com/32419898/216814698-611a647b-830a-45f7-88fc-508ffccc1c91.mp4

@sujitacharya2005 sujitacharya2005 added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Feb 3, 2023
SergeyZhukovsky
SergeyZhukovsky approved these changes Feb 4, 2023
View reviewed changes
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

deeppandya
deeppandya suggested changes Feb 8, 2023
View reviewed changes
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java Outdated
@@ -15,7 +15,10 @@

import org.chromium.base.BraveFeatureList;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think we use Log anywhere. so we need to remove unused imports

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java Outdated
Handler handler = ((Interface.Proxy) cookieListOptInPageAndroidHandler).getProxyHandler();
handler.setErrorHandler(connectionErrorHandler);

return cookieListOptInPageAndroidHandler;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cookieListOptInPageAndroidHandler should be filterListAndroidHandler.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

browser/brave_shields/android/filter_list_service_factory_android.cc
}

} // namespace android
} // namespace chrome
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

browser/brave_shields/android/filter_list_service_factory_android.cc
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
#include "base/android/jni_android.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line after license string

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

browser/brave_shields/filter_list_service_factory.cc
return chrome::GetBrowserContextRedirectedInIncognito(context);
}

} // namespace brave_shields
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

browser/brave_shields/filter_list_service_factory.h

} // namespace brave_shields

#endif // BRAVE_BROWSER_BRAVE_SHIELDS_FILTER_LIST_SERVICE_FACTORY_H_
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

components/brave_shields/browser/filter_list_service.cc
filterListUuid, shouldEnableFilter);
}

} // namespace brave_shields
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

components/brave_shields/browser/filter_list_service.h

} // namespace brave_shields

#endif // BRAVE_COMPONENTS_BRAVE_SHIELDS_BROWSER_FILTER_LIST_SERVICE_H_
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit : new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

@sujitacharya2005 sujitacharya2005 force-pushed the 25079_switch_to_App2 branch 5 times, most recently from c0b633f to 5554394 Compare February 19, 2023 17:25
deeppandya
deeppandya approved these changes Feb 21, 2023
View reviewed changes
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sujitacharya2005 sujitacharya2005 merged commit 1fb30a2 into master Feb 21, 2023
@sujitacharya2005 sujitacharya2005 deleted the 25079_switch_to_App2 branch February 21, 2023 15:53
@github-actions github-actions bot added this to the 1.50.x - Nightly milestone Feb 21, 2023
@GeetaSarvadnya GeetaSarvadnya mentioned this pull request Apr 5, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deeppandya deeppandya deeppandya approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

@tapanmodh tapanmodh Awaiting requested review from tapanmodh

Assignees

@sujitacharya2005 sujitacharya2005

Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.50.x - Release
Development

Successfully merging this pull request may close these issues.

[Android] Suppress Mobile “Switch to App” Annoyances
3 participants
@sujitacharya2005 @deeppandya @SergeyZhukovsky