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

Ensure images are scaled during message schema migration

Browse source
This commit is contained in:
trevor-signal 2024-01-02 20:37:01 -05:00 committed by GitHub
parent ce35f686e6
commit 677ab64335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ts/util/attachments.ts
View file

@ -15,9 +15,15 @@ import * as MIME from '../types/MIME';
import * as Errors from '../types/errors'; import * as Errors from '../types/errors';
import * as Bytes from '../Bytes'; import * as Bytes from '../Bytes';
// Upgrade steps // Upgrade steps NOTE: This step strips all EXIF metadata from JPEG images as part of
// NOTE: This step strips all EXIF metadata from JPEG images as // re-encoding the image:
// part of re-encoding the image:
// When sending an image:
// 1. During composition, images are passed through handleImageAttachment. If needed, this
// scales them down to high-quality (level 3).
// 2. Draft images are then written to disk as a draft image (so there is a `path`)
// 3. On send, the message schema is upgraded, triggering this function
export async function autoOrientJPEG( export async function autoOrientJPEG(
attachment: AttachmentType, attachment: AttachmentType,
{ logger }: { logger: LoggerType }, { logger }: { logger: LoggerType },
@ -36,7 +42,6 @@ export async function autoOrientJPEG(
if (!canBeTranscoded(attachment)) { if (!canBeTranscoded(attachment)) {
return attachment; return attachment;
} }
// If we haven't downloaded the attachment yet, we won't have the data. // If we haven't downloaded the attachment yet, we won't have the data.
// All images go through handleImageAttachment before being sent and thus have // All images go through handleImageAttachment before being sent and thus have
// already been scaled to level, oriented, stripped of exif data, and saved // already been scaled to level, oriented, stripped of exif data, and saved
@ -48,15 +53,15 @@ export async function autoOrientJPEG(
return attachment; return attachment;
} }
let scaleTarget: string | Blob; let scaleTarget: string | Blob;
if (path) { if (data) {
scaleTarget = window.Signal.Migrations.getAbsoluteAttachmentPath(path);
} else {
if (!data) {
return attachment;
}
scaleTarget = new Blob([data], { scaleTarget = new Blob([data], {
type: attachment.contentType, type: attachment.contentType,
}); });
} else {
if (!path) {
return attachment;
}
scaleTarget = window.Signal.Migrations.getAbsoluteAttachmentPath(path);
} }
try { try {