mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Display a default message for incoming message errors

Browse source 
An exception to the previous commit, for incoming messages we should not
show a mysterious empty bubble. Instead there is some generic
non-technical error message.

// FREEBIE
This commit is contained in:
lilia 2015-09-30 15:22:59 -07:00
parent 929c16090b
commit a802322d44
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/models/messages.js
View file

@ -59,7 +59,7 @@
return 'Received message with unknown identity key.';
}
if (this.isIncoming() && this.hasErrors()) {
return 'Error decrypting incoming message.';
return 'Error handling incoming message.';
}
return this.get('body');

9
js/views/message_view.js
View file

@ -34,7 +34,12 @@
},
renderErrors: function() {
var errors = this.model.get('errors');
if (_.size(errors) > 0) { this.$el.addClass('error'); }
if (_.size(errors) > 0) {
this.$el.addClass('error');
if (this.model.isIncoming()) {
this.$('.content').text(this.model.getDescription()).addClass('error-message');
}
}
},
renderControl: function() {
if (this.model.isEndSession() || this.model.isGroupUpdate()) {
@ -63,8 +68,8 @@
this.renderSent();
this.renderDelivered();
this.renderErrors();
this.renderControl();
this.renderErrors();
this.$('.attachments').append(
this.model.get('attachments').map(function(attachment) {