From 61ac70cfb5cf58f92cd97abdde7152040c51201c Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Wed, 29 Aug 2018 17:45:55 +0200
Subject: js: return base64 after encrypt with armor=false

--

* src/gpgmejs.js/encrypt: the encrypted data were converted back to a
  (incorrect) string, whereas they should be data with no encoding
  specified. Returning base64 data is the expected way.
* DemoExtension: caught yet another usage of old syntax.
---
 lang/js/src/gpgmejs.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lang/js/src')

diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 08f80fc2..295cc043 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -154,8 +154,12 @@ export class GpgME {
         if (msg instanceof Error){
             return Promise.reject(msg);
         }
-        msg.setParameter('armor', armor);
-
+        if (armor === false){
+            msg.setParameter('armor', false);
+            msg.expected = 'base64';
+        } else if (armor === true) {
+            msg.setParameter('armor', true);
+        }
         if (base64 === true) {
             msg.setParameter('base64', true);
         }
-- 
cgit v1.2.3