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

Prefer GoogleChrome.is* over MIME.is*

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-24 17:16:26 -04:00
parent 64c3d604aa
commit b65370c8d7
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/models/conversations.js
View file

@ -17,7 +17,7 @@
window.Whisper = window.Whisper || {};
const { Message, MIME } = window.Signal.Types;
const { Message } = window.Signal.Types;
const { upgradeMessageSchema, loadAttachmentData } = window.Signal.Migrations;
// TODO: Factor out private and group subclasses of Conversation
@ -651,7 +651,8 @@
text: quotedMessage.get('body'),
attachments: await Promise.all((attachments || []).map(async (attachment) => {
const { contentType } = attachment;
const willMakeThumbnail = MIME.isImage(contentType);
const willMakeThumbnail =
Signal.Util.GoogleChrome.isImageTypeSupported(contentType);
return {
contentType,
@ -1111,7 +1112,9 @@
const first = attachments[0];
const { thumbnail, contentType } = first;
return thumbnail || MIME.isVideo(contentType) || MIME.isImage(contentType);
return thumbnail ||
Signal.Util.GoogleChrome.isImageTypeSupported(contentType) ||
Signal.Util.GoogleChrome.isVideoTypeSupported(contentType);
},
forceRender(message) {
message.trigger('change', message);
@ -1151,7 +1154,7 @@
// Maybe in the future we could try to pull the thumbnail from a video ourselves,
// but for now we will rely on incoming thumbnails only.
if (!MIME.isImage(first.contentType)) {
if (!Signal.Util.GoogleChrome.isImageTypeSupported(first.contentType)) {
return false;
}
@ -1191,7 +1194,7 @@
// Maybe in the future we could try to pull thumbnails video ourselves,
// but for now we will rely on incoming thumbnails only.
if (!first || !MIME.isImage(first.contentType)) {
if (!first || !Signal.Util.GoogleChrome.isImageTypeSupported(first.contentType)) {
return;
}