Merge branch 'master' into f/ios-connection-ui

apps/ios/Shared/AppDelegate.swift

@@ -47,6 +47,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         let m = ChatModel.shared
         let deviceToken = DeviceToken(pushProvider: PushProvider(env: pushEnvironment), token: token)
         m.deviceToken = deviceToken
+        // savedToken is set in startChat, when it is started before this method is called
         if m.savedToken != nil {
             registerToken(token: deviceToken)
         }
@@ -85,7 +86,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 }
             } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
+                if  m.ntfEnablePeriodic && allowBackgroundRefresh() {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)

apps/ios/Shared/Model/BGManager.swift

@@ -15,7 +15,8 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6
 
-private let bgRefreshInterval: TimeInterval = 450
+// This is the smallest interval between refreshes, and also target interval in "off" mode
+private let bgRefreshInterval: TimeInterval = 600
 
 private let maxTimerCount = 9
 
@@ -55,7 +56,7 @@ class BGManager {
         }
         logger.debug("BGManager.handleRefresh")
         schedule()
-        if appStateGroupDefault.get().inactive {
+        if allowBackgroundRefresh() {
             let completeRefresh = completionHandler {
                 task.setTaskCompleted(success: true)
             }
@@ -92,18 +93,19 @@ class BGManager {
         DispatchQueue.main.async {
             let m = ChatModel.shared
             if (!m.chatInitialized) {
+                setAppState(.bgRefresh)
                 do {
                     try initializeChat(start: true)
                 } catch let error {
                     fatalError("Failed to start or load chats: \(responseError(error))")
                 }
             }
+            activateChat(appState: .bgRefresh)
             if m.currentUser == nil {
                 completeReceiving("no current user")
                 return
             }
             logger.debug("BGManager.receiveMessages: starting chat")
-            activateChat(appState: .bgRefresh)
             let cr = ChatReceiver()
             self.chatReceiver = cr
             cr.start()

apps/ios/Shared/Model/ChatModel.swift

@@ -105,12 +105,10 @@ final class ChatModel: ObservableObject {
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
-    var ntfEnableLocal: Bool {
-        notificationMode == .off || ntfEnableLocalGroupDefault.get()
-    }
+    let ntfEnableLocal = true
 
     var ntfEnablePeriodic: Bool {
-        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+        notificationMode != .off
     }
 
     var activeRemoteCtrl: Bool {

apps/ios/Shared/Model/ImageUtils.swift

@@ -195,18 +195,18 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     }
 }
 
-func generateNewFileName(_ prefix: String, _ ext: String) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
+func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }
 
-private func uniqueCombine(_ fileName: String) -> String {
+private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
     func tryCombine(_ fileName: String, _ n: Int) -> String {
         let ns = fileName as NSString
         let name = ns.deletingPathExtension
         let ext = ns.pathExtension
         let suffix = (n == 0) ? "" : "_\(n)"
         let f = "\(name)\(suffix).\(ext)"
-        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
     }
     return tryCombine(fileName, 0)
 }

apps/ios/Shared/Model/NSESubscriber.swift

@@ -0,0 +1,83 @@
+//
+//  NSESubscriber.swift
+//  SimpleXChat
+//
+//  Created by Evgeny on 09/12/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SimpleXChat
+
+private var nseSubscribers: [UUID:NSESubscriber] = [:]
+
+// timeout for active notification service extension going into "suspending" state.
+// If in two seconds the state does not change, we assume that it was not running and proceed with app activation/answering call.
+private let SUSPENDING_TIMEOUT: TimeInterval = 2
+
+// timeout should be larger than SUSPENDING_TIMEOUT
+func waitNSESuspended(timeout: TimeInterval, dispatchQueue: DispatchQueue = DispatchQueue.main, suspended: @escaping (Bool) -> Void) {
+    if timeout <= SUSPENDING_TIMEOUT {
+        logger.warning("waitNSESuspended: small timeout \(timeout), using \(SUSPENDING_TIMEOUT + 1)")
+    }
+    var state = nseStateGroupDefault.get()
+    if case .suspended = state {
+        dispatchQueue.async { suspended(true) }
+        return
+    }
+    let id = UUID()
+    var suspendedCalled = false
+    checkTimeout()
+    nseSubscribers[id] = nseMessageSubscriber { msg in
+        if case let .state(newState) = msg {
+            state = newState
+            logger.debug("waitNSESuspended state: \(state.rawValue)")
+            if case .suspended = newState {
+                notifySuspended(true)
+            }
+        }
+    }
+    return
+
+    func notifySuspended(_ ok: Bool) {
+        logger.debug("waitNSESuspended notifySuspended: \(ok)")
+        if !suspendedCalled {
+            logger.debug("waitNSESuspended notifySuspended: calling suspended(\(ok))")
+            suspendedCalled = true
+            nseSubscribers.removeValue(forKey: id)
+            dispatchQueue.async { suspended(ok) }
+        }
+    }
+
+    func checkTimeout() {
+        if !suspending() {
+            checkSuspendingTimeout()
+        } else if state == .suspending {
+            checkSuspendedTimeout()
+        }
+    }
+
+    func suspending() -> Bool {
+        suspendedCalled || state == .suspended || state == .suspending
+    }
+
+    func checkSuspendingTimeout() {
+        DispatchQueue.global().asyncAfter(deadline: .now() + SUSPENDING_TIMEOUT) {
+            logger.debug("waitNSESuspended check suspending timeout")
+            if !suspending() {
+                notifySuspended(false)
+            } else if state != .suspended {
+                checkSuspendedTimeout()
+            }
+        }
+    }
+
+    func checkSuspendedTimeout() {
+        DispatchQueue.global().asyncAfter(deadline: .now() + min(timeout - SUSPENDING_TIMEOUT, 1)) {
+            logger.debug("waitNSESuspended check suspended timeout")
+            if state != .suspended {
+                notifySuspended(false)
+            }
+        }
+    }
+}

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -228,7 +228,8 @@ func apiStopChat() async throws {
 }
 
 func apiActivateChat() {
-    let r = chatSendCmdSync(.apiActivateChat)
+    chatReopenStore()
+    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
     if case .cmdOk = r { return }
     logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -1234,6 +1235,9 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
         try startChat(refreshInvitations: refreshInvitations)
     } else {
         m.chatRunning = false
+        try getUserChatData()
+        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
+        m.onboardingStage = onboardingStageDefault.get()
     }
 }
 
@@ -1250,6 +1254,8 @@ func startChat(refreshInvitations: Bool = true) throws {
             try refreshCallInvitations()
         }
         (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
+        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
+        // when it is called before startChat
         if let token = m.deviceToken {
             registerToken(token: token)
         }

apps/ios/Shared/Model/SuspendChat.swift

@@ -9,27 +9,28 @@
 import Foundation
 import UIKit
 import SimpleXChat
+import SwiftUI
 
 private let suspendLockQueue = DispatchQueue(label: "chat.simplex.app.suspend.lock")
 
-let appSuspendTimeout: Int = 15 // seconds
-
 let bgSuspendTimeout: Int = 5 // seconds
 
 let terminationTimeout: Int = 3 // seconds
 
+let activationDelay: TimeInterval = 1.5
+
 private func _suspendChat(timeout: Int) {
     // this is a redundant check to prevent logical errors, like the one fixed in this PR
-    let state = appStateGroupDefault.get()
+    let state = AppChatState.shared.value
     if !state.canSuspend {
         logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
     } else if ChatModel.ok {
-        appStateGroupDefault.set(.suspending)
+        AppChatState.shared.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
         DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
     } else {
-        appStateGroupDefault.set(.suspended)
+        AppChatState.shared.set(.suspended)
     }
 }
 
@@ -41,18 +42,16 @@ func suspendChat() {
 
 func suspendBgRefresh() {
     suspendLockQueue.sync {
-        if case .bgRefresh = appStateGroupDefault.get()  {
+        if case .bgRefresh = AppChatState.shared.value  {
             _suspendChat(timeout: bgSuspendTimeout)
         }
     }
 }
 
-private var terminating = false
-
 func terminateChat() {
     logger.debug("terminateChat")
     suspendLockQueue.sync {
-        switch appStateGroupDefault.get() {
+        switch AppChatState.shared.value {
         case .suspending:
             // suspend instantly if already suspending
             _chatSuspended()
@@ -64,7 +63,6 @@ func terminateChat() {
         case .stopped:
             chatCloseStore()
         default:
-            terminating = true
             // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
@@ -73,7 +71,7 @@ func terminateChat() {
 
 func chatSuspended() {
     suspendLockQueue.sync {
-        if case .suspending = appStateGroupDefault.get() {
+        if case .suspending = AppChatState.shared.value {
             _chatSuspended()
         }
     }
@@ -81,48 +79,108 @@ func chatSuspended() {
 
 private func _chatSuspended() {
     logger.debug("_chatSuspended")
-    appStateGroupDefault.set(.suspended)
+    AppChatState.shared.set(.suspended)
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
-    if terminating {
-         chatCloseStore()
+    chatCloseStore()
+}
+
+func setAppState(_ appState: AppState) {
+    suspendLockQueue.sync {
+        AppChatState.shared.set(appState)
     }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
-    terminating = false
     suspendLockQueue.sync {
-        appStateGroupDefault.set(appState)
+        AppChatState.shared.set(appState)
         if ChatModel.ok { apiActivateChat() }
         logger.debug("DEBUGGING: activateChat: after apiActivateChat")
     }
 }
 
 func initChatAndMigrate(refreshInvitations: Bool = true) {
-    terminating = false
     let m = ChatModel.shared
     if (!m.chatInitialized) {
+        m.v3DBMigration = v3DBMigrationDefault.get()
+        if AppChatState.shared.value == .stopped {
+            AlertManager.shared.showAlert(Alert(
+                title: Text("Start chat?"),
+                message: Text("Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat."),
+                primaryButton: .default(Text("Ok")) {
+                    AppChatState.shared.set(.active)
+                    initialize(start: true)
+                },
+                secondaryButton: .cancel {
+                    initialize(start: false)
+                }
+            ))
+        } else {
+            initialize(start: true)
+        }
+    }
+
+    func initialize(start: Bool) {
         do {
-            m.v3DBMigration = v3DBMigrationDefault.get()
-            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
+            try initializeChat(start: m.v3DBMigration.startChat && start, refreshInvitations: refreshInvitations)
         } catch let error {
-            fatalError("Failed to start or load chats: \(responseError(error))")
+            AlertManager.shared.showAlertMsg(
+                title: start ? "Error starting chat" : "Error opening chat",
+                message: "Please contact developers.\nError: \(responseError(error))"
+            )
         }
     }
 }
 
-func startChatAndActivate() {
-    terminating = false
+func startChatAndActivate(dispatchQueue: DispatchQueue = DispatchQueue.main, _ completion: @escaping () -> Void) {
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()
         logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
     }
-    if .active != appStateGroupDefault.get()  {
+    if .active == AppChatState.shared.value {
+        completion()
+    } else if nseStateGroupDefault.get().inactive {
+        activate()
+    } else {
+        // setting app state to "activating" to notify NSE that it should suspend
+        setAppState(.activating)
+        waitNSESuspended(timeout: 10, dispatchQueue: dispatchQueue) { ok in
+            if !ok {
+                // if for some reason NSE failed to suspend,
+                // e.g., it crashed previously without setting its state to "suspended",
+                // set it to "suspended" state anyway, so that next time app
+                // does not have to wait when activating.
+                nseStateGroupDefault.set(.suspended)
+            }
+            if AppChatState.shared.value == .activating {
+                activate()
+            }
+        }
+    }
+
+    func activate() {
         logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
         activateChat()
+        completion()
         logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
     }
 }
+
+// appStateGroupDefault must not be used in the app directly, only via this singleton
+class AppChatState {
+    static let shared = AppChatState()
+    private var value_ = appStateGroupDefault.get()
+
+    var value: AppState {
+        value_
+    }
+
+    func set(_ state: AppState) {
+        appStateGroupDefault.set(state)
+        sendAppState(state)
+        value_ = state
+    }
+}

apps/ios/Shared/SimpleXApp.swift

@@ -27,7 +27,7 @@ struct SimpleXApp: App {
 
     init() {
 //        DispatchQueue.global(qos: .background).sync {
-        haskell_init()
+            haskell_init()
 //            hs_init(0, nil)
 //        }
         UserDefaults.standard.register(defaults: appDefaults)
@@ -54,7 +54,7 @@ struct SimpleXApp: App {
                 }
                 .onAppear() {
                     showInitializationView = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
                         initChatAndMigrate()
                     }
                 }
@@ -76,16 +76,19 @@ struct SimpleXApp: App {
                         NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                     case .active:
                         CallController.shared.shouldSuspendChat = false
-                        let appState = appStateGroupDefault.get()
-                        startChatAndActivate()
-                        if appState.inactive && chatModel.chatRunning == true {
-                            updateChats()
-                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                updateCallInvitations()
+                        let appState = AppChatState.shared.value
+                        if appState != .stopped {
+                            startChatAndActivate {
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
+                                    }
+                                }
+                                doAuthenticate = authenticationExpired()
+                                canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                             }
                         }
-                        doAuthenticate = authenticationExpired()
-                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                     default:
                         break
                     }

apps/ios/Shared/Views/Call/CallController.swift

@@ -155,31 +155,32 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         if (!ChatModel.shared.chatInitialized) {
             initChatAndMigrate(refreshInvitations: false)
         }
-        startChatAndActivate()
-        shouldSuspendChat = true
-        // There are no invitations in the model, as it was processed by NSE
-        _ = try? justRefreshCallInvitations()
-        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
-        // Extract the call information from the push notification payload
-        let m = ChatModel.shared
-        if let contactId = payload.dictionaryPayload["contactId"] as? String,
-           let invitation = m.callInvitations[contactId] {
-            let update = cxCallUpdate(invitation: invitation)
-            if let uuid = invitation.callkitUUID {
-                logger.debug("CallController: report pushkit call via CallKit")
-                let update = cxCallUpdate(invitation: invitation)
-                provider.reportNewIncomingCall(with: uuid, update: update) { error in
-                    if error != nil {
-                        m.callInvitations.removeValue(forKey: contactId)
+        startChatAndActivate(dispatchQueue: DispatchQueue.global()) {
+            self.shouldSuspendChat = true
+            // There are no invitations in the model, as it was processed by NSE
+            _ = try? justRefreshCallInvitations()
+            // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
+            // Extract the call information from the push notification payload
+            let m = ChatModel.shared
+            if let contactId = payload.dictionaryPayload["contactId"] as? String,
+               let invitation = m.callInvitations[contactId] {
+                let update = self.cxCallUpdate(invitation: invitation)
+                if let uuid = invitation.callkitUUID {
+                    logger.debug("CallController: report pushkit call via CallKit")
+                    let update = self.cxCallUpdate(invitation: invitation)
+                    self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
+                        if error != nil {
+                            m.callInvitations.removeValue(forKey: contactId)
+                        }
+                        // Tell PushKit that the notification is handled.
+                        completion()
                     }
-                    // Tell PushKit that the notification is handled.
-                    completion()
+                } else {
+                    self.reportExpiredCall(update: update, completion)
                 }
             } else {
-                reportExpiredCall(update: update, completion)
+                self.reportExpiredCall(payload: payload, completion)
             }
-        } else {
-            reportExpiredCall(payload: payload, completion)
         }
     }
 

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -384,10 +384,10 @@ struct ComposeView: View {
             }
         }
         .sheet(isPresented: $showMediaPicker) {
-            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
-                showMediaPicker = false
-                if itemsSelected {
-                    DispatchQueue.main.async {
+            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10) { itemsSelected in
+                await MainActor.run {
+                    showMediaPicker = false
+                    if itemsSelected {
                         composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                     }
                 }
@@ -488,6 +488,21 @@ struct ComposeView: View {
         }
     }
 
+    private func addMediaContent(_ content: UploadContent) async {
+        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+            var newMedia: [(String, UploadContent?)] = []
+            if case var .mediaPreviews(media) = composeState.preview {
+                media.append((img, content))
+                newMedia = media
+            } else {
+                newMedia = [(img, content)]
+            }
+            await MainActor.run {
+                composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: newMedia))
+            }
+        }
+    }
+
     private var maxFileSize: Int64 {
         getMaxFileSize(.xftp)
     }

apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift

@@ -103,8 +103,10 @@ struct GroupProfileView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
             }
         }
         .onChange(of: chosenImage) { image in

apps/ios/Shared/Views/Database/DatabaseView.swift

@@ -415,7 +415,7 @@ struct DatabaseView: View {
                 do {
                     try initializeChat(start: true)
                     m.chatDbChanged = false
-                    appStateGroupDefault.set(.active)
+                    AppChatState.shared.set(.active)
                 } catch let error {
                     fatalError("Error starting chat \(responseError(error))")
                 }
@@ -427,7 +427,7 @@ struct DatabaseView: View {
                 m.chatRunning = true
                 ChatReceiver.shared.start()
                 chatLastStartGroupDefault.set(Date.now)
-                appStateGroupDefault.set(.active)
+                AppChatState.shared.set(.active)
             } catch let error {
                 runChat = false
                 alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,7 +477,7 @@ func stopChatAsync() async throws {
     try await apiStopChat()
     ChatReceiver.shared.stop()
     await MainActor.run { ChatModel.shared.chatRunning = false }
-    appStateGroupDefault.set(.stopped)
+    AppChatState.shared.set(.stopped)
 }
 
 func deleteChatAsync() async throws {

apps/ios/Shared/Views/Helpers/ImagePicker.swift

@@ -13,112 +13,122 @@ import SimpleXChat
 
 struct LibraryImagePicker: View {
     @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectItems: Bool) -> Void
-    @State var images: [UploadContent] = []
+    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
+    @State var mediaAdded = false
 
     var body: some View {
-        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
-            .onChange(of: images) { _ in
-                if let img = images.first {
-                    image = img.uiImage
-                }
-            }
+        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
+    }
+
+    private func addMedia(_ content: UploadContent) async {
+        if mediaAdded { return }
+        await MainActor.run {
+            mediaAdded = true
+            image = content.uiImage
+        }
     }
 }
 
 struct LibraryMediaListPicker: UIViewControllerRepresentable {
     typealias UIViewControllerType = PHPickerViewController
-    @Binding var media: [UploadContent]
+    var addMedia: (_ content: UploadContent) async -> Void
     var selectionLimit: Int
-    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    var didFinishPicking: (_ didSelectItems: Bool) async -> Void
 
     class Coordinator: PHPickerViewControllerDelegate {
         let parent: LibraryMediaListPicker
         let dispatchQueue = DispatchQueue(label: "chat.simplex.app.LibraryMediaListPicker")
-        var media: [UploadContent] = []
-        var mediaCount: Int = 0
 
         init(_ parent: LibraryMediaListPicker) {
             self.parent = parent
         }
 
         func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-            parent.didFinishPicking(!results.isEmpty)
-            guard !results.isEmpty else {
-                return
+            Task {
+                await parent.didFinishPicking(!results.isEmpty)
+                if results.isEmpty { return }
+                for r in results {
+                    await loadItem(r.itemProvider)
+                }
             }
+        }
 
-            parent.media = []
-            media = []
-            mediaCount = results.count
-            for result in results {
-                logger.log("LibraryMediaListPicker result")
-                let p = result.itemProvider
-                if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                    p.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
-                        if let url = url {
-                            let tempUrl = URL(fileURLWithPath: getTempFilesDirectory().path + "/" + generateNewFileName("video", url.pathExtension))
-                            if ((try? FileManager.default.copyItem(at: url, to: tempUrl)) != nil) {
-                                ChatModel.shared.filesToDelete.insert(tempUrl)
-                                self.loadVideo(url: tempUrl, error: error)
+        private func loadItem(_ p: NSItemProvider) async {
+            logger.debug("LibraryMediaListPicker result")
+            if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
+                if let video = await loadVideo(p) {
+                    await self.parent.addMedia(video)
+                    logger.debug("LibraryMediaListPicker: added video")
+                }
+            } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
+                if let img = await loadImageData(p) {
+                    await self.parent.addMedia(img)
+                    logger.debug("LibraryMediaListPicker: added image")
+                }
+            } else if p.canLoadObject(ofClass: UIImage.self) {
+                if let img = await loadImage(p) {
+                    await self.parent.addMedia(.simpleImage(image: img))
+                    logger.debug("LibraryMediaListPicker: added image")
+                }
+            }
+        }
+
+        private func loadImageData(_ p: NSItemProvider) async -> UploadContent? {
+            await withCheckedContinuation { cont in
+                loadFileURL(p, type: UTType.data) { url in
+                    if let url = url {
+                        let img = UploadContent.loadFromURL(url: url)
+                        cont.resume(returning: img)
+                    } else {
+                        cont.resume(returning: nil)
+                    }
+                }
+            }
+        }
+
+        private func loadImage(_ p: NSItemProvider) async -> UIImage? {
+            await withCheckedContinuation { cont in
+                p.loadObject(ofClass: UIImage.self)  { obj, err in
+                    if let err = err {
+                        logger.error("LibraryMediaListPicker result image error: \(err.localizedDescription)")
+                        cont.resume(returning: nil)
+                    } else  {
+                        cont.resume(returning: obj as? UIImage)
+                    }
+                }
+            }
+        }
+
+        private func loadVideo(_ p: NSItemProvider) async -> UploadContent? {
+            await withCheckedContinuation { cont in
+                loadFileURL(p, type: UTType.movie) { url in
+                    if let url = url  {
+                        let tempUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", url.pathExtension, fullPath: true))
+                        do {
+//                            logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
+                            try FileManager.default.copyItem(at: url, to: tempUrl)
+                            DispatchQueue.main.async {
+                                _ = ChatModel.shared.filesToDelete.insert(tempUrl)
                             }
+                            let video = UploadContent.loadVideoFromURL(url: tempUrl)
+                            cont.resume(returning: video)
+                            return
+                        } catch let err {
+                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
                         }
                     }
-                } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                    p.loadFileRepresentation(forTypeIdentifier: UTType.data.identifier) { url, error in
-                        self.loadImage(object: url, error: error)
-                    }
-                } else if p.canLoadObject(ofClass: UIImage.self) {
-                    p.loadObject(ofClass: UIImage.self)  { image, error in
-                        DispatchQueue.main.async {
-                            self.loadImage(object: image, error: error)
-                        }
-                    }
+                    cont.resume(returning: nil)
+                }
+            }
+        }
+
+        private func loadFileURL(_ p: NSItemProvider, type: UTType, completion: @escaping (URL?) -> Void) {
+            p.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, err in
+                if let err = err {
+                    logger.error("LibraryMediaListPicker loadFileURL error: \(err.localizedDescription)")
+                    completion(nil)
                 } else {
-                    dispatchQueue.sync { self.mediaCount -= 1}
-                }
-            }
-            DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
-                self.dispatchQueue.sync {
-                    if self.parent.media.count == 0 {
-                        logger.log("LibraryMediaListPicker: added \(self.media.count) images out of \(results.count)")
-                        self.parent.media = self.media
-                    }
-                }
-            }
-        }
-
-        func loadImage(object: Any?, error: Error? = nil) {
-            if let error = error {
-                logger.error("LibraryMediaListPicker: couldn't load image with error: \(error.localizedDescription)")
-            } else if let image = object as? UIImage {
-                media.append(.simpleImage(image: image))
-                logger.log("LibraryMediaListPicker: added image")
-            } else if let url = object as? URL, let image = UploadContent.loadFromURL(url: url) {
-                media.append(image)
-            }
-            dispatchQueue.sync {
-                self.mediaCount -= 1
-                if self.mediaCount == 0 && self.parent.media.count == 0 {
-                    logger.log("LibraryMediaListPicker: added all media")
-                    self.parent.media = self.media
-                    self.media = []
-                }
-            }
-        }
-
-        func loadVideo(url: URL?, error: Error? = nil) {
-            if let error = error {
-                logger.error("LibraryMediaListPicker: couldn't load video with error: \(error.localizedDescription)")
-            } else if let url = url as URL?, let video = UploadContent.loadVideoFromURL(url: url) {
-                media.append(video)
-            }
-            dispatchQueue.sync {
-                self.mediaCount -= 1
-                if self.mediaCount == 0 && self.parent.media.count == 0 {
-                    logger.log("LibraryMediaListPicker: added all media")
-                    self.parent.media = self.media
-                    self.media = []
+                    completion(url)
                 }
             }
         }

apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift

@@ -52,7 +52,7 @@ struct LocalAuthView: View {
                 resetChatCtrl()
                 try initializeChat(start: true)
                 m.chatDbChanged = false
-                appStateGroupDefault.set(.active)
+                AppChatState.shared.set(.active)
                 if m.currentUser != nil { return }
                 var profile: Profile? = nil
                 if let displayName = displayName, displayName != "" {

apps/ios/Shared/Views/NewChat/AddGroupView.swift

@@ -130,8 +130,10 @@ struct AddGroupView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
             }
         }
         .alert(isPresented: $showInvalidNameAlert) {

apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift

@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                     }
                     .disabled(currentNetCfg == NetCfg.proxyDefaults)
 
-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 60_000, 90_000, 120_000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 45_000, 60_000, 90_000, 120_000], label: secondsLabel)
                     timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                     intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                     Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)

apps/ios/Shared/Views/UserSettings/NotificationsView.swift

@@ -14,9 +14,6 @@ struct NotificationsView: View {
     @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
     @State private var showAlert: NotificationAlert?
     @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
-//    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_LOCAL, store: groupDefaults) private var ntfEnableLocal = false
-//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_PERIODIC, store: groupDefaults) private var ntfEnablePeriodic = false
 
     var body: some View {
         List {
@@ -88,13 +85,6 @@ struct NotificationsView: View {
                         .padding(.top, 1)
                 }
             }
-
-//            if developerTools {
-//                Section(String("Experimental")) {
-//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
-//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
-//                }
-//            }
         }
         .disabled(legacyDatabase)
     }
@@ -119,7 +109,7 @@ struct NotificationsView: View {
 
     private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
         switch mode {
-        case .off: return "Turn off notifications?"
+        case .off: return "Use only local notifications?"
         case .periodic: return "Enable periodic notifications?"
         case .instant: return "Enable instant notifications?"
         }

apps/ios/Shared/Views/UserSettings/UserProfile.swift

@@ -120,8 +120,10 @@ struct UserProfile: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
             }
         }
         .onChange(of: chosenImage) { image in

apps/ios/SimpleX NSE/ConcurrentQueue.swift

@@ -0,0 +1,64 @@
+//
+//  ConcurrentQueue.swift
+//  SimpleX NSE
+//
+//  Created by Evgeny on 08/12/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+
+struct DequeueElement<T> {
+    var elementId: UUID?
+    var task: Task<T?, Never>
+}
+
+class ConcurrentQueue<T> {
+    private var queue: [T] = []
+    private var queueLock = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.concurrent-queue.lock.\(UUID())")
+    private var continuations = [(elementId: UUID, continuation: CheckedContinuation<T?, Never>)]()
+
+    func enqueue(_ el: T) {
+        resumeContinuation(el) { self.queue.append(el) }
+    }
+
+    func frontEnqueue(_ el: T) {
+        resumeContinuation(el) { self.queue.insert(el, at: 0) }
+    }
+
+    private func resumeContinuation(_ el: T, add: @escaping () -> Void) {
+        queueLock.sync {
+            if let (_, cont) = continuations.first {
+                continuations.remove(at: 0)
+                cont.resume(returning: el)
+            } else {
+                add()
+            }
+        }
+    }
+
+    func dequeue() -> DequeueElement<T> {
+        queueLock.sync {
+            if queue.isEmpty {
+                let elementId = UUID()
+                let task = Task {
+                    await withCheckedContinuation { cont in
+                        continuations.append((elementId, cont))
+                    }
+                }
+                return DequeueElement(elementId: elementId, task: task)
+            } else {
+                let el = queue.remove(at: 0)
+                return DequeueElement(task: Task { el })
+            }
+        }
+    }
+
+    func cancelDequeue(_ elementId: UUID) {
+        queueLock.sync {
+            let cancelled = continuations.filter { $0.elementId == elementId }
+            continuations.removeAll { $0.elementId == elementId }
+            cancelled.forEach { $0.continuation.resume(returning: nil) }
+        }
+    }
+}

apps/ios/SimpleX NSE/NotificationService.swift

@@ -14,91 +14,225 @@ import SimpleXChat
 
 let logger = Logger()
 
-let suspendingDelay: UInt64 = 2_000_000_000
+let suspendingDelay: UInt64 = 2_500_000_000
 
-typealias NtfStream = AsyncStream<NSENotification>
+let nseSuspendTimeout: Int = 10
 
+typealias NtfStream = ConcurrentQueue<NSENotification>
+
+// Notifications are delivered via concurrent queues, as they are all received from chat controller in a single loop that
+// writes to ConcurrentQueue and when notification is processed, the instance of Notification service extension reads from the queue.
+// One queue per connection (entity) is used.
+// The concurrent queues allow read cancellation, to ensure that notifications are not lost in case the current thread completes
+// before expected notification is read (multiple notifications can be expected, because one notification can be delivered for several messages).
 actor PendingNtfs {
     static let shared = PendingNtfs()
     private var ntfStreams: [String: NtfStream] = [:]
-    private var ntfConts: [String: NtfStream.Continuation] = [:]
 
-    func createStream(_ id: String) {
-        logger.debug("PendingNtfs.createStream: \(id, privacy: .public)")
-        if ntfStreams.index(forKey: id) == nil {
-            ntfStreams[id] = AsyncStream { cont in
-                ntfConts[id] = cont
-                logger.debug("PendingNtfs.createStream: store continuation")
-            }
+    func createStream(_ id: String) async {
+        logger.debug("NotificationService PendingNtfs.createStream: \(id, privacy: .public)")
+        if ntfStreams[id] == nil {
+            ntfStreams[id] = ConcurrentQueue()
+            logger.debug("NotificationService PendingNtfs.createStream: created ConcurrentQueue")
         }
     }
 
-    func readStream(_ id: String, for nse: NotificationService, msgCount: Int = 1, showNotifications: Bool) async {
-        logger.debug("PendingNtfs.readStream: \(id, privacy: .public) \(msgCount, privacy: .public)")
+    func readStream(_ id: String, for nse: NotificationService, ntfInfo: NtfMessages) async {
+        logger.debug("NotificationService PendingNtfs.readStream: \(id, privacy: .public) \(ntfInfo.ntfMessages.count, privacy: .public)")
+        if !ntfInfo.user.showNotifications {
+            nse.setBestAttemptNtf(.empty)
+        }
         if let s = ntfStreams[id] {
-            logger.debug("PendingNtfs.readStream: has stream")
-            var rcvCount = max(1, msgCount)
-            for await ntf in s {
-                nse.setBestAttemptNtf(showNotifications ? ntf : .empty)
-                rcvCount -= 1
-                if rcvCount == 0 || ntf.categoryIdentifier == ntfCategoryCallInvitation { break }
+            logger.debug("NotificationService PendingNtfs.readStream: has stream")
+            var expected = Set(ntfInfo.ntfMessages.map { $0.msgId })
+            logger.debug("NotificationService PendingNtfs.readStream: expecting: \(expected, privacy: .public)")
+            var readCancelled = false
+            var dequeued: DequeueElement<NSENotification>?
+            nse.cancelRead = {
+                readCancelled = true
+                if let elementId = dequeued?.elementId {
+                    s.cancelDequeue(elementId)
+                }
             }
-            logger.debug("PendingNtfs.readStream: exiting")
+            while !readCancelled {
+                dequeued = s.dequeue()
+                if let ntf = await dequeued?.task.value {
+                    if readCancelled {
+                        logger.debug("NotificationService PendingNtfs.readStream: read cancelled, put ntf to queue front")
+                        s.frontEnqueue(ntf)
+                        break
+                    } else if case let .msgInfo(info) = ntf {
+                        let found = expected.remove(info.msgId)
+                        if found != nil {
+                            logger.debug("NotificationService PendingNtfs.readStream: msgInfo, last: \(expected.isEmpty, privacy: .public)")
+                            if expected.isEmpty { break }
+                        } else if let msgTs = ntfInfo.msgTs, info.msgTs > msgTs {
+                            logger.debug("NotificationService PendingNtfs.readStream: unexpected msgInfo")
+                            s.frontEnqueue(ntf)
+                            break
+                        }
+                    } else if ntfInfo.user.showNotifications {
+                        logger.debug("NotificationService PendingNtfs.readStream: setting best attempt")
+                        nse.setBestAttemptNtf(ntf)
+                        if ntf.isCallInvitation { break }
+                    }
+                } else {
+                    break
+                }
+            }
+            nse.cancelRead = nil
+            logger.debug("NotificationService PendingNtfs.readStream: exiting")
         }
     }
 
-    func writeStream(_ id: String, _ ntf: NSENotification) {
-        logger.debug("PendingNtfs.writeStream: \(id, privacy: .public)")
-        if let cont = ntfConts[id] {
-            logger.debug("PendingNtfs.writeStream: writing ntf")
-            cont.yield(ntf)
+    func writeStream(_ id: String, _ ntf: NSENotification) async {
+        logger.debug("NotificationService PendingNtfs.writeStream: \(id, privacy: .public)")
+        if let s = ntfStreams[id] {
+            logger.debug("NotificationService PendingNtfs.writeStream: writing ntf")
+            s.enqueue(ntf)
+        }
+    }
+}
+
+// The current implementation assumes concurrent notification delivery and uses semaphores
+// to process only one notification per connection (entity) at a time.
+class NtfStreamSemaphores {
+    static let shared = NtfStreamSemaphores()
+    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-semaphores.lock")
+    private var semaphores: [String: DispatchSemaphore] = [:]
+
+    func waitForStream(_ id: String) {
+        streamSemaphore(id, value: 0)?.wait()
+    }
+
+    func signalStreamReady(_ id: String) {
+        streamSemaphore(id, value: 1)?.signal()
+    }
+
+    // this function returns nil if semaphore is just created, so passed value shoud be coordinated with the desired end value of the semaphore
+    private func streamSemaphore(_ id: String, value: Int) -> DispatchSemaphore? {
+        NtfStreamSemaphores.queue.sync {
+            if let s = semaphores[id] {
+                return s
+            } else {
+                semaphores[id] = DispatchSemaphore(value: value)
+                return nil
+            }
         }
     }
 }
 
 enum NSENotification {
-    case nse(notification: UNMutableNotificationContent)
-    case callkit(invitation: RcvCallInvitation)
+    case nse(UNMutableNotificationContent)
+    case callkit(RcvCallInvitation)
     case empty
+    case msgInfo(NtfMsgInfo)
 
-    var categoryIdentifier: String? {
+    var isCallInvitation: Bool {
         switch self {
-        case let .nse(ntf): return ntf.categoryIdentifier
-        case .callkit: return ntfCategoryCallInvitation
-        case .empty: return nil
+        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
+        case .callkit: true
+        case .empty: false
+        case .msgInfo: false
         }
     }
 }
 
+// Once the last thread in the process completes processing chat controller is suspended, and the database is closed, to avoid
+// background crashes and contention for database with the application (both UI and background fetch triggered either on schedule
+// or when background notification is received.
+class NSEThreads {
+    static let shared = NSEThreads()
+    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
+    private var allThreads: Set<UUID> = []
+    private var activeThreads: Set<UUID> = []
+
+    func newThread() -> UUID {
+        NSEThreads.queue.sync {
+            let (_, t) = allThreads.insert(UUID())
+            return t
+        }
+    }
+
+    func startThread(_ t: UUID) {
+        NSEThreads.queue.sync {
+            if allThreads.contains(t) {
+                _ = activeThreads.insert(t)
+            } else {
+                logger.warning("NotificationService startThread: thread \(t) was removed before it started")
+            }
+        }
+    }
+
+    func endThread(_ t: UUID) -> Bool {
+        NSEThreads.queue.sync {
+            let tActive = activeThreads.remove(t)
+            let t = allThreads.remove(t)
+            if tActive != nil && activeThreads.isEmpty {
+                return true
+            }
+            if t != nil && allThreads.isEmpty {
+                NSEChatState.shared.set(.suspended)
+            }
+            return false
+        }
+    }
+}
+
+// Notification service extension creates a new instance of the class and calls didReceive for each notification.
+// Each didReceive is called in its own thread, but multiple calls can be made in one process, and, empirically, there is never
+// more than one process of notification service extension exists at a time.
+// Soon after notification service delivers the last notification it is either suspended or terminated.
 class NotificationService: UNNotificationServiceExtension {
     var contentHandler: ((UNNotificationContent) -> Void)?
     var bestAttemptNtf: NSENotification?
     var badgeCount: Int = 0
+    // thread is added to allThreads here - if thread did not start chat,
+    // chat does not need to be suspended but NSE state still needs to be set to "suspended".
+    var threadId: UUID? = NSEThreads.shared.newThread()
+    var receiveEntityId: String?
+    var cancelRead: (() -> Void)?
+    var appSubscriber: AppSubscriber?
+    var returnedSuspension = false
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         logger.debug("DEBUGGING: NotificationService.didReceive")
-        if let ntf = request.content.mutableCopy() as? UNMutableNotificationContent {
-            setBestAttemptNtf(ntf)
-        }
+        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
+        setBestAttemptNtf(ntf)
         self.contentHandler = contentHandler
         registerGroupDefaults()
         let appState = appStateGroupDefault.get()
+        logger.debug("NotificationService: app is \(appState.rawValue, privacy: .public)")
         switch appState {
+        case .stopped:
+            setBadgeCount()
+            setBestAttemptNtf(createAppStoppedNtf())
+            deliverBestAttemptNtf()
         case .suspended:
-            logger.debug("NotificationService: app is suspended")
             setBadgeCount()
             receiveNtfMessages(request, contentHandler)
         case .suspending:
-            logger.debug("NotificationService: app is suspending")
             setBadgeCount()
             Task {
-                var state = appState
-                for _ in 1...5 {
-                    _ = try? await Task.sleep(nanoseconds: suspendingDelay)
-                    state = appStateGroupDefault.get()
-                    if state == .suspended || state != .suspending { break }
+                let state: AppState = await withCheckedContinuation { cont in
+                    appSubscriber = appStateSubscriber { s in
+                        if s == .suspended { appSuspension(s) }
+                    }
+                    DispatchQueue.global().asyncAfter(deadline: .now() + Double(appSuspendTimeout) + 1) {
+                        logger.debug("NotificationService: appSuspension timeout")
+                        appSuspension(appStateGroupDefault.get())
+                    }
+
+                    @Sendable
+                    func appSuspension(_ s: AppState) {
+                        if !self.returnedSuspension {
+                            self.returnedSuspension = true
+                            self.appSubscriber = nil // this disposes of appStateSubscriber
+                            cont.resume(returning: s)
+                        }
+                    }
                 }
-                logger.debug("NotificationService: app state is \(state.rawValue, privacy: .public)")
+                logger.debug("NotificationService: app state is now \(state.rawValue, privacy: .public)")
                 if state.inactive {
                     receiveNtfMessages(request, contentHandler)
                 } else {
@@ -106,7 +240,6 @@ class NotificationService: UNNotificationServiceExtension {
                 }
             }
         default:
-            logger.debug("NotificationService: app state is \(appState.rawValue, privacy: .public)")
             deliverBestAttemptNtf()
         }
     }
@@ -121,27 +254,35 @@ class NotificationService: UNNotificationServiceExtension {
         if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
            let nonce = ntfData["nonce"] as? String,
            let encNtfInfo = ntfData["message"] as? String,
-           let dbStatus = startChat() {
+           // check it here again
+           appStateGroupDefault.get().inactive {
+            // thread is added to activeThreads tracking set here - if thread started chat it needs to be suspended
+            if let t = threadId { NSEThreads.shared.startThread(t) }
+            let dbStatus = startChat()
             if case .ok = dbStatus,
-               let ntfMsgInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfMsgInfo), privacy: .public)")
-                if let connEntity = ntfMsgInfo.connEntity {
+               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo), privacy: .public)")
+                if let connEntity = ntfInfo.connEntity_ {
                     setBestAttemptNtf(
-                        ntfMsgInfo.ntfsEnabled
-                        ? .nse(notification: createConnectionEventNtf(ntfMsgInfo.user, connEntity))
+                        ntfInfo.ntfsEnabled
+                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
                         : .empty
                     )
                     if let id = connEntity.id {
-                        Task {
-                            logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id, privacy: .public)")
-                            await PendingNtfs.shared.createStream(id)
-                            await PendingNtfs.shared.readStream(id, for: self, msgCount: ntfMsgInfo.ntfMessages.count, showNotifications: ntfMsgInfo.user.showNotifications)
-                            deliverBestAttemptNtf()
+                        receiveEntityId = id
+                        NtfStreamSemaphores.shared.waitForStream(id)
+                        if receiveEntityId != nil {
+                            Task {
+                                logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id, privacy: .public)")
+                                await PendingNtfs.shared.createStream(id)
+                                await PendingNtfs.shared.readStream(id, for: self, ntfInfo: ntfInfo)
+                                deliverBestAttemptNtf()
+                            }
                         }
+                        return
                     }
                 }
-                return
-            } else {
+            } else if let dbStatus = dbStatus {
                 setBestAttemptNtf(createErrorNtf(dbStatus))
             }
         }
@@ -159,14 +300,14 @@ class NotificationService: UNNotificationServiceExtension {
     }
 
     func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        setBestAttemptNtf(.nse(notification: ntf))
+        setBestAttemptNtf(.nse(ntf))
     }
 
     func setBestAttemptNtf(_ ntf: NSENotification) {
         logger.debug("NotificationService.setBestAttemptNtf")
         if case let .nse(notification) = ntf {
             notification.badge = badgeCount as NSNumber
-            bestAttemptNtf = .nse(notification: notification)
+            bestAttemptNtf = .nse(notification)
         } else {
             bestAttemptNtf = ntf
         }
@@ -174,9 +315,33 @@ class NotificationService: UNNotificationServiceExtension {
 
     private func deliverBestAttemptNtf() {
         logger.debug("NotificationService.deliverBestAttemptNtf")
+        if let cancel = cancelRead {
+            cancelRead = nil
+            cancel()
+        }
+        if let id = receiveEntityId {
+            receiveEntityId = nil
+            NtfStreamSemaphores.shared.signalStreamReady(id)
+        }
+        if let t = threadId {
+            threadId = nil
+            if NSEThreads.shared.endThread(t) {
+                suspendChat(nseSuspendTimeout)
+            }
+        }
         if let handler = contentHandler, let ntf = bestAttemptNtf {
+            contentHandler = nil
+            bestAttemptNtf = nil
+            let deliver: (UNMutableNotificationContent?) -> Void = { ntf in
+                let useNtf = if let ntf = ntf {
+                    appStateGroupDefault.get().running ? UNMutableNotificationContent() : ntf
+                } else {
+                    UNMutableNotificationContent()
+                }
+                handler(useNtf)
+            }
             switch ntf {
-            case let .nse(content): handler(content)
+            case let .nse(content): deliver(content)
             case let .callkit(invitation):
                 CXProvider.reportNewIncomingVoIPPushPayload([
                     "displayName": invitation.contact.displayName,
@@ -184,66 +349,200 @@ class NotificationService: UNNotificationServiceExtension {
                     "media": invitation.callType.media.rawValue
                 ]) { error in
                     if error == nil {
-                        handler(UNMutableNotificationContent())
+                        deliver(nil)
                     } else {
-                        logger.debug("reportNewIncomingVoIPPushPayload success to CallController for \(invitation.contact.id)")
-                        handler(createCallInvitationNtf(invitation))
+                        logger.debug("NotificationService reportNewIncomingVoIPPushPayload success to CallController for \(invitation.contact.id)")
+                        deliver(createCallInvitationNtf(invitation))
                     }
                 }
-            case .empty: handler(UNMutableNotificationContent())
+            case .empty: deliver(nil) // used to mute notifications that did not unsubscribe yet
+            case .msgInfo: deliver(nil) // unreachable, the best attempt is never set to msgInfo
             }
-            bestAttemptNtf = nil
         }
     }
 }
 
-var chatStarted = false
-var networkConfig: NetCfg = getNetCfg()
-var xftpConfig: XFTPFileConfig? = getXFTPCfg()
+// nseStateGroupDefault must not be used in NSE directly, only via this singleton
+class NSEChatState {
+    static let shared = NSEChatState()
+    private var value_ = NSEState.created
 
+    var value: NSEState {
+        value_
+    }
+
+    func set(_ state: NSEState) {
+        nseStateGroupDefault.set(state)
+        sendNSEState(state)
+        value_ = state
+    }
+
+    init() {
+        // This is always set to .created state, as in case previous start of NSE crashed in .active state, it is stored correctly.
+        // Otherwise the app will be activating slower
+        set(.created)
+    }
+}
+
+var appSubscriber: AppSubscriber = appStateSubscriber { state in
+    logger.debug("NotificationService: appSubscriber")
+    if state.running && NSEChatState.shared.value.canSuspend {
+        logger.debug("NotificationService: appSubscriber app state \(state.rawValue), suspending")
+        suspendChat(nseSuspendTimeout)
+    }
+}
+
+func appStateSubscriber(onState: @escaping (AppState) -> Void) -> AppSubscriber {
+    appMessageSubscriber { msg in
+        if case let .state(state) = msg {
+            logger.debug("NotificationService: appStateSubscriber \(state.rawValue, privacy: .public)")
+            onState(state)
+        }
+    }
+}
+
+var receiverStarted = false
+let startLock = DispatchSemaphore(value: 1)
+let suspendLock = DispatchSemaphore(value: 1)
+var networkConfig: NetCfg = getNetCfg()
+let xftpConfig: XFTPFileConfig? = getXFTPCfg()
+
+// startChat uses semaphore startLock to ensure that only one didReceive thread can start chat controller
+// Subsequent calls to didReceive will be waiting on semaphore and won't start chat again, as it will be .active
 func startChat() -> DBMigrationResult? {
+    logger.debug("NotificationService: startChat")
+    if case .active = NSEChatState.shared.value { return .ok }
+
+    startLock.wait()
+    defer { startLock.signal() }
+    
+    return switch NSEChatState.shared.value {
+    case .created: doStartChat()
+    case .starting: .ok // it should never get to this branch, as it would be waiting for start on startLock
+    case .active: .ok
+    case .suspending: activateChat()
+    case .suspended: activateChat()
+    }
+}
+
+func doStartChat() -> DBMigrationResult? {
+    logger.debug("NotificationService: doStartChat")
     hs_init(0, nil)
-    if chatStarted { return .ok }
     let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation())
     if dbStatus != .ok {
         resetChatCtrl()
+        NSEChatState.shared.set(.created)
         return dbStatus
     }
+    let state = NSEChatState.shared.value
+    NSEChatState.shared.set(.starting)
     if let user = apiGetActiveUser() {
-        logger.debug("active user \(String(describing: user))")
+        logger.debug("NotificationService active user \(String(describing: user))")
         do {
             try setNetworkConfig(networkConfig)
             try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
             try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
             try setXFTPConfig(xftpConfig)
             try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
-            let justStarted = try apiStartChat()
-            chatStarted = true
-            if justStarted {
-                chatLastStartGroupDefault.set(Date.now)
-                Task { await receiveMessages() }
+            // prevent suspension while starting chat
+            suspendLock.wait()
+            defer { suspendLock.signal() }
+            if NSEChatState.shared.value == .starting {
+                updateNetCfg()
+                let justStarted = try apiStartChat()
+                NSEChatState.shared.set(.active)
+                if justStarted {
+                    chatLastStartGroupDefault.set(Date.now)
+                    Task {
+                        if !receiverStarted {
+                            receiverStarted = true
+                            await receiveMessages()
+                        }
+                    }
+                }
+                return .ok
             }
-            return .ok
         } catch {
             logger.error("NotificationService startChat error: \(responseError(error), privacy: .public)")
         }
     } else {
-        logger.debug("no active user")
+        logger.debug("NotificationService: no active user")
     }
+    if NSEChatState.shared.value == .starting { NSEChatState.shared.set(state) }
     return nil
 }
 
+func activateChat() -> DBMigrationResult? {
+    logger.debug("NotificationService: activateChat")
+    let state = NSEChatState.shared.value
+    NSEChatState.shared.set(.active)
+    if apiActivateChat() {
+        logger.debug("NotificationService: activateChat: after apiActivateChat")
+        return .ok
+    } else {
+        NSEChatState.shared.set(state)
+        return nil
+    }
+}
+
+// suspendChat uses semaphore suspendLock to ensure that only one suspension can happen.
+func suspendChat(_ timeout: Int) {
+    logger.debug("NotificationService: suspendChat")
+    let state = NSEChatState.shared.value
+    if !state.canSuspend {
+        logger.error("NotificationService suspendChat called, current state: \(state.rawValue, privacy: .public)")
+    } else {
+        suspendLock.wait()
+        defer { suspendLock.signal() }
+
+        NSEChatState.shared.set(.suspending)
+        if apiSuspendChat(timeoutMicroseconds: timeout * 1000000) {
+            logger.debug("NotificationService: activateChat: after apiActivateChat")
+            DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: chatSuspended)
+        } else {
+            NSEChatState.shared.set(state)
+        }
+    }
+}
+
+func chatSuspended() {
+    logger.debug("NotificationService chatSuspended")
+    if case .suspending = NSEChatState.shared.value {
+        NSEChatState.shared.set(.suspended)
+        chatCloseStore()
+    }
+}
+
+// A single loop is used per Notification service extension process to receive and process all messages depending on the NSE state
+// If the extension is not active yet, or suspended/suspending, or the app is running, the notifications will no be received.
 func receiveMessages() async {
     logger.debug("NotificationService receiveMessages")
     while true {
-        updateNetCfg()
+        switch NSEChatState.shared.value {
+        // it should never get to "created" and "starting" branches, as NSE state is set to .active before the loop start
+        case .created: await delayWhenInactive()
+        case .starting: await delayWhenInactive()
+        case .active: await receiveMsg()
+        case .suspending: await receiveMsg()
+        case .suspended: await delayWhenInactive()
+        }
+    }
+
+    func receiveMsg() async {
         if let msg = await chatRecvMsg() {
+            logger.debug("NotificationService receiveMsg: message")
             if let (id, ntf) = await receivedMsgNtf(msg) {
+                logger.debug("NotificationService receiveMsg: notification")
                 await PendingNtfs.shared.createStream(id)
                 await PendingNtfs.shared.writeStream(id, ntf)
             }
         }
     }
+
+    func delayWhenInactive() async {
+        logger.debug("NotificationService delayWhenInactive")
+        _ = try? await Task.sleep(nanoseconds: 1000_000000)
+    }
 }
 
 func chatRecvMsg() async -> ChatResponse? {
@@ -257,14 +556,14 @@ private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }
 
 func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
-    logger.debug("NotificationService processReceivedMsg: \(res.responseType)")
+    logger.debug("NotificationService receivedMsgNtf: \(res.responseType, privacy: .public)")
     switch res {
     case let .contactConnected(user, contact, _):
-        return (contact.id, .nse(notification: createContactConnectedNtf(user, contact)))
+        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
     case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .nse(notification: createContactRequestNtf(user, contactRequest)))
+        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
     case let .newChatItem(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         var cItem = aChatItem.chatItem
@@ -274,7 +573,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
         if let file = cItem.autoReceiveFile() {
             cItem = autoReceiveFile(file, encrypted: cItem.encryptLocalFile) ?? cItem
         }
-        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
         return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
     case let .rcvFileSndCancelled(_, aChatItem, _):
         cleanupFile(aChatItem)
@@ -292,10 +591,15 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
         // Do not post it without CallKit support, iOS will stop launching the app without showing CallKit
         return (
             invitation.contact.id,
-            useCallKit() ? .callkit(invitation: invitation) : .nse(notification: createCallInvitationNtf(invitation))
+            useCallKit() ? .callkit(invitation) : .nse(createCallInvitationNtf(invitation))
         )
+    case let .ntfMessage(_, connEntity, ntfMessage):
+        return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
+    case .chatSuspended:
+        chatSuspended()
+        return nil
     default:
-        logger.debug("NotificationService processReceivedMsg ignored event: \(res.responseType)")
+        logger.debug("NotificationService receivedMsgNtf ignored event: \(res.responseType)")
         return nil
     }
 }
@@ -334,6 +638,21 @@ func apiStartChat() throws -> Bool {
     }
 }
 
+func apiActivateChat() -> Bool {
+    chatReopenStore()
+    let r = sendSimpleXCmd(.apiActivateChat(restoreChat: false))
+    if case .cmdOk = r { return true }
+    logger.error("NotificationService apiActivateChat error: \(String(describing: r))")
+    return false
+}
+
+func apiSuspendChat(timeoutMicroseconds: Int) -> Bool {
+    let r = sendSimpleXCmd(.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
+    if case .cmdOk = r { return true }
+    logger.error("NotificationService apiSuspendChat error: \(String(describing: r))")
+    return false
+}
+
 func apiSetTempFolder(tempFolder: String) throws {
     let r = sendSimpleXCmd(.setTempFolder(tempFolder: tempFolder))
     if case .cmdOk = r { return }
@@ -364,8 +683,8 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
         return nil
     }
     let r = sendSimpleXCmd(.apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfMessages(user, connEntity, msgTs, ntfMessages) = r, let user = user {
-        return NtfMessages(user: user, connEntity: connEntity, msgTs: msgTs, ntfMessages: ntfMessages)
+    if case let .ntfMessages(user, connEntity_, msgTs, ntfMessages) = r, let user = user {
+        return NtfMessages(user: user, connEntity_: connEntity_, msgTs: msgTs, ntfMessages: ntfMessages)
     } else if case let .chatCmdError(_, error) = r {
         logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
     } else {
@@ -405,11 +724,11 @@ func setNetworkConfig(_ cfg: NetCfg) throws {
 
 struct NtfMessages {
     var user: User
-    var connEntity: ConnectionEntity?
+    var connEntity_: ConnectionEntity?
     var msgTs: Date?
     var ntfMessages: [NtfMsgInfo]
 
     var ntfsEnabled: Bool {
-        user.showNotifications && (connEntity?.ntfsEnabled ?? false)
+        user.showNotifications && (connEntity_?.ntfsEnabled ?? false)
     }
 }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -112,6 +112,11 @@
 		5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */; };
 		5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */; };
 		5CCB939C297EFCB100399E78 /* NavStackCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCB939B297EFCB100399E78 /* NavStackCompat.swift */; };
+		5CCD1A602B27927E001A4199 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CCD1A5B2B27927E001A4199 /* libgmpxx.a */; };
+		5CCD1A612B27927E001A4199 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CCD1A5C2B27927E001A4199 /* libgmp.a */; };
+		5CCD1A622B27927E001A4199 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CCD1A5D2B27927E001A4199 /* libffi.a */; };
+		5CCD1A632B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CCD1A5E2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */; };
+		5CCD1A642B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CCD1A5F2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */; };
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
@@ -139,10 +144,15 @@
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
+		5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */; };
+		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
+		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
 		5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59CF286477B400863A68 /* ChatArchiveView.swift */; };
 		5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
 		5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
+		640417CD2B29B8C200CCB412 /* NewChatMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */; };
+		640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CC2B29B8C200CCB412 /* NewChatView.swift */; };
 		6407BA83295DA85D0082BA18 /* CIInvalidJSONView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */; };
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
@@ -154,11 +164,6 @@
 		64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */; };
 		64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DCB29FFE3E800E3D48D /* MailView.swift */; };
 		6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */; };
-		644D0EC82B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644D0EC32B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */; };
-		644D0EC92B29B15200E98A94 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644D0EC42B29B15200E98A94 /* libffi.a */; };
-		644D0ECA2B29B15200E98A94 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644D0EC52B29B15200E98A94 /* libgmpxx.a */; };
-		644D0ECB2B29B15200E98A94 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644D0EC62B29B15200E98A94 /* libgmp.a */; };
-		644D0ECC2B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644D0EC72B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */; };
 		644EFFDE292BCD9D00525D5B /* ComposeVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */; };
 		644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */; };
 		644EFFE2292D089800525D5B /* FramedCIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */; };
@@ -172,8 +177,6 @@
 		649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCDA12805D6EF00C3A862 /* CIImageView.swift */; };
 		64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
 		64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */; };
-		64AEA4ED2B15D2A400334292 /* NewChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AEA4EC2B15D2A400334292 /* NewChatView.swift */; };
-		64AEA4EF2B15FEE100334292 /* NewChatMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AEA4EE2B15FEE100334292 /* NewChatMenuButton.swift */; };
 		64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */; };
 		64C3B0212A0D359700E19930 /* CustomTimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C3B0202A0D359700E19930 /* CustomTimePicker.swift */; };
 		64D0C2C029F9688300B38D5F /* UserAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2BF29F9688300B38D5F /* UserAddressView.swift */; };
@@ -391,6 +394,11 @@
 		5CC2C0FE2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIRcvDecryptionError.swift; sourceTree = "<group>"; };
 		5CCB939B297EFCB100399E78 /* NavStackCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavStackCompat.swift; sourceTree = "<group>"; };
+		5CCD1A5B2B27927E001A4199 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CCD1A5C2B27927E001A4199 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CCD1A5D2B27927E001A4199 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5CCD1A5E2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a"; sourceTree = "<group>"; };
+		5CCD1A5F2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a"; sourceTree = "<group>"; };
 		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
 		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -419,9 +427,14 @@
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
+		5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrentQueue.swift; sourceTree = "<group>"; };
+		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
+		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
 		5CFA59CF286477B400863A68 /* ChatArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatArchiveView.swift; sourceTree = "<group>"; };
 		5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZoomableScrollView.swift; path = Shared/Views/ZoomableScrollView.swift; sourceTree = SOURCE_ROOT; };
+		640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatMenuButton.swift; sourceTree = "<group>"; };
+		640417CC2B29B8C200CCB412 /* NewChatView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatView.swift; sourceTree = "<group>"; };
 		6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIInvalidJSONView.swift; sourceTree = "<group>"; };
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
@@ -433,11 +446,6 @@
 		64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		64466DCB29FFE3E800E3D48D /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
 		6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLinkView.swift; sourceTree = "<group>"; };
-		644D0EC32B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a"; sourceTree = "<group>"; };
-		644D0EC42B29B15200E98A94 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		644D0EC52B29B15200E98A94 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		644D0EC62B29B15200E98A94 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		644D0EC72B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a"; sourceTree = "<group>"; };
 		644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeVoiceView.swift; sourceTree = "<group>"; };
 		644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIVoiceView.swift; sourceTree = "<group>"; };
 		644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramedCIVoiceView.swift; sourceTree = "<group>"; };
@@ -452,8 +460,6 @@
 		649BCDA12805D6EF00C3A862 /* CIImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIImageView.swift; sourceTree = "<group>"; };
 		64AA1C6827EE10C800AC7277 /* ContextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextItemView.swift; sourceTree = "<group>"; };
 		64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedItemView.swift; sourceTree = "<group>"; };
-		64AEA4EC2B15D2A400334292 /* NewChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatView.swift; sourceTree = "<group>"; };
-		64AEA4EE2B15FEE100334292 /* NewChatMenuButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatMenuButton.swift; sourceTree = "<group>"; };
 		64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemInfoView.swift; sourceTree = "<group>"; };
 		64C3B0202A0D359700E19930 /* CustomTimePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTimePicker.swift; sourceTree = "<group>"; };
 		64D0C2BF29F9688300B38D5F /* UserAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAddressView.swift; sourceTree = "<group>"; };
@@ -503,13 +509,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5CCD1A602B27927E001A4199 /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				644D0ECA2B29B15200E98A94 /* libgmpxx.a in Frameworks */,
+				5CCD1A612B27927E001A4199 /* libgmp.a in Frameworks */,
+				5CCD1A622B27927E001A4199 /* libffi.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				644D0EC82B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */,
-				644D0ECB2B29B15200E98A94 /* libgmp.a in Frameworks */,
-				644D0ECC2B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */,
-				644D0EC92B29B15200E98A94 /* libffi.a in Frameworks */,
+				5CCD1A642B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */,
+				5CCD1A632B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -571,11 +577,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				644D0EC42B29B15200E98A94 /* libffi.a */,
-				644D0EC62B29B15200E98A94 /* libgmp.a */,
-				644D0EC52B29B15200E98A94 /* libgmpxx.a */,
-				644D0EC72B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */,
-				644D0EC32B29B15200E98A94 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */,
+				5CCD1A5D2B27927E001A4199 /* libffi.a */,
+				5CCD1A5C2B27927E001A4199 /* libgmp.a */,
+				5CCD1A5B2B27927E001A4199 /* libgmpxx.a */,
+				5CCD1A5F2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */,
+				5CCD1A5E2B27927E001A4199 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -600,6 +606,7 @@
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
 				5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */,
 				5CB346E42868AA7F001FD2EF /* SuspendChat.swift */,
+				5CF937212B25034A00E1D781 /* NSESubscriber.swift */,
 				5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */,
 				5C93293E2928E0FD0090FFF9 /* AudioRecPlay.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
@@ -719,11 +726,11 @@
 		5CB924DD27A8622200ACCCDD /* NewChat */ = {
 			isa = PBXGroup;
 			children = (
+				640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */,
+				640417CC2B29B8C200CCB412 /* NewChatView.swift */,
 				5CC1C99127A6C7F5000D9FF6 /* QRCode.swift */,
 				6442E0B9287F169300CEC0F9 /* AddGroupView.swift */,
 				64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */,
-				64AEA4EC2B15D2A400334292 /* NewChatView.swift */,
-				64AEA4EE2B15FEE100334292 /* NewChatMenuButton.swift */,
 			);
 			path = NewChat;
 			sourceTree = "<group>";
@@ -776,6 +783,7 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
+				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -796,6 +804,7 @@
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
 				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
+				5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
 				5CE2BA78284530CC00EC33A6 /* SimpleXChat.docc */,
@@ -1089,6 +1098,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */,
+				640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */,
 				6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */,
 				5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */,
 				5C55A923283CEDE600C4E99E /* SoundPlayer.swift in Sources */,
@@ -1102,14 +1112,12 @@
 				5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */,
 				644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */,
 				6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */,
-				64AEA4EF2B15FEE100334292 /* NewChatMenuButton.swift in Sources */,
 				5C93293129239BED0090FFF9 /* ProtocolServerView.swift in Sources */,
 				5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */,
 				5CBD285A295711D700EC2CF4 /* ImageUtils.swift in Sources */,
 				6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */,
 				5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */,
 				5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */,
-				64AEA4ED2B15D2A400334292 /* NewChatView.swift in Sources */,
 				5C029EAA283942EA004A9677 /* CallController.swift in Sources */,
 				5CBE6C142944CC12002D9531 /* ScanCodeView.swift in Sources */,
 				5CC036E029C488D500C0EF20 /* HiddenProfileView.swift in Sources */,
@@ -1152,6 +1160,7 @@
 				649BCDA0280460FD00C3A862 /* ComposeImageView.swift in Sources */,
 				5CA059ED279559F40002BEB4 /* ContentView.swift in Sources */,
 				5C05DF532840AA1D00C683F9 /* CallSettings.swift in Sources */,
+				640417CD2B29B8C200CCB412 /* NewChatMenuButton.swift in Sources */,
 				5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
 				5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */,
 				5C7505A527B679EE00BE3227 /* NavLinkPlain.swift in Sources */,
@@ -1166,6 +1175,7 @@
 				5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */,
 				5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */,
 				6442E0BA287F169300CEC0F9 /* AddGroupView.swift in Sources */,
+				5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */,
 				6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */,
 				64D0C2C229FA57AB00B38D5F /* UserAddressLearnMore.swift in Sources */,
 				64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */,
@@ -1243,6 +1253,7 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
+				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1250,6 +1261,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */,
 				5C00168128C4FE760094D739 /* KeyChain.swift in Sources */,
 				5CE2BA97284537A800EC33A6 /* dummy.m in Sources */,
 				5CE2BA922845340900EC33A6 /* FileUtils.swift in Sources */,
@@ -1486,7 +1498,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1508,7 +1520,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1529,7 +1541,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1551,7 +1563,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1610,7 +1622,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1623,7 +1635,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1642,7 +1654,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1655,7 +1667,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1674,7 +1686,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1698,7 +1710,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1720,7 +1732,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 185;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1744,7 +1756,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -41,7 +41,7 @@ public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: Migratio
     var cKey = dbKey.cString(using: .utf8)!
     var cConfirm = confirm.rawValue.cString(using: .utf8)!
     // the last parameter of chat_migrate_init is used to return the pointer to chat controller
-    let cjson = chat_migrate_init(&cPath, &cKey, &cConfirm, &chatController)!
+    let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, &chatController)!
     let dbRes = dbMigrationResult(fromCString(cjson))
     let encrypted = dbKey != ""
     let keychainErr = dbRes == .ok && useKeychain && encrypted && !kcDatabasePassword.set(dbKey)
@@ -57,6 +57,13 @@ public func chatCloseStore() {
     }
 }
 
+public func chatReopenStore() {
+    let err = fromCString(chat_reopen_store(getChatCtrl()))
+    if err != "" {
+        logger.error("chatReopenStore error: \(err)")
+    }
+}
+
 public func resetChatCtrl() {
     chatController = nil
     migrationResult = nil

apps/ios/SimpleXChat/APITypes.swift

@@ -27,7 +27,7 @@ public enum ChatCommand {
     case apiDeleteUser(userId: Int64, delSMPQueues: Bool, viewPwd: String?)
     case startChat(subscribe: Bool, expire: Bool, xftp: Bool)
     case apiStopChat
-    case apiActivateChat
+    case apiActivateChat(restoreChat: Bool)
     case apiSuspendChat(timeoutMicroseconds: Int)
     case setTempFolder(tempFolder: String)
     case setFilesFolder(filesFolder: String)
@@ -156,7 +156,7 @@ public enum ChatCommand {
             case let .apiDeleteUser(userId, delSMPQueues, viewPwd): return "/_delete user \(userId) del_smp=\(onOff(delSMPQueues))\(maybePwd(viewPwd))"
             case let .startChat(subscribe, expire, xftp): return "/_start subscribe=\(onOff(subscribe)) expire=\(onOff(expire)) xftp=\(onOff(xftp))"
             case .apiStopChat: return "/_stop"
-            case .apiActivateChat: return "/_app activate"
+            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
             case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
             case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
             case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
@@ -604,7 +604,8 @@ public enum ChatResponse: Decodable, Error {
     case callInvitations(callInvitations: [RcvCallInvitation])
     case ntfTokenStatus(status: NtfTknStatus)
     case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
-    case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
+    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
+    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
     // remote desktop responses/events
     case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
@@ -751,6 +752,7 @@ public enum ChatResponse: Decodable, Error {
             case .ntfTokenStatus: return "ntfTokenStatus"
             case .ntfToken: return "ntfToken"
             case .ntfMessages: return "ntfMessages"
+            case .ntfMessage: return "ntfMessage"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
             case .remoteCtrlList: return "remoteCtrlList"
             case .remoteCtrlFound: return "remoteCtrlFound"
@@ -898,6 +900,7 @@ public enum ChatResponse: Decodable, Error {
             case let .ntfTokenStatus(status): return String(describing: status)
             case let .ntfToken(token, status, ntfMode): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)"
             case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
+            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
             case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
             case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
@@ -1204,9 +1207,9 @@ public struct NetCfg: Codable, Equatable {
     public static let defaults: NetCfg = NetCfg(
         socksProxy: nil,
         sessionMode: TransportSessionMode.user,
-        tcpConnectTimeout: 15_000_000,
-        tcpTimeout: 10_000_000,
-        tcpTimeoutPerKb: 30_000,
+        tcpConnectTimeout: 20_000_000,
+        tcpTimeout: 15_000_000,
+        tcpTimeoutPerKb: 45_000,
         tcpKeepAlive: KeepAliveOpts.defaults,
         smpPingInterval: 1200_000_000,
         smpPingCount: 3,
@@ -1495,6 +1498,8 @@ public enum PushProvider: String, Decodable {
     }
 }
 
+// This notification mode is for app core, UI uses AppNotificationsMode.off to mean completely disable,
+// and .local for periodic background checks
 public enum NotificationsMode: String, Decodable, SelectableItem {
     case off = "OFF"
     case periodic = "PERIODIC"
@@ -1502,9 +1507,9 @@ public enum NotificationsMode: String, Decodable, SelectableItem {
 
     public var label: LocalizedStringKey {
         switch self {
-        case .off: return "Off (Local)"
-        case .periodic: return "Periodically"
-        case .instant: return "Instantly"
+        case .off: "Local"
+        case .periodic: "Periodically"
+        case .instant: "Instantly"
         }
     }
 

apps/ios/SimpleXChat/AppGroup.swift

@@ -9,12 +9,15 @@
 import Foundation
 import SwiftUI
 
+public let appSuspendTimeout: Int = 15 // seconds
+
 let GROUP_DEFAULT_APP_STATE = "appState"
+let GROUP_DEFAULT_NSE_STATE = "nseState"
 let GROUP_DEFAULT_DB_CONTAINER = "dbContainer"
 public let GROUP_DEFAULT_CHAT_LAST_START = "chatLastStart"
 let GROUP_DEFAULT_NTF_PREVIEW_MODE = "ntfPreviewMode"
-public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal"
-public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
+public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal" // no longer used
+public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer used
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
 public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
@@ -66,13 +69,23 @@ public func registerGroupDefaults() {
     ])
 }
 
-public enum AppState: String {
+public enum AppState: String, Codable {
     case active
+    case activating
     case bgRefresh
     case suspending
     case suspended
     case stopped
 
+    public var running: Bool {
+        switch self {
+        case .active: return true
+        case .activating: return true
+        case .bgRefresh: return true
+        default: return false
+        }
+    }
+
     public var inactive: Bool {
         switch self {
         case .suspending: return true
@@ -84,23 +97,57 @@ public enum AppState: String {
     public var canSuspend: Bool {
         switch self {
         case .active: return true
+        case .activating: return true
         case .bgRefresh: return true
         default: return false
         }
     }
 }
 
+public enum NSEState: String, Codable {
+    case created
+    case starting
+    case active
+    case suspending
+    case suspended
+
+    public var inactive: Bool {
+        switch self {
+        case .created: true
+        case .suspended: true
+        default: false
+        }
+    }
+
+    public var canSuspend: Bool {
+        if case .active = self { true } else { false }
+    }
+}
+
 public enum DBContainer: String {
     case documents
     case group
 }
 
+// appStateGroupDefault must not be used in the app directly, only via AppChatState singleton
 public let appStateGroupDefault = EnumDefault<AppState>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_APP_STATE,
     withDefault: .active
 )
 
+// nseStateGroupDefault must not be used in NSE directly, only via NSEChatState singleton
+public let nseStateGroupDefault = EnumDefault<NSEState>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NSE_STATE,
+    withDefault: .suspended // so that NSE that was never launched does not delay the app from resuming
+)
+
+// inactive app states do not include "stopped" state
+public func allowBackgroundRefresh() -> Bool {
+    appStateGroupDefault.get().inactive && nseStateGroupDefault.get().inactive
+}
+
 public let dbContainerGroupDefault = EnumDefault<DBContainer>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_DB_CONTAINER,
@@ -117,10 +164,6 @@ public let ntfPreviewModeGroupDefault = EnumDefault<NotificationPreviewMode>(
 
 public let incognitoGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INCOGNITO)
 
-public let ntfEnableLocalGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_ENABLE_LOCAL)
-
-public let ntfEnablePeriodicGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_ENABLE_PERIODIC)
-
 public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES)
 
 public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2016,7 +2016,8 @@ public enum ConnectionEntity: Decodable {
 }
 
 public struct NtfMsgInfo: Decodable {
-
+    public var msgId: String
+    public var msgTs: Date
 }
 
 public struct AChatItem: Decodable {

apps/ios/SimpleXChat/Notifications.swift

@@ -146,6 +146,13 @@ public func createErrorNtf(_ dbStatus: DBMigrationResult) -> UNMutableNotificati
     )
 }
 
+public func createAppStoppedNtf() -> UNMutableNotificationContent {
+    return createNotification(
+        categoryIdentifier: ntfCategoryConnectionEvent,
+        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification")
+    )
+}
+
 private func groupMsgNtfTitle(_ groupInfo: GroupInfo, _ groupMember: GroupMember, hideContent: Bool) -> String {
     hideContent
     ? NSLocalizedString("Group message:", comment: "notification")

apps/ios/SimpleXChat/SharedFileSubscriber.swift

@@ -0,0 +1,99 @@
+//
+//  SharedFileSubscriber.swift
+//  SimpleXChat
+//
+//  Created by Evgeny on 09/12/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+
+public typealias AppSubscriber = SharedFileSubscriber<ProcessMessage<AppProcessMessage>>
+
+public typealias NSESubscriber = SharedFileSubscriber<ProcessMessage<NSEProcessMessage>>
+
+public class SharedFileSubscriber<Message: Codable>: NSObject, NSFilePresenter {
+    var fileURL: URL
+    public var presentedItemURL: URL?
+    public var presentedItemOperationQueue: OperationQueue = .main
+    var subscriber: (Message) -> Void
+
+    init(fileURL: URL, onMessage: @escaping (Message) -> Void) {
+        self.fileURL = fileURL
+        presentedItemURL = fileURL
+        subscriber = onMessage
+        super.init()
+        NSFileCoordinator.addFilePresenter(self)
+    }
+
+    public func presentedItemDidChange() {
+        do {
+            let data = try Data(contentsOf: fileURL)
+            let msg = try jsonDecoder.decode(Message.self, from: data)
+            subscriber(msg)
+        } catch let error {
+            logger.error("presentedItemDidChange error: \(error)")
+        }
+    }
+
+    static func notify(url: URL, message: Message) {
+        let fc = NSFileCoordinator(filePresenter: nil)
+        fc.coordinate(writingItemAt: url, options: [], error: nil) { newURL in
+            do {
+                let data = try jsonEncoder.encode(message)
+                try data.write(to: newURL, options: [.atomic])
+            } catch {
+                logger.error("notifyViaSharedFile error: \(error)")
+            }
+        }
+    }
+
+    deinit {
+        NSFileCoordinator.removeFilePresenter(self)
+    }
+}
+
+let appMessagesSharedFile = getGroupContainerDirectory().appendingPathComponent("chat.simplex.app.messages", isDirectory: false)
+
+let nseMessagesSharedFile = getGroupContainerDirectory().appendingPathComponent("chat.simplex.app.SimpleX-NSE.messages", isDirectory: false)
+
+public struct ProcessMessage<Message: Codable>: Codable {
+    var createdAt: Date = Date.now
+    var message: Message
+}
+
+public enum AppProcessMessage: Codable {
+    case state(state: AppState)
+}
+
+public enum NSEProcessMessage: Codable {
+    case state(state: NSEState)
+}
+
+public func sendAppProcessMessage(_ message: AppProcessMessage) {
+    SharedFileSubscriber.notify(url: appMessagesSharedFile, message: ProcessMessage(message: message))
+}
+
+public func sendNSEProcessMessage(_ message: NSEProcessMessage) {
+    SharedFileSubscriber.notify(url: nseMessagesSharedFile, message: ProcessMessage(message: message))
+}
+
+public func appMessageSubscriber(onMessage: @escaping (AppProcessMessage) -> Void) -> AppSubscriber {
+    SharedFileSubscriber(fileURL: appMessagesSharedFile) { (msg: ProcessMessage<AppProcessMessage>) in
+        onMessage(msg.message)
+    }
+}
+
+public func nseMessageSubscriber(onMessage: @escaping (NSEProcessMessage) -> Void) -> NSESubscriber {
+    SharedFileSubscriber(fileURL: nseMessagesSharedFile) { (msg: ProcessMessage<NSEProcessMessage>) in
+        onMessage(msg.message)
+    }
+}
+
+public func sendAppState(_ state: AppState) {
+    sendAppProcessMessage(.state(state: state))
+}
+
+public func sendNSEState(_ state: NSEState) {
+    sendNSEProcessMessage(.state(state: state))
+}

apps/ios/SimpleXChat/SimpleX.h

@@ -16,10 +16,10 @@ extern void hs_init(int argc, char **argv[]);
 typedef void* chat_ctrl;
 
 // the last parameter is used to return the pointer to chat controller
-extern char *chat_migrate_init(char *path, char *key, char *confirm, chat_ctrl *ctrl);
+extern char *chat_migrate_init_key(char *path, char *key, int keepKey, char *confirm, chat_ctrl *ctrl);
 extern char *chat_close_store(chat_ctrl ctl);
+extern char *chat_reopen_store(chat_ctrl ctl);
 extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctl);
 extern char *chat_recv_msg_wait(chat_ctrl ctl, int wait);
 extern char *chat_parse_markdown(char *str);
 extern char *chat_parse_server(char *str);

apps/multiplatform/android/build.gradle.kts

@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId = "chat.simplex.app"
-        minSdkVersion(26)
+        minSdkVersion(28)
         targetSdkVersion(33)
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes

apps/multiplatform/common/build.gradle.kts

@@ -110,7 +110,7 @@ android {
   compileSdkVersion(34)
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   defaultConfig {
-    minSdkVersion(26)
+    minSdkVersion(28)
     targetSdkVersion(33)
   }
   compileOptions {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -2800,9 +2800,9 @@ data class NetCfg(
         hostMode = HostMode.OnionViaSocks,
         requiredHostMode = false,
         sessionMode = TransportSessionMode.User,
-        tcpConnectTimeout = 15_000_000,
-        tcpTimeout = 10_000_000,
-        tcpTimeoutPerKb = 30_000,
+        tcpConnectTimeout = 20_000_000,
+        tcpTimeout = 15_000_000,
+        tcpTimeoutPerKb = 45_000,
         tcpKeepAlive = KeepAliveOpts.defaults,
         smpPingInterval = 1200_000_000,
         smpPingCount = 3

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/AdvancedNetworkSettings.kt

@@ -154,20 +154,20 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
       SectionItemView {
         TimeoutSettingRow(
           stringResource(MR.strings.network_option_tcp_connection_timeout), networkTCPConnectTimeout,
-          listOf(5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000_000, 45_000_000), secondsLabel
+          listOf(7_500000, 10_000000, 15_000000, 20_000000, 30_000_000, 45_000_000), secondsLabel
         )
       }
       SectionItemView {
         TimeoutSettingRow(
           stringResource(MR.strings.network_option_protocol_timeout), networkTCPTimeout,
-          listOf(3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000_000, 30_000_000), secondsLabel
+          listOf(5_000000, 7_000000, 10_000000, 15_000000, 20_000_000, 30_000_000), secondsLabel
         )
       }
       SectionItemView {
         // can't be higher than 130ms to avoid overflow on 32bit systems
         TimeoutSettingRow(
           stringResource(MR.strings.network_option_protocol_timeout_per_kb), networkTCPTimeoutPerKb,
-          listOf(15_000, 30_000, 60_000, 90_000, 120_000), secondsLabel
+          listOf(15_000, 30_000, 45_000, 60_000, 90_000, 120_000), secondsLabel
         )
       }
       SectionItemView {

apps/multiplatform/gradle.properties

@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-android.version_name=5.4
-android.version_code=162
+android.version_name=5.4.1
+android.version_code=164
 
-desktop.version_name=5.4
-desktop.version_code=18
+desktop.version_name=5.4.1
+desktop.version_code=19
 
 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2

cabal.project

@@ -11,7 +11,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: a860936072172e261480fa6bdd95203976e366b2
+    tag: f576260594b9898e26dbac1bcb4b5061fa4fa242
 
 source-repository-package
     type: git

docs/DOWNLOADS.md

@@ -7,7 +7,7 @@ revision: 25.11.2023
 | Updated 25.11.2023 | Languages: EN |
 # Download SimpleX apps
 
-The latest stable version is v5.4.0.
+The latest stable version is v5.4.1.
 
 You can get the latest beta releases from [GitHub](https://github.com/simplex-chat/simplex-chat/releases).
 
@@ -21,24 +21,24 @@ You can get the latest beta releases from [GitHub](https://github.com/simplex-ch
 
 Using the same profile as on mobile device is not yet supported – you need to create a separate profile to use desktop apps.
 
-**Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-ubuntu-22_04-x86_64.deb).
+**Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-ubuntu-22_04-x86_64.deb).
 
-**Mac**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-macos-x86_64.dmg) (Intel), [aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-macos-aarch64.dmg) (Apple Silicon).
+**Mac**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-macos-x86_64.dmg) (Intel), [aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-macos-aarch64.dmg) (Apple Silicon).
 
-**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-desktop-windows-x86_64.msi).
+**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-desktop-windows-x86_64.msi).
 
 ## Mobile apps
 
 **iOS**: [App store](https://apps.apple.com/us/app/simplex-chat/id1605771084), [TestFlight](https://testflight.apple.com/join/DWuT2LQu).
 
-**Android**: [Play store](https://play.google.com/store/apps/details?id=chat.simplex.app), [F-Droid](https://simplex.chat/fdroid/), [APK aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex.apk), [APK armv7](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-armv7a.apk).
+**Android**: [Play store](https://play.google.com/store/apps/details?id=chat.simplex.app), [F-Droid](https://simplex.chat/fdroid/), [APK aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex.apk), [APK armv7](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-armv7a.apk).
 
 ## Terminal (console) app
 
 See [Using terminal app](/docs/CLI.md).
 
-**Linux**: [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-chat-ubuntu-20_04-x86-64), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-chat-ubuntu-22_04-x86-64).
+**Linux**: [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-chat-ubuntu-20_04-x86-64), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-chat-ubuntu-22_04-x86-64).
 
-**Mac** [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-chat-macos-x86-64), aarch64 - [compile from source](./CLI.md#).
+**Mac** [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-chat-macos-x86-64), aarch64 - [compile from source](./CLI.md#).
 
-**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.0/simplex-chat-windows-x86-64).
+**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.4.1/simplex-chat-windows-x86-64).

package.yaml

@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.4.0.6
+version: 5.4.0.7
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."a860936072172e261480fa6bdd95203976e366b2" = "16rwnh5zzphmw8d8ypvps6xjvzbmf5ljr6zzy15gz2g0jyh7hd91";
+  "https://github.com/simplex-chat/simplexmq.git"."f576260594b9898e26dbac1bcb4b5061fa4fa242" = "0lmfncha6dxxg5ck9f4a155kyd6267k5m9w5mli121lir6ikvk7z";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";

simplex-chat.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        5.4.0.6
+version:        5.4.0.7
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -125,6 +125,7 @@ library
       Simplex.Chat.Migrations.M20231113_group_forward
       Simplex.Chat.Migrations.M20231114_remote_control
       Simplex.Chat.Migrations.M20231126_remote_ctrl_address
+      Simplex.Chat.Migrations.M20231207_chat_list_pagination
       Simplex.Chat.Mobile
       Simplex.Chat.Mobile.File
       Simplex.Chat.Mobile.Shared
@@ -532,6 +533,7 @@ test-suite simplex-chat-test
       Bots.DirectoryTests
       ChatClient
       ChatTests
+      ChatTests.ChatList
       ChatTests.Direct
       ChatTests.Files
       ChatTests.Groups

src/Simplex/Chat.hs

@@ -9,7 +9,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
@@ -28,13 +27,15 @@ import qualified Data.Aeson as J
 import Data.Attoparsec.ByteString.Char8 (Parser)
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (bimap, first)
+import Data.ByteArray (ScrubbedBytes)
+import qualified Data.ByteArray as BA
 import qualified Data.ByteString.Base64 as B64
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
 import Data.Char
 import Data.Constraint (Dict (..))
-import Data.Either (fromRight, rights)
+import Data.Either (fromRight, partitionEithers, rights)
 import Data.Fixed (div')
 import Data.Functor (($>))
 import Data.Int (Int64)
@@ -50,7 +51,7 @@ import qualified Data.Text as T
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
 import Data.Time (NominalDiffTime, addUTCTime, defaultTimeLocale, formatTime)
 import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime, nominalDay, nominalDiffTimeToSeconds)
-import Data.Time.Clock.System (SystemTime, systemToUTCTime)
+import Data.Time.Clock.System (systemToUTCTime)
 import Data.Word (Word16, Word32)
 import qualified Database.SQLite.Simple as SQL
 import Simplex.Chat.Archive
@@ -191,10 +192,10 @@ smallGroupsRcptsMemLimit = 20
 logCfg :: LogConfig
 logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
 
-createChatDatabase :: FilePath -> String -> MigrationConfirmation -> IO (Either MigrationError ChatDatabase)
-createChatDatabase filePrefix key confirmMigrations = runExceptT $ do
-  chatStore <- ExceptT $ createChatStore (chatStoreFile filePrefix) key confirmMigrations
-  agentStore <- ExceptT $ createAgentStore (agentStoreFile filePrefix) key confirmMigrations
+createChatDatabase :: FilePath -> ScrubbedBytes -> Bool -> MigrationConfirmation -> IO (Either MigrationError ChatDatabase)
+createChatDatabase filePrefix key keepKey confirmMigrations = runExceptT $ do
+  chatStore <- ExceptT $ createChatStore (chatStoreFile filePrefix) key keepKey confirmMigrations
+  agentStore <- ExceptT $ createAgentStore (agentStoreFile filePrefix) key keepKey confirmMigrations
   pure ChatDatabase {chatStore, agentStore}
 
 newChatController :: ChatDatabase -> Maybe User -> ChatConfig -> ChatOpts -> IO ChatController
@@ -538,16 +539,18 @@ processChatCommand = \case
   APIStopChat -> do
     ask >>= stopChatController
     pure CRChatStopped
-  APIActivateChat -> withUser $ \_ -> do
-    restoreCalls
+  APIActivateChat restoreChat -> withUser $ \_ -> do
+    when restoreChat restoreCalls
     withAgent foregroundAgent
-    users <- withStoreCtx' (Just "APIActivateChat, getUsers") getUsers
-    void . forkIO $ subscribeUsers True users
-    void . forkIO $ startFilesToReceive users
-    setAllExpireCIFlags True
+    when restoreChat $ do
+      users <- withStoreCtx' (Just "APIActivateChat, getUsers") getUsers
+      void . forkIO $ subscribeUsers True users
+      void . forkIO $ startFilesToReceive users
+      setAllExpireCIFlags True
     ok_
   APISuspendChat t -> do
     setAllExpireCIFlags False
+    stopRemoteCtrl
     withAgent (`suspendAgent` t)
     ok_
   ResubscribeAllConnections -> withStoreCtx' (Just "ResubscribeAllConnections, getUsers") getUsers >>= subscribeUsers False >> ok_
@@ -596,8 +599,10 @@ processChatCommand = \case
             . sortOn (timeAvg . snd)
             . M.assocs
             <$> withConnection st (readTVarIO . DB.slow)
-  APIGetChats userId withPCC -> withUserId userId $ \user ->
-    CRApiChats user <$> withStoreCtx' (Just "APIGetChats, getChatPreviews") (\db -> getChatPreviews db user withPCC)
+  APIGetChats {userId, pendingConnections, pagination, query} -> withUserId' userId $ \user -> do
+    (errs, previews) <- partitionEithers <$> withStore' (\db -> getChatPreviews db user pendingConnections pagination query)
+    toView $ CRChatErrors (Just user) (map ChatErrorStore errs)
+    pure $ CRApiChats user previews
   APIGetChat (ChatRef cType cId) pagination search -> withUser $ \user -> case cType of
     -- TODO optimize queries calculating ChatStats, currently they're disabled
     CTDirect -> do
@@ -937,6 +942,8 @@ processChatCommand = \case
           throwChatError (CECommandError $ "reaction already " <> if add then "added" else "removed")
         when (add && length rs >= maxMsgReactions) $
           throwChatError (CECommandError "too many reactions")
+  APIUserRead userId -> withUserId userId $ \user -> withStore' (`setUserChatsRead` user) >> ok user
+  UserRead -> withUser $ \User {userId} -> processChatCommand $ APIUserRead userId
   APIChatRead (ChatRef cType chatId) fromToIds -> withUser $ \_ -> case cType of
     CTDirect -> do
       user <- withStore $ \db -> getUserByContactId db chatId
@@ -1046,10 +1053,12 @@ processChatCommand = \case
     CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
     CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
   APIAcceptContact incognito connReqId -> withUser $ \_ -> withChatLock "acceptContact" $ do
-    (user, cReq) <- withStore $ \db -> getContactRequest' db connReqId
+    (user@User {userId}, cReq@UserContactRequest {userContactLinkId}) <- withStore $ \db -> getContactRequest' db connReqId
+    ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
+    let contactUsed = (\(_, groupId_, _) -> isNothing groupId_) ucl
     -- [incognito] generate profile to send, create connection with incognito profile
     incognitoProfile <- if incognito then Just . NewIncognito <$> liftIO generateRandomProfile else pure Nothing
-    ct <- acceptContactRequest user cReq incognitoProfile
+    ct <- acceptContactRequest user cReq incognitoProfile contactUsed
     pure $ CRAcceptingContactRequest user ct
   APIRejectContact connReqId -> withUser $ \user -> withChatLock "rejectContact" $ do
     cReq@UserContactRequest {agentContactConnId = AgentConnId connId, agentInvitationId = AgentInvId invId} <-
@@ -1172,16 +1181,13 @@ processChatCommand = \case
   APIDeleteToken token -> withUser $ \_ -> withAgent (`deleteNtfToken` token) >> ok_
   APIGetNtfMessage nonce encNtfInfo -> withUser $ \_ -> do
     (NotificationInfo {ntfConnId, ntfMsgMeta}, msgs) <- withAgent $ \a -> getNotificationMessage a nonce encNtfInfo
-    let ntfMessages = map (\SMP.SMPMsgMeta {msgTs, msgFlags} -> NtfMsgInfo {msgTs = systemToUTCTime msgTs, msgFlags}) msgs
-        getMsgTs :: SMP.NMsgMeta -> SystemTime
-        getMsgTs SMP.NMsgMeta {msgTs} = msgTs
-        msgTs' = systemToUTCTime . getMsgTs <$> ntfMsgMeta
+    let msgTs' = systemToUTCTime . (\SMP.NMsgMeta {msgTs} -> msgTs) <$> ntfMsgMeta
         agentConnId = AgentConnId ntfConnId
     user_ <- withStore' (`getUserByAConnId` agentConnId)
-    connEntity <-
+    connEntity_ <-
       pure user_ $>>= \user ->
         withStore (\db -> Just <$> getConnectionEntity db user agentConnId) `catchChatError` (\e -> toView (CRChatError (Just user) e) $> Nothing)
-    pure CRNtfMessages {user_, connEntity, msgTs = msgTs', ntfMessages}
+    pure CRNtfMessages {user_, connEntity_, msgTs = msgTs', ntfMessages = map ntfMsgInfo msgs}
   APIGetUserProtoServers userId (AProtocolType p) -> withUserId userId $ \user -> withServerProtocol p $ do
     ChatConfig {defaultServers} <- asks config
     servers <- withStore' (`getProtocolServers` user)
@@ -1205,8 +1211,7 @@ processChatCommand = \case
       CRServerTestResult user srv <$> withAgent (\a -> testProtocolServer a (aUserId user) server)
   TestProtoServer srv -> withUser $ \User {userId} ->
     processChatCommand $ APITestProtoServer userId srv
-  APISetChatItemTTL userId newTTL_ -> withUser $ \user -> do
-    checkSameUser userId user
+  APISetChatItemTTL userId newTTL_ -> withUserId userId $ \user ->
     checkStoreNotChanged $
       withChatLock "setChatItemTTL" $ do
         case newTTL_ of
@@ -1224,7 +1229,7 @@ processChatCommand = \case
         ok user
   SetChatItemTTL newTTL_ -> withUser' $ \User {userId} -> do
     processChatCommand $ APISetChatItemTTL userId newTTL_
-  APIGetChatItemTTL userId -> withUserId userId $ \user -> do
+  APIGetChatItemTTL userId -> withUserId' userId $ \user -> do
     ttl <- withStoreCtx' (Just "APIGetChatItemTTL, getChatItemTTL") (`getChatItemTTL` user)
     pure $ CRChatItemTTL user ttl
   GetChatItemTTL -> withUser' $ \User {userId} -> do
@@ -1483,9 +1488,9 @@ processChatCommand = \case
     pure $ CRUserContactLinkDeleted user'
   DeleteMyAddress -> withUser $ \User {userId} ->
     processChatCommand $ APIDeleteMyAddress userId
-  APIShowMyAddress userId -> withUserId userId $ \user ->
+  APIShowMyAddress userId -> withUserId' userId $ \user ->
     CRUserContactLink user <$> withStoreCtx (Just "APIShowMyAddress, getUserAddress") (`getUserAddress` user)
-  ShowMyAddress -> withUser $ \User {userId} ->
+  ShowMyAddress -> withUser' $ \User {userId} ->
     processChatCommand $ APIShowMyAddress userId
   APISetProfileAddress userId False -> withUserId userId $ \user@User {profile = p} -> do
     let p' = (fromLocalProfile p :: Profile) {contactLink = Nothing}
@@ -1822,8 +1827,10 @@ processChatCommand = \case
     let mc = MCText msg
     processChatCommand . APISendMessage (ChatRef CTGroup groupId) False Nothing $ ComposedMessage Nothing (Just quotedItemId) mc
   LastChats count_ -> withUser' $ \user -> do
-    chats <- withStore' $ \db -> getChatPreviews db user False
-    pure $ CRChats $ maybe id take count_ chats
+    let count = fromMaybe 5000 count_
+    (errs, previews) <- partitionEithers <$> withStore' (\db -> getChatPreviews db user False (PTLast count) clqNoFilters)
+    toView $ CRChatErrors (Just user) (map ChatErrorStore errs)
+    pure $ CRChats previews
   LastMessages (Just chatName) count search -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
     chatResp <- processChatCommand $ APIGetChat chatRef (CPLast count) search
@@ -2689,21 +2696,21 @@ getRcvFilePath fileId fPath_ fn keepHandle = case fPath_ of
     getTmpHandle :: FilePath -> m Handle
     getTmpHandle fPath = openFile fPath AppendMode `catchThrow` (ChatError . CEFileInternal . show)
 
-acceptContactRequest :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> m Contact
-acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = cp, userContactLinkId, xContactId} incognitoProfile = do
+acceptContactRequest :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> m Contact
+acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = cp, userContactLinkId, xContactId} incognitoProfile contactUsed = do
   subMode <- chatReadVar subscriptionMode
   let profileToSend = profileToSendOnAccept user incognitoProfile
   dm <- directMessage $ XInfo profileToSend
   acId <- withAgent $ \a -> acceptContact a True invId dm subMode
-  withStore' $ \db -> createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId cp userContactLinkId xContactId incognitoProfile subMode
+  withStore' $ \db -> createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId cp userContactLinkId xContactId incognitoProfile subMode contactUsed
 
-acceptContactRequestAsync :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> m Contact
-acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile = do
+acceptContactRequestAsync :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> m Contact
+acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile contactUsed = do
   subMode <- chatReadVar subscriptionMode
   let profileToSend = profileToSendOnAccept user incognitoProfile
   (cmdId, acId) <- agentAcceptContactAsync user True invId (XInfo profileToSend) subMode
   withStore' $ \db -> do
-    ct@Contact {activeConn} <- createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId p userContactLinkId xContactId incognitoProfile subMode
+    ct@Contact {activeConn} <- createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId p userContactLinkId xContactId incognitoProfile subMode contactUsed
     forM_ activeConn $ \Connection {connId} -> setCommandConnId db user cmdId connId
     pure ct
 
@@ -3227,23 +3234,24 @@ processAgentMsgRcvFile _corrId aFileId msg =
               toView $ CRRcvFileError user ci e
 
 processAgentMessageConn :: forall m. ChatMonad m => User -> ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> m ()
-processAgentMessageConn user _ agentConnId END =
-  withStore (\db -> getConnectionEntity db user $ AgentConnId agentConnId) >>= \case
-    RcvDirectMsgConnection _ (Just ct) -> toView $ CRContactAnotherClient user ct
-    entity -> toView $ CRSubscriptionEnd user entity
 processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
   entity <- withStore (\db -> getConnectionEntity db user $ AgentConnId agentConnId) >>= updateConnStatus
-  case entity of
-    RcvDirectMsgConnection conn contact_ ->
-      processDirectMessage agentMessage entity conn contact_
-    RcvGroupMsgConnection conn gInfo m ->
-      processGroupMessage agentMessage entity conn gInfo m
-    RcvFileConnection conn ft ->
-      processRcvFileConn agentMessage entity conn ft
-    SndFileConnection conn ft ->
-      processSndFileConn agentMessage entity conn ft
-    UserContactConnection conn uc ->
-      processUserContactRequest agentMessage entity conn uc
+  case agentMessage of
+    END -> case entity of
+      RcvDirectMsgConnection _ (Just ct) -> toView $ CRContactAnotherClient user ct
+      _ -> toView $ CRSubscriptionEnd user entity
+    MSGNTF smpMsgInfo -> toView $ CRNtfMessage user entity $ ntfMsgInfo smpMsgInfo
+    _ -> case entity of
+      RcvDirectMsgConnection conn contact_ ->
+        processDirectMessage agentMessage entity conn contact_
+      RcvGroupMsgConnection conn gInfo m ->
+        processGroupMessage agentMessage entity conn gInfo m
+      RcvFileConnection conn ft ->
+        processRcvFileConn agentMessage entity conn ft
+      SndFileConnection conn ft ->
+        processSndFileConn agentMessage entity conn ft
+      UserContactConnection conn uc ->
+        processUserContactRequest agentMessage entity conn uc
   where
     updateConnStatus :: ConnectionEntity -> m ConnectionEntity
     updateConnStatus acEntity = case agentMsgConnStatus agentMessage of
@@ -3382,20 +3390,20 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                     doProbeContacts = isJust groupLinkId
                 probeMatchingContactsAndMembers ct (contactConnIncognito ct) doProbeContacts
                 withStore' $ \db -> resetContactConnInitiated db user conn
-              forM_ viaUserContactLink $ \userContactLinkId ->
-                withStore' (\db -> getUserContactLinkById db userId userContactLinkId) >>= \case
-                  Just (UserContactLink {autoAccept = Just AutoAccept {autoReply = mc_}}, groupId_, gLinkMemRole) -> do
-                    forM_ mc_ $ \mc -> do
-                      (msg, _) <- sendDirectContactMessage ct (XMsgNew $ MCSimple (extMsgContent mc Nothing))
-                      ci <- saveSndChatItem user (CDDirectSnd ct) msg (CISndMsgContent mc)
-                      toView $ CRNewChatItem user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
-                    forM_ groupId_ $ \groupId -> do
-                      groupInfo <- withStore $ \db -> getGroupInfo db user groupId
-                      subMode <- chatReadVar subscriptionMode
-                      groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation subMode
-                      gVar <- asks idsDrg
-                      withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct gLinkMemRole groupConnIds (fromJVersionRange peerChatVRange) subMode
-                  _ -> pure ()
+              forM_ viaUserContactLink $ \userContactLinkId -> do
+                ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
+                let (UserContactLink {autoAccept}, groupId_, gLinkMemRole) = ucl
+                forM_ autoAccept $ \(AutoAccept {autoReply = mc_}) ->
+                  forM_ mc_ $ \mc -> do
+                    (msg, _) <- sendDirectContactMessage ct (XMsgNew $ MCSimple (extMsgContent mc Nothing))
+                    ci <- saveSndChatItem user (CDDirectSnd ct) msg (CISndMsgContent mc)
+                    toView $ CRNewChatItem user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
+                forM_ groupId_ $ \groupId -> do
+                  groupInfo <- withStore $ \db -> getGroupInfo db user groupId
+                  subMode <- chatReadVar subscriptionMode
+                  groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation subMode
+                  gVar <- asks idsDrg
+                  withStore $ \db -> createNewContactMemberAsync db gVar user groupInfo ct gLinkMemRole groupConnIds (fromJVersionRange peerChatVRange) subMode
             Just (gInfo, m@GroupMember {activeConn}) ->
               when (maybe False ((== ConnReady) . connStatus) activeConn) $ do
                 notifyMemberConnected gInfo m $ Just ct
@@ -3913,28 +3921,27 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           withStore (\db -> createOrUpdateContactRequest db user userContactLinkId invId chatVRange p xContactId_) >>= \case
             CORContact contact -> toView $ CRContactRequestAlreadyAccepted user contact
             CORRequest cReq -> do
-              withStore' (\db -> getUserContactLinkById db userId userContactLinkId) >>= \case
-                Just (UserContactLink {autoAccept}, groupId_, gLinkMemRole) ->
-                  case autoAccept of
-                    Just AutoAccept {acceptIncognito} -> case groupId_ of
-                      Nothing -> do
-                        -- [incognito] generate profile to send, create connection with incognito profile
-                        incognitoProfile <- if acceptIncognito then Just . NewIncognito <$> liftIO generateRandomProfile else pure Nothing
-                        ct <- acceptContactRequestAsync user cReq incognitoProfile
-                        toView $ CRAcceptingContactRequest user ct
-                      Just groupId -> do
-                        gInfo <- withStore $ \db -> getGroupInfo db user groupId
-                        let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
-                        if isCompatibleRange chatVRange groupLinkNoContactVRange
-                          then do
-                            mem <- acceptGroupJoinRequestAsync user gInfo cReq gLinkMemRole profileMode
-                            createInternalChatItem user (CDGroupRcv gInfo mem) (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
-                            toView $ CRAcceptingGroupJoinRequestMember user gInfo mem
-                          else do
-                            ct <- acceptContactRequestAsync user cReq profileMode
-                            toView $ CRAcceptingGroupJoinRequest user gInfo ct
-                    _ -> toView $ CRReceivedContactRequest user cReq
-                _ -> pure ()
+              ucl <- withStore $ \db -> getUserContactLinkById db userId userContactLinkId
+              let (UserContactLink {autoAccept}, groupId_, gLinkMemRole) = ucl
+              case autoAccept of
+                Just AutoAccept {acceptIncognito} -> case groupId_ of
+                  Nothing -> do
+                    -- [incognito] generate profile to send, create connection with incognito profile
+                    incognitoProfile <- if acceptIncognito then Just . NewIncognito <$> liftIO generateRandomProfile else pure Nothing
+                    ct <- acceptContactRequestAsync user cReq incognitoProfile True
+                    toView $ CRAcceptingContactRequest user ct
+                  Just groupId -> do
+                    gInfo <- withStore $ \db -> getGroupInfo db user groupId
+                    let profileMode = ExistingIncognito <$> incognitoMembershipProfile gInfo
+                    if isCompatibleRange chatVRange groupLinkNoContactVRange
+                      then do
+                        mem <- acceptGroupJoinRequestAsync user gInfo cReq gLinkMemRole profileMode
+                        createInternalChatItem user (CDGroupRcv gInfo mem) (CIRcvGroupEvent RGEInvitedViaGroupLink) Nothing
+                        toView $ CRAcceptingGroupJoinRequestMember user gInfo mem
+                      else do
+                        ct <- acceptContactRequestAsync user cReq profileMode False
+                        toView $ CRAcceptingGroupJoinRequest user gInfo ct
+                _ -> toView $ CRReceivedContactRequest user cReq
 
     memberCanSend :: GroupMember -> m () -> m ()
     memberCanSend mem a
@@ -4930,7 +4937,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       conn' <- updatePeerChatVRange activeConn chatVRange
       case chatMsgEvent of
         XInfo p -> do
-          ct <- withStore $ \db -> createDirectContact db user conn' p
+          let contactUsed = connDirect activeConn
+          ct <- withStore $ \db -> createDirectContact db user conn' p contactUsed
           toView $ CRContactConnecting user ct
           pure conn'
         XGrpLinkInv glInv -> do
@@ -5910,6 +5918,11 @@ withUser action = withUser' $ \user ->
 withUser_ :: ChatMonad m => m ChatResponse -> m ChatResponse
 withUser_ = withUser . const
 
+withUserId' :: ChatMonad m => UserId -> (User -> m ChatResponse) -> m ChatResponse
+withUserId' userId action = withUser' $ \user -> do
+  checkSameUser userId user
+  action user
+
 withUserId :: ChatMonad m => UserId -> (User -> m ChatResponse) -> m ChatResponse
 withUserId userId action = withUser $ \user -> do
   checkSameUser userId user
@@ -5959,7 +5972,8 @@ chatCommandP =
       "/_start subscribe=" *> (StartChat <$> onOffP <* " expire=" <*> onOffP <* " xftp=" <*> onOffP),
       "/_start" $> StartChat True True True,
       "/_stop" $> APIStopChat,
-      "/_app activate" $> APIActivateChat,
+      "/_app activate restore=" *> (APIActivateChat <$> onOffP),
+      "/_app activate" $> APIActivateChat True,
       "/_app suspend " *> (APISuspendChat <$> A.decimal),
       "/_resubscribe all" $> ResubscribeAllConnections,
       "/_temp_folder " *> (SetTempFolder <$> filePath),
@@ -5974,13 +5988,19 @@ chatCommandP =
       "/_db import " *> (APIImportArchive <$> jsonP),
       "/_db delete" $> APIDeleteStorage,
       "/_db encryption " *> (APIStorageEncryption <$> jsonP),
-      "/db encrypt " *> (APIStorageEncryption . DBEncryptionConfig "" <$> dbKeyP),
-      "/db key " *> (APIStorageEncryption <$> (DBEncryptionConfig <$> dbKeyP <* A.space <*> dbKeyP)),
-      "/db decrypt " *> (APIStorageEncryption . (`DBEncryptionConfig` "") <$> dbKeyP),
+      "/db encrypt " *> (APIStorageEncryption . dbEncryptionConfig "" <$> dbKeyP),
+      "/db key " *> (APIStorageEncryption <$> (dbEncryptionConfig <$> dbKeyP <* A.space <*> dbKeyP)),
+      "/db decrypt " *> (APIStorageEncryption . (`dbEncryptionConfig` "") <$> dbKeyP),
       "/sql chat " *> (ExecChatStoreSQL <$> textP),
       "/sql agent " *> (ExecAgentStoreSQL <$> textP),
       "/sql slow" $> SlowSQLQueries,
-      "/_get chats " *> (APIGetChats <$> A.decimal <*> (" pcc=on" $> True <|> " pcc=off" $> False <|> pure False)),
+      "/_get chats "
+        *> ( APIGetChats
+              <$> A.decimal
+              <*> (" pcc=on" $> True <|> " pcc=off" $> False <|> pure False)
+              <*> (A.space *> paginationByTimeP <|> pure (PTLast 5000))
+              <*> (A.space *> jsonP <|> pure clqNoFilters)
+           ),
       "/_get chat " *> (APIGetChat <$> chatRefP <* A.space <*> chatPaginationP <*> optional (" search=" *> stringP)),
       "/_get items " *> (APIGetChatItems <$> chatPaginationP <*> optional (" search=" *> stringP)),
       "/_get item info " *> (APIGetChatItemInfo <$> chatRefP <* A.space <*> A.decimal),
@@ -5989,6 +6009,8 @@ chatCommandP =
       "/_delete item " *> (APIDeleteChatItem <$> chatRefP <* A.space <*> A.decimal <* A.space <*> ciDeleteMode),
       "/_delete member item #" *> (APIDeleteMemberChatItem <$> A.decimal <* A.space <*> A.decimal <* A.space <*> A.decimal),
       "/_reaction " *> (APIChatItemReaction <$> chatRefP <* A.space <*> A.decimal <* A.space <*> onOffP <* A.space <*> jsonP),
+      "/_read user " *> (APIUserRead <$> A.decimal),
+      "/read user" $> UserRead,
       "/_read chat " *> (APIChatRead <$> chatRefP <*> optional (A.space *> ((,) <$> ("from=" *> A.decimal) <* A.space <*> ("to=" *> A.decimal)))),
       "/_unread chat " *> (APIChatUnread <$> chatRefP <* A.space <*> onOffP),
       "/_delete " *> (APIDeleteChat <$> chatRefP <*> (A.space *> "notify=" *> onOffP <|> pure True)),
@@ -6218,6 +6240,10 @@ chatCommandP =
       (CPLast <$ "count=" <*> A.decimal)
         <|> (CPAfter <$ "after=" <*> A.decimal <* A.space <* "count=" <*> A.decimal)
         <|> (CPBefore <$ "before=" <*> A.decimal <* A.space <* "count=" <*> A.decimal)
+    paginationByTimeP =
+      (PTLast <$ "count=" <*> A.decimal)
+        <|> (PTAfter <$ "after=" <*> strP <* A.space <* "count=" <*> A.decimal)
+        <|> (PTBefore <$ "before=" <*> strP <* A.space <* "count=" <*> A.decimal)
     mcTextP = MCText . safeDecodeUtf8 <$> A.takeByteString
     msgContentP = "text " *> mcTextP <|> "json " *> jsonP
     ciDeleteMode = "broadcast" $> CIDMBroadcast <|> "internal" $> CIDMInternal
@@ -6317,7 +6343,8 @@ chatCommandP =
           A.decimal
         ]
     dbKeyP = nonEmptyKey <$?> strP
-    nonEmptyKey k@(DBEncryptionKey s) = if null s then Left "empty key" else Right k
+    nonEmptyKey k@(DBEncryptionKey s) = if BA.null s then Left "empty key" else Right k
+    dbEncryptionConfig currentKey newKey = DBEncryptionConfig {currentKey, newKey, keepKey = Just False}
     autoAcceptP =
       ifM
         onOffP

src/Simplex/Chat/Archive.hs

@@ -17,12 +17,14 @@ import qualified Codec.Archive.Zip as Z
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
+import qualified Data.ByteArray as BA
 import Data.Functor (($>))
+import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
 import qualified Database.SQLite3 as SQL
 import Simplex.Chat.Controller
 import Simplex.Messaging.Agent.Client (agentClientStore)
-import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..), closeSQLiteStore, sqlString)
+import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..), closeSQLiteStore, keyString, sqlString, storeKey)
 import Simplex.Messaging.Util
 import System.FilePath
 import UnliftIO.Directory
@@ -118,7 +120,7 @@ storageFiles = do
   pure StorageFiles {chatStore, agentStore, filesPath}
 
 sqlCipherExport :: forall m. ChatMonad m => DBEncryptionConfig -> m ()
-sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = DBEncryptionKey key'} =
+sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = DBEncryptionKey key', keepKey} =
   when (key /= key') $ do
     fs <- storageFiles
     checkFile `withDBs` fs
@@ -134,15 +136,15 @@ sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = D
     backup f = copyFile f (f <> ".bak")
     restore f = copyFile (f <> ".bak") f
     checkFile f = unlessM (doesFileExist f) $ throwDBError $ DBErrorNoFile f
-    checkEncryption SQLiteStore {dbEncrypted} = do
-      enc <- readTVarIO dbEncrypted
-      when (enc && null key) $ throwDBError DBErrorEncrypted
-      when (not enc && not (null key)) $ throwDBError DBErrorPlaintext
+    checkEncryption SQLiteStore {dbKey} = do
+      enc <- maybe True (not . BA.null) <$> readTVarIO dbKey
+      when (enc && BA.null key) $ throwDBError DBErrorEncrypted
+      when (not enc && not (BA.null key)) $ throwDBError DBErrorPlaintext
     exported = (<> ".exported")
     removeExported f = whenM (doesFileExist $ exported f) $ removeFile (exported f)
-    moveExported SQLiteStore {dbFilePath = f, dbEncrypted} = do
+    moveExported SQLiteStore {dbFilePath = f, dbKey} = do
       renameFile (exported f) f
-      atomically $ writeTVar dbEncrypted $ not (null key')
+      atomically $ writeTVar dbKey $ storeKey key' (fromMaybe False keepKey)
     export f = do
       withDB f (`SQL.exec` exportSQL) DBErrorExport
       withDB (exported f) (`SQL.exec` testSQL) DBErrorOpen
@@ -161,7 +163,7 @@ sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = D
         exportSQL =
           T.unlines $
             keySQL key
-              <> [ "ATTACH DATABASE " <> sqlString (f <> ".exported") <> " AS exported KEY " <> sqlString key' <> ";",
+              <> [ "ATTACH DATABASE " <> sqlString (T.pack f <> ".exported") <> " AS exported KEY " <> keyString key' <> ";",
                    "SELECT sqlcipher_export('exported');",
                    "DETACH DATABASE exported;"
                  ]
@@ -172,7 +174,7 @@ sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = D
                    "PRAGMA secure_delete = ON;",
                    "SELECT count(*) FROM sqlite_master;"
                  ]
-        keySQL k = ["PRAGMA key = " <> sqlString k <> ";" | not (null k)]
+        keySQL k = ["PRAGMA key = " <> keyString k <> ";" | not (BA.null k)]
 
 withDBs :: Monad m => (FilePath -> m b) -> StorageFiles -> m b
 action `withDBs` StorageFiles {chatStore, agentStore} = action (dbFilePath chatStore) >> action (dbFilePath agentStore)

src/Simplex/Chat/Controller.hs

@@ -29,6 +29,8 @@ import qualified Data.Aeson.TH as JQ
 import qualified Data.Aeson.Types as JT
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (first)
+import Data.ByteArray (ScrubbedBytes)
+import qualified Data.ByteArray as BA
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import Data.Char (ord)
@@ -39,7 +41,9 @@ import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import Data.String
 import Data.Text (Text)
+import Data.Text.Encoding (decodeLatin1)
 import Data.Time (NominalDiffTime, UTCTime)
+import Data.Time.Clock.System (systemToUTCTime)
 import Data.Version (showVersion)
 import Data.Word (Word16)
 import Language.Haskell.TH (Exp, Q, runIO)
@@ -69,7 +73,7 @@ import qualified Simplex.Messaging.Crypto.File as CF
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Notifications.Protocol (DeviceToken (..), NtfTknStatus)
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, parseAll, parseString, sumTypeJSON)
-import Simplex.Messaging.Protocol (AProtoServerWithAuth, AProtocolType (..), CorrId, MsgFlags, NtfServer, ProtoServerWithAuth, ProtocolTypeI, QueueId, SProtocolType, SubscriptionMode (..), UserProtocol, XFTPServerWithAuth, userProtocol)
+import Simplex.Messaging.Protocol (AProtoServerWithAuth, AProtocolType (..), CorrId, NtfServer, ProtoServerWithAuth, ProtocolTypeI, QueueId, SMPMsgMeta (..), SProtocolType, SubscriptionMode (..), UserProtocol, XFTPServerWithAuth, userProtocol)
 import Simplex.Messaging.TMap (TMap)
 import Simplex.Messaging.Transport (TLS, simplexMQVersion)
 import Simplex.Messaging.Transport.Client (TransportHost)
@@ -230,7 +234,7 @@ data ChatCommand
   | DeleteUser UserName Bool (Maybe UserPwd)
   | StartChat {subscribeConnections :: Bool, enableExpireChatItems :: Bool, startXFTPWorkers :: Bool}
   | APIStopChat
-  | APIActivateChat
+  | APIActivateChat {restoreChat :: Bool}
   | APISuspendChat {suspendTimeout :: Int}
   | ResubscribeAllConnections
   | SetTempFolder FilePath
@@ -247,7 +251,7 @@ data ChatCommand
   | ExecChatStoreSQL Text
   | ExecAgentStoreSQL Text
   | SlowSQLQueries
-  | APIGetChats {userId :: UserId, pendingConnections :: Bool}
+  | APIGetChats {userId :: UserId, pendingConnections :: Bool, pagination :: PaginationByTime, query :: ChatListQuery}
   | APIGetChat ChatRef ChatPagination (Maybe String)
   | APIGetChatItems ChatPagination (Maybe String)
   | APIGetChatItemInfo ChatRef ChatItemId
@@ -256,6 +260,8 @@ data ChatCommand
   | APIDeleteChatItem ChatRef ChatItemId CIDeleteMode
   | APIDeleteMemberChatItem GroupId GroupMemberId ChatItemId
   | APIChatItemReaction {chatRef :: ChatRef, chatItemId :: ChatItemId, add :: Bool, reaction :: MsgReaction}
+  | APIUserRead UserId
+  | UserRead
   | APIChatRead ChatRef (Maybe (ChatItemId, ChatItemId))
   | APIChatUnread ChatRef Bool
   | APIDeleteChat ChatRef Bool -- `notify` flag is only applied to direct chats
@@ -453,7 +459,7 @@ allowRemoteCommand :: ChatCommand -> Bool -- XXX: consider using Relay/Block/For
 allowRemoteCommand = \case
   StartChat {} -> False
   APIStopChat -> False
-  APIActivateChat -> False
+  APIActivateChat _ -> False
   APISuspendChat _ -> False
   QuitChat -> False
   SetTempFolder _ -> False
@@ -654,7 +660,8 @@ data ChatResponse
   | CRUserContactLinkSubError {chatError :: ChatError} -- TODO delete
   | CRNtfTokenStatus {status :: NtfTknStatus}
   | CRNtfToken {token :: DeviceToken, status :: NtfTknStatus, ntfMode :: NotificationsMode}
-  | CRNtfMessages {user_ :: Maybe User, connEntity :: Maybe ConnectionEntity, msgTs :: Maybe UTCTime, ntfMessages :: [NtfMsgInfo]}
+  | CRNtfMessages {user_ :: Maybe User, connEntity_ :: Maybe ConnectionEntity, msgTs :: Maybe UTCTime, ntfMessages :: [NtfMsgInfo]}
+  | CRNtfMessage {user :: User, connEntity :: ConnectionEntity, ntfMessage :: NtfMsgInfo}
   | CRContactConnectionDeleted {user :: User, connection :: PendingContactConnection}
   | CRRemoteHostList {remoteHosts :: [RemoteHostInfo]}
   | CRCurrentRemoteHost {remoteHost_ :: Maybe RemoteHostInfo}
@@ -683,6 +690,7 @@ data ChatResponse
   | CRMessageError {user :: User, severity :: Text, errorMessage :: Text}
   | CRChatCmdError {user_ :: Maybe User, chatError :: ChatError}
   | CRChatError {user_ :: Maybe User, chatError :: ChatError}
+  | CRChatErrors {user_ :: Maybe User, chatErrors :: [ChatError]}
   | CRArchiveImported {archiveErrors :: [ArchiveError]}
   | CRTimedAction {action :: String, durationMilliseconds :: Int64}
   deriving (Show)
@@ -731,6 +739,26 @@ logResponseToFile = \case
   CRMessageError {} -> True
   _ -> False
 
+data ChatPagination
+  = CPLast Int
+  | CPAfter ChatItemId Int
+  | CPBefore ChatItemId Int
+  deriving (Show)
+
+data PaginationByTime
+  = PTLast Int
+  | PTAfter UTCTime Int
+  | PTBefore UTCTime Int
+  deriving (Show)
+
+data ChatListQuery
+  = CLQFilters {favorite :: Bool, unread :: Bool}
+  | CLQSearch {search :: String}
+  deriving (Show)
+
+clqNoFilters :: ChatListQuery
+clqNoFilters = CLQFilters {favorite = False, unread = False}
+
 data ConnectionPlan
   = CPInvitationLink {invitationLinkPlan :: InvitationLinkPlan}
   | CPContactAddress {contactAddressPlan :: ContactAddressPlan}
@@ -825,17 +853,17 @@ deriving instance Show AUserProtoServers
 data ArchiveConfig = ArchiveConfig {archivePath :: FilePath, disableCompression :: Maybe Bool, parentTempDirectory :: Maybe FilePath}
   deriving (Show)
 
-data DBEncryptionConfig = DBEncryptionConfig {currentKey :: DBEncryptionKey, newKey :: DBEncryptionKey}
+data DBEncryptionConfig = DBEncryptionConfig {currentKey :: DBEncryptionKey, newKey :: DBEncryptionKey, keepKey :: Maybe Bool}
   deriving (Show)
 
-newtype DBEncryptionKey = DBEncryptionKey String
+newtype DBEncryptionKey = DBEncryptionKey ScrubbedBytes
   deriving (Show)
 
 instance IsString DBEncryptionKey where fromString = parseString $ parseAll strP
 
 instance StrEncoding DBEncryptionKey where
-  strEncode (DBEncryptionKey s) = B.pack s
-  strP = DBEncryptionKey . B.unpack <$> A.takeWhile (\c -> c /= ' ' && ord c >= 0x21 && ord c <= 0x7E)
+  strEncode (DBEncryptionKey s) = BA.convert s
+  strP = DBEncryptionKey . BA.convert <$> A.takeWhile (\c -> c /= ' ' && ord c >= 0x21 && ord c <= 0x7E)
 
 instance FromJSON DBEncryptionKey where
   parseJSON = strParseJSON "DBEncryptionKey"
@@ -900,9 +928,12 @@ data XFTPFileConfig = XFTPFileConfig
 defaultXFTPFileConfig :: XFTPFileConfig
 defaultXFTPFileConfig = XFTPFileConfig {minFileSize = 0}
 
-data NtfMsgInfo = NtfMsgInfo {msgTs :: UTCTime, msgFlags :: MsgFlags}
+data NtfMsgInfo = NtfMsgInfo {msgId :: Text, msgTs :: UTCTime}
   deriving (Show)
 
+ntfMsgInfo :: SMPMsgMeta -> NtfMsgInfo
+ntfMsgInfo SMPMsgMeta {msgId, msgTs} = NtfMsgInfo {msgId = decodeLatin1 $ strEncode msgId, msgTs = systemToUTCTime msgTs}
+
 crNtfToken :: (DeviceToken, NtfTknStatus, NotificationsMode) -> ChatResponse
 crNtfToken (token, status, ntfMode) = CRNtfToken {token, status, ntfMode}
 
@@ -1264,6 +1295,8 @@ withAgent action =
 
 $(JQ.deriveJSON (enumJSON $ dropPrefix "HS") ''HelpSection)
 
+$(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CLQ") ''ChatListQuery)
+
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "ILP") ''InvitationLinkPlan)
 
 $(JQ.deriveJSON (sumTypeJSON $ dropPrefix "CAP") ''ContactAddressPlan)

src/Simplex/Chat/Core.hs

@@ -22,7 +22,7 @@ simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {core
       withGlobalLogging logCfg initRun
     _ -> initRun
   where
-    initRun = createChatDatabase dbFilePrefix dbKey confirmMigrations >>= either exit run
+    initRun = createChatDatabase dbFilePrefix dbKey False confirmMigrations >>= either exit run
     exit e = do
       putStrLn $ "Error opening database: " <> show e
       exitFailure

src/Simplex/Chat/Messages.hs

@@ -713,12 +713,6 @@ type ChatItemId = Int64
 
 type ChatItemTs = UTCTime
 
-data ChatPagination
-  = CPLast Int
-  | CPAfter ChatItemId Int
-  | CPBefore ChatItemId Int
-  deriving (Show)
-
 data SChatType (c :: ChatType) where
   SCTDirect :: SChatType 'CTDirect
   SCTGroup :: SChatType 'CTGroup

src/Simplex/Chat/Migrations/M20221222_chat_ts.hs

@@ -8,7 +8,7 @@ import Database.SQLite.Simple.QQ (sql)
 m20221222_chat_ts :: Query
 m20221222_chat_ts =
   [sql|
-ALTER TABLE contacts ADD COLUMN chat_ts TEXT;
+ALTER TABLE contacts ADD COLUMN chat_ts TEXT; -- must be not NULL
 
-ALTER TABLE groups ADD COLUMN chat_ts TEXT;
+ALTER TABLE groups ADD COLUMN chat_ts TEXT; -- must be not NULL
 |]

src/Simplex/Chat/Migrations/M20231207_chat_list_pagination.hs

@@ -0,0 +1,44 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20231207_chat_list_pagination where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20231207_chat_list_pagination :: Query
+m20231207_chat_list_pagination =
+  [sql|
+UPDATE contacts SET contact_used = 1
+WHERE contact_id = (
+  SELECT contact_id FROM connections
+  WHERE conn_level = 0 AND via_group_link = 0
+);
+
+UPDATE contacts
+SET chat_ts = updated_at
+WHERE chat_ts IS NULL;
+
+UPDATE groups
+SET chat_ts = updated_at
+WHERE chat_ts IS NULL;
+
+CREATE INDEX idx_contacts_chat_ts ON contacts(user_id, chat_ts);
+CREATE INDEX idx_groups_chat_ts ON groups(user_id, chat_ts);
+CREATE INDEX idx_contact_requests_updated_at ON contact_requests(user_id, updated_at);
+CREATE INDEX idx_connections_updated_at ON connections(user_id, updated_at);
+
+CREATE INDEX idx_chat_items_contact_id_item_status ON chat_items(contact_id, item_status);
+CREATE INDEX idx_chat_items_group_id_item_status ON chat_items(group_id, item_status);
+|]
+
+down_m20231207_chat_list_pagination :: Query
+down_m20231207_chat_list_pagination =
+  [sql|
+DROP INDEX idx_contacts_chat_ts;
+DROP INDEX idx_groups_chat_ts;
+DROP INDEX idx_contact_requests_updated_at;
+DROP INDEX idx_connections_updated_at;
+
+DROP INDEX idx_chat_items_contact_id_item_status;
+DROP INDEX idx_chat_items_group_id_item_status;
+|]

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -810,3 +810,18 @@ CREATE UNIQUE INDEX idx_remote_hosts_host_fingerprint ON remote_hosts(
 CREATE UNIQUE INDEX idx_remote_controllers_ctrl_fingerprint ON remote_controllers(
   ctrl_fingerprint
 );
+CREATE INDEX idx_contacts_chat_ts ON contacts(user_id, chat_ts);
+CREATE INDEX idx_groups_chat_ts ON groups(user_id, chat_ts);
+CREATE INDEX idx_contact_requests_updated_at ON contact_requests(
+  user_id,
+  updated_at
+);
+CREATE INDEX idx_connections_updated_at ON connections(user_id, updated_at);
+CREATE INDEX idx_chat_items_contact_id_item_status ON chat_items(
+  contact_id,
+  item_status
+);
+CREATE INDEX idx_chat_items_group_id_item_status ON chat_items(
+  group_id,
+  item_status
+);

src/Simplex/Chat/Mobile.hs

@@ -15,6 +15,8 @@ import Control.Monad.Reader
 import qualified Data.Aeson as J
 import qualified Data.Aeson.TH as JQ
 import Data.Bifunctor (first)
+import Data.ByteArray (ScrubbedBytes)
+import qualified Data.ByteArray as BA
 import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -44,7 +46,7 @@ import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
 import Simplex.Messaging.Agent.Client (agentClientStore)
 import Simplex.Messaging.Agent.Env.SQLite (createAgentStore)
-import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..), MigrationError, closeSQLiteStore)
+import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..), MigrationError, closeSQLiteStore, reopenSQLiteStore)
 import Simplex.Messaging.Client (defaultNetworkConfig)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding.String
@@ -70,8 +72,12 @@ $(JQ.deriveToJSON defaultJSON ''APIResponse)
 
 foreign export ccall "chat_migrate_init" cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
 
+foreign export ccall "chat_migrate_init_key" cChatMigrateInitKey :: CString -> CString -> CInt -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
+
 foreign export ccall "chat_close_store" cChatCloseStore :: StablePtr ChatController -> IO CString
 
+foreign export ccall "chat_reopen_store" cChatReopenStore :: StablePtr ChatController -> IO CString
+
 foreign export ccall "chat_send_cmd" cChatSendCmd :: StablePtr ChatController -> CString -> IO CJSONString
 
 foreign export ccall "chat_send_remote_cmd" cChatSendRemoteCmd :: StablePtr ChatController -> CInt -> CString -> IO CJSONString
@@ -102,7 +108,10 @@ foreign export ccall "chat_decrypt_file" cChatDecryptFile :: CString -> CString
 
 -- | check / migrate database and initialize chat controller on success
 cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
-cChatMigrateInit fp key conf ctrl = do
+cChatMigrateInit fp key = cChatMigrateInitKey fp key 0
+
+cChatMigrateInitKey :: CString -> CString -> CInt -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
+cChatMigrateInitKey fp key keepKey conf ctrl = do
   -- ensure we are set to UTF-8; iOS does not have locale, and will default to
   -- US-ASCII all the time.
   setLocaleEncoding utf8
@@ -110,10 +119,10 @@ cChatMigrateInit fp key conf ctrl = do
   setForeignEncoding utf8
 
   dbPath <- peekCAString fp
-  dbKey <- peekCAString key
+  dbKey <- BA.convert <$> B.packCString key
   confirm <- peekCAString conf
   r <-
-    chatMigrateInit dbPath dbKey confirm >>= \case
+    chatMigrateInitKey dbPath dbKey (keepKey /= 0) confirm >>= \case
       Right cc -> (newStablePtr cc >>= poke ctrl) $> DBMOk
       Left e -> pure e
   newCStringFromLazyBS $ J.encode r
@@ -121,6 +130,11 @@ cChatMigrateInit fp key conf ctrl = do
 cChatCloseStore :: StablePtr ChatController -> IO CString
 cChatCloseStore cPtr = deRefStablePtr cPtr >>= chatCloseStore >>= newCAString
 
+cChatReopenStore :: StablePtr ChatController -> IO CString
+cChatReopenStore cPtr = do
+  c <- deRefStablePtr cPtr
+  newCAString =<< chatReopenStore c
+
 -- | send command to chat (same syntax as in terminal for now)
 cChatSendCmd :: StablePtr ChatController -> CString -> IO CJSONString
 cChatSendCmd cPtr cCmd = do
@@ -162,13 +176,13 @@ cChatPasswordHash cPwd cSalt = do
 cChatValidName :: CString -> IO CString
 cChatValidName cName = newCString . mkValidName =<< peekCString cName
 
-mobileChatOpts :: String -> String -> ChatOpts
-mobileChatOpts dbFilePrefix dbKey =
+mobileChatOpts :: String -> ChatOpts
+mobileChatOpts dbFilePrefix =
   ChatOpts
     { coreOptions =
         CoreChatOpts
           { dbFilePrefix,
-            dbKey,
+            dbKey = "", -- for API database is already opened, and the key in options is not used
             smpServers = [],
             xftpServers = [],
             networkConfig = defaultNetworkConfig,
@@ -205,8 +219,11 @@ defaultMobileConfig =
 getActiveUser_ :: SQLiteStore -> IO (Maybe User)
 getActiveUser_ st = find activeUser <$> withTransaction st getUsers
 
-chatMigrateInit :: String -> String -> String -> IO (Either DBMigrationResult ChatController)
-chatMigrateInit dbFilePrefix dbKey confirm = runExceptT $ do
+chatMigrateInit :: String -> ScrubbedBytes -> String -> IO (Either DBMigrationResult ChatController)
+chatMigrateInit dbFilePrefix dbKey = chatMigrateInitKey dbFilePrefix dbKey False
+
+chatMigrateInitKey :: String -> ScrubbedBytes -> Bool -> String -> IO (Either DBMigrationResult ChatController)
+chatMigrateInitKey dbFilePrefix dbKey keepKey confirm = runExceptT $ do
   confirmMigrations <- liftEitherWith (const DBMInvalidConfirmation) $ strDecode $ B.pack confirm
   chatStore <- migrate createChatStore (chatStoreFile dbFilePrefix) confirmMigrations
   agentStore <- migrate createAgentStore (agentStoreFile dbFilePrefix) confirmMigrations
@@ -214,10 +231,10 @@ chatMigrateInit dbFilePrefix dbKey confirm = runExceptT $ do
   where
     initialize st db = do
       user_ <- getActiveUser_ st
-      newChatController db user_ defaultMobileConfig (mobileChatOpts dbFilePrefix dbKey)
+      newChatController db user_ defaultMobileConfig (mobileChatOpts dbFilePrefix)
     migrate createStore dbFile confirmMigrations =
       ExceptT $
-        (first (DBMErrorMigration dbFile) <$> createStore dbFile dbKey confirmMigrations)
+        (first (DBMErrorMigration dbFile) <$> createStore dbFile dbKey keepKey confirmMigrations)
           `catch` (pure . checkDBError)
           `catchAll` (pure . dbError)
       where
@@ -231,6 +248,11 @@ chatCloseStore ChatController {chatStore, smpAgent} = handleErr $ do
   closeSQLiteStore chatStore
   closeSQLiteStore $ agentClientStore smpAgent
 
+chatReopenStore :: ChatController -> IO String
+chatReopenStore ChatController {chatStore, smpAgent} = handleErr $ do
+  reopenSQLiteStore chatStore
+  reopenSQLiteStore (agentClientStore smpAgent)
+
 handleErr :: IO () -> IO String
 handleErr a = (a $> "") `catch` (pure . show @SomeException)
 

src/Simplex/Chat/Options.hs

@@ -18,6 +18,7 @@ where
 
 import Control.Logger.Simple (LogLevel (..))
 import qualified Data.Attoparsec.ByteString.Char8 as A
+import Data.ByteArray (ScrubbedBytes)
 import qualified Data.ByteString.Char8 as B
 import Data.Text (Text)
 import Numeric.Natural (Natural)
@@ -48,7 +49,7 @@ data ChatOpts = ChatOpts
 
 data CoreChatOpts = CoreChatOpts
   { dbFilePrefix :: String,
-    dbKey :: String,
+    dbKey :: ScrubbedBytes,
     smpServers :: [SMPServerWithAuth],
     xftpServers :: [XFTPServerWithAuth],
     networkConfig :: NetworkConfig,

src/Simplex/Chat/Remote.hs

@@ -189,7 +189,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         RHSessionConnecting _inv rhs' -> Right ((), RHSessionPendingConfirmation sessionCode tls rhs')
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
       let rh_' = (\rh -> (rh :: RemoteHostInfo) {sessionState = Just RHSPendingConfirmation {sessionCode}}) <$> remoteHost_
-      toView $ CRRemoteHostSessionCode {remoteHost_ = rh_', sessionCode}
+      toView CRRemoteHostSessionCode {remoteHost_ = rh_', sessionCode}
       (RCHostSession {sessionKeys}, rhHello, pairing') <- timeoutThrow (ChatErrorRemoteHost rhKey RHETimeout) 60000000 $ takeRCStep vars'
       hostInfo@HostAppInfo {deviceName = hostDeviceName} <-
         liftError (ChatErrorRemoteHost rhKey) $ parseHostAppInfo rhHello
@@ -260,7 +260,7 @@ cancelRemoteHostSession handlerInfo_ rhKey = do
     atomically $
       TM.lookup rhKey sessions >>= \case
         Nothing -> pure Nothing
-        Just (sessSeq, _) | maybe False (/= sessSeq) (fst <$> handlerInfo_) -> pure Nothing -- ignore cancel from a ghost session handler
+        Just (sessSeq, _) | maybe False ((sessSeq /=) . fst) handlerInfo_ -> pure Nothing -- ignore cancel from a ghost session handler
         Just (_, rhs) -> do
           TM.delete rhKey sessions
           modifyTVar' crh $ \cur -> if (RHId <$> cur) == Just rhKey then Nothing else cur -- only wipe the closing RH
@@ -268,7 +268,7 @@ cancelRemoteHostSession handlerInfo_ rhKey = do
   forM_ deregistered $ \session -> do
     liftIO $ cancelRemoteHost handlingError session `catchAny` (logError . tshow)
     forM_ (snd <$> handlerInfo_) $ \rhStopReason ->
-      toView $ CRRemoteHostStopped {remoteHostId_, rhsState = rhsSessionState session, rhStopReason}
+      toView CRRemoteHostStopped {remoteHostId_, rhsState = rhsSessionState session, rhStopReason}
   where
     handlingError = isJust handlerInfo_
     remoteHostId_ = case rhKey of

src/Simplex/Chat/Store.hs

@@ -12,13 +12,14 @@ module Simplex.Chat.Store
   )
 where
 
+import Data.ByteArray (ScrubbedBytes)
 import Simplex.Chat.Store.Migrations
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Store.Shared
 import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation, MigrationError, SQLiteStore (..), createSQLiteStore, withTransaction)
 
-createChatStore :: FilePath -> String -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
-createChatStore dbPath dbKey = createSQLiteStore dbPath dbKey migrations
+createChatStore :: FilePath -> ScrubbedBytes -> Bool -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
+createChatStore dbPath key keepKey = createSQLiteStore dbPath key keepKey migrations
 
 chatStoreFile :: FilePath -> FilePath
 chatStoreFile = (<> "_chat.db")

src/Simplex/Chat/Store/Direct.hs

@@ -43,6 +43,7 @@ module Simplex.Chat.Store.Direct
     deletePCCIncognitoProfile,
     updateContactUsed,
     updateContactUnreadChat,
+    setUserChatsRead,
     updateContactStatus,
     updateGroupUnreadChat,
     setConnectionVerified,
@@ -78,6 +79,7 @@ import Data.Text (Text)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
 import Database.SQLite.Simple (NamedParam (..), Only (..), (:.) (..))
 import Database.SQLite.Simple.QQ (sql)
+import Simplex.Chat.Messages
 import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
@@ -199,15 +201,15 @@ createIncognitoProfile db User {userId} p = do
   createdAt <- getCurrentTime
   createIncognitoProfile_ db userId createdAt p
 
-createDirectContact :: DB.Connection -> User -> Connection -> Profile -> ExceptT StoreError IO Contact
-createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p@Profile {preferences} = do
+createDirectContact :: DB.Connection -> User -> Connection -> Profile -> Bool -> ExceptT StoreError IO Contact
+createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p@Profile {preferences} contactUsed = do
   currentTs <- liftIO getCurrentTime
-  (localDisplayName, contactId, profileId) <- createContact_ db userId p localAlias Nothing currentTs (Just currentTs)
+  (localDisplayName, contactId, profileId) <- createContact_ db userId p localAlias Nothing currentTs contactUsed
   liftIO $ DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, currentTs, connId)
   let profile = toLocalProfile profileId p localAlias
       userPreferences = emptyChatPrefs
       mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
-  pure $ Contact {contactId, localDisplayName, profile, activeConn = Just conn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+  pure $ Contact {contactId, localDisplayName, profile, activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
 
 deleteContactConnectionsAndFiles :: DB.Connection -> UserId -> Contact -> IO ()
 deleteContactConnectionsAndFiles db userId Contact {contactId} = do
@@ -392,6 +394,13 @@ updateContactUnreadChat db User {userId} Contact {contactId} unreadChat = do
   updatedAt <- getCurrentTime
   DB.execute db "UPDATE contacts SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?" (unreadChat, updatedAt, userId, contactId)
 
+setUserChatsRead :: DB.Connection -> User -> IO ()
+setUserChatsRead db User {userId} = do
+  updatedAt <- getCurrentTime
+  DB.execute db "UPDATE contacts SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND unread_chat = ?" (False, updatedAt, userId, True)
+  DB.execute db "UPDATE groups SET unread_chat = ?, updated_at = ? WHERE user_id = ? AND unread_chat = ?" (False, updatedAt, userId, True)
+  DB.execute db "UPDATE chat_items SET item_status = ?, updated_at = ? WHERE user_id = ? AND item_status = ?" (CISRcvRead, updatedAt, userId, CISRcvNew)
+
 updateContactStatus :: DB.Connection -> User -> Contact -> ContactStatus -> IO Contact
 updateContactStatus db User {userId} ct@Contact {contactId} contactStatus = do
   currentTs <- getCurrentTime
@@ -641,8 +650,8 @@ deleteContactRequest db User {userId} contactRequestId = do
     (userId, userId, contactRequestId)
   DB.execute db "DELETE FROM contact_requests WHERE user_id = ? AND contact_request_id = ?" (userId, contactRequestId)
 
-createAcceptedContact :: DB.Connection -> User -> ConnId -> VersionRange -> ContactName -> ProfileId -> Profile -> Int64 -> Maybe XContactId -> Maybe IncognitoProfile -> SubscriptionMode -> IO Contact
-createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}} agentConnId cReqChatVRange localDisplayName profileId profile userContactLinkId xContactId incognitoProfile subMode = do
+createAcceptedContact :: DB.Connection -> User -> ConnId -> VersionRange -> ContactName -> ProfileId -> Profile -> Int64 -> Maybe XContactId -> Maybe IncognitoProfile -> SubscriptionMode -> Bool -> IO Contact
+createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}} agentConnId cReqChatVRange localDisplayName profileId profile userContactLinkId xContactId incognitoProfile subMode contactUsed = do
   DB.execute db "DELETE FROM contact_requests WHERE user_id = ? AND local_display_name = ?" (userId, localDisplayName)
   createdAt <- getCurrentTime
   customUserProfileId <- forM incognitoProfile $ \case
@@ -651,12 +660,12 @@ createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}
   let userPreferences = fromMaybe emptyChatPrefs $ incognitoProfile >> preferences
   DB.execute
     db
-    "INSERT INTO contacts (user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, created_at, updated_at, chat_ts, xcontact_id) VALUES (?,?,?,?,?,?,?,?,?)"
-    (userId, localDisplayName, profileId, True, userPreferences, createdAt, createdAt, createdAt, xContactId)
+    "INSERT INTO contacts (user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, created_at, updated_at, chat_ts, xcontact_id, contact_used) VALUES (?,?,?,?,?,?,?,?,?,?)"
+    (userId, localDisplayName, profileId, True, userPreferences, createdAt, createdAt, createdAt, xContactId, contactUsed)
   contactId <- insertedRowId db
   conn <- createConnection_ db userId ConnContact (Just contactId) agentConnId cReqChatVRange Nothing (Just userContactLinkId) customUserProfileId 0 createdAt subMode
   let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
-  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn = Just conn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
 
 getContactIdByName :: DB.Connection -> User -> ContactName -> ExceptT StoreError IO Int64
 getContactIdByName db User {userId} cName =

src/Simplex/Chat/Store/Groups.hs

@@ -1149,7 +1149,7 @@ createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupM
     Just (directCmdId, directAgentConnId) -> do
       Connection {connId = directConnId} <- liftIO $ createConnection_ db userId ConnContact Nothing directAgentConnId mcvr memberContactId Nothing customUserProfileId cLevel currentTs subMode
       liftIO $ setCommandConnId db user directCmdId directConnId
-      (localDisplayName, contactId, memProfileId) <- createContact_ db userId memberProfile "" (Just groupId) currentTs Nothing
+      (localDisplayName, contactId, memProfileId) <- createContact_ db userId memberProfile "" (Just groupId) currentTs False
       liftIO $ DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, currentTs, directConnId)
       pure $ NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memInvitedBy = IBUnknown, memInvitedByGroupMemberId = Nothing, localDisplayName, memContactId = Just contactId, memProfileId}
     Nothing -> do
@@ -1178,12 +1178,12 @@ createIntroToMemberContact db user@User {userId} GroupMember {memberContactId =
       DB.execute
         db
         [sql|
-          INSERT INTO contacts (contact_profile_id, via_group, local_display_name, user_id, created_at, updated_at)
-          SELECT contact_profile_id, group_id, ?, ?, ?, ?
+          INSERT INTO contacts (contact_profile_id, via_group, local_display_name, user_id, created_at, updated_at, chat_ts)
+          SELECT contact_profile_id, group_id, ?, ?, ?, ?, ?
           FROM group_members
           WHERE group_member_id = ?
         |]
-        (localDisplayName, userId, ts, ts, groupMemberId)
+        (localDisplayName, userId, ts, ts, ts, groupMemberId)
       contactId <- insertedRowId db
       DB.execute db "UPDATE connections SET contact_id = ?, updated_at = ? WHERE connection_id = ?" (contactId, ts, connId)
       pure contactId

src/Simplex/Chat/Store/Messages.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -109,14 +110,15 @@ import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)
 import Data.Either (fromRight, rights)
 import Data.Int (Int64)
-import Data.List (sortOn)
+import Data.List (sortBy)
 import Data.Maybe (fromMaybe, isJust, mapMaybe)
-import Data.Ord (Down (..))
+import Data.Ord (Down (..), comparing)
 import Data.Text (Text)
 import Data.Time (addUTCTime)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
-import Database.SQLite.Simple (NamedParam (..), Only (..), (:.) (..))
+import Database.SQLite.Simple (NamedParam (..), Only (..), Query, (:.) (..))
 import Database.SQLite.Simple.QQ (sql)
+import Simplex.Chat.Controller (ChatListQuery (..), ChatPagination (..), PaginationByTime (..))
 import Simplex.Chat.Markdown
 import Simplex.Chat.Messages
 import Simplex.Chat.Messages.CIContent
@@ -467,7 +469,7 @@ getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRe
         <$> DB.queryNamed
           db
           [sql|
-            SELECT i.chat_item_id, 
+            SELECT i.chat_item_id,
               -- GroupMember
               m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
               m.member_status, m.show_messages, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
@@ -486,209 +488,402 @@ getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRe
         ciQuoteGroup [] = ciQuote Nothing $ CIQGroupRcv Nothing
         ciQuoteGroup ((Only itemId :. memberRow) : _) = ciQuote itemId . CIQGroupRcv . Just $ toGroupMember userContactId memberRow
 
-getChatPreviews :: DB.Connection -> User -> Bool -> IO [AChat]
-getChatPreviews db user withPCC = do
-  directChats <- getDirectChatPreviews_ db user
-  groupChats <- getGroupChatPreviews_ db user
-  cReqChats <- getContactRequestChatPreviews_ db user
-  connChats <- getContactConnectionChatPreviews_ db user withPCC
-  pure $ sortOn (Down . ts) (directChats <> groupChats <> cReqChats <> connChats)
+getChatPreviews :: DB.Connection -> User -> Bool -> PaginationByTime -> ChatListQuery -> IO [Either StoreError AChat]
+getChatPreviews db user withPCC pagination query = do
+  directChats <- findDirectChatPreviews_ db user pagination query
+  groupChats <- findGroupChatPreviews_ db user pagination query
+  cReqChats <- getContactRequestChatPreviews_ db user pagination query
+  connChats <- if withPCC then getContactConnectionChatPreviews_ db user pagination query else pure []
+  let refs = sortTake $ concat [directChats, groupChats, cReqChats, connChats]
+  mapM (runExceptT <$> getChatPreview) refs
   where
-    ts :: AChat -> UTCTime
-    ts (AChat _ Chat {chatInfo, chatItems}) = case chatInfoChatTs chatInfo of
-      Just chatTs -> chatTs
-      Nothing -> case chatItems of
-        ci : _ -> max (chatItemTs ci) (chatInfoUpdatedAt chatInfo)
-        _ -> chatInfoUpdatedAt chatInfo
+    ts :: AChatPreviewData -> UTCTime
+    ts (ACPD _ cpd) = case cpd of
+      (DirectChatPD t _ _) -> t
+      (GroupChatPD t _ _) -> t
+      (ContactRequestPD t _) -> t
+      (ContactConnectionPD t _) -> t
+    sortTake = case pagination of
+      PTLast count -> take count . sortBy (comparing $ Down . ts)
+      PTAfter _ count -> reverse . take count . sortBy (comparing ts)
+      PTBefore _ count -> take count . sortBy (comparing $ Down . ts)
+    getChatPreview :: AChatPreviewData -> ExceptT StoreError IO AChat
+    getChatPreview (ACPD cType cpd) = case cType of
+      SCTDirect -> getDirectChatPreview_ db user cpd
+      SCTGroup -> getGroupChatPreview_ db user cpd
+      SCTContactRequest -> let (ContactRequestPD _ chat) = cpd in pure chat
+      SCTContactConnection -> let (ContactConnectionPD _ chat) = cpd in pure chat
 
-getDirectChatPreviews_ :: DB.Connection -> User -> IO [AChat]
-getDirectChatPreviews_ db user@User {userId} = do
-  currentTs <- getCurrentTime
-  map (toDirectChatPreview currentTs)
-    <$> DB.query
-      db
-      [sql|
-        SELECT
-          -- Contact
-          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
-          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent,
-          -- Connection
-          c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
-          c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version,
-          -- ChatStats
-          COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), ct.unread_chat,
-          -- ChatItem
-          i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.shared_msg_id, i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at, i.timed_ttl, i.timed_delete_at, i.item_live,
-          -- CIFile
-          f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
-          -- DirectQuote
-          ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent
-        FROM contacts ct
-        JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
-        LEFT JOIN connections c ON c.contact_id = ct.contact_id
-        LEFT JOIN (
-          SELECT contact_id, chat_item_id, MAX(created_at)
-          FROM chat_items
-          GROUP BY contact_id
-        ) LastItems ON LastItems.contact_id = ct.contact_id
-        LEFT JOIN chat_items i ON i.contact_id = LastItems.contact_id
-                               AND i.chat_item_id = LastItems.chat_item_id
-        LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
-        LEFT JOIN (
-          SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
-          FROM chat_items
-          WHERE item_status = ?
-          GROUP BY contact_id
-        ) ChatStats ON ChatStats.contact_id = ct.contact_id
-        LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
-        WHERE ct.user_id = ?
-          AND ct.is_user = 0
-          AND ct.deleted = 0
-          AND (
-            (
-              ((c.conn_level = 0 AND c.via_group_link = 0) OR ct.contact_used = 1)
-              AND c.connection_id = (
-                SELECT cc_connection_id FROM (
-                  SELECT
-                    cc.connection_id AS cc_connection_id,
-                    cc.created_at AS cc_created_at,
-                    (CASE WHEN cc.conn_status = ? OR cc.conn_status = ? THEN 1 ELSE 0 END) AS cc_conn_status_ord
-                  FROM connections cc
-                  WHERE cc.user_id = ct.user_id AND cc.contact_id = ct.contact_id
-                  ORDER BY cc_conn_status_ord DESC, cc_created_at DESC
-                  LIMIT 1
-                )
-              )
-            )
-            OR c.connection_id IS NULL
+data ChatPreviewData (c :: ChatType) where
+  DirectChatPD :: UTCTime -> ContactId -> Maybe ChatStats -> ChatPreviewData 'CTDirect
+  GroupChatPD :: UTCTime -> GroupId -> Maybe ChatStats -> ChatPreviewData 'CTGroup
+  ContactRequestPD :: UTCTime -> AChat -> ChatPreviewData 'CTContactRequest
+  ContactConnectionPD :: UTCTime -> AChat -> ChatPreviewData 'CTContactConnection
+
+data AChatPreviewData = forall c. ChatTypeI c => ACPD (SChatType c) (ChatPreviewData c)
+
+paginationByTimeFilter :: PaginationByTime -> (Query, [NamedParam])
+paginationByTimeFilter = \case
+  PTLast count -> ("\nORDER BY ts DESC LIMIT :count", [":count" := count])
+  PTAfter ts count -> ("\nAND ts > :ts ORDER BY ts ASC LIMIT :count", [":ts" := ts, ":count" := count])
+  PTBefore ts count -> ("\nAND ts < :ts ORDER BY ts DESC LIMIT :count", [":ts" := ts, ":count" := count])
+
+type MaybeChatStatsRow = (Maybe Int, Maybe ChatItemId, Maybe Bool)
+
+toMaybeChatStats :: MaybeChatStatsRow -> Maybe ChatStats
+toMaybeChatStats (Just unreadCount, Just minUnreadItemId, Just unreadChat) = Just ChatStats {unreadCount, minUnreadItemId, unreadChat}
+toMaybeChatStats _ = Nothing
+
+findDirectChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
+findDirectChatPreviews_ db User {userId} pagination clq =
+  map toPreview <$> getPreviews
+  where
+    toPreview :: (ContactId, UTCTime) :. MaybeChatStatsRow -> AChatPreviewData
+    toPreview ((contactId, ts) :. statsRow_) =
+      ACPD SCTDirect $ DirectChatPD ts contactId (toMaybeChatStats statsRow_)
+    (pagQuery, pagParams) = paginationByTimeFilter pagination
+    getPreviews = case clq of
+      CLQFilters {favorite = False, unread = False} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT ct.contact_id, ct.chat_ts as ts, NULL, NULL, NULL
+              FROM contacts ct
+              WHERE ct.user_id = :user_id AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used
+            |]
+              <> pagQuery
           )
-        ORDER BY i.item_ts DESC
-      |]
-      (CISRcvNew, userId, ConnReady, ConnSndReady)
-  where
-    toDirectChatPreview :: UTCTime -> ContactRow :. MaybeConnectionRow :. ChatStatsRow :. MaybeChatItemRow :. QuoteRow -> AChat
-    toDirectChatPreview currentTs (contactRow :. connRow :. statsRow :. ciRow_) =
-      let contact = toContact user $ contactRow :. connRow
-          ci_ = toDirectChatItemList currentTs ciRow_
-          stats = toChatStats statsRow
-       in AChat SCTDirect $ Chat (DirectChat contact) ci_ stats
+          ([":user_id" := userId] <> pagParams)
+      CLQFilters {favorite = True, unread = False} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT ct.contact_id, ct.chat_ts as ts, NULL, NULL, NULL
+              FROM contacts ct
+              WHERE ct.user_id = :user_id AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used
+                AND ct.favorite = 1
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId] <> pagParams)
+      CLQFilters {favorite = False, unread = True} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT ct.contact_id, ct.chat_ts as ts, COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), ct.unread_chat
+              FROM contacts ct
+              LEFT JOIN (
+                SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+                FROM chat_items
+                WHERE item_status = :rcv_new
+                GROUP BY contact_id
+              ) ChatStats ON ChatStats.contact_id = ct.contact_id
+              WHERE ct.user_id = :user_id AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used
+                AND (ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":rcv_new" := CISRcvNew] <> pagParams)
+      CLQFilters {favorite = True, unread = True} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT ct.contact_id, ct.chat_ts as ts, COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), ct.unread_chat
+              FROM contacts ct
+              LEFT JOIN (
+                SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+                FROM chat_items
+                WHERE item_status = :rcv_new
+                GROUP BY contact_id
+              ) ChatStats ON ChatStats.contact_id = ct.contact_id
+              WHERE ct.user_id = :user_id AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used
+                AND (ct.favorite = 1
+                  OR ct.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":rcv_new" := CISRcvNew] <> pagParams)
+      CLQSearch {search} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT ct.contact_id, ct.chat_ts as ts, NULL, NULL, NULL
+              FROM contacts ct
+              JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
+              WHERE ct.user_id = :user_id AND ct.is_user = 0 AND ct.deleted = 0 AND ct.contact_used
+                AND (
+                  ct.local_display_name LIKE '%' || :search || '%'
+                  OR cp.display_name LIKE '%' || :search || '%'
+                  OR cp.full_name LIKE '%' || :search || '%'
+                  OR cp.local_alias LIKE '%' || :search || '%'
+                )
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":search" := search] <> pagParams)
 
-getGroupChatPreviews_ :: DB.Connection -> User -> IO [AChat]
-getGroupChatPreviews_ db User {userId, userContactId} = do
-  currentTs <- getCurrentTime
-  map (toGroupChatPreview currentTs)
-    <$> DB.query
-      db
-      [sql|
-        SELECT
-          -- GroupInfo
-          g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image, g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences, g.created_at, g.updated_at, g.chat_ts,
-          -- GroupMember - membership
-          mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
-          mu.member_status, mu.show_messages, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
-          pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
-          -- ChatStats
-          COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), g.unread_chat,
-          -- ChatItem
-          i.chat_item_id, i.item_ts, i.item_sent, i.item_content, i.item_text, i.item_status, i.shared_msg_id, i.item_deleted, i.item_deleted_ts, i.item_edited, i.created_at, i.updated_at, i.timed_ttl, i.timed_delete_at, i.item_live,
-          -- CIFile
-          f.file_id, f.file_name, f.file_size, f.file_path, f.file_crypto_key, f.file_crypto_nonce, f.ci_file_status, f.protocol,
-          -- CIMeta forwardedByMember
-          i.forwarded_by_group_member_id,
-          -- Maybe GroupMember - sender
-          m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
-          m.member_status, m.show_messages, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-          p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
-          -- quoted ChatItem
-          ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent,
-          -- quoted GroupMember
-          rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category,
-          rm.member_status, rm.show_messages, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id,
-          rp.display_name, rp.full_name, rp.image, rp.contact_link, rp.local_alias, rp.preferences,
-          -- deleted by GroupMember
-          dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category,
-          dbm.member_status, dbm.show_messages, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id,
-          dbp.display_name, dbp.full_name, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences
-        FROM groups g
-        JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
-        JOIN group_members mu ON mu.group_id = g.group_id
-        JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
-        LEFT JOIN (
-          SELECT group_id, chat_item_id, MAX(item_ts)
-          FROM chat_items
-          GROUP BY group_id
-        ) LastItems ON LastItems.group_id = g.group_id
-        LEFT JOIN chat_items i ON i.group_id = LastItems.group_id
-                               AND i.chat_item_id = LastItems.chat_item_id
-        LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
-        LEFT JOIN (
-          SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
-          FROM chat_items
-          WHERE item_status = ?
-          GROUP BY group_id
-        ) ChatStats ON ChatStats.group_id = g.group_id
-        LEFT JOIN group_members m ON m.group_member_id = i.group_member_id
-        LEFT JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
-        LEFT JOIN chat_items ri ON ri.shared_msg_id = i.quoted_shared_msg_id AND ri.group_id = i.group_id
-        LEFT JOIN group_members rm ON rm.group_member_id = ri.group_member_id
-        LEFT JOIN contact_profiles rp ON rp.contact_profile_id = COALESCE(rm.member_profile_id, rm.contact_profile_id)
-        LEFT JOIN group_members dbm ON dbm.group_member_id = i.item_deleted_by_group_member_id
-        LEFT JOIN contact_profiles dbp ON dbp.contact_profile_id = COALESCE(dbm.member_profile_id, dbm.contact_profile_id)
-        WHERE g.user_id = ? AND mu.contact_id = ?
-        ORDER BY i.item_ts DESC
-      |]
-      (CISRcvNew, userId, userContactId)
+getDirectChatPreview_ :: DB.Connection -> User -> ChatPreviewData 'CTDirect -> ExceptT StoreError IO AChat
+getDirectChatPreview_ db user (DirectChatPD _ contactId stats_) = do
+  contact <- getContact db user contactId
+  lastItem <- getLastItem
+  stats <- maybe getChatStats pure stats_
+  pure $ AChat SCTDirect (Chat (DirectChat contact) lastItem stats)
   where
-    toGroupChatPreview :: UTCTime -> GroupInfoRow :. ChatStatsRow :. MaybeGroupChatItemRow -> AChat
-    toGroupChatPreview currentTs (groupInfoRow :. statsRow :. ciRow_) =
-      let groupInfo = toGroupInfo userContactId groupInfoRow
-          ci_ = toGroupChatItemList currentTs userContactId ciRow_
-          stats = toChatStats statsRow
-       in AChat SCTGroup $ Chat (GroupChat groupInfo) ci_ stats
+    getLastItem :: ExceptT StoreError IO [CChatItem 'CTDirect]
+    getLastItem =
+      liftIO getLastItemId >>= \case
+        Nothing -> pure []
+        Just lastItemId -> (: []) <$> getDirectChatItem db user contactId lastItemId
+    getLastItemId :: IO (Maybe ChatItemId)
+    getLastItemId =
+      maybeFirstRow fromOnly $
+        DB.query
+          db
+          [sql|
+            SELECT chat_item_id FROM (
+              SELECT contact_id, chat_item_id, MAX(created_at)
+              FROM chat_items
+              WHERE contact_id = ?
+              GROUP BY contact_id
+            )
+          |]
+          (Only contactId)
+    getChatStats :: ExceptT StoreError IO ChatStats
+    getChatStats = do
+      r_ <- liftIO getUnreadStats
+      let (unreadCount, minUnreadItemId) = maybe (0, 0) (\(_, unreadCnt, minId) -> (unreadCnt, minId)) r_
+      -- unread_chat could be read into contact to not search twice
+      unreadChat <-
+        ExceptT . firstRow fromOnly (SEInternalError $ "unread_chat not found for contact " <> show contactId) $
+          DB.query db "SELECT unread_chat FROM contacts WHERE contact_id = ?" (Only contactId)
+      pure ChatStats {unreadCount, minUnreadItemId, unreadChat}
+    getUnreadStats :: IO (Maybe (ContactId, Int, ChatItemId))
+    getUnreadStats =
+      maybeFirstRow id $
+        DB.query
+          db
+          [sql|
+            SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+            FROM chat_items
+            WHERE contact_id = ? AND item_status = ?
+            GROUP BY contact_id
+          |]
+          (contactId, CISRcvNew)
 
-getContactRequestChatPreviews_ :: DB.Connection -> User -> IO [AChat]
-getContactRequestChatPreviews_ db User {userId} =
-  map toContactRequestChatPreview
-    <$> DB.query
-      db
-      [sql|
-        SELECT
-          cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.user_contact_link_id,
-          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at,
-          cr.peer_chat_min_version, cr.peer_chat_max_version
-        FROM contact_requests cr
-        JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
-        JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id
-        JOIN user_contact_links uc ON uc.user_contact_link_id = cr.user_contact_link_id
-        WHERE cr.user_id = ? AND uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
-      |]
-      (userId, userId)
+findGroupChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
+findGroupChatPreviews_ db User {userId} pagination clq =
+  map toPreview <$> getPreviews
   where
-    toContactRequestChatPreview :: ContactRequestRow -> AChat
-    toContactRequestChatPreview cReqRow =
-      let cReq = toContactRequest cReqRow
+    toPreview :: (GroupId, UTCTime) :. MaybeChatStatsRow -> AChatPreviewData
+    toPreview ((groupId, ts) :. statsRow_) =
+      ACPD SCTGroup $ GroupChatPD ts groupId (toMaybeChatStats statsRow_)
+    (pagQuery, pagParams) = paginationByTimeFilter pagination
+    getPreviews = case clq of
+      CLQFilters {favorite = False, unread = False} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT g.group_id, g.chat_ts as ts, NULL, NULL, NULL
+              FROM groups g
+              WHERE g.user_id = :user_id
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId] <> pagParams)
+      CLQFilters {favorite = True, unread = False} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT g.group_id, g.chat_ts as ts, NULL, NULL, NULL
+              FROM groups g
+              WHERE g.user_id = :user_id
+                AND g.favorite = 1
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId] <> pagParams)
+      CLQFilters {favorite = False, unread = True} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT g.group_id, g.chat_ts as ts, COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), g.unread_chat
+              FROM groups g
+              LEFT JOIN (
+                SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+                FROM chat_items
+                WHERE item_status = :rcv_new
+                GROUP BY group_id
+              ) ChatStats ON ChatStats.group_id = g.group_id
+              WHERE g.user_id = :user_id
+                AND (g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":rcv_new" := CISRcvNew] <> pagParams)
+      CLQFilters {favorite = True, unread = True} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT g.group_id, g.chat_ts as ts, COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), g.unread_chat
+              FROM groups g
+              LEFT JOIN (
+                SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+                FROM chat_items
+                WHERE item_status = :rcv_new
+                GROUP BY group_id
+              ) ChatStats ON ChatStats.group_id = g.group_id
+              WHERE g.user_id = :user_id
+                AND (g.favorite = 1
+                  OR g.unread_chat = 1 OR ChatStats.UnreadCount > 0)
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":rcv_new" := CISRcvNew] <> pagParams)
+      CLQSearch {search} ->
+        DB.queryNamed
+          db
+          ( [sql|
+              SELECT g.group_id, g.chat_ts as ts, NULL, NULL, NULL
+              FROM groups g
+              JOIN group_profiles gp ON gp.group_profile_id = g.group_profile_id
+              WHERE g.user_id = :user_id
+                AND (
+                  g.local_display_name LIKE '%' || :search || '%'
+                  OR gp.display_name LIKE '%' || :search || '%'
+                  OR gp.full_name LIKE '%' || :search || '%'
+                  OR gp.description LIKE '%' || :search || '%'
+                )
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":search" := search] <> pagParams)
+
+getGroupChatPreview_ :: DB.Connection -> User -> ChatPreviewData 'CTGroup -> ExceptT StoreError IO AChat
+getGroupChatPreview_ db user (GroupChatPD _ groupId stats_) = do
+  groupInfo <- getGroupInfo db user groupId
+  lastItem <- getLastItem
+  stats <- maybe getChatStats pure stats_
+  pure $ AChat SCTGroup (Chat (GroupChat groupInfo) lastItem stats)
+  where
+    getLastItem :: ExceptT StoreError IO [CChatItem 'CTGroup]
+    getLastItem =
+      liftIO getLastItemId >>= \case
+        Nothing -> pure []
+        Just lastItemId -> (: []) <$> getGroupChatItem db user groupId lastItemId
+    getLastItemId :: IO (Maybe ChatItemId)
+    getLastItemId =
+      maybeFirstRow fromOnly $
+        DB.query
+          db
+          [sql|
+            SELECT chat_item_id FROM (
+              SELECT group_id, chat_item_id, MAX(item_ts)
+              FROM chat_items
+              WHERE group_id = ?
+              GROUP BY group_id
+            )
+          |]
+          (Only groupId)
+    getChatStats :: ExceptT StoreError IO ChatStats
+    getChatStats = do
+      r_ <- liftIO getUnreadStats
+      let (unreadCount, minUnreadItemId) = maybe (0, 0) (\(_, unreadCnt, minId) -> (unreadCnt, minId)) r_
+      -- unread_chat could be read into group to not search twice
+      unreadChat <-
+        ExceptT . firstRow fromOnly (SEInternalError $ "unread_chat not found for group " <> show groupId) $
+          DB.query db "SELECT unread_chat FROM groups WHERE group_id = ?" (Only groupId)
+      pure ChatStats {unreadCount, minUnreadItemId, unreadChat}
+    getUnreadStats :: IO (Maybe (GroupId, Int, ChatItemId))
+    getUnreadStats =
+      maybeFirstRow id $
+        DB.query
+          db
+          [sql|
+            SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
+            FROM chat_items
+            WHERE group_id = ? AND item_status = ?
+            GROUP BY group_id
+          |]
+          (groupId, CISRcvNew)
+
+getContactRequestChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
+getContactRequestChatPreviews_ db User {userId} pagination clq = case clq of
+  CLQFilters {favorite = False, unread = False} -> query ""
+  CLQFilters {favorite = True, unread = False} -> pure []
+  CLQFilters {favorite = False, unread = True} -> query ""
+  CLQFilters {favorite = True, unread = True} -> query ""
+  CLQSearch {search} -> query search
+  where
+    (pagQuery, pagParams) = paginationByTimeFilter pagination
+    query search =
+      map toPreview
+        <$> DB.queryNamed
+          db
+          ( [sql|
+              SELECT
+                cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.user_contact_link_id,
+                c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences,
+                cr.created_at, cr.updated_at as ts,
+                cr.peer_chat_min_version, cr.peer_chat_max_version
+              FROM contact_requests cr
+              JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
+              JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id
+              JOIN user_contact_links uc ON uc.user_contact_link_id = cr.user_contact_link_id
+              WHERE cr.user_id = :user_id
+                AND uc.user_id = :user_id
+                AND uc.local_display_name = ''
+                AND uc.group_id IS NULL
+                AND (
+                  cr.local_display_name LIKE '%' || :search || '%'
+                  OR p.display_name LIKE '%' || :search || '%'
+                  OR p.full_name LIKE '%' || :search || '%'
+                )
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":search" := search] <> pagParams)
+    toPreview :: ContactRequestRow -> AChatPreviewData
+    toPreview cReqRow =
+      let cReq@UserContactRequest {updatedAt} = toContactRequest cReqRow
           stats = ChatStats {unreadCount = 0, minUnreadItemId = 0, unreadChat = False}
-       in AChat SCTContactRequest $ Chat (ContactRequest cReq) [] stats
+          aChat = AChat SCTContactRequest $ Chat (ContactRequest cReq) [] stats
+       in ACPD SCTContactRequest $ ContactRequestPD updatedAt aChat
 
-getContactConnectionChatPreviews_ :: DB.Connection -> User -> Bool -> IO [AChat]
-getContactConnectionChatPreviews_ _ _ False = pure []
-getContactConnectionChatPreviews_ db User {userId} _ =
-  map toContactConnectionChatPreview
-    <$> DB.query
-      db
-      [sql|
-        SELECT connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id, custom_user_profile_id, conn_req_inv, local_alias, created_at, updated_at
-        FROM connections
-        WHERE user_id = ? AND conn_type = ? AND contact_id IS NULL AND conn_level = 0 AND via_contact IS NULL AND (via_group_link = 0 || (via_group_link = 1 AND group_link_id IS NOT NULL))
-      |]
-      (userId, ConnContact)
+getContactConnectionChatPreviews_ :: DB.Connection -> User -> PaginationByTime -> ChatListQuery -> IO [AChatPreviewData]
+getContactConnectionChatPreviews_ db User {userId} pagination clq = case clq of
+  CLQFilters {favorite = False, unread = False} -> query ""
+  CLQFilters {favorite = True, unread = False} -> pure []
+  CLQFilters {favorite = False, unread = True} -> pure []
+  CLQFilters {favorite = True, unread = True} -> pure []
+  CLQSearch {search} -> query search
   where
-    toContactConnectionChatPreview :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, LocalAlias, UTCTime, UTCTime) -> AChat
-    toContactConnectionChatPreview connRow =
-      let conn = toPendingContactConnection connRow
+    (pagQuery, pagParams) = paginationByTimeFilter pagination
+    query search =
+      map toPreview
+        <$> DB.queryNamed
+          db
+          ( [sql|
+              SELECT
+                connection_id, agent_conn_id, conn_status, via_contact_uri_hash, via_user_contact_link, group_link_id,
+                custom_user_profile_id, conn_req_inv, local_alias, created_at, updated_at as ts
+              FROM connections
+              WHERE user_id = :user_id
+                AND conn_type = :conn_contact
+                AND contact_id IS NULL
+                AND conn_level = 0
+                AND via_contact IS NULL
+                AND (via_group_link = 0 || (via_group_link = 1 AND group_link_id IS NOT NULL))
+                AND local_alias LIKE '%' || :search || '%'
+            |]
+              <> pagQuery
+          )
+          ([":user_id" := userId, ":conn_contact" := ConnContact, ":search" := search] <> pagParams)
+    toPreview :: (Int64, ConnId, ConnStatus, Maybe ByteString, Maybe Int64, Maybe GroupLinkId, Maybe Int64, Maybe ConnReqInvitation, LocalAlias, UTCTime, UTCTime) -> AChatPreviewData
+    toPreview connRow =
+      let conn@PendingContactConnection {updatedAt} = toPendingContactConnection connRow
           stats = ChatStats {unreadCount = 0, minUnreadItemId = 0, unreadChat = False}
-       in AChat SCTContactConnection $ Chat (ContactConnection conn) [] stats
+          aChat = AChat SCTContactConnection $ Chat (ContactConnection conn) [] stats
+       in ACPD SCTContactConnection $ ContactConnectionPD updatedAt aChat
 
 getDirectChat :: DB.Connection -> User -> Int64 -> ChatPagination -> Maybe String -> ExceptT StoreError IO (Chat 'CTDirect)
 getDirectChat db user contactId pagination search_ = do
@@ -993,19 +1188,12 @@ setGroupChatItemDeleteAt db User {userId} groupId chatItemId deleteAt =
     "UPDATE chat_items SET timed_delete_at = ? WHERE user_id = ? AND group_id = ? AND chat_item_id = ?"
     (deleteAt, userId, groupId, chatItemId)
 
-type ChatStatsRow = (Int, ChatItemId, Bool)
-
-toChatStats :: ChatStatsRow -> ChatStats
-toChatStats (unreadCount, minUnreadItemId, unreadChat) = ChatStats {unreadCount, minUnreadItemId, unreadChat}
-
 type MaybeCIFIleRow = (Maybe Int64, Maybe String, Maybe Integer, Maybe FilePath, Maybe C.SbKey, Maybe C.CbNonce, Maybe ACIFileStatus, Maybe FileProtocol)
 
 type ChatItemModeRow = (Maybe Int, Maybe UTCTime, Maybe Bool)
 
 type ChatItemRow = (Int64, ChatItemTs, AMsgDirection, Text, Text, ACIStatus, Maybe SharedMsgId) :. (Int, Maybe UTCTime, Maybe Bool, UTCTime, UTCTime) :. ChatItemModeRow :. MaybeCIFIleRow
 
-type MaybeChatItemRow = (Maybe Int64, Maybe ChatItemTs, Maybe AMsgDirection, Maybe Text, Maybe Text, Maybe ACIStatus, Maybe SharedMsgId) :. (Maybe Int, Maybe UTCTime, Maybe Bool, Maybe UTCTime, Maybe UTCTime) :. ChatItemModeRow :. MaybeCIFIleRow
-
 type QuoteRow = (Maybe ChatItemId, Maybe SharedMsgId, Maybe UTCTime, Maybe MsgContent, Maybe Bool)
 
 toDirectQuote :: QuoteRow -> Maybe (CIQuote 'CTDirect)
@@ -1055,15 +1243,8 @@ toDirectChatItem currentTs (((itemId, itemTs, AMsgDirection msgDir, itemContentT
     ciTimed :: Maybe CITimed
     ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
 
-toDirectChatItemList :: UTCTime -> MaybeChatItemRow :. QuoteRow -> [CChatItem 'CTDirect]
-toDirectChatItemList currentTs (((Just itemId, Just itemTs, Just msgDir, Just itemContent, Just itemText, Just itemStatus, sharedMsgId) :. (Just itemDeleted, deletedTs, itemEdited, Just createdAt, Just updatedAt) :. (timedTTL, timedDeleteAt, itemLive) :. fileRow) :. quoteRow) =
-  either (const []) (: []) $ toDirectChatItem currentTs (((itemId, itemTs, msgDir, itemContent, itemText, itemStatus, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. (timedTTL, timedDeleteAt, itemLive) :. fileRow) :. quoteRow)
-toDirectChatItemList _ _ = []
-
 type GroupQuoteRow = QuoteRow :. MaybeGroupMemberRow
 
-type MaybeGroupChatItemRow = MaybeChatItemRow :. Only (Maybe GroupMemberId) :. MaybeGroupMemberRow :. GroupQuoteRow :. MaybeGroupMemberRow
-
 toGroupQuote :: QuoteRow -> Maybe GroupMember -> Maybe (CIQuote 'CTGroup)
 toGroupQuote qr@(_, _, _, _, quotedSent) quotedMember_ = toQuote qr $ direction quotedSent quotedMember_
   where
@@ -1114,11 +1295,6 @@ toGroupChatItem currentTs userContactId (((itemId, itemTs, AMsgDirection msgDir,
     ciTimed :: Maybe CITimed
     ciTimed = timedTTL >>= \ttl -> Just CITimed {ttl, deleteAt = timedDeleteAt}
 
-toGroupChatItemList :: UTCTime -> Int64 -> MaybeGroupChatItemRow -> [CChatItem 'CTGroup]
-toGroupChatItemList currentTs userContactId (((Just itemId, Just itemTs, Just msgDir, Just itemContent, Just itemText, Just itemStatus, sharedMsgId) :. (Just itemDeleted, deletedTs, itemEdited, Just createdAt, Just updatedAt) :. (timedTTL, timedDeleteAt, itemLive) :. fileRow) :. forwardedByMember :. memberRow_ :. (quoteRow :. quotedMemberRow_) :. deletedByGroupMemberRow_) =
-  either (const []) (: []) $ toGroupChatItem currentTs userContactId (((itemId, itemTs, msgDir, itemContent, itemText, itemStatus, sharedMsgId) :. (itemDeleted, deletedTs, itemEdited, createdAt, updatedAt) :. (timedTTL, timedDeleteAt, itemLive) :. fileRow) :. forwardedByMember :. memberRow_ :. (quoteRow :. quotedMemberRow_) :. deletedByGroupMemberRow_)
-toGroupChatItemList _ _ _ = []
-
 getAllChatItems :: DB.Connection -> User -> ChatPagination -> Maybe String -> ExceptT StoreError IO [AChatItem]
 getAllChatItems db user@User {userId} pagination search_ = do
   itemRefs <-

src/Simplex/Chat/Store/Migrations.hs

@@ -91,6 +91,7 @@ import Simplex.Chat.Migrations.M20231107_indexes
 import Simplex.Chat.Migrations.M20231113_group_forward
 import Simplex.Chat.Migrations.M20231114_remote_control
 import Simplex.Chat.Migrations.M20231126_remote_ctrl_address
+import Simplex.Chat.Migrations.M20231207_chat_list_pagination
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -181,7 +182,8 @@ schemaMigrations =
     ("20231107_indexes", m20231107_indexes, Just down_m20231107_indexes),
     ("20231113_group_forward", m20231113_group_forward, Just down_m20231113_group_forward),
     ("20231114_remote_control", m20231114_remote_control, Just down_m20231114_remote_control),
-    ("20231126_remote_ctrl_address", m20231126_remote_ctrl_address, Just down_m20231126_remote_ctrl_address)
+    ("20231126_remote_ctrl_address", m20231126_remote_ctrl_address, Just down_m20231126_remote_ctrl_address),
+    ("20231207_chat_list_pagination", m20231207_chat_list_pagination, Just down_m20231207_chat_list_pagination)
   ]
 
 -- | The list of migrations in ascending order by date

src/Simplex/Chat/Store/Profiles.hs

@@ -116,8 +116,8 @@ createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, image,
     profileId <- insertedRowId db
     DB.execute
       db
-      "INSERT INTO contacts (contact_profile_id, local_display_name, user_id, is_user, created_at, updated_at) VALUES (?,?,?,?,?,?)"
-      (profileId, displayName, userId, True, currentTs, currentTs)
+      "INSERT INTO contacts (contact_profile_id, local_display_name, user_id, is_user, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?)"
+      (profileId, displayName, userId, True, currentTs, currentTs, currentTs)
     contactId <- insertedRowId db
     DB.execute db "UPDATE users SET contact_id = ? WHERE user_id = ?" (contactId, userId)
     pure $ toUser $ (userId, auId, contactId, profileId, activeUser, displayName, fullName, image, Nothing, userPreferences) :. (showNtfs, sendRcptsContacts, sendRcptsSmallGroups, Nothing, Nothing)
@@ -429,9 +429,9 @@ getUserAddress db User {userId} =
       |]
       (Only userId)
 
-getUserContactLinkById :: DB.Connection -> UserId -> Int64 -> IO (Maybe (UserContactLink, Maybe GroupId, GroupMemberRole))
+getUserContactLinkById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO (UserContactLink, Maybe GroupId, GroupMemberRole)
 getUserContactLinkById db userId userContactLinkId =
-  maybeFirstRow (\(ucl :. (groupId_, mRole_)) -> (toUserContactLink ucl, groupId_, fromMaybe GRMember mRole_)) $
+  ExceptT . firstRow (\(ucl :. (groupId_, mRole_)) -> (toUserContactLink ucl, groupId_, fromMaybe GRMember mRole_)) SEUserContactLinkNotFound $
     DB.query
       db
       [sql|

src/Simplex/Chat/Store/Shared.hs

@@ -235,10 +235,10 @@ setCommandConnId db User {userId} cmdId connId = do
 createContact :: DB.Connection -> User -> Profile -> ExceptT StoreError IO ()
 createContact db User {userId} profile = do
   currentTs <- liftIO getCurrentTime
-  void $ createContact_ db userId profile "" Nothing currentTs Nothing
+  void $ createContact_ db userId profile "" Nothing currentTs True
 
-createContact_ :: DB.Connection -> UserId -> Profile -> LocalAlias -> Maybe Int64 -> UTCTime -> Maybe UTCTime -> ExceptT StoreError IO (Text, ContactId, ProfileId)
-createContact_ db userId Profile {displayName, fullName, image, contactLink, preferences} localAlias viaGroup currentTs chatTs =
+createContact_ :: DB.Connection -> UserId -> Profile -> LocalAlias -> Maybe Int64 -> UTCTime -> Bool -> ExceptT StoreError IO (Text, ContactId, ProfileId)
+createContact_ db userId Profile {displayName, fullName, image, contactLink, preferences} localAlias viaGroup currentTs contactUsed =
   ExceptT . withLocalDisplayName db userId displayName $ \ldn -> do
     DB.execute
       db
@@ -247,8 +247,8 @@ createContact_ db userId Profile {displayName, fullName, image, contactLink, pre
     profileId <- insertedRowId db
     DB.execute
       db
-      "INSERT INTO contacts (contact_profile_id, local_display_name, user_id, via_group, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?)"
-      (profileId, ldn, userId, viaGroup, currentTs, currentTs, chatTs)
+      "INSERT INTO contacts (contact_profile_id, local_display_name, user_id, via_group, created_at, updated_at, chat_ts, contact_used) VALUES (?,?,?,?,?,?,?,?)"
+      (profileId, ldn, userId, viaGroup, currentTs, currentTs, currentTs, contactUsed)
     contactId <- insertedRowId db
     pure $ Right (ldn, contactId, profileId)
 

src/Simplex/Chat/Types.hs

@@ -186,9 +186,10 @@ contactConnIncognito :: Contact -> IncognitoEnabled
 contactConnIncognito = maybe False connIncognito . contactConn
 
 contactDirect :: Contact -> Bool
-contactDirect Contact {activeConn} = maybe True direct activeConn
-  where
-    direct Connection {connLevel, viaGroupLink} = connLevel == 0 && not viaGroupLink
+contactDirect Contact {activeConn} = maybe True connDirect activeConn
+
+connDirect :: Connection -> Bool
+connDirect Connection {connLevel, viaGroupLink} = connLevel == 0 && not viaGroupLink
 
 directOrUsed :: Contact -> Bool
 directOrUsed ct@Contact {contactUsed} =

src/Simplex/Chat/View.hs

@@ -279,6 +279,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRNtfTokenStatus status -> ["device token status: " <> plain (smpEncode status)]
   CRNtfToken _ status mode -> ["device token status: " <> plain (smpEncode status) <> ", notifications mode: " <> plain (strEncode mode)]
   CRNtfMessages {} -> []
+  CRNtfMessage {} -> []
   CRCurrentRemoteHost rhi_ ->
     [ maybe
         "Using local profile"
@@ -364,6 +365,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRMessageError u prefix err -> ttyUser u [plain prefix <> ": " <> plain err | prefix == "error" || logLevel <= CLLWarning]
   CRChatCmdError u e -> ttyUserPrefix' u $ viewChatError logLevel testView e
   CRChatError u e -> ttyUser' u $ viewChatError logLevel testView e
+  CRChatErrors u errs -> ttyUser' u $ concatMap (viewChatError logLevel testView) errs
   CRArchiveImported archiveErrs -> if null archiveErrs then ["ok"] else ["archive import errors: " <> plain (show archiveErrs)]
   CRTimedAction _ _ -> []
   where

tests/ChatClient.hs

@@ -15,6 +15,7 @@ import Control.Concurrent.STM
 import Control.Exception (bracket, bracket_)
 import Control.Monad
 import Control.Monad.Except
+import Data.ByteArray (ScrubbedBytes)
 import Data.Functor (($>))
 import Data.List (dropWhileEnd, find)
 import Data.Maybe (fromJust, isNothing)
@@ -86,7 +87,7 @@ testOpts =
       maintenance = False
     }
 
-getTestOpts :: Bool -> String -> ChatOpts
+getTestOpts :: Bool -> ScrubbedBytes -> ChatOpts
 getTestOpts maintenance dbKey = testOpts {maintenance, coreOptions = (coreOptions testOpts) {dbKey}}
 
 termSettings :: VirtualTerminalSettings
@@ -160,13 +161,13 @@ groupLinkViaContactVRange = mkVersionRange 1 2
 
 createTestChat :: FilePath -> ChatConfig -> ChatOpts -> String -> Profile -> IO TestCC
 createTestChat tmp cfg opts@ChatOpts {coreOptions = CoreChatOpts {dbKey}} dbPrefix profile = do
-  Right db@ChatDatabase {chatStore} <- createChatDatabase (tmp </> dbPrefix) dbKey MCError
+  Right db@ChatDatabase {chatStore} <- createChatDatabase (tmp </> dbPrefix) dbKey False MCError
   Right user <- withTransaction chatStore $ \db' -> runExceptT $ createUserRecord db' (AgentUserId 1) profile True
   startTestChat_ db cfg opts user
 
 startTestChat :: FilePath -> ChatConfig -> ChatOpts -> String -> IO TestCC
 startTestChat tmp cfg opts@ChatOpts {coreOptions = CoreChatOpts {dbKey}} dbPrefix = do
-  Right db@ChatDatabase {chatStore} <- createChatDatabase (tmp </> dbPrefix) dbKey MCError
+  Right db@ChatDatabase {chatStore} <- createChatDatabase (tmp </> dbPrefix) dbKey False MCError
   Just user <- find activeUser <$> withTransaction chatStore getUsers
   startTestChat_ db cfg opts user
 
@@ -275,8 +276,8 @@ getTermLine cc =
   5000000 `timeout` atomically (readTQueue $ termQ cc) >>= \case
     Just s -> do
       -- remove condition to always echo virtual terminal
+      -- when True $ do
       when (printOutput cc) $ do
-        -- when True $ do
         name <- userName cc
         putStrLn $ name <> ": " <> s
       pure s

tests/ChatTests.hs

@@ -1,5 +1,6 @@
 module ChatTests where
 
+import ChatTests.ChatList
 import ChatTests.Direct
 import ChatTests.Files
 import ChatTests.Groups
@@ -12,3 +13,4 @@ chatTests = do
   describe "group tests" chatGroupTests
   describe "file tests" chatFileTests
   describe "profile tests" chatProfileTests
+  describe "chat list pagination tests" chatListTests

tests/ChatTests/ChatList.hs

@@ -0,0 +1,227 @@
+module ChatTests.ChatList where
+
+import ChatClient
+import ChatTests.Utils
+import Data.Time.Clock (getCurrentTime)
+import Data.Time.Format.ISO8601 (iso8601Show)
+import Test.Hspec
+
+chatListTests :: SpecWith FilePath
+chatListTests = do
+  it "get last chats" testPaginationLast
+  it "get chats before/after timestamp" testPaginationTs
+  it "filter by search query" testFilterSearch
+  it "filter favorite" testFilterFavorite
+  it "filter unread" testFilterUnread
+  it "filter favorite or unread" testFilterFavoriteOrUnread
+  it "sort and filter chats of all types" testPaginationAllChatTypes
+
+testPaginationLast :: HasCallStack => FilePath -> IO ()
+testPaginationLast =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      alice ##> "/chats 0"
+      alice ##> "/chats 1"
+      alice <# "@cath hey"
+      alice ##> "/chats 2"
+      alice <# "bob> hey"
+      alice <# "@cath hey"
+
+testPaginationTs :: HasCallStack => FilePath -> IO ()
+testPaginationTs =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      tsStart <- iso8601Show <$> getCurrentTime
+      connectUsers alice bob
+      alice <##> bob
+      tsAliceBob <- iso8601Show <$> getCurrentTime
+      connectUsers alice cath
+      cath <##> alice
+      tsFinish <- iso8601Show <$> getCurrentTime
+      -- syntax smoke check
+      getChats_ alice "count=0" []
+      getChats_ alice ("after=" <> tsFinish <> " count=2") []
+      getChats_ alice ("before=" <> tsFinish <> " count=0") []
+      -- limited reads
+      getChats_ alice "count=1" [("@cath", "hey")]
+      getChats_ alice ("after=" <> tsStart <> " count=1") [("@bob", "hey")]
+      getChats_ alice ("before=" <> tsFinish <> " count=1") [("@cath", "hey")]
+      -- interval bounds
+      getChats_ alice ("after=" <> tsAliceBob <> " count=10") [("@cath", "hey")]
+      getChats_ alice ("before=" <> tsAliceBob <> " count=10") [("@bob", "hey")]
+
+getChats_ :: HasCallStack => TestCC -> String -> [(String, String)] -> Expectation
+getChats_ cc query expected = do
+  cc #$> ("/_get chats 1 pcc=on " <> query, chats, expected)
+
+testFilterSearch :: HasCallStack => FilePath -> IO ()
+testFilterSearch =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query s = "count=1 {\"type\": \"search\", \"search\": \"" <> s <> "\"}"
+
+      getChats_ alice (query "abc") []
+      getChats_ alice (query "alice") []
+      getChats_ alice (query "bob") [("@bob", "hey")]
+      getChats_ alice (query "Bob") [("@bob", "hey")]
+
+testFilterFavorite :: HasCallStack => FilePath -> IO ()
+testFilterFavorite =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": true, \"unread\": false}"
+
+      -- no favorite chats
+      getChats_ alice query []
+
+      -- 1 favorite chat
+      alice ##> "/_settings @2 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 favorite chat, unread chat not included
+      alice ##> "/_unread chat @3 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+testFilterUnread :: HasCallStack => FilePath -> IO ()
+testFilterUnread =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": false, \"unread\": true}"
+
+      -- no unread chats
+      getChats_ alice query []
+
+      -- 1 unread chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 unread chat, favorite chat not included
+      alice ##> "/_settings @3 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+testFilterFavoriteOrUnread :: HasCallStack => FilePath -> IO ()
+testFilterFavoriteOrUnread =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      alice <##> bob
+      connectUsers alice cath
+      cath <##> alice
+
+      let query = "{\"type\": \"filters\", \"favorite\": true, \"unread\": true}"
+
+      -- no favorite or unread chats
+      getChats_ alice query []
+
+      -- 1 unread chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@bob", "hey")]
+
+      -- 1 favorite chat
+      alice ##> "/_unread chat @2 off"
+      alice <## "ok"
+      alice ##> "/_settings @3 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      getChats_ alice query [("@cath", "hey")]
+
+      -- 1 unread chat, 1 favorite chat
+      alice ##> "/_unread chat @2 on"
+      alice <## "ok"
+      getChats_ alice query [("@cath", "hey"), ("@bob", "hey")]
+
+testPaginationAllChatTypes :: HasCallStack => FilePath -> IO ()
+testPaginationAllChatTypes =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
+    \alice bob cath dan -> do
+      ts1 <- iso8601Show <$> getCurrentTime
+
+      -- @bob
+      connectUsers alice bob
+      alice <##> bob
+
+      ts2 <- iso8601Show <$> getCurrentTime
+
+      -- <@cath
+      alice ##> "/ad"
+      cLink <- getContactLink alice True
+      cath ##> ("/c " <> cLink)
+      alice <#? cath
+
+      ts3 <- iso8601Show <$> getCurrentTime
+
+      -- :3
+      alice ##> "/c"
+      _ <- getInvitation alice
+
+      ts4 <- iso8601Show <$> getCurrentTime
+
+      -- #team
+      alice ##> "/g team"
+      alice <## "group #team is created"
+      alice <## "to add members use /a team <name> or /create link #team"
+
+      ts5 <- iso8601Show <$> getCurrentTime
+
+      -- @dan
+      connectUsers alice dan
+      alice <##> dan
+
+      ts6 <- iso8601Show <$> getCurrentTime
+
+      getChats_ alice "count=10" [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice "count=3" [("@dan", "hey"), ("#team", ""), (":3", "")]
+      getChats_ alice ("after=" <> ts2 <> " count=2") [(":3", ""), ("<@cath", "")]
+      getChats_ alice ("before=" <> ts5 <> " count=2") [("#team", ""), (":3", "")]
+      getChats_ alice ("after=" <> ts3 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", "")]
+      getChats_ alice ("before=" <> ts4 <> " count=10") [(":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("after=" <> ts1 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("before=" <> ts6 <> " count=10") [("@dan", "hey"), ("#team", ""), (":3", ""), ("<@cath", ""), ("@bob", "hey")]
+      getChats_ alice ("after=" <> ts6 <> " count=10") []
+      getChats_ alice ("before=" <> ts1 <> " count=10") []
+
+      let queryFavorite = "{\"type\": \"filters\", \"favorite\": true, \"unread\": false}"
+      getChats_ alice queryFavorite []
+
+      alice ##> "/_settings @2 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+      alice ##> "/_settings #1 {\"enableNtfs\":\"all\",\"favorite\":true}"
+      alice <## "ok"
+
+      getChats_ alice queryFavorite [("#team", ""), ("@bob", "hey")]
+      getChats_ alice ("before=" <> ts4 <> " count=1 " <> queryFavorite) [("@bob", "hey")]
+      getChats_ alice ("before=" <> ts5 <> " count=1 " <> queryFavorite) [("#team", "")]
+      getChats_ alice ("after=" <> ts1 <> " count=1 " <> queryFavorite) [("@bob", "hey")]
+      getChats_ alice ("after=" <> ts4 <> " count=1 " <> queryFavorite) [("#team", "")]
+
+      let queryUnread = "{\"type\": \"filters\", \"favorite\": false, \"unread\": true}"
+
+      getChats_ alice queryUnread [("<@cath", "")]
+      getChats_ alice ("before=" <> ts2 <> " count=10 " <> queryUnread) []
+      getChats_ alice ("before=" <> ts3 <> " count=10 " <> queryUnread) [("<@cath", "")]
+      getChats_ alice ("after=" <> ts2 <> " count=10 " <> queryUnread) [("<@cath", "")]
+      getChats_ alice ("after=" <> ts3 <> " count=10 " <> queryUnread) []

tests/ChatTests/Direct.hs

@@ -175,6 +175,8 @@ testAddContact = versionTestMatrix2 runTestAddContact
       bob #$> ("/_read chat @2 from=1 to=100", id, "ok")
       alice #$> ("/_read chat @2", id, "ok")
       bob #$> ("/_read chat @2", id, "ok")
+      alice #$> ("/read user", id, "ok")
+      alice #$> ("/_read user 1", id, "ok")
 
 testDuplicateContactsSeparate :: HasCallStack => FilePath -> IO ()
 testDuplicateContactsSeparate =

tests/MobileTests.hs

@@ -209,7 +209,7 @@ testChatApi :: FilePath -> IO ()
 testChatApi tmp = do
   let dbPrefix = tmp </> "1"
       f = chatStoreFile dbPrefix
-  Right st <- createChatStore f "myKey" MCYesUp
+  Right st <- createChatStore f "myKey" False MCYesUp
   Right _ <- withTransaction st $ \db -> runExceptT $ createUserRecord db (AgentUserId 1) aliceProfile {preferences = Nothing} True
   Right cc <- chatMigrateInit dbPrefix "myKey" "yesUp"
   Left (DBMErrorNotADatabase _) <- chatMigrateInit dbPrefix "" "yesUp"

tests/SchemaDump.hs

@@ -36,14 +36,14 @@ testVerifySchemaDump :: IO ()
 testVerifySchemaDump = withTmpFiles $ do
   savedSchema <- ifM (doesFileExist appSchema) (readFile appSchema) (pure "")
   savedSchema `deepseq` pure ()
-  void $ createChatStore testDB "" MCError
+  void $ createChatStore testDB "" False MCError
   getSchema testDB appSchema `shouldReturn` savedSchema
   removeFile testDB
 
 testSchemaMigrations :: IO ()
 testSchemaMigrations = withTmpFiles $ do
   let noDownMigrations = dropWhileEnd (\Migration {down} -> isJust down) Store.migrations
-  Right st <- createSQLiteStore testDB "" noDownMigrations MCError
+  Right st <- createSQLiteStore testDB "" False noDownMigrations MCError
   mapM_ (testDownMigration st) $ drop (length noDownMigrations) Store.migrations
   closeSQLiteStore st
   removeFile testDB