Added a restore account button to the failed migrations alert

Fixed a couple of bugs around restoring the "approved" state for message requests
Fixed a bug where the last message body for conversations was incorrectly trying to include deleted messages

Session/Home/HomeVC.swift

@@ -263,6 +263,10 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, NewConve
             updatedState.sections.contains(where: { !$0.elements.isEmpty })
         )
         
+        if updatedState.userProfile != self.viewModel.state.userProfile {
+            updateNavBarButtons()
+        }
+        
         // Update the 'view seed' UI
         if updatedState.showViewedSeedBanner != self.viewModel.state.showViewedSeedBanner {
             tableViewTopConstraint.isActive = false

Session/Home/HomeViewModel.swift

@@ -13,14 +13,17 @@ public class HomeViewModel {
     
     public struct State: Equatable {
         let showViewedSeedBanner: Bool
+        let userProfile: Profile?
         let sections: [ArraySection<Section, SessionThreadViewModel>]
         
         func with(
             showViewedSeedBanner: Bool? = nil,
+            userProfile: Profile? = nil,
             sections: [ArraySection<Section, SessionThreadViewModel>]? = nil
         ) -> State {
             return State(
                 showViewedSeedBanner: (showViewedSeedBanner ?? self.showViewedSeedBanner),
+                userProfile: (userProfile ?? self.userProfile),
                 sections: (sections ?? self.sections)
             )
         }
@@ -29,6 +32,7 @@ public class HomeViewModel {
     /// This value is the current state of the view
     public private(set) var state: State = State(
         showViewedSeedBanner: !GRDBStorage.shared[.hasViewedSeed],
+        userProfile: nil,
         sections: []
     )
     
@@ -71,17 +75,18 @@ public class HomeViewModel {
             ],
             fetch: { db -> State in
                 let hasViewedSeed: Bool = db[.hasViewedSeed]
-                let userPublicKey: String = getUserHexEncodedPublicKey(db)
+                let userProfile: Profile = Profile.fetchOrCreateCurrentUser(db)
                 let unreadMessageRequestCount: Int = try SessionThread
-                    .unreadMessageRequestsQuery(userPublicKey: userPublicKey)
+                    .unreadMessageRequestsQuery(userPublicKey: userProfile.id)
                     .fetchCount(db)
                 let finalUnreadMessageRequestCount: Int = (db[.hasHiddenMessageRequests] ? 0 : unreadMessageRequestCount)
                 let threads: [SessionThreadViewModel] = try SessionThreadViewModel
-                    .homeQuery(userPublicKey: userPublicKey)
+                    .homeQuery(userPublicKey: userProfile.id)
                     .fetchAll(db)
                 
                 return State(
                     showViewedSeedBanner: !hasViewedSeed,
+                    userProfile: userProfile,
                     sections: [
                         ArraySection(
                             model: .messageRequests,

Session/Meta/AppDelegate.swift

@@ -19,6 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var backgroundSnapshotBlockerWindow: UIWindow?
     var appStartupWindow: UIWindow?
     var hasInitialRootViewController: Bool = false
+    private var loadingViewController: LoadingViewController?
     
     /// This needs to be a lazy variable to ensure it doesn't get initialized before it actually needs to be used
     lazy var poller: Poller = Poller()
@@ -41,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         DeviceSleepManager.sharedInstance.addBlock(blockObject: self)
         
         let mainWindow: UIWindow = UIWindow(frame: UIScreen.main.bounds)
-        let loadingViewController: LoadingViewController = LoadingViewController()
+        self.loadingViewController = LoadingViewController()
         
         AppSetup.setupEnvironment(
             appSpecificBlock: {
@@ -59,57 +60,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                     OWSScreenLockUI.sharedManager().startObserving()
                 }
             },
-            migrationProgressChanged: { progress, minEstimatedTotalTime in
+            migrationProgressChanged: { [weak self] progress, minEstimatedTotalTime in
-                loadingViewController.updateProgress(
+                self?.loadingViewController?.updateProgress(
                     progress: progress,
                     minEstimatedTotalTime: minEstimatedTotalTime
                 )
             },
             migrationsCompletion: { [weak self] successful, needsConfigSync in
-                guard let strongSelf = self else { return }
                 guard successful else {
                     self?.showFailedMigrationAlert()
                     return
                 }
                 
-                Configuration.performMainSetup()
+                self?.completePostMigrationSetup(needsConfigSync: needsConfigSync)
-                JobRunner.add(executor: SyncPushTokensJob.self, for: .syncPushTokens)
-                
-                // Trigger any launch-specific jobs and start the JobRunner
-                JobRunner.appDidFinishLaunching()
-                
-                // Note that this does much more than set a flag;
-                // it will also run all deferred blocks (including the JobRunner
-                // 'appDidBecomeActive' method)
-                AppReadiness.setAppIsReady()
-                
-                DeviceSleepManager.sharedInstance.removeBlock(blockObject: strongSelf)
-                AppVersion.sharedInstance().mainAppLaunchDidComplete()
-                Environment.shared?.audioSession.setup()
-                Environment.shared?.reachabilityManager.setup()
-                
-                GRDBStorage.shared.writeAsync { db in
-                    // Disable the SAE until the main app has successfully completed launch process
-                    // at least once in the post-SAE world.
-                    db[.isReadyForAppExtensions] = true
-                    
-                    if Identity.userExists(db) {
-                        let appVersion: AppVersion = AppVersion.sharedInstance()
-                        
-                        // If the device needs to sync config or the user updated to a new version
-                        if
-                            needsConfigSync || (
-                                (appVersion.lastAppVersion?.count ?? 0) > 0 &&
-                                appVersion.lastAppVersion != appVersion.currentAppVersion
-                            )
-                        {
-                            try MessageSender.syncConfiguration(db, forceSyncNow: true).retainUntilComplete()
-                        }
-                    }
-                }
-                
-                // Setup the UI
-                self?.ensureRootViewController()
             }
         )
         
@@ -122,7 +85,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         CurrentAppContext().mainWindow = mainWindow
         
         // Show LoadingViewController until the async database view registrations are complete.
-        mainWindow.rootViewController = loadingViewController
+        mainWindow.rootViewController = self.loadingViewController
         mainWindow.makeKeyAndVisible()
 
         adapt(appMode: AppModeManager.getAppModeOrSystemDefault())
@@ -221,13 +184,51 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     
     // MARK: - App Readiness
     
+    private func completePostMigrationSetup(needsConfigSync: Bool) {
+        Configuration.performMainSetup()
+        JobRunner.add(executor: SyncPushTokensJob.self, for: .syncPushTokens)
+        
+        // Trigger any launch-specific jobs and start the JobRunner
+        JobRunner.appDidFinishLaunching()
+        
+        // Note that this does much more than set a flag;
+        // it will also run all deferred blocks (including the JobRunner
+        // 'appDidBecomeActive' method)
+        AppReadiness.setAppIsReady()
+        
+        DeviceSleepManager.sharedInstance.removeBlock(blockObject: self)
+        AppVersion.sharedInstance().mainAppLaunchDidComplete()
+        Environment.shared?.audioSession.setup()
+        Environment.shared?.reachabilityManager.setup()
+        
+        GRDBStorage.shared.writeAsync { db in
+            // Disable the SAE until the main app has successfully completed launch process
+            // at least once in the post-SAE world.
+            db[.isReadyForAppExtensions] = true
+            
+            if Identity.userExists(db) {
+                let appVersion: AppVersion = AppVersion.sharedInstance()
+                
+                // If the device needs to sync config or the user updated to a new version
+                if
+                    needsConfigSync || (
+                        (appVersion.lastAppVersion?.count ?? 0) > 0 &&
+                        appVersion.lastAppVersion != appVersion.currentAppVersion
+                    )
+                {
+                    try MessageSender.syncConfiguration(db, forceSyncNow: true).retainUntilComplete()
+                }
+            }
+        }
+        
+        // Setup the UI
+        self.ensureRootViewController()
+    }
+    
     private func showFailedMigrationAlert() {
         let alert = UIAlertController(
             title: "Session",
-            message: [
+            message: "DATABASE_MIGRATION_FAILED".localized(),
-                "DATABASE_MIGRATION_FAILED".localized(),
-                "modal_share_logs_explanation".localized()
-            ].joined(separator: "\n\n"),
             preferredStyle: .alert
         )
         alert.addAction(UIAlertAction(title: "modal_share_logs_title".localized(), style: .default) { _ in
@@ -235,7 +236,33 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 self?.showFailedMigrationAlert()
             }
         })
-        alert.addAction(UIAlertAction(title: "Close", style: .destructive) { _ in
+        alert.addAction(UIAlertAction(title: "vc_restore_title".localized(), style: .destructive) { _ in
+            // Remove the legacy database and any message hashes that have been migrated to the new DB
+            try? SUKLegacy.deleteLegacyDatabaseFilesAndKey()
+            
+            GRDBStorage.shared.write { db in
+                try SnodeReceivedMessageInfo.deleteAll(db)
+            }
+            
+            // The re-run the migration (should succeed since there is no data)
+            AppSetup.runPostSetupMigrations(
+                migrationProgressChanged: { [weak self] progress, minEstimatedTotalTime in
+                    self?.loadingViewController?.updateProgress(
+                        progress: progress,
+                        minEstimatedTotalTime: minEstimatedTotalTime
+                    )
+                },
+                migrationsCompletion: { [weak self] successful, needsConfigSync in
+                    guard successful else {
+                        self?.showFailedMigrationAlert()
+                        return
+                    }
+                    
+                    self?.completePostMigrationSetup(needsConfigSync: needsConfigSync)
+                }
+            )
+        })
+        alert.addAction(UIAlertAction(title: "Close", style: .default) { _ in
             DDLog.flushLog()
             exit(0)
         })

Session/Meta/Translations/de.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Fehler";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/en.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/es.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Fallo";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/fa.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "خطاء";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/fi.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/fr.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Erreur";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/hi.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/hr.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/id-ID.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Galat";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/it.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Errore";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/ja.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "エラー";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/nl.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/pl.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Błąd";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/pt_BR.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Erro";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/ru.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Ошибка";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/si.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/sk.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/sv.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/th.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/vi-VN.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/zh-Hant.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "Error";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Meta/Translations/zh_CN.lproj/Localizable.strings

@@ -655,4 +655,4 @@
 "DEFAULT_OPEN_GROUP_LOAD_ERROR_SUBTITLE" = "Please try again later";
 "ALERT_ERROR_TITLE" = "错误";
 "LOADING_CONVERSATIONS" = "Loading Conversations...";
-"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database";
+"DATABASE_MIGRATION_FAILED" = "An error occurred when optimising the database\n\nYou can export your application logs to be able to share for troubleshooting or you can restore our device\n\nWarning: Restoring your device will result in loss of any data older than two weeks";

Session/Settings/SettingsVC.swift

@@ -593,9 +593,19 @@ final class SettingsVC: BaseVC, AvatarViewHelperDelegate {
     }
     
     @objc private func remigrateDatabase() {
-        GRDBStorage.deleteDatabaseFiles()
+        let alert = UIAlertController(
-        try? GRDBStorage.deleteDbKeys()
+            title: "Session",
-        exit(1)
+            message: "Are you sure you want to re-migrate from your old database state?\n\nWarning: If you had a migration error and picked the \"Restore your account\" option this will result in a complete loss of data and the need to manually restore from the seed",
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: "Re-migrate", style: .destructive) { _ in
+            GRDBStorage.deleteDatabaseFiles()
+            try? GRDBStorage.deleteDbKeys()
+            exit(1)
+        })
+        alert.addAction(UIAlertAction(title: "Cancel", style: .default))
+        
+        navigationController?.present(alert, animated: true)
     }
     
     @objc private func showPath() {

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ConfigurationMessages.swift

@@ -22,7 +22,8 @@ extension MessageReceiver {
             .defaulting(to: Date(timeIntervalSince1970: 0))
             .timeIntervalSince1970
         
-        // Profile
+        // Profile (also force-approve the current user in case the account got into a weird state or
+        // restored directly from a migration)
         try MessageReceiver.updateProfileIfNeeded(
             db,
             publicKey: userPublicKey,
@@ -31,6 +32,12 @@ extension MessageReceiver {
             profileKey: OWSAES256Key(data: message.profileKey),
             sentTimestamp: messageSentTimestamp
         )
+        try Contact(id: userPublicKey)
+            .with(
+                isApproved: true,
+                didApproveMe: true
+            )
+            .save(db)
         
         if isInitialSync || messageSentTimestamp > lastConfigTimestamp {
             if isInitialSync {

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift

@@ -120,14 +120,18 @@ extension MessageReceiver {
             guard
                 let threadId: String = threadId,
                 let thread: SessionThread = try? SessionThread.fetchOne(db, id: threadId),
-                !thread.isNoteToSelf(db),
+                !thread.isNoteToSelf(db)
-                let contact: Contact = try? thread.contact.fetchOne(db),
-                !contact.isApproved
             else { return }
             
-            try? contact
+            // Sending a message to someone flags them as approved so create the contact record if
+            // it doesn't exist
+            let contact: Contact = Contact.fetchOrCreate(db, id: threadId)
+            
+            guard !contact.isApproved else { return }
+            
+            _ = try? contact
                 .with(isApproved: true)
-                .update(db)
+                .saved(db)
         }
         else {
             // The message was sent to the current user so flag their 'didApproveMe' as true (can't send a message to

SessionMessagingKit/Shared Models/SessionThreadViewModel.swift

@@ -343,6 +343,7 @@ public extension SessionThreadViewModel {
                     SUM(\(interaction[.wasRead]) = false AND \(interaction[.hasMention]) = true) AS \(ViewModel.threadUnreadMentionCountKey)
                 
                 FROM \(Interaction.self)
+                WHERE \(SQL("\(interaction[.variant]) != \(Interaction.Variant.standardIncomingDeleted)"))
                 GROUP BY \(interaction[.threadId])
             ) AS \(Interaction.self) ON \(interaction[.threadId]) = \(thread[.id])
             
@@ -492,8 +493,6 @@ public extension SessionThreadViewModel {
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
         let interaction: TypedTableAlias<Interaction> = TypedTableAlias()
         
-        let interactionIdLiteral: SQL = SQL(stringLiteral: Interaction.Columns.id.name)
-        let interactionThreadIdLiteral: SQL = SQL(stringLiteral: Interaction.Columns.threadId.name)
         let closedGroupUserCountTableLiteral: SQL = SQL(stringLiteral: "\(ViewModel.closedGroupUserCountString)_table")
         let groupMemberGroupIdColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.groupId.name)
         let profileIdColumnLiteral: SQL = SQL(stringLiteral: Profile.Columns.id.name)

SessionUtilitiesKit/Database/GRDBStorage.swift

@@ -32,10 +32,6 @@ public final class GRDBStorage {
     
     // MARK: - Initialization
     
-//        if CurrentAppContext().isMainApp {
-//            GRDBStorage.deleteDatabaseFiles() // TODO: Remove this.
-//            try! GRDBStorage.deleteDbKeys() // TODO: Remove this.
-//        }
     public init(
         customWriter: DatabaseWriter? = nil,
         customMigrations: [TargetMigrations]? = nil
@@ -184,6 +180,7 @@ public final class GRDBStorage {
             self?.hasCompletedMigrations = true
             self?.migrationProgressUpdater = nil
             SUKLegacy.clearLegacyDatabaseInstance()
+//            SUKLegacy.deleteLegacyDatabaseFilesAndKey() // TODO: Delete legacy database after the migration is done
             
             if let error = error {
                 SNLog("[Migration Error] Migration failed with error: \(error)")

SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift

@@ -109,6 +109,13 @@ public enum SUKLegacy {
         self.database = nil
     }
     
+    public static func deleteLegacyDatabaseFilesAndKey() throws {
+        OWSFileSystem.deleteFile(legacyDatabaseFilepath)
+        OWSFileSystem.deleteFile("\(legacyDatabaseFilepath)-shm")
+        OWSFileSystem.deleteFile("\(legacyDatabaseFilepath)-wal")
+        try SSKDefaultKeychainStorage.shared.remove(service: keychainService, key: keychainDBCipherKeySpec)
+    }
+    
     // MARK: - UnknownDBObject
     
     @objc(LegacyUnknownDBObject)

SignalUtilitiesKit/Utilities/AppSetup.swift

@@ -45,22 +45,40 @@ public enum AppSetup {
             
             /// `performMainSetup` **MUST** run before `perform(migrations:)`
             Configuration.performMainSetup()
-            GRDBStorage.shared.perform(
+            
-                migrations: [
+            runPostSetupMigrations(
-                    SNUtilitiesKit.migrations(),
+                backgroundTask: backgroundTask,
-                    SNSnodeKit.migrations(),
+                migrationProgressChanged: migrationProgressChanged,
-                    SNMessagingKit.migrations()
+                migrationsCompletion: migrationsCompletion
-                ],
-                onProgressUpdate: migrationProgressChanged,
-                onComplete: { success, needsConfigSync in
-                    DispatchQueue.main.async {
-                        migrationsCompletion(success, needsConfigSync)
-                        
-                        // The 'if' is only there to prevent the "variable never read" warning from showing
-                        if backgroundTask != nil { backgroundTask = nil }
-                    }
-                }
             )
+            
+            // The 'if' is only there to prevent the "variable never read" warning from showing
+            if backgroundTask != nil { backgroundTask = nil }
         }
     }
+    
+    public static func runPostSetupMigrations(
+        backgroundTask: OWSBackgroundTask? = nil,
+        migrationProgressChanged: ((CGFloat, TimeInterval) -> ())? = nil,
+        migrationsCompletion: @escaping (Bool, Bool) -> ()
+    ) {
+        var backgroundTask: OWSBackgroundTask? = (backgroundTask ?? OWSBackgroundTask(labelStr: #function))
+        
+        GRDBStorage.shared.perform(
+            migrations: [
+                SNUtilitiesKit.migrations(),
+                SNSnodeKit.migrations(),
+                SNMessagingKit.migrations()
+            ],
+            onProgressUpdate: migrationProgressChanged,
+            onComplete: { success, needsConfigSync in
+                DispatchQueue.main.async {
+                    migrationsCompletion(success, needsConfigSync)
+                    
+                    // The 'if' is only there to prevent the "variable never read" warning from showing
+                    if backgroundTask != nil { backgroundTask = nil }
+                }
+            }
+        )
+    }
 }