[git] GpgOL - branch, master, updated. gpgol-1.4.0-278-g1a7f63c

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  1a7f63cc4d9089e9f4a36b78b52e62f20a17364a (commit)
       via  6c777017d2171af2a4e8ddbcaacb9e35373eb575 (commit)
       via  0bbee29ac7054b9e570654cc358ad34c6c47db1f (commit)
      from  11f337486e24cb49cb8074d15794ec037b627567 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a7f63cc4d9089e9f4a36b78b52e62f20a17364a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Aug 21 12:05:58 2017 +0200

    Improve formatting if VS-NFD is active
    
    * src/mail.cpp (Mail::get_crypto_details): Add a linefeed.

diff --git a/src/mail.cpp b/src/mail.cpp
index a4c21e5..e819434 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1991,6 +1991,10 @@ Mail::get_crypto_details()
              }
            message += "\n\n";
          }
+       else
+         {
+           message += "\n";
+         }
      }
    if (hasConflict)
     {

commit 6c777017d2171af2a4e8ddbcaacb9e35373eb575
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Aug 21 12:05:24 2017 +0200

    Fix message for unsigned mails
    
    * src/mail.cpp (Mail::get_crypto_details): Return earlier.

diff --git a/src/mail.cpp b/src/mail.cpp
index 2dc0389..a4c21e5 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1769,9 +1769,10 @@ Mail::get_crypto_details()
              message += _("The encryption was not VS-NfD-compliant.");
            }
         }
-      message += "\n";
+      message += "\n\n";
       message += _("You cannot be sure who sent the message because "
                    "it is not signed.");
+      return message;
     }
 
   bool keyFound = true;

commit 0bbee29ac7054b9e570654cc358ad34c6c47db1f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Aug 21 12:04:22 2017 +0200

    Handle Symmetric encryption
    
    * src/mail.cpp (Mail::parsing_done, Mail::update_categories)
    (Mail::is_encrypted): Use decryptResult.isNull instead of numRecp.
    
    --
    For symmetric encryption we have no recipients.

diff --git a/src/mail.cpp b/src/mail.cpp
index 77d5f29..2dc0389 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -847,7 +847,7 @@ Mail::parsing_done()
   m_verify_result = m_parser->verify_result ();
 
   m_crypto_flags = 0;
-  if (m_decrypt_result.numRecipients())
+  if (!m_decrypt_result.isNull())
     {
       m_crypto_flags |= 1;
     }
@@ -1507,10 +1507,8 @@ Mail::update_categories ()
       remove_category (m_mailitem, verifyCategory);
     }
 
-  if (m_decrypt_result.numRecipients())
+  if (!m_decrypt_result.isNull())
     {
-      /* We use the number of recipients as we don't care
-         if decryption was successful or not for this category */
       add_category (m_mailitem, decCategory);
     }
   else
@@ -1534,7 +1532,7 @@ Mail::is_signed() const
 bool
 Mail::is_encrypted() const
 {
-  return m_decrypt_result.numRecipients() > 0;
+  return !m_decrypt_result.isNull();
 }
 
 int

-----------------------------------------------------------------------

Summary of changes:
 src/mail.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org