1392802 - Local version not incremented after reconciliation of records unchanged locally since last sync

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Android Sync, enhancement, P1)

Description

[:Grisha Kruglov]

When bookmark records are merged during sync, local version is only bumped if a record was also modified locally since previous sync. See https://dxr.mozilla.org/mozilla-central/source/mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/BookmarksSessionHelper.java?q=path%3ABookmarksSessionHelper.java&redirect_type=single#440

Local version should be bumped if we made _any_ modifications to the record while merging. Otherwise we're going to not upload those changes.

Comment 1

[:Grisha Kruglov]

Attachment: Bug 1392802 - Increment localVersion while reconciling a bookmark if we modified its dateAdded t.s.

We might decide that there's an older dateAdded timestamp present for an incoming bookmark while processing it,
in which case we need to ensure that our changes will be uploaded.

Review commit: https://reviewboard.mozilla.org/r/174076/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/174076/

Comment 2

[Richard Newman [:rnewman]]

Comment on attachment 8902490 [details]
Bug 1392802 - Increment localVersion while reconciling a bookmark if we modified its dateAdded t.s.

https://reviewboard.mozilla.org/r/174076/#review179692

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a33490d5a193
Increment localVersion while reconciling a bookmark if we modified its dateAdded t.s. r=rnewman

Comment 4

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/a33490d5a193