Skip to content

Commit 62a86b8

Browse files
committed
fix(mobile): retry incomplete initial share replacements
1 parent 833f8bb commit 62a86b8

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎apps/mobile/src/features/sharing/incoming-share-storage.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,16 @@ describe("incoming share storage", () => {
155155
expect(warning).toHaveBeenCalledOnce();
156156
});
157157

158-
it("ignores a partial initial write and allows retrying the share", async () => {
159-
fileSystemMocks.failNextWrite();
158+
it.each(["write", "partial"])("retries an interrupted initial %s", async (failure) => {
159+
if (failure === "write") fileSystemMocks.failNextWrite();
160+
else fileSystemMocks.failRelocationTo(failure);
160161

161162
await expect(writeIncomingShareDraft(VALID_DRAFT)).rejects.toMatchObject({
162163
operation: "write",
163164
shareId: VALID_DRAFT.id,
164165
});
165-
await expect(loadIncomingShareDrafts({ strict: true })).resolves.toEqual([]);
166+
vi.spyOn(console, "warn").mockImplementation(() => undefined);
167+
await expect(loadIncomingShareDrafts()).resolves.toEqual([]);
166168

167169
await writeIncomingShareDraft(VALID_DRAFT);
168170
await expect(loadIncomingShareDrafts({ strict: true })).resolves.toEqual([VALID_DRAFT]);

‎apps/mobile/src/features/sharing/incoming-share-storage.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ export async function writeIncomingShareDraft(draft: IncomingShareDraft): Promis
8989
temp.create({ intermediates: true, overwrite: true });
9090
await temp.write(JSON.stringify(draft));
9191
// Expo can remove or partially copy the destination before a move fails.
92-
if (file.exists && (await readSavedDraft(file)).file === file) {
93-
file.copySync(backup, { overwrite: true });
92+
if (file.exists) {
93+
const saved = await readSavedDraft(file).catch(() => undefined);
94+
if (!saved || saved.file === file) file.copySync(backup, { overwrite: true });
9495
}
9596
temp.moveSync(file, { overwrite: true });
9697
try {

0 commit comments

Comments
 (0)