Closed Bug 694144 Opened 9 years ago Closed 9 years ago

Port syncAddDevice fixes from bug 690532 and bug 689428

Categories

(SeaMonkey :: Sync UI, defect)

defect
Not set

Tracking

(seamonkey2.7+ fixed)

RESOLVED FIXED
seamonkey2.7
Tracking Status
seamonkey2.7 + fixed

People

(Reporter: InvisibleSmiley, Assigned: InvisibleSmiley)

References

Details

Attachments

(2 files)

Bug 689428 and bug 690532 made changes to syncAddDevice which I'm consolidating here.

Bug 689428 (target: mozilla10 -> SM 2.7) is about a Sync API change which we need to port to avoid breakage (i.e. I assume we currently are broken, but haven't actually checked).

Bug 690532 is just a nice to have error check improvement.
Attachment #566631 - Flags: review?(neil)
Tracking+ due to Bug 689428
Comment on attachment 566631 [details] [diff] [review]
patch [Checkin: comment 3]

Well, sendWithPin no longer exists. But I wasn't able to pair two profiles...
Attachment #566631 - Flags: review?(neil) → review+
Comment on attachment 566631 [details] [diff] [review]
patch [Checkin: comment 3]

http://hg.mozilla.org/comm-central/rev/b91ee9125022

(In reply to neil@parkwaycc.co.uk from comment #2)
> I wasn't able to pair two profiles...

It also failed for me with a trunk build without the patch as the "new device" and a trunk build with the patch as the "donor". However it succeeded with a 2.4.1 build as the "new device", so either there's more missing to be ported for the accepting side (which would then be for another bug), or it requires two patched trunk builds to succeed. I'm currently building a Linux trunk build and will check with that then.
Attachment #566631 - Attachment description: patch → patch [Checkin: comment 3]
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
I guess we're missing 675823 part 2, esp. what startPairing/completePairing are doing; not so sure about sendCredentialsAfterSync (seems to be unused). I'll file a bug for just making it work again for now.
OK, I don't normally hijack fixed bugs, but all we need to fix the "new device" part and thus the whole pairing process is add two callback dummies, cf.:

http://mxr.mozilla.org/comm-central/source/mozilla/services/sync/modules/jpakeclient.js#104

So let's do this here in this related bug which is already tracking-sm2.7+. I already verified that the fix works. Without it there's an error message which pointed me at the solution.
Attachment #567340 - Flags: review?(neil)
Comment on attachment 567340 [details] [diff] [review]
fix pairing [Checkin: comment 7]

Yes, this works now. (I didn't think to try setting up sync from an old to a new build, thanks for pointing out that it was fixed by the previous patch.)
Attachment #567340 - Flags: review?(neil) → review+
Comment on attachment 567340 [details] [diff] [review]
fix pairing [Checkin: comment 7]

http://hg.mozilla.org/comm-central/rev/e708d4e7aa41
Attachment #567340 - Attachment description: fix pairing → fix pairing [Checkin: comment 7]
No longer blocks: sync2sm
You need to log in before you can comment on or make changes to this bug.