From 2fa3508c110478deb253b3cd0b2f0561c30270b9 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 19 Feb 2024 17:35:48 +0100 Subject: [PATCH] Rename MessagePgpVerify action to PgpVerifyMessage --- dev/Stores/User/GnuPG.js | 2 +- dev/Stores/User/OpenPGP.js | 2 +- snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js index a3374ced0..8b79d8eb5 100644 --- a/dev/Stores/User/GnuPG.js +++ b/dev/Stores/User/GnuPG.js @@ -206,7 +206,7 @@ export const GnuPGUserStore = new class { data.bodyPart = data.bodyPart.raw; data.sigPart = data.sigPart.body; } - let response = await Remote.post('MessagePgpVerify', null, data); + let response = await Remote.post('PgpVerifyMessage', null, data); if (response?.Result) { return { fingerprint: response.Result.fingerprint, diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js index 3dacf945f..79567e185 100644 --- a/dev/Stores/User/OpenPGP.js +++ b/dev/Stores/User/OpenPGP.js @@ -239,7 +239,7 @@ export const OpenPGPUserStore = new class { data.tryGnuPG = 0; let response; if (data.sigPartId) { - response = await Remote.post('MessagePgpVerify', null, data); + response = await Remote.post('PgpVerifyMessage', null, data); } else if (data.bodyPart) { // MimePart response = { Result: { text: data.bodyPart.raw, signature: data.sigPart.body } }; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php index 1c4722413..1429260cd 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php @@ -10,10 +10,6 @@ use MailSo\Mime\Enumerations\Header as MimeEnumHeader; trait Pgp { - /** - * Also see trait Messages::DoMessagePgpVerify - */ - public function DoGetPGPKeys() : array { $result = []; @@ -295,7 +291,7 @@ trait Pgp /** * https://datatracker.ietf.org/doc/html/rfc3156#section-5 */ - public function DoMessagePgpVerify() : array + public function DoPgpVerifyMessage() : array { $sFolderName = $this->GetActionParam('folder', ''); $iUid = (int) $this->GetActionParam('uid', 0);