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

GPG show error on view/export

Browse source
This commit is contained in:
the-djmaze 2024-03-04 11:15:34 +01:00
parent d57300dd75
commit 5aa71a3ede
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Stores/User/GnuPG.js
View file

@ -97,6 +97,7 @@ export const GnuPGUserStore = new class {
} }
} catch (e) { } catch (e) {
Passphrases.delete(key); Passphrases.delete(key);
alert(e.message);
} }
} }
return key.armor; return key.armor;

4
snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
View file

@ -1114,9 +1114,9 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
foreach ($this->_openPipes->readPipeLines(self::FD_ERROR) as $line) { foreach ($this->_openPipes->readPipeLines(self::FD_ERROR) as $line) {
$this->_debug("\t{$line}"); $this->_debug("\t{$line}");
$errors[] = \preg_replace('/^gpg: /', '', $line); $errors[] = \preg_replace('/^gpg: /', '', $line);
if ($throw && (\str_contains($line, 'error') || \str_contains($line, 'failed'))) {
break 2;
} }
if ($throw && $errors) {
break;
} }
} }