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

Provide error output to user when encrypted message can't be sent

Browse Source 
updates #497
This commit is contained in:
JC Brand 2018-08-23 11:03:17 +02:00
parent 7692a46e17
commit b17579501f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/converse-omemo.js
View File

@ -397,13 +397,21 @@
}, },
sendMessage (attrs) { sendMessage (attrs) {
const { _converse } = this.__super__; const { _converse } = this.__super__,
{ __ } = _converse;
if (this.get('omemo_active')) { if (this.get('omemo_active')) {
const message = this.messages.create(attrs); const message = this.messages.create(attrs);
this.getBundlesAndBuildSessions() this.getBundlesAndBuildSessions()
.then(devices => this.createOMEMOMessageStanza(message, devices)) .then(devices => this.createOMEMOMessageStanza(message, devices))
.then(stanza => this.sendMessageStanza(stanza)) .then(stanza => this.sendMessageStanza(stanza))
.catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR)); .catch((e) => {
this.messages.create({
'message': __("Sorry, could not send the message due to an error.") + ` ${e.message}`,
'type': 'error',
});
converse.log(e, Strophe.LogLevel.ERROR);
});
} else { } else {
return this.__super__.sendMessage.apply(this, arguments); return this.__super__.sendMessage.apply(this, arguments);
} }