Merge branch 'master' of github.com:RC1140/cr-gpg

RC1140 · Aug 30, 2012 · e91576f · e91576f
2 parents 9109bc9 + ab9e5e2
commit e91576f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/chromeExtension/background.js b/chromeExtension/background.js
@@ -35,11 +35,7 @@ if (request.messageType == 'encrypt'){
 }else if(request.messageType == 'sign'){
     var signing_key = plugin0().gpgGetPreference('default-key').value
     var sign_status = plugin0().gpgSignText([signing_key],request.sign.message, 2);
-    console.log(sign_status);
-    if (!sign_status.error && sign_status.data.length > 0) {
-        sendResponse({message: sign_status.data,domid:request.sign.domel});
-    };
-
+    sendResponse({message: sign_status,domid:request.sign.domel});
 }else if(request.messageType == 'verify'){    
     var verify_status = plugin0().gpgVerify(request.verify.message);
     sendResponse({message: verify_status ,domid:request.verify.domel})

diff --git a/chromeExtension/popup.js b/chromeExtension/popup.js
@@ -19,14 +19,13 @@ $(document).ready(function(){
     });
 
     $('.sign').click(function(){
-        var signing_key = plugin0().gpgGetPreference('default-key').value;
-        var sign_status = plugin0().gpgSignText([signing_key],$('#sigmessage').val(), 2);
-        if(!sign_status.error){
-            $('#sigmessage').val(sign_status.data);       
-        }else{
-            $('#sigmessage').val(JSON.stringify(sign_status, undefined, 2));       
-        };
-
+        chrome.extension.sendRequest({'messageType':'sign',sign: {'message':$('#sigmessage').val()}}, function(response) {
+            if(!response.message.error){
+                $('#sigmessage').val(response.message.data);       
+            }else{
+                $('#sigmessage').val(JSON.stringify(response.message, undefined, 2));       
+            };
+        });
     });
     $('.verify').click(function(){
         var verify_status = plugin0().gpgVerify($('#sigmessage').val());
@@ -36,7 +35,7 @@ $(document).ready(function(){
     $('.import').click(function(){
         chrome.extension.sendRequest({'messageType':'importkey',import: {'message':$('textarea.message').val()}}, function(response) {
             $('textarea.message').val(JSON.stringify(response.message, undefined, 2));   
-        });   
+        });
     });
     $('textarea').click(function(){
         if($(this).text() == 'Enter text here'){