Skip to content

Commit d1bf788

Browse files
kylehuffkylehuff
committed
Replace logging utility
1 parent d55269e commit d1bf788

13 files changed

+110
-85
lines changed

‎extension/API/libwebpg/nativeMessaging.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ webpg.plugin = {
151151
window.addEventListener("message", function(event) {
152152
if (event.data.data.type === eventName ||
153153
event.data.data.type === "on" + eventName) {
154-
console.log("calling " + eventName + " type event for event type: " + event.data.data.type);
155-
console.log(event.data.data);
154+
webpg.utils.log()("calling " + eventName + " type event for event type: " + event.data.data.type);
155+
webpg.utils.log()(event.data.data);
156156
callback(event.data.data);
157157
}
158158
}, useCapture);
@@ -164,6 +164,9 @@ webpg.plugin = {
164164
@member webpg.nativeMessaging
165165
*/
166166
get_version: function() {
167+
if (navigator.userAgent.toLowerCase().search("chrome") === -1)
168+
return;
169+
167170
webpg.nativeMessaging.sendMessage(
168171
{"func": "get_version"},
169172
function(res) {
@@ -605,12 +608,12 @@ webpg.plugin = {
605608
},
606609

607610
gpgEnableKey: function(keyid, callback) {
608-
console.log(params);
611+
webpg.utils.log()(params);
609612
var args = {
610613
"func": "gpgEnableKey",
611614
"params": [keyid]
612615
}
613-
console.log(args);
616+
webpg.utils.log()(args);
614617
return webpg.nativeMessaging.nativeFunction(args, callback);
615618
},
616619

‎extension/background.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,19 @@ webpg.background = {
144144

145145
webpg.plugin.get_webpg_status(function(res) {
146146
webpg.plugin.webpg_status = res;
147-
webpg.utils.log("WebPG NPAPI Plugin valid: " + webpg.plugin.valid + "; version " + webpg.plugin.version);
147+
webpg.utils.log('INFO')("WebPG NPAPI Plugin valid: " + webpg.plugin.valid + "; version " + webpg.plugin.version);
148148

149149
// Set the users preferred option for the GnuPG binary
150150
if (webpg.plugin.valid) {
151151
var gnupgbin = webpg.preferences.gnupgbin.get();
152152
if (gnupgbin.length > 1) {
153153
webpg.plugin.gpgSetBinary(gnupgbin);
154-
webpg.utils.log("Setting GnuPG binary to user value: '" + gnupgbin + "'");
154+
webpg.utils.log('INFO')("Setting GnuPG binary to user value: '" + gnupgbin + "'");
155155
}
156156
var gpgconf = webpg.preferences.gpgconf.get();
157157
if (gpgconf.length > 1) {
158158
webpg.plugin.gpgSetGPGConf(gpgconf);
159-
webpg.utils.log("Setting GPGCONF binary to user value: '" + gpgconf + "'");
159+
webpg.utils.log('INFO')("Setting GPGCONF binary to user value: '" + gpgconf + "'");
160160
}
161161
}
162162

@@ -165,11 +165,11 @@ webpg.background = {
165165
this.banner_version = "9.4";
166166

167167
if (gnupghome.length > 0)
168-
webpg.utils.log("Setting GnuPG home directory to user value: '" + gnupghome + "'");
168+
webpg.utils.log('INFO')("Setting GnuPG home directory to user value: '" + gnupghome + "'");
169169
if (webpg.plugin.webpg_status.openpgp_detected)
170-
webpg.utils.log("Protocol OpenPGP is valid; v" + webpg.plugin.webpg_status.OpenPGP.version);
170+
webpg.utils.log('INFO')("Protocol OpenPGP is valid; v" + webpg.plugin.webpg_status.OpenPGP.version);
171171
if (webpg.plugin.webpg_status.gpgconf_detected)
172-
webpg.utils.log("Protocol GPGCONF is valid; v" + webpg.plugin.webpg_status.GPGCONF.version);
172+
webpg.utils.log('INFO')("Protocol GPGCONF is valid; v" + webpg.plugin.webpg_status.GPGCONF.version);
173173
//webpg.plugin.gpgSetHomeDir(gnupghome);
174174
webpg.plugin.addEventListener("keygenprogress", webpg.background.gpgGenKeyProgress, false);
175175
webpg.plugin.addEventListener("keygencomplete", webpg.background.gpgGenKeyComplete, false);
@@ -199,7 +199,7 @@ webpg.background = {
199199
webpg.background.tabIndex = 100;
200200
webpg.utils.tabListener.add();
201201
}
202-
webpg.utils.log("WebPG background initialized");
202+
webpg.utils.log('INFO')("WebPG background initialized");
203203
});
204204
// Display the welcome notice if appropriate
205205
var banner_version = webpg.preferences.banner_version.get();
@@ -374,7 +374,7 @@ webpg.background = {
374374
try {
375375
chrome.browserAction.setBadgeText({'text': request.badgeText, 'tabId': sender.tab.id});
376376
} catch (err) {
377-
webpg.utils.log(err.message);
377+
webpg.utils.log('ERROR')(err.message);
378378
}
379379
break;
380380

@@ -387,7 +387,7 @@ webpg.background = {
387387
break;
388388

389389
case 'decrypt':
390-
webpg.utils.log("gpgDecrypt requested");
390+
webpg.utils.log('INFO')("gpgDecrypt requested");
391391
webpg.plugin.gpgDecrypt(request.data, function(response) {
392392
response.original_text = request.data;
393393
if (response.error === true)
@@ -505,7 +505,7 @@ webpg.background = {
505505
break;
506506

507507
case 'async-gpgGenKey':
508-
webpg.utils.log("async-gpgGenKey requested");
508+
webpg.utils.log('INFO')("async-gpgGenKey requested");
509509
webpg.plugin.gpgGenKey(
510510
request.data.publicKey_algo,
511511
request.data.publicKey_size,
@@ -521,7 +521,7 @@ webpg.background = {
521521
break;
522522

523523
case 'async-gpgGenSubKey':
524-
webpg.utils.log("async-gpgGenSubKey requested");
524+
webpg.utils.log('INFO')("async-gpgGenSubKey requested");
525525
webpg.plugin.gpgGenSubKey(
526526
request.data.key_id,
527527
request.data.subKey_algo,
@@ -535,7 +535,7 @@ webpg.background = {
535535
break;
536536

537537
case 'doKeyImport':
538-
webpg.utils.log("doKeyImport requested");
538+
webpg.utils.log('INFO')("doKeyImport requested");
539539
request.bypassSendResult = true;
540540
function processResult(import_status) {
541541
if (import_status.error || !import_status.imports ||
@@ -560,7 +560,7 @@ webpg.background = {
560560
webpg.plugin.gpgImportKey(request.data, processResult);
561561
}
562562
} catch (err) {
563-
webpg.utils.log(err);
563+
webpg.utils.log('ERROR')(err);
564564
}
565565
};
566566
if (request.temp_context) {
@@ -595,14 +595,14 @@ webpg.background = {
595595
request.signers !== null &&
596596
request.signers.length > 0) ? request.signers : [];
597597
if (request.recipients.length > 0) {
598-
webpg.utils.log(request.data, request.recipients);
598+
webpg.utils.log('INFO')(request.data, request.recipients);
599599
webpg.plugin.gpgEncrypt(
600600
request.data,
601601
request.recipients,
602602
sign,
603603
signers,
604604
function(response) {
605-
webpg.utils.log(response);
605+
webpg.utils.log('INFO')(response);
606606
if (typeof(request.message_event)==='undefined' || request.message_event !== "gmail")
607607
webpg.utils.tabs.sendRequest(sender.tab, {
608608
"msg": "insertEncryptedData",
@@ -621,7 +621,7 @@ webpg.background = {
621621
break;
622622

623623
case 'encryptSign':
624-
webpg.utils.log("encrypt requested");
624+
webpg.utils.log('INFO')("encrypt requested");
625625
if (request.recipients && request.recipients.length > 0) {
626626
response = webpg.plugin.gpgEncrypt(request.data,
627627
request.recipients, 1, request.signers);
@@ -637,13 +637,13 @@ webpg.background = {
637637
break;
638638

639639
case 'symmetricEncrypt':
640-
webpg.utils.log("symmetric encryption requested");
640+
webpg.utils.log('INFO')("symmetric encryption requested");
641641
var signers = (typeof(request.signers)!=='undefined' &&
642642
request.signers !== null &&
643643
request.signers.length > 0) ? request.signers : [];
644644
var sign = (signers.length > 0) ? 1 : 0;
645645
webpg.plugin.gpgSymmetricEncrypt(request.data, sign, signers, function(response) {
646-
webpg.utils.log(request);
646+
webpg.utils.log('INFO')(request);
647647
if (request.message_event === "context" || request.message_event === "editor")
648648
webpg.utils.tabs.sendRequest(sender.tab, {
649649
"msg": "insertEncryptedData",
@@ -664,7 +664,7 @@ webpg.background = {
664664
break;
665665

666666
case 'deleteKey':
667-
webpg.utils.log("deleteKey requested");
667+
webpg.utils.log('INFO')("deleteKey requested");
668668
if (request.temp_context) {
669669
temp_path = webpg.plugin.getTemporaryPath();
670670
if (!temp_path)
@@ -682,7 +682,7 @@ webpg.background = {
682682
break;
683683

684684
case 'getNamedKey':
685-
webpg.utils.log("getNamedKey requested");
685+
webpg.utils.log('INFO')("getNamedKey requested");
686686
request.bypassSendResult = true;
687687
function getNamedKey() {
688688
webpg.plugin.getNamedKey(request.key_id, false, false, function(response) {
@@ -791,7 +791,7 @@ webpg.background = {
791791

792792
case 'log':
793793
response = null;
794-
webpg.utils.log("Remote log request recieved; ", request.data);
794+
webpg.utils.log('INFO')("Remote log request recieved; ", request.data);
795795
break;
796796

797797
case 'create_menu':
@@ -824,7 +824,7 @@ webpg.background = {
824824
break;
825825

826826
case 'sendPGPMIMEMessage':
827-
webpg.utils.log(request);
827+
webpg.utils.log('INFO')(request);
828828
webpg.plugin.sendMessage(request.params, function(response) {
829829
sendResponse({'result': response});
830830
});
@@ -886,7 +886,7 @@ webpg.background = {
886886
doc.body.removeEventListener('gpgkeylistprogress', contentWindow.webpg.keymanager.keylistprogress);
887887
} catch (err) {
888888
// We don't really care if it didn't already exist
889-
webpg.utils.log(err);
889+
webpg.utils.log('INFO')(err);
890890
} finally {
891891
// Add the listener
892892
doc.body.addEventListener('gpgkeylistprogress', contentWindow.webpg.keymanager.keylistprogress);
@@ -947,7 +947,7 @@ webpg.background = {
947947
doc.body.removeEventListener('progress', contentWindow.webpg.keymanager.progressMsg);
948948
} catch (err) {
949949
// We don't really care if it didn't already exist
950-
webpg.utils.log(err.message);
950+
webpg.utils.log('ERROR')(err.message);
951951
} finally {
952952
// Add the listener
953953
doc.body.addEventListener('progress', contentWindow.webpg.keymanager.progressMsg);

‎extension/browser_action_menu.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ var _ = webpg.utils.i18n.gettext;
1818

1919
var menuActions = {
2020
options: function(){
21-
console.log("options was selected");
21+
webpg.utils.log("INFO")("options was selected");
2222
url = chrome.extension.getURL('options.html') + "?auto_init=true&tab=0";
2323
chrome.tabs.create({ 'url': url });
2424
return false;
2525
},
2626

2727
key_manager: function(){
28-
console.log("key mangager was selected");
28+
webpg.utils.log("INFO")("key mangager was selected");
2929
url = chrome.extension.getURL('key_manager.html') + "?auto_init=true&tab=0";
3030
chrome.tabs.create({ 'url': url });
3131
return false;
3232
},
3333

3434
about: function(){
35-
console.log("about was selected");
35+
webpg.utils.log("INFO")("about was selected");
3636
url = chrome.extension.getURL('about.html');
3737
chrome.tabs.create({ 'url': url });
3838
return false;

‎extension/buttonbar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ webpg.jq(function() {
188188
'buttons': [{
189189
'text': _("Import"),
190190
'click': function() {
191-
//console.log(params, webpg.jq(this).find("#importkey_name")[0].value);
191+
//webpg.utils.log("INFO")(params, webpg.jq(this).find("#importkey_name")[0].value);
192192
var f = webpg.jq(this).find("#importkey_name")[0].files.item(0);
193193
var reader = new FileReader();
194194
var attempt = 0;
@@ -207,7 +207,7 @@ webpg.jq(function() {
207207
var result = {'error': true};
208208
result = webpg.plugin.gpgImportKey(e.target.result);
209209
if (result.considered < 1) {
210-
console.log(result);
210+
webpg.utils.log("INFO")(result);
211211
msg = ["<ul><li><strong><span class='error-text' style='padding-right:12px;'>",
212212
_("Error"), ":</span>", _("There was an error importing any keys in this file"),
213213
"</strong></li>"];

‎extension/constants.js

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ webpg.constants = {
3232
LOG: true
3333
},
3434

35+
LOG_LEVEL: {
36+
INFO: 'INFO',
37+
WARN: 'WARN',
38+
ERROR: 'ERROR'
39+
},
40+
3541
/*
3642
Constants: ff_prefTypes - Mozilla preference value type
3743

‎extension/dialog.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ webpg.dialog = {
232232
'class': 'webpg-dialog-insert-btn',
233233
'click': function() {
234234
if (!webpg.inline.action_selected) {
235-
console.log("no action has been selected");
235+
webpg.utils.log()("no action has been selected");
236236
webpg.jq('#dialog-pubkey-search-lbl').appendTo(
237237
webpg.jq(".ui-dialog-buttonpane")).css({
238238
'color': '#f11',
@@ -241,7 +241,7 @@ webpg.dialog = {
241241
}).text(_("no action has been selected")).show();
242242
return false;
243243
} else if (webpg.inline.before_action_value.selectionText === webpg.jq('#webpg-dialog-editor').val()) {
244-
console.log("no action has been successful");
244+
webpg.utils.log()("no action has been successful");
245245
webpg.jq('#dialog-pubkey-search-lbl').appendTo(
246246
webpg.jq(".ui-dialog-buttonpane")).css({
247247
'color': '#f11',

0 commit comments

Comments
 (0)