Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update export in mobile app to use temp cache directory (#2413)

Leendert de Borst83f2f495f2ee
diff --git a/apps/mobile-app/app/(tabs)/settings/import-export.tsx b/apps/mobile-app/app/(tabs)/settings/import-export.tsx
index c349ce160..0c551e14a 100644
--- a/apps/mobile-app/app/(tabs)/settings/import-export.tsx
+++ b/apps/mobile-app/app/(tabs)/settings/import-export.tsx
@@ -1,9 +1,10 @@
import { Ionicons } from '@expo/vector-icons';
-import { Directory, File, Paths } from 'expo-file-system';
+import { File } from 'expo-file-system';
import * as Sharing from 'expo-sharing';
import { useState } from 'react';
import { StyleSheet, View, TouchableOpacity } from 'react-native';
+import { getExportDirectory } from '@/utils/FileUtility';
import { VaultUnlockHelper } from '@/utils/VaultUnlockHelper';
import { useColors } from '@/hooks/useColorScheme';
@@ -74,6 +75,7 @@ export default function ImportExportScreen(): React.ReactNode {
setIsExporting(true);
+ let file: File | null = null;
try {
const dateStr = new Date().toISOString().split('T')[0];
@@ -83,12 +85,12 @@ export default function ImportExportScreen(): React.ReactNode {
const csvContent = await dbContext.sqliteClient.importExport.exportToCsv();
const filename = `aliasvault-export-${dateStr}.csv`;
- const downloadsDir = new Directory(Paths.document, 'Exports');
- if (!downloadsDir.exists) {
- downloadsDir.create({ intermediates: true });
+ const exportDir = getExportDirectory();
+ if (!exportDir.exists) {
+ exportDir.create({ intermediates: true });
}
- const file = new File(downloadsDir, filename);
+ file = new File(exportDir, filename);
if (file.exists) {
file.delete();
}
@@ -96,28 +98,24 @@ export default function ImportExportScreen(): React.ReactNode {
file.write(csvContent);
// Share the file using the system share dialog
- const canShare = await Sharing.isAvailableAsync();
- if (canShare) {
+ if (await Sharing.isAvailableAsync()) {
await Sharing.shareAsync(file.uri, {
dialogTitle: filename,
mimeType: 'text/csv',
});
-
- // Clean up the temporary file after sharing
- setTimeout(() => {
- try {
- if (file.exists) {
- file.delete();
- }
- } catch (error) {
- console.error('Error cleaning up export file:', error);
- }
- }, 5000);
}
} catch (error) {
console.error('Export error:', error);
showAlert(t('common.error'), t('common.errors.unknownError'));
} finally {
+ // Cleanup temporary export file if it still exists.
+ try {
+ if (file?.exists) {
+ file.delete();
+ }
+ } catch (error) {
+ console.error('Error cleaning up export file:', error);
+ }
setIsExporting(false);
}
};
diff --git a/apps/mobile-app/app/_layout.tsx b/apps/mobile-app/app/_layout.tsx
index cadbd4354..efc394802 100644
--- a/apps/mobile-app/app/_layout.tsx
+++ b/apps/mobile-app/app/_layout.tsx
@@ -10,6 +10,7 @@ import { install } from 'react-native-quick-crypto';
import '@/platform/MobilePlatform';
import { resolveDeepLink } from '@/utils/DeepLinkResolver';
+import { clearExportDirectories } from '@/utils/FileUtility';
import { useColors, useColorScheme } from '@/hooks/useColorScheme';
@@ -53,6 +54,9 @@ function RootLayoutNav() : React.ReactNode {
}
hasBooted.current = true;
+ // Remove plaintext exports an interrupted share left behind.
+ clearExportDirectories();
+
/**
* Initialize i18n and inspect the cold-start deep link in parallel.
* One-time startup migrations run here too.
diff --git a/apps/mobile-app/utils/FileUtility.ts b/apps/mobile-app/utils/FileUtility.ts
index 014f18c07..1d15e2175 100644
--- a/apps/mobile-app/utils/FileUtility.ts
+++ b/apps/mobile-app/utils/FileUtility.ts
@@ -1,4 +1,4 @@
-import { Directory, File } from 'expo-file-system';
+import { Directory, File, Paths } from 'expo-file-system';
/*
* Sanitize filenames for attachments so they are accepted by mobile OS filesystems.
@@ -34,3 +34,24 @@ export const getFileForFilename = (directory: Directory, filename: string): File
const directoryUri = directory.uri.endsWith('/') ? directory.uri : `${directory.uri}/`;
return new File(`${directoryUri}${encodeURIComponent(sanitizeFilename(filename))}`);
};
+
+/**
+ * The directory vault exports are written to before sharing.
+ * @returns The export directory.
+ */
+export const getExportDirectory = (): Directory => new Directory(Paths.cache, 'Exports');
+
+/**
+ * Deletes export files left behind by an interrupted share, including the Documents folder older builds wrote to.
+ */
+export const clearExportDirectories = (): void => {
+ for (const directory of [getExportDirectory(), new Directory(Paths.document, 'Exports')]) {
+ try {
+ if (directory.exists) {
+ directory.delete();
+ }
+ } catch (error) {
+ console.error('Error clearing export directory:', error);
+ }
+ }
+};