729609 - Special folders get duplicated during profile migration

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect, P2)

Description

[:Margaret Leibovic]

I also noticed that the "Mobile Bookmarks" from my places.sqlite was renamed to just "mobile". The duplicate special folders all had the correct children, but the original (empty) special folders also existed.

From the log:

02-22 10:07:22.768 14560 14568 I ProfMigr: Opening path: /mnt/sdcard/Android/data/org.mozilla.fennec_leibovic/files/mozilla/d5i7ydrt.default/places.sqlite
02-22 10:07:22.878 14560 14568 V ProfMigr: Name: places, pid=1, nid=0
02-22 10:07:22.898 14560 14568 V ProfMigr: Name: menu, pid=2, nid=3
02-22 10:07:22.898 14560 14568 V ProfMigr: Name: toolbar, pid=3, nid=2
02-22 10:07:22.908 14560 14568 V ProfMigr: Name: tags, pid=4, nid=4
02-22 10:07:22.908 14560 14568 V ProfMigr: Name: unfiled, pid=5, nid=5
02-22 10:07:23.078 14560 14568 D ProfMigr: Added folder: 2
02-22 10:07:23.118 14560 14568 D ProfMigr: Added folder: 3
02-22 10:07:23.148 14560 14568 D ProfMigr: Added folder: 4
02-22 10:07:23.188 14560 14568 D ProfMigr: Added folder: 5
02-22 10:07:23.228 14560 14568 D ProfMigr: Added folder: 8
02-22 10:07:24.010 14560 14568 D ProfMigr: Added folder: 240
02-22 10:07:24.070 14560 14568 D ProfMigr: Added folder: 244
02-22 10:07:24.340 14560 14568 D ProfMigr: Added folder: 250
02-22 10:07:24.640 14560 14568 D ProfMigr: Added folder: 256
02-22 10:07:24.680 14560 14568 D ProfMigr: Added folder: 257
02-22 10:07:24.740 14560 14568 D ProfMigr: Added folder: 258
02-22 10:07:24.780 14560 14568 D ProfMigr: Added folder: 259
02-22 10:07:24.830 14560 14568 D ProfMigr: Added folder: 260
02-22 10:07:25.280 14560 14568 D ProfMigr: Added folder: 265
02-22 10:07:25.320 14560 14568 D ProfMigr: Added folder: 266
02-22 10:07:25.370 14560 14568 D ProfMigr: Added folder: 267
02-22 10:07:25.410 14560 14568 D ProfMigr: Added folder: 268
02-22 10:07:25.470 14560 14568 D ProfMigr: Added folder: 269
02-22 10:07:25.520 14560 14568 D ProfMigr: Added folder: 270
02-22 10:07:25.560 14560 14568 I ProfMigr: Iteration = 1, added 37 bookmark(s), skipped 0 bookmark(s)
02-22 10:07:49.978 14560 14568 I ProfMigr: Profile migration finished

Comment 1

[Gian-Carlo Pascutto [:gcp]]

My code probes moz_bookmarks_roots in places, and then looks up the corresponding folders in the Android DB to set up a remapping. This appears to work correctly:

02-22 10:07:22.878 14560 14568 V ProfMigr: Name: places, pid=1, nid=0
02-22 10:07:22.898 14560 14568 V ProfMigr: Name: menu, pid=2, nid=3
02-22 10:07:22.898 14560 14568 V ProfMigr: Name: toolbar, pid=3, nid=2
02-22 10:07:22.908 14560 14568 V ProfMigr: Name: tags, pid=4, nid=4
02-22 10:07:22.908 14560 14568 V ProfMigr: Name: unfiled, pid=5, nid=5

However, when we are importing, we import those folders from places:

02-22 10:07:23.078 14560 14568 D ProfMigr: Added folder: 2
02-22 10:07:23.118 14560 14568 D ProfMigr: Added folder: 3
02-22 10:07:23.148 14560 14568 D ProfMigr: Added folder: 4
02-22 10:07:23.188 14560 14568 D ProfMigr: Added folder: 5

This is probably what causes the duplication.

Comment 2

[Gian-Carlo Pascutto [:gcp]]

Attachment: Patch 1. Don't import special folders for which we have a remapping

Simple patch which should avoid the duplication.

Comment 3

[:Margaret Leibovic]

Comment on attachment 599724 [details] [diff] [review]
Patch 1. Don't import special folders for which we have a remapping

This works for me, but I think Lucas should also take a look at this, since I'm not familiar with this code.

Comment 4

[Gian-Carlo Pascutto [:gcp]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e2ee770cc461

Comment 5

[Marco Bonardo [:mak]]

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