[git] GPGME - branch, javascript-binding, updated. gpgme-1.11.1-92-gd65a392
by Maximilian Krambach
cvs at cvs.gnupg.org
Thu Aug 16 17:06:59 CEST 2018
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, javascript-binding has been updated
via d65a392670888f86071ca629266ec14b7afb0e46 (commit)
via ea43158d4043b01058afd7411c84aa38b61c2009 (commit)
from 43cff5136459c5bca4dca66772eb815f5761c6cd (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 d65a392670888f86071ca629266ec14b7afb0e46
Author: Maximilian Krambach <maximilian.krambach at intevation.de>
Date: Thu Aug 16 17:07:29 2018 +0200
js: fix import feedback
--
* src/Keyring.js For Key imports without prepare_sync the import
feedback was lacking the summary
diff --git a/lang/js/src/Keyring.js b/lang/js/src/Keyring.js
index 93923c6..eb4f60f 100644
--- a/lang/js/src/Keyring.js
+++ b/lang/js/src/Keyring.js
@@ -327,7 +327,15 @@ export class GPGME_Keyring {
status: infos[fprs[i]].status
});
}
- resolve(resultset);
+ let summary = {};
+ for (let i=0; i < feedbackValues.length; i++ ){
+ summary[feedbackValues[i]] =
+ response[feedbackValues[i]];
+ }
+ resolve({
+ Keys:resultset,
+ summary:summary
+ });
}
}, function(error){
commit ea43158d4043b01058afd7411c84aa38b61c2009
Author: Maximilian Krambach <maximilian.krambach at intevation.de>
Date: Thu Aug 16 14:40:53 2018 +0200
js: avoid async getters
--
* src/Key.js get armored was returning a promise on async keys.
As getters should not do that, it returns an error in this case.
diff --git a/lang/js/src/Key.js b/lang/js/src/Key.js
index eeb2703..aa41905 100644
--- a/lang/js/src/Key.js
+++ b/lang/js/src/Key.js
@@ -303,7 +303,11 @@ export class GPGME_Key {
* @returns {String|GPGME_Error} The armored public Key block.
*/
get armored(){
- return this.get('armored', true);
+ if (this.isAsync === true){
+ return gpgme_error('KEY_NO_INIT');
+ } else {
+ return this.get('armored');
+ }
}
}
@@ -389,15 +393,6 @@ class GPGME_UserId {
}
/**
- * Validates a subkey property against {@link validUserIdProperties} and
- * sets it if validation is successful
- * @param {String} property
- * @param {*} value
- * @param private
- */
-
-
- /**
* Fetches information about the user
* @param {String} property Information to request
* @returns {String | Number}
-----------------------------------------------------------------------
Summary of changes:
lang/js/src/Key.js | 15 +++++----------
lang/js/src/Keyring.js | 10 +++++++++-
2 files changed, 14 insertions(+), 11 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list