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

Fixed PGP import

Browse source
This commit is contained in:
RainLoop Team 2015-03-26 16:46:17 +04:00
parent c4aabb0cd4
commit 470b3645e2
5 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/View/Popup/AddOpenPgpKey.js
View file

@ -41,8 +41,11 @@
oOpenpgpKeyring = PgpStore.openpgpKeyring
;
sKey = sKey.replace(/[\r\n]([a-zA-Z0-9]{2,}:[^\r\n]+)[\r\n]+([a-zA-Z0-9\/\\+=]{10,})/g, '\n$1!-!N!-!$2')
.replace(/[\n\r]+/g, '\n').replace(/!-!N!-!/g, '\n\n');
if (/[\n]/.test(sKey))
{
sKey = sKey.replace(/[\r]+/g, '')
.replace(/[\n]{2,}/g, '\n\n');
}
this.key.error('' === sKey);