colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Draft attachments: Show image as generic attachment if too big

Browse Source
This commit is contained in:
Scott Nonnenberg
2021-11-19 13:19:42 -08:00
committed by GitHub
parent 555c6e6bfa
commit 7bb37dc63b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ts/components/conversation/AttachmentList.tsx
View File

@@ -10,6 +10,7 @@ import type { LocalizerType } from '../../types/Util';
import type { AttachmentDraftType } from '../../types/Attachment'; import type { AttachmentDraftType } from '../../types/Attachment';
import { import {
areAllAttachmentsVisual, areAllAttachmentsVisual,
canDisplayImage,
isImageAttachment, isImageAttachment,
isVideoAttachment, isVideoAttachment,
} from '../../types/Attachment'; } from '../../types/Attachment';
@@ -74,7 +75,11 @@ export const AttachmentList = ({
const isVideo = isVideoAttachment(attachment); const isVideo = isVideoAttachment(attachment);
const closeAttachment = () => onCloseAttachment(attachment); const closeAttachment = () => onCloseAttachment(attachment);
if (isImage || isVideo || attachment.pending) { if (
(isImage && canDisplayImage([attachment])) ||
isVideo ||
attachment.pending
) {
const isDownloaded = !attachment.pending; const isDownloaded = !attachment.pending;
const imageUrl = const imageUrl =
url || (isVideo ? BLANK_VIDEO_THUMBNAIL : undefined); url || (isVideo ? BLANK_VIDEO_THUMBNAIL : undefined);