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

Do not try to download text attachments

Browse source
This commit is contained in:
Josh Perez 2022-04-08 13:03:10 -04:00 • committed by GitHub
parent 0a0fabd2ca
commit 0f16ef5dd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/components/StoryImage.tsx
View file

@ -52,7 +52,7 @@ export const StoryImage = ({
return null; return null;
} }
const isPending = Boolean(attachment.pending); const isPending = Boolean(attachment.pending) && !attachment.textAttachment;
const isNotReadyToShow = hasNotResolved(attachment) || isPending; const isNotReadyToShow = hasNotResolved(attachment) || isPending;
const getClassName = getClassNamesFor('StoryImage', moduleClassName); const getClassName = getClassNamesFor('StoryImage', moduleClassName);

3
ts/models/messages.ts
View file

@ -2569,7 +2569,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const shouldHoldOffDownload = const shouldHoldOffDownload =
(isStory(message.attributes) && !queueStoryForDownload) || (isStory(message.attributes) && !queueStoryForDownload) ||
((isImage(attachments) || isVideo(attachments)) && (!isStory(message.attributes) &&
(isImage(attachments) || isVideo(attachments)) &&
isInCall(reduxState)); isInCall(reduxState));
if ( if (

4
ts/textsecure/MessageReceiver.ts
View file

@ -110,7 +110,6 @@ import {
} from './messageReceiverEvents'; } from './messageReceiverEvents';
import * as log from '../logging/log'; import * as log from '../logging/log';
import * as durations from '../util/durations'; import * as durations from '../util/durations';
import { IMAGE_JPEG } from '../types/MIME';
import { areArraysMatchingSets } from '../util/areArraysMatchingSets'; import { areArraysMatchingSets } from '../util/areArraysMatchingSets';
import { generateBlurHash } from '../util/generateBlurHash'; import { generateBlurHash } from '../util/generateBlurHash';
@ -1803,8 +1802,7 @@ export default class MessageReceiver
if (msg.textAttachment) { if (msg.textAttachment) {
attachments.push({ attachments.push({
contentType: IMAGE_JPEG, size: msg.textAttachment.text?.length,
size: 0,
textAttachment: msg.textAttachment, textAttachment: msg.textAttachment,
blurHash: generateBlurHash( blurHash: generateBlurHash(
(msg.textAttachment.color || (msg.textAttachment.color ||

2
ts/types/Attachment.ts
View file

@ -723,7 +723,7 @@ export function isGIF(attachments?: ReadonlyArray<AttachmentType>): boolean {
} }
export function isDownloaded(attachment?: AttachmentType): boolean { export function isDownloaded(attachment?: AttachmentType): boolean {
return Boolean(attachment && attachment.path); return Boolean(attachment && (attachment.path || attachment.textAttachment));
} }
export function hasNotResolved(attachment?: AttachmentType): boolean { export function hasNotResolved(attachment?: AttachmentType): boolean {

2
ts/util/queueAttachmentDownloads.ts
View file

@ -81,7 +81,7 @@ export async function queueAttachmentDownloads(
return attachment; return attachment;
} }
// We've already downloaded this! // We've already downloaded this!
if (attachment.path) { if (attachment.path || attachment.textAttachment) {
log.info( log.info(
`Normal attachment already downloaded for message ${idForLogging}` `Normal attachment already downloaded for message ${idForLogging}`
); );