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] Enable History datatype for Sync #20642

Merged
merged 10 commits into from
Oct 24, 2023
Merged

Conversation

soner-yuksel
Copy link
Contributor

@soner-yuksel soner-yuksel commented Oct 23, 2023

This PR contains the changes for iOS History API after history datatype enabled inside Brave. iOs refecltion of this particular PR #20329

Resolves brave/brave-browser#33839

iOS Ticket - PR to allow All History Items Sync:
brave/brave-ios#8305
brave/brave-ios#8306

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 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:

@soner-yuksel soner-yuksel added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 labels Oct 23, 2023
@soner-yuksel soner-yuksel added this to the 1.61.x - Nightly milestone Oct 23, 2023
@soner-yuksel soner-yuksel requested a review from a team as a code owner October 23, 2023 19:05
@soner-yuksel soner-yuksel self-assigned this Oct 23, 2023
@soner-yuksel soner-yuksel force-pushed the ios/bugfix/sync_all_history branch from 3e3ccb2 to be7214a Compare October 23, 2023 22:18
@emerick
Copy link
Contributor

emerick commented Oct 24, 2023

@soner-yuksel If you ping me when this is merged, I can cherry-pick it into the cr119 uplift for you. Just let me know.

@soner-yuksel
Copy link
Contributor Author

@soner-yuksel If you ping me when this is merged, I can cherry-pick it into the cr119 uplift for you. Just let me know.

@emerick sounds excellent that will save me from making uplifts 😄

@soner-yuksel soner-yuksel merged commit baf1922 into master Oct 24, 2023
@soner-yuksel soner-yuksel deleted the ios/bugfix/sync_all_history branch October 24, 2023 18:48
kjozwiak pushed a commit that referenced this pull request Oct 26, 2023
* Enable History datatype for Sync (#20329)

* Reverted PR#16705 (Sync all history)

* Reverted PR#16478 (Display history sync diagnostic info)

* Reverted PR#20071 (Disable history sync datatype to fallback to typed urls datatype)

* Added overrides for HistoryModelTypeController and HistoryDeleteDirectivesModelTypeController to work
when encrypt everything option is on

* Add patch to sync history delete directives and history entities together

* Added unit test for LowPriorityUserTypes

* Enable encryption of history sync entities

* Added test for precondition state of history datatype controllers

* Modified: clean out HistoryDeleteDirectiveSpecifics::UrlDirective::url field, as it is unencrypted

* Added test to ensure we don't send url at HistoryDeleteDirectiveSpecifics::UrlDirective

* Modified ModelTypeTest.EncryptableUserTypes test to check History type

* Removed 'path_excludes' for the files removed in the current PR

---------

Co-authored-by: Darnell Andries <dandries@brave.com>

* Fix #33746: Cleanup Brave-Core iOS chromium_src overrides & initialization code (#20598)

- Cleanup Brave-Core IOS Chromium_SRC overrides.
- Add new cleaner Chromium_SRC overrides and simplify app launch logic.

* Don't redefine static_assert (#20440)

(Instead, we make sure the static_assert passes here by locally restoring
kCoarseResolutionMicroseconds back to its original Chromium value.)

* Use `PrefService` with `MigrateObsoleteProfilePrefs` (#20396)

Upstream is changing `MigrateObsoleteProfilePrefs` to take a
`PrefService` pointer, rather than `Profile`, as this is more expressive
of the data actually being accessed.

This change aligns all places where we have procedures similar to
`MigrateObsoleteProfilePrefs`, to receive a `PrefService*` instance as
well.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/d848587fe1f19123940de4e4c0cec328bc23001f

commit d848587fe1f19123940de4e4c0cec328bc23001f
Author: Mikel Astiz <mastiz@chromium.org>
Date:   Mon Oct 2 09:28:03 2023 +0000

    [sync] Remove legacy SyncRequested pref

    It has been practically unused for some time, and most of it is dead
    code ever since the feature toggle was cleaned up in
    https://crrev.com/c/4886256.

    On Ash, it needs to be migrated to a newly-introduced preference
    tailored to the actual underlying need, which is being able to remember
    that the server returned DISABLE_SYNC_ON_CLIENT (i.e. the user reset
    sync via dashboard).

    Change-Id: I0239447173b32d7d007ebf733dde23a5de1859e1
    Bug: 1443446, 1219990

* Ignore formatting for crates under `third_party` (#20390)

This changes adds a patch to add brave's own third party crates path to
the list of rust paths to be ignored during formatting.

* Merge pull request #20642 from brave/ios/bugfix/sync_all_history

* Merge pull request #20664 from brave/cr119-followup-disable-power-bookmarks

Disable kPowerBookmarksSidePanel feature flag

* [Android] Fix for private tab badge padding

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/37d04b2089c15cb152a8a559887a7d10c66572be

[APS] Update tooltip visibility and remove hover highlight for StatusView

- Remove tooltip when StatusIconView is not visible.
- remove hover highlight when StatusIconView is not visible(e.g. default engine is not Google).
- remove hover highlight when VerboseStatusText is visible(e.g. offline).

demo(default engine not Google): https://drive.google.com/file/d/1DPIhHtWN4RnjPvkysyCSfV_gd73ZMjPb/view?usp=sharing

demo(offline)
https://drive.google.com/file/d/1-1Y_t59i8AcxFv6sLpBE-kG2tsSGoi4s/view?usp=sharing

TODO: relocate the logic in StatusView to StatusViewBinder or StatusProperties.

Bug: 1476816, 1476802

* Merge pull request #20314 from brave/cr119

Upgrade from Chromium 118 to Chromium 119

---------

Co-authored-by: AlexeyBarabash <AlexeyBarabash@users.noreply.github.com>
Co-authored-by: Darnell Andries <dandries@brave.com>
Co-authored-by: Brandon-T <bthomas@brave.com>
Co-authored-by: Arthur Edelstein <aedelstein@brave.com>
Co-authored-by: cdesouza-chromium <cdesouza@brave.com>
Co-authored-by: Soner YUKSEL <grkmyksl@gmail.com>
Co-authored-by: Artem Samoilenko <artem@brave.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[iOS] [Sync] Enable History sync data type
3 participants