Merge branch 'ikloecker/t6342-gpgtar' into master

--
Solved conflicts:
	NEWS
	lang/cpp/src/context.cpp
	lang/cpp/src/context.h

1 files changed, 26 insertions, 0 deletions

diff --git a/lang/qt/src/protocol_p.h b/lang/qt/src/protocol_p.h
index 915fef99..73405c6d 100644
--- a/lang/qt/src/protocol_p.h
+++ b/lang/qt/src/protocol_p.h
@@ -46,7 +46,9 @@
 #include "qgpgmedeletejob.h"
 #include "qgpgmedownloadjob.h"
 #include "qgpgmesignencryptjob.h"
+#include "qgpgmeencryptarchivejob.h"
 #include "qgpgmeencryptjob.h"
+#include "qgpgmesignarchivejob.h"
 #include "qgpgmesignjob.h"
 #include "qgpgmesignkeyjob.h"
 #include "qgpgmeexportjob.h"
@@ -506,6 +508,30 @@ public:
         }
         return new QGpgME::QGpgMESetPrimaryUserIDJob{context};
     }
+
+    QGpgME::EncryptArchiveJob *encryptArchiveJob(bool armor) const override
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return nullptr;
+        }
+        if (auto context = GpgME::Context::createForProtocol(mProtocol)) {
+            context->setArmor(armor);
+            return new QGpgME::QGpgMEEncryptArchiveJob{context};
+        }
+        return nullptr;
+    }
+
+    QGpgME::SignArchiveJob *signArchiveJob(bool armor) const override
+    {
+        if (mProtocol != GpgME::OpenPGP) {
+            return nullptr;
+        }
+        if (auto context = GpgME::Context::createForProtocol(mProtocol)) {
+            context->setArmor(armor);
+            return new QGpgME::QGpgMESignArchiveJob{context};
+        }
+        return nullptr;
+    }
 };
 
 }