change of heart on how to migrate legacy storage

This commit is contained in:
gorhill 2017-03-25 10:57:11 -04:00
parent 1b1e982835
commit 419fad084e
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
2 changed files with 11 additions and 8 deletions

View file

@ -46,6 +46,9 @@ function startup({ webExtension }) {
});
return true;
}
if ( message.what === 'webext:storageMigrateDone' ) {
browser.runtime.onMessage.removeListener(onMessage);
}
if ( typeof callback === 'function' ) {
callback();
}
@ -262,13 +265,6 @@ var getStorageMigrator = function() {
let markAsDone = function() {
close();
let { Services } = Components.utils.import('resource://gre/modules/Services.jsm', null),
path = Services.dirsvc.get('ProfD', Components.interfaces.nsIFile);
path.append('extension-data');
path.append(hostName + '.sqlite');
if ( path.exists() && path.isFile() ) {
path.renameTo(null, hostName + '.migrated.sqlite');
}
};
return {

View file

@ -52,7 +52,14 @@
});
};
migrateNext();
self.browser.storage.local.get('legacyStorageMigrated', bin => {
if ( bin && bin.legacyStorageMigrated ) {
self.browser.runtime.sendMessage({ what: 'webext:storageMigrateDone' });
return callback();
}
self.browser.storage.local.set({ legacyStorageMigrated: true });
migrateNext();
});
};
µb.onBeforeStartQueue.push(migrateAll);