wip

ConversationsClassic/AppData/Services/Database+Migrations.swift

@@ -94,12 +94,20 @@ extension Database {
                 table.primaryKey(["account", "id"], onConflict: .replace)
             }
 
-            try db.alter(table: "messages") { table in
+            do {
-                table.add(column: "secure", .boolean).notNull().defaults(to: false)
+                try db.alter(table: "messages") { table in
+                    table.add(column: "secure", .boolean).notNull().defaults(to: false)
+                }
+            } catch {
+                print("Error adding columns: \(error)\nProbably already added")
             }
 
-            try db.alter(table: "chats") { table in
+            do {
-                table.add(column: "encrypted", .boolean).notNull().defaults(to: false)
+                try db.alter(table: "chats") { table in
+                    table.add(column: "encrypted", .boolean).notNull().defaults(to: false)
+                }
+            } catch {
+                print("Error adding columns: \(error)\nProbably already added")
             }
         }
 

ConversationsClassic/AppData/Services/Database.swift

@@ -60,11 +60,20 @@ private extension Database {
 #if DEBUG
     extension Database {
         func flushAllData() {
-            // nullable queue and remove db file
             do {
-                try FileManager.default.removeItem(atPath: dbPath)
+                try dbQueue.write { db in
+                    // Fetch all table names
+                    let tables = try String.fetchAll(db, sql: """
+                        SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%';
+                    """)
+
+                    // Generate and execute DELETE statements for each table
+                    for table in tables {
+                        try db.execute(sql: "DELETE FROM \(table);")
+                    }
+                }
             } catch {
-                print("Error: \(error)")
+                print("Error flushing all data: \(error)")
             }
         }
     }

ConversationsClassic/AppData/Store/ClientsStore.swift

@@ -202,7 +202,6 @@ private extension ClientsStore {
             clients.removeAll()
             actualRosters.removeAll()
             actualChats.removeAll()
-            ready = false
         }
     }
 #endif

ConversationsClassic/Helpers/UserDefaultsWrapper.swift

@@ -33,4 +33,9 @@ enum UserSettings {
 
     @Storage(key: kSecureChatsByDefault, defaultValue: false)
     static var secureChatsByDefault: Bool
+
+    static func reset() {
+        omemoDeviceId = 0
+        secureChatsByDefault = false
+    }
 }

ConversationsClassic/View/Main/Settings/SettingsScreen.swift

@@ -66,6 +66,7 @@ struct SettingsScreen: View {
                                 Button("Delete", role: .destructive) {
                                     clientsStore.flushAllData()
                                     Database.shared.flushAllData()
+                                    UserSettings.reset()
                                 }
                             }
                         }