moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-29 20:32:15 -05:00
Code Issues Releases Wiki Activity

Merge branch 'dev/WO-100'

Browse Source
This commit is contained in:
Felix Hammerl 2013-11-11 18:04:33 +01:00
commit 046c0271c8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/controller/write.js
View File

@ -81,6 +81,7 @@ define(function(require) {
} }
// set display to insecure while fetching keys // set display to insecure while fetching keys
$scope.toKey = undefined;
displayInsecure(); displayInsecure();
// check if to address is contained in known public keys // check if to address is contained in known public keys
emailDao._keychain.getReceiverPublicKey($scope.to, function(err, key) { emailDao._keychain.getReceiverPublicKey($scope.to, function(err, key) {
@ -91,6 +92,7 @@ define(function(require) {
// compare again since model could have changed during the roundtrip // compare again since model could have changed during the roundtrip
if (key && key.userId === $scope.to) { if (key && key.userId === $scope.to) {
$scope.toKey = key;
displaySecure(); displaySecure();
$scope.$apply(); $scope.$apply();
} }
@ -135,7 +137,17 @@ define(function(require) {
// validate recipients // validate recipients
to = $scope.to.replace(/\s/g, '').split(/[,;]/); to = $scope.to.replace(/\s/g, '').split(/[,;]/);
if (!to || to.length < 1) { if (!to || to.length < 1) {
console.log('Seperate recipients with a comma!'); $scope.onError({
errMsg: 'Seperate recipients with a comma!'
});
return;
}
// only allow secure recipients until invitation is implemented
if (!$scope.toKey) {
$scope.onError({
errMsg: 'Invitations not yet supported!'
});
return; return;
} }