WIP: add batching

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
     tags:
       - "v*"
       - "!*-fdroid"
-      - "!*-armv7a"
   pull_request:
 
 jobs:
@@ -80,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.3"
+          cabal-version: "3.10.1.0"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -189,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/build-desktop-mac.sh
+          scripts/ci/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
@@ -260,9 +259,7 @@ jobs:
       # Unix /
 
       # / Windows
-
-      # * 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
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
 
       - name: 'Setup MSYS2'
         if: matrix.os == 'windows-latest'

apps/ios/Shared/AppDelegate.swift

@@ -42,7 +42,6 @@ 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)
         }
@@ -81,7 +80,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 }
             } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)

apps/ios/Shared/ContentView.swift

@@ -14,14 +14,11 @@ struct ContentView: View {
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
     @Environment(\.colorScheme) var colorScheme
-
-    var contentAccessAuthenticationExtended: Bool
-
-    @Environment(\.scenePhase) var scenePhase
-    @State private var automaticAuthenticationAttempted = false
-    @State private var canConnectViewCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-
+    @Binding var doAuthenticate: Bool
+    @Binding var userAuthorized: Bool?
+    @Binding var canConnectCall: Bool
+    @Binding var lastSuccessfulUnlock: TimeInterval?
+    @Binding var showInitializationView: Bool
     @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
@@ -43,19 +40,9 @@ struct ContentView: View {
         }
     }
 
-    private var accessAuthenticated: Bool {
-        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
-    }
-
     var body: some View {
         ZStack {
-            // 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()
-            }
+            contentView()
             if chatModel.showCallView, let call = chatModel.activeCall {
                 callView(call)
             }
@@ -63,7 +50,6 @@ struct ContentView: View {
                 LocalAuthView(authRequest: la)
             } else if showSetPasscode {
                 SetAppPasscodeView {
-                    chatModel.contentViewAccessAuthenticated = true
                     prefPerformLA = true
                     showSetPasscode = false
                     privacyLocalAuthModeDefault.set(.passcode)
@@ -74,9 +60,13 @@ struct ContentView: View {
                     alertManager.showAlert(laPasscodeNotSetAlert())
                 }
             }
-            if chatModel.chatDbStatus == nil {
-                initializationView()
-            }
+        }
+        .onAppear {
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
         }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
         .sheet(isPresented: $showSettings) {
@@ -86,44 +76,14 @@ 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 let status = chatModel.chatDbStatus, status != .ok {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if chatModel.chatDbStatus == nil && showInitializationView {
+            initializationView()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
             DatabaseErrorView(status: status)
         } else if !chatModel.v3DBMigration.startChat {
             MigrateToAppGroupView()
@@ -146,11 +106,11 @@ struct ContentView: View {
         if CallController.useCallKit() {
             ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                 .onDisappear {
-                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
                 }
         } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
-            if prefPerformLA && !accessAuthenticated {
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
+            if prefPerformLA && userAuthorized != true {
                 Rectangle()
                     .fill(colorScheme == .dark ? .black : .white)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -160,27 +120,22 @@ struct ContentView: View {
     }
 
     private func lockButton() -> some View {
-        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
     }
 
     private func initializationView() -> some View {
         VStack {
             ProgressView().scaleEffect(2)
-            Text("Opening app…")
+            Text("Opening database…")
                 .padding()
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity )
-        .background(
-            Rectangle()
-                .fill(.background)
-        ) 
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
             ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
-                requestNtfAuthorization()
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
                 if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
@@ -232,37 +187,48 @@ struct ContentView: View {
         }
     }
 
-    private func unlockedRecently() -> Bool {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
-        } else {
-            return false
+    private func initAuthenticate() {
+        logger.debug("initAuthenticate")
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
         }
     }
 
-    private func authenticateContentViewAccess() {
-        logger.debug("DEBUGGING: authenticateContentViewAccess")
-        dismissAllSheets(animated: false) {
-            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
-            chatModel.chatId = nil
+    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
+        if !prefPerformLA {
+            userAuthorized = true
+        } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
+            dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
+                chatModel.chatId = nil
+                justAuthenticate()
+            }
+        }
+    }
 
-            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())
+    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())
                 }
+            case .unavailable:
+                userAuthorized = true
+                prefPerformLA = false
+                canConnectCall = true
+                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
@@ -293,7 +259,6 @@ 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,13 +15,7 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6
 
-// 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 bgRefreshInterval: TimeInterval = 450
 
 private let maxTimerCount = 9
 
@@ -39,14 +33,14 @@ class BGManager {
         }
     }
 
-    func schedule(interval: TimeInterval? = nil) {
+    func schedule() {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.schedule: disabled")
             return
         }
         logger.debug("BGManager.schedule")
         let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
         do {
             try BGTaskScheduler.shared.submit(request)
         } catch {
@@ -54,34 +48,20 @@ 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")
-        let shouldRun_ = lastRanLongAgo
-        if allowBackgroundRefresh() && shouldRun_ {
-            schedule()
+        schedule()
+        if appStateGroupDefault.get().inactive {
             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)
         }
@@ -110,22 +90,20 @@ 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,8 +54,6 @@ 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] = []
@@ -106,10 +104,12 @@ final class ChatModel: ObservableObject {
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
-    let ntfEnableLocal = true
+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
+    }
 
     var ntfEnablePeriodic: Bool {
-        notificationMode != .off
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
     }
 
     var activeRemoteCtrl: Bool {

apps/ios/Shared/Model/ImageUtils.swift

@@ -195,18 +195,18 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     }
 }
 
-func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
+func generateNewFileName(_ prefix: String, _ ext: String) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }
 
-private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
+private func uniqueCombine(_ fileName: String) -> 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: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
     }
     return tryCombine(fileName, 0)
 }

apps/ios/Shared/Model/NSESubscriber.swift

@@ -1,83 +0,0 @@
-//
-//  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, 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.main.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.main.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

@@ -211,7 +211,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
 }
 
 func apiStartChat() throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true))
+    let r = chatSendCmdSync(.startChat(subscribe: true, expire: true, xftp: true))
     switch r {
     case .chatStarted: return true
     case .chatRunning: return false
@@ -228,8 +228,7 @@ func apiStopChat() async throws {
 }
 
 func apiActivateChat() {
-    chatReopenStore()
-    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
+    let r = chatSendCmdSync(.apiActivateChat)
     if case .cmdOk = r { return }
     logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -403,7 +402,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
     case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
     case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
     default:
-        logger.debug("apiGetNtfToken response: \(String(describing: r))")
+        logger.debug("apiGetNtfToken response: \(String(describing: r), privacy: .public)")
         return (nil, nil, .off)
     }
 }
@@ -1235,9 +1234,6 @@ 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()
     }
 }
 
@@ -1254,8 +1250,6 @@ 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)
         }
@@ -1742,9 +1736,7 @@ 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 {
-            await MainActor.run {
-                m.remoteCtrlSession = nil
-            }
+            m.remoteCtrlSession = nil
             if case .connected = sess.sessionState {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     switchToLocalSession()

apps/ios/Shared/Model/SuspendChat.swift

@@ -9,30 +9,27 @@
 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
-
-let nseSuspendTimeout: TimeInterval = 5
-
 private func _suspendChat(timeout: Int) {
     // this is a redundant check to prevent logical errors, like the one fixed in this PR
-    let state = AppChatState.shared.value
+    let state = appStateGroupDefault.get()
     if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue)")
+        logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
     } else if ChatModel.ok {
-        AppChatState.shared.set(.suspending)
+        appStateGroupDefault.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
         DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
     } else {
-        AppChatState.shared.set(.suspended)
+        appStateGroupDefault.set(.suspended)
     }
 }
 
@@ -44,16 +41,18 @@ func suspendChat() {
 
 func suspendBgRefresh() {
     suspendLockQueue.sync {
-        if case .bgRefresh = AppChatState.shared.value  {
+        if case .bgRefresh = appStateGroupDefault.get()  {
             _suspendChat(timeout: bgSuspendTimeout)
         }
     }
 }
 
+private var terminating = false
+
 func terminateChat() {
     logger.debug("terminateChat")
     suspendLockQueue.sync {
-        switch AppChatState.shared.value {
+        switch appStateGroupDefault.get() {
         case .suspending:
             // suspend instantly if already suspending
             _chatSuspended()
@@ -65,6 +64,7 @@ func terminateChat() {
         case .stopped:
             chatCloseStore()
         default:
+            terminating = true
             // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
@@ -73,7 +73,7 @@ func terminateChat() {
 
 func chatSuspended() {
     suspendLockQueue.sync {
-        if case .suspending = AppChatState.shared.value {
+        if case .suspending = appStateGroupDefault.get() {
             _chatSuspended()
         }
     }
@@ -81,121 +81,48 @@ func chatSuspended() {
 
 private func _chatSuspended() {
     logger.debug("_chatSuspended")
-    AppChatState.shared.set(.suspended)
+    appStateGroupDefault.set(.suspended)
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
-    chatCloseStore()
-}
-
-func setAppState(_ appState: AppState) {
-    suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+    if terminating {
+         chatCloseStore()
     }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
+    terminating = false
     suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+        appStateGroupDefault.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 {
-            try initializeChat(start: m.v3DBMigration.startChat && start, refreshInvitations: refreshInvitations)
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
         } catch let error {
-            AlertManager.shared.showAlertMsg(
-                title: start ? "Error starting chat" : "Error opening chat",
-                message: "Please contact developers.\nError: \(responseError(error))"
-            )
+            fatalError("Failed to start or load chats: \(responseError(error))")
         }
     }
 }
 
-func startChatForCall() {
-    logger.debug("DEBUGGING: startChatForCall")
-    if ChatModel.shared.chatRunning == true {
-        ChatReceiver.shared.start()
-        logger.debug("DEBUGGING: startChatForCall: after ChatReceiver.shared.start")
-    }
-    if .active != AppChatState.shared.value {
-        logger.debug("DEBUGGING: startChatForCall: before activateChat")
-        activateChat()
-        logger.debug("DEBUGGING: startChatForCall: after activateChat")
-    }
-}
-
-func startChatAndActivate(_ completion: @escaping () -> Void) {
+func startChatAndActivate() {
+    terminating = false
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()
         logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
     }
-    if case .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: nseSuspendTimeout) { 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() {
+    if .active != appStateGroupDefault.get()  {
         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,9 +16,14 @@ struct SimpleXApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject private var chatModel = ChatModel.shared
     @ObservedObject var alertManager = AlertManager.shared
-
     @Environment(\.scenePhase) var scenePhase
-    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @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
 
     init() {
         DispatchQueue.global(qos: .background).sync {
@@ -34,17 +39,22 @@ struct SimpleXApp: App {
     }
 
     var body: some Scene {
-        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())
+        return WindowGroup {
+            ContentView(
+                doAuthenticate: $doAuthenticate,
+                userAuthorized: $userAuthorized,
+                canConnectCall: $canConnectCall,
+                lastSuccessfulUnlock: $lastSuccessfulUnlock,
+                showInitializationView: $showInitializationView
+            )
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
                 }
                 .onAppear() {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
+                    showInitializationView = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                         initChatAndMigrate()
                     }
                 }
@@ -52,35 +62,30 @@ 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 = AppChatState.shared.value
-
-                        if appState != .stopped {
-                            startChatAndActivate {
-                                if appState.inactive && chatModel.chatRunning == true {
-                                    updateChats()
-                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                        updateCallInvitations()
-                                    }
-                                }
+                        let appState = appStateGroupDefault.get()
+                        startChatAndActivate()
+                        if appState.inactive && chatModel.chatRunning == true {
+                            updateChats()
+                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                updateCallInvitations()
                             }
                         }
+                        doAuthenticate = authenticationExpired()
+                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                     default:
                         break
                     }
@@ -98,12 +103,12 @@ struct SimpleXApp: App {
         if legacyDatabase, case .documents = dbContainerGroupDefault.get() {
             dbContainerGroupDefault.set(.documents)
             setMigrationState(.offer)
-            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath(), privacy: .public)*.db")
         } else {
             dbContainerGroupDefault.set(.group)
             setMigrationState(.ready)
-            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
-            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath(), privacy: .public)*.db")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not", privacy: .public) present")
         }
     }
 
@@ -113,14 +118,22 @@ struct SimpleXApp: App {
     }
 
     private func authenticationExpired() -> Bool {
-        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
+        if let enteredBackground = enteredBackground {
             let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= 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/ActiveCallView.swift

@@ -38,13 +38,13 @@ struct ActiveCallView: View {
             }
         }
         .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
             AppDelegate.keepScreenOn(true)
             createWebRTCClient()
             dismissAllSheets()
         }
         .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
             createWebRTCClient()
         }
         .onDisappear {

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

@@ -130,7 +130,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             // The delay allows to accept the second call before suspending a chat
             // see `.onChange(of: scenePhase)` in SimpleXApp
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
                 if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                     self?.shouldSuspendChat = false
                     suspendChat()
@@ -142,46 +142,33 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     @objc(pushRegistry:didUpdatePushCredentials:forType:)
     func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
     }
 
     func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.debug("CallController: did receive push with type \(type.rawValue)")
+        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
         if type != .voIP {
             completion()
             return
         }
-        if AppChatState.shared.value == .stopped {
-            self.reportExpiredCall(payload: payload, completion)
-            return
-        }
+        logger.debug("CallController: initializing chat")
         if (!ChatModel.shared.chatInitialized) {
-            logger.debug("CallController: initializing chat")
-            do {
-                try initializeChat(start: true, refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                self.reportExpiredCall(payload: payload, completion)
-                return
-            }
+            initChatAndMigrate(refreshInvitations: false)
         }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
+        startChatAndActivate()
+        shouldSuspendChat = true
         // There are no invitations in the model, as it was processed by NSE
         _ = try? justRefreshCallInvitations()
-        logger.debug("CallController: updated call invitations chat")
         // 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)
+            let update = 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
+                let update = cxCallUpdate(invitation: invitation)
+                provider.reportNewIncomingCall(with: uuid, update: update) { error in
                     if error != nil {
                         m.callInvitations.removeValue(forKey: contactId)
                     }
@@ -189,10 +176,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     completion()
                 }
             } else {
-                self.reportExpiredCall(update: update, completion)
+                reportExpiredCall(update: update, completion)
             }
         } else {
-            self.reportExpiredCall(payload: payload, completion)
+            reportExpiredCall(payload: payload, completion)
         }
     }
 
@@ -223,7 +210,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
         if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
@@ -363,7 +350,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
         controller.request(CXTransaction(action: action)) { error in
             if let error = error {
-                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
             } else {
                 logger.debug("CallController.requestTransaction requested transaction successfully")
                 onSuccess()

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

@@ -18,7 +18,6 @@ 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
@@ -309,7 +308,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(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(&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,14 +723,9 @@ struct ChatView: View {
                 if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
                     menu.append(replyUIAction(ci))
                 }
-                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 {
+                menu.append(shareUIAction(ci))
+                menu.append(copyUIAction(ci))
+                if let fileSource = getLoadedFileSource(ci.file) {
                     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 let .mediaPreviews(media): return !media.isEmpty
+        case .mediaPreviews: return true
         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(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
-                await MainActor.run {
-                    showMediaPicker = false
-                    if itemsSelected {
+            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
+                showMediaPicker = false
+                if itemsSelected {
+                    DispatchQueue.main.async {
                         composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                     }
                 }
@@ -488,30 +488,6 @@ 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,6 +16,7 @@ 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,19 +188,17 @@ struct GroupMemberInfoView: View {
                         // this condition prevents re-setting picker
                         if !justOpened { return }
                     }
-                    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))")
-                        }
+                    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
                 }
                 .onChange(of: newRole) { newRole in
                     if newRole != member.memberRole {

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

@@ -103,10 +103,8 @@ struct GroupProfileView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in 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], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], 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
-                    AppChatState.shared.set(.active)
+                    appStateGroupDefault.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)
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.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 }
-    AppChatState.shared.set(.stopped)
+    appStateGroupDefault.set(.stopped)
 }
 
 func deleteChatAsync() async throws {

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

@@ -13,130 +13,112 @@ import SimpleXChat
 
 struct LibraryImagePicker: View {
     @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
-    @State var mediaAdded = false
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    @State var images: [UploadContent] = []
 
     var body: some View {
-        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
-    }
-
-    private func addMedia(_ content: UploadContent) async {
-        if mediaAdded { return }
-        await MainActor.run {
-            mediaAdded = true
-            image = content.uiImage
-        }
+        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
+            .onChange(of: images) { _ in
+                if let img = images.first {
+                    image = img.uiImage
+                }
+            }
     }
 }
 
 struct LibraryMediaListPicker: UIViewControllerRepresentable {
     typealias UIViewControllerType = PHPickerViewController
-    var addMedia: (_ content: UploadContent) async -> Void
+    @Binding var media: [UploadContent]
     var selectionLimit: Int
-    var finishedPreprocessing: () -> Void = {}
-    var didFinishPicking: (_ didSelectItems: Bool) async -> Void
+    var didFinishPicking: (_ didSelectItems: Bool) -> 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]) {
-            Task {
-                await parent.didFinishPicking(!results.isEmpty)
-                if results.isEmpty { return }
-                for r in results {
-                    await loadItem(r.itemProvider)
-                }
-                parent.finishedPreprocessing()
+            parent.didFinishPicking(!results.isEmpty)
+            guard !results.isEmpty else {
+                return
             }
-        }
 
-        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)
+            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)
                             }
-                            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)
+                        }
+                    }
+                } 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
+                    }
                 }
             }
         }
 
-        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 {
-                    completion(url)
+        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 = []
                 }
             }
         }

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

@@ -1,26 +0,0 @@
-//
-//  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
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.set(.active)
                 if m.currentUser != nil { return }
                 var profile: Profile? = nil
                 if let displayName = displayName, displayName != "" {

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

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

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

@@ -74,7 +74,6 @@ struct QRCode: View {
         .onAppear {
             image = image ?? generateImage(uri, tintColor: tintColor)
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
 

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

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

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

@@ -81,6 +81,11 @@ 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))")
@@ -95,7 +100,7 @@ struct CreateSimpleXAddress: View {
             } label: {
                 Text("Create SimpleX address").font(.title)
             }
-            Text("You can make it visible to your SimpleX contacts via Settings.")
+            Text("Your contacts in SimpleX will see it.\nYou can change it in 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], scanMode: .oncePerCode, completion: processDesktopQRCode)
+            CodeScannerView(codeTypes: [.qr], 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: [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("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("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,6 +14,9 @@ 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 {
@@ -85,6 +88,13 @@ 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)
     }
@@ -109,7 +119,7 @@ struct NotificationsView: View {
 
     private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
         switch mode {
-        case .off: return "Use only local notifications?"
+        case .off: return "Turn off notifications?"
         case .periodic: return "Enable periodic notifications?"
         case .instant: return "Enable instant notifications?"
         }

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

@@ -467,7 +467,6 @@ struct SimplexLockView: View {
             switch a {
             case .enableAuth:
                 SetAppPasscodeView {
-                    m.contentViewAccessAuthenticated = true
                     laLockDelay = 30
                     prefPerformLA = true
                     showChangePassword = true
@@ -620,7 +619,6 @@ 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], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
                 .padding(.top)

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

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

apps/ios/SimpleX NSE/ConcurrentQueue.swift

@@ -1,64 +0,0 @@
-//
-//  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,233 +14,91 @@ import SimpleXChat
 
 let logger = Logger()
 
-let appSuspendingDelay: UInt64 = 2_500_000_000
+let suspendingDelay: UInt64 = 2_000_000_000
 
-typealias SuspendSchedule = (delay: TimeInterval, timeout: Int)
+typealias NtfStream = AsyncStream<NSENotification>
 
-let nseSuspendSchedule: SuspendSchedule = (2, 4)
-
-let fastNSESuspendSchedule: SuspendSchedule = (1, 1)
-
-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) async {
-        logger.debug("NotificationService PendingNtfs.createStream: \(id)")
-        if ntfStreams[id] == nil {
-            ntfStreams[id] = ConcurrentQueue()
-            logger.debug("NotificationService PendingNtfs.createStream: created ConcurrentQueue")
+    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 readStream(_ id: String, for nse: NotificationService, ntfInfo: NtfMessages) async {
-        logger.debug("NotificationService PendingNtfs.readStream: \(id) \(ntfInfo.ntfMessages.count)")
-        if !ntfInfo.user.showNotifications {
-            nse.setBestAttemptNtf(.empty)
-        }
+    func readStream(_ id: String, for nse: NotificationService, msgCount: Int = 1, showNotifications: Bool) async {
+        logger.debug("PendingNtfs.readStream: \(id, privacy: .public) \(msgCount, privacy: .public)")
         if let s = ntfStreams[id] {
-            logger.debug("NotificationService PendingNtfs.readStream: has stream")
-            var expected = Set(ntfInfo.ntfMessages.map { $0.msgId })
-            logger.debug("NotificationService PendingNtfs.readStream: expecting: \(expected)")
-            var readCancelled = false
-            var dequeued: DequeueElement<NSENotification>?
-            nse.cancelRead = {
-                readCancelled = true
-                if let elementId = dequeued?.elementId {
-                    s.cancelDequeue(elementId)
-                }
+            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 }
             }
-            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)")
-                            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")
+            logger.debug("PendingNtfs.readStream: exiting")
         }
     }
 
-    func writeStream(_ id: String, _ ntf: NSENotification) async {
-        logger.debug("NotificationService PendingNtfs.writeStream: \(id)")
-        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
-            }
+    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)
         }
     }
 }
 
 enum NSENotification {
-    case nse(UNMutableNotificationContent)
-    case callkit(RcvCallInvitation)
+    case nse(notification: UNMutableNotificationContent)
+    case callkit(invitation: RcvCallInvitation)
     case empty
-    case msgInfo(NtfMsgInfo)
 
-    var isCallInvitation: Bool {
+    var categoryIdentifier: String? {
         switch self {
-        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
-        case .callkit: true
-        case .empty: false
-        case .msgInfo: false
+        case let .nse(ntf): return ntf.categoryIdentifier
+        case .callkit: return ntfCategoryCallInvitation
+        case .empty: return nil
         }
     }
 }
 
-// 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")
-        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
-        setBestAttemptNtf(ntf)
+        if let ntf = request.content.mutableCopy() as? UNMutableNotificationContent {
+            setBestAttemptNtf(ntf)
+        }
         self.contentHandler = contentHandler
         registerGroupDefaults()
         let appState = appStateGroupDefault.get()
-        logger.debug("NotificationService: app is \(appState.rawValue)")
         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 {
-                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)
-                        }
-                    }
+                var state = appState
+                for _ in 1...5 {
+                    _ = try await Task.sleep(nanoseconds: suspendingDelay)
+                    state = appStateGroupDefault.get()
+                    if state == .suspended || state != .suspending { break }
                 }
-                logger.debug("NotificationService: app state is now \(state.rawValue)")
+                logger.debug("NotificationService: app state is \(state.rawValue, privacy: .public)")
                 if state.inactive {
                     receiveNtfMessages(request, contentHandler)
                 } else {
@@ -248,6 +106,7 @@ class NotificationService: UNNotificationServiceExtension {
                 }
             }
         default:
+            logger.debug("NotificationService: app state is \(appState.rawValue, privacy: .public)")
             deliverBestAttemptNtf()
         }
     }
@@ -262,35 +121,27 @@ class NotificationService: UNNotificationServiceExtension {
         if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
            let nonce = ntfData["nonce"] as? String,
            let encNtfInfo = ntfData["message"] as? String,
-           // 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()
+           let dbStatus = startChat() {
             if case .ok = dbStatus,
-               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.ntfMessages.count))")
-                if let connEntity = ntfInfo.connEntity_ {
+               let ntfMsgInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfMsgInfo), privacy: .public)")
+                if let connEntity = ntfMsgInfo.connEntity {
                     setBestAttemptNtf(
-                        ntfInfo.ntfsEnabled
-                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
+                        ntfMsgInfo.ntfsEnabled
+                        ? .nse(notification: createConnectionEventNtf(ntfMsgInfo.user, connEntity))
                         : .empty
                     )
                     if let id = connEntity.id {
-                        receiveEntityId = id
-                        NtfStreamSemaphores.shared.waitForStream(id)
-                        if receiveEntityId != nil {
-                            Task {
-                                logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id)")
-                                await PendingNtfs.shared.createStream(id)
-                                await PendingNtfs.shared.readStream(id, for: self, ntfInfo: ntfInfo)
-                                deliverBestAttemptNtf()
-                            }
+                        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()
                         }
-                        return
                     }
                 }
-            } else if let dbStatus = dbStatus {
+                return
+            } else {
                 setBestAttemptNtf(createErrorNtf(dbStatus))
             }
         }
@@ -299,7 +150,7 @@ class NotificationService: UNNotificationServiceExtension {
 
     override func serviceExtensionTimeWillExpire() {
         logger.debug("DEBUGGING: NotificationService.serviceExtensionTimeWillExpire")
-        deliverBestAttemptNtf(urgent: true)
+        deliverBestAttemptNtf()
     }
 
     func setBadgeCount() {
@@ -308,301 +159,91 @@ class NotificationService: UNNotificationServiceExtension {
     }
 
     func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        setBestAttemptNtf(.nse(ntf))
+        setBestAttemptNtf(.nse(notification: ntf))
     }
 
     func setBestAttemptNtf(_ ntf: NSENotification) {
         logger.debug("NotificationService.setBestAttemptNtf")
         if case let .nse(notification) = ntf {
             notification.badge = badgeCount as NSNumber
-            bestAttemptNtf = .nse(notification)
+            bestAttemptNtf = .nse(notification: notification)
         } else {
             bestAttemptNtf = ntf
         }
     }
 
-    private func deliverBestAttemptNtf(urgent: Bool = false) {
+    private func deliverBestAttemptNtf() {
         logger.debug("NotificationService.deliverBestAttemptNtf")
-        if let cancel = cancelRead {
-            cancelRead = nil
-            cancel()
-        }
-        if let id = receiveEntityId {
-            receiveEntityId = nil
-            NtfStreamSemaphores.shared.signalStreamReady(id)
-        }
-        let suspend: Bool
-        if let t = threadId {
-            threadId = nil
-            suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
-        } else {
-            suspend = false
-        }
-        deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
-    }
-
-    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if case .callkit = bestAttemptNtf {
-            logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
-            if urgent {
-                // suspending NSE even though there may be other notifications
-                // to allow the app to process callkit call
-                suspendChat(0)
-                deliverNotification()
-            } else {
-                // suspending NSE with delay and delivering after the suspension
-                // because pushkit notification must be processed without delay
-                // to avoid app termination
-                DispatchQueue.global().asyncAfter(deadline: .now() + fastNSESuspendSchedule.delay) {
-                    suspendChat(fastNSESuspendSchedule.timeout)
-                    DispatchQueue.global().asyncAfter(deadline: .now() + Double(fastNSESuspendSchedule.timeout)) {
-                        self.deliverNotification()
-                    }
-                }
-            }
-        } else {
-            if suspend {
-                logger.debug("NotificationService.deliverCallkitOrNotification: will suspend")
-                if urgent {
-                    suspendChat(0)
-                } else {
-                    // suspension is delayed to allow chat core finalise any processing
-                    // (e.g., send delivery receipts)
-                    DispatchQueue.global().asyncAfter(deadline: .now() + nseSuspendSchedule.delay) {
-                        if NSEThreads.shared.noThreads {
-                            suspendChat(nseSuspendSchedule.timeout)
-                        }
-                    }
-                }
-            }
-            deliverNotification()
-        }
-    }
-
-    private func deliverNotification() {
         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): deliver(content)
+            case let .nse(content): handler(content)
             case let .callkit(invitation):
-                logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
                 CXProvider.reportNewIncomingVoIPPushPayload([
                     "displayName": invitation.contact.displayName,
                     "contactId": invitation.contact.id,
                     "media": invitation.callType.media.rawValue
                 ]) { error in
-                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
+                    if error == nil {
+                        handler(UNMutableNotificationContent())
+                    } else {
+                        logger.debug("reportNewIncomingVoIPPushPayload success to CallController for \(invitation.contact.id)")
+                        handler(createCallInvitationNtf(invitation))
+                    }
                 }
-            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
+            case .empty: handler(UNMutableNotificationContent())
             }
+            bestAttemptNtf = nil
         }
     }
 }
 
-// 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(fastNSESuspendSchedule.timeout)
-    }
-}
-
-func appStateSubscriber(onState: @escaping (AppState) -> Void) -> AppSubscriber {
-    appMessageSubscriber { msg in
-        if case let .state(state) = msg {
-            logger.debug("NotificationService: appStateSubscriber \(state.rawValue)")
-            onState(state)
-        }
-    }
-}
-
-var receiverStarted = false
-let startLock = DispatchSemaphore(value: 1)
-let suspendLock = DispatchSemaphore(value: 1)
+var chatStarted = false
 var networkConfig: NetCfg = getNetCfg()
-let xftpConfig: XFTPFileConfig? = getXFTPCfg()
+var 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")
-    // only skip creating if there is chat controller
-    if case .active = NSEChatState.shared.value, hasChatCtrl() { return .ok }
-
-    startLock.wait()
-    defer { startLock.signal() }
-    
-    if hasChatCtrl() {
-        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()
-        }
-    } else {
-        // Ignore state in preference if there is no chat controller.
-        // State in preference may have failed to update e.g. because of a crash.
-        NSEChatState.shared.set(.created)
-        return doStartChat()
-    }
-}
-
-func doStartChat() -> DBMigrationResult? {
-    logger.debug("NotificationService: doStartChat")
-    haskell_init_nse()
-    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation(), backgroundMode: true)
-    logger.debug("NotificationService: doStartChat \(String(describing: dbStatus))")
+    hs_init(0, nil)
+    if chatStarted { return .ok }
+    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation())
     if dbStatus != .ok {
         resetChatCtrl()
-        NSEChatState.shared.set(.created)
         return dbStatus
     }
-    let state = NSEChatState.shared.value
-    NSEChatState.shared.set(.starting)
     if let user = apiGetActiveUser() {
-        logger.debug("NotificationService active user \(String(describing: user))")
+        logger.debug("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())
-            // 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
+            let justStarted = try apiStartChat()
+            chatStarted = true
+            if justStarted {
+                chatLastStartGroupDefault.set(Date.now)
+                Task { await receiveMessages() }
             }
+            return .ok
         } catch {
-            logger.error("NotificationService startChat error: \(responseError(error))")
+            logger.error("NotificationService startChat error: \(responseError(error), privacy: .public)")
         }
     } else {
-        logger.debug("NotificationService: no active user")
+        logger.debug("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)")
-    } else if hasChatCtrl() {
-        // only suspend if we have chat controller to avoid crashes when suspension is
-        // attempted when chat controller was not created
-        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 {
-        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 {
+        updateNetCfg()
         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? {
@@ -616,14 +257,14 @@ private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }
 
 func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
-    logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
+    logger.debug("NotificationService processReceivedMsg: \(res.responseType)")
     switch res {
     case let .contactConnected(user, contact, _):
-        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
+        return (contact.id, .nse(notification: createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
     case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
+        return (UserContact(contactRequest: contactRequest).id, .nse(notification: createContactRequestNtf(user, contactRequest)))
     case let .newChatItem(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         var cItem = aChatItem.chatItem
@@ -633,7 +274,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(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
         return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
     case let .rcvFileSndCancelled(_, aChatItem, _):
         cleanupFile(aChatItem)
@@ -651,18 +292,10 @@ 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) : .nse(createCallInvitationNtf(invitation))
+            useCallKit() ? .callkit(invitation: invitation) : .nse(notification: createCallInvitationNtf(invitation))
         )
-    case let .ntfMessage(_, connEntity, ntfMessage):
-        return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
-    case .chatSuspended:
-        chatSuspended()
-        return nil
-    case let .chatError(_, err):
-        logger.error("NotificationService receivedMsgNtf error: \(String(describing: err))")
-        return nil
     default:
-        logger.debug("NotificationService receivedMsgNtf ignored event: \(res.responseType)")
+        logger.debug("NotificationService processReceivedMsg ignored event: \(res.responseType)")
         return nil
     }
 }
@@ -675,22 +308,17 @@ func updateNetCfg() {
             try setNetworkConfig(networkConfig)
             networkConfig = newNetConfig
         } catch {
-            logger.error("NotificationService apply changed network config error: \(responseError(error))")
+            logger.error("NotificationService apply changed network config error: \(responseError(error), privacy: .public)")
         }
     }
 }
 
 func apiGetActiveUser() -> User? {
     let r = sendSimpleXCmd(.showActiveUser)
-    logger.debug("apiGetActiveUser sendSimpleXCmd response: \(r.responseType)")
+    logger.debug("apiGetActiveUser sendSimpleXCmd response: \(String(describing: r))")
     switch r {
     case let .activeUser(user): return user
-    case .chatCmdError(_, .error(.noActiveUser)):
-        logger.debug("apiGetActiveUser sendSimpleXCmd no active user")
-        return nil
-    case let .chatCmdError(_, err):
-        logger.debug("apiGetActiveUser sendSimpleXCmd error: \(String(describing: err))")
-        return nil
+    case .chatCmdError(_, .error(.noActiveUser)): return nil
     default:
         logger.error("NotificationService apiGetActiveUser unexpected response: \(String(describing: r))")
         return nil
@@ -698,7 +326,7 @@ func apiGetActiveUser() -> User? {
 }
 
 func apiStartChat() throws -> Bool {
-    let r = sendSimpleXCmd(.startChat(mainApp: false))
+    let r = sendSimpleXCmd(.startChat(subscribe: false, expire: false, xftp: false))
     switch r {
     case .chatStarted: return true
     case .chatRunning: return false
@@ -706,21 +334,6 @@ 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 }
@@ -751,13 +364,12 @@ 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 {
-        logger.debug("apiGetNtfMessage response ntfMessages: \(ntfMessages.count)")
-        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 {
-        logger.debug("apiGetNtfMessage ignored response: \(r.responseType) \(String.init(describing: r))")
+        logger.debug("apiGetNtfMessage ignored response: \(r.responseType, privacy: .public) \(String.init(describing: r), privacy: .private)")
     }
     return nil
 }
@@ -793,11 +405,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

@@ -30,11 +30,6 @@
 		5C116CDC27AABE0400E66D01 /* ContactRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */; };
 		5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C13730A28156D2700F43030 /* ContactConnectionView.swift */; };
 		5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */; };
-		5C245F232B4EAA5E001CC39F /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */; };
-		5C245F242B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */; };
-		5C245F252B4EAA5E001CC39F /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F202B4EAA5E001CC39F /* libgmp.a */; };
-		5C245F262B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */; };
-		5C245F272B4EAA5E001CC39F /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F222B4EAA5E001CC39F /* libffi.a */; };
 		5C2E260727A2941F00F70299 /* SimpleXAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260627A2941F00F70299 /* SimpleXAPI.swift */; };
 		5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260A27A30CFA00F70299 /* ChatListView.swift */; };
 		5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260E27A30FDC00F70299 /* ChatView.swift */; };
@@ -48,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 */; };
+		5C4BB4B82B1E7D75007981AA /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4BB4B32B1E7D75007981AA /* libgmp.a */; };
+		5C4BB4B92B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4BB4B42B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a */; };
+		5C4BB4BA2B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4BB4B52B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a */; };
+		5C4BB4BB2B1E7D75007981AA /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4BB4B62B1E7D75007981AA /* libffi.a */; };
+		5C4BB4BC2B1E7D75007981AA /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C4BB4B72B1E7D75007981AA /* 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 */; };
@@ -150,9 +150,6 @@
 		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 */; };
@@ -168,11 +165,6 @@
 		64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */; };
 		64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DCB29FFE3E800E3D48D /* MailView.swift */; };
 		6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */; };
-		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 */; };
@@ -193,7 +185,6 @@
 		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 */; };
@@ -285,11 +276,6 @@
 		5C13730A28156D2700F43030 /* ContactConnectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactConnectionView.swift; sourceTree = "<group>"; };
 		5C13730C2815740A00F43030 /* DebugJSON.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = DebugJSON.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemView.swift; sourceTree = "<group>"; };
-		5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5C245F202B4EAA5E001CC39F /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a"; sourceTree = "<group>"; };
-		5C245F222B4EAA5E001CC39F /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C2E260627A2941F00F70299 /* SimpleXAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXAPI.swift; sourceTree = "<group>"; };
 		5C2E260A27A30CFA00F70299 /* ChatListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListView.swift; sourceTree = "<group>"; };
 		5C2E260E27A30FDC00F70299 /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
@@ -304,6 +290,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>"; };
+		5C4BB4B32B1E7D75007981AA /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C4BB4B42B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5C4BB4B52B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a"; sourceTree = "<group>"; };
+		5C4BB4B62B1E7D75007981AA /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C4BB4B72B1E7D75007981AA /* 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>"; };
@@ -443,9 +434,6 @@
 		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; };
@@ -460,11 +448,6 @@
 		64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		64466DCB29FFE3E800E3D48D /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
 		6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLinkView.swift; sourceTree = "<group>"; };
-		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>"; };
@@ -487,7 +470,6 @@
 		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; };
@@ -529,13 +511,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C245F232B4EAA5E001CC39F /* libgmpxx.a in Frameworks */,
-				5C245F262B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a in Frameworks */,
-				5C245F252B4EAA5E001CC39F /* libgmp.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C245F272B4EAA5E001CC39F /* libffi.a in Frameworks */,
+				5C4BB4BB2B1E7D75007981AA /* libffi.a in Frameworks */,
+				5C4BB4BA2B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a in Frameworks */,
+				5C4BB4B92B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a in Frameworks */,
+				5C4BB4B82B1E7D75007981AA /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C245F242B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a in Frameworks */,
+				5C4BB4BC2B1E7D75007981AA /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -597,11 +579,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C245F222B4EAA5E001CC39F /* libffi.a */,
-				5C245F202B4EAA5E001CC39F /* libgmp.a */,
-				5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */,
-				5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */,
-				5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */,
+				5C4BB4B62B1E7D75007981AA /* libffi.a */,
+				5C4BB4B32B1E7D75007981AA /* libgmp.a */,
+				5C4BB4B72B1E7D75007981AA /* libgmpxx.a */,
+				5C4BB4B42B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a */,
+				5C4BB4B52B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -626,7 +608,6 @@
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
 				5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */,
 				5CB346E42868AA7F001FD2EF /* SuspendChat.swift */,
-				5CF937212B25034A00E1D781 /* NSESubscriber.swift */,
 				5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */,
 				5C93293E2928E0FD0090FFF9 /* AudioRecPlay.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
@@ -654,7 +635,6 @@
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
 				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
-				8C05382D2B39887E006436DC /* VideoUtils.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -808,7 +788,6 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
-				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -829,7 +808,6 @@
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
 				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
-				5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
 				5CE2BA78284530CC00EC33A6 /* SimpleXChat.docc */,
@@ -1202,7 +1180,6 @@
 				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 */,
@@ -1225,7 +1202,6 @@
 				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 */,
@@ -1283,7 +1259,6 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
-				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1291,7 +1266,6 @@
 			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 */,
@@ -1528,7 +1502,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1550,7 +1524,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1571,7 +1545,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1593,7 +1567,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1652,7 +1626,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1665,7 +1639,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1684,7 +1658,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1697,7 +1671,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1716,7 +1690,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1740,7 +1714,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1762,7 +1736,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1786,7 +1760,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX (iOS).xcscheme

@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX NSE.xcscheme

@@ -2,7 +2,7 @@
 <Scheme
    LastUpgradeVersion = "1400"
    wasCreatedForAppExtension = "YES"
-   version = "1.3">
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -47,14 +47,16 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference

apps/ios/SimpleXChat/API.swift

@@ -12,16 +12,12 @@ private var chatController: chat_ctrl?
 
 private var migrationResult: (Bool, DBMigrationResult)?
 
-public func hasChatCtrl() -> Bool {
-    chatController != nil
-}
-
-public func getChatCtrl() -> chat_ctrl {
+public func getChatCtrl(_ useKey: String? = nil) -> chat_ctrl {
     if let controller = chatController { return controller }
     fatalError("chat controller not initialized")
 }
 
-public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil, backgroundMode: Bool = false) -> (Bool, DBMigrationResult) {
+public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil) -> (Bool, DBMigrationResult) {
     if let res = migrationResult { return res }
     let dbPath = getAppDatabasePath().path
     var dbKey = ""
@@ -45,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_key(&cPath, &cKey, 1, &cConfirm, backgroundMode ? 1 : 0, &chatController)!
+    let cjson = chat_migrate_init(&cPath, &cKey, &cConfirm, &chatController)!
     let dbRes = dbMigrationResult(fromCString(cjson))
     let encrypted = dbKey != ""
     let keychainErr = dbRes == .ok && useKeychain && encrypted && !kcDatabasePassword.set(dbKey)
@@ -61,13 +57,6 @@ 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

@@ -25,9 +25,9 @@ public enum ChatCommand {
     case apiMuteUser(userId: Int64)
     case apiUnmuteUser(userId: Int64)
     case apiDeleteUser(userId: Int64, delSMPQueues: Bool, viewPwd: String?)
-    case startChat(mainApp: Bool)
+    case startChat(subscribe: Bool, expire: Bool, xftp: Bool)
     case apiStopChat
-    case apiActivateChat(restoreChat: Bool)
+    case apiActivateChat
     case apiSuspendChat(timeoutMicroseconds: Int)
     case setTempFolder(tempFolder: String)
     case setFilesFolder(filesFolder: String)
@@ -154,9 +154,9 @@ public enum ChatCommand {
             case let .apiMuteUser(userId): return "/_mute user \(userId)"
             case let .apiUnmuteUser(userId): return "/_unmute user \(userId)"
             case let .apiDeleteUser(userId, delSMPQueues, viewPwd): return "/_delete user \(userId) del_smp=\(onOff(delSMPQueues))\(maybePwd(viewPwd))"
-            case let .startChat(mainApp): return "/_start main=\(onOff(mainApp))"
+            case let .startChat(subscribe, expire, xftp): return "/_start subscribe=\(onOff(subscribe)) expire=\(onOff(expire)) xftp=\(onOff(xftp))"
             case .apiStopChat: return "/_stop"
-            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
+            case .apiActivateChat: return "/_app activate"
             case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
             case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
             case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
@@ -604,8 +604,7 @@ 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 ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
+    case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
     // remote desktop responses/events
     case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
@@ -752,7 +751,6 @@ public enum ChatResponse: Decodable, Error {
             case .ntfTokenStatus: return "ntfTokenStatus"
             case .ntfToken: return "ntfToken"
             case .ntfMessages: return "ntfMessages"
-            case .ntfMessage: return "ntfMessage"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
             case .remoteCtrlList: return "remoteCtrlList"
             case .remoteCtrlFound: return "remoteCtrlFound"
@@ -900,7 +898,6 @@ public enum ChatResponse: Decodable, Error {
             case let .ntfTokenStatus(status): return String(describing: status)
             case let .ntfToken(token, status, ntfMode): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)"
             case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
-            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
             case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
             case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
@@ -1207,9 +1204,9 @@ public struct NetCfg: Codable, Equatable {
     public static let defaults: NetCfg = NetCfg(
         socksProxy: nil,
         sessionMode: TransportSessionMode.user,
-        tcpConnectTimeout: 20_000_000,
-        tcpTimeout: 15_000_000,
-        tcpTimeoutPerKb: 45_000,
+        tcpConnectTimeout: 15_000_000,
+        tcpTimeout: 10_000_000,
+        tcpTimeoutPerKb: 30_000,
         tcpKeepAlive: KeepAliveOpts.defaults,
         smpPingInterval: 1200_000_000,
         smpPingCount: 3,
@@ -1498,8 +1495,6 @@ 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"
@@ -1507,9 +1502,9 @@ public enum NotificationsMode: String, Decodable, SelectableItem {
 
     public var label: LocalizedStringKey {
         switch self {
-        case .off: "Local"
-        case .periodic: "Periodically"
-        case .instant: "Instantly"
+        case .off: return "Off (Local)"
+        case .periodic: return "Periodically"
+        case .instant: return "Instantly"
         }
     }
 

apps/ios/SimpleXChat/AppGroup.swift

@@ -9,16 +9,12 @@
 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" // no longer used
-public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer used
+public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal"
+public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
 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"
@@ -70,23 +66,13 @@ public func registerGroupDefaults() {
     ])
 }
 
-public enum AppState: String, Codable {
+public enum AppState: String {
     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
@@ -98,57 +84,23 @@ public enum AppState: String, Codable {
     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,
@@ -157,8 +109,6 @@ 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,
@@ -167,6 +117,10 @@ 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,8 +2016,7 @@ 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(getChatCtrl(), &cPath, ptr, Int32(data.count))!
+    let cjson = chat_write_file(&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(getChatCtrl(), &cFromPath, &cToPath)!
+    let cjson = chat_encrypt_file(&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,13 +146,6 @@ 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

@@ -1,99 +0,0 @@
-//
-//  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_key(char *path, char *key, int keepKey, char *confirm, int backgroundMode, chat_ctrl *ctrl);
+extern char *chat_migrate_init(char *path, char *key, char *confirm, chat_ctrl *ctrl);
 extern char *chat_close_store(chat_ctrl ctl);
-extern char *chat_reopen_store(chat_ctrl ctl);
 extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
+extern char *chat_recv_msg(chat_ctrl ctl);
 extern char *chat_recv_msg_wait(chat_ctrl ctl, int wait);
 extern char *chat_parse_markdown(char *str);
 extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_valid_name(char *name);
-extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
+extern char *chat_encrypt_media(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(chat_ctrl ctl, char *path, char *data, int len);
+extern char *chat_write_file(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(chat_ctrl ctl, 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(chat_ctrl ctl, char *fromPath, char *toPath);
+extern char *chat_encrypt_file(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/ios/SimpleXChat/hs_init.c

@@ -23,19 +23,3 @@ void haskell_init(void) {
     char **pargv = argv;
     hs_init_with_rtsopts(&argc, &pargv);
 }
-
-void haskell_init_nse(void) {
-    int argc = 7;
-    char *argv[] = {
-        "simplex",
-        "+RTS", // requires `hs_init_with_rtsopts`
-        "-A1m", // chunk size for new allocations
-        "-H1m", // initial heap size
-        "-F0.5", // heap growth triggering GC
-        "-Fd1", // memory return
-        "-c", // compacting garbage collector
-        0
-    };
-    char **pargv = argv;
-    hs_init_with_rtsopts(&argc, &pargv);
-}

apps/ios/SimpleXChat/hs_init.h

@@ -11,6 +11,4 @@
 
 void haskell_init(void);
 
-void haskell_init_nse(void);
-
 #endif /* hs_init_h */

apps/multiplatform/android/build.gradle.kts

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

apps/multiplatform/android/src/main/AndroidManifest.xml

@@ -39,7 +39,6 @@
         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,7 +5,6 @@ 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
@@ -23,7 +22,6 @@ import java.lang.ref.WeakReference
 class MainActivity: FragmentActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    platform.androidSetNightModeIfSupported()
     applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
     super.onCreate(savedInstanceState)
     // testJson()
@@ -43,7 +41,9 @@ class MainActivity: FragmentActivity() {
       )
     }
     setContent {
-      AppScreen()
+      SimpleXTheme {
+        AppScreen()
+      }
     }
     SimplexApp.context.schedulePeriodicServiceRestartWorker()
     SimplexApp.context.schedulePeriodicWakeUp()
@@ -126,9 +126,7 @@ fun processIntent(intent: Intent?) {
   when (intent?.action) {
     "android.intent.action.VIEW" -> {
       val uri = intent.data
-      if (uri != null) {
-        chatModel.appOpenUrl.value = null to uri.toURI()
-      }
+      if (uri != null) connectIfOpenedViaUri(chatModel.remoteHostId(), uri.toURI(), ChatModel)
     }
   }
 }

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

@@ -1,8 +1,7 @@
 package chat.simplex.app
 
 import android.app.Application
-import android.app.UiModeManager
-import android.os.*
+import chat.simplex.common.platform.Log
 import androidx.lifecycle.*
 import androidx.work.*
 import chat.simplex.app.model.NtfManager
@@ -11,12 +10,10 @@ 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
@@ -35,24 +32,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
   override fun onCreate() {
     super.onCreate()
     if (ProcessPhoenix.isPhoenixProcess(this)) {
-      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)
-            }
-          }
-        }
-      }
+      return;
     }
     context = this
     initHaskell()
@@ -164,14 +144,13 @@ class SimplexApp: Application(), LifecycleEventObserver {
     androidAppContext = this
     APPLICATION_ID = BuildConfig.APPLICATION_ID
     ntfManager = object : chat.simplex.common.platform.NtfManager() {
-      override fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean = NtfManager.notifyCallInvitation(invitation)
+      override fun notifyCallInvitation(invitation: RcvCallInvitation) = NtfManager.notifyCallInvitation(invitation)
       override fun hasNotificationsForChat(chatId: String): Boolean = NtfManager.hasNotificationsForChat(chatId)
       override fun cancelNotificationsForChat(chatId: String) = NtfManager.cancelNotificationsForChat(chatId)
       override fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String?, actions: List<Pair<NotificationAction, () -> Unit>>) = NtfManager.displayNotification(user, chatId, displayName, msgText, image, actions.map { it.first })
       override fun androidCreateNtfChannelsMaybeShowAlert() = NtfManager.createNtfChannelsMaybeShowAlert()
       override fun cancelCallNotification() = NtfManager.cancelCallNotification()
       override fun cancelAllNotifications() = NtfManager.cancelAllNotifications()
-      override fun showMessage(title: String, text: String) = NtfManager.showMessage(title, text)
     }
     platform = object : PlatformInterface {
       override suspend fun androidServiceStart() {
@@ -227,23 +206,6 @@ 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/java/chat/simplex/app/model/NtfManager.android.kt

@@ -30,7 +30,7 @@ object NtfManager {
   const val ShowChatsAction: String = "chat.simplex.app.SHOW_CHATS"
 
   // DO NOT change notification channel settings / names
-  const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_2"
+  const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_1"
   const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
   const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
   const val CallNotificationId: Int = -1
@@ -59,7 +59,7 @@ object NtfManager {
       .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
       .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
       .build()
-    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/raw/ring_once")
+    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
     Log.d(TAG, "callNotificationChannel sound: $soundUri")
     callChannel.setSound(soundUri, attrs)
     callChannel.enableVibration(true)
@@ -140,7 +140,7 @@ object NtfManager {
     }
   }
 
-  fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean {
+  fun notifyCallInvitation(invitation: RcvCallInvitation) {
     val keyguardManager = getKeyguardManager(context)
     Log.d(
       TAG,
@@ -149,7 +149,7 @@ object NtfManager {
           "callOnLockScreen ${appPreferences.callOnLockScreen.get()}, " +
           "onForeground ${isAppOnForeground}"
     )
-    if (isAppOnForeground) return false
+    if (isAppOnForeground) return
     val contactId = invitation.contact.id
     Log.d(TAG, "notifyCallInvitation $contactId")
     val image = invitation.contact.image
@@ -163,7 +163,7 @@ object NtfManager {
           .setFullScreenIntent(fullScreenPendingIntent, true)
           .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
       } else {
-        val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/raw/ring_once")
+        val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
         val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, Intent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
         NotificationCompat.Builder(context, CallChannel)
           .setContentIntent(chatPendingIntent(OpenChatAction, invitation.user.userId, invitation.contact.id))
@@ -206,39 +206,6 @@ object NtfManager {
         notify(CallNotificationId, notification)
       }
     }
-    return true
-  }
-
-  fun showMessage(title: String, text: String) {
-    val builder = NotificationCompat.Builder(context, MessageChannel)
-      .setContentTitle(title)
-      .setContentText(text)
-      .setPriority(NotificationCompat.PRIORITY_HIGH)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(null)
-      .setColor(0x88FFFF)
-      .setAutoCancel(true)
-      .setVibrate(null)
-      .setContentIntent(chatPendingIntent(ShowChatsAction, null, null))
-      .setSilent(false)
-
-    val summary = NotificationCompat.Builder(context, MessageChannel)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setColor(0x88FFFF)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setGroupSummary(true)
-      .setContentIntent(chatPendingIntent(ShowChatsAction, null))
-      .build()
-
-    with(NotificationManagerCompat.from(context)) {
-      if (ActivityCompat.checkSelfPermission(SimplexApp.context, android.Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
-        notify("MESSAGE".hashCode(), builder.build())
-        notify(0, summary)
-      }
-    }
   }
 
   fun cancelCallNotification() {
@@ -281,7 +248,6 @@ object NtfManager {
     manager.createNotificationChannel(callNotificationChannel(CallChannel, generalGetString(MR.strings.ntf_channel_calls)))
     // Remove old channels since they can't be edited
     manager.deleteNotificationChannel("chat.simplex.app.CALL_NOTIFICATION")
-    manager.deleteNotificationChannel("chat.simplex.app.CALL_NOTIFICATION_1")
     manager.deleteNotificationChannel("chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION")
   }
 

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

@@ -1,8 +0,0 @@
-<?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="Theme.AppCompat.DayNight.NoActionBar">
+  <style name="Theme.SimpleX" parent="android:Theme.Material.Light.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(28)
+    minSdkVersion(26)
     targetSdkVersion(33)
   }
   compileOptions {
@@ -155,34 +155,6 @@ 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")) {
@@ -223,44 +195,20 @@ afterEvaluate {
         return this
       }
       val fileRegex = Regex("MR/../strings.xml$|MR/..-.../strings.xml$|MR/..-../strings.xml$|MR/base/strings.xml$")
-      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
+      kotlin.sourceSets["commonMain"].resources.filter { fileRegex.containsMatchIn(it.absolutePath) }.asFileTree.forEach { file ->
         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)) {
-              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)
+              finalLines.add(line.removeCDATA().addCDATA(file.absolutePath))
             } else if (multiline.isEmpty() && startStringRegex.containsMatchIn(line)) {
               multiline.add(line)
             } else if (multiline.isNotEmpty() && endStringRegex.containsMatchIn(line)) {
               multiline.add(line)
-              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)
+              finalLines.addAll(multiline.joinToString("\n").removeCDATA().addCDATA(file.absolutePath).split("\n"))
               multiline.clear()
             } else if (multiline.isNotEmpty()) {
               multiline.add(line)
@@ -269,14 +217,10 @@ afterEvaluate {
             }
           }
           if (multiline.isNotEmpty()) {
-            errors.add("Unclosed string tag: ${multiline.joinToString("\n")} \nin ${file.absolutePath}")
+            throw Exception("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,6 +27,7 @@ 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
@@ -44,7 +45,6 @@ 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,17 +4,14 @@ import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Rect
-import android.os.*
+import android.os.Build
 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.AppScreen
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.KeyboardState
 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()
 
@@ -74,44 +71,3 @@ 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/database/DatabaseView.android.kt

@@ -1,7 +0,0 @@
-package chat.simplex.common.views.database
-
-import chat.simplex.common.views.usersettings.restartApp
-
-actual fun restartChatOrApp() {
-  restartApp()
-}

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.android.kt

@@ -28,7 +28,7 @@ actual fun SettingsSectionApp(
 }
 
 
-fun restartApp() {
+private fun restartApp() {
   ProcessPhoenix.triggerRebirth(androidAppContext)
   shutdownApp()
 }

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(chat_ctrl ctrl, const char *path, char *ptr, int length);
+extern char *chat_write_file(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(chat_ctrl ctrl, const char *from_path, const char *to_path);
+extern char *chat_encrypt_file(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, jlong controller, jstring path, jobject buffer) {
+Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, 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((void*)controller, _path, buff, capacity));
+    jstring res = (*env)->NewStringUTF(env, chat_write_file(_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, jlong controller, jstring from_path, jstring to_path) {
+Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, 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((void*)controller, _from_path, _to_path));
+    jstring res = (*env)->NewStringUTF(env, chat_encrypt_file(_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}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/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(chat_ctrl ctrl, const char *path, char *ptr, int length);
+extern char *chat_write_file(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(chat_ctrl ctrl, const char *from_path, const char *to_path);
+extern char *chat_encrypt_file(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, jlong controller, jstring path, jobject buffer) {
+Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, 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((void*)controller, _path, buff, capacity));
+    jstring res = decode_to_utf8_string(env, chat_write_file(_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, jlong controller, jstring from_path, jstring to_path) {
+Java_chat_simplex_common_platform_CoreKt_chatEncryptFile(JNIEnv *env, jclass clazz, 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((void*)controller, _from_path, _to_path));
+    jstring res = decode_to_utf8_string(env, chat_encrypt_file(_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

@@ -42,11 +42,9 @@ data class SettingsViewState(
 
 @Composable
 fun AppScreen() {
-  SimpleXTheme {
-    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-      Surface(color = MaterialTheme.colors.background) {
-        MainScreen()
-      }
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    Surface(color = MaterialTheme.colors.background) {
+      MainScreen()
     }
   }
 }
@@ -162,26 +160,11 @@ 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()
@@ -332,11 +315,9 @@ fun DesktopScreen(settingsState: SettingsViewState) {
       )
     }
     VerticalDivider(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH))
-    tryOrShowError("UserPicker", error = {}) {
-      UserPicker(chatModel, userPickerState) {
-        scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-        userPickerState.value = AnimatedViewState.GONE
-      }
+    UserPicker(chatModel, userPickerState) {
+      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
+      userPickerState.value = AnimatedViewState.GONE
     }
     ModalManager.fullscreen.showInView()
   }

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

@@ -2,6 +2,7 @@ package chat.simplex.common.model
 
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -58,7 +59,7 @@ object ChatModel {
   val chatItemStatuses = mutableMapOf<Long, CIStatus>()
   val groupMembers = mutableStateListOf<GroupMember>()
 
-  val terminalItems = mutableStateOf<List<TerminalItem>>(listOf())
+  val terminalItems = mutableStateListOf<TerminalItem>()
   val userAddress = mutableStateOf<UserContactLinkRec?>(null)
   // Allows to temporary save servers that are being edited on multiple screens
   val userSMPServersUnsaved = mutableStateOf<(List<ServerCfg>)?>(null)
@@ -67,11 +68,8 @@ object ChatModel {
   // set when app opened from external intent
   val clearOverlays = mutableStateOf<Boolean>(false)
 
-  // 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)
+  // set when app is opened via contact or invitation URI
+  val appOpenUrl = mutableStateOf<URI?>(null)
 
   // preferences
   val notificationPreviewMode by lazy {
@@ -122,9 +120,6 @@ object ChatModel {
   val remoteHostPairing = mutableStateOf<Pair<RemoteHostInfo?, RemoteHostSessionState>?>(null)
   val remoteCtrlSession = mutableStateOf<RemoteCtrlSession?>(null)
 
-  val processedCriticalError: ProcessedErrors<AgentErrorType.CRITICAL> = ProcessedErrors(60_000)
-  val processedInternalError: ProcessedErrors<AgentErrorType.INTERNAL> = ProcessedErrors(20_000)
-
   fun getUser(userId: Long): User? = if (currentUser.value?.userId == userId) {
     currentUser.value
   } else {
@@ -623,10 +618,10 @@ object ChatModel {
   }
 
   fun addTerminalItem(item: TerminalItem) {
-    if (terminalItems.value.size >= 500) {
-      terminalItems.value = terminalItems.value.subList(1, terminalItems.value.size)
+    if (terminalItems.size >= 500) {
+      terminalItems.removeAt(0)
     }
-    terminalItems.value += item
+    terminalItems.add(item)
   }
 
   val connectedToRemote: Boolean @Composable get() = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true

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

@@ -21,11 +21,10 @@ 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(ctrl, path, buffer)
+  val str = chatWriteFile(path, buffer)
   return when (val d = json.decodeFromString(WriteFileResult.serializer(), str)) {
     is WriteFileResult.Result -> d.cryptoArgs
     is WriteFileResult.Error -> throw Exception(d.writeError)
@@ -44,8 +43,7 @@ fun readCryptoFile(path: String, cryptoArgs: CryptoFileArgs): ByteArray {
 }
 
 fun encryptCryptoFile(fromPath: String, toPath: String): CryptoFileArgs {
-  val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized")
-  val str = chatEncryptFile(ctrl, fromPath, toPath)
+  val str = chatEncryptFile(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

@@ -108,7 +108,6 @@ class AppPreferences {
   val chatArchiveTime = mkDatePreference(SHARED_PREFS_CHAT_ARCHIVE_TIME, null)
   val chatLastStart = mkDatePreference(SHARED_PREFS_CHAT_LAST_START, null)
   val developerTools = mkBoolPreference(SHARED_PREFS_DEVELOPER_TOOLS, false)
-  val showInternalErrors = mkBoolPreference(SHARED_PREFS_SHOW_INTERNAL_ERRORS, false)
   val terminalAlwaysVisible = mkBoolPreference(SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE, false)
   val networkUseSocksProxy = mkBoolPreference(SHARED_PREFS_NETWORK_USE_SOCKS_PROXY, false)
   val networkProxyHostPort = mkStrPreference(SHARED_PREFS_NETWORK_PROXY_HOST_PORT, "localhost:9050")
@@ -277,7 +276,6 @@ class AppPreferences {
     private const val SHARED_PREFS_ONBOARDING_STAGE = "OnboardingStage"
     private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
     private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
-    private const val SHARED_PREFS_SHOW_INTERNAL_ERRORS = "ShowInternalErrors"
     private const val SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE = "TerminalAlwaysVisible"
     private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
     private const val SHARED_PREFS_NETWORK_PROXY_HOST_PORT = "NetworkProxyHostPort"
@@ -585,7 +583,7 @@ object ChatController {
   }
 
   suspend fun apiStartChat(): Boolean {
-    val r = sendCmd(null, CC.StartChat(mainApp = true))
+    val r = sendCmd(null, CC.StartChat(expire = true))
     when (r) {
       is CR.ChatStarted -> return true
       is CR.ChatRunning -> return false
@@ -1922,14 +1920,6 @@ object ChatController {
           }
         }
       }
-      is CR.ChatCmdError -> when {
-        r.chatError is ChatError.ChatErrorAgent && r.chatError.agentError is AgentErrorType.CRITICAL -> {
-          chatModel.processedCriticalError.newError(r.chatError.agentError, r.chatError.agentError.offerRestart)
-        }
-        r.chatError is ChatError.ChatErrorAgent && r.chatError.agentError is AgentErrorType.INTERNAL && appPrefs.showInternalErrors.get() -> {
-          chatModel.processedInternalError.newError(r.chatError.agentError, false)
-        }
-      }
       else ->
         Log.d(TAG , "unsupported event: ${r.responseType}")
     }
@@ -2033,8 +2023,7 @@ object ChatController {
     chatModel.chatId.value = null
     ModalManager.center.closeModals()
     ModalManager.end.closeModals()
-    AlertManager.shared.hideAllAlerts()
-    AlertManager.privacySensitive.hideAllAlerts()
+    AlertManager.shared.alertViews.clear()
     chatModel.currentRemoteHost.value = switchRemoteHost(rhId)
     reloadRemoteHosts()
     val user = apiGetActiveUser(rhId)
@@ -2171,7 +2160,7 @@ sealed class CC {
   class ApiMuteUser(val userId: Long): CC()
   class ApiUnmuteUser(val userId: Long): CC()
   class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean, val viewPwd: String?): CC()
-  class StartChat(val mainApp: Boolean): CC()
+  class StartChat(val expire: Boolean): CC()
   class ApiStopChat: CC()
   class SetTempFolder(val tempFolder: String): CC()
   class SetFilesFolder(val filesFolder: String): CC()
@@ -2298,7 +2287,7 @@ sealed class CC {
     is ApiMuteUser -> "/_mute user $userId"
     is ApiUnmuteUser -> "/_unmute user $userId"
     is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}${maybePwd(viewPwd)}"
-    is StartChat -> "/_start main=${onOff(mainApp)}"
+    is StartChat -> "/_start subscribe=on expire=${onOff(expire)} xftp=on"
     is ApiStopChat -> "/_stop"
     is SetTempFolder -> "/_temp_folder $tempFolder"
     is SetFilesFolder -> "/_files_folder $filesFolder"
@@ -2811,9 +2800,9 @@ data class NetCfg(
         hostMode = HostMode.OnionViaSocks,
         requiredHostMode = false,
         sessionMode = TransportSessionMode.User,
-        tcpConnectTimeout = 20_000_000,
-        tcpTimeout = 15_000_000,
-        tcpTimeoutPerKb = 45_000,
+        tcpConnectTimeout = 15_000_000,
+        tcpTimeout = 10_000_000,
+        tcpTimeoutPerKb = 30_000,
         tcpKeepAlive = KeepAliveOpts.defaults,
         smpPingInterval = 1200_000_000,
         smpPingCount = 3
@@ -4720,7 +4709,6 @@ sealed class AgentErrorType {
     is AGENT -> "AGENT ${agentErr.string}"
     is INTERNAL -> "INTERNAL $internalErr"
     is INACTIVE -> "INACTIVE"
-    is CRITICAL -> "CRITICAL $offerRestart $criticalErr"
   }
   @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType): AgentErrorType()
   @Serializable @SerialName("CONN") class CONN(val connErr: ConnectionErrorType): AgentErrorType()
@@ -4732,7 +4720,6 @@ sealed class AgentErrorType {
   @Serializable @SerialName("AGENT") class AGENT(val agentErr: SMPAgentError): AgentErrorType()
   @Serializable @SerialName("INTERNAL") class INTERNAL(val internalErr: String): AgentErrorType()
   @Serializable @SerialName("INACTIVE") object INACTIVE: AgentErrorType()
-  @Serializable @SerialName("CRITICAL") data class CRITICAL(val offerRestart: Boolean, val criticalErr: String): AgentErrorType()
 }
 
 @Serializable

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(ctrl: ChatCtrl, path: String, buffer: ByteBuffer): String
+external fun chatWriteFile(path: String, buffer: ByteBuffer): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
-external fun chatEncryptFile(ctrl: ChatCtrl, fromPath: String, toPath: String): String
+external fun chatEncryptFile(fromPath: String, toPath: String): String
 external fun chatDecryptFile(fromPath: String, key: String, nonce: String, toPath: String): String
 
 val chatModel: ChatModel

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

@@ -93,13 +93,12 @@ abstract class NtfManager {
     }
   }
 
-  abstract fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean
+  abstract fun notifyCallInvitation(invitation: RcvCallInvitation)
   abstract fun hasNotificationsForChat(chatId: String): Boolean
   abstract fun cancelNotificationsForChat(chatId: String)
   abstract fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<Pair<NotificationAction, () -> Unit>> = emptyList())
   abstract fun cancelCallNotification()
   abstract fun cancelAllNotifications()
-  abstract fun showMessage(title: String, text: String)
   // Android only
   abstract fun androidCreateNtfChannelsMaybeShowAlert()
 

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

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

@@ -207,12 +207,12 @@ fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: ()
 
 fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: () -> Unit) {
   withApi {
-    chatModel.currentUser.value = chatModel.controller.apiCreateActiveUser(
+    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() && !chatModel.desktopOnboardingRandomPassword.value) {
+      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get()) {
         OnboardingStage.Step2_5_SetupDatabasePassphrase
       } else {
         OnboardingStage.Step3_CreateSimpleXAddress

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

@@ -13,8 +13,8 @@ class CallManager(val chatModel: ChatModel) {
       callInvitations[invitation.contact.id] = invitation
       if (invitation.user.showNotifications) {
         if (Clock.System.now() - invitation.callTs <= 3.minutes) {
-          invitation.sentNotification = ntfManager.notifyCallInvitation(invitation)
           activeCallInvitation.value = invitation
+          ntfManager.notifyCallInvitation(invitation)
         } else {
           val contact = invitation.contact
           ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)

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

@@ -15,10 +15,11 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.ProfileImage
 import chat.simplex.common.views.usersettings.ProfilePreview
+import chat.simplex.common.platform.ntfManager
+import chat.simplex.common.platform.SoundPlayer
 import chat.simplex.res.MR
 import kotlinx.datetime.Clock
 
@@ -26,11 +27,7 @@ import kotlinx.datetime.Clock
 fun IncomingCallAlertView(invitation: RcvCallInvitation, chatModel: ChatModel) {
   val cm = chatModel.callManager
   val scope = rememberCoroutineScope()
-  LaunchedEffect(Unit) {
-    if (chatModel.activeCallInvitation.value?.sentNotification == false || appPlatform.isDesktop) {
-      SoundPlayer.start(scope, sound = !chatModel.showCallView.value)
-    }
-  }
+  LaunchedEffect(true) { SoundPlayer.start(scope, sound = !chatModel.showCallView.value) }
   DisposableEffect(true) { onDispose { SoundPlayer.stop() } }
   IncomingCallAlertLayout(
     invitation,

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

@@ -112,9 +112,6 @@ sealed class WCallResponse {
     CallMediaType.Video -> MR.strings.incoming_video_call
     CallMediaType.Audio -> MR.strings.incoming_audio_call
   })
-
-  // Shows whether notification was shown or not to prevent playing sound twice in both notification and in-app
-  var sentNotification: Boolean = false
 }
 @Serializable data class CallCapabilities(val encryption: Boolean)
 @Serializable data class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {

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

@@ -220,9 +220,8 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
           }
         }
       },
-      loadPrevMessages = {
-        if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-        val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
+      loadPrevMessages = { cInfo ->
+        val c = chatModel.getChat(cInfo.id)
         val firstId = chatModel.chatItems.firstOrNull()?.id
         if (c != null && firstId != null) {
           withApi {
@@ -441,8 +440,7 @@ 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
-        if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-        val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
+        val c = chatModel.getChat(chat.chatInfo.id) ?: return@ChatLayout
         withApi {
           apiFindMessages(c, chatModel, value)
           searchText.value = value
@@ -469,7 +467,7 @@ fun ChatLayout(
   back: () -> Unit,
   info: () -> Unit,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: () -> Unit,
+  loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
   receiveFile: (Long, Boolean) -> Unit,
@@ -792,7 +790,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   useLinkPreviews: Boolean,
   linkMode: SimplexLinkMode,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: () -> Unit,
+  loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
   receiveFile: (Long, Boolean) -> Unit,
@@ -830,7 +828,9 @@ fun BoxWithConstraintsScope.ChatItemsList(
     }
   }
 
-  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)
+  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, chat, chatItems) { c ->
+    loadPrevMessages(c.chatInfo)
+  }
 
   Spacer(Modifier.size(8.dp))
   val reversedChatItems by remember { derivedStateOf { chatItems.reversed().toList() } }
@@ -900,11 +900,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
 
         @Composable
         fun ChatItemViewShortHand(cItem: ChatItem, range: IntRange?) {
-          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)
-          }
+          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
@@ -1150,32 +1146,24 @@ fun BoxWithConstraintsScope.FloatingButtons(
 fun PreloadItems(
   listState: LazyListState,
   remaining: Int = 10,
-  onLoadMore: () -> Unit,
+  chat: Chat,
+  items: List<*>,
+  onLoadMore: (chat: Chat) -> Unit,
 ) {
-  // 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
+  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
       }
-  }
-  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
-    }
+      .distinctUntilChanged()
       .filter { it > 0 }
       .collect {
-        onLoadMore()
+        onLoadMore(chat)
       }
   }
 }
@@ -1447,7 +1435,7 @@ fun PreviewChatLayout() {
       back = {},
       info = {},
       showMemberInfo = { _, _ -> },
-      loadPrevMessages = {},
+      loadPrevMessages = { _ -> },
       deleteMessage = { _, _ -> },
       deleteMessages = { _ -> },
       receiveFile = { _, _ -> },
@@ -1520,7 +1508,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.hasAlertsShown())
+        bitmap = getBitmapFromUri(uri, withAlertOnException = AlertManager.shared.alertViews.isEmpty())
         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,6 +29,7 @@ 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
@@ -81,10 +82,7 @@ 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) }
-    val sendMsgButtonDisabled = !sendMsgEnabled || !cs.sendEnabled() ||
-      (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-      cs.endLiveDisabled
-    PlatformTextField(composeState, sendMsgEnabled, sendMsgButtonDisabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
+    PlatformTextField(composeState, sendMsgEnabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
       if (!cs.inProgress) {
         sendMessage(null)
       }
@@ -157,6 +155,9 @@ 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
@@ -199,12 +200,12 @@ fun SendMsgView(
 
           val menuItems = MenuItems()
           if (menuItems.isNotEmpty()) {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage) { showDropdown.value = true }
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !disabled, sendMessage) { showDropdown.value = true }
             DefaultDropdownMenu(showDropdown) {
               menuItems.forEach { composable -> composable() }
             }
           } else {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage)
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !disabled, sendMessage)
           }
         }
       }

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

@@ -1,18 +0,0 @@
-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/ChatItemView.kt

@@ -195,13 +195,7 @@ fun ChatItemView(
                 }
                 val clipboard = LocalClipboardManager.current
                 val cachedRemoteReqs = remember { CIFile.cachedRemoteFileRequests }
-                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
-                }
-
+                val copyAndShareAllowed = cItem.file == null || !chatModel.connectedToRemote() || getLoadedFilePath(cItem.file) != null || cachedRemoteReqs[cItem.file.fileSource] != false
                 if (copyAndShareAllowed) {
                   ItemAction(stringResource(MR.strings.share_verb), painterResource(MR.images.ic_share), onClick = {
                     var fileSource = getLoadedFileSource(cItem.file)
@@ -227,7 +221,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 && cItem.file?.loaded == true))) {
+                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))) {
                   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,7 +14,6 @@ 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
@@ -62,17 +61,9 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     is ChatInfo.Direct -> {
       val contactNetworkStatus = chatModel.contactNetworkStatus(chat.chatInfo.contact)
       ChatListNavLinkLayout(
-        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)
-          }
-        },
+        chatLinkPreview = { 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 = {
-          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
-            ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu, showMarkRead)
-          }
-        },
+        dropdownMenuItems = { ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu, showMarkRead) },
         showMenu,
         stopped,
         selectedChat
@@ -80,45 +71,25 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     }
     is ChatInfo.Group ->
       ChatListNavLinkLayout(
-        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)
-          }
-        },
+        chatLinkPreview = { 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 = {
-          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
-            GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, inProgress, showMarkRead)
-          }
-        },
+        dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, inProgress, showMarkRead) },
         showMenu,
         stopped,
         selectedChat
       )
     is ChatInfo.ContactRequest ->
       ChatListNavLinkLayout(
-        chatLinkPreview = {
-          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
-            ContactRequestView(chat.chatInfo)
-          }
-        },
+        chatLinkPreview = { ContactRequestView(chat.chatInfo) },
         click = { contactRequestAlertDialog(chat.remoteHostId, chat.chatInfo, chatModel) },
-        dropdownMenuItems = {
-          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
-            ContactRequestMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu)
-          }
-        },
+        dropdownMenuItems = { ContactRequestMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu) },
         showMenu,
         stopped,
         selectedChat
       )
     is ChatInfo.ContactConnection ->
       ChatListNavLinkLayout(
-        chatLinkPreview = {
-          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
-            ContactConnectionView(chat.chatInfo.contactConnection)
-          }
-        },
+        chatLinkPreview = { ContactConnectionView(chat.chatInfo.contactConnection) },
         click = {
           ModalManager.center.closeModals()
           ModalManager.end.closeModals()
@@ -126,11 +97,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
             ContactConnectionInfoView(chatModel, chat.remoteHostId, chat.chatInfo.contactConnection.connReqInv, chat.chatInfo.contactConnection, false, close)
           }
         },
-        dropdownMenuItems = {
-          tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
-            ContactConnectionMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu)
-          }
-        },
+        dropdownMenuItems = { ContactConnectionMenuItems(chat.remoteHostId, chat.chatInfo, chatModel, showMenu) },
         showMenu,
         stopped,
         selectedChat
@@ -138,9 +105,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     is ChatInfo.InvalidJSON ->
       ChatListNavLinkLayout(
         chatLinkPreview = {
-          tryOrShowError("${chat.id}ChatListNavLink", error = { ErrorChatListItem() }) {
-            InvalidDataView()
-          }
+          InvalidDataView()
         },
         click = {
           ModalManager.end.closeModals()
@@ -154,13 +119,6 @@ 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)
@@ -653,12 +611,12 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
   close: (() -> Unit)?,
   openChat: Boolean
 ) {
-  AlertManager.privacySensitive.showAlertDialogButtonsColumn(
+  AlertManager.shared.showAlertDialogButtonsColumn(
     title = String.format(generalGetString(MR.strings.connect_with_contact_name_question), contact.chatViewName),
     buttons = {
       Column {
         SectionItemView({
-          AlertManager.privacySensitive.hideAlert()
+          AlertManager.shared.hideAlert()
           withApi {
             close?.invoke()
             val ok = connectContactViaAddress(chatModel, rhId, contact.contactId, incognito = false)
@@ -670,7 +628,7 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
           Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
         SectionItemView({
-          AlertManager.privacySensitive.hideAlert()
+          AlertManager.shared.hideAlert()
           withApi {
             close?.invoke()
             val ok = connectContactViaAddress(chatModel, rhId, contact.contactId, incognito = true)
@@ -682,7 +640,7 @@ fun askCurrentOrIncognitoProfileConnectContactViaAddress(
           Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
         SectionItemView({
-          AlertManager.privacySensitive.hideAlert()
+          AlertManager.shared.hideAlert()
         }) {
           Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
         }
@@ -696,7 +654,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.privacySensitive.showAlertMsg(
+    AlertManager.shared.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,7 +11,6 @@ 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
@@ -50,6 +49,13 @@ 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) {
@@ -65,11 +71,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   val (userPickerState, scaffoldState ) = settingsState
   Scaffold(topBar = { Box(Modifier.padding(end = endPadding)) { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } } },
     scaffoldState = scaffoldState,
-    drawerContent = {
-      tryOrShowError("Settings", error = { ErrorSettingsView() }) {
-        SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
-      }
-    },
+    drawerContent = { SettingsView(chatModel, setPerformLA, scaffoldState.drawerState) },
     drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
     drawerGesturesEnabled = appPlatform.isAndroid,
     floatingActionButton = {
@@ -116,16 +118,12 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   if (searchInList.isEmpty()) {
     DesktopActiveCallOverlayLayout(newChatSheetState)
     // TODO disable this button and sheet for the duration of the switch
-    tryOrShowError("NewChatSheet", error = {}) {
-      NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
-    }
+    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
   }
   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
-      }
+    UserPicker(chatModel, userPickerState) {
+      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
+      userPickerState.value = AnimatedViewState.GONE
     }
   }
 }
@@ -304,7 +302,7 @@ expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<An
 fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
   Log.d(TAG, "connectIfOpenedViaUri: opened via link")
   if (chatModel.currentUser.value == null) {
-    chatModel.appOpenUrl.value = rhId to uri
+    chatModel.appOpenUrl.value = uri
   } else {
     withApi {
       planAndConnect(chatModel, rhId, uri, incognito = null, close = null)
@@ -312,13 +310,6 @@ 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

@@ -47,12 +47,10 @@ fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stoppe
     }
   }
   if (appPlatform.isAndroid) {
-    tryOrShowError("UserPicker", error = {}) {
-      UserPicker(chatModel, userPickerState, showSettings = false, showCancel = true, cancelClicked = {
-        chatModel.sharedContent.value = null
-        userPickerState.value = AnimatedViewState.GONE
-      })
-    }
+    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/database/DatabaseErrorView.kt

@@ -270,7 +270,7 @@ private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onCli
     } else null
     ),
     modifier = Modifier.focusRequester(focusRequester).onPreviewKeyEvent {
-      if (onClick != null && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
+      if (onClick != null && it.key == Key.Enter && 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.*
@@ -366,7 +367,7 @@ fun chatArchiveTitle(chatArchiveTime: Instant, chatLastStart: Instant): String {
   return stringResource(if (chatArchiveTime < chatLastStart) MR.strings.old_database_archive else MR.strings.new_database_archive)
 }
 
-fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
+private fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
   withApi {
     try {
       if (chatDbChanged.value) {
@@ -406,8 +407,6 @@ private fun stopChatAlert(m: ChatModel) {
   )
 }
 
-expect fun restartChatOrApp()
-
 private fun exportProhibitedAlert() {
   AlertManager.shared.showAlertMsg(
     title = generalGetString(MR.strings.set_password_to_export),
@@ -415,7 +414,7 @@ private fun exportProhibitedAlert() {
   )
 }
 
-fun authStopChat(m: ChatModel, onStop: (() -> Unit)? = null) {
+private fun authStopChat(m: ChatModel) {
   if (m.controller.appPrefs.performLA.get()) {
     authenticate(
       generalGetString(MR.strings.auth_stop_chat),
@@ -423,7 +422,7 @@ fun authStopChat(m: ChatModel, onStop: (() -> Unit)? = null) {
       completed = { laResult ->
         when (laResult) {
           LAResult.Success, is LAResult.Unavailable -> {
-            stopChat(m, onStop)
+            stopChat(m)
           }
           is LAResult.Error -> {
             m.chatRunning.value = true
@@ -435,16 +434,15 @@ fun authStopChat(m: ChatModel, onStop: (() -> Unit)? = null) {
       }
     )
   } else {
-    stopChat(m, onStop)
+    stopChat(m)
   }
 }
 
-private fun stopChat(m: ChatModel, onStop: (() -> Unit)? = null) {
+private fun stopChat(m: ChatModel) {
   withApi {
     try {
       stopChatAsync(m)
       platform.androidChatStopped()
-      onStop?.invoke()
     } catch (e: Error) {
       m.chatRunning.value = true
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_stopping_chat), e.toString())

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

@@ -1,11 +1,8 @@
 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
@@ -24,7 +21,7 @@ import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.painterResource
 
 class AlertManager {
-  private var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
+  var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
 
   fun showAlert(alert: @Composable () -> Unit) {
     Log.d(TAG, "AlertManager.showAlert")
@@ -35,12 +32,6 @@ class AlertManager {
     alertViews.removeLastOrNull()
   }
 
-  fun hideAllAlerts() {
-    alertViews.clear()
-  }
-
-  fun hasAlertsShown() = alertViews.isNotEmpty()
-
   fun showAlertDialogButtons(
     title: String,
     text: String? = null,
@@ -226,7 +217,6 @@ class AlertManager {
 
   companion object {
     val shared = AlertManager()
-    val privacySensitive = AlertManager()
   }
 }
 
@@ -243,71 +233,53 @@ private fun alertTitle(title: String): (@Composable () -> Unit)? {
 
 @Composable
 private fun AlertContent(text: String?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  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()
+  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
+        )
+      }
+    }
+    content()
   }
 }
 
 @Composable
 private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  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()
+  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
+        )
+      }
+    }
+    content()
   }
 }
 

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

@@ -1,64 +0,0 @@
-package chat.simplex.common.views.helpers
-
-import chat.simplex.common.model.AgentErrorType
-import chat.simplex.common.platform.Log
-import chat.simplex.common.platform.TAG
-import chat.simplex.common.platform.ntfManager
-import chat.simplex.common.views.database.restartChatOrApp
-import chat.simplex.res.MR
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-
-class ProcessedErrors <T: AgentErrorType>(val interval: Long) {
-  private var lastShownTimestamp: Long = -1
-  private var lastShownOfferRestart: Boolean = false
-  private var timer: Job = Job()
-
-  fun newError(error: T, offerRestart: Boolean) {
-    timer.cancel()
-    timer = withBGApi {
-      val delayBeforeNext = (lastShownTimestamp + interval) - System.currentTimeMillis()
-      if ((lastShownOfferRestart || !offerRestart) && delayBeforeNext >= 0) {
-        delay(delayBeforeNext)
-      }
-      lastShownTimestamp = System.currentTimeMillis()
-      lastShownOfferRestart = offerRestart
-      AlertManager.shared.hideAllAlerts()
-      showMessage(error, offerRestart)
-    }
-  }
-
-  private fun showMessage(error: T, offerRestart: Boolean) {
-    when (error) {
-      is AgentErrorType.CRITICAL -> {
-        val title = generalGetString(MR.strings.agent_critical_error_title)
-        val text = generalGetString(MR.strings.agent_critical_error_desc).format(error.criticalErr)
-        try {
-          ntfManager.showMessage(title, text)
-        } catch (e: Throwable) {
-          Log.e(TAG, e.stackTraceToString())
-        }
-        if (offerRestart) {
-          AlertManager.shared.showAlertDialog(
-            title = title,
-            text = text,
-            confirmText = generalGetString(MR.strings.restart_chat_button),
-            onConfirm = {
-              withApi { restartChatOrApp() }
-            })
-        } else {
-          AlertManager.shared.showAlertMsg(
-            title = title,
-            text = text,
-          )
-        }
-      }
-      is AgentErrorType.INTERNAL -> {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.agent_internal_error_title),
-          text = generalGetString(MR.strings.agent_internal_error_desc).format(error.internalErr),
-        )
-      }
-    }
-  }
-}

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

@@ -390,28 +390,6 @@ 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,8 +70,7 @@ private fun deleteStorageAndRestart(m: ChatModel, password: String, completed: (
         m.controller.startChat(createdUser)
       }
       ModalManager.fullscreen.closeModals()
-      AlertManager.shared.hideAllAlerts()
-      AlertManager.privacySensitive.hideAllAlerts()
+      AlertManager.shared.hideAlert()
       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/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, true)
+            val file = saveTempImageUncompressed(image, false)
             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.IncognitoView
+import chat.simplex.common.views.usersettings.*
 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.privacySensitive.showAlertDialog(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+          AlertManager.shared.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.privacySensitive.showAlertDialog(
+            AlertManager.shared.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.privacySensitive.showAlertDialog(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+          AlertManager.shared.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.privacySensitive.showAlertMsg(
+          AlertManager.shared.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.privacySensitive.showAlertDialog(
+            AlertManager.shared.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.privacySensitive.showAlertDialog(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+            AlertManager.shared.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.privacySensitive.showAlertMsg(
+          AlertManager.shared.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),
@@ -289,7 +289,7 @@ suspend fun connectViaUri(
   if (pcc != null) {
     chatModel.updateContactConnection(rhId, pcc)
     close?.invoke()
-    AlertManager.privacySensitive.showAlertMsg(
+    AlertManager.shared.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
       text =
       when (connLinkType) {
@@ -320,14 +320,14 @@ fun askCurrentOrIncognitoProfileAlert(
   text: AnnotatedString? = null,
   connectDestructive: Boolean,
 ) {
-  AlertManager.privacySensitive.showAlertDialogButtonsColumn(
+  AlertManager.shared.showAlertDialogButtonsColumn(
     title = title,
     text = text,
     buttons = {
       Column {
         val connectColor = if (connectDestructive) MaterialTheme.colors.error else MaterialTheme.colors.primary
         SectionItemView({
-          AlertManager.privacySensitive.hideAlert()
+          AlertManager.shared.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.privacySensitive.hideAlert()
+          AlertManager.shared.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.privacySensitive.hideAlert()
+          AlertManager.shared.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.privacySensitive.showAlertDialogButtonsColumn(
+  AlertManager.shared.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.privacySensitive.hideAlert()
+          AlertManager.shared.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.privacySensitive.hideAlert()
+            AlertManager.shared.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito, connectionPlan, close)
             }
@@ -400,7 +400,7 @@ fun ownGroupLinkConfirmConnect(
         } else {
           // Use current profile
           SectionItemView({
-            AlertManager.privacySensitive.hideAlert()
+            AlertManager.shared.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito = false, connectionPlan, close)
             }
@@ -409,7 +409,7 @@ fun ownGroupLinkConfirmConnect(
           }
           // Use new incognito profile
           SectionItemView({
-            AlertManager.privacySensitive.hideAlert()
+            AlertManager.shared.hideAlert()
             withApi {
               connectViaUri(chatModel, rhId, uri, incognito = true, connectionPlan, close)
             }
@@ -419,7 +419,7 @@ fun ownGroupLinkConfirmConnect(
         }
         // Cancel
         SectionItemView({
-          AlertManager.privacySensitive.hideAlert()
+          AlertManager.shared.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,6 +48,14 @@ 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
         }
       }
@@ -92,7 +100,7 @@ private fun CreateSimpleXAddressLayout(
       ContinueButton(nextStep)
     } else {
       CreateAddressButton(createAddress)
-      TextBelowButton(stringResource(MR.strings.you_can_make_address_visible_via_settings))
+      TextBelowButton(stringResource(MR.strings.your_contacts_will_see_it))
       Spacer(Modifier.weight(1f))
       SkipButton(nextStep)
     }

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

@@ -73,8 +73,7 @@ private fun LinkAMobileLayout(
       }
       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) {
+          if (chatModel.remoteHosts.isEmpty()) {
             chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
           } else {
             chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)

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

@@ -1,7 +1,10 @@
 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
@@ -12,12 +15,14 @@ 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.*
@@ -120,7 +125,7 @@ private fun SetupDatabasePassphraseLayout(
           .padding(horizontal = DEFAULT_PADDING)
           .focusRequester(focusRequester)
           .onPreviewKeyEvent {
-            if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
+            if (it.key == Key.Enter && it.type == KeyEventType.KeyUp) {
               focusManager.moveFocus(FocusDirection.Down)
               true
             } else {
@@ -150,7 +155,7 @@ private fun SetupDatabasePassphraseLayout(
         modifier = Modifier
           .padding(horizontal = DEFAULT_PADDING)
           .onPreviewKeyEvent {
-            if (!disabled && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
+            if (!disabled && it.key == Key.Enter && it.type == KeyEventType.KeyUp) {
               onClickUpdate()
               true
             } else {
@@ -172,10 +177,7 @@ private fun SetupDatabasePassphraseLayout(
     }
 
     Spacer(Modifier.weight(1f))
-    SkipButton(progressIndicator.value) {
-      chatModel.desktopOnboardingRandomPassword.value = true
-      nextStep()
-    }
+    SkipButton(progressIndicator.value, nextStep)
 
     SectionBottomSpacer()
   }

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(7_500000, 10_000000, 15_000000, 20_000000, 30_000_000, 45_000_000), secondsLabel
+          listOf(5_000000, 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(5_000000, 7_000000, 10_000000, 15_000000, 20_000_000, 30_000_000), secondsLabel
+          listOf(3_000000, 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, 45_000, 60_000, 90_000, 120_000), secondsLabel
+          listOf(15_000, 30_000, 60_000, 90_000, 120_000), secondsLabel
         )
       }
       SectionItemView {

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

@@ -10,11 +10,10 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
-import chat.simplex.common.model.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.appPlatform
-import chat.simplex.common.platform.appPreferences
 import chat.simplex.common.views.TerminalView
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
@@ -45,7 +44,6 @@ fun DeveloperView(
             m.controller.appPrefs.terminalAlwaysVisible.set(false)
           }
         }
-        SettingsPreferenceItem(painterResource(MR.images.ic_report), stringResource(MR.strings.show_internal_errors), appPreferences.showInternalErrors)
       }
     }
     SectionTextFooter(

apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml

@@ -150,6 +150,7 @@
     <string name="add_new_contact_to_create_one_time_QR_code"><![CDATA[<b> إضافة جهة اتصال جديدة </b>: لإنشاء رمز الاستجابة السريعة الخاص بك لمرة واحدة لجهة اتصالك.]]></string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><![CDATA[<b> امسح رمز الاستجابة السريعة </b>: للاتصال بجهة الاتصال التي تعرض لك رمز الاستجابة السريعة.]]></string>
     <string name="callstatus_in_progress">مكالمتك تحت الإجراء</string>
+    <string name="callstatus_ended">انتهت المكالمة</string>
     <string name="change_database_passphrase_question">تغيير عبارة مرور قاعدة البيانات؟</string>
     <string name="cannot_access_keychain">لا يمكن الوصول إلى Keystore لحفظ كلمة مرور قاعدة البيانات</string>
     <string name="icon_descr_cancel_file_preview">إلغاء معاينة الملف</string>
@@ -1275,6 +1276,8 @@
     <string name="gallery_video_button">فيديو</string>
     <string name="you_can_share_your_address">يمكنك مشاركة عنوانك كرابط أو رمز QR - يمكن لأي شخص الاتصال بك.</string>
     <string name="you_can_create_it_later">يمكنك إنشاؤه لاحقًا</string>
+    <string name="your_contacts_will_see_it">سوف تراها جهات اتصالك في whatsapp.
+\nيمكنك تغييره في الإعدادات.</string>
     <string name="invite_prohibited_description">أنت تحاول دعوة جهة اتصال قمت بمشاركة ملف تعريف متخفي معها إلى المجموعة التي تستخدم فيها ملفك الشخصي الرئيسي</string>
     <string name="user_unmute">إلغاء الكتم</string>
     <string name="unmute_chat">إلغاء الكتم</string>