Bug 1361818 - Make sure TPS is aware sync's collection.get method is asynchronous now r?markh
Ideally we'd convert this to promises, but this function is already full of
promiseSpinningly's and removing them all is too much work for this bug.
MozReview-Commit-ID: 144JFRwejTb
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -619,17 +619,17 @@ var TPS = {
let collection = bookmarkEngine.itemSource();
let collectionKey = bookmarkEngine.service.collectionKeys.keyForCollection(bookmarkEngine.name);
collection.full = true;
let items = [];
collection.recordHandler = function(item) {
item.decrypt(collectionKey);
items.push(item.cleartext);
};
- collection.get();
+ Async.promiseSpinningly(collection.get());
return items;
};
let serverRecordDumpStr;
try {
Logger.logInfo("About to perform bookmark validation");
let clientTree = Async.promiseSpinningly(PlacesUtils.promiseBookmarksTree("", {
includeItemIds: true
}));