Merge branch 'new_ui' into pgp

src/js/controller/login.js

@@ -21,14 +21,23 @@ define(function(require) {
         });
 
         function login(password, callback) {
+            // get OAuth token from chrome
             appController.fetchOAuthToken(password, function(err) {
                 if (err) {
                     console.error(err);
                     return;
                 }
 
+                // login to imap backend
+                appController._emailDao.imapLogin(function(err) {
+                    if (err) {
+                        console.error(err);
+                        return;
+                    }
+
                     callback();
                 });
+            });
         }
 
         function onLogin() {

src/js/controller/mail-list.js

@@ -8,7 +8,7 @@ define(function(require) {
     var MailListCtrl = function($scope) {
         var offset = 0,
             num = 100,
-            loggedIn = false;
+            firstSelect = true;
 
         emailDao = appController._emailDao;
 
@@ -73,6 +73,7 @@ define(function(require) {
         //
 
         function initList() {
+            firstSelect = true;
             updateStatus('Read cache ...');
 
             // list messaged from local db
@@ -80,41 +81,12 @@ define(function(require) {
                 folder: getFolder().path,
                 offset: offset,
                 num: num
-            }, function() {
+            }, function sync() {
-                if (loggedIn) {
-                    // user is already logged in
-                    sync();
-                    return;
-                }
-                // login to imap
-                loginImap(function() {
-                    loggedIn = true;
-                    sync();
-                });
-            });
-
-            function sync() {
                 updateStatus('Syncing ...');
                 $scope.$apply();
 
                 // sync imap folder to local db
                 $scope.synchronize();
-            }
-        }
-
-        function loginImap(callback) {
-            updateStatus('Login ...');
-            $scope.$apply();
-
-            emailDao.imapLogin(function(err) {
-                if (err) {
-                    console.log(err);
-                    updateStatus('Error on login!');
-                    $scope.$apply();
-                    return;
-                }
-
-                callback();
             });
         }
 
@@ -187,13 +159,13 @@ define(function(require) {
         }
 
         function markAsRead(email) {
-            email.unread = false;
+            // don't mark top selected email automatically
-
+            if (firstSelect) {
-            // only update imap state if user is logged in
+                firstSelect = false;
-            if (!loggedIn) {
                 return;
             }
 
+            email.unread = false;
             emailDao.imapMarkMessageRead({
                 folder: getFolder().path,
                 uid: email.uid

src/js/controller/navigation.js

@@ -11,9 +11,9 @@ define(function(require) {
 
         initFolders(function(folders) {
             $scope.folders = folders;
-            $scope.apply();
             // select inbox as the current folder on init
             $scope.openFolder($scope.folders[0]);
+            $scope.$apply();
         });
 
         //