From 43392d775a7c83baed57bb897ad8f399a81eda4d Mon Sep 17 00:00:00 2001 From: Luca Saiu Date: Fri, 24 Sep 2021 11:49:16 +0200 Subject: [PATCH] adapt to the engine changes in ENGINE-959 --- src/message_cache.cc | 6 ++---- src/message_cache.hh | 2 -- test/framework/framework.cc | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/message_cache.cc b/src/message_cache.cc index e83bad3..615355b 100644 --- a/src/message_cache.cc +++ b/src/message_cache.cc @@ -24,10 +24,9 @@ namespace pEp { message *src, message **dst, stringlist_t **keylist, - PEP_rating *rating, PEP_decrypt_flags_t *flags) { - return message_cache.decrypt_message(session, src, dst, keylist, rating, flags); + return message_cache.decrypt_message(session, src, dst, keylist, flags); } PEP_STATUS MessageCache::cache_mime_encode_message( @@ -314,7 +313,6 @@ namespace pEp { message *src, message **dst, stringlist_t **keylist, - PEP_rating *rating, PEP_decrypt_flags_t *flags) { if (!src || cacheID(src) == "") @@ -332,7 +330,7 @@ namespace pEp { correctAttachmentsOrder(src->attachments); ::message *_dst = nullptr; - PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, rating, flags); + PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, flags); *dst = empty_message_copy(_dst, _id, true); { diff --git a/src/message_cache.hh b/src/message_cache.hh index cd4aa2e..6a53366 100644 --- a/src/message_cache.hh +++ b/src/message_cache.hh @@ -53,7 +53,6 @@ namespace pEp { message *src, message **dst, stringlist_t **keylist, - PEP_rating *rating, PEP_decrypt_flags_t *flags); static PEP_STATUS cache_encrypt_message( @@ -98,7 +97,6 @@ namespace pEp { message *src, message **dst, stringlist_t **keylist, - PEP_rating *rating, PEP_decrypt_flags_t *flags); PEP_STATUS encrypt_message( diff --git a/test/framework/framework.cc b/test/framework/framework.cc index 51b1618..630255a 100644 --- a/test/framework/framework.cc +++ b/test/framework/framework.cc @@ -133,9 +133,8 @@ namespace pEp { ::message *_dst; stringlist_t *keylist; - ::PEP_rating rating; ::PEP_decrypt_flags_t flags = 0; - ::PEP_STATUS status = ::decrypt_message(Adapter::session(), msg.get(), &_dst, &keylist, &rating, &flags); + ::PEP_STATUS status = ::decrypt_message(Adapter::session(), msg.get(), &_dst, &keylist, &flags); throw_status(status); Message dst; @@ -143,6 +142,7 @@ namespace pEp { dst = make_message(_dst); else dst = msg; + ::PEP_rating rating = dst.get()->rating; if (dst.get()->attachments) { for (auto a = dst.get()->attachments; a && a->value; a = a->next) {