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

Load attachment data for quotedMessages, processMessage on add

Browse source 
Not ideal that it loads it twice, but AttachmentView is so selfish with
its blob and objectUrl!
This commit is contained in:
Scott Nonnenberg 2018-04-12 18:12:40 -07:00
parent d91f40177e
commit 32925ed026
No known key found for this signature in database
GPG key ID: 5F82280C35134661
3 changed files with 80 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/views/message_view.js
View file

@ -194,7 +194,7 @@
this.listenTo(this.model, 'change:delivered', this.renderDelivered);
this.listenTo(this.model, 'change:read_by', this.renderRead);
this.listenTo(this.model, 'change:expirationStartTimestamp', this.renderExpiring);
this.listenTo(this.model, 'change', this.renderSent);
this.listenTo(this.model, 'change', this.onChange);
this.listenTo(this.model, 'change:flags change:group_update', this.renderControl);
this.listenTo(this.model, 'destroy', this.onDestroy);
this.listenTo(this.model, 'unload', this.onUnload);
@ -274,6 +274,10 @@
}
this.onUnload();
},
onChange() {
this.renderRead();
this.renderQuote();
},
select(e) {
this.$el.trigger('select', { message: this.model });
e.stopPropagation();
@ -379,17 +383,19 @@
return null;
},
renderQuote() {
const VOICE_FLAG = textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE;
const objectUrl = this.getQuoteObjectUrl();
const quote = this.model.get('quote');
if (!quote) {
return;
}
const VOICE_FLAG = textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE;
const objectUrl = this.getQuoteObjectUrl();
function processAttachment(attachment) {
const thumbnail = !attachment.thumbnail
const thumbnail = !objectUrl
? null
: Object.assign({}, attachment.thumbnail, {
: Object.assign({}, attachment.thumbnail || {}, {
objectUrl,
});
@ -411,7 +417,7 @@
const isIncoming = this.model.isIncoming();
const props = {
attachments: quote.attachments && quote.attachments.map(processAttachment),
attachments: (quote.attachments || []).map(processAttachment),
authorColor,
authorProfileName,
authorTitle,
@ -420,14 +426,13 @@
onClick: () => {
const { quotedMessage } = this.model;
if (quotedMessage) {
this.trigger('scroll-to-message', { id: quotedMessage.id });
this.model.trigger('scroll-to-message', { id: quotedMessage.id });
}
},
text: quote.text,
};
if (this.replyView) {
this.replyView.remove();
this.replyView = null;
} else if (contact) {
this.listenTo(contact, 'change:color', this.renderQuote);