Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert decrypt button enabling; allow to select sign key

Browse source
This commit is contained in:
Carles Escrig Royo 2016-04-20 19:56:14 +02:00
parent 12f619bda7
commit 412ba464c8
No known key found for this signature in database
GPG key ID: 5E6F07C704111773
5 changed files with 129 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

94
dev/View/Popup/ComposeOpenPgp.js
View file

@ -30,7 +30,8 @@
var self = this;
this.optionsCaption = Translator.i18n('PGP_NOTIFICATIONS/ADD_A_PUBLICK_KEY');
this.publicKeysOptionsCaption = Translator.i18n('PGP_NOTIFICATIONS/ADD_A_PUBLICK_KEY');
this.privateKeysOptionsCaption = Translator.i18n('PGP_NOTIFICATIONS/SELECT_A_PRIVATE_KEY');
this.addOptionClass = function (oDomOption, oItem)
{
self.defautOptionsAfterRender(oDomOption, oItem);
@ -50,6 +51,7 @@
this.buttonFocus = ko.observable(false);
this.text = ko.observable('');
this.selectedPrivateKey = ko.observable(null);
this.selectedPublicKey = ko.observable(null);
this.signKey = ko.observable(null);
@ -61,6 +63,20 @@
}));
}, this);
this.privateKeysOptions = ko.computed(function () {
return _.compact(_.flatten(_.map(PgpStore.openpgpkeysPrivate(), function (oKey, iIndex) {
return self.signKey() && self.signKey().key.id === oKey.id ? null :
_.map(oKey.users, function (sUser) {
return {
'id': oKey.guid,
'name': '(' + oKey.id.substr(-8).toUpperCase() + ') ' + sUser,
'key': oKey,
'class': iIndex % 2 ? 'odd' : 'even'
};
});
}), true));
});
this.publicKeysOptions = ko.computed(function () {
return _.compact(_.flatten(_.map(PgpStore.openpgpkeysPublic(), function (oKey, iIndex) {
return -1 < Utils.inArray(oKey, self.encryptKeysView()) ? null :
@ -233,6 +249,31 @@
return !this.submitRequest() && (this.sign() || this.encrypt());
});
this.selectCommand = Utils.createCommand(this, function () {
var
sKeyId = this.selectedPrivateKey(),
oKey = null,
aKeys = this.encryptKeys(),
oOption = sKeyId ? _.find(this.privateKeysOptions(), function (oItem) {
return oItem && sKeyId === oItem.id;
}) : null
;
if (oOption)
{
oKey = {
'empty': !oOption.key,
'selected': ko.observable(!!oOption.key),
'users': oOption.key.users,
'hash': oOption.key.id.substr(-8).toUpperCase(),
'key': oOption.key
};
this.signKey(oKey);
}
});
this.addCommand = Utils.createCommand(this, function () {
var
@ -248,7 +289,7 @@
aKeys.push({
'empty': !oOption.key,
'selected': ko.observable(!!oOption.key),
'removable': this.signKey().id !== oOption.key.id,
'removable': ko.observable(!this.sign() || !this.signKey() || this.signKey().key.id !== oOption.key.id),
'users': oOption.key.users,
'hash': oOption.key.id.substr(-8).toUpperCase(),
'key': oOption.key
@ -258,6 +299,24 @@
}
});
this.updateCommand = Utils.createCommand(this, function () {
var self = this;
_.each(this.encryptKeys(), function (oKey) {
oKey.removable(!self.sign() || !self.signKey() || self.signKey().key.id !== oKey.key.id);
});
});
this.selectedPrivateKey.subscribe(function (sValue) {
if (sValue)
{
this.selectCommand();
this.updateCommand();
}
}, this);
this.selectedPublicKey.subscribe(function (sValue) {
if (sValue)
{
@ -340,8 +399,10 @@
this.clearPopup();
var
self = this,
aRec = [],
sEmail = '',
aKeys = [],
oKey = null,
oEmail = new EmailModel()
;
@ -374,9 +435,10 @@
{
sEmail = oIdentity.email();
aRec.unshift(sEmail);
oKey = PgpStore.findPrivateKeyByEmailNotNative(sEmail);
if (oKey)
aKeys = PgpStore.findAllPrivateKeysByEmailNotNative(sEmail);
if (aKeys)
{
var oKey = aKeys[0];
this.signKey({
'users': oKey.users || [sEmail],
'hash': oKey.id.substr(-8).toUpperCase(),
@ -392,17 +454,19 @@
if (aRec && 0 < aRec.length)
{
this.encryptKeys(_.uniq(_.compact(_.map(aRec, function (sEmail) {
var oKey = PgpStore.findPublicKeyByEmailNotNative(sEmail) || null;
return {
'empty': !oKey,
'selected': ko.observable(!!oKey),
'removable': oIdentity && oIdentity.email() && oIdentity.email() !== sEmail,
'users': oKey ? (oKey.users || [sEmail]) : [sEmail],
'hash': oKey ? oKey.id.substr(-8).toUpperCase() : '',
'key': oKey
};
})), function (oEncryptKey) {
this.encryptKeys(_.uniq(_.compact(_.flatten(_.map(aRec, function (sEmail) {
var aKeys = PgpStore.findAllPublicKeysByEmailNotNative(sEmail);
return aKeys ? _.map(aKeys, function (oKey) {
return {
'empty': !oKey,
'selected': ko.observable(!!oKey),
'removable': ko.observable(!self.sign() || !self.signKey() || self.signKey().key.id !== oKey.id),
'users': oKey ? (oKey.users || [sEmail]) : [sEmail],
'hash': oKey ? oKey.id.substr(-8).toUpperCase() : '',
'key': oKey
};
}) : [];
}), true)), function (oEncryptKey) {
return oEncryptKey.hash;
}));