Skip to content

Commit 8a4eca1

Browse files
committed
fix(mobile): clean up JPEGs rendered from dropped images
1 parent 939eeef commit 8a4eca1

2 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎apps/mobile/src/lib/composerImages.test.ts‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const clipboard = vi.hoisted(() => ({
1919
vi.mock("expo-clipboard", () => clipboard);
2020

2121
const manipulator = vi.hoisted(() => {
22-
const state = { sourceSize: { width: 0, height: 0 } };
22+
const state = { sourceSize: { width: 0, height: 0 }, renderedBase64: "cmVuZGVyZWQ=" };
2323
const manipulate = vi.fn((source: string | { width: number; height: number }) => {
2424
let size = typeof source === "string" ? state.sourceSize : source;
2525
const context = {
@@ -30,10 +30,11 @@ const manipulator = vi.hoisted(() => {
3030
renderAsync: vi.fn(async () => ({
3131
...size,
3232
release: vi.fn(),
33-
saveAsync: vi.fn(async (options: { format: string }) => ({
34-
uri: `file:///cache/rendered.${options.format}`,
35-
base64: `cmVuZGVyZWQ=`,
36-
})),
33+
saveAsync: vi.fn(async (options: { format: string }) => {
34+
const uri = `file:///cache/rendered.${options.format}`;
35+
files.set(uri, { base64: state.renderedBase64, deleted: false });
36+
return { uri, base64: state.renderedBase64 };
37+
}),
3738
})),
3839
};
3940
return context;
@@ -198,6 +199,7 @@ describe("oversized pasted images", () => {
198199
describe("native pasted image cleanup", () => {
199200
beforeEach(() => {
200201
files.clear();
202+
manipulator.state.renderedBase64 = "cmVuZGVyZWQ=";
201203
});
202204

203205
it("preserves the reported image type of extensionless Android content URIs", async () => {
@@ -217,7 +219,7 @@ describe("native pasted image cleanup", () => {
217219
expect(files.get(uri)?.deleted).toBe(false);
218220
});
219221

220-
it("renders an unsupported Android image format to JPEG before attaching it", async () => {
222+
it("renders unsupported images to JPEG and removes the cache file after attaching", async () => {
221223
const uri = "content://media/external/images/media/43";
222224
files.set(uri, { base64: "b3JpZ2luYWw=", deleted: false, mimeType: "image/heic" });
223225
manipulator.state.sourceSize = { width: 100, height: 100 };
@@ -229,8 +231,25 @@ describe("native pasted image cleanup", () => {
229231
name: "pasted-image.jpeg",
230232
mimeType: "image/jpeg",
231233
dataUrl: "data:image/jpeg;base64,cmVuZGVyZWQ=",
234+
previewUri: "data:image/jpeg;base64,cmVuZGVyZWQ=",
232235
}),
233236
]);
237+
expect(files.get("file:///cache/rendered.jpeg")?.deleted).toBe(true);
238+
expect(files.get(uri)?.deleted).toBe(false);
239+
});
240+
241+
it("removes the rendered JPEG when its bytes exceed the image limit", async () => {
242+
const uri = "content://media/external/images/media/43";
243+
files.set(uri, { base64: "b3JpZ2luYWw=", deleted: false, mimeType: "image/heic" });
244+
manipulator.state.sourceSize = { width: 100, height: 100 };
245+
manipulator.state.renderedBase64 = "A".repeat(
246+
Math.ceil((PROVIDER_SEND_TURN_MAX_IMAGE_BYTES + 1) / 3) * 4,
247+
);
248+
249+
const attachments = await convertPastedImagesToAttachments({ uris: [uri], existingCount: 0 });
250+
251+
expect(attachments).toEqual([]);
252+
expect(files.get("file:///cache/rendered.jpeg")?.deleted).toBe(true);
234253
expect(files.get(uri)?.deleted).toBe(false);
235254
});
236255

‎apps/mobile/src/lib/composerImages.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ export async function convertPastedImagesToAttachments(input: {
679679
const results: DraftComposerImageAttachment[] = [];
680680

681681
for (const [index, uri] of input.uris.entries()) {
682-
const ownedTemporaryFile = isOwnedPastedImageUri(uri);
682+
const temporaryUris = isOwnedPastedImageUri(uri) ? [uri] : [];
683683
try {
684684
if (index >= Math.max(0, remainingSlots)) {
685685
continue;
@@ -692,9 +692,12 @@ export async function convertPastedImagesToAttachments(input: {
692692
const mimeType = isProviderSendTurnSupportedImageMimeType(sourceMimeType)
693693
? sourceMimeType
694694
: "image/jpeg";
695-
const pastedBase64 =
696-
mimeType === sourceMimeType ? await file.base64() : (await renderPhoto(uri)).base64;
697-
const fitted = await fitComposerImage({ uri, mimeType, base64: pastedBase64 });
695+
const rendered = mimeType === sourceMimeType ? null : await renderPhoto(uri);
696+
if (rendered !== null) {
697+
temporaryUris.push(rendered.uri);
698+
}
699+
const pastedBase64 = rendered?.base64 ?? (await file.base64());
700+
const fitted = rendered ?? (await fitComposerImage({ uri, mimeType, base64: pastedBase64 }));
698701
const base64 = fitted?.base64 ?? pastedBase64;
699702
const sizeBytes = estimateBase64ByteSize(base64);
700703
if (sizeBytes <= 0 || sizeBytes > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES) {
@@ -707,19 +710,20 @@ export async function convertPastedImagesToAttachments(input: {
707710
mimeType,
708711
sizeBytes,
709712
dataUrl: `data:${mimeType};base64,${base64}`,
710-
previewUri: ownedTemporaryFile ? `data:${mimeType};base64,${base64}` : (fitted?.uri ?? uri),
713+
previewUri:
714+
temporaryUris.length > 0 ? `data:${mimeType};base64,${base64}` : (fitted?.uri ?? uri),
711715
});
712716
} catch (error) {
713717
console.warn("Failed to read pasted image", uri, error);
714718
} finally {
715-
if (ownedTemporaryFile) {
719+
for (const temporaryUri of temporaryUris) {
716720
try {
717-
const file = new File(uri);
721+
const file = new File(temporaryUri);
718722
if (file.exists) {
719723
file.delete();
720724
}
721725
} catch (error) {
722-
console.warn("Failed to remove temporary pasted image", uri, error);
726+
console.warn("Failed to remove temporary pasted image", temporaryUri, error);
723727
}
724728
}
725729
}

0 commit comments

Comments
 (0)