Merge branch 'stable' into stable-android

* build-android: build armv7a in seperate tag

And update nix install.

* build-android: change tag detection logic

* build-android: minor change of logic

.github/workflows/build.yml

@@ -79,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: "9.6.3"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -188,7 +188,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -259,10 +259,12 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: 'Setup MSYS2'
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2
         with:
           msystem: ucrt64

apps/ios/Shared/AppDelegate.swift

@@ -42,6 +42,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)
         }
@@ -80,7 +81,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() && BGManager.shared.lastRanLongAgo {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)

apps/ios/Shared/ContentView.swift

@@ -14,11 +14,14 @@ struct ContentView: View {
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
     @Environment(\.colorScheme) var colorScheme
-    @Binding var doAuthenticate: Bool
-    @Binding var userAuthorized: Bool?
-    @Binding var canConnectCall: Bool
-    @Binding var lastSuccessfulUnlock: TimeInterval?
-    @Binding var showInitializationView: Bool
+
+    var contentAccessAuthenticationExtended: Bool
+
+    @Environment(\.scenePhase) var scenePhase
+    @State private var automaticAuthenticationAttempted = false
+    @State private var canConnectViewCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -40,9 +43,19 @@ struct ContentView: View {
         }
     }
 
+    private var accessAuthenticated: Bool {
+        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
+    }
+
     var body: some View {
         ZStack {
-            contentView()
+            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
+            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
+            if !prefPerformLA || accessAuthenticated {
+                contentView()
+            } else {
+                lockButton()
+            }
             if chatModel.showCallView, let call = chatModel.activeCall {
                 callView(call)
             }
@@ -50,6 +63,7 @@ struct ContentView: View {
                 LocalAuthView(authRequest: la)
             } else if showSetPasscode {
                 SetAppPasscodeView {
+                    chatModel.contentViewAccessAuthenticated = true
                     prefPerformLA = true
                     showSetPasscode = false
                     privacyLocalAuthModeDefault.set(.passcode)
@@ -60,13 +74,9 @@ struct ContentView: View {
                     alertManager.showAlert(laPasscodeNotSetAlert())
                 }
             }
-        }
-        .onAppear {
-            if prefPerformLA { requestNtfAuthorization() }
-            initAuthenticate()
-        }
-        .onChange(of: doAuthenticate) { _ in
-            initAuthenticate()
+            if chatModel.chatDbStatus == nil {
+                initializationView()
+            }
         }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
         .sheet(isPresented: $showSettings) {
@@ -76,14 +86,44 @@ struct ContentView: View {
             Button("System authentication") { initialEnableLA() }
             Button("Passcode entry") { showSetPasscode = true }
         }
+        .onChange(of: scenePhase) { phase in
+            logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
+            switch (phase) {
+            case .background:
+                // also see .onChange(of: scenePhase) in SimpleXApp: on entering background
+                // it remembers enteredBackgroundAuthenticated and sets chatModel.contentViewAccessAuthenticated to false
+                automaticAuthenticationAttempted = false
+                canConnectViewCall = false
+            case .active:
+                canConnectViewCall = !prefPerformLA || contentAccessAuthenticationExtended || unlockedRecently()
+                
+                // condition `!chatModel.contentViewAccessAuthenticated` is required for when authentication is enabled in settings or on initial notice
+                if prefPerformLA && !chatModel.contentViewAccessAuthenticated {
+                    if AppChatState.shared.value != .stopped {
+                        if contentAccessAuthenticationExtended {
+                            chatModel.contentViewAccessAuthenticated = true
+                        } else {
+                            if !automaticAuthenticationAttempted {
+                                automaticAuthenticationAttempted = true
+                                // authenticate if call kit call is not in progress
+                                if !(CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil) {
+                                    authenticateContentViewAccess()
+                                }
+                            }
+                        }
+                    } else {
+                        // when app is stopped automatic authentication is not attempted
+                        chatModel.contentViewAccessAuthenticated = contentAccessAuthenticationExtended
+                    }
+                }
+            default:
+                break
+            }
+        }
     }
 
     @ViewBuilder private func contentView() -> some View {
-        if prefPerformLA && userAuthorized != true {
-            lockButton()
-        } else if chatModel.chatDbStatus == nil && showInitializationView {
-            initializationView()
-        } else if let status = chatModel.chatDbStatus, status != .ok {
+        if let status = chatModel.chatDbStatus, status != .ok {
             DatabaseErrorView(status: status)
         } else if !chatModel.v3DBMigration.startChat {
             MigrateToAppGroupView()
@@ -106,11 +146,11 @@ struct ContentView: View {
         if CallController.useCallKit() {
             ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                 .onDisappear {
-                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
+                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
                 }
         } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectCall)
-            if prefPerformLA && userAuthorized != true {
+            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
+            if prefPerformLA && !accessAuthenticated {
                 Rectangle()
                     .fill(colorScheme == .dark ? .black : .white)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -120,22 +160,27 @@ struct ContentView: View {
     }
 
     private func lockButton() -> some View {
-        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
+        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
     }
 
     private func initializationView() -> some View {
         VStack {
             ProgressView().scaleEffect(2)
-            Text("Opening database…")
+            Text("Opening app…")
                 .padding()
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity )
+        .background(
+            Rectangle()
+                .fill(.background)
+        ) 
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
             ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
-                if !prefPerformLA { requestNtfAuthorization() }
+                requestNtfAuthorization()
                 // Local Authentication notice is to be shown on next start after onboarding is complete
                 if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
@@ -187,48 +232,37 @@ struct ContentView: View {
         }
     }
 
-    private func initAuthenticate() {
-        logger.debug("initAuthenticate")
-        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
-            userAuthorized = false
-        } else if doAuthenticate {
-            runAuthenticate()
-        }
-    }
-
-    private func runAuthenticate() {
-        logger.debug("DEBUGGING: runAuthenticate")
-        if !prefPerformLA {
-            userAuthorized = true
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
         } else {
-            logger.debug("DEBUGGING: before dismissAllSheets")
-            dismissAllSheets(animated: false) {
-                logger.debug("DEBUGGING: in dismissAllSheets callback")
-                chatModel.chatId = nil
-                justAuthenticate()
-            }
+            return false
         }
     }
 
-    private func justAuthenticate() {
-        userAuthorized = false
-        let laMode = privacyLocalAuthModeDefault.get()
-        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
-            switch (laResult) {
-            case .success:
-                userAuthorized = true
-                canConnectCall = true
-                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
-            case .failed:
-                if laMode == .passcode {
-                    AlertManager.shared.showAlert(laFailedAlert())
+    private func authenticateContentViewAccess() {
+        logger.debug("DEBUGGING: authenticateContentViewAccess")
+        dismissAllSheets(animated: false) {
+            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
+            chatModel.chatId = nil
+
+            authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+                logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
+                switch (laResult) {
+                case .success:
+                    chatModel.contentViewAccessAuthenticated = true
+                    canConnectViewCall = true
+                    lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
+                case .failed:
+                    chatModel.contentViewAccessAuthenticated = false
+                    if privacyLocalAuthModeDefault.get() == .passcode {
+                        AlertManager.shared.showAlert(laFailedAlert())
+                    }
+                case .unavailable:
+                    prefPerformLA = false
+                    canConnectViewCall = true
+                    AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
                 }
-            case .unavailable:
-                userAuthorized = true
-                prefPerformLA = false
-                canConnectCall = true
-                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
@@ -259,6 +293,7 @@ struct ContentView: View {
         authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
             switch laResult {
             case .success:
+                chatModel.contentViewAccessAuthenticated = true
                 prefPerformLA = true
                 alertManager.showAlert(laTurnedOnAlert())
             case .failed:

apps/ios/Shared/Model/BGManager.swift

@@ -15,7 +15,13 @@ 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 // 10 minutes
+
+// This intervals are used for background refresh in instant and periodic modes
+private let periodicBgRefreshInterval: TimeInterval = 1200 // 20 minutes
+
+private let maxBgRefreshInterval: TimeInterval = 2400 // 40 minutes
 
 private let maxTimerCount = 9
 
@@ -33,14 +39,14 @@ class BGManager {
         }
     }
 
-    func schedule() {
+    func schedule(interval: TimeInterval? = nil) {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.schedule: disabled")
             return
         }
         logger.debug("BGManager.schedule")
         let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
         do {
             try BGTaskScheduler.shared.submit(request)
         } catch {
@@ -48,20 +54,34 @@ class BGManager {
         }
     }
 
+    var runInterval: TimeInterval {
+        switch ChatModel.shared.notificationMode {
+        case .instant: maxBgRefreshInterval
+        case .periodic: periodicBgRefreshInterval
+        case .off: bgRefreshInterval
+        }
+    }
+
+    var lastRanLongAgo: Bool {
+        Date.now.timeIntervalSince(chatLastBackgroundRunGroupDefault.get()) > runInterval
+    }
+
     private func handleRefresh(_ task: BGAppRefreshTask) {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.handleRefresh: disabled")
             return
         }
         logger.debug("BGManager.handleRefresh")
-        schedule()
-        if appStateGroupDefault.get().inactive {
+        let shouldRun_ = lastRanLongAgo
+        if allowBackgroundRefresh() && shouldRun_ {
+            schedule()
             let completeRefresh = completionHandler {
                 task.setTaskCompleted(success: true)
             }
             task.expirationHandler = { completeRefresh("expirationHandler") }
             receiveMessages(completeRefresh)
         } else {
+            schedule(interval: shouldRun_ ? bgRefreshInterval : runInterval)
             logger.debug("BGManager.completionHandler: already active, not started")
             task.setTaskCompleted(success: true)
         }
@@ -90,20 +110,22 @@ class BGManager {
         }
         self.completed = false
         DispatchQueue.main.async {
+            chatLastBackgroundRunGroupDefault.set(Date.now)
             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

@@ -54,6 +54,8 @@ final class ChatModel: ObservableObject {
     @Published var chatDbChanged = false
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
+    // local authentication
+    @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
     @Published var chats: [Chat] = []
@@ -104,12 +106,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))")
 }
@@ -605,27 +606,29 @@ func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
     throw r
 }
 
-func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
-    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
+    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
         AlertManager.shared.showAlert(alert)
         return nil
     } else {
-        return connReqType
+        return r
     }
 }
 
-func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
         return (nil, nil)
     }
     let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
+    let m = ChatModel.shared
     switch r {
-    case .sentConfirmation: return (.invitation, nil)
-    case .sentInvitation: return (.contact, nil)
+    case let .sentConfirmation(_, connection):
+        return ((.invitation, connection), nil)
+    case let .sentInvitation(_, connection):
+        return ((.contact, connection), nil)
     case let .contactAlreadyExists(_, contact):
-        let m = ChatModel.shared
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
@@ -1232,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()
     }
 }
 
@@ -1248,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)
         }
@@ -1362,18 +1370,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
     let m = ChatModel.shared
     logger.debug("processReceivedMsg: \(res.responseType)")
     switch res {
-    case let .newContactConnection(user, connection):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnection(connection)
-            }
-        }
-    case let .contactConnectionDeleted(user, connection):
-        if active(user) {
-            await MainActor.run {
-                m.removeChat(connection.id)
-            }
-        }
     case let .contactDeletedByContact(user, contact):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
@@ -1746,7 +1742,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
         // This delay is needed to cancel the session that fails on network failure,
         // e.g. when user did not grant permission to access local network yet.
         if let sess = m.remoteCtrlSession {
-            m.remoteCtrlSession = nil
+            await MainActor.run {
+                m.remoteCtrlSession = nil
+            }
             if case .connected = sess.sessionState {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     switchToLocalSession()

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

@@ -16,14 +16,9 @@ struct SimpleXApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject private var chatModel = ChatModel.shared
     @ObservedObject var alertManager = AlertManager.shared
+
     @Environment(\.scenePhase) var scenePhase
-    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
-    @State private var userAuthorized: Bool?
-    @State private var doAuthenticate = false
-    @State private var enteredBackground: TimeInterval? = nil
-    @State private var canConnectCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-    @State private var showInitializationView = false
+    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
 
     init() {
         DispatchQueue.global(qos: .background).sync {
@@ -39,22 +34,17 @@ struct SimpleXApp: App {
     }
 
     var body: some Scene {
-        return WindowGroup {
-            ContentView(
-                doAuthenticate: $doAuthenticate,
-                userAuthorized: $userAuthorized,
-                canConnectCall: $canConnectCall,
-                lastSuccessfulUnlock: $lastSuccessfulUnlock,
-                showInitializationView: $showInitializationView
-            )
+        WindowGroup {
+            // contentAccessAuthenticationExtended has to be passed to ContentView on view initialization,
+            // so that it's computed by the time view renders, and not on event after rendering
+            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
                 }
                 .onAppear() {
-                    showInitializationView = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
                         initChatAndMigrate()
                     }
                 }
@@ -62,30 +52,35 @@ struct SimpleXApp: App {
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                     switch (phase) {
                     case .background:
+                        // --- authentication
+                        // see ContentView .onChange(of: scenePhase) for remaining authentication logic
+                        if chatModel.contentViewAccessAuthenticated {
+                            enteredBackgroundAuthenticated = ProcessInfo.processInfo.systemUptime
+                        }
+                        chatModel.contentViewAccessAuthenticated = false
+                        // authentication ---
+
                         if CallController.useCallKit() && chatModel.activeCall != nil {
                             CallController.shared.shouldSuspendChat = true
                         } else {
                             suspendChat()
                             BGManager.shared.schedule()
                         }
-                        if userAuthorized == true {
-                            enteredBackground = ProcessInfo.processInfo.systemUptime
-                        }
-                        doAuthenticate = false
-                        canConnectCall = false
                         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()
                     default:
                         break
                     }
@@ -118,22 +113,14 @@ struct SimpleXApp: App {
     }
 
     private func authenticationExpired() -> Bool {
-        if let enteredBackground = enteredBackground {
+        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
             let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
         } else {
             return true
         }
     }
 
-    private func unlockedRecently() -> Bool {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
-        } else {
-            return false
-        }
-    }
-
     private func updateChats() {
         do {
             let chats = try apiGetChats()

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/Call/WebRTCClient.swift

@@ -18,6 +18,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }()
     private static let ivTagBytes: Int = 28
     private static let enableEncryption: Bool = true
+    private var chat_ctrl = getChatCtrl()
 
     struct Call {
         var connection: RTCPeerConnection
@@ -308,7 +309,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
             let isKeyFrame = unencrypted[0] & 1 == 0
             let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
-            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
             return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
         } else {
             return nil

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -723,9 +723,14 @@ struct ChatView: View {
                 if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
                     menu.append(replyUIAction(ci))
                 }
-                menu.append(shareUIAction(ci))
-                menu.append(copyUIAction(ci))
-                if let fileSource = getLoadedFileSource(ci.file) {
+                let fileSource = getLoadedFileSource(ci.file)
+                let fileExists = if let fs = fileSource, FileManager.default.fileExists(atPath: getAppFilePath(fs.filePath).path) { true } else { false }
+                let copyAndShareAllowed = !ci.content.text.isEmpty || (ci.content.msgContent?.isImage == true && fileExists)
+                if copyAndShareAllowed {
+                    menu.append(shareUIAction(ci))
+                    menu.append(copyUIAction(ci))
+                }
+                if let fileSource = fileSource, fileExists {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
                             menu.append(saveFileAction(fileSource))

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

@@ -104,7 +104,7 @@ struct ComposeState {
 
     var sendEnabled: Bool {
         switch preview {
-        case .mediaPreviews: return true
+        case let .mediaPreviews(media): return !media.isEmpty
         case .voicePreview: return voiceMessageRecordingState == .finished
         case .filePreview: return true
         default: return !message.isEmpty || liveMessage != nil
@@ -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, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
+                await MainActor.run {
+                    showMediaPicker = false
+                    if itemsSelected {
                         composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                     }
                 }
@@ -488,6 +488,30 @@ 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))
+            }
+        }
+    }
+
+    // When error occurs while converting video, remove media preview
+    private func finishedPreprocessingMediaContent() {
+        if case let .mediaPreviews(media) = composeState.preview, media.isEmpty {
+            DispatchQueue.main.async {
+                composeState = composeState.copy(preview: .noPreview)
+            }
+        }
+    }
+
     private var maxFileSize: Int64 {
         getMaxFileSize(.xftp)
     }

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

@@ -16,7 +16,6 @@ struct GroupChatInfoView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @Binding var groupInfo: GroupInfo
-    @ObservedObject private var alertManager = AlertManager.shared
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
     @State private var groupLinkMemberRole: GroupMemberRole = .member

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

@@ -188,17 +188,19 @@ struct GroupMemberInfoView: View {
                         // this condition prevents re-setting picker
                         if !justOpened { return }
                     }
-                    newRole = member.memberRole
-                    do {
-                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                        _ = chatModel.upsertGroupMember(groupInfo, mem)
-                        connectionStats = stats
-                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
-                    }
                     justOpened = false
+                    DispatchQueue.main.async {
+                        newRole = member.memberRole
+                        do {
+                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                            _ = chatModel.upsertGroupMember(groupInfo, mem)
+                            connectionStats = stats
+                            connectionCode = code
+                        } catch let error {
+                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        }
+                    }
                 }
                 .onChange(of: newRole) { newRole in
                     if newRole != member.memberRole {

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/Chat/ScanCodeView.swift

@@ -17,7 +17,7 @@ struct ScanCodeView: View {
 
     var body: some View {
         VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
             Text("Scan security code from your contact's app.")

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,130 @@ 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 finishedPreprocessing: () -> 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.finishedPreprocessing()
             }
+        }
 
-            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 + "/" + "rawvideo", url.pathExtension, fullPath: true))
+                        let convertedVideoUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", "mp4", fullPath: true))
+                        do {
+//                          logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
+                            try FileManager.default.copyItem(at: url, to: tempUrl)
+                        } catch let err {
+                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
+                            return cont.resume(returning: nil)
+                        }
+                        Task {
+                            let success = await makeVideoQualityLower(tempUrl, outputUrl: convertedVideoUrl)
+                            try? FileManager.default.removeItem(at: tempUrl)
+                            if success {
+                                _ = ChatModel.shared.filesToDelete.insert(convertedVideoUrl)
+                                let video = UploadContent.loadVideoFromURL(url: convertedVideoUrl)
+                                return cont.resume(returning: video)
                             }
+                            try? FileManager.default.removeItem(at: convertedVideoUrl)
+                            cont.resume(returning: nil)
                         }
                     }
-                } 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)
-                        }
-                    }
+                }
+            }
+        }
+
+        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/Helpers/VideoUtils.swift

@@ -0,0 +1,26 @@
+//
+//  VideoUtils.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 25.12.2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import AVFoundation
+import Foundation
+import SimpleXChat
+
+func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
+    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
+    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
+        s.outputURL = outputUrl
+        s.outputFileType = .mp4
+        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
+        await s.export()
+        if let err = s.error {
+            logger.error("Failed to export video with error: \(err)")
+        }
+        return s.status == .completed
+    }
+    return false
+}

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/NewChat/CreateLinkView.swift

@@ -73,6 +73,7 @@ struct CreateLinkView: View {
         Task {
             if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
                 await MainActor.run {
+                    m.updateContactConnection(pcc)
                     connReqInvitation = connReq
                     contactConnection = pcc
                     m.connReqInv = connReq

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

@@ -52,6 +52,9 @@ struct NewChatButton: View {
     func addContactAction() {
         Task {
             if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
+                    ChatModel.shared.updateContactConnection(pcc)
+                }
                 actionSheet = .createLink(link: connReq, connection: pcc)
             }
         }
@@ -346,7 +349,10 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn
 
 private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
     Task {
-        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
+        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
+            await MainActor.run {
+                ChatModel.shared.updateContactConnection(pcc)
+            }
             let crt: ConnReqType
             if let plan = connectionPlan {
                 crt = planToConnReqType(plan)

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

@@ -11,20 +11,12 @@ import CoreImage.CIFilterBuiltins
 
 struct MutableQRCode: View {
     @Binding var uri: String
-    @State private var image: UIImage?
+    var withLogo: Bool = true
+    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
 
     var body: some View {
-        ZStack {
-            if let image = image {
-                qrCodeImage(image)
-            }
-        }
-        .onAppear {
-            image = generateImage(uri)
-        }
-        .onChange(of: uri) { _ in
-            image = generateImage(uri)
-        }
+        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
+            .id("simplex-qrcode-view-for-\(uri)")
     }
 }
 
@@ -49,7 +41,7 @@ struct QRCode: View {
     var withLogo: Bool = true
     var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
     @State private var image: UIImage? = nil
-    @State private var makeScreenshotBinding: () -> Void = {}
+    @State private var makeScreenshotFunc: () -> Void = {}
 
     var body: some View {
         ZStack {
@@ -70,18 +62,19 @@ struct QRCode: View {
                     }
                 }
                 .onAppear {
-                    makeScreenshotBinding = {
+                    makeScreenshotFunc = {
                         let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                    }
                 }
                 .frame(width: geo.size.width, height: geo.size.height)
             }
         }
-        .onTapGesture(perform: makeScreenshotBinding)
+        .onTapGesture(perform: makeScreenshotFunc)
         .onAppear {
-            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
+            image = image ?? generateImage(uri, tintColor: tintColor)
         }
-
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
 
@@ -93,13 +86,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String) -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)
     if let outputImage = filter.outputImage,
        let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage)
+        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
     }
     return nil
 }

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

@@ -25,7 +25,7 @@ struct ScanToConnectView: View {
                     .fixedSize(horizontal: false, vertical: true)
                     .padding(.vertical)
 
-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
                     .aspectRatio(1, contentMode: .fit)
                     .cornerRadius(12)
 

apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift

@@ -81,11 +81,6 @@ struct CreateSimpleXAddress: View {
                         DispatchQueue.main.async {
                             m.userAddress = UserContactLink(connReqContact: connReqContact)
                         }
-                        if let u = try await apiSetProfileAddress(on: true) {
-                            DispatchQueue.main.async {
-                                m.updateUser(u)
-                            }
-                        }
                         await MainActor.run { progressIndicator = false }
                     } catch let error {
                         logger.error("CreateSimpleXAddress create address: \(responseError(error))")
@@ -100,7 +95,7 @@ struct CreateSimpleXAddress: View {
             } label: {
                 Text("Create SimpleX address").font(.title)
             }
-            Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.")
+            Text("You can make it visible to your SimpleX contacts via Settings.")
                 .multilineTextAlignment(.center)
                 .font(.footnote)
                 .padding(.horizontal, 32)

apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift

@@ -332,7 +332,7 @@ struct ConnectDesktopView: View {
 
     private func scanDesctopAddressView() -> some View {
         Section("Scan QR code from desktop") {
-            CodeScannerView(codeTypes: [.qr], completion: processDesktopQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processDesktopQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
                 .listRowBackground(Color.clear)

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/PrivacySettings.swift

@@ -467,6 +467,7 @@ struct SimplexLockView: View {
             switch a {
             case .enableAuth:
                 SetAppPasscodeView {
+                    m.contentViewAccessAuthenticated = true
                     laLockDelay = 30
                     prefPerformLA = true
                     showChangePassword = true
@@ -619,6 +620,7 @@ struct SimplexLockView: View {
         authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
             switch laResult {
             case .success:
+                m.contentViewAccessAuthenticated = true
                 prefPerformLA = true
                 laAlert = .laTurnedOnAlert
             case .failed:

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

@@ -21,7 +21,7 @@ struct ScanProtocolServer: View {
                 .font(.largeTitle)
                 .bold()
                 .padding(.vertical)
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
                 .padding(.top)

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

@@ -190,7 +190,8 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
+            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
             shareQRCodeButton(userAddress)
             if MFMailComposeViewController.canSendMail() {
                 shareViaEmailButton(userAddress)

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,231 @@ import SimpleXChat
 
 let logger = Logger()
 
-let suspendingDelay: UInt64 = 2_000_000_000
+let appSuspendingDelay: UInt64 = 2_500_000_000
 
-typealias NtfStream = AsyncStream<NSENotification>
+let nseSuspendDelay: TimeInterval = 2
 
+let nseSuspendTimeout: Int = 5
+
+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
+        }
+    }
+
+    var noThreads: Bool {
+        allThreads.isEmpty
+    }
+}
+
+// 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 +246,6 @@ class NotificationService: UNNotificationServiceExtension {
                 }
             }
         default:
-            logger.debug("NotificationService: app state is \(appState.rawValue, privacy: .public)")
             deliverBestAttemptNtf()
         }
     }
@@ -121,27 +260,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.ntfMessages.count), 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 +306,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 +321,41 @@ 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) {
+                logger.debug("NotificationService.deliverBestAttemptNtf: will suspend")
+                // suspension is delayed to allow chat core finalise any processing
+                // (e.g., send delivery receipts)
+                DispatchQueue.global().asyncAfter(deadline: .now() + nseSuspendDelay) {
+                    if NSEThreads.shared.noThreads {
+                        logger.debug("NotificationService.deliverBestAttemptNtf: suspending...")
+                        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 +363,201 @@ 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())
+    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation(), backgroundMode: true)
     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: suspendChat: after apiSuspendChat")
+            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()
+        logger.debug("NotificationService chatSuspended: suspended")
+    }
+}
+
+// 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 +571,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 +588,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 +606,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 +653,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 +698,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 +739,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

@@ -43,6 +43,11 @@
 		5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; };
 		5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */; };
 		5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B3B09285FB130003915F2 /* DatabaseView.swift */; };
+		5C4E80DA2B3CCD090080FAE2 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4E80D52B3CCD090080FAE2 /* libgmp.a */; };
+		5C4E80DB2B3CCD090080FAE2 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4E80D62B3CCD090080FAE2 /* libffi.a */; };
+		5C4E80DC2B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4E80D72B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a */; };
+		5C4E80DD2B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4E80D82B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a */; };
+		5C4E80DE2B3CCD090080FAE2 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4E80D92B3CCD090080FAE2 /* libgmpxx.a */; };
 		5C5346A827B59A6A004DF848 /* ChatHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5346A727B59A6A004DF848 /* ChatHelp.swift */; };
 		5C55A91F283AD0E400C4E99E /* CallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A91E283AD0E400C4E99E /* CallManager.swift */; };
 		5C55A921283CCCB700C4E99E /* IncomingCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A920283CCCB700C4E99E /* IncomingCallView.swift */; };
@@ -120,11 +125,6 @@
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
 		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 */; };
-		5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9B2B120ADF00C510B1 /* libgmp.a */; };
-		5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */; };
-		5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */; };
-		5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */; };
-		5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9F2B120ADF00C510B1 /* libffi.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -150,6 +150,9 @@
 		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 */; };
@@ -165,6 +168,11 @@
 		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 */; };
+		6449333A2AF8E51000AC506E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933352AF8E51000AC506E /* libgmpxx.a */; };
+		6449333B2AF8E51000AC506E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933362AF8E51000AC506E /* libgmp.a */; };
+		6449333C2AF8E51000AC506E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933372AF8E51000AC506E /* libffi.a */; };
+		6449333D2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */; };
+		6449333E2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.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 */; };
@@ -185,6 +193,7 @@
 		64D0C2C629FAC1EC00B38D5F /* AddContactLearnMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */; };
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
+		8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C05382D2B39887E006436DC /* VideoUtils.swift */; };
 		D7197A1829AE89660055C05A /* WebRTC in Frameworks */ = {isa = PBXBuildFile; productRef = D7197A1729AE89660055C05A /* WebRTC */; };
 		D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A9087294BD7A70047C86D /* NativeTextEditor.swift */; };
 		D741547829AF89AF0022400A /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547729AF89AF0022400A /* StoreKit.framework */; };
@@ -290,6 +299,11 @@
 		5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacySettings.swift; sourceTree = "<group>"; };
 		5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = "<group>"; };
 		5C4B3B09285FB130003915F2 /* DatabaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseView.swift; sourceTree = "<group>"; };
+		5C4E80D52B3CCD090080FAE2 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C4E80D62B3CCD090080FAE2 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C4E80D72B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a"; sourceTree = "<group>"; };
+		5C4E80D82B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5C4E80D92B3CCD090080FAE2 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 		5C5346A727B59A6A004DF848 /* ChatHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHelp.swift; sourceTree = "<group>"; };
 		5C55A91E283AD0E400C4E99E /* CallManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallManager.swift; sourceTree = "<group>"; };
 		5C55A920283CCCB700C4E99E /* IncomingCallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingCallView.swift; sourceTree = "<group>"; };
@@ -403,11 +417,6 @@
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; 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>"; };
-		5CD67B9B2B120ADF00C510B1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a"; sourceTree = "<group>"; };
-		5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5CD67B9F2B120ADF00C510B1 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -434,6 +443,9 @@
 		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; };
@@ -448,6 +460,11 @@
 		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>"; };
+		644933352AF8E51000AC506E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		644933362AF8E51000AC506E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		644933372AF8E51000AC506E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a"; sourceTree = "<group>"; };
+		644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.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>"; };
@@ -470,6 +487,7 @@
 		64DAE1502809D9F5000DA960 /* FileUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; };
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
+		8C05382D2B39887E006436DC /* VideoUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoUtils.swift; sourceTree = "<group>"; };
 		D72A9087294BD7A70047C86D /* NativeTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeTextEditor.swift; sourceTree = "<group>"; };
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -511,13 +529,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */,
-				5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */,
+				5C4E80DD2B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */,
-				5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */,
-				5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */,
+				5C4E80DA2B3CCD090080FAE2 /* libgmp.a in Frameworks */,
+				5C4E80DC2B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
+				5C4E80DB2B3CCD090080FAE2 /* libffi.a in Frameworks */,
+				5C4E80DE2B3CCD090080FAE2 /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -579,11 +597,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CD67B9F2B120ADF00C510B1 /* libffi.a */,
-				5CD67B9B2B120ADF00C510B1 /* libgmp.a */,
-				5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */,
-				5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */,
-				5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */,
+				5C4E80D62B3CCD090080FAE2 /* libffi.a */,
+				5C4E80D52B3CCD090080FAE2 /* libgmp.a */,
+				5C4E80D92B3CCD090080FAE2 /* libgmpxx.a */,
+				5C4E80D82B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5-ghc9.6.3.a */,
+				5C4E80D72B3CCD090080FAE2 /* libHSsimplex-chat-5.4.2.1-FP1oxJSttEYhorN1FRfI5.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -608,6 +626,7 @@
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
 				5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */,
 				5CB346E42868AA7F001FD2EF /* SuspendChat.swift */,
+				5CF937212B25034A00E1D781 /* NSESubscriber.swift */,
 				5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */,
 				5C93293E2928E0FD0090FFF9 /* AudioRecPlay.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
@@ -635,6 +654,7 @@
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
 				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
+				8C05382D2B39887E006436DC /* VideoUtils.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -788,6 +808,7 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
+				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -808,6 +829,7 @@
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
 				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
+				5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
 				5CE2BA78284530CC00EC33A6 /* SimpleXChat.docc */,
@@ -1180,6 +1202,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 */,
@@ -1202,6 +1225,7 @@
 				5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */,
 				5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */,
 				649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */,
+				8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */,
 				5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */,
 				5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */,
 				5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */,
@@ -1259,6 +1283,7 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
+				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1266,6 +1291,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 */,
@@ -1502,7 +1528,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 186;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1524,7 +1550,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1545,7 +1571,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 186;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1567,7 +1593,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1626,7 +1652,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 = 186;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1639,7 +1665,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1658,7 +1684,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 = 186;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1671,7 +1697,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1690,7 +1716,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 186;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1714,7 +1740,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1736,7 +1762,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 184;
+				CURRENT_PROJECT_VERSION = 186;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1760,7 +1786,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -17,7 +17,7 @@ public func getChatCtrl(_ useKey: String? = nil) -> chat_ctrl {
     fatalError("chat controller not initialized")
 }
 
-public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil) -> (Bool, DBMigrationResult) {
+public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil, backgroundMode: Bool = false) -> (Bool, DBMigrationResult) {
     if let res = migrationResult { return res }
     let dbPath = getAppDatabasePath().path
     var dbKey = ""
@@ -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, backgroundMode ? 1 : 0, &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)"
@@ -505,8 +505,8 @@ public enum ChatResponse: Decodable, Error {
     case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
     case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
     case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
-    case sentConfirmation(user: UserRef)
-    case sentInvitation(user: UserRef)
+    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
+    case sentInvitation(user: UserRef, connection: PendingContactConnection)
     case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
     case contactAlreadyExists(user: UserRef, contact: Contact)
     case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
@@ -604,8 +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 newContactConnection(user: UserRef, connection: PendingContactConnection)
+    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])
@@ -752,7 +752,7 @@ public enum ChatResponse: Decodable, Error {
             case .ntfTokenStatus: return "ntfTokenStatus"
             case .ntfToken: return "ntfToken"
             case .ntfMessages: return "ntfMessages"
-            case .newContactConnection: return "newContactConnection"
+            case .ntfMessage: return "ntfMessage"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
             case .remoteCtrlList: return "remoteCtrlList"
             case .remoteCtrlFound: return "remoteCtrlFound"
@@ -803,11 +803,11 @@ public enum ChatResponse: Decodable, Error {
             case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
             case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
             case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
+            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
             case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
             case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case .sentConfirmation: return noDetails
-            case .sentInvitation: return noDetails
+            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
+            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
             case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
             case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
             case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
@@ -900,7 +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 .newContactConnection(u, connection): return withUser(u, String(describing: connection))
+            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)"
@@ -1207,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,
@@ -1498,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"
@@ -1505,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,16 @@
 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"
+public let GROUP_DEFAULT_CHAT_LAST_BACKGROUND_RUN = "chatLastBackgroundRun"
 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 +70,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 +98,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,
@@ -109,6 +157,8 @@ public let dbContainerGroupDefault = EnumDefault<DBContainer>(
 
 public let chatLastStartGroupDefault = DateDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CHAT_LAST_START)
 
+public let chatLastBackgroundRunGroupDefault = DateDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CHAT_LAST_BACKGROUND_RUN)
+
 public let ntfPreviewModeGroupDefault = EnumDefault<NotificationPreviewMode>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_NTF_PREVIEW_MODE,
@@ -117,10 +167,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/CryptoFile.swift

@@ -17,7 +17,7 @@ public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
     let ptr: UnsafeMutableRawPointer = malloc(data.count)
     memcpy(ptr, (data as NSData).bytes, data.count)
     var cPath = path.cString(using: .utf8)!
-    let cjson = chat_write_file(&cPath, ptr, Int32(data.count))!
+    let cjson = chat_write_file(getChatCtrl(), &cPath, ptr, Int32(data.count))!
     let d = fromCString(cjson).data(using: .utf8)!
     switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
     case let .result(cfArgs): return cfArgs
@@ -50,7 +50,7 @@ public func readCryptoFile(path: String, cryptoArgs: CryptoFileArgs) throws -> D
 public func encryptCryptoFile(fromPath: String, toPath: String) throws -> CryptoFileArgs {
     var cFromPath = fromPath.cString(using: .utf8)!
     var cToPath = toPath.cString(using: .utf8)!
-    let cjson = chat_encrypt_file(&cFromPath, &cToPath)!
+    let cjson = chat_encrypt_file(getChatCtrl(), &cFromPath, &cToPath)!
     let d = fromCString(cjson).data(using: .utf8)!
     switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
     case let .result(cfArgs): return cfArgs

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,20 +16,20 @@ 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, int backgroundMode, 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);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_valid_name(char *name);
-extern char *chat_encrypt_media(char *key, char *frame, int len);
+extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
 
 // chat_write_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_write_file(char *path, char *data, int len);
+extern char *chat_write_file(chat_ctrl ctl, char *path, char *data, int len);
 
 // chat_read_file returns a buffer with:
 // result status (1 byte), then if
@@ -38,7 +38,7 @@ extern char *chat_write_file(char *path, char *data, int len);
 extern char *chat_read_file(char *path, char *key, char *nonce);
 
 // chat_encrypt_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_encrypt_file(char *fromPath, char *toPath);
+extern char *chat_encrypt_file(chat_ctrl ctl, char *fromPath, char *toPath);
 
 // chat_decrypt_file returns null-terminated string with the error message
 extern char *chat_decrypt_file(char *fromPath, char *key, char *nonce, char *toPath);

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/android/src/main/AndroidManifest.xml

@@ -39,6 +39,7 @@
         android:exported="true"
         android:label="${app_name}"
         android:windowSoftInputMode="adjustResize"
+        android:configChanges="uiMode"
         android:theme="@style/Theme.SimpleX">
       <intent-filter>
         <category android:name="android.intent.category.LAUNCHER" />

apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt

@@ -5,6 +5,7 @@ import android.net.Uri
 import android.os.*
 import android.view.WindowManager
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.getUserIdFromIntent
@@ -22,6 +23,7 @@ import java.lang.ref.WeakReference
 class MainActivity: FragmentActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    platform.androidSetNightModeIfSupported()
     applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
     super.onCreate(savedInstanceState)
     // testJson()
@@ -41,9 +43,7 @@ class MainActivity: FragmentActivity() {
       )
     }
     setContent {
-      SimpleXTheme {
-        AppScreen()
-      }
+      AppScreen()
     }
     SimplexApp.context.schedulePeriodicServiceRestartWorker()
     SimplexApp.context.schedulePeriodicWakeUp()
@@ -126,7 +126,9 @@ fun processIntent(intent: Intent?) {
   when (intent?.action) {
     "android.intent.action.VIEW" -> {
       val uri = intent.data
-      if (uri != null) connectIfOpenedViaUri(chatModel.remoteHostId(), uri.toURI(), ChatModel)
+      if (uri != null) {
+        chatModel.appOpenUrl.value = null to uri.toURI()
+      }
     }
   }
 }

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -1,7 +1,8 @@
 package chat.simplex.app
 
 import android.app.Application
-import chat.simplex.common.platform.Log
+import android.app.UiModeManager
+import android.os.*
 import androidx.lifecycle.*
 import androidx.work.*
 import chat.simplex.app.model.NtfManager
@@ -10,10 +11,12 @@ import chat.simplex.common.helpers.requiresIgnoringBattery
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.updatingChatsMutex
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.CurrentColors
+import chat.simplex.common.ui.theme.DefaultTheme
+import chat.simplex.common.views.call.RcvCallInvitation
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.RcvCallInvitation
 import com.jakewharton.processphoenix.ProcessPhoenix
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.withLock
@@ -32,7 +35,24 @@ class SimplexApp: Application(), LifecycleEventObserver {
   override fun onCreate() {
     super.onCreate()
     if (ProcessPhoenix.isPhoenixProcess(this)) {
-      return;
+      return
+    } else {
+      registerGlobalErrorHandler()
+      Handler(Looper.getMainLooper()).post {
+        while (true) {
+          try {
+            Looper.loop()
+          } catch (e: Throwable) {
+            if (e.message != null && e.message!!.startsWith("Unable to start activity")) {
+              android.os.Process.killProcess(android.os.Process.myPid())
+              break
+            } else {
+              // Send it to our exception handled because it will not get the exception otherwise
+              Thread.getDefaultUncaughtExceptionHandler()?.uncaughtException(Looper.getMainLooper().thread, e)
+            }
+          }
+        }
+      }
     }
     context = this
     initHaskell()
@@ -75,7 +95,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
         }
         Lifecycle.Event.ON_RESUME -> {
           isAppOnForeground = true
-          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete && chatModel.currentUser.value != null) {
             SimplexService.showBackgroundServiceNoticeIfNeeded()
           }
           /**
@@ -206,6 +226,23 @@ class SimplexApp: Application(), LifecycleEventObserver {
 
       override fun androidIsBackgroundCallAllowed(): Boolean = !SimplexService.isBackgroundRestricted()
 
+      override fun androidSetNightModeIfSupported() {
+        if (Build.VERSION.SDK_INT < 31) return
+
+        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM.name) {
+          null
+        } else {
+          CurrentColors.value.colors.isLight
+        }
+        val mode = when (light) {
+          null -> UiModeManager.MODE_NIGHT_AUTO
+          true -> UiModeManager.MODE_NIGHT_NO
+          false -> UiModeManager.MODE_NIGHT_YES
+        }
+        val uiModeManager = androidAppContext.getSystemService(UI_MODE_SERVICE) as UiModeManager
+        uiModeManager.setApplicationNightMode(mode)
+      }
+
       override suspend fun androidAskToAllowBackgroundCalls(): Boolean {
         if (SimplexService.isBackgroundRestricted()) {
           val userChoice: CompletableDeferred<Boolean> = CompletableDeferred()

apps/multiplatform/android/src/main/res/values-night/themes.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="Theme.SimpleX" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <item name="android:statusBarColor">@color/black</item>
+    <item name="android:windowBackground">@color/window_background_dark</item>
+  </style>
+</resources>

apps/multiplatform/android/src/main/res/values/themes.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="Theme.SimpleX" parent="android:Theme.Material.Light.NoActionBar">
+  <style name="Theme.SimpleX" parent="Theme.AppCompat.DayNight.NoActionBar">
     <item name="android:statusBarColor">@color/black</item>
   </style>
 </resources>

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 {
@@ -155,6 +155,34 @@ afterEvaluate {
       val endTagRegex = Regex("</")
       val anyHtmlRegex = Regex("[^>]*>.*(<|>).*</string>|[^>]*>.*(&lt;|&gt;).*</string>")
       val correctHtmlRegex = Regex("[^>]*>.*<b>.*</b>.*</string>|[^>]*>.*<i>.*</i>.*</string>|[^>]*>.*<u>.*</u>.*</string>|[^>]*>.*<font[^>]*>.*</font>.*</string>")
+      val possibleFormat = listOf("s", "d", "1\$s", "1\$d", "2s", "f")
+
+      fun String.id(): String = replace("<string name=\"", "").trim().substringBefore("\"")
+
+      fun String.formatting(filepath: String): List<String> {
+        if (!contains("%")) return emptyList()
+        val value = substringAfter("\">").substringBeforeLast("</string>")
+
+        val formats = ArrayList<String>()
+        var substring = value.substringAfter("%")
+        while (true) {
+          var foundFormat = false
+          for (format in possibleFormat) {
+            if (substring.startsWith(format)) {
+              formats.add(format)
+              foundFormat = true
+              break
+            }
+          }
+          if (!foundFormat) {
+            throw Exception("Unknown formatting in string. Add it to 'possibleFormat' in common/build.gradle.kts if needed: $this \nin $filepath")
+          }
+          val was = substring
+          substring = substring.substringAfter("%")
+          if (was.length == substring.length) break
+        }
+        return formats
+      }
 
       fun String.removeCDATA(): String =
         if (contains("<![CDATA")) {
@@ -195,20 +223,44 @@ afterEvaluate {
         return this
       }
       val fileRegex = Regex("MR/../strings.xml$|MR/..-.../strings.xml$|MR/..-../strings.xml$|MR/base/strings.xml$")
-      kotlin.sourceSets["commonMain"].resources.filter { fileRegex.containsMatchIn(it.absolutePath) }.asFileTree.forEach { file ->
+      val tree = kotlin.sourceSets["commonMain"].resources.filter { fileRegex.containsMatchIn(it.absolutePath.replace("\\", "/")) }.asFileTree
+      val baseStringsFile = tree.firstOrNull { it.absolutePath.replace("\\", "/").endsWith("base/strings.xml") } ?: throw Exception("No base/strings.xml found")
+      val treeList = ArrayList(tree.toList())
+      treeList.remove(baseStringsFile)
+      treeList.add(0, baseStringsFile)
+      val baseFormatting = mutableMapOf<String, List<String>>()
+      treeList.forEachIndexed { index, file ->
+        val isBase = index == 0
         val initialLines = ArrayList<String>()
         val finalLines = ArrayList<String>()
+        val errors = ArrayList<String>()
+
         file.useLines { lines ->
           val multiline = ArrayList<String>()
           lines.forEach { line ->
             initialLines.add(line)
             if (stringRegex.matches(line)) {
-              finalLines.add(line.removeCDATA().addCDATA(file.absolutePath))
+              val fixedLine = line.removeCDATA().addCDATA(file.absolutePath)
+              val lineId = fixedLine.id()
+              if (isBase) {
+                baseFormatting[lineId] = fixedLine.formatting(file.absolutePath)
+              } else if (baseFormatting[lineId] != fixedLine.formatting(file.absolutePath)) {
+                errors.add("Incorrect formatting in string: $fixedLine \nin ${file.absolutePath}")
+              }
+              finalLines.add(fixedLine)
             } else if (multiline.isEmpty() && startStringRegex.containsMatchIn(line)) {
               multiline.add(line)
             } else if (multiline.isNotEmpty() && endStringRegex.containsMatchIn(line)) {
               multiline.add(line)
-              finalLines.addAll(multiline.joinToString("\n").removeCDATA().addCDATA(file.absolutePath).split("\n"))
+              val fixedLines = multiline.joinToString("\n").removeCDATA().addCDATA(file.absolutePath).split("\n")
+              val fixedLinesJoined = fixedLines.joinToString("")
+              val lineId = fixedLinesJoined.id()
+              if (isBase) {
+                baseFormatting[lineId] = fixedLinesJoined.formatting(file.absolutePath)
+              } else if (baseFormatting[lineId] != fixedLinesJoined.formatting(file.absolutePath)) {
+                errors.add("Incorrect formatting in string: $fixedLinesJoined \nin ${file.absolutePath}")
+              }
+              finalLines.addAll(fixedLines)
               multiline.clear()
             } else if (multiline.isNotEmpty()) {
               multiline.add(line)
@@ -217,10 +269,14 @@ afterEvaluate {
             }
           }
           if (multiline.isNotEmpty()) {
-            throw Exception("Unclosed string tag: ${multiline.joinToString("\n")} \nin ${file.absolutePath}")
+            errors.add("Unclosed string tag: ${multiline.joinToString("\n")} \nin ${file.absolutePath}")
           }
         }
 
+        if (errors.isNotEmpty()) {
+          throw Exception("Found errors: \n\n${errors.joinToString("\n\n")}")
+        }
+
         if (!debug && finalLines != initialLines) {
           file.writer().use {
             finalLines.forEachIndexed { index, line ->

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/PlatformTextField.android.kt

@@ -27,7 +27,6 @@ import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
 import androidx.core.widget.doAfterTextChanged
 import androidx.core.widget.doOnTextChanged
-import chat.simplex.common.*
 import chat.simplex.common.R
 import chat.simplex.common.helpers.toURI
 import chat.simplex.common.model.ChatModel
@@ -45,6 +44,7 @@ import java.net.URI
 actual fun PlatformTextField(
   composeState: MutableState<ComposeState>,
   sendMsgEnabled: Boolean,
+  sendMsgButtonDisabled: Boolean,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
   userIsObserver: Boolean,

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt

@@ -4,14 +4,17 @@ import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Rect
-import android.os.Build
+import android.os.*
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.activity.compose.setContent
 import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalView
-import chat.simplex.common.views.helpers.KeyboardState
+import chat.simplex.common.AppScreen
+import chat.simplex.common.views.helpers.*
 import androidx.compose.ui.platform.LocalContext as LocalContext1
+import chat.simplex.res.MR
 
 actual fun showToast(text: String, timeout: Long) = Toast.makeText(androidAppContext, text, Toast.LENGTH_SHORT).show()
 
@@ -71,3 +74,44 @@ actual fun hideKeyboard(view: Any?) {
 }
 
 actual fun androidIsFinishingMainActivity(): Boolean = (mainActivity.get()?.isFinishing == true)
+
+actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
+  actual override fun uncaughtException(thread: Thread, e: Throwable) {
+    Log.e(TAG, "App crashed, thread name: " + thread.name + ", exception: " + e.stackTraceToString())
+    includeMoreFailedComposables()
+    if (ModalManager.start.hasModalsOpen()) {
+      ModalManager.start.closeModal()
+    } else if (chatModel.chatId.value != null) {
+      // Since no modals are open, the problem is probably in ChatView
+      chatModel.chatId.value = null
+      chatModel.chatItems.clear()
+    } else {
+      // ChatList, nothing to do. Maybe to show other view except ChatList
+    }
+    chatModel.activeCall.value?.let {
+      withBGApi {
+        chatModel.callManager.endCall(it)
+      }
+    }
+    if (thread.name == "main") {
+      mainActivity.get()?.recreate()
+    } else {
+      mainActivity.get()?.apply {
+        window
+          ?.decorView
+          ?.findViewById<ViewGroup>(android.R.id.content)
+          ?.removeViewAt(0)
+        setContent {
+          AppScreen()
+        }
+      }
+    }
+    // Wait until activity recreates to prevent showing two alerts (in case `main` was crashed)
+    Handler(Looper.getMainLooper()).post {
+      AlertManager.shared.showAlertMsg(
+        title = generalGetString(MR.strings.app_was_crashed),
+        text = e.stackTraceToString()
+      )
+    }
+  }
+}

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.android.kt

@@ -0,0 +1,15 @@
+package chat.simplex.common.views.onboarding
+
+import androidx.compose.runtime.Composable
+import chat.simplex.common.model.SharedPreference
+import chat.simplex.common.model.User
+import chat.simplex.res.MR
+
+@Composable
+actual fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)?) {
+  if (user == null) {
+    OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, onclick = onclick)
+  } else {
+    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick = onclick)
+  }
+}

apps/multiplatform/common/src/commonMain/cpp/android/simplex-api.c

@@ -65,9 +65,9 @@ extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
-extern char *chat_write_file(const char *path, char *ptr, int length);
+extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
-extern char *chat_encrypt_file(const char *from_path, const char *to_path);
+extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
 
 JNIEXPORT jobjectArray JNICALL
@@ -157,11 +157,11 @@ Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jstring path, jobject buffer) {
+Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jlong controller, jstring path, jobject buffer) {
     const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
     jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
     jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = (*env)->NewStringUTF(env, chat_write_file(_path, buff, capacity));
+    jstring res = (*env)->NewStringUTF(env, chat_write_file((void*)controller, _path, buff, capacity));
     (*env)->ReleaseStringUTFChars(env, path, _path);
     return res;
 }
@@ -206,10 +206,10 @@ Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz,
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, jstring from_path, jstring to_path) {
+Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, jlong controller, jstring from_path, jstring to_path) {
     const char *_from_path = (*env)->GetStringUTFChars(env, from_path, JNI_FALSE);
     const char *_to_path = (*env)->GetStringUTFChars(env, to_path, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_encrypt_file(_from_path, _to_path));
+    jstring res = (*env)->NewStringUTF(env, chat_encrypt_file((void*)controller, _from_path, _to_path));
     (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;

apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt

@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})
 
 	target_link_libraries(app-lib rts simplex)

apps/multiplatform/common/src/commonMain/cpp/desktop/simplex-api.c

@@ -38,9 +38,9 @@ extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
-extern char *chat_write_file(const char *path, char *ptr, int length);
+extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
-extern char *chat_encrypt_file(const char *from_path, const char *to_path);
+extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
 
 // As a reference: https://stackoverflow.com/a/60002045
@@ -167,11 +167,11 @@ Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jstring path, jobject buffer) {
+Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jlong controller, jstring path, jobject buffer) {
     const char *_path = encode_to_utf8_chars(env, path);
     jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
     jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = decode_to_utf8_string(env, chat_write_file(_path, buff, capacity));
+    jstring res = decode_to_utf8_string(env, chat_write_file((void*)controller, _path, buff, capacity));
     (*env)->ReleaseStringUTFChars(env, path, _path);
     return res;
 }
@@ -216,10 +216,10 @@ Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz,
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, jstring from_path, jstring to_path) {
+Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, jlong controller, jstring from_path, jstring to_path) {
     const char *_from_path = encode_to_utf8_chars(env, from_path);
     const char *_to_path = encode_to_utf8_chars(env, to_path);
-    jstring res = decode_to_utf8_string(env, chat_encrypt_file(_from_path, _to_path));
+    jstring res = decode_to_utf8_string(env, chat_encrypt_file((void*)controller, _from_path, _to_path));
     (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt

@@ -37,15 +37,16 @@ import kotlinx.coroutines.flow.*
 
 data class SettingsViewState(
   val userPickerState: MutableStateFlow<AnimatedViewState>,
-  val scaffoldState: ScaffoldState,
-  val switchingUsersAndHosts: MutableState<Boolean>
+  val scaffoldState: ScaffoldState
 )
 
 @Composable
 fun AppScreen() {
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Surface(color = MaterialTheme.colors.background) {
-      MainScreen()
+  SimpleXTheme {
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      Surface(color = MaterialTheme.colors.background) {
+        MainScreen()
+      }
     }
   }
 }
@@ -102,11 +103,8 @@ fun MainScreen() {
   }
 
   Box {
-    var onboarding by remember { mutableStateOf(chatModel.controller.appPrefs.onboardingStage.get()) }
-    LaunchedEffect(Unit) {
-      snapshotFlow { chatModel.controller.appPrefs.onboardingStage.state.value }.distinctUntilChanged().collect { onboarding = it }
-    }
-    val userCreated = chatModel.userCreated.value
+    val onboarding by remember { chatModel.controller.appPrefs.onboardingStage.state }
+    val localUserCreated = chatModel.localUserCreated.value
     var showInitializationView by remember { mutableStateOf(false) }
     when {
       chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
@@ -115,14 +113,18 @@ fun MainScreen() {
           DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
         }
       }
-      remember { chatModel.chatDbEncrypted }.value == null || userCreated == null -> SplashView()
-      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
+      remember { chatModel.chatDbEncrypted }.value == null || localUserCreated == null -> SplashView()
+      onboarding == OnboardingStage.OnboardingComplete -> {
         Box {
           showAdvertiseLAAlert = true
-          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
+          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(if (chatModel.desktopNoUserNoRemote()) AnimatedViewState.VISIBLE else AnimatedViewState.GONE)) }
+          KeyChangeEffect(chatModel.desktopNoUserNoRemote) {
+            if (chatModel.desktopNoUserNoRemote() && !ModalManager.start.hasModalsOpen()) {
+              userPickerState.value = AnimatedViewState.VISIBLE
+            }
+          }
           val scaffoldState = rememberScaffoldState()
-          val switchingUsersAndHosts = rememberSaveable { mutableStateOf(false) }
-          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState, switchingUsersAndHosts) }
+          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState) }
           if (appPlatform.isAndroid) {
             AndroidScreen(settingsState)
           } else {
@@ -137,12 +139,14 @@ fun MainScreen() {
         }
       }
       onboarding == OnboardingStage.Step2_CreateProfile -> CreateFirstProfile(chatModel) {}
+      onboarding == OnboardingStage.LinkAMobile -> LinkAMobile()
       onboarding == OnboardingStage.Step2_5_SetupDatabasePassphrase -> SetupDatabasePassphrase(chatModel)
       onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel, null)
       onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
     }
     if (appPlatform.isAndroid) {
       ModalManager.fullscreen.showInView()
+      SwitchingUsersView()
     }
 
     val unauthorized = remember { derivedStateOf { AppLock.userAuthorized.value != true } }
@@ -158,11 +162,26 @@ fun MainScreen() {
         AuthView()
       } else {
         SplashView()
+        ModalManager.fullscreen.showPasscodeInView()
+      }
+    } else {
+      if (chatModel.showCallView.value) {
+        ActiveCallView()
+      } else {
+        // It's needed for privacy settings toggle, so it can be shown even if the app is passcode unlocked
+        ModalManager.fullscreen.showPasscodeInView()
+      }
+      AlertManager.privacySensitive.showInView()
+      if (onboarding == OnboardingStage.OnboardingComplete) {
+        LaunchedEffect(chatModel.currentUser.value, chatModel.appOpenUrl.value) {
+          val (rhId, url) = chatModel.appOpenUrl.value ?: (null to null)
+          if (url != null) {
+            chatModel.appOpenUrl.value = null
+            connectIfOpenedViaUri(rhId, url, chatModel)
+          }
+        }
       }
-    } else if (chatModel.showCallView.value) {
-      ActiveCallView()
     }
-    ModalManager.fullscreen.showPasscodeInView()
     val invitation = chatModel.activeCallInvitation.value
     if (invitation != null) IncomingCallAlertView(invitation, chatModel)
     AlertManager.shared.showInView()
@@ -262,7 +281,7 @@ fun CenterPartOfScreen() {
             .background(MaterialTheme.colors.background),
           contentAlignment = Alignment.Center
         ) {
-          Text(stringResource(MR.strings.no_selected_chat))
+          Text(stringResource(if (chatModel.desktopNoUserNoRemote) MR.strings.no_connected_mobile else MR.strings.no_selected_chat))
         }
       } else {
         ModalManager.center.showInView()
@@ -286,6 +305,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
     }
     Box(Modifier.widthIn(max = DEFAULT_START_MODAL_WIDTH)) {
       ModalManager.start.showInView()
+      SwitchingUsersView()
     }
     Row(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH).clipToBounds()) {
       Box(Modifier.widthIn(min = DEFAULT_MIN_CENTER_MODAL_WIDTH).weight(1f)) {
@@ -298,7 +318,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
         EndPartOfScreen()
       }
     }
-    val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
+    val (userPickerState, scaffoldState ) = settingsState
     val scope = rememberCoroutineScope()
     if (scaffoldState.drawerState.isOpen) {
       Box(
@@ -312,9 +332,11 @@ fun DesktopScreen(settingsState: SettingsViewState) {
       )
     }
     VerticalDivider(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH))
-    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
-      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-      userPickerState.value = AnimatedViewState.GONE
+    tryOrShowError("UserPicker", error = {}) {
+      UserPicker(chatModel, userPickerState) {
+        scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
+        userPickerState.value = AnimatedViewState.GONE
+      }
     }
     ModalManager.fullscreen.showInView()
   }
@@ -335,3 +357,26 @@ fun InitializationView() {
     }
   }
 }
+
+@Composable
+private fun SwitchingUsersView() {
+  if (remember { chatModel.switchingUsersAndHosts }.value) {
+    Box(
+      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
+      contentAlignment = Alignment.Center
+    ) {
+      ProgressIndicator()
+    }
+  }
+}
+
+@Composable
+private fun ProgressIndicator() {
+  CircularProgressIndicator(
+    Modifier
+      .padding(horizontal = 2.dp)
+      .size(30.dp),
+    color = MaterialTheme.colors.secondary,
+    strokeWidth = 2.5.dp
+  )
+}

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

@@ -2,7 +2,6 @@ package chat.simplex.common.model
 
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -43,7 +42,7 @@ object ChatModel {
   val setDeliveryReceipts = mutableStateOf(false)
   val currentUser = mutableStateOf<User?>(null)
   val users = mutableStateListOf<UserInfo>()
-  val userCreated = mutableStateOf<Boolean?>(null)
+  val localUserCreated = mutableStateOf<Boolean?>(null)
   val chatRunning = mutableStateOf<Boolean?>(null)
   val chatDbChanged = mutableStateOf<Boolean>(false)
   val chatDbEncrypted = mutableStateOf<Boolean?>(false)
@@ -51,6 +50,7 @@ object ChatModel {
   val chats = mutableStateListOf<Chat>()
   // map of connections network statuses, key is agent connection id
   val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
+  val switchingUsersAndHosts = mutableStateOf(false)
 
   // current chat
   val chatId = mutableStateOf<String?>(null)
@@ -58,7 +58,7 @@ object ChatModel {
   val chatItemStatuses = mutableMapOf<Long, CIStatus>()
   val groupMembers = mutableStateListOf<GroupMember>()
 
-  val terminalItems = mutableStateListOf<TerminalItem>()
+  val terminalItems = mutableStateOf<List<TerminalItem>>(listOf())
   val userAddress = mutableStateOf<UserContactLinkRec?>(null)
   // Allows to temporary save servers that are being edited on multiple screens
   val userSMPServersUnsaved = mutableStateOf<(List<ServerCfg>)?>(null)
@@ -67,8 +67,11 @@ object ChatModel {
   // set when app opened from external intent
   val clearOverlays = mutableStateOf<Boolean>(false)
 
-  // set when app is opened via contact or invitation URI
-  val appOpenUrl = mutableStateOf<URI?>(null)
+  // Only needed during onboarding when user skipped password setup (left as random password)
+  val desktopOnboardingRandomPassword = mutableStateOf(false)
+
+  // set when app is opened via contact or invitation URI (rhId, uri)
+  val appOpenUrl = mutableStateOf<Pair<Long?, URI>?>(null)
 
   // preferences
   val notificationPreviewMode by lazy {
@@ -108,6 +111,9 @@ object ChatModel {
 
   var updatingChatsMutex: Mutex = Mutex()
 
+  val desktopNoUserNoRemote: Boolean @Composable get() = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
+  fun desktopNoUserNoRemote(): Boolean = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
+
   // remote controller
   val remoteHosts = mutableStateListOf<RemoteHostInfo>()
   val currentRemoteHost = mutableStateOf<RemoteHostInfo?>(null)
@@ -614,12 +620,13 @@ object ChatModel {
   }
 
   fun addTerminalItem(item: TerminalItem) {
-    if (terminalItems.size >= 500) {
-      terminalItems.removeAt(0)
+    if (terminalItems.value.size >= 500) {
+      terminalItems.value = terminalItems.value.subList(1, terminalItems.value.size)
     }
-    terminalItems.add(item)
+    terminalItems.value += item
   }
 
+  val connectedToRemote: Boolean @Composable get() = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
   fun connectedToRemote(): Boolean = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
 }
 

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

@@ -21,10 +21,11 @@ sealed class WriteFileResult {
 * */
 
 fun writeCryptoFile(path: String, data: ByteArray): CryptoFileArgs {
+  val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized")
   val buffer = ByteBuffer.allocateDirect(data.size)
   buffer.put(data)
   buffer.rewind()
-  val str = chatWriteFile(path, buffer)
+  val str = chatWriteFile(ctrl, path, buffer)
   return when (val d = json.decodeFromString(WriteFileResult.serializer(), str)) {
     is WriteFileResult.Result -> d.cryptoArgs
     is WriteFileResult.Error -> throw Exception(d.writeError)
@@ -43,7 +44,8 @@ fun readCryptoFile(path: String, cryptoArgs: CryptoFileArgs): ByteArray {
 }
 
 fun encryptCryptoFile(fromPath: String, toPath: String): CryptoFileArgs {
-  val str = chatEncryptFile(fromPath, toPath)
+  val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized")
+  val str = chatEncryptFile(ctrl, fromPath, toPath)
   val d = json.decodeFromString(WriteFileResult.serializer(), str)
   return when (d) {
     is WriteFileResult.Result -> d.cryptoArgs

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

@@ -173,6 +173,8 @@ class AppPreferences {
   val connectRemoteViaMulticastAuto = mkBoolPreference(SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO, true)
   val offerRemoteMulticast = mkBoolPreference(SHARED_PREFS_OFFER_REMOTE_MULTICAST, true)
 
+  val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)
+  
   private fun mkIntPreference(prefName: String, default: Int) =
     SharedPreference(
       get = fun() = settings.getInt(prefName, default),
@@ -317,6 +319,7 @@ class AppPreferences {
     private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST = "ConnectRemoteViaMulticast"
     private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "ConnectRemoteViaMulticastAuto"
     private const val SHARED_PREFS_OFFER_REMOTE_MULTICAST = "OfferRemoteMulticast"
+    private const val SHARED_PREFS_DESKTOP_WINDOW_STATE = "DesktopWindowState"
   }
 }
 
@@ -359,7 +362,7 @@ object ChatController {
       chatModel.users.addAll(users)
       if (justStarted) {
         chatModel.currentUser.value = user
-        chatModel.userCreated.value = true
+        chatModel.localUserCreated.value = true
         getUserChatData(null)
         appPrefs.chatLastStart.set(Clock.System.now())
         chatModel.chatRunning.value = true
@@ -379,6 +382,31 @@ object ChatController {
     }
   }
 
+  suspend fun startChatWithoutUser() {
+    Log.d(TAG, "user: null")
+    try {
+      if (chatModel.chatRunning.value == true) return
+      apiSetTempFolder(coreTmpDir.absolutePath)
+      apiSetFilesFolder(appFilesDir.absolutePath)
+      if (appPlatform.isDesktop) {
+        apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
+      }
+      apiSetXFTPConfig(getXFTPCfg())
+      apiSetEncryptLocalFiles(appPrefs.privacyEncryptLocalFiles.get())
+      chatModel.users.clear()
+      chatModel.currentUser.value = null
+      chatModel.localUserCreated.value = false
+      appPrefs.chatLastStart.set(Clock.System.now())
+      chatModel.chatRunning.value = true
+      startReceiver()
+      setLocalDeviceName(appPrefs.deviceNameForRemoteAccess.get()!!)
+      Log.d(TAG, "startChat: started without user")
+    } catch (e: Error) {
+      Log.e(TAG, "failed starting chat without user $e")
+      throw e
+    }
+  }
+
   suspend fun changeActiveUser(rhId: Long?, toUserId: Long, viewPwd: String?) {
     try {
       changeActiveUser_(rhId, toUserId, viewPwd)
@@ -402,8 +430,9 @@ object ChatController {
   }
 
   suspend fun getUserChatData(rhId: Long?) {
-    chatModel.userAddress.value = apiGetUserAddress(rhId)
-    chatModel.chatItemTTL.value = getChatItemTTL(rhId)
+    val hasUser = chatModel.currentUser.value != null
+    chatModel.userAddress.value = if (hasUser) apiGetUserAddress(rhId) else null
+    chatModel.chatItemTTL.value = if (hasUser) getChatItemTTL(rhId) else ChatItemTTL.None
     updatingChatsMutex.withLock {
       val chats = apiGetChats(rhId)
       chatModel.updateChats(chats)
@@ -472,7 +501,9 @@ object ChatController {
     val r = sendCmd(rh, CC.ShowActiveUser())
     if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
     Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
-    chatModel.userCreated.value = false
+    if (rh == null) {
+      chatModel.localUserCreated.value = false
+    }
     return null
   }
 
@@ -891,20 +922,21 @@ object ChatController {
     return null
   }
 
-  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): Boolean  {
+  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection?  {
     val userId = chatModel.currentUser.value?.userId ?: run {
       Log.e(TAG, "apiConnect: no current user")
-      return false
+      return null
     }
     val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq))
     when {
-      r is CR.SentConfirmation || r is CR.SentInvitation -> return true
+      r is CR.SentConfirmation -> return r.connection
+      r is CR.SentInvitation -> return r.connection
       r is CR.ContactAlreadyExists -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.contact_already_exists),
           String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), r.contact.displayName)
         )
-        return false
+        return null
       }
       r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat
           && r.chatError.errorType is ChatErrorType.InvalidConnReq -> {
@@ -912,7 +944,7 @@ object ChatController {
           generalGetString(MR.strings.invalid_connection_link),
           generalGetString(MR.strings.please_check_correct_link_and_maybe_ask_for_a_new_one)
         )
-        return false
+        return null
       }
       r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
           && r.chatError.agentError is AgentErrorType.SMP
@@ -921,13 +953,13 @@ object ChatController {
           generalGetString(MR.strings.connection_error_auth),
           generalGetString(MR.strings.connection_error_auth_desc)
         )
-        return false
+        return null
       }
       else -> {
         if (!(networkErrorAlert(r))) {
           apiErrorAlert("apiConnect", generalGetString(MR.strings.connection_error), r)
         }
-        return false
+        return null
       }
     }
   }
@@ -1394,9 +1426,9 @@ object ChatController {
     chatModel.remoteHosts.addAll(hosts)
   }
 
-  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true): Triple<RemoteHostInfo?, String, String>? {
-    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast))
-    if (r is CR.RemoteHostStarted) return Triple(r.remoteHost_, r.invitation, r.ctrlPort)
+  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true, address: RemoteCtrlAddress?, port: Int?): CR.RemoteHostStarted? {
+    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast, address, port))
+    if (r is CR.RemoteHostStarted) return r
     apiErrorAlert("startRemoteHost", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
@@ -1526,16 +1558,6 @@ object ChatController {
     fun active(user: UserLike): Boolean = activeUser(rhId, user)
     chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
     when (r) {
-      is CR.NewContactConnection -> {
-        if (active(r.user)) {
-          chatModel.updateContactConnection(rhId, r.connection)
-        }
-      }
-      is CR.ContactConnectionDeleted -> {
-        if (active(r.user)) {
-          chatModel.removeChat(rhId, r.connection.id)
-        }
-      }
       is CR.ContactDeletedByContact -> {
         if (active(r.user) && r.contact.directOrUsed) {
           chatModel.updateContact(rhId, r.contact)
@@ -1996,12 +2018,13 @@ object ChatController {
     chatModel.setContactNetworkStatus(contact, NetworkStatus.Error(err))
   }
 
-  suspend fun switchUIRemoteHost(rhId: Long?) {
+  suspend fun switchUIRemoteHost(rhId: Long?) = showProgressIfNeeded {
     // TODO lock the switch so that two switches can't run concurrently?
     chatModel.chatId.value = null
     ModalManager.center.closeModals()
     ModalManager.end.closeModals()
-    AlertManager.shared.alertViews.clear()
+    AlertManager.shared.hideAllAlerts()
+    AlertManager.privacySensitive.hideAllAlerts()
     chatModel.currentRemoteHost.value = switchRemoteHost(rhId)
     reloadRemoteHosts()
     val user = apiGetActiveUser(rhId)
@@ -2009,7 +2032,10 @@ object ChatController {
     chatModel.users.clear()
     chatModel.users.addAll(users)
     chatModel.currentUser.value = user
-    chatModel.userCreated.value = true
+    if (user == null) {
+      chatModel.chatItems.clear()
+      chatModel.chats.clear()
+    }
     val statuses = apiGetNetworkStatuses(rhId)
     if (statuses != null) {
       chatModel.networkStatuses.clear()
@@ -2019,6 +2045,23 @@ object ChatController {
     getUserChatData(rhId)
   }
 
+  suspend fun showProgressIfNeeded(block: suspend () -> Unit) {
+    val job = withBGApi {
+      try {
+        delay(500)
+        chatModel.switchingUsersAndHosts.value = true
+      } catch (e: Throwable) {
+        chatModel.switchingUsersAndHosts.value = false
+      }
+    }
+    try {
+      block()
+    } finally {
+      job.cancel()
+      chatModel.switchingUsersAndHosts.value = false
+    }
+  }
+
   fun getXFTPCfg(): XFTPFileConfig {
     return XFTPFileConfig(minFileSize = 0)
   }
@@ -2206,7 +2249,7 @@ sealed class CC {
   // Remote control
   class SetLocalDeviceName(val displayName: String): CC()
   class ListRemoteHosts(): CC()
-  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean): CC()
+  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean, val address: RemoteCtrlAddress?, val port: Int?): CC()
   class SwitchRemoteHost (val remoteHostId: Long?): CC()
   class StopRemoteHost(val remoteHostKey: Long?): CC()
   class DeleteRemoteHost(val remoteHostId: Long): CC()
@@ -2342,7 +2385,7 @@ sealed class CC {
     is CancelFile -> "/fcancel $fileId"
     is SetLocalDeviceName -> "/set device name $displayName"
     is ListRemoteHosts -> "/list remote hosts"
-    is StartRemoteHost -> "/start remote host " + if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}"
+    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${address.`interface`}" else "") + (if (port != null) " port=$port" else "")
     is SwitchRemoteHost -> "/switch remote host " + if (remoteHostId == null) "local" else "$remoteHostId"
     is StopRemoteHost -> "/stop remote host " + if (remoteHostKey == null) "new" else "$remoteHostKey"
     is DeleteRemoteHost -> "/delete remote host $remoteHostId"
@@ -2758,9 +2801,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
@@ -3564,6 +3607,8 @@ data class RemoteHostInfo(
   val remoteHostId: Long,
   val hostDeviceName: String,
   val storePath: String,
+  val bindAddress_: RemoteCtrlAddress?,
+  val bindPort_: Int?,
   val sessionState: RemoteHostSessionState?
 ) {
   val activeHost: Boolean
@@ -3572,6 +3617,12 @@ data class RemoteHostInfo(
   fun activeHost(): Boolean = chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId
 }
 
+@Serializable
+data class RemoteCtrlAddress(
+  val address: String,
+  val `interface`: String
+)
+
 @Serializable
 sealed class RemoteHostSessionState {
   @Serializable @SerialName("starting") object Starting: RemoteHostSessionState()
@@ -3707,8 +3758,8 @@ sealed class CR {
   @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connReqInvitation: String, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionIncognitoUpdated") class ConnectionIncognitoUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connectionPlan: ConnectionPlan): CR()
-  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef): CR()
-  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef): CR()
+  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef, val connection: PendingContactConnection): CR()
+  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("sentInvitationToContact") class SentInvitationToContact(val user: UserRef, val contact: Contact, val customUserProfile: Profile?): CR()
   @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactRequestAlreadyAccepted") class ContactRequestAlreadyAccepted(val user: UserRef, val contact: Contact): CR()
@@ -3802,12 +3853,11 @@ sealed class CR {
   @Serializable @SerialName("callAnswer") class CallAnswer(val user: UserRef, val contact: Contact, val answer: WebRTCSession): CR()
   @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val user: UserRef, val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
   @Serializable @SerialName("callEnded") class CallEnded(val user: UserRef, val contact: Contact): CR()
-  @Serializable @SerialName("newContactConnection") class NewContactConnection(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: UserRef, val connection: PendingContactConnection): CR()
   // remote events (desktop)
   @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
   @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
-  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val ctrlPort: String): CR()
+  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val localAddrs: List<RemoteCtrlAddress>, val ctrlPort: String): CR()
   @Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
   @Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
   @Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
@@ -3951,7 +4001,6 @@ sealed class CR {
     is CallAnswer -> "callAnswer"
     is CallExtraInfo -> "callExtraInfo"
     is CallEnded -> "callEnded"
-    is NewContactConnection -> "newContactConnection"
     is ContactConnectionDeleted -> "contactConnectionDeleted"
     is RemoteHostList -> "remoteHostList"
     is CurrentRemoteHost -> "currentRemoteHost"
@@ -4006,11 +4055,11 @@ sealed class CR {
     is ContactCode -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionCode: $connectionCode")
     is GroupMemberCode -> withUser(user, "groupInfo: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionCode: $connectionCode")
     is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
-    is Invitation -> withUser(user, connReqInvitation)
+    is Invitation -> withUser(user, "connReqInvitation: $connReqInvitation\nconnection: $connection")
     is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
     is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
-    is SentConfirmation -> withUser(user, noDetails())
-    is SentInvitation -> withUser(user, noDetails())
+    is SentConfirmation -> withUser(user, json.encodeToString(connection))
+    is SentInvitation -> withUser(user, json.encodeToString(connection))
     is SentInvitationToContact -> withUser(user, json.encodeToString(contact))
     is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
     is ContactRequestAlreadyAccepted -> withUser(user, json.encodeToString(contact))
@@ -4098,7 +4147,6 @@ sealed class CR {
     is CallAnswer -> withUser(user, "contact: ${contact.id}\nanswer: ${json.encodeToString(answer)}")
     is CallExtraInfo -> withUser(user, "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}")
     is CallEnded -> withUser(user, "contact: ${contact.id}")
-    is NewContactConnection -> withUser(user, json.encodeToString(connection))
     is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
     // remote events (mobile)
     is RemoteHostList -> json.encodeToString(remoteHosts)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt

@@ -22,9 +22,9 @@ external fun chatParseMarkdown(str: String): String
 external fun chatParseServer(str: String): String
 external fun chatPasswordHash(pwd: String, salt: String): String
 external fun chatValidName(name: String): String
-external fun chatWriteFile(path: String, buffer: ByteBuffer): String
+external fun chatWriteFile(ctrl: ChatCtrl, path: String, buffer: ByteBuffer): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
-external fun chatEncryptFile(fromPath: String, toPath: String): String
+external fun chatEncryptFile(ctrl: ChatCtrl, fromPath: String, toPath: String): String
 external fun chatDecryptFile(fromPath: String, key: String, nonce: String, toPath: String): String
 
 val chatModel: ChatModel
@@ -55,10 +55,22 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
     if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
     val user = chatController.apiGetActiveUser(null)
     if (user == null) {
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
       chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
       chatModel.currentUser.value = null
       chatModel.users.clear()
+      if (appPlatform.isDesktop) {
+        /**
+         * Setting it here to null because otherwise the screen will flash in [MainScreen] after the first start
+         * because of default value of [OnboardingStage.OnboardingComplete]
+         * */
+        chatModel.localUserCreated.value = null
+        if (chatController.listRemoteHosts()?.isEmpty() == true) {
+          chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+        }
+        chatController.startChatWithoutUser()
+      } else {
+        chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+      }
     } else {
       val savedOnboardingStage = appPreferences.onboardingStage.get()
       appPreferences.onboardingStage.set(if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt

@@ -59,7 +59,9 @@ abstract class NtfManager {
       awaitChatStartedIfNeeded(chatModel)
       if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
         // TODO include remote host ID in desktop notifications?
-        chatModel.controller.changeActiveUser(null, userId, null)
+        chatModel.controller.showProgressIfNeeded {
+          chatModel.controller.changeActiveUser(null, userId, null)
+        }
       }
       val cInfo = chatModel.getChat(chatId)?.chatInfo
       chatModel.clearOverlays.value = true
@@ -72,7 +74,9 @@ abstract class NtfManager {
       awaitChatStartedIfNeeded(chatModel)
       if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
         // TODO include remote host ID in desktop notifications?
-        chatModel.controller.changeActiveUser(null, userId, null)
+        chatModel.controller.showProgressIfNeeded {
+          chatModel.controller.changeActiveUser(null, userId, null)
+        }
       }
       chatModel.chatId.value = null
       chatModel.clearOverlays.value = true

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Platform.kt

@@ -10,6 +10,7 @@ interface PlatformInterface {
   fun androidChatStopped() {}
   fun androidChatInitializedAndStarted() {}
   fun androidIsBackgroundCallAllowed(): Boolean = true
+  fun androidSetNightModeIfSupported() {}
   suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
 }
 /**

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/PlatformTextField.kt

@@ -4,13 +4,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.text.TextStyle
 import chat.simplex.common.views.chat.ComposeState
-import java.io.File
 import java.net.URI
 
 @Composable
 expect fun PlatformTextField(
   composeState: MutableState<ComposeState>,
   sendMsgEnabled: Boolean,
+  sendMsgButtonDisabled: Boolean,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
   userIsObserver: Boolean,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/UI.kt

@@ -16,3 +16,11 @@ expect fun getKeyboardState(): State<KeyboardState>
 expect fun hideKeyboard(view: Any?)
 
 expect fun androidIsFinishingMainActivity(): Boolean
+
+fun registerGlobalErrorHandler() {
+  Thread.setDefaultUncaughtExceptionHandler(GlobalExceptionsHandler())
+}
+
+expect class GlobalExceptionsHandler(): Thread.UncaughtExceptionHandler {
+  override fun uncaughtException(thread: Thread, e: Throwable)
+}

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/ThemeManager.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.text.font.FontFamily
 import chat.simplex.res.MR
 import chat.simplex.common.model.AppPreferences
 import chat.simplex.common.model.ChatController
+import chat.simplex.common.platform.platform
 import chat.simplex.common.views.helpers.generalGetString
 
 // https://github.com/rsms/inter
@@ -96,6 +97,7 @@ object ThemeManager {
   fun applyTheme(theme: String, darkForSystemTheme: Boolean) {
     appPrefs.currentTheme.set(theme)
     CurrentColors.value = currentColors(darkForSystemTheme)
+    platform.androidSetNightModeIfSupported()
   }
 
   fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {

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

@@ -34,7 +34,6 @@ fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
     close()
   })
   TerminalLayout(
-    remember { chatModel.terminalItems },
     composeState,
     sendCommand = { sendCommand(chatModel, composeState) },
     close
@@ -63,7 +62,6 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
 
 @Composable
 fun TerminalLayout(
-  terminalItems: List<TerminalItem>,
   composeState: MutableState<ComposeState>,
   sendCommand: () -> Unit,
   close: () -> Unit
@@ -111,7 +109,7 @@ fun TerminalLayout(
           .fillMaxWidth(),
         color = MaterialTheme.colors.background
       ) {
-        TerminalLog(terminalItems)
+        TerminalLog()
       }
     }
   }
@@ -120,22 +118,13 @@ fun TerminalLayout(
 private var lazyListState = 0 to 0
 
 @Composable
-fun TerminalLog(terminalItems: List<TerminalItem>) {
+fun TerminalLog() {
   val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
   DisposableEffect(Unit) {
     onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
   }
   val reversedTerminalItems by remember {
-    derivedStateOf {
-      // Such logic prevents concurrent modification
-      val res = ArrayList<TerminalItem>()
-      var i = 0
-      while (i < terminalItems.size) {
-        res.add(terminalItems[i])
-        i++
-      }
-      res.asReversed()
-    }
+    derivedStateOf { chatModel.terminalItems.value.asReversed() }
   }
   val clipboard = LocalClipboardManager.current
   LazyColumn(state = listState, reverseLayout = true) {
@@ -152,7 +141,12 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
           .clickable {
             ModalManager.start.showModal(endButtons = { ShareButton { clipboard.shareText(item.details) } }) {
               SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
-                Text(item.details, modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
+                val details = item.details
+                  .let {
+                    if (it.length < 100_000) it
+                    else it.substring(0, 100_000)
+                  }
+                Text(details, modifier = Modifier.heightIn(max = 50_000.dp).padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
               }
             }
           }.padding(horizontal = 8.dp, vertical = 4.dp)
@@ -170,7 +164,6 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
 fun PreviewTerminalLayout() {
   SimpleXTheme {
     TerminalLayout(
-      terminalItems = TerminalItem.sampleData,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) },
       sendCommand = {},
       close = {}

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

@@ -21,8 +21,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.ChatModel
-import chat.simplex.common.model.Profile
+import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -76,7 +76,13 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
           disabled = !canCreateProfile(displayName.value),
           textColor = MaterialTheme.colors.primary,
           iconColor = MaterialTheme.colors.primary,
-          click = { createProfileInProfiles(chatModel, displayName.value, close) },
+          click = {
+            if (chatModel.localUserCreated.value == true) {
+              createProfileInProfiles(chatModel, displayName.value, close)
+            } else {
+              createProfileInNoProfileSetup(displayName.value, close)
+            }
+          },
         )
         SectionTextFooter(generalGetString(MR.strings.your_profile_is_stored_on_your_device))
         SectionTextFooter(generalGetString(MR.strings.profile_is_only_shared_with_your_contacts))
@@ -168,6 +174,17 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
   }
 }
 
+fun createProfileInNoProfileSetup(displayName: String, close: () -> Unit) {
+  withApi {
+    val user = controller.apiCreateActiveUser(null, Profile(displayName.trim(), "", null)) ?: return@withApi
+    controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
+    chatModel.chatRunning.value = false
+    controller.startChat(user)
+    controller.switchUIRemoteHost(null)
+    close()
+  }
+}
+
 fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: () -> Unit) {
   withApi {
     val rhId = chatModel.remoteHostId()
@@ -190,12 +207,12 @@ fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: ()
 
 fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: () -> Unit) {
   withApi {
-    chatModel.controller.apiCreateActiveUser(
+    chatModel.currentUser.value = chatModel.controller.apiCreateActiveUser(
       null, Profile(displayName.trim(), "", null)
     ) ?: return@withApi
     val onboardingStage = chatModel.controller.appPrefs.onboardingStage
     if (chatModel.users.isEmpty()) {
-      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get()) {
+      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get() && !chatModel.desktopOnboardingRandomPassword.value) {
         OnboardingStage.Step2_5_SetupDatabasePassphrase
       } else {
         OnboardingStage.Step3_CreateSimpleXAddress

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

@@ -220,8 +220,9 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
           }
         }
       },
-      loadPrevMessages = { cInfo ->
-        val c = chatModel.getChat(cInfo.id)
+      loadPrevMessages = {
+        if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+        val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
         val firstId = chatModel.chatItems.firstOrNull()?.id
         if (c != null && firstId != null) {
           withApi {
@@ -440,7 +441,8 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
       changeNtfsState = { enabled, currentValue -> toggleNotifications(chat, enabled, chatModel, currentValue) },
       onSearchValueChanged = { value ->
         if (searchText.value == value) return@ChatLayout
-        val c = chatModel.getChat(chat.chatInfo.id) ?: return@ChatLayout
+        if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+        val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
         withApi {
           apiFindMessages(c, chatModel, value)
           searchText.value = value
@@ -467,7 +469,7 @@ fun ChatLayout(
   back: () -> Unit,
   info: () -> Unit,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: (ChatInfo) -> Unit,
+  loadPrevMessages: () -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
   receiveFile: (Long, Boolean) -> Unit,
@@ -790,7 +792,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   useLinkPreviews: Boolean,
   linkMode: SimplexLinkMode,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: (ChatInfo) -> Unit,
+  loadPrevMessages: () -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
   receiveFile: (Long, Boolean) -> Unit,
@@ -828,9 +830,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
     }
   }
 
-  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, chat, chatItems) { c ->
-    loadPrevMessages(c.chatInfo)
-  }
+  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)
 
   Spacer(Modifier.size(8.dp))
   val reversedChatItems by remember { derivedStateOf { chatItems.reversed().toList() } }
@@ -900,7 +900,11 @@ fun BoxWithConstraintsScope.ChatItemsList(
 
         @Composable
         fun ChatItemViewShortHand(cItem: ChatItem, range: IntRange?) {
-          ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
+          tryOrShowError("${cItem.id}ChatItem", error = {
+            CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
+          }) {
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
+          }
         }
 
         @Composable
@@ -1146,24 +1150,32 @@ fun BoxWithConstraintsScope.FloatingButtons(
 fun PreloadItems(
   listState: LazyListState,
   remaining: Int = 10,
-  chat: Chat,
-  items: List<*>,
-  onLoadMore: (chat: Chat) -> Unit,
+  onLoadMore: () -> Unit,
 ) {
-  LaunchedEffect(listState, chat, items) {
-    snapshotFlow { listState.layoutInfo }
-      .map {
-        val totalItemsNumber = it.totalItemsCount
-        val lastVisibleItemIndex = (it.visibleItemsInfo.lastOrNull()?.index ?: 0) + 1
-        if (lastVisibleItemIndex > (totalItemsNumber - remaining) && totalItemsNumber >= ChatPagination.INITIAL_COUNT)
-          totalItemsNumber
-        else
-          0
+  // Prevent situation when initial load and load more happens one after another after selecting a chat with long scroll position from previous selection
+  val allowLoad = remember { mutableStateOf(false) }
+  LaunchedEffect(Unit) {
+    snapshotFlow { chatModel.chatId.value }
+      .filterNotNull()
+      .collect {
+        allowLoad.value = listState.layoutInfo.totalItemsCount == listState.layoutInfo.visibleItemsInfo.size
+        delay(500)
+        allowLoad.value = true
       }
-      .distinctUntilChanged()
+  }
+  KeyChangeEffect(allowLoad.value) {
+    snapshotFlow {
+      val lInfo = listState.layoutInfo
+      val totalItemsNumber = lInfo.totalItemsCount
+      val lastVisibleItemIndex = (lInfo.visibleItemsInfo.lastOrNull()?.index ?: 0) + 1
+      if (allowLoad.value && lastVisibleItemIndex > (totalItemsNumber - remaining) && totalItemsNumber >= ChatPagination.INITIAL_COUNT)
+        totalItemsNumber + ChatPagination.PRELOAD_COUNT
+      else
+        0
+    }
       .filter { it > 0 }
       .collect {
-        onLoadMore(chat)
+        onLoadMore()
       }
   }
 }
@@ -1435,7 +1447,7 @@ fun PreviewChatLayout() {
       back = {},
       info = {},
       showMemberInfo = { _, _ -> },
-      loadPrevMessages = { _ -> },
+      loadPrevMessages = {},
       deleteMessage = { _, _ -> },
       deleteMessages = { _ -> },
       receiveFile = { _, _ -> },
@@ -1508,7 +1520,7 @@ fun PreviewGroupChatLayout() {
       back = {},
       info = {},
       showMemberInfo = { _, _ -> },
-      loadPrevMessages = { _ -> },
+      loadPrevMessages = {},
       deleteMessage = { _, _ -> },
       deleteMessages = {},
       receiveFile = { _, _ -> },

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

@@ -201,7 +201,7 @@ suspend fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text:
         // Image
         val drawable = getDrawableFromUri(uri)
         // Do not show alert in case it's already shown from the function above
-        bitmap = getBitmapFromUri(uri, withAlertOnException = AlertManager.shared.alertViews.isEmpty())
+        bitmap = getBitmapFromUri(uri, withAlertOnException = !AlertManager.shared.hasAlertsShown())
         if (isAnimImage(uri, drawable)) {
           // It's a gif or webp
           val fileSize = getFileSize(uri)

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

@@ -29,7 +29,6 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import dev.icerock.moko.resources.compose.painterResource
 import kotlinx.coroutines.*
-import java.io.File
 import java.net.URI
 
 @Composable
@@ -82,7 +81,10 @@ fun SendMsgView(
     val showVoiceButton = !nextSendGrpInv && cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
         cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    PlatformTextField(composeState, sendMsgEnabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
+    val sendMsgButtonDisabled = !sendMsgEnabled || !cs.sendEnabled() ||
+      (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
+      cs.endLiveDisabled
+    PlatformTextField(composeState, sendMsgEnabled, sendMsgButtonDisabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
       if (!cs.inProgress) {
         sendMessage(null)
       }
@@ -155,9 +157,6 @@ fun SendMsgView(
         else -> {
           val cs = composeState.value
           val icon = if (cs.editing || cs.liveMessage != null) painterResource(MR.images.ic_check_filled) else painterResource(MR.images.ic_arrow_upward)
-          val disabled = !sendMsgEnabled || !cs.sendEnabled() ||
-              (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-              cs.endLiveDisabled
           val showDropdown = rememberSaveable { mutableStateOf(false) }
 
           @Composable
@@ -200,12 +199,12 @@ fun SendMsgView(
 
           val menuItems = MenuItems()
           if (menuItems.isNotEmpty()) {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !disabled, sendMessage) { showDropdown.value = true }
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage) { showDropdown.value = true }
             DefaultDropdownMenu(showDropdown) {
               menuItems.forEach { composable -> composable() }
             }
           } else {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !disabled, sendMessage)
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage)
           }
         }
       }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIBrokenComposableView.kt

@@ -0,0 +1,18 @@
+package chat.simplex.common.views.chat.item
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.unit.dp
+import chat.simplex.res.MR
+
+@Composable
+fun CIBrokenComposableView(alignment: Alignment) {
+  Box(Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 6.dp), contentAlignment = alignment) {
+    Text(stringResource(MR.strings.error_showing_message), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
+  }
+}

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt

@@ -164,6 +164,12 @@ fun CIImageView(
           }
         }
       }
+    } else {
+      KeyChangeEffect(file) {
+        if (res.value == null) {
+          res.value = imageAndFilePath(file)
+        }
+      }
     }
     val loaded = res.value
     if (loaded != null) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -195,7 +195,13 @@ fun ChatItemView(
                 }
                 val clipboard = LocalClipboardManager.current
                 val cachedRemoteReqs = remember { CIFile.cachedRemoteFileRequests }
-                val copyAndShareAllowed = cItem.file == null || !chatModel.connectedToRemote() || getLoadedFilePath(cItem.file) != null || cachedRemoteReqs[cItem.file.fileSource] != false
+                val copyAndShareAllowed = when {
+                  cItem.content.text.isNotEmpty() -> true
+                  cItem.file != null && chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file.fileSource] != false && cItem.file.loaded -> true
+                  getLoadedFilePath(cItem.file) != null -> true
+                  else -> false
+                }
+
                 if (copyAndShareAllowed) {
                   ItemAction(stringResource(MR.strings.share_verb), painterResource(MR.images.ic_share), onClick = {
                     var fileSource = getLoadedFileSource(cItem.file)
@@ -221,7 +227,7 @@ fun ChatItemView(
                     showMenu.value = false
                   })
                 }
-                if ((cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) && (getLoadedFilePath(cItem.file) != null || (chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file?.fileSource] != false))) {
+                if ((cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) && (getLoadedFilePath(cItem.file) != null || (chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file?.fileSource] != false && cItem.file?.loaded == true))) {
                   SaveContentItemAction(cItem, saveFileLauncher, showMenu)
                 }
                 if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -61,9 +62,17 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     is ChatInfo.Direct -> {
       val contactNetworkStatus = chatModel.contactNetworkStatus(chat.chatInfo.contact)
       ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, contactNetworkStatus, stopped, linkMode, inProgress = false, progressByTimeout = false) },
+        chatLinkPreview = {
+          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
+            ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, contactNetworkStatus, stopped, linkMode, inProgress = false, progressByTimeout = false)
+          }
+        },
         click = { directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel) },
-        dropdownMenuItems = { ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu, showMarkRead) },
+        dropdownMenuItems = {
+          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
+            ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu, showMarkRead)
+          }
+        },
         showMenu,
         stopped,
         selectedChat
@@ -71,25 +80,45 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     }
     is ChatInfo.Group ->
       ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, stopped, linkMode, inProgress.value, progressByTimeout) },
+        chatLinkPreview = {
+          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
+            ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, stopped, linkMode, inProgress.value, progressByTimeout)
+          }
+        },
         click = { if (!inProgress.value) groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel, inProgress) },
-        dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, inProgress, showMarkRead) },
+        dropdownMenuItems = {
+          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
+            GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, inProgress, showMarkRead)
+          }
+        },
         showMenu,
         stopped,
         selectedChat
       )
     is ChatInfo.ContactRequest ->
       ChatListNavLinkLayout(
-        chatLinkPreview = { ContactRequestView(chat.chatInfo) },
+        chatLinkPreview = {
+          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
+            ContactRequestView(chat.chatInfo)
+          }
+        },
         click = { contactRequestAlertDialog(chat.remoteHostId, chat.chatInfo, chatModel) },
-        dropdownMenuItems = { ContactRequestMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu) },
+        dropdownMenuItems = {
+          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
+            ContactRequestMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu)
+          }
+        },
         showMenu,
         stopped,
         selectedChat
       )
     is ChatInfo.ContactConnection ->
       ChatListNavLinkLayout(
-        chatLinkPreview = { ContactConnectionView(chat.chatInfo.contactConnection) },
+        chatLinkPreview = {
+          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
+            ContactConnectionView(chat.chatInfo.contactConnection)
+          }
+        },
         click = {
           ModalManager.center.closeModals()
           ModalManager.end.closeModals()
@@ -97,7 +126,11 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
             ContactConnectionInfoView(chatModel, chat.remoteHostId, chat.chatInfo.contactConnection.connReqInv, chat.chatInfo.contactConnection, false, close)
           }
         },
-        dropdownMenuItems = { ContactConnectionMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu) },
+        dropdownMenuItems = {
+          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
+            ContactConnectionMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu)
+          }
+        },
         showMenu,
         stopped,
         selectedChat
@@ -105,7 +138,9 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     is ChatInfo.InvalidJSON ->
       ChatListNavLinkLayout(
         chatLinkPreview = {
-          InvalidDataView()
+          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
+            InvalidDataView()
+          }
         },
         click = {
           ModalManager.end.closeModals()
@@ -119,6 +154,13 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
   }
 }
 
+@Composable
+private fun ErrorChatListItem() {
+  Box(Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 6.dp)) {
+    Text(stringResource(MR.strings.error_showing_content), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
+  }
+}
+
 fun directChatAction(rhId: Long?, contact: Contact, chatModel: ChatModel) {
   when {
     contact.activeConn == null && contact.profile.contactLink != null -> askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close = null, openChat = true)
@@ -611,12 +653,12 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
   close: (() -> Unit)?,
   openChat: Boolean
 ) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
+  AlertManager.privacySensitive.showAlertDialogButtonsColumn(
     title = String.format(generalGetString(MR.strings.connect_with_contact_name_question), contact.chatViewName),
     buttons = {
       Column {
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
           withApi {
             close?.invoke()
             val ok = connectContactViaAddress(chatModel, rhId, contact.contactId, incognito = false)
@@ -628,7 +670,7 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
           Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
           withApi {
             close?.invoke()
             val ok = connectContactViaAddress(chatModel, rhId, contact.contactId, incognito = true)
@@ -640,7 +682,7 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
           Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
         }) {
           Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
@@ -654,7 +696,7 @@ suspend fun connectContactViaAddress(chatModel: ChatModel, rhId: Long?, contactI
   val contact = chatModel.controller.apiConnectContactViaAddress(rhId, incognito, contactId)
   if (contact != null) {
     chatModel.updateContact(rhId, contact)
-    AlertManager.shared.showAlertMsg(
+    AlertManager.privacySensitive.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
       text = generalGetString(MR.strings.you_will_be_connected_when_your_connection_request_is_accepted),
       hostDevice = hostDevice(rhId),

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt

@@ -11,6 +11,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.*
+import androidx.compose.ui.text.font.FontStyle
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -49,13 +50,6 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   LaunchedEffect(chatModel.clearOverlays.value) {
     if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
   }
-  LaunchedEffect(chatModel.appOpenUrl.value) {
-    val url = chatModel.appOpenUrl.value
-    if (url != null) {
-      chatModel.appOpenUrl.value = null
-      connectIfOpenedViaUri(chatModel.remoteHostId(), url, chatModel)
-    }
-  }
   if (appPlatform.isDesktop) {
     KeyChangeEffect(chatModel.chatId.value) {
       if (chatModel.chatId.value != null) {
@@ -68,14 +62,18 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
   var searchInList by rememberSaveable { mutableStateOf("") }
   val scope = rememberCoroutineScope()
-  val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
+  val (userPickerState, scaffoldState ) = settingsState
   Scaffold(topBar = { Box(Modifier.padding(end = endPadding)) { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } } },
     scaffoldState = scaffoldState,
-    drawerContent = { SettingsView(chatModel, setPerformLA, scaffoldState.drawerState) },
+    drawerContent = {
+      tryOrShowError("Settings", error = { ErrorSettingsView() }) {
+        SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
+      }
+    },
     drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
     drawerGesturesEnabled = appPlatform.isAndroid,
     floatingActionButton = {
-      if (searchInList.isEmpty()) {
+      if (searchInList.isEmpty() && !chatModel.desktopNoUserNoRemote) {
         FloatingActionButton(
           onClick = {
             if (!stopped) {
@@ -104,7 +102,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
       ) {
         if (chatModel.chats.isNotEmpty()) {
           ChatList(chatModel, search = searchInList)
-        } else if (!switchingUsersAndHosts.value) {
+        } else if (!chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
           Box(Modifier.fillMaxSize()) {
             if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
               OnboardingButtons(showNewChatSheet)
@@ -118,20 +116,16 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   if (searchInList.isEmpty()) {
     DesktopActiveCallOverlayLayout(newChatSheetState)
     // TODO disable this button and sheet for the duration of the switch
-    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
-  }
-  if (appPlatform.isAndroid) {
-    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
-      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-      userPickerState.value = AnimatedViewState.GONE
+    tryOrShowError("NewChatSheet", error = {}) {
+      NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
     }
   }
-  if (switchingUsersAndHosts.value) {
-    Box(
-      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
-      contentAlignment = Alignment.Center
-    ) {
-      ProgressIndicator()
+  if (appPlatform.isAndroid) {
+    tryOrShowError("UserPicker", error = {}) {
+      UserPicker(chatModel, userPickerState) {
+        scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
+        userPickerState.value = AnimatedViewState.GONE
+      }
     }
   }
 }
@@ -209,7 +203,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
     navigationButton = {
       if (showSearch) {
         NavigationButtonBack(hideSearchOnBack)
-      } else if (chatModel.users.isEmpty()) {
+      } else if (chatModel.users.isEmpty() && !chatModel.desktopNoUserNoRemote) {
         NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
       } else {
         val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
@@ -304,24 +298,13 @@ private fun ToggleFilterButton() {
   }
 }
 
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier
-      .padding(horizontal = 2.dp)
-      .size(30.dp),
-    color = MaterialTheme.colors.secondary,
-    strokeWidth = 2.5.dp
-  )
-}
-
 @Composable
 expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>)
 
 fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
   Log.d(TAG, "connectIfOpenedViaUri: opened via link")
   if (chatModel.currentUser.value == null) {
-    chatModel.appOpenUrl.value = uri
+    chatModel.appOpenUrl.value = rhId to uri
   } else {
     withApi {
       planAndConnect(chatModel, rhId, uri, incognito = null, close = null)
@@ -329,6 +312,13 @@ fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
   }
 }
 
+@Composable
+private fun ErrorSettingsView() {
+  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+    Text(generalGetString(MR.strings.error_showing_content), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
+  }
+}
+
 private var lazyListState = 0 to 0
 
 @Composable

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 @Composable
 fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stopped: Boolean) {
   var searchInList by rememberSaveable { mutableStateOf("") }
-  val (userPickerState, scaffoldState, switchingUsersAndHosts) = settingsState
+  val (userPickerState, scaffoldState) = settingsState
   val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
   Scaffold(
     Modifier.padding(end = endPadding),
@@ -47,10 +47,12 @@ fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stoppe
     }
   }
   if (appPlatform.isAndroid) {
-    UserPicker(chatModel, userPickerState, switchingUsersAndHosts, showSettings = false, showCancel = true, cancelClicked = {
-      chatModel.sharedContent.value = null
-      userPickerState.value = AnimatedViewState.GONE
-    })
+    tryOrShowError("UserPicker", error = {}) {
+      UserPicker(chatModel, userPickerState, showSettings = false, showCancel = true, cancelClicked = {
+        chatModel.sharedContent.value = null
+        userPickerState.value = AnimatedViewState.GONE
+      })
+    }
   }
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt

@@ -26,7 +26,9 @@ import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.platform.*
+import chat.simplex.common.views.CreateProfile
 import chat.simplex.common.views.remote.*
+import chat.simplex.common.views.usersettings.doWithAuth
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
@@ -38,7 +40,6 @@ import kotlin.math.roundToInt
 fun UserPicker(
   chatModel: ChatModel,
   userPickerState: MutableStateFlow<AnimatedViewState>,
-  switchingUsersAndHosts: MutableState<Boolean>,
   showSettings: Boolean = true,
   showCancel: Boolean = false,
   cancelClicked: () -> Unit = {},
@@ -123,14 +124,10 @@ fun UserPicker(
         userPickerState.value = AnimatedViewState.HIDING
         if (!u.user.activeUser) {
           scope.launch {
-            val job = launch {
-              delay(500)
-              switchingUsersAndHosts.value = true
+            controller.showProgressIfNeeded {
+              ModalManager.closeAllModalsEverywhere()
+              chatModel.controller.changeActiveUser(u.user.remoteHostId, u.user.userId, null)
             }
-            ModalManager.closeAllModalsEverywhere()
-            chatModel.controller.changeActiveUser(u.user.remoteHostId, u.user.userId, null)
-            job.cancel()
-            switchingUsersAndHosts.value = false
           }
         }
       }
@@ -162,13 +159,13 @@ fun UserPicker(
       val currentRemoteHost = remember { chatModel.currentRemoteHost }.value
       Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
         if (remoteHosts.isNotEmpty()) {
-          if (currentRemoteHost == null) {
+          if (currentRemoteHost == null && chatModel.localUserCreated.value == true) {
             LocalDevicePickerItem(true) {
               userPickerState.value = AnimatedViewState.HIDING
               switchToLocalDevice()
             }
             Divider(Modifier.requiredHeight(1.dp))
-          } else {
+          } else if (currentRemoteHost != null) {
             val connecting = rememberSaveable { mutableStateOf(false) }
             RemoteHostPickerItem(currentRemoteHost,
               actionButtonClick = {
@@ -176,7 +173,7 @@ fun UserPicker(
                 stopRemoteHostAndReloadHosts(currentRemoteHost, true)
               }) {
                 userPickerState.value = AnimatedViewState.HIDING
-                switchToRemoteHost(currentRemoteHost, switchingUsersAndHosts, connecting)
+                switchToRemoteHost(currentRemoteHost, connecting)
               }
             Divider(Modifier.requiredHeight(1.dp))
           }
@@ -184,7 +181,7 @@ fun UserPicker(
 
         UsersView()
 
-        if (remoteHosts.isNotEmpty() && currentRemoteHost != null) {
+        if (remoteHosts.isNotEmpty() && currentRemoteHost != null && chatModel.localUserCreated.value == true) {
           LocalDevicePickerItem(false) {
             userPickerState.value = AnimatedViewState.HIDING
             switchToLocalDevice()
@@ -199,7 +196,7 @@ fun UserPicker(
               stopRemoteHostAndReloadHosts(h, false)
             }) {
               userPickerState.value = AnimatedViewState.HIDING
-              switchToRemoteHost(h, switchingUsersAndHosts, connecting)
+              switchToRemoteHost(h, connecting)
           }
           Divider(Modifier.requiredHeight(1.dp))
         }
@@ -220,6 +217,18 @@ fun UserPicker(
           userPickerState.value = AnimatedViewState.GONE
         }
         Divider(Modifier.requiredHeight(1.dp))
+      } else if (chatModel.desktopNoUserNoRemote) {
+        CreateInitialProfile {
+          doWithAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) {
+            ModalManager.center.showModalCloseable { close ->
+              LaunchedEffect(Unit) {
+                userPickerState.value = AnimatedViewState.HIDING
+              }
+              CreateProfile(chat.simplex.common.platform.chatModel, close)
+            }
+          }
+        }
+        Divider(Modifier.requiredHeight(1.dp))
       }
       if (showSettings) {
         SettingsPickerItem(settingsClicked)
@@ -401,6 +410,16 @@ private fun LinkAMobilePickerItem(onClick: () -> Unit) {
   }
 }
 
+@Composable
+private fun CreateInitialProfile(onClick: () -> Unit) {
+  SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
+    val text = generalGetString(MR.strings.create_chat_profile)
+    Icon(painterResource(MR.images.ic_manage_accounts), text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+    Spacer(Modifier.width(DEFAULT_PADDING + 6.dp))
+    Text(text, color = if (isInDarkTheme()) MenuTextColorDark else Color.Black)
+  }
+}
+
 @Composable
 private fun SettingsPickerItem(onClick: () -> Unit) {
   SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
@@ -441,21 +460,15 @@ private fun switchToLocalDevice() {
   }
 }
 
-private fun switchToRemoteHost(h: RemoteHostInfo, switchingUsersAndHosts: MutableState<Boolean>, connecting: MutableState<Boolean>) {
+private fun switchToRemoteHost(h: RemoteHostInfo, connecting: MutableState<Boolean>) {
   if (!h.activeHost()) {
     withBGApi {
-      val job = launch {
-        delay(500)
-        switchingUsersAndHosts.value = true
-      }
       ModalManager.closeAllModalsEverywhere()
       if (h.sessionState != null) {
         chatModel.controller.switchUIRemoteHost(h.remoteHostId)
       } else {
         connectMobileDevice(h, connecting)
       }
-      job.cancel()
-      switchingUsersAndHosts.value = false
     }
   } else {
     connectMobileDevice(h, connecting)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt

@@ -264,12 +264,13 @@ private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onCli
     text,
     generalGetString(MR.strings.enter_passphrase),
     isValid = ::validKey,
-    keyboardActions = KeyboardActions(onDone = if (enabled) {
+    // Don't enable this on desktop since it interfere with key event listener
+    keyboardActions = KeyboardActions(onDone = if (enabled && appPlatform.isAndroid) {
       { onClick?.invoke() }
     } else null
     ),
     modifier = Modifier.focusRequester(focusRequester).onPreviewKeyEvent {
-      if (onClick != null && it.key == Key.Enter && it.type == KeyEventType.KeyUp) {
+      if (onClick != null && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
         onClick()
         true
       } else {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt

@@ -4,6 +4,7 @@ import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionTextFooter
 import SectionItemView
+import SectionSpacer
 import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.*
@@ -20,6 +21,7 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.model.ChatModel.updatingChatsMutex
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -59,7 +61,9 @@ fun DatabaseView(
   val appFilesCountAndSize = remember { mutableStateOf(directoryFileCountAndSize(appFilesDir.absolutePath)) }
   val importArchiveLauncher = rememberFileChooserLauncher(true) { to: URI? ->
     if (to != null) {
-      importArchiveAlert(m, to, appFilesCountAndSize, progressIndicator)
+      importArchiveAlert(m, to, appFilesCountAndSize, progressIndicator) {
+        startChat(m, chatLastStart, m.chatDbChanged)
+      }
     }
   }
   val chatItemTTL = remember { mutableStateOf(m.chatItemTTL.value) }
@@ -77,7 +81,6 @@ fun DatabaseView(
       m.chatDbEncrypted.value,
       m.controller.appPrefs.storeDBPassphrase.state.value,
       m.controller.appPrefs.initialRandomDBPassphrase,
-      m.controller.appPrefs.developerTools.state.value,
       importArchiveLauncher,
       chatArchiveName,
       chatArchiveTime,
@@ -100,7 +103,13 @@ fun DatabaseView(
           setCiTTL(m, rhId, chatItemTTL, progressIndicator, appFilesCountAndSize)
         }
       },
-      showSettingsModal
+      showSettingsModal,
+      disconnectAllHosts = {
+        val connected = chatModel.remoteHosts.filter { it.sessionState is RemoteHostSessionState.Connected }
+        connected.forEachIndexed { index, h ->
+          controller.stopRemoteHostAndReloadHosts(h, index == connected.lastIndex && chatModel.connectedToRemote())
+        }
+      }
     )
     if (progressIndicator.value) {
       Box(
@@ -129,7 +138,6 @@ fun DatabaseLayout(
   chatDbEncrypted: Boolean?,
   passphraseSaved: Boolean,
   initialRandomDBPassphrase: SharedPreference<Boolean>,
-  developerTools: Boolean,
   importArchiveLauncher: FileChooserLauncher,
   chatArchiveName: MutableState<String?>,
   chatArchiveTime: MutableState<Instant?>,
@@ -144,36 +152,43 @@ fun DatabaseLayout(
   deleteChatAlert: () -> Unit,
   deleteAppFilesAndMedia: () -> Unit,
   onChatItemTTLSelected: (ChatItemTTL) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  disconnectAllHosts: () -> Unit,
 ) {
   val stopped = !runChat
-  val operationsDisabled = !stopped || progressIndicator
+  val operationsDisabled = (!stopped || progressIndicator) && !chatModel.desktopNoUserNoRemote
 
   Column(
     Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
   ) {
     AppBarTitle(stringResource(MR.strings.your_chat_database))
 
-    SectionView(stringResource(MR.strings.messages_section_title).uppercase()) {
-      TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected)
-    }
-    SectionTextFooter(
-      remember(currentUser?.displayName) {
-        buildAnnotatedString {
-          append(generalGetString(MR.strings.messages_section_description) + " ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append(currentUser?.displayName ?: "")
-          }
-          append(".")
-        }
+    if (!chatModel.desktopNoUserNoRemote) {
+      SectionView(stringResource(MR.strings.messages_section_title).uppercase()) {
+        TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected)
       }
-    )
-
-    if (currentRemoteHost == null) {
+      SectionTextFooter(
+        remember(currentUser?.displayName) {
+          buildAnnotatedString {
+            append(generalGetString(MR.strings.messages_section_description) + " ")
+            withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
+              append(currentUser?.displayName ?: "")
+            }
+            append(".")
+          }
+        }
+      )
       SectionDividerSpaced(maxTopPadding = true)
-
+    }
+    val toggleEnabled = remember { chatModel.remoteHosts }.none { it.sessionState is RemoteHostSessionState.Connected }
+    if (chatModel.localUserCreated.value == true) {
       SectionView(stringResource(MR.strings.run_chat_section)) {
-        RunChatSetting(runChat, stopped, startChat, stopChatAlert)
+        if (!toggleEnabled) {
+          SectionItemView(disconnectAllHosts) {
+            Text(generalGetString(MR.strings.disconnect_remote_hosts), Modifier.fillMaxWidth(), color = WarningOrange)
+          }
+        }
+        RunChatSetting(runChat, stopped, toggleEnabled, startChat, stopChatAlert)
       }
       SectionTextFooter(
         if (stopped) {
@@ -183,92 +198,96 @@ fun DatabaseLayout(
         }
       )
       SectionDividerSpaced()
-
-      SectionView(stringResource(MR.strings.chat_database_section)) {
-        val unencrypted = chatDbEncrypted == false
-        SettingsActionItem(
-          if (unencrypted) painterResource(MR.images.ic_lock_open_right) else if (useKeyChain) painterResource(MR.images.ic_vpn_key_filled)
-          else painterResource(MR.images.ic_lock),
-          stringResource(MR.strings.database_passphrase),
-          click = showSettingsModal() { DatabaseEncryptionView(it) },
-          iconColor = if (unencrypted || (appPlatform.isDesktop && passphraseSaved)) WarningOrange else MaterialTheme.colors.secondary,
-          disabled = operationsDisabled
-        )
-        if (appPlatform.isDesktop && developerTools) {
-          SettingsActionItem(
-            painterResource(MR.images.ic_folder_open),
-            stringResource(MR.strings.open_database_folder),
-            ::desktopOpenDatabaseDir,
-            disabled = operationsDisabled
-          )
-        }
-        SettingsActionItem(
-          painterResource(MR.images.ic_ios_share),
-          stringResource(MR.strings.export_database),
-          click = {
-            if (initialRandomDBPassphrase.get()) {
-              exportProhibitedAlert()
-            } else {
-              exportArchive()
-            }
-          },
-          textColor = MaterialTheme.colors.primary,
-          iconColor = MaterialTheme.colors.primary,
-          disabled = operationsDisabled
-        )
-        SettingsActionItem(
-          painterResource(MR.images.ic_download),
-          stringResource(MR.strings.import_database),
-          { withApi { importArchiveLauncher.launch("application/zip") } },
-          textColor = Color.Red,
-          iconColor = Color.Red,
-          disabled = operationsDisabled
-        )
-        val chatArchiveNameVal = chatArchiveName.value
-        val chatArchiveTimeVal = chatArchiveTime.value
-        val chatLastStartVal = chatLastStart.value
-        if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
-          val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
-          SettingsActionItem(
-            painterResource(MR.images.ic_inventory_2),
-            title,
-            click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
-            disabled = operationsDisabled
-          )
-        }
-        SettingsActionItem(
-          painterResource(MR.images.ic_delete_forever),
-          stringResource(MR.strings.delete_database),
-          deleteChatAlert,
-          textColor = Color.Red,
-          iconColor = Color.Red,
-          disabled = operationsDisabled
-        )
-      }
-      SectionDividerSpaced(maxTopPadding = true)
-
-      SectionView(stringResource(MR.strings.files_and_media_section).uppercase()) {
-        val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
-        SectionItemView(
-          deleteAppFilesAndMedia,
-          disabled = deleteFilesDisabled
-        ) {
-          Text(
-            stringResource(if (users.size > 1) MR.strings.delete_files_and_media_for_all_users else MR.strings.delete_files_and_media_all),
-            color = if (deleteFilesDisabled) MaterialTheme.colors.secondary else Color.Red
-          )
-        }
-      }
-      val (count, size) = appFilesCountAndSize.value
-      SectionTextFooter(
-        if (count == 0) {
-          stringResource(MR.strings.no_received_app_files)
-        } else {
-          String.format(stringResource(MR.strings.total_files_count_and_size), count, formatBytes(size))
-        }
-      )
     }
 
+    SectionView(stringResource(MR.strings.chat_database_section)) {
+      if (chatModel.localUserCreated.value != true && !toggleEnabled) {
+        SectionItemView(disconnectAllHosts) {
+          Text(generalGetString(MR.strings.disconnect_remote_hosts), Modifier.fillMaxWidth(), color = WarningOrange)
+        }
+      }
+      val unencrypted = chatDbEncrypted == false
+      SettingsActionItem(
+        if (unencrypted) painterResource(MR.images.ic_lock_open_right) else if (useKeyChain) painterResource(MR.images.ic_vpn_key_filled)
+        else painterResource(MR.images.ic_lock),
+        stringResource(MR.strings.database_passphrase),
+        click = showSettingsModal() { DatabaseEncryptionView(it) },
+        iconColor = if (unencrypted || (appPlatform.isDesktop && passphraseSaved)) WarningOrange else MaterialTheme.colors.secondary,
+        disabled = operationsDisabled
+      )
+      if (appPlatform.isDesktop) {
+        SettingsActionItem(
+          painterResource(MR.images.ic_folder_open),
+          stringResource(MR.strings.open_database_folder),
+          ::desktopOpenDatabaseDir,
+          disabled = operationsDisabled
+        )
+      }
+      SettingsActionItem(
+        painterResource(MR.images.ic_ios_share),
+        stringResource(MR.strings.export_database),
+        click = {
+          if (initialRandomDBPassphrase.get()) {
+            exportProhibitedAlert()
+          } else {
+            exportArchive()
+          }
+        },
+        textColor = MaterialTheme.colors.primary,
+        iconColor = MaterialTheme.colors.primary,
+        disabled = operationsDisabled
+      )
+      SettingsActionItem(
+        painterResource(MR.images.ic_download),
+        stringResource(MR.strings.import_database),
+        { withApi { importArchiveLauncher.launch("application/zip") } },
+        textColor = Color.Red,
+        iconColor = Color.Red,
+        disabled = operationsDisabled
+      )
+      val chatArchiveNameVal = chatArchiveName.value
+      val chatArchiveTimeVal = chatArchiveTime.value
+      val chatLastStartVal = chatLastStart.value
+      if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
+        val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
+        SettingsActionItem(
+          painterResource(MR.images.ic_inventory_2),
+          title,
+          click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
+          disabled = operationsDisabled
+        )
+      }
+      SettingsActionItem(
+        painterResource(MR.images.ic_delete_forever),
+        stringResource(MR.strings.delete_database),
+        deleteChatAlert,
+        textColor = Color.Red,
+        iconColor = Color.Red,
+        disabled = operationsDisabled
+      )
+    }
+    SectionDividerSpaced(maxTopPadding = true)
+
+    SectionView(stringResource(MR.strings.files_and_media_section).uppercase()) {
+      val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
+      SectionItemView(
+        deleteAppFilesAndMedia,
+        disabled = deleteFilesDisabled
+      ) {
+        Text(
+          stringResource(if (users.size > 1) MR.strings.delete_files_and_media_for_all_users else MR.strings.delete_files_and_media_all),
+          color = if (deleteFilesDisabled) MaterialTheme.colors.secondary else Color.Red
+        )
+      }
+    }
+    val (count, size) = appFilesCountAndSize.value
+    SectionTextFooter(
+      if (count == 0) {
+        stringResource(MR.strings.no_received_app_files)
+      } else {
+        String.format(stringResource(MR.strings.total_files_count_and_size), count, formatBytes(size))
+      }
+    )
     SectionBottomSpacer()
   }
 }
@@ -319,6 +338,7 @@ private fun TtlOptions(current: State<ChatItemTTL>, enabled: State<Boolean>, onS
 fun RunChatSetting(
   runChat: Boolean,
   stopped: Boolean,
+  enabled: Boolean,
   startChat: () -> Unit,
   stopChatAlert: () -> Unit
 ) {
@@ -337,6 +357,7 @@ fun RunChatSetting(
           stopChatAlert()
         }
       },
+      enabled = enabled,
     )
   }
 }
@@ -501,13 +522,14 @@ private fun importArchiveAlert(
   m: ChatModel,
   importedArchiveURI: URI,
   appFilesCountAndSize: MutableState<Pair<Int, Long>>,
-  progressIndicator: MutableState<Boolean>
+  progressIndicator: MutableState<Boolean>,
+  startChat: () -> Unit,
 ) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(MR.strings.import_database_question),
     text = generalGetString(MR.strings.your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one),
     confirmText = generalGetString(MR.strings.import_database_confirmation),
-    onConfirm = { importArchive(m, importedArchiveURI, appFilesCountAndSize, progressIndicator) },
+    onConfirm = { importArchive(m, importedArchiveURI, appFilesCountAndSize, progressIndicator, startChat) },
     destructive = true,
   )
 }
@@ -516,7 +538,8 @@ private fun importArchive(
   m: ChatModel,
   importedArchiveURI: URI,
   appFilesCountAndSize: MutableState<Pair<Int, Long>>,
-  progressIndicator: MutableState<Boolean>
+  progressIndicator: MutableState<Boolean>,
+  startChat: () -> Unit,
 ) {
   progressIndicator.value = true
   val archivePath = saveArchiveFromURI(importedArchiveURI)
@@ -533,6 +556,10 @@ private fun importArchive(
             operationEnded(m, progressIndicator) {
               AlertManager.shared.showAlertMsg(generalGetString(MR.strings.chat_database_imported), text = generalGetString(MR.strings.restart_the_app_to_use_imported_chat_database))
             }
+            if (chatModel.localUserCreated.value == false) {
+              chatModel.chatRunning.value = false
+              startChat()
+            }
           } else {
             operationEnded(m, progressIndicator) {
               AlertManager.shared.showAlertMsg(generalGetString(MR.strings.chat_database_imported), text = generalGetString(MR.strings.restart_the_app_to_use_imported_chat_database) + "\n" + generalGetString(MR.strings.non_fatal_errors_occured_during_import))
@@ -681,7 +708,6 @@ fun PreviewDatabaseLayout() {
       chatDbEncrypted = false,
       passphraseSaved = false,
       initialRandomDBPassphrase = SharedPreference({ true }, {}),
-      developerTools = true,
       importArchiveLauncher = rememberFileChooserLauncher(true) {},
       chatArchiveName = remember { mutableStateOf("dummy_archive") },
       chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
@@ -697,6 +723,7 @@ fun PreviewDatabaseLayout() {
       deleteAppFilesAndMedia = {},
       showSettingsModal = { {} },
       onChatItemTTLSelected = {},
+      disconnectAllHosts = {},
     )
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt

@@ -1,8 +1,11 @@
 package chat.simplex.common.views.helpers
 
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -21,7 +24,7 @@ import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.painterResource
 
 class AlertManager {
-  var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
+  private var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
 
   fun showAlert(alert: @Composable () -> Unit) {
     Log.d(TAG, "AlertManager.showAlert")
@@ -32,6 +35,12 @@ class AlertManager {
     alertViews.removeLastOrNull()
   }
 
+  fun hideAllAlerts() {
+    alertViews.clear()
+  }
+
+  fun hasAlertsShown() = alertViews.isNotEmpty()
+
   fun showAlertDialogButtons(
     title: String,
     text: String? = null,
@@ -217,6 +226,7 @@ class AlertManager {
 
   companion object {
     val shared = AlertManager()
+    val privacySensitive = AlertManager()
   }
 }
 
@@ -233,53 +243,71 @@ private fun alertTitle(title: String): (@Composable () -> Unit)? {
 
 @Composable
 private fun AlertContent(text: String?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  Column(
-    Modifier
-      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-  ) {
-    if (appPlatform.isDesktop) {
-      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-    } else {
-      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-    }
-    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-      if (text != null) {
-        Text(
-          escapedHtmlToAnnotatedString(text, LocalDensity.current),
-          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-          fontSize = 16.sp,
-          textAlign = TextAlign.Center,
-          color = MaterialTheme.colors.secondary
-        )
+  BoxWithConstraints {
+    Column(
+      Modifier
+        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+    ) {
+      if (appPlatform.isDesktop) {
+        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+      } else {
+        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
       }
+      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+        if (text != null) {
+          Column(Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
+            .verticalScroll(rememberScrollState())
+          ) {
+            SelectionContainer {
+              Text(
+                escapedHtmlToAnnotatedString(text, LocalDensity.current),
+                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+                fontSize = 16.sp,
+                textAlign = TextAlign.Center,
+                color = MaterialTheme.colors.secondary
+              )
+            }
+          }
+        }
+      }
+      content()
     }
-    content()
   }
 }
 
 @Composable
 private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  Column(
-    Modifier
-      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-  ) {
-    if (appPlatform.isDesktop) {
-      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-    } else {
-      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-    }
-    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-      if (text != null) {
-        Text(
-          text,
-          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-          fontSize = 16.sp,
-          textAlign = TextAlign.Center,
-          color = MaterialTheme.colors.secondary
-        )
+  BoxWithConstraints {
+    Column(
+      Modifier
+        .verticalScroll(rememberScrollState())
+        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+    ) {
+      if (appPlatform.isDesktop) {
+        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+      } else {
+        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
       }
+      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+        if (text != null) {
+          Column(
+            Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
+              .verticalScroll(rememberScrollState())
+          ) {
+            SelectionContainer {
+              Text(
+                text,
+                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+                fontSize = 16.sp,
+                textAlign = TextAlign.Center,
+                color = MaterialTheme.colors.secondary
+              )
+            }
+          }
+        }
+      }
+      content()
     }
-    content()
   }
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultBasicTextField.kt

@@ -19,8 +19,8 @@ import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.*
 import chat.simplex.common.views.database.PassphraseStrength
 import chat.simplex.common.views.database.validKey
 import chat.simplex.res.MR
@@ -123,6 +123,7 @@ fun DefaultConfigurableTextField(
   isValid: (String) -> Boolean,
   keyboardActions: KeyboardActions = KeyboardActions(),
   keyboardType: KeyboardType = KeyboardType.Text,
+  fontSize: TextUnit = 16.sp,
   dependsOn: State<Any?>? = null,
 ) {
   var valid by remember { mutableStateOf(isValid(state.value.text)) }
@@ -152,7 +153,6 @@ fun DefaultConfigurableTextField(
   BasicTextField(
     value = state.value,
     modifier = modifier
-      .fillMaxWidth()
       .background(colors.backgroundColor(enabled).value, shape)
       .indicatorLine(enabled, false, interactionSource, colors)
       .defaultMinSize(
@@ -176,14 +176,14 @@ fun DefaultConfigurableTextField(
     textStyle = TextStyle.Default.copy(
       color = color,
       fontWeight = FontWeight.Normal,
-      fontSize = 16.sp
+      fontSize = fontSize
     ),
     interactionSource = interactionSource,
     decorationBox = @Composable { innerTextField ->
       TextFieldDefaults.TextFieldDecorationBox(
         value = state.value.text,
         innerTextField = innerTextField,
-        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary) },
+        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary, fontSize = fontSize, maxLines = 1, overflow = TextOverflow.Ellipsis) },
         singleLine = true,
         enabled = enabled,
         isError = !valid,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ExposedDropDownSettingRow.kt

@@ -10,72 +10,90 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.*
 import chat.simplex.res.MR
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
 
+@Composable
+fun <T> ExposedDropDownSetting(
+  values: List<Pair<T, String>>,
+  selection: State<T>,
+  textColor: Color = MaterialTheme.colors.secondary,
+  fontSize: TextUnit = 16.sp,
+  label: String? = null,
+  enabled: State<Boolean> = mutableStateOf(true),
+  minWidth: Dp = 200.dp,
+  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
+  onSelected: (T) -> Unit
+) {
+  val expanded = remember { mutableStateOf(false) }
+  ExposedDropdownMenuBox(
+    expanded = expanded.value,
+    onExpandedChange = {
+      expanded.value = !expanded.value && enabled.value
+    }
+  ) {
+    Row(
+      Modifier.padding(start = 10.dp),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.End
+    ) {
+      Text(
+        values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
+        Modifier.widthIn(max = maxWidth),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        color = textColor,
+        fontSize = fontSize,
+      )
+      Spacer(Modifier.size(12.dp))
+      Icon(
+        if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
+        generalGetString(MR.strings.icon_descr_more_button),
+        tint = MaterialTheme.colors.secondary
+      )
+    }
+    DefaultExposedDropdownMenu(
+      modifier = Modifier.widthIn(min = minWidth),
+      expanded = expanded,
+    ) {
+      values.forEach { selectionOption ->
+        DropdownMenuItem(
+          onClick = {
+            onSelected(selectionOption.first)
+            expanded.value = false
+          },
+          contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
+        ) {
+          Text(
+            selectionOption.second + (if (label != null) " $label" else ""),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+            fontSize = fontSize,
+          )
+        }
+      }
+    }
+  }
+}
+
 @Composable
 fun <T> ExposedDropDownSettingRow(
   title: String,
   values: List<Pair<T, String>>,
   selection: State<T>,
+  textColor: Color = MaterialTheme.colors.secondary,
   label: String? = null,
   icon: Painter? = null,
   iconTint: Color = MaterialTheme.colors.secondary,
   enabled: State<Boolean> = mutableStateOf(true),
+  minWidth: Dp = 200.dp,
+  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
   onSelected: (T) -> Unit
 ) {
   SettingsActionItemWithContent(icon, title, iconColor = iconTint, disabled = !enabled.value) {
-    val expanded = remember { mutableStateOf(false) }
-    ExposedDropdownMenuBox(
-      expanded = expanded.value,
-      onExpandedChange = {
-        expanded.value = !expanded.value && enabled.value
-      }
-    ) {
-      Row(
-        Modifier.padding(start = 10.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.End
-      ) {
-        val maxWidth = with(LocalDensity.current) { 180.sp.toDp() }
-        Text(
-          values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
-          Modifier.widthIn(max = maxWidth),
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          color = MaterialTheme.colors.secondary
-        )
-        Spacer(Modifier.size(12.dp))
-        Icon(
-          if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
-          generalGetString(MR.strings.icon_descr_more_button),
-          tint = MaterialTheme.colors.secondary
-        )
-      }
-      DefaultExposedDropdownMenu(
-        modifier = Modifier.widthIn(min = 200.dp),
-        expanded = expanded,
-      ) {
-        values.forEach { selectionOption ->
-          DropdownMenuItem(
-            onClick = {
-              onSelected(selectionOption.first)
-              expanded.value = false
-            },
-            contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
-          ) {
-            Text(
-              selectionOption.second + (if (label != null) " $label" else ""),
-              maxLines = 1,
-              overflow = TextOverflow.Ellipsis,
-              color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
-            )
-          }
-        }
-      }
-    }
+    ExposedDropDownSetting(values, selection ,textColor, label = label, enabled = enabled, minWidth = minWidth, maxWidth = maxWidth, onSelected = onSelected)
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt

@@ -10,6 +10,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalDensity
 import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.platform.onRightClick
@@ -202,13 +203,14 @@ fun SectionTextFooter(text: String) {
 }
 
 @Composable
-fun SectionTextFooter(text: AnnotatedString) {
+fun SectionTextFooter(text: AnnotatedString, textAlign: TextAlign = TextAlign.Start) {
   Text(
     text,
     Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
     color = MaterialTheme.colors.secondary,
     lineHeight = 18.sp,
-    fontSize = 14.sp
+    fontSize = 14.sp,
+    textAlign = textAlign
   )
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt

@@ -55,7 +55,7 @@ fun annotatedStringResource(id: StringResource): AnnotatedString {
 @Composable
 fun annotatedStringResource(id: StringResource, vararg args: Any?): AnnotatedString {
   val density = LocalDensity.current
-  return remember(id) {
+  return remember(id, args) {
     escapedHtmlToAnnotatedString(id.localized().format(args = args), density)
   }
 }
@@ -390,6 +390,28 @@ fun IntSize.Companion.Saver(): Saver<IntSize, *> = Saver(
   restore = { IntSize(it.first, it.second) }
 )
 
+private var lastExecutedComposables = HashSet<Any>()
+private val failedComposables = HashSet<Any>()
+
+@Composable
+fun tryOrShowError(key: Any = Exception().stackTraceToString().lines()[2], error: @Composable () -> Unit = {}, content: @Composable () -> Unit) {
+  if (!failedComposables.contains(key)) {
+    lastExecutedComposables.add(key)
+    content()
+    lastExecutedComposables.remove(key)
+  } else {
+    error()
+  }
+}
+
+fun includeMoreFailedComposables() {
+  lastExecutedComposables.forEach {
+    failedComposables.add(it)
+    Log.i(TAG, "Added composable key as failed: $it")
+  }
+  lastExecutedComposables.clear()
+}
+
 @Composable
 fun DisposableEffectOnGone(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenGone: () -> Unit) {
   DisposableEffect(Unit) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt

@@ -70,7 +70,8 @@ private fun deleteStorageAndRestart(m: ChatModel, password: String, completed: (
         m.controller.startChat(createdUser)
       }
       ModalManager.fullscreen.closeModals()
-      AlertManager.shared.hideAlert()
+      AlertManager.shared.hideAllAlerts()
+      AlertManager.privacySensitive.hideAllAlerts()
       completed(LAResult.Success)
     } catch (e: Exception) {
       completed(LAResult.Error(generalGetString(MR.strings.incorrect_passcode)))

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/CreateLinkView.kt

@@ -108,6 +108,7 @@ private fun createInvitation(
   withApi {
     val r = m.controller.apiAddContact(rhId, incognito = m.controller.appPrefs.incognito.get())
     if (r != null) {
+      m.updateContactConnection(rhId, r.second)
       connReqInvitation.value = r.first
       contactConnection.value = r.second
     } else {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt

@@ -67,7 +67,7 @@ fun QRCode(
           scope.launch {
             val image = qrCodeBitmap(connReq, 1024).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
               .let { if (withLogo) it.addLogo() else it }
-            val file = saveTempImageUncompressed(image, false)
+            val file = saveTempImageUncompressed(image, true)
             if (file != null) {
               shareFile("", CryptoFile.plain(file.absolutePath))
             }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ScanToConnectView.kt

@@ -20,7 +20,7 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.usersettings.*
+import chat.simplex.common.views.usersettings.IncognitoView
 import chat.simplex.res.MR
 import java.net.URI
 
@@ -58,7 +58,7 @@ suspend fun planAndConnect(
         InvitationLinkPlan.OwnLink -> {
           Log.d(TAG, "planAndConnect, .InvitationLink, .OwnLink, incognito=$incognito")
           if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
+            AlertManager.privacySensitive.showAlertDialog(
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_one_time_link),
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
@@ -80,13 +80,13 @@ suspend fun planAndConnect(
           val contact = connectionPlan.invitationLinkPlan.contact_
           if (contact != null) {
             openKnownContact(chatModel, rhId, close, contact)
-            AlertManager.shared.showAlertMsg(
+            AlertManager.privacySensitive.showAlertMsg(
               generalGetString(MR.strings.contact_already_exists),
               String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName),
               hostDevice = hostDevice(rhId),
             )
           } else {
-            AlertManager.shared.showAlertMsg(
+            AlertManager.privacySensitive.showAlertMsg(
               generalGetString(MR.strings.connect_plan_already_connecting),
               generalGetString(MR.strings.connect_plan_you_are_already_connecting_via_this_one_time_link),
               hostDevice = hostDevice(rhId),
@@ -97,7 +97,7 @@ suspend fun planAndConnect(
           Log.d(TAG, "planAndConnect, .InvitationLink, .Known, incognito=$incognito")
           val contact = connectionPlan.invitationLinkPlan.contact
           openKnownContact(chatModel, rhId, close, contact)
-          AlertManager.shared.showAlertMsg(
+          AlertManager.privacySensitive.showAlertMsg(
             generalGetString(MR.strings.contact_already_exists),
             String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName),
             hostDevice = hostDevice(rhId),
@@ -121,7 +121,7 @@ suspend fun planAndConnect(
         ContactAddressPlan.OwnLink -> {
           Log.d(TAG, "planAndConnect, .ContactAddress, .OwnLink, incognito=$incognito")
           if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
+            AlertManager.privacySensitive.showAlertDialog(
               title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
               text = generalGetString(MR.strings.connect_plan_this_is_your_own_simplex_address),
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
@@ -141,7 +141,7 @@ suspend fun planAndConnect(
         ContactAddressPlan.ConnectingConfirmReconnect -> {
           Log.d(TAG, "planAndConnect, .ContactAddress, .ConnectingConfirmReconnect, incognito=$incognito")
           if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
+            AlertManager.privacySensitive.showAlertDialog(
               title = generalGetString(MR.strings.connect_plan_repeat_connection_request),
               text = generalGetString(MR.strings.connect_plan_you_have_already_requested_connection_via_this_address),
               confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
@@ -162,7 +162,7 @@ suspend fun planAndConnect(
           Log.d(TAG, "planAndConnect, .ContactAddress, .ConnectingProhibit, incognito=$incognito")
           val contact = connectionPlan.contactAddressPlan.contact
           openKnownContact(chatModel, rhId, close, contact)
-          AlertManager.shared.showAlertMsg(
+          AlertManager.privacySensitive.showAlertMsg(
             generalGetString(MR.strings.contact_already_exists),
             String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName),
             hostDevice = hostDevice(rhId),
@@ -172,7 +172,7 @@ suspend fun planAndConnect(
           Log.d(TAG, "planAndConnect, .ContactAddress, .Known, incognito=$incognito")
           val contact = connectionPlan.contactAddressPlan.contact
           openKnownContact(chatModel, rhId, close, contact)
-          AlertManager.shared.showAlertMsg(
+          AlertManager.privacySensitive.showAlertMsg(
             generalGetString(MR.strings.contact_already_exists),
             String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName),
             hostDevice = hostDevice(rhId),
@@ -193,7 +193,7 @@ suspend fun planAndConnect(
         GroupLinkPlan.Ok -> {
           Log.d(TAG, "planAndConnect, .GroupLink, .Ok, incognito=$incognito")
           if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
+            AlertManager.privacySensitive.showAlertDialog(
               title = generalGetString(MR.strings.connect_via_group_link),
               text = generalGetString(MR.strings.you_will_join_group),
               confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
@@ -217,7 +217,7 @@ suspend fun planAndConnect(
         GroupLinkPlan.ConnectingConfirmReconnect -> {
           Log.d(TAG, "planAndConnect, .GroupLink, .ConnectingConfirmReconnect, incognito=$incognito")
           if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
+            AlertManager.privacySensitive.showAlertDialog(
               title = generalGetString(MR.strings.connect_plan_repeat_join_request),
               text = generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link),
               confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
@@ -238,12 +238,12 @@ suspend fun planAndConnect(
           Log.d(TAG, "planAndConnect, .GroupLink, .ConnectingProhibit, incognito=$incognito")
           val groupInfo = connectionPlan.groupLinkPlan.groupInfo_
           if (groupInfo != null) {
-            AlertManager.shared.showAlertMsg(
+            AlertManager.privacySensitive.showAlertMsg(
               generalGetString(MR.strings.connect_plan_group_already_exists),
               String.format(generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_vName), groupInfo.displayName)
             )
           } else {
-            AlertManager.shared.showAlertMsg(
+            AlertManager.privacySensitive.showAlertMsg(
               generalGetString(MR.strings.connect_plan_already_joining_the_group),
               generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link),
               hostDevice = hostDevice(rhId),
@@ -254,7 +254,7 @@ suspend fun planAndConnect(
           Log.d(TAG, "planAndConnect, .GroupLink, .Known, incognito=$incognito")
           val groupInfo = connectionPlan.groupLinkPlan.groupInfo
           openKnownGroup(chatModel, rhId, close, groupInfo)
-          AlertManager.shared.showAlertMsg(
+          AlertManager.privacySensitive.showAlertMsg(
             generalGetString(MR.strings.connect_plan_group_already_exists),
             String.format(generalGetString(MR.strings.connect_plan_you_are_already_in_group_vName), groupInfo.displayName),
             hostDevice = hostDevice(rhId),
@@ -283,12 +283,13 @@ suspend fun connectViaUri(
   incognito: Boolean,
   connectionPlan: ConnectionPlan?,
   close: (() -> Unit)?
-): Boolean {
-  val r = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
+) {
+  val pcc = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
   val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
-  if (r) {
+  if (pcc != null) {
+    chatModel.updateContactConnection(rhId, pcc)
     close?.invoke()
-    AlertManager.shared.showAlertMsg(
+    AlertManager.privacySensitive.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
       text =
       when (connLinkType) {
@@ -299,7 +300,6 @@ suspend fun connectViaUri(
       hostDevice = hostDevice(rhId),
     )
   }
-  return r
 }
 
 fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {
@@ -320,14 +320,14 @@ fun askCurrentOrIncognitoProfileAlert(
   text: AnnotatedString? = null,
   connectDestructive: Boolean,
 ) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
+  AlertManager.privacySensitive.showAlertDialogButtonsColumn(
     title = title,
     text = text,
     buttons = {
       Column {
         val connectColor = if (connectDestructive) MaterialTheme.colors.error else MaterialTheme.colors.primary
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
           withApi {
             connectViaUri(chatModel, rhId, uri, incognito = false, connectionPlan, close)
           }
@@ -335,7 +335,7 @@ fun askCurrentOrIncognitoProfileAlert(
           Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
         }
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
           withApi {
             connectViaUri(chatModel, rhId, uri, incognito = true, connectionPlan, close)
           }
@@ -343,7 +343,7 @@ fun askCurrentOrIncognitoProfileAlert(
           Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
         }
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
         }) {
           Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
@@ -372,14 +372,14 @@ fun ownGroupLinkConfirmConnect(
   groupInfo: GroupInfo,
   close: (() -> Unit)?,
 ) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
+  AlertManager.privacySensitive.showAlertDialogButtonsColumn(
     title = generalGetString(MR.strings.connect_plan_join_your_group),
     text = AnnotatedString(String.format(generalGetString(MR.strings.connect_plan_this_is_your_link_for_group_vName), groupInfo.displayName)),
     buttons = {
       Column {
         // Open group
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
           openKnownGroup(chatModel, rhId, close, groupInfo)
         }) {
           Text(generalGetString(MR.strings.connect_plan_open_group), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
@@ -387,7 +387,7 @@ fun ownGroupLinkConfirmConnect(
         if (incognito != null) {
           // Join incognito / Join with current profile
           SectionItemView({
-            AlertManager.shared.hideAlert()
+            AlertManager.privacySensitive.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close)
             }
@@ -400,7 +400,7 @@ fun ownGroupLinkConfirmConnect(
         } else {
           // Use current profile
           SectionItemView({
-            AlertManager.shared.hideAlert()
+            AlertManager.privacySensitive.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito = false, connectionPlan, close)
             }
@@ -409,7 +409,7 @@ fun ownGroupLinkConfirmConnect(
           }
           // Use new incognito profile
           SectionItemView({
-            AlertManager.shared.hideAlert()
+            AlertManager.privacySensitive.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito = true, connectionPlan, close)
             }
@@ -419,7 +419,7 @@ fun ownGroupLinkConfirmConnect(
         }
         // Cancel
         SectionItemView({
-          AlertManager.shared.hideAlert()
+          AlertManager.privacySensitive.hideAlert()
         }) {
           Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/CreateSimpleXAddress.kt

@@ -48,14 +48,6 @@ fun CreateSimpleXAddress(m: ChatModel, rhId: Long?) {
         val connReqContact = m.controller.apiCreateUserAddress(rhId)
         if (connReqContact != null) {
           m.userAddress.value = UserContactLinkRec(connReqContact)
-          try {
-            val u = m.controller.apiSetProfileAddress(rhId, true)
-            if (u != null) {
-              m.updateUser(u)
-            }
-          } catch (e: Exception) {
-            Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}")
-          }
           progressIndicator = false
         }
       }
@@ -100,7 +92,7 @@ private fun CreateSimpleXAddressLayout(
       ContinueButton(nextStep)
     } else {
       CreateAddressButton(createAddress)
-      TextBelowButton(stringResource(MR.strings.your_contacts_will_see_it))
+      TextBelowButton(stringResource(MR.strings.you_can_make_address_visible_via_settings))
       Spacer(Modifier.weight(1f))
       SkipButton(nextStep)
     }
@@ -182,6 +174,10 @@ private fun prepareChatBeforeAddressCreation(rhId: Long?) {
     val user = chatModel.controller.apiGetActiveUser(rhId) ?: return@withApi
     chatModel.currentUser.value = user
     if (chatModel.users.isEmpty()) {
+      if (appPlatform.isDesktop) {
+        // Make possible to use chat after going to remote device linking and returning back to local profile creation
+        chatModel.chatRunning.value = false
+      }
       chatModel.controller.startChat(user)
     } else {
       val users = chatModel.controller.listUsers(rhId)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/LinkAMobileView.kt

@@ -0,0 +1,92 @@
+package chat.simplex.common.views.onboarding
+
+import SectionTextFooter
+import SectionView
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.ChatModel
+import chat.simplex.common.platform.chatModel
+import chat.simplex.common.ui.theme.DEFAULT_PADDING
+import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.remote.AddingMobileDevice
+import chat.simplex.common.views.remote.DeviceNameField
+import chat.simplex.common.views.usersettings.PreferenceToggle
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
+
+@Composable
+fun LinkAMobile() {
+  val connecting = rememberSaveable { mutableStateOf(false) }
+  val deviceName = chatModel.controller.appPrefs.deviceNameForRemoteAccess
+  var deviceNameInQrCode by remember { mutableStateOf(chatModel.controller.appPrefs.deviceNameForRemoteAccess.get()) }
+  val staleQrCode = remember { mutableStateOf(false) }
+
+  LinkAMobileLayout(
+    deviceName = remember { deviceName.state },
+    connecting,
+    staleQrCode,
+    updateDeviceName = {
+      withBGApi {
+        if (it != "" && it != deviceName.get()) {
+          chatModel.controller.setLocalDeviceName(it)
+          deviceName.set(it)
+          staleQrCode.value = deviceName.get() != deviceNameInQrCode
+        }
+      }
+    }
+  )
+  KeyChangeEffect(staleQrCode.value) {
+    if (!staleQrCode.value) {
+      deviceNameInQrCode = deviceName.get()
+    }
+  }
+}
+
+@Composable
+private fun LinkAMobileLayout(
+  deviceName: State<String?>,
+  connecting: MutableState<Boolean>,
+  staleQrCode: MutableState<Boolean>,
+  updateDeviceName: (String) -> Unit,
+) {
+  Column(Modifier.padding(top = 20.dp)) {
+    AppBarTitle(stringResource(if (remember { chatModel.remoteHosts }.isEmpty()) MR.strings.link_a_mobile else MR.strings.linked_mobiles))
+    Row(Modifier.weight(1f).padding(horizontal = DEFAULT_PADDING * 2), verticalAlignment = Alignment.CenterVertically) {
+      Column(
+        Modifier.weight(0.3f),
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+      ) {
+        SectionView(generalGetString(MR.strings.this_device_name).uppercase()) {
+          DeviceNameField(deviceName.value ?: "") { updateDeviceName(it) }
+          SectionTextFooter(generalGetString(MR.strings.this_device_name_shared_with_mobile))
+          PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), remember { ChatModel.controller.appPrefs.offerRemoteMulticast.state }.value) {
+            ChatModel.controller.appPrefs.offerRemoteMulticast.set(it)
+          }
+        }
+      }
+      Box(Modifier.weight(0.7f)) {
+        AddingMobileDevice(false, staleQrCode, connecting) {
+          // currentRemoteHost will be set instantly but remoteHosts may be delayed
+          if (chatModel.remoteHosts.isEmpty() && chatModel.currentRemoteHost.value == null) {
+            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+          } else {
+            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
+          }
+        }
+      }
+    }
+    SimpleButtonDecorated(
+      text = stringResource(MR.strings.about_simplex),
+      icon = painterResource(MR.images.ic_arrow_back_ios_new),
+      textDecoration = TextDecoration.None,
+      fontWeight = FontWeight.Medium
+    ) { chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo) }
+  }
+}

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/OnboardingView.kt

@@ -3,6 +3,7 @@ package chat.simplex.common.views.onboarding
 enum class OnboardingStage {
   Step1_SimpleXInfo,
   Step2_CreateProfile,
+  LinkAMobile,
   Step2_5_SetupDatabasePassphrase,
   Step3_CreateSimpleXAddress,
   Step4_SetNotificationsMode,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SetupDatabasePassphrase.kt

@@ -1,10 +1,7 @@
 package chat.simplex.common.views.onboarding
 
 import SectionBottomSpacer
-import SectionItemView
-import SectionItemViewSpaceBetween
 import SectionTextFooter
-import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -15,14 +12,12 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.*
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
@@ -43,7 +38,11 @@ fun SetupDatabasePassphrase(m: ChatModel) {
   val newKey = rememberSaveable { mutableStateOf("") }
   val confirmNewKey = rememberSaveable { mutableStateOf("") }
   fun nextStep() {
-    m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
+    if (appPlatform.isAndroid || chatModel.currentUser.value != null) {
+      m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
+    } else {
+      m.controller.appPrefs.onboardingStage.set(OnboardingStage.LinkAMobile)
+    }
   }
   SetupDatabasePassphraseLayout(
     currentKey,
@@ -121,7 +120,7 @@ private fun SetupDatabasePassphraseLayout(
           .padding(horizontal = DEFAULT_PADDING)
           .focusRequester(focusRequester)
           .onPreviewKeyEvent {
-            if (it.key == Key.Enter && it.type == KeyEventType.KeyUp) {
+            if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
               focusManager.moveFocus(FocusDirection.Down)
               true
             } else {
@@ -151,7 +150,7 @@ private fun SetupDatabasePassphraseLayout(
         modifier = Modifier
           .padding(horizontal = DEFAULT_PADDING)
           .onPreviewKeyEvent {
-            if (!disabled && it.key == Key.Enter && it.type == KeyEventType.KeyUp) {
+            if (!disabled && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
               onClickUpdate()
               true
             } else {
@@ -159,10 +158,7 @@ private fun SetupDatabasePassphraseLayout(
             }
           },
         isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
-        keyboardActions = KeyboardActions(onDone = {
-          if (!disabled) onClickUpdate()
-          defaultKeyboardAction(ImeAction.Done)
-        }),
+        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
       )
 
       Box(Modifier.align(Alignment.CenterHorizontally).padding(vertical = DEFAULT_PADDING)) {
@@ -176,7 +172,10 @@ private fun SetupDatabasePassphraseLayout(
     }
 
     Spacer(Modifier.weight(1f))
-    SkipButton(progressIndicator.value, nextStep)
+    SkipButton(progressIndicator.value) {
+      chatModel.desktopOnboardingRandomPassword.value = true
+      nextStep()
+    }
 
     SectionBottomSpacer()
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt

@@ -8,6 +8,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -99,26 +100,22 @@ private fun InfoRow(icon: Painter, titleId: StringResource, textId: StringResour
 }
 
 @Composable
-fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)? = null) {
-  if (user == null) {
-    OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, onclick)
-  } else {
-    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick)
-  }
-}
+expect fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)? = null)
 
 @Composable
 fun OnboardingActionButton(
   labelId: StringResource,
   onboarding: OnboardingStage?,
   border: Boolean,
+  icon: Painter? = null,
+  iconColor: Color = MaterialTheme.colors.primary,
   onclick: (() -> Unit)?
 ) {
   val modifier = if (border) {
     Modifier
       .border(border = BorderStroke(1.dp, MaterialTheme.colors.primary), shape = RoundedCornerShape(50))
       .padding(
-      horizontal = DEFAULT_PADDING * 2,
+      horizontal = if (icon == null) DEFAULT_PADDING * 2 else DEFAULT_PADDING_HALF,
       vertical = 4.dp
     )
   } else {
@@ -131,6 +128,9 @@ fun OnboardingActionButton(
       ChatController.appPrefs.onboardingStage.set(onboarding)
     }
   }, modifier) {
+    if (icon != null) {
+      Icon(icon, stringResource(labelId), Modifier.padding(end = DEFAULT_PADDING_HALF), tint = iconColor)
+    }
     Text(stringResource(labelId), style = MaterialTheme.typography.h2, color = MaterialTheme.colors.primary, fontSize = 20.sp)
     Icon(
       painterResource(MR.images.ic_arrow_forward_ios), "next stage", tint = MaterialTheme.colors.primary,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt

@@ -9,16 +9,20 @@ import SectionView
 import TextIconSpaced
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.input.*
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
@@ -30,11 +34,11 @@ import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCode
-import chat.simplex.common.views.usersettings.PreferenceToggle
-import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
+import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.flow.distinctUntilChanged
 
 @Composable
 fun ConnectMobileView() {
@@ -97,9 +101,11 @@ fun ConnectMobileLayout(
       SectionDividerSpaced(maxBottomPadding = false)
     }
     SectionView(stringResource(MR.strings.devices).uppercase()) {
-      SettingsActionItemWithContent(text = stringResource(MR.strings.this_device), icon = painterResource(MR.images.ic_desktop), click = connectDesktop) {
-        if (connectedHost.value == null) {
-          Icon(painterResource(MR.images.ic_done_filled), null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+      if (chatModel.localUserCreated.value == true) {
+        SettingsActionItemWithContent(text = stringResource(MR.strings.this_device), icon = painterResource(MR.images.ic_desktop), click = connectDesktop) {
+          if (connectedHost.value == null) {
+            Icon(painterResource(MR.images.ic_done_filled), null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+          }
         }
       }
 
@@ -152,7 +158,7 @@ fun DeviceNameField(
   DefaultConfigurableTextField(
     state = state,
     placeholder = generalGetString(MR.strings.enter_this_device_name),
-    modifier = Modifier.padding(start = DEFAULT_PADDING),
+    modifier = Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING),
     isValid = { true },
   )
   KeyChangeEffect(state.value) {
@@ -162,26 +168,40 @@ fun DeviceNameField(
 
 @Composable
 private fun ConnectMobileViewLayout(
-  title: String,
+  title: String?,
   invitation: String?,
   deviceName: String?,
   sessionCode: String?,
-  port: String?
+  port: String?,
+  staleQrCode: Boolean = false,
+  refreshQrCode: () -> Unit = {},
+  UnderQrLayout: @Composable () -> Unit = {},
 ) {
   Column(
     Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
     verticalArrangement = Arrangement.spacedBy(8.dp)
   ) {
-    AppBarTitle(title)
+    if (title != null) {
+      AppBarTitle(title)
+    }
     SectionView {
       if (invitation != null && sessionCode == null && port != null) {
-        QRCode(
-          invitation, Modifier
-            .padding(start = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING_HALF)
-            .aspectRatio(1f)
-        )
-        SectionTextFooter(annotatedStringResource(MR.strings.open_on_mobile_and_scan_qr_code))
-        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect_on_port, port))
+        Box {
+          QRCode(
+            invitation, Modifier
+              .padding(start = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING_HALF)
+              .aspectRatio(1f)
+          )
+          if (staleQrCode) {
+            Box(Modifier.matchParentSize().background(MaterialTheme.colors.background.copy(alpha = 0.9f)), contentAlignment = Alignment.Center) {
+              SimpleButtonDecorated(stringResource(MR.strings.refresh_qr_code), painterResource(MR.images.ic_refresh), click = refreshQrCode)
+            }
+          }
+        }
+        SectionTextFooter(annotatedStringResource(MR.strings.open_on_mobile_and_scan_qr_code), textAlign = TextAlign.Center)
+        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect), textAlign = TextAlign.Center)
+
+        UnderQrLayout()
 
         if (remember { controller.appPrefs.developerTools.state }.value) {
           val clipboard = LocalClipboardManager.current
@@ -218,6 +238,9 @@ private fun ConnectMobileViewLayout(
         }
       }
     }
+    if (invitation != null) {
+      SectionBottomSpacer()
+    }
   }
 }
 
@@ -237,64 +260,105 @@ fun connectMobileDevice(rh: RemoteHostInfo, connecting: MutableState<Boolean>) {
 
 private fun showAddingMobileDevice(connecting: MutableState<Boolean>) {
   ModalManager.start.showModalCloseable { close ->
-    val invitation = rememberSaveable { mutableStateOf<String?>(null) }
-    val port = rememberSaveable { mutableStateOf<String?>(null) }
-    val pairing = remember { chatModel.remoteHostPairing }
-    val sessionCode = when (val state = pairing.value?.second) {
-      is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
-      else -> null
-    }
-    /** It's needed to prevent screen flashes when [chatModel.newRemoteHostPairing] sets to null in background */
-    var cachedSessionCode by remember { mutableStateOf<String?>(null) }
-    if (cachedSessionCode == null && sessionCode != null) {
-      cachedSessionCode = sessionCode
-    }
-    val remoteDeviceName = pairing.value?.first?.hostDeviceName
-    ConnectMobileViewLayout(
-      title = if (cachedSessionCode == null) stringResource(MR.strings.link_a_mobile) else stringResource(MR.strings.verify_connection),
-      invitation = invitation.value,
-      deviceName = remoteDeviceName,
-      sessionCode = cachedSessionCode,
-      port = port.value
+    AddingMobileDevice(true, remember { mutableStateOf(false) }, connecting, close)
+  }
+}
+
+@Composable
+fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, connecting: MutableState<Boolean>, close: () -> Unit) {
+  var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
+  val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
+  val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
+  val startRemoteHost = suspend {
+    val r = chatModel.controller.startRemoteHost(
+      rhId = null,
+      multicast = controller.appPrefs.offerRemoteMulticast.get(),
+      address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_,
+      port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_
     )
-    val oldRemoteHostId by remember { mutableStateOf(chatModel.currentRemoteHost.value?.remoteHostId) }
-    LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
-      if (chatModel.currentRemoteHost.value?.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != oldRemoteHostId) {
-        close()
-      }
+    if (r != null) {
+      cachedR = r
+      connecting.value = true
+      customAddress.value = cachedR.addresses.firstOrNull()
+      customPort.value = cachedR.port
+      chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
     }
-    KeyChangeEffect(pairing.value) {
-      if (pairing.value == null) {
-        close()
-      }
-    }
-    DisposableEffect(Unit) {
+  }
+  val pairing = remember { chatModel.remoteHostPairing }
+  val sessionCode = when (val state = pairing.value?.second) {
+    is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
+    else -> null
+  }
+  /** It's needed to prevent screen flashes when [chatModel.newRemoteHostPairing] sets to null in background */
+  var cachedSessionCode by remember { mutableStateOf<String?>(null) }
+  if (cachedSessionCode == null && sessionCode != null) {
+    cachedSessionCode = sessionCode
+  }
+  val remoteDeviceName = pairing.value?.first?.hostDeviceName
+  ConnectMobileViewLayout(
+    title = if (!showTitle) null else if (cachedSessionCode == null) stringResource(MR.strings.link_a_mobile) else stringResource(MR.strings.verify_connection),
+    invitation = cachedR?.invitation,
+    deviceName = remoteDeviceName,
+    sessionCode = cachedSessionCode,
+    port = cachedR?.ctrlPort,
+    staleQrCode = staleQrCode.value || (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
+    refreshQrCode = {
       withBGApi {
-        val r = chatModel.controller.startRemoteHost(null, controller.appPrefs.offerRemoteMulticast.get())
-        if (r != null) {
-          connecting.value = true
-          invitation.value = r.second
-          port.value = r.third
-          chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
+        if (chatController.stopRemoteHost(null)) {
+          startRemoteHost()
+          staleQrCode.value = false
         }
       }
-      onDispose {
-        if (chatModel.currentRemoteHost.value?.remoteHostId == oldRemoteHostId) {
-          withBGApi {
-            chatController.stopRemoteHost(null)
-          }
+    },
+    UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
+  )
+  val oldRemoteHostId by remember { mutableStateOf(chatModel.currentRemoteHost.value?.remoteHostId) }
+  LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
+    if (chatModel.currentRemoteHost.value?.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != oldRemoteHostId) {
+      close()
+    }
+  }
+  KeyChangeEffect(pairing.value) {
+    if (pairing.value == null) {
+      close()
+    }
+  }
+  DisposableEffect(Unit) {
+    withBGApi {
+      startRemoteHost()
+    }
+    onDispose {
+      if (chatModel.currentRemoteHost.value?.remoteHostId == oldRemoteHostId) {
+        withBGApi {
+          chatController.stopRemoteHost(null)
         }
-        chatModel.remoteHostPairing.value = null
       }
+      chatModel.remoteHostPairing.value = null
     }
   }
 }
 
 private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState<Boolean>) {
   ModalManager.start.showModalCloseable { close ->
+    var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
+    val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
+    val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
+    val startRemoteHost = suspend {
+      val r = chatModel.controller.startRemoteHost(
+        rhId = rh.remoteHostId,
+        multicast = controller.appPrefs.offerRemoteMulticast.get(),
+        address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_ ?: rh.bindAddress_,
+        port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_ ?: rh.bindPort_
+      )
+      if (r != null) {
+        cachedR = r
+        connecting.value = true
+        customAddress.value = cachedR.addresses.firstOrNull()
+        customPort.value = cachedR.port
+        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
+      }
+    }
     val pairing = remember { chatModel.remoteHostPairing }
-    val invitation = rememberSaveable { mutableStateOf<String?>(null) }
-    val port = rememberSaveable { mutableStateOf<String?>(null) }
     val sessionCode = when (val state = pairing.value?.second) {
       is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
       else -> null
@@ -306,25 +370,22 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
     }
     ConnectMobileViewLayout(
       title = if (cachedSessionCode == null) stringResource(MR.strings.scan_from_mobile) else stringResource(MR.strings.verify_connection),
-      invitation = invitation.value,
+      invitation = cachedR?.invitation,
       deviceName = pairing.value?.first?.hostDeviceName ?: rh.hostDeviceName,
       sessionCode = cachedSessionCode,
-      port = port.value
+      port = cachedR?.ctrlPort,
+      staleQrCode = (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
+      refreshQrCode = {
+        withBGApi {
+          if (chatController.stopRemoteHost(rh.remoteHostId)) {
+            startRemoteHost()
+          }
+        }
+      },
+      UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
     )
-    var remoteHostId by rememberSaveable { mutableStateOf<Long?>(null) }
-    LaunchedEffect(Unit) {
-      val r = chatModel.controller.startRemoteHost(rh.remoteHostId, controller.appPrefs.offerRemoteMulticast.get())
-      if (r != null) {
-        val (rh_, inv) = r
-        connecting.value = true
-        remoteHostId = rh_?.remoteHostId
-        invitation.value = inv
-        port.value = r.third
-        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
-      }
-    }
     LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
-      if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId) {
+      if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == cachedR.remoteHostId) {
         close()
       }
     }
@@ -334,10 +395,13 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
       }
     }
     DisposableEffect(Unit) {
+      withBGApi {
+        startRemoteHost()
+      }
       onDispose {
-        if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != remoteHostId) {
+        if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != cachedR.remoteHostId) {
           withBGApi {
-            chatController.stopRemoteHost(remoteHostId)
+            chatController.stopRemoteHost(cachedR.remoteHostId)
           }
         }
         chatModel.remoteHostPairing.value = null
@@ -370,3 +434,77 @@ private fun showConnectedMobileDevice(rh: RemoteHostInfo, disconnectHost: () ->
     }
   }
 }
+
+@Composable
+private fun UnderQrLayout(cachedR: CR.RemoteHostStarted?, customAddress: MutableState<RemoteCtrlAddress?>, customPort: MutableState<Int?>) {
+  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
+    if (cachedR.addresses.size > 1) {
+      ExposedDropDownSetting(
+        cachedR.addresses.map { it to it.address + " (${it.`interface`})" },
+        customAddress,
+        textColor = MaterialTheme.colors.onBackground,
+        fontSize = 14.sp,
+        minWidth = 250.dp,
+        maxWidth = with(LocalDensity.current) { 250.sp.toDp() },
+        enabled = remember { mutableStateOf(cachedR.addresses.size > 1) },
+        onSelected = {
+          customAddress.value = it
+        }
+      )
+    } else {
+      Spacer(Modifier.width(10.dp))
+      Text(customAddress.value?.address + " (${customAddress.value?.`interface`})", fontSize = 14.sp, color = MaterialTheme.colors.onBackground)
+    }
+    val portUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
+      mutableStateOf(TextFieldValue((customPort.value ?: cachedR.port!!).toString()))
+    }
+    Spacer(Modifier.width(DEFAULT_PADDING))
+    Box {
+      DefaultConfigurableTextField(
+        portUnsaved,
+        stringResource(MR.strings.random_port),
+        modifier = Modifier.widthIn(max = 132.dp),
+        isValid = { (validPort(it) && it.toInt() > 1023) || it.isBlank() },
+        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
+        keyboardType = KeyboardType.Number,
+        fontSize = 14.sp,
+      )
+      if (validPort(portUnsaved.value.text) && portUnsaved.value.text.toInt() > 1023) {
+        Icon(painterResource(MR.images.ic_edit), stringResource(MR.strings.edit_verb), Modifier.padding(end = 56.dp).size(16.dp).align(Alignment.CenterEnd), tint = MaterialTheme.colors.secondary)
+        IconButton(::showOpenPortAlert, Modifier.align(Alignment.TopEnd).padding(top = 2.dp)) {
+          Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.primary)
+        }
+      }
+    }
+    LaunchedEffect(Unit) {
+      snapshotFlow { portUnsaved.value.text }
+        .distinctUntilChanged()
+        .collect {
+          if (validPort(it) && it.toInt() > 1023) {
+            customPort.value = it.toInt()
+          } else {
+            customPort.value = null
+          }
+        }
+    }
+    KeyChangeEffect(customPort.value) {
+      if (customPort.value != null) {
+        portUnsaved.value = portUnsaved.value.copy(text = customPort.value.toString())
+      }
+    }
+  }
+}
+
+private fun showOpenPortAlert() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.open_port_in_firewall_title),
+    text = generalGetString(MR.strings.open_port_in_firewall_desc),
+  )
+}
+
+private val CR.RemoteHostStarted?.rh: RemoteHostInfo? get() = this?.remoteHost_
+private val CR.RemoteHostStarted?.remoteHostId: Long? get() = this?.remoteHost_?.remoteHostId
+private val CR.RemoteHostStarted?.address: RemoteCtrlAddress? get() = this?.localAddrs?.firstOrNull()
+private val CR.RemoteHostStarted?.addresses: List<RemoteCtrlAddress> get() =
+  (if (controller.appPrefs.developerTools.get() || this?.localAddrs?.indexOfFirst { it.address == "127.0.0.1" } == 0) this?.localAddrs else this?.localAddrs?.filterNot { it.address == "127.0.0.1" }) ?: emptyList()
+private val CR.RemoteHostStarted?.port: Int? get() = this?.ctrlPort?.toIntOrNull()

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/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ClickableText
 import chat.simplex.common.views.helpers.*
@@ -169,18 +170,20 @@ fun NetworkAndServersView(
     verticalArrangement = Arrangement.spacedBy(8.dp)
   ) {
     AppBarTitle(stringResource(MR.strings.network_and_servers))
-    SectionView(generalGetString(MR.strings.settings_section_title_messages)) {
-      SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.smp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.SMP, close) })
+    if (!chatModel.desktopNoUserNoRemote) {
+      SectionView(generalGetString(MR.strings.settings_section_title_messages)) {
+        SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.smp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.SMP, close) })
 
-      SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) })
+        SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) })
 
-      if (currentRemoteHost == null) {
-        UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showSettingsModal)
-        UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
-        if (developerTools) {
-          SessionModePicker(sessionMode, showSettingsModal, updateSessionMode)
+        if (currentRemoteHost == null) {
+          UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showSettingsModal)
+          UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
+          if (developerTools) {
+            SessionModePicker(sessionMode, showSettingsModal, updateSessionMode)
+          }
+          SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
         }
-        SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
       }
     }
     if (currentRemoteHost == null && networkUseSocksProxy.value) {
@@ -192,7 +195,7 @@ fun NetworkAndServersView(
         }
       }
       Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 32.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
-    } else {
+    } else if (!chatModel.desktopNoUserNoRemote) {
       Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 24.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
     }
 
@@ -302,7 +305,7 @@ fun SockProxySettings(m: ChatModel) {
         DefaultConfigurableTextField(
           hostUnsaved,
           stringResource(MR.strings.host_verb),
-          modifier = Modifier,
+          modifier = Modifier.fillMaxWidth(),
           isValid = ::validHost,
           keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
           keyboardType = KeyboardType.Text,
@@ -312,7 +315,7 @@ fun SockProxySettings(m: ChatModel) {
         DefaultConfigurableTextField(
           portUnsaved,
           stringResource(MR.strings.port_verb),
-          modifier = Modifier,
+          modifier = Modifier.fillMaxWidth(),
           isValid = ::validPort,
           keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done); save() }),
           keyboardType = KeyboardType.Number,
@@ -425,7 +428,7 @@ private fun validHost(s: String): Boolean {
 }
 
 // https://ihateregex.io/expr/port/
-private fun validPort(s: String): Boolean {
+fun validPort(s: String): Boolean {
   val validPort = Regex("^(6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([1-5][0-9]{4})|([0-5]{0,5})|([0-9]{1,4})$")
   return s.isNotBlank() && s.matches(validPort)
 }