Skip to content

Commit 1813d52

Browse files
committed
reclassify some routine events
1 parent 6c807dc commit 1813d52

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

extension/API/libwebpg/nativeMessaging.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,16 @@ webpg.nativeMessaging = {
136136
};
137137
this.onMessage.addListener = function(callback) {
138138
//webpg.utils.debug("adding listener");
139+
139140
process.stdout.on('data', function (data) {
140141
let data_array = Uint8Array.from(data, (c) => c.charCodeAt(0));
141142
port.parse(data_array, callback);
142143
});
143144

144-
//process.stderr.on('data', function (data) {
145-
//webpg.utils.info(data);
146-
//});
145+
process.stderr.on('data', function (data) {
146+
if (data.trim().length > 0)
147+
webpg.utils.info(data);
148+
});
147149

148150
process.on('close', function(code) {
149151
webpg.utils.debug("pid", process.pid, "closed with exit code", process.exitCode);

extension/background.js

+11-12
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ webpg.background = {
391391
break;
392392

393393
case 'decrypt':
394-
webpg.utils.info("gpgDecrypt requested");
394+
webpg.utils.debug("gpgDecrypt requested");
395395
webpg.plugin.gpgDecrypt(request.data, function(response) {
396396
response.original_text = request.data;
397397
if (response.error === true)
@@ -449,7 +449,7 @@ webpg.background = {
449449
break;
450450

451451
case 'verify':
452-
webpg.utils.info("gpgVerify requested");
452+
webpg.utils.debug("gpgVerify requested");
453453
var content,
454454
plaintext = (request.plaintext!==undefined) ?
455455
request.plaintext : null;
@@ -531,7 +531,7 @@ webpg.background = {
531531
break;
532532

533533
case 'async-gpgGenKey':
534-
webpg.utils.info("async-gpgGenKey requested");
534+
webpg.utils.debug("async-gpgGenKey requested");
535535
webpg.plugin.gpgGenKey(
536536
request.data.publicKey_algo,
537537
request.data.publicKey_size,
@@ -547,7 +547,7 @@ webpg.background = {
547547
break;
548548

549549
case 'async-gpgGenSubKey':
550-
webpg.utils.info("async-gpgGenSubKey requested");
550+
webpg.utils.debug("async-gpgGenSubKey requested");
551551
webpg.plugin.gpgGenSubKey(
552552
request.data.key_id,
553553
request.data.subKey_algo,
@@ -561,7 +561,7 @@ webpg.background = {
561561
break;
562562

563563
case 'doKeyImport':
564-
webpg.utils.info("doKeyImport requested");
564+
webpg.utils.debug("doKeyImport requested");
565565
request.bypassSendResult = true;
566566
function processResult(import_status) {
567567
if (import_status.error || !import_status.imports ||
@@ -607,7 +607,7 @@ webpg.background = {
607607
break;
608608

609609
case 'encrypt':
610-
webpg.utils.info("encrypt requested");
610+
webpg.utils.debug("encrypt requested");
611611
if (request.recipients.length > 0) {
612612
webpg.plugin.gpgEncrypt(
613613
request.data,
@@ -634,8 +634,7 @@ webpg.background = {
634634
break;
635635

636636
case 'encryptSign':
637-
webpg.utils.info("encrypt-sign requested");
638-
webpg.utils.info(request);
637+
webpg.utils.debug("encrypt-sign requested");
639638
if (request.recipients && request.recipients.length > 0) {
640639
response = webpg.plugin.gpgEncryptSign(
641640
request.data,
@@ -662,7 +661,7 @@ webpg.background = {
662661
break;
663662

664663
case 'symmetricEncrypt':
665-
webpg.utils.info("symmetric encryption requested");
664+
webpg.utils.debug("symmetric encryption requested");
666665
var signers = (typeof(request.signers)!=='undefined' &&
667666
request.signers !== null &&
668667
request.signers.length > 0) ? request.signers : [];
@@ -690,7 +689,7 @@ webpg.background = {
690689
break;
691690

692691
case 'deleteKey':
693-
webpg.utils.info("deleteKey requested");
692+
webpg.utils.debug("deleteKey requested");
694693
var restoreHome = function() {
695694
if (request.temp_context) {
696695
webpg.plugin.gpgSetHomeDir(gnupghome);
@@ -718,7 +717,7 @@ webpg.background = {
718717
break;
719718

720719
case 'getNamedKey':
721-
webpg.utils.info("getNamedKey requested");
720+
webpg.utils.debug("getNamedKey requested");
722721
request.bypassSendResult = true;
723722
var getNamedKey = function() {
724723
webpg.plugin.getNamedKey(request.key_id, false, false, function(response) {
@@ -863,7 +862,7 @@ webpg.background = {
863862
break;
864863

865864
case 'sendPGPMIMEMessage':
866-
webpg.utils.info(request);
865+
webpg.utils.debug(request);
867866
webpg.plugin.sendMessage(request.params, function(response) {
868867
sendResponse({'result': response});
869868
});

0 commit comments

Comments
 (0)