mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-05-18 05:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update upgrade.tsx and NativeVaultManager.ts (#1576)

Browse Source
This commit is contained in:
Leendert de Borst
2026-02-01 15:24:15 +01:00
committed by Leendert de Borst
parent fecede2b9d
commit c1aa28b295
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/mobile-app/app/upgrade.tsx
View File

@@ -177,13 +177,14 @@ export default function UpgradeScreen() : React.ReactNode {
return;
}
// Use the useVaultMutate hook to handle the upgrade and vault upload
/*
* Use the useVaultMutate hook to handle the upgrade and vault upload.
* IMPORTANT: Do NOT wrap migration SQL in beginTransaction/commitTransaction!
* The migration SQL contains PRAGMA foreign_keys statements that MUST be executed
* outside of any transaction to take effect. The SQL handles its own transactions.
*/
await executeVaultMutation(async () => {
// Begin transaction
setUpgradeStatus(t('upgrade.status.startingDatabaseTransaction'));
await NativeVaultManager.beginTransaction();
// Execute each SQL command
// Execute each SQL command (each migration script handles its own transactions)
setUpgradeStatus(t('upgrade.status.applyingDatabaseMigrations'));
for (let i = 0; i < upgradeResult.sqlCommands.length; i++) {
const sqlCommand = upgradeResult.sqlCommands[i];
@@ -194,14 +195,17 @@ export default function UpgradeScreen() : React.ReactNode {
} catch (error) {
console.error(`Error executing SQL command ${i + 1}:`, sqlCommand, error);
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
await NativeVaultManager.rollbackTransaction();
throw new Error(`${t('upgrade.alerts.failedToApplyMigration', { current: i + 1, total: upgradeResult.sqlCommands.length })}\n\nDetails: ${errorMessage}`);
}
}
// Commit transaction
/*
* Persist the database to encrypted storage and mark as dirty.
* This is needed because we're not using beginTransaction/commitTransaction.
* The executeVaultMutation hook will handle the upload.
*/
setUpgradeStatus(t('upgrade.status.committingChanges'));
await NativeVaultManager.commitTransaction();
await NativeVaultManager.persistAndMarkDirty();
}, {
skipSyncCheck: true, // Skip sync check during upgrade to prevent loop
/**

3
apps/mobile-app/specs/NativeVaultManager.ts
View File

@@ -38,6 +38,9 @@ export interface Spec extends TurboModule {
beginTransaction(): Promise<void>;
commitTransaction(): Promise<void>;
rollbackTransaction(): Promise<void>;
// Persist the in-memory database to encrypted storage and mark as dirty.
// Used after migrations where SQL handles its own transactions but we need to persist and sync.
persistAndMarkDirty(): Promise<void>;
// Cryptography operations
deriveKeyFromPassword(password: string, salt: string, encryptionType: string, encryptionSettings: string): Promise<string>;