From d23bdbc172a5ddcb2c2d2bae486b98ee0d02f181 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Tue, 3 Dec 2013 20:25:39 +0100
Subject: [PATCH] fix login existing and do scope.apply after email dao sync

---
 src/js/controller/login-new-device.js | 5 ++++-
 src/js/controller/mail-list.js        | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/controller/login-new-device.js b/src/js/controller/login-new-device.js
index eab846f..fbc2d1c 100644
--- a/src/js/controller/login-new-device.js
+++ b/src/js/controller/login-new-device.js
@@ -39,7 +39,10 @@ define(function(require) {
                     encryptedKey: $scope.key.privateKeyArmored
                 };
 
-                emailDao.unlock(keypair, $scope.passphrase, function(err) {
+                emailDao.unlock({
+                    keypair: keypair,
+                    passphrase: $scope.passphrase
+                }, function(err) {
                     if (err) {
                         $scope.incorrect = true;
                         $scope.onError(err);
diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index 1bf39d8..0d2731b 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -88,9 +88,10 @@ define(function(require) {
 
                 // sort emails
                 displayEmails(getFolder().messages);
-
                 // display last update
                 updateStatus('Last update: ', new Date());
+
+                $scope.$apply();
             });
         };