Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-23 08:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v1.112.5'

Browse Source
This commit is contained in:
link2xt
2023-04-02 09:50:16 +00:00
parent 8477f7b472 c9879f863b
commit 5e597e1f09
11 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imex.rs
View File

@@ -397,8 +397,7 @@ async fn imex_inner(
export_backup(context, path, passphrase.unwrap_or_default()).await
}
ImexMode::ImportBackup => {
import_backup(context, path, passphrase.unwrap_or_default()).await?;
context.sql.run_migrations(context).await
import_backup(context, path, passphrase.unwrap_or_default()).await
}
}
}
@@ -474,6 +473,7 @@ async fn import_backup(
}
}
context.sql.run_migrations(context).await?;
delete_and_reset_all_device_msgs(context).await?;
Ok(())

1
src/imex/transfer.rs
View File

@@ -407,6 +407,7 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
match transfer_from_provider(context, &ticket).await {
Ok(()) => {
context.sql.run_migrations(context).await?;
delete_and_reset_all_device_msgs(context).await?;
context.emit_event(ReceiveProgress::Completed.into());
Ok(())