748898 - Use "mobile" as title for Mobile Bookmarks folder on upload

Status: VERIFIED FIXED

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

Description

[Richard Newman [:rnewman]]

Works around Bug 747699.

Should (I'm testing now) cause most desktop reconciling/"Firefox Support" dupe/etc. bugs to disappear.

Comment 1

[Richard Newman [:rnewman]]

https://github.com/mozilla-services/android-sync/pull/175

Literally a one-line change (plus test changes, of course).

I've tested this by hand; Tracy has offered to try out my own build later today.

Comment 2

[Tracy Walker [:tracy]]

from rnewman irc:

in particular, this should fix the situation where you pair a new Android device with a desktop profile that already has the mobile bookmarks from another fennec. previously those would be duplicated. now they should not.

I verified the above is true with his people build.  Content of new Android mobile bookmarks is merged into the pre-existing Mobile Bookmarks folder on desktop.

Comment 3

[Tracy Walker [:tracy]]

Hmmm, however,  default bookmarks on fennec appear to be duplicated on fennec.  Fennec start page is duplicated on Desktop, but none of the other defaults from Fennec are duplicated.

Comment 4

[Tracy Walker [:tracy]]

This may be caused by having used nightly to get mobile bookmarks onto desktop, then nuking it and installing the test build. Then using the same Sync account. In testing wipe other from desktop it list both the Nightly and the Fennec build.

Comment 5

[Richard Newman [:rnewman]]

(In reply to Tracy Walker [:tracy] from comment #4)
> This may be caused by having used nightly to get mobile bookmarks onto
> desktop, then nuking it and installing the test build. Then using the same
> Sync account.

Do they have the same URLs and titles? E.g., I see "Firefox: Customize with add-ons" having two different URLs:

https://addons.mozilla.org/en-US/mobile/
https://addons.mozilla.org/en-US/android/

> In testing wipe other from desktop it list both the Nightly
> and the Fennec build.

That's fine: we don't clean up our client record when uninstalled (we can't).

Comment 6

[Tracy Walker [:tracy]]

Ack, I can't tell now.  wipe client cleaned it all up.

Comment 7

[Richard Newman [:rnewman]]

Just tested this myself with one Android, one desktop, where the desktop had existing mobile bookmarks; merge was successful, with no dupes on mobile and missing records created correctly on desktop. Subsequent deletes preserve order.

Comment 8

[Richard Newman [:rnewman]]

Implemented a slightly more thorough and safe extension to this: we translate input and output records into our defined set of folder titles, which means we safely handle any kind of parent name, so long as we know the GUID locally.

You can test this by syncing a slightly older Fennec (which will upload records with parentName = "Mobile Bookmarks"), then pairing a Fennec with this fix. You'll see

V/BrowserRepoSession(31460): Replacing parent name "Mobile Bookmarks" with "mobile".

in the log (if you have VERBOSE enabled), and you'll get correct merging on both mobile and desktop.

Will land shortly.

Comment 9

[Richard Newman [:rnewman]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/448c7052c962

Comment 10

[Richard Newman [:rnewman]]

Attachment: Patch.

[Approval Request Comment]
Fennec release blocker, could probably qualify as a beta blocker.

User impact if declined: 
  Potential bookmark duplication on desktop (or mobile, in theory).

Testing completed (on m-c, etc.): 
  Landed on m-i; will get QA before Aurora uplift.

Risk to taking this patch (and alternatives if risky):
  Minimal; could have a negative effect on bookmark reconciling, but none observed during testing, and should in any case be better than the current state.

String changes made by this patch:
  None

*sigh* didn't qref to add r= in inbound; that patch is r=liuche.

Fixed for this.

Comment 11

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/448c7052c962

Comment 12

[Richard Newman [:rnewman]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/4dcc2d5428c7

Comment 13

[Andreea Pod]

Based on comment 2, I synced 2 devices with a new sync account and the mobile bookmarks appeared only once.
Verified fixed on: Firefox 15.0a1 (2012-05-30)
Device: LG Optimus 2X (Android 2.2.2)