Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Slight refactor of generatePrivateKey...

Browse Source 
to avoid having to give pass it a callback method
This commit is contained in:
JC Brand 2014-02-12 11:30:05 +02:00
parent 3a5741cd36
commit 1a4044dd2a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
converse.js
View File

@ -563,7 +563,7 @@
} }
}, },
generatePrivateKey: function (callback, instance_tag) { generatePrivateKey: function () {
var key = new DSA(); var key = new DSA();
var jid = converse.connection.jid; var jid = converse.connection.jid;
if (converse.cache_otr_key) { if (converse.cache_otr_key) {
@ -578,10 +578,7 @@
cipher.encrypt(CryptoJS.algo.AES, 'match', pass).toString(); cipher.encrypt(CryptoJS.algo.AES, 'match', pass).toString();
} }
} }
callback({ return key;
'key': key,
'instance_tag': instance_tag
});
} }
}); });
@ -630,14 +627,18 @@
} }
} }
// We need to generate a new key and instance tag // We need to generate a new key and instance tag
instance_tag = OTR.makeInstanceTag();
this.trigger('showHelpMessages', [ this.trigger('showHelpMessages', [
__('Generating private key.'), __('Generating private key.'),
__('Your browser might become unresponsive.')], __('Your browser might become unresponsive.')],
null, null,
true // show spinner true // show spinner
); );
setTimeout($.proxy(converse.otr.generatePrivateKey, this), 500, callback, instance_tag); setTimeout(function () {
callback({
'key': converse.otr.generatePrivateKey.apply(this),
'instance_tag': OTR.makeInstanceTag()
});
}, 500);
}, },
updateOTRStatus: function (state) { updateOTRStatus: function (state) {
@ -1345,7 +1346,7 @@
} else if (data.otr_status == FINISHED){ } else if (data.otr_status == FINISHED){
msgs.push(__("Your buddy has ended encryption on their end, you should do the same.")); msgs.push(__("Your buddy has ended encryption on their end, you should do the same."));
} }
return this.showHelpMessages(msgs); return this.showHelpMessages(msgs, 'info', false);
}, },
renderToolbar: function () { renderToolbar: function () {