This is a regression from bug 664792 where we made autoconnect in charge of the first sync. We should make it prompt for the MP.

Simply remove the bail out in Service._autoconnect if the master password is locked. This restored the previous behaviour: * we prompt for the MP on autoconnect * if the user cancels, we continue to schedule syncs at MASTER_PASSWORD_LOCKED_RETRY_INTERVAL (which is 15 minutes), rather than the singleDeviceInterval (which is 1 day)

Comment on attachment 545760 [details] [diff] [review] v1 Review of attachment 545760 [details] [diff] [review]: ----------------------------------------------------------------- I will file a followup to write an automated test that subsequent timed sync attempts do not attempt to access MP-protected credentials.

This is asking for the MP when you click the Connect button in setup. Is that correct? If you give the MP at that time, then proceed through setup, everything works fine.

(In reply to comment #4) > This is asking for the MP when you click the Connect button in setup. Is > that correct? Yes, this is correct. More crucially, though, once you have Sync set up and restart, about 10 seconds later you should get an MP prompt for the initial sync. If you enter your MP then, it will sync. If you deny it, it will not bother you anymore, but it will check every 15 minutes whether your MP is unlocked now (you may have unlocked it by some other means).

ok, yes, 10 seconds after restart we get the MP prompt. Cancelling it sets next sync to 15 minutes later. Instant sync triggers don't attempt to sync during the 15 minute MP interval. I assume that's expected, otherwise we get MP prompted relentlessly, right. However, at the expected time, MP does not prompt again and instant sync triggers don't fire a prompt either.

(In reply to comment #6) > ok, yes, 10 seconds after restart we get the MP prompt. Cancelling it sets > next sync to 15 minutes later. Instant sync triggers don't attempt to sync > during the 15 minute MP interval. I assume that's expected, otherwise we get > MP prompted relentlessly, right. Exactly. > However, at the expected time, MP does not prompt again and instant sync > triggers don't fire a prompt either. That is precisely the intended behaviour.

Comment on attachment 545760 [details] [diff] [review] v1 Request approval for Aurora since this is a regression caused by bug 664792 which is in Aurora. The risk is minimal and the fix has already been verified by Services QA.