Merge pull request 'LIB-17' (#12) from LIB-17 into master

Reviewed-on: https://gitea.pep.foundation/pEp.foundation/libpEpAdapter/pulls/12

src/message_cache.cc

@@ -25,10 +25,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(
@@ -270,6 +269,8 @@ namespace pEp {
             dst->opt_fields->next = dup(src->opt_fields);
         }
 
+        dst->rating = src->rating;
+
         return dst;
     }
 
@@ -315,7 +316,6 @@ namespace pEp {
         message *src,
         message **dst,
         stringlist_t **keylist,
-        PEP_rating *rating,
         PEP_decrypt_flags_t *flags)
     {
         if (!src || cacheID(src) == "")
@@ -333,7 +333,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);
 
         {

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(

test/framework/framework.cc

@@ -132,15 +132,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;
@@ -148,6 +141,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) {