mirror of
https://github.com/moparisthebest/mail
synced 2025-02-07 02:20:14 -05:00
rename devicestorage for clarity
This commit is contained in:
parent
1ad8a2da46
commit
33205ff4d9
@ -335,7 +335,7 @@ define(function(require) {
|
||||
};
|
||||
|
||||
self.buildModules = function() {
|
||||
var lawnchairDao, restDao, pubkeyDao, emailDao, keychain, pgp, devicestorage, pgpbuilder;
|
||||
var lawnchairDao, restDao, pubkeyDao, emailDao, keychain, pgp, userStorage, pgpbuilder;
|
||||
|
||||
// start the mailreader's worker thread
|
||||
mailreader.startWorker(config.workerPath + '/../lib/mailreader-parser-worker.js');
|
||||
@ -345,14 +345,14 @@ define(function(require) {
|
||||
pubkeyDao = new PublicKeyDAO(restDao);
|
||||
lawnchairDao = new LawnchairDAO();
|
||||
|
||||
self._devicestorage = devicestorage = new DeviceStorageDAO(lawnchairDao);
|
||||
self._userStorage = userStorage = new DeviceStorageDAO(lawnchairDao);
|
||||
self._invitationDao = new InvitationDAO(restDao);
|
||||
self._keychain = keychain = new KeychainDAO(lawnchairDao, pubkeyDao);
|
||||
self._crypto = pgp = new PGP();
|
||||
self._pgpbuilder = pgpbuilder = new PgpBuilder();
|
||||
self._emailDao = emailDao = new EmailDAO(keychain, pgp, devicestorage, pgpbuilder, mailreader);
|
||||
self._outboxBo = new OutboxBO(emailDao, keychain, devicestorage);
|
||||
self._updateHandler = new UpdateHandler(self._appConfigStore, devicestorage);
|
||||
self._emailDao = emailDao = new EmailDAO(keychain, pgp, userStorage, pgpbuilder, mailreader);
|
||||
self._outboxBo = new OutboxBO(emailDao, keychain, userStorage);
|
||||
self._updateHandler = new UpdateHandler(self._appConfigStore, userStorage);
|
||||
};
|
||||
|
||||
/**
|
||||
@ -362,7 +362,7 @@ define(function(require) {
|
||||
self.buildModules();
|
||||
|
||||
// init user's local database
|
||||
self._devicestorage.init(options.emailAddress, function() {
|
||||
self._userStorage.init(options.emailAddress, function() {
|
||||
|
||||
// Migrate the databases if necessary
|
||||
self._updateHandler.update(onUpdate);
|
||||
|
@ -16,7 +16,7 @@ define(function(require) {
|
||||
controller._emailDao = emailDaoStub = sinon.createStubInstance(EmailDAO);
|
||||
controller._outboxBo = outboxStub = sinon.createStubInstance(OutboxBO);
|
||||
controller._appConfigStore = appConfigStoreStub = sinon.createStubInstance(DeviceStorageDAO);
|
||||
controller._devicestorage = devicestorageStub = sinon.createStubInstance(DeviceStorageDAO);
|
||||
controller._userStorage = devicestorageStub = sinon.createStubInstance(DeviceStorageDAO);
|
||||
controller._updateHandler = updateHandlerStub = sinon.createStubInstance(UpdateHandler);
|
||||
|
||||
isOnlineStub = sinon.stub(controller, 'isOnline');
|
||||
|
Loading…
Reference in New Issue
Block a user