Skip to content
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.

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

Guard ChromeActivity.getTabModelSelector with areTabModelsInitialized #26724

Merged
merged 3 commits into from
Nov 26, 2024

Conversation

AlexeyBarabash
Copy link
Contributor

This PR fixes crash reported from GP dev console, also fixes other similar palces.

Fixes brave/brave-browser#42319

Resolves brave/brave-browser#42319

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:

Test Plan:

There is no one, crash was reported from GP dev console.

Copy link
Collaborator

@simoarpe simoarpe left a comment

Choose a reason for hiding this comment

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

👍 Added just a minor suggestion. Changes look good!

Comment on lines 1224 to 1226
if (!chromeActivity.areTabModelsInitialized()) {
return ProfileManager.getLastUsedRegularProfile();
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Because both return ProfileManager.getLastUsedRegularProfile(); I would unify this if statement with the one above by simply changing the condition into if (chromeActivity == null || !chromeActivity.areTabModelsInitialized())

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, fixed at a2a11d8

ChromeTabbedActivity activity = BraveRewardsHelper.getChromeTabbedActivity();
if (activity == null
|| !activity.areTabModelsInitialized()
|| activity.getTabModelSelector() == null) {
Copy link
Member

Choose a reason for hiding this comment

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

could you please also change getTabModelSelector(it's deprecated) to getTabModelSelectorSupplier as

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, changed at 3ba5886

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.

++

@AlexeyBarabash AlexeyBarabash merged commit f91a38e into master Nov 26, 2024
17 checks passed
@AlexeyBarabash AlexeyBarabash deleted the fix_android_crash_42319 branch November 26, 2024 15:45
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 26, 2024
@brave-builds
Copy link
Collaborator

Released in v1.75.53

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash inside BraveRewardsHelper
4 participants