From f6d27516cb7dce521dd128502f5e907f95284638 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 2 Apr 2023 08:12:23 +0000
Subject: [PATCH] Run migrations before delete_and_reset_all_device_msgs()

Both when importing a backup from file or receiving it over the network.
---
 src/imex.rs          | 4 ++--
 src/imex/transfer.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/imex.rs b/src/imex.rs
index 885187cae..3b0846e3b 100644
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -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(())
diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs
index a9e7ff739..e2a257511 100644
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -407,8 +407,8 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
 
     match transfer_from_provider(context, &ticket).await {
         Ok(()) => {
-            delete_and_reset_all_device_msgs(context).await?;
             context.sql.run_migrations(context).await?;
+            delete_and_reset_all_device_msgs(context).await?;
             context.emit_event(ReceiveProgress::Completed.into());
             Ok(())
         }