added exception handling for password/login

src/js/crypto/crypto.js

@@ -41,7 +41,15 @@ app.crypto.Crypto = function(window, util) {
 				keyStore.persist(storageId, storedKey);
 			} else {
 				// decrypt key
-				symmetricUserKey = aes.decrypt(storedKey.encryptedKey, pbkdf2, storedKey.keyIV);
+				try {
+					symmetricUserKey = aes.decrypt(storedKey.encryptedKey, pbkdf2, storedKey.keyIV);
+				} catch (ex) {
+					callback({
+						errMsg: 'Wrong password!'
+					});
+					return;
+				}
+
 			}
 			keyId = storedKey._id;
 

src/js/dao/email-dao.js

@@ -29,7 +29,12 @@ app.dao.EmailDAO = function(_, crypto, devicestorage, cloudstorage, naclCrypto,
 		});
 
 		function initCrypto() {
-			crypto.init(account.get('emailAddress'), password, account.get('symKeySize'), account.get('symIvSize'), function() {
+			crypto.init(account.get('emailAddress'), password, account.get('symKeySize'), account.get('symIvSize'), function(err) {
+				if (err) {
+					callback(err);
+					return;
+				}
+
 				initNaclCrypto();
 			});
 		}

src/js/view/login-view.js

@@ -39,8 +39,13 @@
 				textVisible: true,
 				theme: 'c'
 			});
-			this.dao.init(account, password, function() {
+			this.dao.init(account, password, function(err) {
 				$.mobile.loading('hide');
+				if (err) {
+					window.alert(err.errMsg);
+					return;
+				}
+
 				window.location = '#accounts/' + account.get('emailAddress') + '/folders';
 			});
 		}