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

Fix UI initialization flow and reset when devices < 2 from native side #1109

Merged
merged 1 commit into from
Dec 17, 2018

Conversation

darkdh
Copy link
Member

@darkdh darkdh commented Dec 16, 2018

fix brave/brave-browser#2533
fix brave/brave-browser#2537
fix brave/brave-browser#2540
fix brave/brave-browser#2552
fix brave/brave-browser#2575

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Except test case in above issues, here is the critical case:

  1. Create sync chain on device a
  2. Connect to sync chain on device b
  3. Remember the sync code of the sync chain
  4. Delete device b on device a
  5. Both device should be reset to unsync state after a while
  6. Create sync chain on device a, the sync code should be different than step 3
  7. Create sync chain on device b, the sync code should be different than step 3

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

Copy link
Contributor

@AlexeyBarabash AlexeyBarabash left a comment

Choose a reason for hiding this comment

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

++

Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

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

tested and confirmed it fixes all referenced issues but not brave/brave-browser#2523 which is fixed already, and brave/brave-browser#2527 which was not fixed while trying these changes. otherwise lgtm great work on this one

@darkdh darkdh merged commit 7b1ff67 into master Dec 17, 2018
darkdh added a commit that referenced this pull request Dec 17, 2018
Fix UI initialization flow and reset when devices < 2 from native side
darkdh added a commit that referenced this pull request Dec 17, 2018
Fix UI initialization flow and reset when devices < 2 from native side
darkdh added a commit that referenced this pull request Dec 17, 2018
Fix UI initialization flow and reset when devices < 2 from native side
@darkdh
Copy link
Member Author

darkdh commented Dec 17, 2018

master: 7b1ff67
0.60.x: 5d8dfaa
0.59.x: 80eda77
0.58.x: 7524ffc

@darkdh darkdh deleted the sync-v2-flow-fix branch December 17, 2018 17:58
@kjozwiak
Copy link
Member

Changing the flag as this has already been merged into 0.58.x:

0.58.x: 7524ffc

After talking with @rebron, we'll keep this in 0.58.x even though it was merged without approval. Sync is going to be disabled by default in 0.58.x so this won't risk breaking regular users who haven't enabled sync. Please wait for approval next time before merging.

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