From 33205ff4d91f6976df41d693eb12e4b361b31b38 Mon Sep 17 00:00:00 2001
From: Felix Hammerl <mail@felixhammerl.com>
Date: Tue, 11 Mar 2014 18:15:33 +0100
Subject: [PATCH] rename devicestorage for clarity

---
 src/js/app-controller.js             | 12 ++++++------
 test/new-unit/app-controller-test.js |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/app-controller.js b/src/js/app-controller.js
index 9730118..a40c1cd 100644
--- a/src/js/app-controller.js
+++ b/src/js/app-controller.js
@@ -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);
diff --git a/test/new-unit/app-controller-test.js b/test/new-unit/app-controller-test.js
index 6d25762..4214299 100644
--- a/test/new-unit/app-controller-test.js
+++ b/test/new-unit/app-controller-test.js
@@ -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');