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

[iOS-Sync] Delete Other Devices (uplift to 1.20.x) #7707

Merged
merged 2 commits into from
Feb 2, 2021

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Jan 26, 2021

  • Adds support for deleting other devices from the sync chain.
  • Adds support for the current device being deleted from the chain, by another device.
  • Fixes missing brave_services_key

Uplift of #7584
Resolves brave/brave-ios#3194 and brave/brave-ios#3195

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@bsclifton bsclifton added this to the 1.20.x - Beta milestone Jan 26, 2021
@bsclifton bsclifton requested a review from a team January 26, 2021 20:30
@bsclifton bsclifton self-assigned this Jan 26, 2021
@bsclifton bsclifton changed the title [iOS-Sync] Delete Other Devices (uplift - 1.20.x) [iOS-Sync] Delete Other Devices (uplift to 1.20.x) Jan 26, 2021
…ved).

Adding back deleting other devices using the 1.20.x API (profile_helper).
Changed ResetSync to use the brave_sync::ResetSync from profile_helper.
@bsclifton bsclifton force-pushed the ios-1.20.x-sync-delete-devices branch from 81c6032 to 0bc50e1 Compare February 1, 2021 17:28
@kjozwiak
Copy link
Member

kjozwiak commented Feb 1, 2021

@bsclifton looks like there's a few lint issues as per https://ci.brave.com/blue/organizations/jenkins/pr-brave-browser-ios-1.20.x-sync-delete-devices-post-init/detail/pr-brave-browser-ios-1.20.x-sync-delete-devices-post-init/2/pipeline. Probably doesn't block uplift but should we create anew issue to address these?

[2021-02-01T17:43:34.149Z] Running cpplint...
[2021-02-01T17:43:34.149Z] Skipping file ios/browser/api/sync/BUILD.gn
[2021-02-01T17:43:34.149Z] Done processing ios/browser/api/sync/brave_sync_api.h
[2021-02-01T17:43:34.149Z] Skipping file ios/browser/api/sync/brave_sync_api.mm
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:247:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:251:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:255:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:264:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:268:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] ios/browser/api/sync/brave_sync_worker.cc:272:  Line ends in whitespace.  Consider deleting these extra spaces.  [whitespace/end_of_line] [4]
[2021-02-01T17:43:34.405Z] Done processing ios/browser/api/sync/brave_sync_worker.cc
[2021-02-01T17:43:34.405Z] Done processing ios/browser/api/sync/brave_sync_worker.h
[2021-02-01T17:43:34.405Z] Skipping clang/gn format check because base_branch is origin/1.20.x instead of refs/remotes/origin/master

[2021-02-01T17:43:34.405Z] cpplint errors found: 6

@bsclifton
Copy link
Member Author

whoops - forgot to comment here; pushed lint fixes 👍

@kjozwiak
Copy link
Member

kjozwiak commented Feb 2, 2021

test-browser failed on macOS due to RewardsPromotionBrowserTest.ClaimViaPanel failing as per https://ci.brave.com/job/pr-brave-browser-ios-1.20.x-sync-delete-devices-macos/3/execution/node/222/log/. However, this is a known intermittent issue as per brave/brave-browser#12605.

17:27:59  [  FAILED  ] RewardsPromotionBrowserTest.ClaimViaPanel, where TypeParam =  and GetParam() =  (31123 ms)
17:27:59  [669/669] RewardsPromotionBrowserTest.ClaimViaPanel (31418 ms)
17:27:59  1 test failed:
17:27:59      RewardsPromotionBrowserTest.ClaimViaPanel (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:204)

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.20.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 61533c6 into 1.20.x Feb 2, 2021
@kjozwiak kjozwiak deleted the ios-1.20.x-sync-delete-devices branch February 2, 2021 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants