[git] GPGME - branch, master, updated. gpgme-1.11.1-239-g557fec6

[by Maximilian Krambach]

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 Made Easy".

The branch, master has been updated
       via  557fec600248e6ad413af01c9a53d4993f36af0c (commit)
      from  08cd34afb762975b0273575035dacf69449ef241 (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 557fec600248e6ad413af01c9a53d4993f36af0c
Author: Maximilian Krambach <maximilian.krambach at intevation.de>
Date:   Mon Aug 27 11:21:02 2018 +0200

    js: fix file_name return on decrypt
    
    --
    * src/gpgmejs: Line 228 checked the wrong variable. To avoid further
      confusion, _result was renamed to returnValue in the whole file

diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 1a5d557..5bdffeb 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -217,28 +217,28 @@ export class GpgME {
         putData(msg, data);
         return new Promise(function (resolve, reject){
             msg.post().then(function (result){
-                let _result = { data: result.data };
-                _result.format = result.format ? result.format : null;
+                let returnValue = { data: result.data };
+                returnValue.format = result.format ? result.format : null;
                 if (result.hasOwnProperty('dec_info')){
-                    _result.is_mime = result.dec_info.is_mime ? true: false;
+                    returnValue.is_mime = result.dec_info.is_mime ? true: false;
                     if (result.dec_info.file_name) {
-                        _result.file_name = result.dec_info.file_name;
+                        returnValue.file_name = result.dec_info.file_name;
                     }
                 }
-                if (!result.file_name) {
-                    _result.file_name = null;
+                if (!returnValue.file_name) {
+                    returnValue.file_name = null;
                 }
                 if (result.hasOwnProperty('info')
                     && result.info.hasOwnProperty('signatures')
                     && Array.isArray(result.info.signatures)
                 ) {
-                    _result.signatures = collectSignatures(
+                    returnValue.signatures = collectSignatures(
                         result.info.signatures);
                 }
-                if (_result.signatures instanceof Error){
-                    reject(_result.signatures);
+                if (returnValue.signatures instanceof Error){
+                    reject(returnValue.signatures);
                 } else {
-                    resolve(_result);
+                    resolve(returnValue);
                 }
             }, function (error){
                 reject(error);
@@ -330,18 +330,18 @@ export class GpgME {
                 if (!message.info || !message.info.signatures){
                     reject(gpgme_error('SIG_NO_SIGS'));
                 } else {
-                    let _result = {
+                    let returnValue = {
                         signatures: collectSignatures(message.info.signatures)
                     };
-                    if (_result.signatures instanceof Error){
-                        reject(_result.signatures);
+                    if (returnValue.signatures instanceof Error){
+                        reject(returnValue.signatures);
                     } else {
-                        _result.is_mime = message.info.is_mime? true: false;
+                        returnValue.is_mime = message.info.is_mime? true: false;
                         if (message.info.filename){
-                            _result.file_name = message.info.filename;
+                            returnValue.file_name = message.info.filename;
                         }
-                        _result.data = message.data;
-                        resolve(_result);
+                        returnValue.data = message.data;
+                        resolve(returnValue);
                     }
                 }
             }, function (error){

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

Summary of changes:
 lang/js/src/gpgmejs.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org