WIP: add batching

* ios: fix simplex address view

* fix lib paths

* fix call

apps/ios/Shared/Model/ChatModel.swift

@@ -83,7 +83,7 @@ final class ChatModel: ObservableObject {
     // current WebRTC call
     @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
     @Published var activeCall: Call?
-    @Published var callCommand: WCallCommand?
+    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
     @Published var showCallView = false
     // remote desktop
     @Published var remoteCtrlSession: RemoteCtrlSession?
@@ -267,7 +267,20 @@ final class ChatModel: ObservableObject {
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         // update previews
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = [cItem]
+            chats[i].chatItems = switch cInfo {
+            case .group:
+                if let currentPreviewItem = chats[i].chatItems.first {
+                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
+                        [cItem]
+                    } else {
+                        [currentPreviewItem]
+                    }
+                } else {
+                    [cItem]
+                }
+            default:
+                [cItem]
+            }
             if case .rcvNew = cItem.meta.itemStatus {
                 chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                 increaseUnreadCounter(user: currentUser!)

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -605,27 +605,29 @@ func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
     throw r
 }
 
-func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
-    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
         AlertManager.shared.showAlert(alert)
         return nil
     } else {
-        return connReqType
+        return r
     }
 }
 
-func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
         return (nil, nil)
     }
     let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
+    let m = ChatModel.shared
     switch r {
-    case .sentConfirmation: return (.invitation, nil)
+    case let .sentConfirmation(_, connection):
-    case .sentInvitation: return (.contact, nil)
+        return ((.invitation, connection), nil)
+    case let .sentInvitation(_, connection):
+        return ((.contact, connection), nil)
     case let .contactAlreadyExists(_, contact):
-        let m = ChatModel.shared
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
@@ -1362,18 +1364,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
     let m = ChatModel.shared
     logger.debug("processReceivedMsg: \(res.responseType)")
     switch res {
-    case let .newContactConnection(user, connection):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnection(connection)
-            }
-        }
-    case let .contactConnectionDeleted(user, connection):
-        if active(user) {
-            await MainActor.run {
-                m.removeChat(connection.id)
-            }
-        }
     case let .contactDeletedByContact(user, contact):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
@@ -1666,36 +1656,40 @@ func processReceivedMsg(_ res: ChatResponse) async {
         activateCall(invitation)
     case let .callOffer(_, contact, callType, offer, sharedKey, _):
         await withCall(contact) { call in
-            call.callState = .offerReceived
+            await MainActor.run {
-            call.peerMedia = callType.media
+                call.callState = .offerReceived
-            call.sharedKey = sharedKey
+                call.peerMedia = callType.media
+                call.sharedKey = sharedKey
+            }
             let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
             let iceServers = getIceServers()
             logger.debug(".callOffer useRelay \(useRelay)")
             logger.debug(".callOffer iceServers \(String(describing: iceServers))")
-            m.callCommand = .offer(
+            await m.callCommand.processCommand(.offer(
                 offer: offer.rtcSession,
                 iceCandidates: offer.rtcIceCandidates,
                 media: callType.media, aesKey: sharedKey,
                 iceServers: iceServers,
                 relay: useRelay
-            )
+            ))
         }
     case let .callAnswer(_, contact, answer):
         await withCall(contact) { call in
-            call.callState = .answerReceived
+            await MainActor.run {
-            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
+                call.callState = .answerReceived
+            }
+            await m.callCommand.processCommand(.answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates))
         }
     case let .callExtraInfo(_, contact, extraInfo):
         await withCall(contact) { _ in
-            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
+            await m.callCommand.processCommand(.ice(iceCandidates: extraInfo.rtcIceCandidates))
         }
     case let .callEnded(_, contact):
         if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
             CallController.shared.reportCallRemoteEnded(invitation: invitation)
         }
         await withCall(contact) { call in
-            m.callCommand = .end
+            await m.callCommand.processCommand(.end)
             CallController.shared.reportCallRemoteEnded(call: call)
         }
     case .chatSuspended:
@@ -1753,9 +1747,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
         logger.debug("unsupported event: \(res.responseType)")
     }
 
-    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
+    func withCall(_ contact: Contact, _ perform: (Call) async -> Void) async {
         if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await MainActor.run { perform(call) }
+            await perform(call)
         } else {
             logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
         }

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

@@ -49,10 +49,10 @@ struct ActiveCallView: View {
         }
         .onDisappear {
             logger.debug("ActiveCallView: disappear")
+            Task { await m.callCommand.setClient(nil) }
             AppDelegate.keepScreenOn(false)
             client?.endCall()
         }
-        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
         .background(.black)
         .preferredColorScheme(.dark)
     }
@@ -60,19 +60,8 @@ struct ActiveCallView: View {
     private func createWebRTCClient() {
         if client == nil && canConnectCall {
             client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
-            sendCommandToClient()
-        }
-    }
-
-    private func sendCommandToClient() {
-        if call == m.activeCall,
-           m.activeCall != nil,
-           let client = client,
-           let cmd = m.callCommand {
-            m.callCommand = nil
-            logger.debug("sendCallCommand: \(cmd.cmdType)")
             Task {
-                await client.sendCallCommand(command: cmd)
+                await m.callCommand.setClient(client)
             }
         }
     }
@@ -168,8 +157,10 @@ struct ActiveCallView: View {
                 }
             case let .error(message):
                 logger.debug("ActiveCallView: command error: \(message)")
+                AlertManager.shared.showAlert(Alert(title: Text("Error"), message: Text(message)))
             case let .invalid(type):
                 logger.debug("ActiveCallView: invalid response: \(type)")
+                AlertManager.shared.showAlert(Alert(title: Text("Invalid response"), message: Text(type)))
             }
         }
     }
@@ -255,7 +246,6 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
-//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
                         Text("(") + Text(connInfo.text) + Text(")")
                     }
                 }

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

@@ -22,7 +22,7 @@ class CallManager {
         let m = ChatModel.shared
         if let call = m.activeCall, call.callkitUUID == callUUID {
             m.showCallView = true
-            m.callCommand = .capabilities(media: call.localMedia)
+            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
             return true
         }
         return false
@@ -57,19 +57,21 @@ class CallManager {
             m.activeCall = call
             m.showCallView = true
 
-            m.callCommand = .start(
+            Task {
+                await m.callCommand.processCommand(.start(
                 media: invitation.callType.media,
                 aesKey: invitation.sharedKey,
                 iceServers: iceServers,
                 relay: useRelay
-            )
+                ))
+            }
         }
     }
 
     func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
         if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
             let m = ChatModel.shared
-            m.callCommand = .media(media: media, enable: enable)
+            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
             return true
         }
         return false
@@ -94,11 +96,13 @@ class CallManager {
             completed()
         } else {
             logger.debug("CallManager.endCall: ending call...")
-            m.callCommand = .end
-            m.activeCall = nil
-            m.showCallView = false
-            completed()
             Task {
+                await m.callCommand.processCommand(.end)
+                await MainActor.run {
+                    m.activeCall = nil
+                    m.showCallView = false
+                    completed()
+                }
                 do {
                     try await apiEndCall(call.contact)
                 } catch {

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

@@ -335,6 +335,50 @@ extension WCallResponse: Encodable {
     }
 }
 
+actor WebRTCCommandProcessor {
+    private var client: WebRTCClient? = nil
+    private var commands: [WCallCommand] = []
+    private var running: Bool = false
+
+    func setClient(_ client: WebRTCClient?) async {
+        logger.debug("WebRTC: setClient, commands count \(self.commands.count)")
+        self.client = client
+        if client != nil {
+            await processAllCommands()
+        } else {
+            commands.removeAll()
+        }
+    }
+
+    func processCommand(_ c: WCallCommand) async {
+//        logger.debug("WebRTC: process command \(c.cmdType)")
+        commands.append(c)
+        if !running && client != nil {
+            await processAllCommands()
+        }
+    }
+
+    func processAllCommands() async {
+        logger.debug("WebRTC: process all commands, commands count \(self.commands.count), client == nil \(self.client == nil)")
+        if let client = client {
+            running = true
+            while let c = commands.first, shouldRunCommand(client, c) {
+                commands.remove(at: 0)
+                await client.sendCallCommand(command: c)
+                logger.debug("WebRTC: processed cmd \(c.cmdType)")
+            }
+            running = false
+        }
+    }
+
+    func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
+        switch c {
+        case .capabilities, .start, .offer, .end: true
+        default: client.activeCall.wrappedValue != nil
+        }
+    }
+}
+
 struct ConnectionState: Codable, Equatable {
     var connectionState: String
     var iceConnectionState: String
@@ -358,26 +402,12 @@ struct ConnectionInfo: Codable, Equatable {
             return "\(local?.rawValue ?? unknown) / \(remote?.rawValue ?? unknown)"
         }
     }
-
-    var protocolText: String {
-        let unknown = NSLocalizedString("unknown", comment: "connection info")
-        let local = localCandidate?.protocol?.uppercased() ?? unknown
-        let localRelay = localCandidate?.relayProtocol?.uppercased() ?? unknown
-        let remote = remoteCandidate?.protocol?.uppercased() ?? unknown
-        let localText = localRelay == local || localCandidate?.relayProtocol == nil
-                        ? local
-                        : "\(local) (\(localRelay))"
-        return local == remote
-                ? localText
-                : "\(localText) / \(remote)"
-    }
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
 struct RTCIceCandidate: Codable, Equatable {
     var candidateType: RTCIceCandidateType?
     var `protocol`: String?
-    var relayProtocol: String?
     var sdpMid: String?
     var sdpMLineIndex: Int?
     var candidate: String

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

@@ -21,7 +21,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 
     struct Call {
         var connection: RTCPeerConnection
-        var iceCandidates: [RTCIceCandidate]
+        var iceCandidates: IceCandidates
         var localMedia: CallMediaType
         var localCamera: RTCVideoCapturer?
         var localVideoSource: RTCVideoSource?
@@ -33,10 +33,24 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         var frameDecryptor: RTCFrameDecryptor?
     }
 
+    actor IceCandidates {
+        private var candidates: [RTCIceCandidate] = []
+
+        func getAndClear() async -> [RTCIceCandidate] {
+            let cs = candidates
+            candidates = []
+            return cs
+        }
+
+        func append(_ c: RTCIceCandidate) async {
+            candidates.append(c)
+        }
+    }
+
     private let rtcAudioSession =  RTCAudioSession.sharedInstance()
     private let audioQueue = DispatchQueue(label: "audio")
     private var sendCallResponse: (WVAPIMessage) async -> Void
-    private var activeCall: Binding<Call?>
+    var activeCall: Binding<Call?>
     private var localRendererAspectRatio: Binding<CGFloat?>
 
     @available(*, unavailable)
@@ -60,7 +74,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
     ]
 
-    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
         let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
         connection.delegate = self
         createAudioSender(connection)
@@ -87,7 +101,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
         return Call(
             connection: connection,
-            iceCandidates: remoteIceCandidates,
+            iceCandidates: IceCandidates(),
             localMedia: mediaType,
             localCamera: localCamera,
             localVideoSource: localVideoSource,
@@ -144,26 +158,18 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             logger.debug("starting incoming call - create webrtc session")
             if activeCall.wrappedValue != nil { endCall() }
             let encryption = WebRTCClient.enableEncryption
-            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
             activeCall.wrappedValue = call
-            call.connection.offer { answer in
+            let (offer, error) = await call.connection.offer()
-                Task {
+            if let offer = offer {
-                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
+                resp = .offer(
-                    if gotCandidates {
+                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
-                        await self.sendCallResponse(.init(
+                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
-                            corrId: nil,
+                    capabilities: CallCapabilities(encryption: encryption)
-                            resp: .offer(
+                )
-                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                self.waitForMoreIceCandidates()
-                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
+            } else {
-                                capabilities: CallCapabilities(encryption: encryption)
+                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
-                            ),
-                            command: command)
-                        )
-                    } else {
-                        self.endCall()
-                    }
-                }
-
             }
         case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
             if activeCall.wrappedValue != nil {
@@ -172,26 +178,21 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .error(message: "accept: encryption is not supported")
             } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                       let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
-                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
                 activeCall.wrappedValue = call
                 let pc = call.connection
                 if let type = offer.type, let sdp = offer.sdp {
                     if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        pc.answer { answer in
+                        let (answer, error) = await pc.answer()
+                        if let answer = answer {
                             self.addIceCandidates(pc, remoteIceCandidates)
-//                            Task {
+                            resp = .answer(
-//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
+                                answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                            Task {
+                                iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates()))
-                                await self.sendCallResponse(.init(
+                            )
-                                    corrId: nil,
+                            self.waitForMoreIceCandidates()
-                                    resp: .answer(
+                        } else {
-                                        answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                            resp = .error(message: "answer error: \(error?.localizedDescription ?? "unknown error")")
-                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
-                                    ),
-                                    command: command)
-                                )
-                            }
-//                            }
                         }
                     } else {
                         resp = .error(message: "accept: remote description is not set")
@@ -234,6 +235,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .ok
             }
         case .end:
+            // TODO possibly, endCall should be called before returning .ok
             await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
             endCall()
         }
@@ -242,6 +244,33 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
     }
 
+    func getInitialIceCandidates() async -> [RTCIceCandidate] {
+        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
+        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
+        return candidates
+    }
+
+    func waitForMoreIceCandidates() {
+        Task {
+            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
+                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+                if candidates.count > 0 {
+                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
+                    await self.sendIceCandidates(candidates)
+                }
+            }
+        }
+    }
+
+    func sendIceCandidates(_ candidates: [RTCIceCandidate]) async {
+        await self.sendCallResponse(.init(
+            corrId: nil,
+            resp: .ice(iceCandidates: compressToBase64(input: encodeJSON(candidates))),
+            command: nil)
+        )
+    }
+
     func enableMedia(_ media: CallMediaType, _ enable: Bool) {
         logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
         media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
@@ -387,12 +416,13 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         audioSessionToDefaults()
     }
 
-    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
+    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
-        let startedAt = DispatchTime.now()
+        var t: UInt64 = 0
-        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
+        repeat {
-            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
+            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
-        }
+            t += stepMs
-        return success()
+            await action()
+        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
     }
 }
 
@@ -405,25 +435,33 @@ extension WebRTC.RTCPeerConnection {
             optionalConstraints: nil)
     }
 
-    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
+    func offer() async -> (RTCSessionDescription?, Error?) {
-        offer(for: mediaConstraints()) { (sdp, error) in
+        await withCheckedContinuation { cont in
-            guard let sdp = sdp else {
+            offer(for: mediaConstraints()) { (sdp, error) in
-                return
+                self.processSDP(cont, sdp, error)
             }
-            self.setLocalDescription(sdp, completionHandler: { (error) in
-                completion(sdp)
-            })
         }
     }
 
-    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
+    func answer() async -> (RTCSessionDescription?, Error?)  {
-        answer(for: mediaConstraints()) { (sdp, error) in
+        await withCheckedContinuation { cont in
-            guard let sdp = sdp else {
+            answer(for: mediaConstraints()) { (sdp, error) in
-                return
+                self.processSDP(cont, sdp, error)
             }
+        }
+    }
+
+    private func processSDP(_ cont: CheckedContinuation<(RTCSessionDescription?, Error?), Never>, _ sdp: RTCSessionDescription?, _ error: Error?) {
+        if let sdp = sdp {
             self.setLocalDescription(sdp, completionHandler: { (error) in
-                completion(sdp)
+                if let error = error {
+                    cont.resume(returning: (nil, error))
+                } else {
+                    cont.resume(returning: (sdp, nil))
+                }
             })
+        } else {
+            cont.resume(returning: (nil, error))
         }
     }
 }
@@ -479,6 +517,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                 default: enableSpeaker = false
                 }
                 setSpeakerEnabledAndConfigureSession(enableSpeaker)
+            case .connected: sendConnectedEvent(connection)
             case .disconnected, .failed: endCall()
             default: do {}
             }
@@ -491,7 +530,9 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 
     func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
-        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
+        Task {
+            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
+        }
     }
 
     func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -506,10 +547,9 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                         lastReceivedMs lastDataReceivedMs: Int32,
                         changeReason reason: String) {
 //        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
-        sendConnectedEvent(connection, local: local, remote: remote)
     }
 
-    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
         connection.statistics { (stats: RTCStatisticsReport) in
             stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -517,24 +557,25 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                    let localId = stat.values["localCandidateId"] as? String,
                    let remoteId = stat.values["remoteCandidateId"] as? String,
                    let localStats = stats.statistics[localId],
-                   let remoteStats = stats.statistics[remoteId],
+                   let remoteStats = stats.statistics[remoteId]
-                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
-                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
                 {
                     Task {
                         await self.sendCallResponse(.init(
                             corrId: nil,
                             resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: local.toCandidate(
+                                localCandidate: RTCIceCandidate(
-                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    localStats.values["protocol"] as? String,
+                                    protocol: localStats.values["protocol"] as? String,
-                                    localStats.values["relayProtocol"] as? String
+                                    sdpMid: nil,
+                                    sdpMLineIndex: nil,
+                                    candidate: ""
                                 ),
-                                remoteCandidate: remote.toCandidate(
+                                remoteCandidate: RTCIceCandidate(
-                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
-                                    remoteStats.values["protocol"] as? String,
+                                    protocol: remoteStats.values["protocol"] as? String,
-                                    remoteStats.values["relayProtocol"] as? String
+                                    sdpMid: nil,
-                                ))),
+                                    sdpMLineIndex: nil,
+                                    candidate: ""))),
                             command: nil)
                         )
                     }
@@ -634,11 +675,10 @@ extension RTCIceCandidate {
 }
 
 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
         RTCIceCandidate(
             candidateType: candidateType,
             protocol: `protocol`,
-            relayProtocol: relayProtocol,
             sdpMid: sdpMid,
             sdpMLineIndex: Int(sdpMLineIndex),
             candidate: sdp

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

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

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

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

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

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

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

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

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -43,6 +43,11 @@
 		5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; };
 		5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */; };
 		5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B3B09285FB130003915F2 /* DatabaseView.swift */; };
+		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 */; };
@@ -120,11 +125,6 @@
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
-		5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9B2B120ADF00C510B1 /* libgmp.a */; };
-		5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */; };
-		5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */; };
-		5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */; };
-		5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9F2B120ADF00C510B1 /* libffi.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -290,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>"; };
@@ -403,11 +408,6 @@
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
 		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
 		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
-		5CD67B9B2B120ADF00C510B1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a"; sourceTree = "<group>"; };
-		5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5CD67B9F2B120ADF00C510B1 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -511,13 +511,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */,
-				5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */,
+				5C4BB4BB2B1E7D75007981AA /* libffi.a in Frameworks */,
-				5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */,
+				5C4BB4BA2B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a in Frameworks */,
-				5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.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 */,
+				5C4BB4BC2B1E7D75007981AA /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -579,11 +579,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CD67B9F2B120ADF00C510B1 /* libffi.a */,
+				5C4BB4B62B1E7D75007981AA /* libffi.a */,
-				5CD67B9B2B120ADF00C510B1 /* libgmp.a */,
+				5C4BB4B32B1E7D75007981AA /* libgmp.a */,
-				5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */,
+				5C4BB4B72B1E7D75007981AA /* libgmpxx.a */,
-				5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */,
+				5C4BB4B42B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo-ghc8.10.7.a */,
-				5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */,
+				5C4BB4B52B1E7D75007981AA /* libHSsimplex-chat-5.4.0.6-DWi9o3X1dc6Jx2FZ4ew1fo.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";

apps/ios/SimpleXChat/APITypes.swift

@@ -505,8 +505,8 @@ public enum ChatResponse: Decodable, Error {
     case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
     case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
     case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
-    case sentConfirmation(user: UserRef)
+    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitation(user: UserRef)
+    case sentInvitation(user: UserRef, connection: PendingContactConnection)
     case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
     case contactAlreadyExists(user: UserRef, contact: Contact)
     case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
@@ -605,7 +605,6 @@ public enum ChatResponse: Decodable, Error {
     case ntfTokenStatus(status: NtfTknStatus)
     case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
     case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
-    case newContactConnection(user: UserRef, connection: PendingContactConnection)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
     // remote desktop responses/events
     case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
@@ -613,7 +612,7 @@ public enum ChatResponse: Decodable, Error {
     case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
     case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
     case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
-    case remoteCtrlStopped
+    case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
     // misc
     case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
     case cmdOk(user: UserRef?)
@@ -752,7 +751,6 @@ public enum ChatResponse: Decodable, Error {
             case .ntfTokenStatus: return "ntfTokenStatus"
             case .ntfToken: return "ntfToken"
             case .ntfMessages: return "ntfMessages"
-            case .newContactConnection: return "newContactConnection"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
             case .remoteCtrlList: return "remoteCtrlList"
             case .remoteCtrlFound: return "remoteCtrlFound"
@@ -803,11 +801,11 @@ public enum ChatResponse: Decodable, Error {
             case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
             case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
             case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
+            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
             case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
             case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case .sentConfirmation: return noDetails
+            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
-            case .sentInvitation: return noDetails
+            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
             case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
             case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
             case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
@@ -900,7 +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 .newContactConnection(u, connection): return withUser(u, String(describing: connection))
             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)"
@@ -1552,6 +1549,13 @@ public enum RemoteCtrlSessionState: Decodable {
     case connected(sessionCode: String)
 }
 
+public enum RemoteCtrlStopReason: Decodable {
+    case discoveryFailed(chatError: ChatError)
+    case connectionFailed(chatError: ChatError)
+    case setupFailed(chatError: ChatError)
+    case disconnected
+}
+
 public struct CtrlAppInfo: Decodable {
     public var appVersionRange: AppVersionRange
     public var deviceName: String

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

@@ -75,7 +75,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
         }
         Lifecycle.Event.ON_RESUME -> {
           isAppOnForeground = true
-          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete && chatModel.currentUser.value != null) {
             SimplexService.showBackgroundServiceNoticeIfNeeded()
           }
           /**

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt

@@ -370,7 +370,6 @@ fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
     InfoText(call.callState.text)
 
     val connInfo = call.connectionInfo
-    //    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text}, ${connInfo.protocolText})"
     val connInfoText = if (connInfo == null) ""  else " (${connInfo.text})"
     InfoText(call.encryptionStatus + connInfoText)
   }
@@ -585,8 +584,8 @@ fun PreviewActiveCallOverlayVideo() {
         localMedia = CallMediaType.Video,
         peerMedia = CallMediaType.Video,
         connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null),
+          RTCIceCandidate(RTCIceCandidateType.Host, "tcp"),
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null)
+          RTCIceCandidate(RTCIceCandidateType.Host, "tcp")
         )
       ),
       speakerCanBeEnabled = true,
@@ -611,8 +610,8 @@ fun PreviewActiveCallOverlayAudio() {
         localMedia = CallMediaType.Audio,
         peerMedia = CallMediaType.Audio,
         connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null),
+          RTCIceCandidate(RTCIceCandidateType.Host, "udp"),
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null)
+          RTCIceCandidate(RTCIceCandidateType.Host, "udp")
         )
       ),
       speakerCanBeEnabled = true,

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

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

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

@@ -37,8 +37,7 @@ import kotlinx.coroutines.flow.*
 
 data class SettingsViewState(
   val userPickerState: MutableStateFlow<AnimatedViewState>,
-  val scaffoldState: ScaffoldState,
+  val scaffoldState: ScaffoldState
-  val switchingUsersAndHosts: MutableState<Boolean>
 )
 
 @Composable
@@ -102,11 +101,8 @@ fun MainScreen() {
   }
 
   Box {
-    var onboarding by remember { mutableStateOf(chatModel.controller.appPrefs.onboardingStage.get()) }
+    val onboarding by remember { chatModel.controller.appPrefs.onboardingStage.state }
-    LaunchedEffect(Unit) {
+    val localUserCreated = chatModel.localUserCreated.value
-      snapshotFlow { chatModel.controller.appPrefs.onboardingStage.state.value }.distinctUntilChanged().collect { onboarding = it }
-    }
-    val userCreated = chatModel.userCreated.value
     var showInitializationView by remember { mutableStateOf(false) }
     when {
       chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
@@ -115,14 +111,18 @@ fun MainScreen() {
           DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
         }
       }
-      remember { chatModel.chatDbEncrypted }.value == null || userCreated == null -> SplashView()
+      remember { chatModel.chatDbEncrypted }.value == null || localUserCreated == null -> SplashView()
-      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
+      onboarding == OnboardingStage.OnboardingComplete -> {
         Box {
           showAdvertiseLAAlert = true
-          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
+          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(if (chatModel.desktopNoUserNoRemote()) AnimatedViewState.VISIBLE else AnimatedViewState.GONE)) }
+          KeyChangeEffect(chatModel.desktopNoUserNoRemote) {
+            if (chatModel.desktopNoUserNoRemote() && !ModalManager.start.hasModalsOpen()) {
+              userPickerState.value = AnimatedViewState.VISIBLE
+            }
+          }
           val scaffoldState = rememberScaffoldState()
-          val switchingUsersAndHosts = rememberSaveable { mutableStateOf(false) }
+          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState) }
-          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState, switchingUsersAndHosts) }
           if (appPlatform.isAndroid) {
             AndroidScreen(settingsState)
           } else {
@@ -137,12 +137,14 @@ fun MainScreen() {
         }
       }
       onboarding == OnboardingStage.Step2_CreateProfile -> CreateFirstProfile(chatModel) {}
+      onboarding == OnboardingStage.LinkAMobile -> LinkAMobile()
       onboarding == OnboardingStage.Step2_5_SetupDatabasePassphrase -> SetupDatabasePassphrase(chatModel)
       onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel, null)
       onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
     }
     if (appPlatform.isAndroid) {
       ModalManager.fullscreen.showInView()
+      SwitchingUsersView()
     }
 
     val unauthorized = remember { derivedStateOf { AppLock.userAuthorized.value != true } }
@@ -262,7 +264,7 @@ fun CenterPartOfScreen() {
             .background(MaterialTheme.colors.background),
           contentAlignment = Alignment.Center
         ) {
-          Text(stringResource(MR.strings.no_selected_chat))
+          Text(stringResource(if (chatModel.desktopNoUserNoRemote) MR.strings.no_connected_mobile else MR.strings.no_selected_chat))
         }
       } else {
         ModalManager.center.showInView()
@@ -286,6 +288,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
     }
     Box(Modifier.widthIn(max = DEFAULT_START_MODAL_WIDTH)) {
       ModalManager.start.showInView()
+      SwitchingUsersView()
     }
     Row(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH).clipToBounds()) {
       Box(Modifier.widthIn(min = DEFAULT_MIN_CENTER_MODAL_WIDTH).weight(1f)) {
@@ -298,7 +301,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
         EndPartOfScreen()
       }
     }
-    val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
+    val (userPickerState, scaffoldState ) = settingsState
     val scope = rememberCoroutineScope()
     if (scaffoldState.drawerState.isOpen) {
       Box(
@@ -312,7 +315,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
       )
     }
     VerticalDivider(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH))
-    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
+    UserPicker(chatModel, userPickerState) {
       scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
       userPickerState.value = AnimatedViewState.GONE
     }
@@ -335,3 +338,26 @@ fun InitializationView() {
     }
   }
 }
+
+@Composable
+private fun SwitchingUsersView() {
+  if (remember { chatModel.switchingUsersAndHosts }.value) {
+    Box(
+      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
+      contentAlignment = Alignment.Center
+    ) {
+      ProgressIndicator()
+    }
+  }
+}
+
+@Composable
+private fun ProgressIndicator() {
+  CircularProgressIndicator(
+    Modifier
+      .padding(horizontal = 2.dp)
+      .size(30.dp),
+    color = MaterialTheme.colors.secondary,
+    strokeWidth = 2.5.dp
+  )
+}

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

@@ -2,7 +2,7 @@ package chat.simplex.common.model
 
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -43,7 +43,7 @@ object ChatModel {
   val setDeliveryReceipts = mutableStateOf(false)
   val currentUser = mutableStateOf<User?>(null)
   val users = mutableStateListOf<UserInfo>()
-  val userCreated = mutableStateOf<Boolean?>(null)
+  val localUserCreated = mutableStateOf<Boolean?>(null)
   val chatRunning = mutableStateOf<Boolean?>(null)
   val chatDbChanged = mutableStateOf<Boolean>(false)
   val chatDbEncrypted = mutableStateOf<Boolean?>(false)
@@ -51,6 +51,7 @@ object ChatModel {
   val chats = mutableStateListOf<Chat>()
   // map of connections network statuses, key is agent connection id
   val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
+  val switchingUsersAndHosts = mutableStateOf(false)
 
   // current chat
   val chatId = mutableStateOf<String?>(null)
@@ -108,6 +109,9 @@ object ChatModel {
 
   var updatingChatsMutex: Mutex = Mutex()
 
+  val desktopNoUserNoRemote: Boolean @Composable get() = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
+  fun desktopNoUserNoRemote(): Boolean = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
+
   // remote controller
   val remoteHosts = mutableStateListOf<RemoteHostInfo>()
   val currentRemoteHost = mutableStateOf<RemoteHostInfo?>(null)
@@ -222,8 +226,23 @@ object ChatModel {
     val chat: Chat
     if (i >= 0) {
       chat = chats[i]
+      val newPreviewItem = when (cInfo) {
+        is ChatInfo.Group -> {
+          val currentPreviewItem = chat.chatItems.firstOrNull()
+          if (currentPreviewItem != null) {
+            if (cItem.meta.itemTs >= currentPreviewItem.meta.itemTs) {
+              cItem
+            } else {
+              currentPreviewItem
+            }
+          } else {
+            cItem
+          }
+        }
+        else -> cItem
+      }
       chats[i] = chat.copy(
-        chatItems = arrayListOf(cItem),
+        chatItems = arrayListOf(newPreviewItem),
         chatStats =
           if (cItem.meta.itemStatus is CIStatus.RcvNew) {
             val minUnreadId = if(chat.chatStats.minUnreadItemId == 0L) cItem.id else chat.chatStats.minUnreadItemId
@@ -605,6 +624,7 @@ object ChatModel {
     terminalItems.add(item)
   }
 
+  val connectedToRemote: Boolean @Composable get() = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
   fun connectedToRemote(): Boolean = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
 }
 
@@ -2945,6 +2965,14 @@ sealed class RemoteCtrlSessionState {
   @Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteCtrlSessionState()
 }
 
+@Serializable
+sealed class RemoteCtrlStopReason {
+  @Serializable @SerialName("discoveryFailed") class DiscoveryFailed(val chatError: ChatError): RemoteCtrlStopReason()
+  @Serializable @SerialName("connectionFailed") class ConnectionFailed(val chatError: ChatError): RemoteCtrlStopReason()
+  @Serializable @SerialName("setupFailed") class SetupFailed(val chatError: ChatError): RemoteCtrlStopReason()
+  @Serializable @SerialName("disconnected") object Disconnected: RemoteCtrlStopReason()
+}
+
 sealed class UIRemoteCtrlSessionState {
   object Starting: UIRemoteCtrlSessionState()
   object Searching: UIRemoteCtrlSessionState()

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

@@ -173,6 +173,8 @@ class AppPreferences {
   val connectRemoteViaMulticastAuto = mkBoolPreference(SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO, true)
   val offerRemoteMulticast = mkBoolPreference(SHARED_PREFS_OFFER_REMOTE_MULTICAST, true)
 
+  val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)
+  
   private fun mkIntPreference(prefName: String, default: Int) =
     SharedPreference(
       get = fun() = settings.getInt(prefName, default),
@@ -317,6 +319,7 @@ class AppPreferences {
     private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST = "ConnectRemoteViaMulticast"
     private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "ConnectRemoteViaMulticastAuto"
     private const val SHARED_PREFS_OFFER_REMOTE_MULTICAST = "OfferRemoteMulticast"
+    private const val SHARED_PREFS_DESKTOP_WINDOW_STATE = "DesktopWindowState"
   }
 }
 
@@ -359,7 +362,7 @@ object ChatController {
       chatModel.users.addAll(users)
       if (justStarted) {
         chatModel.currentUser.value = user
-        chatModel.userCreated.value = true
+        chatModel.localUserCreated.value = true
         getUserChatData(null)
         appPrefs.chatLastStart.set(Clock.System.now())
         chatModel.chatRunning.value = true
@@ -379,6 +382,31 @@ object ChatController {
     }
   }
 
+  suspend fun startChatWithoutUser() {
+    Log.d(TAG, "user: null")
+    try {
+      if (chatModel.chatRunning.value == true) return
+      apiSetTempFolder(coreTmpDir.absolutePath)
+      apiSetFilesFolder(appFilesDir.absolutePath)
+      if (appPlatform.isDesktop) {
+        apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
+      }
+      apiSetXFTPConfig(getXFTPCfg())
+      apiSetEncryptLocalFiles(appPrefs.privacyEncryptLocalFiles.get())
+      chatModel.users.clear()
+      chatModel.currentUser.value = null
+      chatModel.localUserCreated.value = false
+      appPrefs.chatLastStart.set(Clock.System.now())
+      chatModel.chatRunning.value = true
+      startReceiver()
+      setLocalDeviceName(appPrefs.deviceNameForRemoteAccess.get()!!)
+      Log.d(TAG, "startChat: started without user")
+    } catch (e: Error) {
+      Log.e(TAG, "failed starting chat without user $e")
+      throw e
+    }
+  }
+
   suspend fun changeActiveUser(rhId: Long?, toUserId: Long, viewPwd: String?) {
     try {
       changeActiveUser_(rhId, toUserId, viewPwd)
@@ -402,8 +430,9 @@ object ChatController {
   }
 
   suspend fun getUserChatData(rhId: Long?) {
-    chatModel.userAddress.value = apiGetUserAddress(rhId)
+    val hasUser = chatModel.currentUser.value != null
-    chatModel.chatItemTTL.value = getChatItemTTL(rhId)
+    chatModel.userAddress.value = if (hasUser) apiGetUserAddress(rhId) else null
+    chatModel.chatItemTTL.value = if (hasUser) getChatItemTTL(rhId) else ChatItemTTL.None
     updatingChatsMutex.withLock {
       val chats = apiGetChats(rhId)
       chatModel.updateChats(chats)
@@ -472,7 +501,9 @@ object ChatController {
     val r = sendCmd(rh, CC.ShowActiveUser())
     if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
     Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
-    chatModel.userCreated.value = false
+    if (rh == null) {
+      chatModel.localUserCreated.value = false
+    }
     return null
   }
 
@@ -891,20 +922,21 @@ object ChatController {
     return null
   }
 
-  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): Boolean  {
+  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection?  {
     val userId = chatModel.currentUser.value?.userId ?: run {
       Log.e(TAG, "apiConnect: no current user")
-      return false
+      return null
     }
     val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq))
     when {
-      r is CR.SentConfirmation || r is CR.SentInvitation -> return true
+      r is CR.SentConfirmation -> return r.connection
+      r is CR.SentInvitation -> return r.connection
       r is CR.ContactAlreadyExists -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.contact_already_exists),
           String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), r.contact.displayName)
         )
-        return false
+        return null
       }
       r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat
           && r.chatError.errorType is ChatErrorType.InvalidConnReq -> {
@@ -912,7 +944,7 @@ object ChatController {
           generalGetString(MR.strings.invalid_connection_link),
           generalGetString(MR.strings.please_check_correct_link_and_maybe_ask_for_a_new_one)
         )
-        return false
+        return null
       }
       r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
           && r.chatError.agentError is AgentErrorType.SMP
@@ -921,13 +953,13 @@ object ChatController {
           generalGetString(MR.strings.connection_error_auth),
           generalGetString(MR.strings.connection_error_auth_desc)
         )
-        return false
+        return null
       }
       else -> {
         if (!(networkErrorAlert(r))) {
           apiErrorAlert("apiConnect", generalGetString(MR.strings.connection_error), r)
         }
-        return false
+        return null
       }
     }
   }
@@ -1394,9 +1426,9 @@ object ChatController {
     chatModel.remoteHosts.addAll(hosts)
   }
 
-  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true): Triple<RemoteHostInfo?, String, String>? {
+  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true, address: RemoteCtrlAddress?, port: Int?): CR.RemoteHostStarted? {
-    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast))
+    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast, address, port))
-    if (r is CR.RemoteHostStarted) return Triple(r.remoteHost_, r.invitation, r.ctrlPort)
+    if (r is CR.RemoteHostStarted) return r
     apiErrorAlert("startRemoteHost", generalGetString(MR.strings.error_alert_title), r)
     return null
   }
@@ -1526,16 +1558,6 @@ object ChatController {
     fun active(user: UserLike): Boolean = activeUser(rhId, user)
     chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
     when (r) {
-      is CR.NewContactConnection -> {
-        if (active(r.user)) {
-          chatModel.updateContactConnection(rhId, r.connection)
-        }
-      }
-      is CR.ContactConnectionDeleted -> {
-        if (active(r.user)) {
-          chatModel.removeChat(rhId, r.connection.id)
-        }
-      }
       is CR.ContactDeletedByContact -> {
         if (active(r.user) && r.contact.directOrUsed) {
           chatModel.updateContact(rhId, r.contact)
@@ -1996,7 +2018,7 @@ object ChatController {
     chatModel.setContactNetworkStatus(contact, NetworkStatus.Error(err))
   }
 
-  suspend fun switchUIRemoteHost(rhId: Long?) {
+  suspend fun switchUIRemoteHost(rhId: Long?) = showProgressIfNeeded {
     // TODO lock the switch so that two switches can't run concurrently?
     chatModel.chatId.value = null
     ModalManager.center.closeModals()
@@ -2009,7 +2031,10 @@ object ChatController {
     chatModel.users.clear()
     chatModel.users.addAll(users)
     chatModel.currentUser.value = user
-    chatModel.userCreated.value = true
+    if (user == null) {
+      chatModel.chatItems.clear()
+      chatModel.chats.clear()
+    }
     val statuses = apiGetNetworkStatuses(rhId)
     if (statuses != null) {
       chatModel.networkStatuses.clear()
@@ -2019,6 +2044,23 @@ object ChatController {
     getUserChatData(rhId)
   }
 
+  suspend fun showProgressIfNeeded(block: suspend () -> Unit) {
+    val job = withBGApi {
+      try {
+        delay(500)
+        chatModel.switchingUsersAndHosts.value = true
+      } catch (e: Throwable) {
+        chatModel.switchingUsersAndHosts.value = false
+      }
+    }
+    try {
+      block()
+    } finally {
+      job.cancel()
+      chatModel.switchingUsersAndHosts.value = false
+    }
+  }
+
   fun getXFTPCfg(): XFTPFileConfig {
     return XFTPFileConfig(minFileSize = 0)
   }
@@ -2206,7 +2248,7 @@ sealed class CC {
   // Remote control
   class SetLocalDeviceName(val displayName: String): CC()
   class ListRemoteHosts(): CC()
-  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean): CC()
+  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean, val address: RemoteCtrlAddress?, val port: Int?): CC()
   class SwitchRemoteHost (val remoteHostId: Long?): CC()
   class StopRemoteHost(val remoteHostKey: Long?): CC()
   class DeleteRemoteHost(val remoteHostId: Long): CC()
@@ -2342,7 +2384,7 @@ sealed class CC {
     is CancelFile -> "/fcancel $fileId"
     is SetLocalDeviceName -> "/set device name $displayName"
     is ListRemoteHosts -> "/list remote hosts"
-    is StartRemoteHost -> "/start remote host " + if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}"
+    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${address.`interface`}" else "") + (if (port != null) " port=$port" else "")
     is SwitchRemoteHost -> "/switch remote host " + if (remoteHostId == null) "local" else "$remoteHostId"
     is StopRemoteHost -> "/stop remote host " + if (remoteHostKey == null) "new" else "$remoteHostKey"
     is DeleteRemoteHost -> "/delete remote host $remoteHostId"
@@ -3564,6 +3606,8 @@ data class RemoteHostInfo(
   val remoteHostId: Long,
   val hostDeviceName: String,
   val storePath: String,
+  val bindAddress_: RemoteCtrlAddress?,
+  val bindPort_: Int?,
   val sessionState: RemoteHostSessionState?
 ) {
   val activeHost: Boolean
@@ -3572,6 +3616,12 @@ data class RemoteHostInfo(
   fun activeHost(): Boolean = chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId
 }
 
+@Serializable
+data class RemoteCtrlAddress(
+  val address: String,
+  val `interface`: String
+)
+
 @Serializable
 sealed class RemoteHostSessionState {
   @Serializable @SerialName("starting") object Starting: RemoteHostSessionState()
@@ -3581,6 +3631,13 @@ sealed class RemoteHostSessionState {
   @Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteHostSessionState()
 }
 
+@Serializable
+sealed class RemoteHostStopReason {
+  @Serializable @SerialName("connectionFailed") data class ConnectionFailed(val chatError: ChatError): RemoteHostStopReason()
+  @Serializable @SerialName("crashed") data class Crashed(val chatError: ChatError): RemoteHostStopReason()
+  @Serializable @SerialName("disconnected") object Disconnected: RemoteHostStopReason()
+}
+
 val json = Json {
   prettyPrint = true
   ignoreUnknownKeys = true
@@ -3700,8 +3757,8 @@ sealed class CR {
   @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connReqInvitation: String, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionIncognitoUpdated") class ConnectionIncognitoUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connectionPlan: ConnectionPlan): CR()
-  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef): CR()
+  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef, val connection: PendingContactConnection): CR()
-  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef): CR()
+  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("sentInvitationToContact") class SentInvitationToContact(val user: UserRef, val contact: Contact, val customUserProfile: Profile?): CR()
   @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactRequestAlreadyAccepted") class ContactRequestAlreadyAccepted(val user: UserRef, val contact: Contact): CR()
@@ -3795,16 +3852,15 @@ sealed class CR {
   @Serializable @SerialName("callAnswer") class CallAnswer(val user: UserRef, val contact: Contact, val answer: WebRTCSession): CR()
   @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val user: UserRef, val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
   @Serializable @SerialName("callEnded") class CallEnded(val user: UserRef, val contact: Contact): CR()
-  @Serializable @SerialName("newContactConnection") class NewContactConnection(val user: UserRef, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: UserRef, val connection: PendingContactConnection): CR()
   // remote events (desktop)
   @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
   @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
-  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val ctrlPort: String): CR()
+  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val localAddrs: List<RemoteCtrlAddress>, val ctrlPort: String): CR()
   @Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
   @Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
   @Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
-  @Serializable @SerialName("remoteHostStopped") class RemoteHostStopped(val remoteHostId_: Long?): CR()
+  @Serializable @SerialName("remoteHostStopped") class RemoteHostStopped(val remoteHostId_: Long?, val rhsState: RemoteHostSessionState, val rhStopReason: RemoteHostStopReason): CR()
   @Serializable @SerialName("remoteFileStored") class RemoteFileStored(val remoteHostId: Long, val remoteFileSource: CryptoFile): CR()
   // remote events (mobile)
   @Serializable @SerialName("remoteCtrlList") class RemoteCtrlList(val remoteCtrls: List<RemoteCtrlInfo>): CR()
@@ -3812,7 +3868,7 @@ sealed class CR {
   @Serializable @SerialName("remoteCtrlConnecting") class RemoteCtrlConnecting(val remoteCtrl_: RemoteCtrlInfo?, val ctrlAppInfo: CtrlAppInfo, val appVersion: String): CR()
   @Serializable @SerialName("remoteCtrlSessionCode") class RemoteCtrlSessionCode(val remoteCtrl_: RemoteCtrlInfo?, val sessionCode: String): CR()
   @Serializable @SerialName("remoteCtrlConnected") class RemoteCtrlConnected(val remoteCtrl: RemoteCtrlInfo): CR()
-  @Serializable @SerialName("remoteCtrlStopped") class RemoteCtrlStopped(): CR()
+  @Serializable @SerialName("remoteCtrlStopped") class RemoteCtrlStopped(val rcsState: RemoteCtrlSessionState, val rcStopReason: RemoteCtrlStopReason): CR()
   @Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
   @Serializable @SerialName("cmdOk") class CmdOk(val user: UserRef?): CR()
   @Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: UserRef?, val chatError: ChatError): CR()
@@ -3944,7 +4000,6 @@ sealed class CR {
     is CallAnswer -> "callAnswer"
     is CallExtraInfo -> "callExtraInfo"
     is CallEnded -> "callEnded"
-    is NewContactConnection -> "newContactConnection"
     is ContactConnectionDeleted -> "contactConnectionDeleted"
     is RemoteHostList -> "remoteHostList"
     is CurrentRemoteHost -> "currentRemoteHost"
@@ -3999,11 +4054,11 @@ sealed class CR {
     is ContactCode -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionCode: $connectionCode")
     is GroupMemberCode -> withUser(user, "groupInfo: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionCode: $connectionCode")
     is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
-    is Invitation -> withUser(user, connReqInvitation)
+    is Invitation -> withUser(user, "connReqInvitation: $connReqInvitation\nconnection: $connection")
     is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
     is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
-    is SentConfirmation -> withUser(user, noDetails())
+    is SentConfirmation -> withUser(user, json.encodeToString(connection))
-    is SentInvitation -> withUser(user, noDetails())
+    is SentInvitation -> withUser(user, json.encodeToString(connection))
     is SentInvitationToContact -> withUser(user, json.encodeToString(contact))
     is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
     is ContactRequestAlreadyAccepted -> withUser(user, json.encodeToString(contact))
@@ -4091,7 +4146,6 @@ sealed class CR {
     is CallAnswer -> withUser(user, "contact: ${contact.id}\nanswer: ${json.encodeToString(answer)}")
     is CallExtraInfo -> withUser(user, "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}")
     is CallEnded -> withUser(user, "contact: ${contact.id}")
-    is NewContactConnection -> withUser(user, json.encodeToString(connection))
     is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
     // remote events (mobile)
     is RemoteHostList -> json.encodeToString(remoteHosts)

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

@@ -55,10 +55,22 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
     if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
     val user = chatController.apiGetActiveUser(null)
     if (user == null) {
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
       chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
       chatModel.currentUser.value = null
       chatModel.users.clear()
+      if (appPlatform.isDesktop) {
+        /**
+         * Setting it here to null because otherwise the screen will flash in [MainScreen] after the first start
+         * because of default value of [OnboardingStage.OnboardingComplete]
+         * */
+        chatModel.localUserCreated.value = null
+        if (chatController.listRemoteHosts()?.isEmpty() == true) {
+          chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+        }
+        chatController.startChatWithoutUser()
+      } else {
+        chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+      }
     } else {
       val savedOnboardingStage = appPreferences.onboardingStage.get()
       appPreferences.onboardingStage.set(if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {

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

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

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

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

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

@@ -127,18 +127,10 @@ sealed class WCallResponse {
         "${local?.value ?: "unknown"} / ${remote?.value ?: "unknown"}"
     }
   }
-
-  val protocolText: String get() {
-    val local = localCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localRelay = localCandidate?.relayProtocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val remote = remoteCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localText = if (localRelay == local || localCandidate?.relayProtocol == null) local else "$local ($localRelay)"
-    return if (local == remote) localText else "$localText / $remote"
-  }
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
-@Serializable data class RTCIceCandidate(val candidateType: RTCIceCandidateType?, val protocol: String?, val relayProtocol: String?)
+@Serializable data class RTCIceCandidate(val candidateType: RTCIceCandidateType?, val protocol: String?)
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceServer
 @Serializable data class RTCIceServer(val urls: List<String>, val username: String? = null, val credential: String? = null)
 

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

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

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

@@ -68,14 +68,14 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
   val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
   var searchInList by rememberSaveable { mutableStateOf("") }
   val scope = rememberCoroutineScope()
-  val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
+  val (userPickerState, scaffoldState ) = settingsState
   Scaffold(topBar = { Box(Modifier.padding(end = endPadding)) { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } } },
     scaffoldState = scaffoldState,
     drawerContent = { SettingsView(chatModel, setPerformLA, scaffoldState.drawerState) },
     drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
     drawerGesturesEnabled = appPlatform.isAndroid,
     floatingActionButton = {
-      if (searchInList.isEmpty()) {
+      if (searchInList.isEmpty() && !chatModel.desktopNoUserNoRemote) {
         FloatingActionButton(
           onClick = {
             if (!stopped) {
@@ -104,7 +104,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
       ) {
         if (chatModel.chats.isNotEmpty()) {
           ChatList(chatModel, search = searchInList)
-        } else if (!switchingUsersAndHosts.value) {
+        } else if (!chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
           Box(Modifier.fillMaxSize()) {
             if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
               OnboardingButtons(showNewChatSheet)
@@ -121,19 +121,11 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
     NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
   }
   if (appPlatform.isAndroid) {
-    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
+    UserPicker(chatModel, userPickerState) {
       scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
       userPickerState.value = AnimatedViewState.GONE
     }
   }
-  if (switchingUsersAndHosts.value) {
-    Box(
-      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
-      contentAlignment = Alignment.Center
-    ) {
-      ProgressIndicator()
-    }
-  }
 }
 
 @Composable
@@ -209,7 +201,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
     navigationButton = {
       if (showSearch) {
         NavigationButtonBack(hideSearchOnBack)
-      } else if (chatModel.users.isEmpty()) {
+      } else if (chatModel.users.isEmpty() && !chatModel.desktopNoUserNoRemote) {
         NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
       } else {
         val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
@@ -304,17 +296,6 @@ private fun ToggleFilterButton() {
   }
 }
 
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier
-      .padding(horizontal = 2.dp)
-      .size(30.dp),
-    color = MaterialTheme.colors.secondary,
-    strokeWidth = 2.5.dp
-  )
-}
-
 @Composable
 expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>)
 

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

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

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

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

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

@@ -264,7 +264,8 @@ private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onCli
     text,
     generalGetString(MR.strings.enter_passphrase),
     isValid = ::validKey,
-    keyboardActions = KeyboardActions(onDone = if (enabled) {
+    // Don't enable this on desktop since it interfere with key event listener
+    keyboardActions = KeyboardActions(onDone = if (enabled && appPlatform.isAndroid) {
       { onClick?.invoke() }
     } else null
     ),

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

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

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

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

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

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

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

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

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

@@ -55,7 +55,7 @@ fun annotatedStringResource(id: StringResource): AnnotatedString {
 @Composable
 fun annotatedStringResource(id: StringResource, vararg args: Any?): AnnotatedString {
   val density = LocalDensity.current
-  return remember(id) {
+  return remember(id, args) {
     escapedHtmlToAnnotatedString(id.localized().format(args = args), density)
   }
 }

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

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

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

@@ -283,10 +283,11 @@ suspend fun connectViaUri(
   incognito: Boolean,
   connectionPlan: ConnectionPlan?,
   close: (() -> Unit)?
-): Boolean {
+) {
-  val r = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
+  val pcc = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
   val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
-  if (r) {
+  if (pcc != null) {
+    chatModel.updateContactConnection(rhId, pcc)
     close?.invoke()
     AlertManager.shared.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
@@ -299,7 +300,6 @@ suspend fun connectViaUri(
       hostDevice = hostDevice(rhId),
     )
   }
-  return r
 }
 
 fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {

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

@@ -182,6 +182,10 @@ private fun prepareChatBeforeAddressCreation(rhId: Long?) {
     val user = chatModel.controller.apiGetActiveUser(rhId) ?: return@withApi
     chatModel.currentUser.value = user
     if (chatModel.users.isEmpty()) {
+      if (appPlatform.isDesktop) {
+        // Make possible to use chat after going to remote device linking and returning back to local profile creation
+        chatModel.chatRunning.value = false
+      }
       chatModel.controller.startChat(user)
     } else {
       val users = chatModel.controller.listUsers(rhId)

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

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

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

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

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

@@ -43,7 +43,11 @@ fun SetupDatabasePassphrase(m: ChatModel) {
   val newKey = rememberSaveable { mutableStateOf("") }
   val confirmNewKey = rememberSaveable { mutableStateOf("") }
   fun nextStep() {
-    m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
+    if (appPlatform.isAndroid || chatModel.currentUser.value != null) {
+      m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
+    } else {
+      m.controller.appPrefs.onboardingStage.set(OnboardingStage.LinkAMobile)
+    }
   }
   SetupDatabasePassphraseLayout(
     currentKey,
@@ -159,10 +163,7 @@ private fun SetupDatabasePassphraseLayout(
             }
           },
         isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
-        keyboardActions = KeyboardActions(onDone = {
+        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
-          if (!disabled) onClickUpdate()
-          defaultKeyboardAction(ImeAction.Done)
-        }),
       )
 
       Box(Modifier.align(Alignment.CenterHorizontally).padding(vertical = DEFAULT_PADDING)) {

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

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

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

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

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

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

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

@@ -92,7 +92,6 @@ fun PrivacySettingsView(
         chatModel.simplexLinkMode.value = it
       })
     }
-    SectionDividerSpaced()
 
     val currentUser = chatModel.currentUser.value
     if (currentUser != null) {
@@ -142,39 +141,42 @@ fun PrivacySettingsView(
         }
       }
 
-      DeliveryReceiptsSection(
+      if (!chatModel.desktopNoUserNoRemote) {
-        currentUser = currentUser,
+        SectionDividerSpaced()
-        setOrAskSendReceiptsContacts = { enable ->
+        DeliveryReceiptsSection(
-          val contactReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
+          currentUser = currentUser,
-            if (chat.chatInfo is ChatInfo.Direct) {
+          setOrAskSendReceiptsContacts = { enable ->
-              val sendRcpts = chat.chatInfo.contact.chatSettings.sendRcpts
+            val contactReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
-              count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
+              if (chat.chatInfo is ChatInfo.Direct) {
+                val sendRcpts = chat.chatInfo.contact.chatSettings.sendRcpts
+                count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
+              } else {
+                count
+              }
+            }
+            if (contactReceiptsOverrides == 0) {
+              setSendReceiptsContacts(enable, clearOverrides = false)
             } else {
-              count
+              showUserContactsReceiptsAlert(enable, contactReceiptsOverrides, ::setSendReceiptsContacts)
+            }
+          },
+          setOrAskSendReceiptsGroups = { enable ->
+            val groupReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
+              if (chat.chatInfo is ChatInfo.Group) {
+                val sendRcpts = chat.chatInfo.groupInfo.chatSettings.sendRcpts
+                count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
+              } else {
+                count
+              }
+            }
+            if (groupReceiptsOverrides == 0) {
+              setSendReceiptsGroups(enable, clearOverrides = false)
+            } else {
+              showUserGroupsReceiptsAlert(enable, groupReceiptsOverrides, ::setSendReceiptsGroups)
             }
           }
-          if (contactReceiptsOverrides == 0) {
+        )
-            setSendReceiptsContacts(enable, clearOverrides = false)
+      }
-          } else {
-            showUserContactsReceiptsAlert(enable, contactReceiptsOverrides, ::setSendReceiptsContacts)
-          }
-        },
-        setOrAskSendReceiptsGroups = { enable ->
-          val groupReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
-            if (chat.chatInfo is ChatInfo.Group) {
-              val sendRcpts = chat.chatInfo.groupInfo.chatSettings.sendRcpts
-              count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
-            } else {
-              count
-            }
-          }
-          if (groupReceiptsOverrides == 0) {
-            setSendReceiptsGroups(enable, clearOverrides = false)
-          } else {
-            showUserGroupsReceiptsAlert(enable, groupReceiptsOverrides, ::setSendReceiptsGroups)
-          }
-        }
-      )
     }
     SectionBottomSpacer()
   }

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

@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.CreateProfile
 import chat.simplex.common.views.database.DatabaseView
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.SimpleXInfo
@@ -38,76 +39,39 @@ import kotlinx.coroutines.launch
 fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, drawerState: DrawerState) {
   val user = chatModel.currentUser.value
   val stopped = chatModel.chatRunning.value == false
-
+  SettingsLayout(
-  if (user != null) {
+    profile = user?.profile,
-    val requireAuth = remember { chatModel.controller.appPrefs.performLA.state }
+    stopped,
-    SettingsLayout(
+    chatModel.chatDbEncrypted.value == true,
-      profile = user.profile,
+    remember { chatModel.controller.appPrefs.storeDBPassphrase.state }.value,
-      stopped,
+    remember { chatModel.controller.appPrefs.notificationsMode.state },
-      chatModel.chatDbEncrypted.value == true,
+    user?.displayName,
-      remember { chatModel.controller.appPrefs.storeDBPassphrase.state }.value,
+    setPerformLA = setPerformLA,
-      remember { chatModel.controller.appPrefs.notificationsMode.state },
+    showModal = { modalView -> { ModalManager.start.showModal { modalView(chatModel) } } },
-      user.displayName,
+    showSettingsModal = { modalView -> { ModalManager.start.showModal(true) { modalView(chatModel) } } },
-      setPerformLA = setPerformLA,
+    showSettingsModalWithSearch = { modalView ->
-      showModal = { modalView -> { ModalManager.start.showModal { modalView(chatModel) } } },
+      ModalManager.start.showCustomModal { close ->
-      showSettingsModal = { modalView -> { ModalManager.start.showModal(true) { modalView(chatModel) } } },
+        val search = rememberSaveable { mutableStateOf("") }
-      showSettingsModalWithSearch = { modalView ->
+        ModalView(
-        ModalManager.start.showCustomModal { close ->
+          { close() },
-          val search = rememberSaveable { mutableStateOf("") }
+          endButtons = {
-          ModalView(
+            SearchTextField(Modifier.fillMaxWidth(), placeholder = stringResource(MR.strings.search_verb), alwaysVisible = true) { search.value = it }
-            { close() },
+          },
-            endButtons = {
+          content = { modalView(chatModel, search) })
-              SearchTextField(Modifier.fillMaxWidth(), placeholder = stringResource(MR.strings.search_verb), alwaysVisible = true) { search.value = it }
+      }
-            },
+    },
-            content = { modalView(chatModel, search) })
+    showCustomModal = { modalView -> { ModalManager.start.showCustomModal { close -> modalView(chatModel, close) } } },
+    showVersion = {
+      withApi {
+        val info = chatModel.controller.apiGetVersion()
+        if (info != null) {
+          ModalManager.start.showModal { VersionInfoView(info) }
         }
-      },
+      }
-      showCustomModal = { modalView -> { ModalManager.start.showCustomModal { close -> modalView(chatModel, close) } } },
+    },
-      showVersion = {
+    withAuth = ::doWithAuth,
-        withApi {
+    drawerState = drawerState,
-          val info = chatModel.controller.apiGetVersion()
+  )
-          if (info != null) {
-            ModalManager.start.showModal { VersionInfoView(info) }
-          }
-        }
-      },
-      withAuth = { title, desc, block ->
-        if (!requireAuth.value) {
-          block()
-        } else {
-          var autoShow = true
-          ModalManager.fullscreen.showModalCloseable { close ->
-            val onFinishAuth = { success: Boolean ->
-              if (success) {
-                close()
-                block()
-              }
-            }
-
-            LaunchedEffect(Unit) {
-              if (autoShow) {
-                autoShow = false
-                runAuth(title, desc, onFinishAuth)
-              }
-            }
-            Box(
-              Modifier.fillMaxSize().background(MaterialTheme.colors.background),
-              contentAlignment = Alignment.Center
-            ) {
-              SimpleButton(
-                stringResource(MR.strings.auth_unlock),
-                icon = painterResource(MR.images.ic_lock),
-                click = {
-                  runAuth(title, desc, onFinishAuth)
-                }
-              )
-            }
-          }
-        }
-      },
-      drawerState = drawerState,
-    )
-  }
 }
 
 val simplexTeamUri =
@@ -115,12 +79,12 @@ val simplexTeamUri =
 
 @Composable
 fun SettingsLayout(
-  profile: LocalProfile,
+  profile: LocalProfile?,
   stopped: Boolean,
   encrypted: Boolean,
   passphraseSaved: Boolean,
   notificationsMode: State<NotificationsMode>,
-  userDisplayName: String,
+  userDisplayName: String?,
   setPerformLA: (Boolean) -> Unit,
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
@@ -150,13 +114,22 @@ fun SettingsLayout(
       AppBarTitle(stringResource(MR.strings.your_settings))
 
       SectionView(stringResource(MR.strings.settings_section_title_you)) {
-        SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, padding = PaddingValues(start = 16.dp, end = DEFAULT_PADDING), disabled = stopped) {
-          ProfilePreview(profile, stopped = stopped)
-        }
         val profileHidden = rememberSaveable { mutableStateOf(false) }
-        SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.your_chat_profiles), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped, extraPadding = true)
+        if (profile != null) {
-        SettingsActionItem(painterResource(MR.images.ic_qr_code), stringResource(MR.strings.your_simplex_contact_address), showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped, extraPadding = true)
+          SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, padding = PaddingValues(start = 16.dp, end = DEFAULT_PADDING), disabled = stopped) {
-        ChatPreferencesItem(showCustomModal, stopped = stopped)
+            ProfilePreview(profile, stopped = stopped)
+          }
+          SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.your_chat_profiles), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped, extraPadding = true)
+          SettingsActionItem(painterResource(MR.images.ic_qr_code), stringResource(MR.strings.your_simplex_contact_address), showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped, extraPadding = true)
+          ChatPreferencesItem(showCustomModal, stopped = stopped)
+        } else if (chatModel.localUserCreated.value == false) {
+          SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.create_chat_profile), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { ModalManager.center.showModalCloseable { close ->
+            LaunchedEffect(Unit) {
+              closeSettings()
+            }
+            CreateProfile(chatModel, close)
+          } } }, disabled = stopped, extraPadding = true)
+        }
         if (appPlatform.isDesktop) {
           SettingsActionItem(painterResource(MR.images.ic_smartphone), stringResource(if (remember { chatModel.remoteHosts }.isEmpty()) MR.strings.link_a_mobile else MR.strings.linked_mobiles), showModal { ConnectMobileView() }, disabled = stopped, extraPadding = true)
         } else {
@@ -176,10 +149,12 @@ fun SettingsLayout(
       SectionDividerSpaced()
 
       SectionView(stringResource(MR.strings.settings_section_title_help)) {
-        SettingsActionItem(painterResource(MR.images.ic_help), stringResource(MR.strings.how_to_use_simplex_chat), showModal { HelpView(userDisplayName) }, disabled = stopped, extraPadding = true)
+        SettingsActionItem(painterResource(MR.images.ic_help), stringResource(MR.strings.how_to_use_simplex_chat), showModal { HelpView(userDisplayName ?: "") }, disabled = stopped, extraPadding = true)
         SettingsActionItem(painterResource(MR.images.ic_add), stringResource(MR.strings.whats_new), showCustomModal { _, close -> WhatsNewView(viaSettings = true, close) }, disabled = stopped, extraPadding = true)
         SettingsActionItem(painterResource(MR.images.ic_info), stringResource(MR.strings.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) }, extraPadding = true)
-        SettingsActionItem(painterResource(MR.images.ic_tag), stringResource(MR.strings.chat_with_the_founder), { uriHandler.openVerifiedSimplexUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped, extraPadding = true)
+        if (!chatModel.desktopNoUserNoRemote) {
+          SettingsActionItem(painterResource(MR.images.ic_tag), stringResource(MR.strings.chat_with_the_founder), { uriHandler.openVerifiedSimplexUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped, extraPadding = true)
+        }
         SettingsActionItem(painterResource(MR.images.ic_mail), stringResource(MR.strings.send_us_an_email), { uriHandler.openUriCatching("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary, extraPadding = true)
       }
       SectionDividerSpaced()
@@ -469,6 +444,42 @@ fun PreferenceToggleWithIcon(
   }
 }
 
+fun doWithAuth(title: String, desc: String, block: () -> Unit) {
+  val requireAuth = chatModel.controller.appPrefs.performLA.get()
+  if (!requireAuth) {
+    block()
+  } else {
+    var autoShow = true
+    ModalManager.fullscreen.showModalCloseable { close ->
+      val onFinishAuth = { success: Boolean ->
+        if (success) {
+          close()
+          block()
+        }
+      }
+
+      LaunchedEffect(Unit) {
+        if (autoShow) {
+          autoShow = false
+          runAuth(title, desc, onFinishAuth)
+        }
+      }
+      Box(
+        Modifier.fillMaxSize().background(MaterialTheme.colors.background),
+        contentAlignment = Alignment.Center
+      ) {
+        SimpleButton(
+          stringResource(MR.strings.auth_unlock),
+          icon = painterResource(MR.images.ic_lock),
+          click = {
+            runAuth(title, desc, onFinishAuth)
+          }
+        )
+      }
+    }
+  }
+}
+
 private fun runAuth(title: String, desc: String, onFinish: (success: Boolean) -> Unit) {
   authenticate(
     title,

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ItemAction
@@ -56,7 +57,9 @@ fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden:
         ModalManager.end.closeModals()
       }
       withBGApi {
-        m.controller.changeActiveUser(user.remoteHostId, user.userId, userViewPassword(user, searchTextOrPassword.value.trim()))
+        controller.showProgressIfNeeded {
+          m.controller.changeActiveUser(user.remoteHostId, user.userId, userViewPassword(user, searchTextOrPassword.value.trim()))
+        }
       }
     },
     removeUser = { user ->

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

@@ -565,6 +565,7 @@
   <string name="your_settings">Your settings</string>
   <string name="your_simplex_contact_address">Your SimpleX address</string>
   <string name="your_chat_profiles">Your chat profiles</string>
+  <string name="create_chat_profile">Create chat profile</string>
   <string name="database_passphrase_and_export">Database passphrase &amp; export</string>
   <string name="about_simplex_chat">About SimpleX Chat</string>
   <string name="how_to_use_simplex_chat">How to use it</string>
@@ -1659,11 +1660,12 @@
   <string name="unlink_desktop_question">Unlink desktop?</string>
   <string name="unlink_desktop">Unlink</string>
   <string name="disconnect_remote_host">Disconnect</string>
+  <string name="disconnect_remote_hosts">Disconnect mobiles</string>
   <string name="remote_host_was_disconnected_toast"><![CDATA[Mobile <b>%s</b> was disconnected]]></string>
   <string name="disconnect_desktop_question">Disconnect desktop?</string>
   <string name="only_one_device_can_work_at_the_same_time">Only one device can work at the same time</string>
   <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Open <i>Use from desktop</i> in mobile app and scan QR code.]]></string>
-  <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Waiting for mobile to connect on port <i>%s</i>]]></string>
+  <string name="waiting_for_mobile_to_connect">Waiting for mobile to connect:</string>
   <string name="bad_desktop_address">Bad desktop address</string>
   <string name="desktop_incompatible_version">Incompatible version</string>
   <string name="desktop_app_version_is_incompatible">Desktop app version %s is not compatible with this app.</string>
@@ -1689,6 +1691,11 @@
   <string name="paste_desktop_address">Paste desktop address</string>
   <string name="desktop_device">Desktop</string>
   <string name="not_compatible">Not compatible!</string>
+  <string name="refresh_qr_code">Refresh</string>
+  <string name="no_connected_mobile">No connected mobile</string>
+  <string name="random_port">Random</string>
+  <string name="open_port_in_firewall_title">Open port in firewall</string>
+  <string name="open_port_in_firewall_desc">To allow a mobile app to connect to the desktop, open this port in your firewall, if you have it enabled</string>
 
   <!-- Under development -->
   <string name="in_developing_title">Coming soon!</string>

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

@@ -1581,7 +1581,7 @@
     <string name="v5_4_better_groups_descr">Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.</string>
     <string name="linked_mobiles">Verknüpfte Mobiltelefone</string>
     <string name="this_device_name">Dieser Gerätename</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Auf die Mobiltelefonverbindung über Port <i>%s</i> warten]]></string>
+    <string name="waiting_for_mobile_to_connect">Auf die Mobiltelefonverbindung warten:</string>
     <string name="loading_remote_file_title">Laden der Datei</string>
     <string name="link_a_mobile">Zu einem Mobiltelefon verbinden</string>
     <string name="settings_section_title_use_from_desktop">Vom Desktop aus nutzen</string>

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

@@ -1486,7 +1486,7 @@
     <string name="desktop_device">Bureau</string>
     <string name="connected_to_desktop">Connecté au bureau</string>
     <string name="this_device_name">Ce nom d\'appareil</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[En attente d\'une connexion mobile sur le port <i>%s</i>]]></string>
+    <string name="waiting_for_mobile_to_connect">En attente d\'une connexion mobile:</string>
     <string name="loading_remote_file_title">Chargement du fichier</string>
     <string name="connecting_to_desktop">Connexion au bureau</string>
     <string name="desktop_devices">Appareils de bureau</string>

apps/multiplatform/common/src/commonMain/resources/MR/images/ic_refresh.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480.433-164.5q-131.583 0-223.758-92.216Q164.5-348.932 164.5-480.082q0-131.149 92.175-223.284Q348.85-795.5 480.5-795.5q84 0 147.75 34.25T738.5-666.5v-129H796V-547H547.5v-57.5H713q-38.032-60.033-96.537-96.767Q557.959-738 480.539-738 372-738 297-663.015q-75 74.986-75 183.25 0 108.265 74.875 183.015Q371.75-222 480.331-222q82.298 0 150.734-47 68.435-47 95.623-124.5H786q-28.5 103-113.49 166-84.991 63-192.077 63Z"/></svg>

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

@@ -1517,6 +1517,6 @@
     <string name="v5_4_more_things_descr">- avvisa facoltativamente i contatti eliminati.
 \n- nomi del profilo con spazi.
 \n- e molto altro!</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[In attesa che il cellulare si connetta alla porta <i>%s</i>]]></string>
+    <string name="waiting_for_mobile_to_connect">In attesa che il cellulare si connette:</string>
     <string name="group_member_role_author">autore</string>
 </resources>

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

@@ -1516,7 +1516,7 @@
 \n- en meer!</string>
     <string name="remote_host_was_disconnected_toast"><![CDATA[Mobiele verbinding <b>%s</b> is verbroken]]></string>
     <string name="group_member_role_author">auteur</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Wachten tot mobiel verbinding maakt op poort <i>%s</i>]]></string>
+    <string name="waiting_for_mobile_to_connect">Wachten tot mobiel verbinding maakt:</string>
     <string name="multicast_connect_automatically">Automatisch verbinden</string>
     <string name="waiting_for_desktop">Wachten op desktop…</string>
     <string name="found_desktop">Desktop gevonden</string>

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

@@ -1496,7 +1496,7 @@
     <string name="v5_4_better_groups_descr">Szybsze dołączenie i bardziej niezawodne wiadomości.</string>
     <string name="linked_mobiles">Połączone telefony</string>
     <string name="this_device_name">Nazwa tego urządzenia</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Oczekiwanie na połączenie telefonu na port <i>%s</i>]]></string>
+    <string name="waiting_for_mobile_to_connect">Oczekiwanie na połączenie telefonu:</string>
     <string name="loading_remote_file_title">Ładowanie pliku</string>
     <string name="found_desktop">Znaleziono komputer</string>
     <string name="desktop_devices">Urządzenia komputerowe</string>

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

@@ -1601,7 +1601,7 @@
     <string name="verify_connection">Проверить соединение</string>
     <string name="multicast_connect_automatically">Соединяться автоматически</string>
     <string name="waiting_for_desktop">Ожидается подключение…</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Ожидается подключение мобильного через порт <i>%s</i>]]></string>
+    <string name="waiting_for_mobile_to_connect">Ожидается подключение мобильного:</string>
     <string name="found_desktop">Компьютер найден</string>
     <string name="not_compatible">Несовместимая версия!</string>
     <string name="group_member_role_author">автор</string>

apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml

@@ -1517,7 +1517,7 @@
     <string name="v5_4_more_things_descr">- 可选择通知已删除的联系人。
 \n- 带空格的个人资料名称。
 \n- 以及更多！</string>
-    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[正等待移动设备在端口 <i>%s</i> 进行连接]]></string>
+    <string name="waiting_for_mobile_to_connect">正等待移动设备 进行连接:</string>
     <string name="group_member_role_author">作者</string>
     <string name="multicast_connect_automatically">自动连接</string>
     <string name="waiting_for_desktop">等待桌面中…</string>

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.platform.desktopPlatform
 import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
 import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.TerminalView
@@ -31,10 +30,30 @@ import java.io.File
 val simplexWindowState = SimplexWindowState()
 
 fun showApp() = application {
-  // For some reason on Linux actual width will be 10.dp less after specifying it here. If we specify 1366,
+  // Creates file if not exists; comes with proper defaults
-  // it will show 1356. But after that we can still update it to 1366 by changing window state. Just making it +10 now here
+  val state = getStoredWindowState()
-  val width = if (desktopPlatform.isLinux()) 1376.dp else 1366.dp
+
-  val windowState = rememberWindowState(placement = WindowPlacement.Floating, width = width, height = 768.dp)
+  val windowState: WindowState = rememberWindowState(
+    placement = WindowPlacement.Floating,
+    width = state.width.dp,
+    height = state.height.dp,
+    position = WindowPosition(state.x.dp, state.y.dp)
+  )
+
+  LaunchedEffect(
+    windowState.position.x.value,
+    windowState.position.y.value,
+    windowState.size.width.value,
+    windowState.size.height.value
+  ) {
+    storeWindowState(WindowPositionSize(
+      x = windowState.position.x.value.toInt(),
+      y = windowState.position.y.value.toInt(),
+      width = windowState.size.width.value.toInt(),
+      height = windowState.size.height.value.toInt()
+    ))
+  }
+
   simplexWindowState.windowState = windowState
   // Reload all strings in all @Composable's after language change at runtime
   if (remember { ChatController.appPrefs.appLanguage.state }.value != "") {
@@ -124,7 +143,7 @@ fun showApp() = application {
     var hiddenUntilRestart by remember { mutableStateOf(false) }
     if (!hiddenUntilRestart) {
       val cWindowState = rememberWindowState(placement = WindowPlacement.Floating, width = DEFAULT_START_MODAL_WIDTH, height = 768.dp)
-      Window(state = cWindowState, onCloseRequest = ::exitApplication, title = stringResource(MR.strings.chat_console)) {
+      Window(state = cWindowState, onCloseRequest = { hiddenUntilRestart = true }, title = stringResource(MR.strings.chat_console)) {
         SimpleXTheme {
           TerminalView(ChatModel) { hiddenUntilRestart = true }
         }

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/StoreWindowState.kt

@@ -0,0 +1,36 @@
+package chat.simplex.common
+
+import chat.simplex.common.model.json
+import chat.simplex.common.platform.appPreferences
+import chat.simplex.common.platform.desktopPlatform
+import kotlinx.serialization.*
+
+@Serializable
+data class WindowPositionSize(
+  val width: Int = 1366,
+  val height: Int = 768,
+  val x: Int = 0,
+  val y: Int = 0,
+)
+
+fun getStoredWindowState(): WindowPositionSize =
+  try {
+    val str = appPreferences.desktopWindowState.get()
+    var state = if (str == null) {
+      WindowPositionSize()
+    } else {
+      json.decodeFromString(str)
+    }
+
+    // For some reason on Linux actual width will be 10.dp less after specifying it here. If we specify 1366,
+    // it will show 1356. But after that we can still update it to 1366 by changing window state. Just making it +10 now here
+    if (desktopPlatform.isLinux() && state.width == 1366) {
+      state = state.copy(width = 1376)
+    }
+    state
+  } catch (e: Throwable) {
+    WindowPositionSize()
+  }
+
+fun storeWindowState(state: WindowPositionSize) =
+  appPreferences.desktopWindowState.set(json.encodeToString(state))

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/call/CallView.desktop.kt

@@ -136,7 +136,6 @@ private fun SendStateUpdates() {
       .collect { call ->
         val state = call.callState.text
         val connInfo = call.connectionInfo
-        //    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text}, ${connInfo.protocolText})"
         val connInfoText = if (connInfo == null) ""  else " (${connInfo.text})"
         val description = call.encryptionStatus + connInfoText
         chatModel.callCommand.add(WCallCommand.Description(state, description))

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

@@ -0,0 +1,23 @@
+package chat.simplex.common.views.onboarding
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.runtime.Composable
+import chat.simplex.common.model.ChatModel.controller
+import chat.simplex.common.model.SharedPreference
+import chat.simplex.common.model.User
+import chat.simplex.common.ui.theme.DEFAULT_PADDING
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+
+@Composable
+actual fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)?) {
+  if (user == null) {
+    Row(horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING * 2.5f)) {
+      OnboardingActionButton(MR.strings.link_a_mobile, onboarding = if (controller.appPrefs.initialRandomDBPassphrase.get()) OnboardingStage.Step2_5_SetupDatabasePassphrase else OnboardingStage.LinkAMobile, true, icon = painterResource(MR.images.ic_smartphone_300), onclick = onclick)
+      OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, icon = painterResource(MR.images.ic_desktop), onclick = onclick)
+    }
+  } else {
+    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick = onclick)
+  }
+}

apps/simplex-broadcast-bot/src/Broadcast/Options.hs

@@ -83,5 +83,6 @@ mkChatOpts BroadcastBotOpts {coreOptions} =
       allowInstantFiles = True,
       autoAcceptFileSize = 0,
       muteNotifications = True,
+      markRead = False,
       maintenance = False
     }

apps/simplex-directory-service/src/Directory/Options.hs

@@ -5,10 +5,10 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Directory.Options
- ( DirectoryOpts (..),
+  ( DirectoryOpts (..),
-   getDirectoryOpts,
+    getDirectoryOpts,
-   mkChatOpts,
+    mkChatOpts,
- )
+  )
 where
 
 import Options.Applicative
@@ -35,8 +35,8 @@ directoryOpts appDir defaultDbFileName = do
           <> help "Comma-separated list of super-users in the format CONTACT_ID:DISPLAY_NAME who will be allowed to manage the directory"
       )
   directoryLog <-
-    Just <$>
+    Just
-      strOption
+      <$> strOption
         ( long "directory-file"
             <> metavar "DIRECTORY_FILE"
             <> help "Append only log for directory state"
@@ -81,5 +81,6 @@ mkChatOpts DirectoryOpts {coreOptions} =
       allowInstantFiles = True,
       autoAcceptFileSize = 0,
       muteNotifications = True,
+      markRead = False,
       maintenance = False
     }

cabal.project

@@ -4,12 +4,14 @@ packages: .
 
 with-compiler: ghc-9.6.3
 
+index-state: 2023-10-20T00:00:00Z
+
 constraints: zip +disable-bzip2 +disable-zstd
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 757b7eec81341d8560a326deab303bb6fb6a26a3
+    tag: eaf5317834b069144b5f4897f9c79831983e54dd
 
 source-repository-package
     type: git
@@ -46,7 +48,8 @@ source-repository-package
     location: https://github.com/simplex-chat/android-support.git
     tag: 9aa09f148089d6752ce563b14c2df1895718d806
 
+-- TODO this fork is only needed to compile with GHC 8.10.7 - it allows previous base version
 source-repository-package
     type: git
-    location: https://github.com/simplex-chat/network-transport.git
+    location: https://github.com/simplex-chat/zip.git
-    tag: 0013798272a683e35ca38d2fdaf480942311fba8
+    tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc

docs/guide/app-settings.md

@@ -45,6 +45,8 @@ When people connect to you via this address, you will receive a connection reque
 
 If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.
 
+See the comparison with [1-time invitation links](./making-connections.md#comparison-of-1-time-invitation-links-and-simplex-contact-addresses).
+
 Read more in [this post](../../blog/20221108-simplex-chat-v4.2-security-audit-new-website.md#auto-accept-contact-requests).
 
 ### Chat preferences

docs/guide/making-connections.md

@@ -13,6 +13,71 @@ Private Connection — connect using an invitation link or QR code via video or
 
 Group Chat — Users have the option to create a secret group, share their contact link [which can be deleted later on], or generate a one-time invitation link.
 
+## Your SimpleX contact address
+
+You can [create an optional long term address](./app-settings.md#your-simplex-contact-address) for other people to connect with you. Unlike 1-time invitation links, these addresses can be used many times, that makes them good to share online, e.g. on social media platforms, or in email signatures. That helps more people discover SimpleX Chat, so please do it!
+
+When people connect to you via this address, you will receive a connection request that you can accept or reject. You can configure an automatic acceptance of connection request and an automatic welcome message that will be sent to the new contacts. You can also share this address as part of your SimpleX profile, so group members can connect to you, and your contacts can share it with others - if this is something that you want.
+
+If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.
+
+### Comparison of 1-time invitation links and SimpleX Contact addresses
+
+<table>
+  <tr>
+    <th></th>
+    <th>1-time invitation link</th>
+    <th>SimpleX contact address</th>
+  </tr>
+  <tr>
+    <td>Can be used many times?</td>
+    <td>No</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>Can be included in user profile?</td>
+    <td>No, as it can only be used once.</td>
+    <td>Yes, to allow group members to connect directly, and your contacts to pass it on to their contacts.</td>
+  </tr>
+  <tr>
+    <td>When to use it?</td>
+    <td>With somebody you know, via another communication channel or QR code (in person or during a video call)</td>
+    <td>Where many people can see and connect via it, e.g. in email signature, website, social media or group chat.</td>
+  </tr>
+  <tr>
+    <td>Security</td>
+    <td>More secure, as can only be used once, and the initial connection request (including profile) is encrypted with double ratchet.</td>
+    <td>Initial connection request is also e2e encrypted, but without double ratchet (it is initialized when request is accepted).</td>
+  </tr>
+  <tr>
+    <td>Identification</td>
+    <td>Both sides know who they connect to, as they know with whom and by who the link was shared. You can attach alias to this invitation as soon as you share it or use it, to identify the other person when connection is established.</td>
+    <td>Only the person using the address knows who they connect to, via the channel where they found the address (email, social media, etc.). The address owner can only see the user profile of the request, and has no proof of identity from the person sending the request<sup>*</sup>.</td>
+  </tr>
+  <tr>
+    <td>Advantages over other platforms</td>
+    <td>There is no direct analogy, other platforms don’t offer one-time invitations without any fixed part identifying the user.</td>
+    <td>Unlike addresses in other platforms, SimpleX addresses are not used to deliver the messages &mdash; only the initial connection requests.<br>It means that removing this address will not break the contacts made via it (like changing an email address would), it would only prevent new connections, which makes it a good solution against spam and abuse.</td>
+  </tr>
+  <tr>
+    <td>Vulnerability to attacks</td>
+    <td>Until the connection is established, anybody who intercepts this link can connect to it, so it has to be verified with the original contact that the connection succeeded.</td>
+    <td>These addresses are vulnerable to connection request spam. Unlike other platforms, you can delete or change the address, without losing any contacts (see above).</td>
+  </tr>
+  <tr>
+    <td>Passive attacks on connection links</td>
+    <td colspan="2">Both types of links are not vulnerable if simply observed &mdash; they only contain public keys. So they can be safely shared via insecure or public channels, as long as you can confirm that you connected to the intended person.</td>
+  </tr>
+  <tr>
+    <td>Active attacks on connection links</td>
+    <td colspan="2">If the link is substituted via the attack on the channel used to share it, the connection security can be compromised, and the original messages monitored (man-in-the-middle attack). If it is a real risk then security code should be verified to mitigate it - doing so proves<sup>**</sup> that the link and keys were not substituted, and that the end-to-end encryption is secure.</td>
+  </tr>
+</table>
+
+<sup>*</sup> Adding optional verified identities that we plan in the future will change it &mdash; the address owner will have an option to request identity verification before accepting the connection.
+
+<sup>**</sup> Connection security code is the cryptographic hash (SHA256) of combined public keys of both sides &mdash; there are 2<sup>256</sup> possible security codes (1 with 77 zeros – about [1000 times smaller](https://www.wolframalpha.com/input?i=2%5E256) than the estimated number of atoms in the visible universe).
+
 ## Conversation preferences
 
 Tap on one of your conversations to open conversation preferences.

docs/rfcs/2023-11-21-inactive-group-members.md

@@ -0,0 +1,110 @@
+# Inactive group members
+
+## Problem
+
+Group traffic is higher than necessary due to lack of diagnosis of inactive group members. By inactive we understand group members who went offline for indefinitely long time, uninstalled application without leaving group, failed to send x.grp.leave message before deleting connection, or in any other way failed to explicitly communicate further inactivity.
+
+Currently other group members continue to identify such members as active and to send messages to their connections until exceeding receiving SMP queues quotas, with pending messages being slowly retried even after that.
+
+## Solution
+
+Identify inactive members and don't send messages to their connections. Silent periodically online members should continue to receive messages, so decision to mark member as inactive should be made conservatively.
+
+Agent:
+- on SMP.QUOTA error notify client with ERR CONN QUOTA (new ConnectionErrorType QUOTA).
+- on receiving QCONT notify client (new event).
+
+Chat, on sending side, per member:
+- unanswered_snd_msg_count - number of messages that were sent consecutively without receiving a message from member.
+- last_rcv_ts - timestamp of last received message.
+- inactive flag.
+- set inactive if:
+  - agent reports QUOTA error.
+  - on sending message: (unanswered_snd_msg_count > K) && (last_rcv_ts earlier than Ddiff days ago), Ddiff = 1/2/3 days?
+- reset inactive:
+  - on receiving QCONT.
+  - on receiving message or receipt. Also reset unanswered_snd_msg_count, last_rcv_ts.
+- don't send to member if inactive.
+  - don't send only content messages (x.msg.new, etc.) and always send messages altering group state?
+- unanswered_snd_msg_count, last_rcv_ts to be tracked, checked, reset only for members with compatible version.
+
+Chat, on receiving side, per member:
+- unanswered_rcv_msg_count - number of messages that were received consecutively without sending a message to member.
+- send non-optional receipt / another (new) protocol message if:
+  - on receiving message: unanswered_rcv_msg_count > M, M < K.
+- on sending a message or receipt to member reset unanswered_rcv_msg_count.
+- unanswered_rcv_msg_count to be tracked, checked, reset only for members with compatible version.
+
+\***
+
+Consider above condition:
+
+> (unanswered_snd_msg_count > K) && (last_rcv_ts earlier than Ddiff days ago)
+
+It still doesn't account for following situation:
+
+1. Sending member sends a few (N1, N1 < M) messages to silent member on day D1.
+2. Sending member doesn't send messages for several days.
+3. Sending member sends more messages (N2, N1 + N2 > K) to silent member on day DI (DI - D1 > diff in days in above condition), while silent member is offline.
+  - Sending member checks above condition and evaluates it to be true, marks silent member as inactive.
+  - Simply remembering last_snd_ts on sending side and adding check for it not being from several days ago to above condition is not enough, as it will be overwritten by current day sends and will only evaluate false for the first send. What could work is remembering prev_session_last_snd_ts or prev_day_last_snd_ts, but it further complicates logic, and still probably wouldn't account for some time zone differences.
+4. Sending member sends yet more messages, which will not be queued for silent member marked inactive.
+5. Silent member comes online, sends receipt upon receiving message fulfilling above condition: `unanswered_rcv_msg_count > M`, and will lose following messages.
+  - If sending member created messages from 4 as pending, and sent them upon receiving receipt from silent member, silent member would only receive them after sending member coming online. If they are in different time zones it may happen on next day.
+
+Same situation can occur even without step 1, simply by sending many messages while other member is offline.
+
+The problem is less acute the greater the difference between K and M, but making K >> M renders this whole mechanism obsolete, as we could then simply rely on QUOTA errors to mark group members inactive (and don't slow retry in agent?).
+
+Perhaps an acceptable way to solve this problem is to add a task to cleanup manager that would send receipts to all members on condition: (unanswered_rcv_msg_count > 0) && (last_reply_ts earlier than 1 day ago). (Adds last_reply_ts to tracking on receiving side). Perhaps it should be a task separate from cleanup manager that only occurs once per start, or with longer interval.
+
+\***
+
+Additionally we could consider group member connection as disabled with smaller AUTH error count. Currently it's 10 messages, could be 1.
+
+### Delivery suspension notice
+
+When receiving side comes back online, replies and continues to receive messages, it has no way of knowing there was a gap in messages from sending member. To notify receiving member about delivery suspension, sending member should send notice containing shared message id of the last sent message (new protocol event) to them:
+
+```haskell
+XGrpMemSuspended :: SharedMsgId -> ChatMsgEvent 'Json
+```
+
+Sending side additionally tracks:
+- xgrpmemsuspended_sent flag - to only send it once.
+
+When processing it, receiving member creates a "gap" chat item (e.g. event saying "member x suspended delivery to you due to your inactivity, there may be a gap in messages").
+
+After receiving member signals activity by sending any reply, sending member may send message history before continuing normal delivery.
+
+Starting point for message history: either receiving member could request history starting from specific shared message id (received in XGrpMemSuspended) with another new protocol event, or sending member can remember it instead of just flag.
+
+### Sending message history
+
+New protocol event:
+
+```haskell
+XGrpMsgHistory :: [ChatMessage 'Json] -> ChatMsgEvent 'Json
+```
+
+Sending member builds messages history starting starting from requested/remembered shared message id:
+- `messages` table is periodically cleaned up, so messages would be retrieved from `chat_items`.
+- if chat item for starting shared message id is not found (it may have been deleted manually or as a disappearing message), abort?
+  - sending member could track number of skipped messages per member, but again if any chat items were deleted, older (previously successfully sent) chat items would be retrieved, resulting in duplicate messages. If receiving member has also cleaned up records in `messages` table, they wouldn't be deduplicated.
+  - sending member could track timestamp of first unsent message instead of shared msg id.
+- sending member should probably limit maximum number of messages sent as history (100?).
+- only XMsgNew events should be sent in XGrpMsgHistory (chat items to be transformed back into text messages).
+  - updates, deletions would be reflected in chat item list.
+  - reactions would be omitted.
+  - files would be likely expired by the time of sending history, so only file name and size may be sent in FileInvitation, with invitation being practically not acceptable.
+    - add new flag to CIFile "expired" for receiving member to mark chat items created based on such invitations.
+    - FileInvitation in MsgContainer could also contain this flag as optional to explicitly communicate that only file metadata is sent.
+    - alternatively sending member could re-upload files, but this seems excessive.
+  - XMsgNew events don't include message timestamps (instead usually broker ts is retrieved from agent message meta), so receiving member wouldn't be able to restore them from history. Perhaps history should include XGrpMsgForward events containing XMsgNew events instead.
+- XGrpMsgHistory is likely to exceed message block limit.
+  - either multiple messages comprising a history can be batched as a single message on chat level until the block size is exceeded.
+  - or large history messages could be batched on agent level.
+
+\***
+
+Same XGrpMsgHistory protocol event could be sent by host to new members, after sending introductions.

fourmolu.yaml

@@ -0,0 +1,30 @@
+indentation: 2
+column-limit: none
+function-arrows: trailing
+comma-style: trailing
+import-export-style: trailing
+indent-wheres: true
+record-brace-space: true
+newlines-between-decls: 1
+haddock-style: single-line
+haddock-style-module: null
+let-style: inline
+in-style: right-align
+single-constraint-parens: never
+unicode: never
+respectful: true
+fixities:
+  - infixr 9 .
+  - infixr 8 .:, .:., .=
+  - infixr 6 <>
+  - infixr 5 ++
+  - infixl 4 <$>, <$, $>,  <$$>, <$?>
+  - infixl 4 <*>, <*, *>, <**>
+  - infix 4 ==, /=
+  - infixr 3 &&
+  - infixl 3 <|>
+  - infixr 2 ||
+  - infixl 1 >>, >>=
+  - infixr 1 =<<, >=>, <=<
+  - infixr 0 $, $!
+reexports: []

package.yaml

@@ -19,7 +19,6 @@ dependencies:
   - attoparsec == 0.14.*
   - base >= 4.7 && < 5
   - base64-bytestring >= 1.0 && < 1.3
-  - bytestring == 0.11.*
   - composition == 1.0.*
   - constraints >= 0.12 && < 0.14
   - containers == 0.6.*
@@ -33,7 +32,7 @@ dependencies:
   - http-types == 0.12.*
   - http2 >= 4.2.2 && < 4.3
   - memory == 0.18.*
-  - mtl == 2.3.*
+  - mtl >= 2.3.1 && < 3.0
   - network >= 3.1.2.7 && < 3.2
   - network-transport == 0.5.6
   - optparse-applicative >= 0.15 && < 0.17
@@ -45,9 +44,7 @@ dependencies:
   - socks == 0.6.*
   - sqlcipher-simple == 0.4.*
   - stm == 2.5.*
-  - template-haskell == 2.20.*
   - terminal == 0.2.*
-  - text == 2.0.*
   - time == 1.9.*
   - tls >= 1.6.0 && < 1.7
   - unliftio == 0.2.*
@@ -64,6 +61,16 @@ when:
   - condition: flag(swift)
     cpp-options:
       - -DswiftJSON
+  - condition: impl(ghc >= 9.6.2)
+    dependencies:
+      - bytestring == 0.11.*
+      - template-haskell == 2.20.*
+      - text >= 2.0.1 && < 2.2
+  - condition: impl(ghc < 9.6.2)
+    dependencies:
+      - bytestring == 0.10.*
+      - template-haskell == 2.16.*
+      - text >= 1.2.3.0 && < 1.3
 
 library:
   source-dirs: src

packages/simplex-chat-client/typescript/src/response.ts

@@ -86,7 +86,6 @@ export type ChatResponse =
   | CRGroupUpdated
   | CRUserContactLinkSubscribed
   | CRUserContactLinkSubError
-  | CRNewContactConnection
   | CRContactConnectionDeleted
   | CRMessageError
   | CRChatCmdError
@@ -731,12 +730,6 @@ export interface CRUserContactLinkSubError extends CR {
   chatError: ChatError
 }
 
-export interface CRNewContactConnection extends CR {
-  type: "newContactConnection"
-  user: User
-  connection: PendingContactConnection
-}
-
 export interface CRContactConnectionDeleted extends CR {
   type: "contactConnectionDeleted"
   user: User

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."757b7eec81341d8560a326deab303bb6fb6a26a3" = "0kqnxpyz8v43802fncqxdg6i2ni70yv7jg7a1nbkny1w937fwf40";
+  "https://github.com/simplex-chat/simplexmq.git"."eaf5317834b069144b5f4897f9c79831983e54dd" = "0jlic1q08mq9p9sgvigmc59r6x1r5fa1zsfqvvrwd97pwain36mj";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
@@ -7,5 +7,5 @@
   "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
   "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
-  "https://github.com/simplex-chat/network-transport.git"."0013798272a683e35ca38d2fdaf480942311fba8" = "0dnn62apgvc248df0m8ib7phrzn63wm0xs71xvlypv52j6cgwzkb";
+  "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
 }

simplex-chat.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -124,6 +124,7 @@ library
       Simplex.Chat.Migrations.M20231107_indexes
       Simplex.Chat.Migrations.M20231113_group_forward
       Simplex.Chat.Migrations.M20231114_remote_control
+      Simplex.Chat.Migrations.M20231126_remote_ctrl_address
       Simplex.Chat.Mobile
       Simplex.Chat.Mobile.File
       Simplex.Chat.Mobile.Shared
@@ -170,7 +171,6 @@ library
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -184,7 +184,7 @@ library
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network >=3.1.2.7 && <3.2
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -196,9 +196,7 @@ library
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -207,6 +205,16 @@ library
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 executable simplex-bot
   main-is: Main.hs
@@ -222,7 +230,6 @@ executable simplex-bot
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -236,7 +243,7 @@ executable simplex-bot
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network >=3.1.2.7 && <3.2
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -249,9 +256,7 @@ executable simplex-bot
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -260,6 +265,16 @@ executable simplex-bot
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 executable simplex-bot-advanced
   main-is: Main.hs
@@ -275,7 +290,6 @@ executable simplex-bot-advanced
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -289,7 +303,7 @@ executable simplex-bot-advanced
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network >=3.1.2.7 && <3.2
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -302,9 +316,7 @@ executable simplex-bot-advanced
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -313,6 +325,16 @@ executable simplex-bot-advanced
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 executable simplex-broadcast-bot
   main-is: ../Main.hs
@@ -330,7 +352,6 @@ executable simplex-broadcast-bot
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -344,7 +365,7 @@ executable simplex-broadcast-bot
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network >=3.1.2.7 && <3.2
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -357,9 +378,7 @@ executable simplex-broadcast-bot
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -368,6 +387,16 @@ executable simplex-broadcast-bot
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 executable simplex-chat
   main-is: Main.hs
@@ -384,7 +413,6 @@ executable simplex-chat
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -398,7 +426,7 @@ executable simplex-chat
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network ==3.1.*
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -411,9 +439,7 @@ executable simplex-chat
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -423,6 +449,16 @@ executable simplex-chat
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 executable simplex-directory-service
   main-is: ../Main.hs
@@ -442,7 +478,6 @@ executable simplex-directory-service
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -456,7 +491,7 @@ executable simplex-directory-service
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network >=3.1.2.7 && <3.2
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -469,9 +504,7 @@ executable simplex-directory-service
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -480,6 +513,16 @@ executable simplex-directory-service
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3
 
 test-suite simplex-chat-test
   type: exitcode-stdio-1.0
@@ -523,7 +566,6 @@ test-suite simplex-chat-test
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
@@ -540,7 +582,7 @@ test-suite simplex-chat-test
     , http-types ==0.12.*
     , http2 >=4.2.2 && <4.3
     , memory ==0.18.*
-    , mtl ==2.3.*
+    , mtl >=2.3.1 && <3.0
     , network ==3.1.*
     , network-transport ==0.5.6
     , optparse-applicative >=0.15 && <0.17
@@ -554,9 +596,7 @@ test-suite simplex-chat-test
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
     , terminal ==0.2.*
-    , text ==2.0.*
     , time ==1.9.*
     , tls >=1.6.0 && <1.7
     , unliftio ==0.2.*
@@ -565,3 +605,13 @@ test-suite simplex-chat-test
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        bytestring ==0.11.*
+      , template-haskell ==2.20.*
+      , text >=2.0.1 && <2.2
+  if impl(ghc < 9.6.2)
+    build-depends:
+        bytestring ==0.10.*
+      , template-haskell ==2.16.*
+      , text >=1.2.3.0 && <1.3

src/Simplex/Chat/Archive.hs

@@ -22,7 +22,7 @@ import qualified Data.Text as T
 import qualified Database.SQLite3 as SQL
 import Simplex.Chat.Controller
 import Simplex.Messaging.Agent.Client (agentClientStore)
-import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..), sqlString, closeSQLiteStore)
+import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..), closeSQLiteStore, sqlString)
 import Simplex.Messaging.Util
 import System.FilePath
 import UnliftIO.Directory

src/Simplex/Chat/Bot/KnownContacts.hs

@@ -6,8 +6,8 @@ module Simplex.Chat.Bot.KnownContacts where
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Int (Int64)
 import Data.Text (Text)
-import Data.Text.Encoding (encodeUtf8)
 import qualified Data.Text as T
+import Data.Text.Encoding (encodeUtf8)
 import Options.Applicative
 import Simplex.Messaging.Parsers (parseAll)
 import Simplex.Messaging.Util (safeDecodeUtf8)

src/Simplex/Chat/Call.hs

@@ -225,4 +225,3 @@ instance FromField CallState where
   fromField = fromTextField_ decodeJSON
 
 $(J.deriveJSON defaultJSON ''RcvCallInvitation)
-

src/Simplex/Chat/Controller.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DuplicateRecordFields #-}
@@ -41,6 +41,7 @@ import Data.String
 import Data.Text (Text)
 import Data.Time (NominalDiffTime, UTCTime)
 import Data.Version (showVersion)
+import Data.Word (Word16)
 import Language.Haskell.TH (Exp, Q, runIO)
 import Numeric.Natural
 import qualified Paths_simplex_chat as SC
@@ -426,19 +427,19 @@ data ChatCommand
   | SetGroupTimedMessages GroupName (Maybe Int)
   | SetLocalDeviceName Text
   | ListRemoteHosts
-  | StartRemoteHost (Maybe (RemoteHostId, Bool)) -- ^ Start new or known remote host with optional multicast for known host
+  | StartRemoteHost (Maybe (RemoteHostId, Bool)) (Maybe RCCtrlAddress) (Maybe Word16) -- Start new or known remote host with optional multicast for known host
-  | SwitchRemoteHost (Maybe RemoteHostId) -- ^ Switch current remote host
+  | SwitchRemoteHost (Maybe RemoteHostId) -- Switch current remote host
-  | StopRemoteHost RHKey -- ^ Shut down a running session
+  | StopRemoteHost RHKey -- Shut down a running session
-  | DeleteRemoteHost RemoteHostId -- ^ Unregister remote host and remove its data
+  | DeleteRemoteHost RemoteHostId -- Unregister remote host and remove its data
   | StoreRemoteFile {remoteHostId :: RemoteHostId, storeEncrypted :: Maybe Bool, localPath :: FilePath}
   | GetRemoteFile {remoteHostId :: RemoteHostId, file :: RemoteFile}
-  | ConnectRemoteCtrl RCSignedInvitation -- ^ Connect new or existing controller via OOB data
+  | ConnectRemoteCtrl RCSignedInvitation -- Connect new or existing controller via OOB data
-  | FindKnownRemoteCtrl -- ^ Start listening for announcements from all existing controllers
+  | FindKnownRemoteCtrl -- Start listening for announcements from all existing controllers
-  | ConfirmRemoteCtrl RemoteCtrlId -- ^ Confirm the connection with found controller
+  | ConfirmRemoteCtrl RemoteCtrlId -- Confirm the connection with found controller
-  | VerifyRemoteCtrlSession Text -- ^ Verify remote controller session
+  | VerifyRemoteCtrlSession Text -- Verify remote controller session
   | ListRemoteCtrls
-  | StopRemoteCtrl -- ^ Stop listening for announcements or terminate an active session
+  | StopRemoteCtrl -- Stop listening for announcements or terminate an active session
-  | DeleteRemoteCtrl RemoteCtrlId -- ^ Remove all local data associated with a remote controller session
+  | DeleteRemoteCtrl RemoteCtrlId -- Remove all local data associated with a remote controller session
   | QuitChat
   | ShowVersion
   | DebugLocks
@@ -469,7 +470,7 @@ allowRemoteCommand = \case
   APIGetNetworkConfig -> False
   SetLocalDeviceName _ -> False
   ListRemoteHosts -> False
-  StartRemoteHost _ -> False
+  StartRemoteHost {} -> False
   SwitchRemoteHost {} -> False
   StoreRemoteFile {} -> False
   GetRemoteFile {} -> False
@@ -556,8 +557,8 @@ data ChatResponse
   | CRInvitation {user :: User, connReqInvitation :: ConnReqInvitation, connection :: PendingContactConnection}
   | CRConnectionIncognitoUpdated {user :: User, toConnection :: PendingContactConnection}
   | CRConnectionPlan {user :: User, connectionPlan :: ConnectionPlan}
-  | CRSentConfirmation {user :: User}
+  | CRSentConfirmation {user :: User, connection :: PendingContactConnection}
-  | CRSentInvitation {user :: User, customUserProfile :: Maybe Profile}
+  | CRSentInvitation {user :: User, connection :: PendingContactConnection, customUserProfile :: Maybe Profile}
   | CRSentInvitationToContact {user :: User, contact :: Contact, customUserProfile :: Maybe Profile}
   | CRContactUpdated {user :: User, fromContact :: Contact, toContact :: Contact}
   | CRGroupMemberUpdated {user :: User, groupInfo :: GroupInfo, fromMember :: GroupMember, toMember :: GroupMember}
@@ -654,11 +655,10 @@ data ChatResponse
   | CRNtfTokenStatus {status :: NtfTknStatus}
   | CRNtfToken {token :: DeviceToken, status :: NtfTknStatus, ntfMode :: NotificationsMode}
   | CRNtfMessages {user_ :: Maybe User, connEntity :: Maybe ConnectionEntity, msgTs :: Maybe UTCTime, ntfMessages :: [NtfMsgInfo]}
-  | CRNewContactConnection {user :: User, connection :: PendingContactConnection}
   | CRContactConnectionDeleted {user :: User, connection :: PendingContactConnection}
   | CRRemoteHostList {remoteHosts :: [RemoteHostInfo]}
   | CRCurrentRemoteHost {remoteHost_ :: Maybe RemoteHostInfo}
-  | CRRemoteHostStarted {remoteHost_ :: Maybe RemoteHostInfo, invitation :: Text, ctrlPort :: String}
+  | CRRemoteHostStarted {remoteHost_ :: Maybe RemoteHostInfo, invitation :: Text, ctrlPort :: String, localAddrs :: NonEmpty RCCtrlAddress}
   | CRRemoteHostSessionCode {remoteHost_ :: Maybe RemoteHostInfo, sessionCode :: Text}
   | CRNewRemoteHost {remoteHost :: RemoteHostInfo}
   | CRRemoteHostConnected {remoteHost :: RemoteHostInfo}
@@ -1072,32 +1072,33 @@ throwDBError = throwError . ChatErrorDatabase
 
 -- TODO review errors, some of it can be covered by HTTP2 errors
 data RemoteHostError
-  = RHEMissing -- ^ No remote session matches this identifier
+  = RHEMissing -- No remote session matches this identifier
-  | RHEInactive -- ^ A session exists, but not active
+  | RHEInactive -- A session exists, but not active
-  | RHEBusy -- ^ A session is already running
+  | RHEBusy -- A session is already running
   | RHETimeout
-  | RHEBadState -- ^ Illegal state transition
+  | RHEBadState -- Illegal state transition
   | RHEBadVersion {appVersion :: AppVersion}
-  | RHELocalCommand -- ^ Command not allowed for remote execution
+  | RHELocalCommand -- Command not allowed for remote execution
   | RHEDisconnected {reason :: Text} -- TODO should be sent when disconnected?
   | RHEProtocolError RemoteProtocolError
   deriving (Show, Exception)
 
 data RemoteHostStopReason
-  = RHSRConnectionFailed ChatError
+  = RHSRConnectionFailed {chatError :: ChatError}
-  | RHSRCrashed ChatError
+  | RHSRCrashed {chatError :: ChatError}
   | RHSRDisconnected
   deriving (Show, Exception)
 
 -- TODO review errors, some of it can be covered by HTTP2 errors
 data RemoteCtrlError
-  = RCEInactive -- ^ No session is running
+  = RCEInactive -- No session is running
-  | RCEBadState -- ^ A session is in a wrong state for the current operation
+  | RCEBadState -- A session is in a wrong state for the current operation
-  | RCEBusy -- ^ A session is already running
+  | RCEBusy -- A session is already running
   | RCETimeout
-  | RCENoKnownControllers -- ^ No previously-contacted controllers to discover
+  | RCENoKnownControllers -- No previously-contacted controllers to discover
-  | RCEBadController -- ^ Attempting to confirm a found controller with another ID
+  | RCEBadController -- Attempting to confirm a found controller with another ID
-  | RCEDisconnected {remoteCtrlId :: RemoteCtrlId, reason :: Text} -- ^ A session disconnected by a controller
+  | -- | A session disconnected by a controller
+    RCEDisconnected {remoteCtrlId :: RemoteCtrlId, reason :: Text}
   | RCEBadInvitation
   | RCEBadVersion {appVersion :: AppVersion}
   | RCEHTTP2Error {http2Error :: Text} -- TODO currently not used
@@ -1105,9 +1106,9 @@ data RemoteCtrlError
   deriving (Show, Exception)
 
 data RemoteCtrlStopReason
-  = RCSRDiscoveryFailed ChatError
+  = RCSRDiscoveryFailed {chatError :: ChatError}
-  | RCSRConnectionFailed ChatError
+  | RCSRConnectionFailed {chatError :: ChatError}
-  | RCSRSetupFailed ChatError
+  | RCSRSetupFailed {chatError :: ChatError}
   | RCSRDisconnected
   deriving (Show, Exception)
 
@@ -1223,8 +1224,8 @@ toView event = do
   session <- asks remoteCtrlSession
   atomically $
     readTVar session >>= \case
-      Just (_, RCSessionConnected {remoteOutputQ}) | allowRemoteEvent event ->
+      Just (_, RCSessionConnected {remoteOutputQ})
-        writeTBQueue remoteOutputQ event
+        | allowRemoteEvent event -> writeTBQueue remoteOutputQ event
       -- TODO potentially, it should hold some events while connecting
       _ -> writeTBQueue localQ (Nothing, Nothing, event)
 

src/Simplex/Chat/Core.hs

@@ -35,9 +35,9 @@ runSimplexChat :: ChatOpts -> User -> ChatController -> (User -> ChatController
 runSimplexChat ChatOpts {maintenance} u cc chat
   | maintenance = wait =<< async (chat u cc)
   | otherwise = do
-    a1 <- runReaderT (startChatController True True True) cc
+      a1 <- runReaderT (startChatController True True True) cc
-    a2 <- async $ chat u cc
+      a2 <- async $ chat u cc
-    waitEither_ a1 a2
+      waitEither_ a1 a2
 
 sendChatCmdStr :: ChatController -> String -> IO ChatResponse
 sendChatCmdStr cc s = runReaderT (execChatCommand Nothing . encodeUtf8 $ T.pack s) cc

src/Simplex/Chat/Files.hs

@@ -6,8 +6,8 @@ module Simplex.Chat.Files where
 import Control.Monad.IO.Class
 import Simplex.Chat.Controller
 import Simplex.Messaging.Util (ifM)
-import System.FilePath (splitExtensions, combine)
+import System.FilePath (combine, splitExtensions)
-import UnliftIO.Directory (doesFileExist, getTemporaryDirectory, getHomeDirectory, doesDirectoryExist)
+import UnliftIO.Directory (doesDirectoryExist, doesFileExist, getHomeDirectory, getTemporaryDirectory)
 
 uniqueCombine :: MonadIO m => FilePath -> String -> m FilePath
 uniqueCombine fPath fName = tryCombine (0 :: Int)

src/Simplex/Chat/Markdown.hs

@@ -19,7 +19,7 @@ import qualified Data.Attoparsec.Text as A
 import Data.Char (isDigit, isPunctuation)
 import Data.Either (fromRight)
 import Data.Functor (($>))
-import Data.List (intercalate, foldl')
+import Data.List (foldl', intercalate)
 import Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as L
 import Data.Maybe (fromMaybe, isNothing)
@@ -85,16 +85,18 @@ newtype FormatColor = FormatColor Color
   deriving (Eq, Show)
 
 instance FromJSON FormatColor where
-  parseJSON = J.withText "FormatColor" $ fmap FormatColor . \case
+  parseJSON =
-    "red" -> pure Red
+    J.withText "FormatColor" $
-    "green" -> pure Green
+      fmap FormatColor . \case
-    "blue" -> pure Blue
+        "red" -> pure Red
-    "yellow" -> pure Yellow
+        "green" -> pure Green
-    "cyan" -> pure Cyan
+        "blue" -> pure Blue
-    "magenta" -> pure Magenta
+        "yellow" -> pure Yellow
-    "black" -> pure Black
+        "cyan" -> pure Cyan
-    "white" -> pure White
+        "magenta" -> pure Magenta
-    unexpected -> fail $ "unexpected FormatColor: " <> show unexpected
+        "black" -> pure Black
+        "white" -> pure White
+        unexpected -> fail $ "unexpected FormatColor: " <> show unexpected
 
 instance ToJSON FormatColor where
   toJSON (FormatColor c) = case c of
@@ -167,14 +169,14 @@ markdownP = mconcat <$> A.many' fragmentP
     md :: Char -> Format -> Text -> Markdown
     md c f s
       | T.null s || T.head s == ' ' || T.last s == ' ' =
-        unmarked $ c `T.cons` s `T.snoc` c
+          unmarked $ c `T.cons` s `T.snoc` c
       | otherwise = markdown f s
     secretP :: Parser Markdown
     secretP = secret <$> A.takeWhile (== '#') <*> A.takeTill (== '#') <*> A.takeWhile (== '#')
     secret :: Text -> Text -> Text -> Markdown
     secret b s a
       | T.null a || T.null s || T.head s == ' ' || T.last s == ' ' =
-        unmarked $ '#' `T.cons` ss
+          unmarked $ '#' `T.cons` ss
       | otherwise = markdown Secret $ T.init ss
       where
         ss = b <> s <> a
@@ -215,9 +217,9 @@ markdownP = mconcat <$> A.many' fragmentP
     wordMD s
       | T.null s = unmarked s
       | isUri s =
-        let t = T.takeWhileEnd isPunctuation s
+          let t = T.takeWhileEnd isPunctuation s
-            uri = uriMarkdown $ T.dropWhileEnd isPunctuation s
+              uri = uriMarkdown $ T.dropWhileEnd isPunctuation s
-         in if T.null t then uri else uri :|: unmarked t
+           in if T.null t then uri else uri :|: unmarked t
       | isEmail s = markdown Email s
       | otherwise = unmarked s
     uriMarkdown s = case strDecode $ encodeUtf8 s of

src/Simplex/Chat/Messages.hs

@@ -11,7 +11,6 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Messages where
@@ -44,7 +43,7 @@ import Simplex.Messaging.Agent.Protocol (AgentMsgId, MsgMeta (..), MsgReceiptSta
 import Simplex.Messaging.Crypto.File (CryptoFile (..))
 import qualified Simplex.Messaging.Crypto.File as CF
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fromTextField_, parseAll, enumJSON, sumTypeJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, fromTextField_, parseAll, sumTypeJSON)
 import Simplex.Messaging.Protocol (MsgBody)
 import Simplex.Messaging.Util (eitherToMaybe, safeDecodeUtf8, (<$?>))
 
@@ -345,7 +344,7 @@ contactTimedTTL Contact {mergedPreferences = ContactUserPreferences {timedMessag
   | forUser enabled && forContact enabled = Just ttl
   | otherwise = Nothing
   where
-    TimedMessagesPreference {ttl} =  userPreference.preference
+    TimedMessagesPreference {ttl} = userPreference.preference
 
 groupTimedTTL :: GroupInfo -> Maybe (Maybe Int)
 groupTimedTTL GroupInfo {fullGroupPreferences = FullGroupPreferences {timedMessages = TimedMessagesGroupPreference {enable, ttl}}}

src/Simplex/Chat/Messages/CIContent.hs

@@ -311,7 +311,7 @@ profileToText Profile {displayName, fullName} = displayName <> optionalFullName
 msgIntegrityError :: MsgErrorType -> Text
 msgIntegrityError = \case
   MsgSkipped fromId toId ->
-    "skipped message ID " <> tshow fromId
+    ("skipped message ID " <> tshow fromId)
       <> if fromId == toId then "" else ".." <> tshow toId
   MsgBadId msgId -> "unexpected message ID " <> tshow msgId
   MsgBadHash -> "incorrect message hash"

src/Simplex/Chat/Messages/CIContent/Events.hs

@@ -46,9 +46,9 @@ data SndConnEvent
   | SCERatchetSync {syncStatus :: RatchetSyncState, member :: Maybe GroupMemberRef}
   deriving (Show)
 
-data RcvDirectEvent =
+data RcvDirectEvent
-  -- RDEProfileChanged {...}
+  = -- RDEProfileChanged {...}
-  RDEContactDeleted
+    RDEContactDeleted
   deriving (Show)
 
 -- platform-specific JSON encoding (used in API)

src/Simplex/Chat/Migrations/M20231126_remote_ctrl_address.hs

@@ -0,0 +1,22 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20231126_remote_ctrl_address where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20231126_remote_ctrl_address :: Query
+m20231126_remote_ctrl_address =
+  [sql|
+ALTER TABLE remote_hosts ADD COLUMN bind_addr TEXT;
+ALTER TABLE remote_hosts ADD COLUMN bind_iface TEXT;
+ALTER TABLE remote_hosts ADD COLUMN bind_port INTEGER;
+|]
+
+down_m20231126_remote_ctrl_address :: Query
+down_m20231126_remote_ctrl_address =
+  [sql|
+ALTER TABLE remote_hosts DROP COLUMN bind_addr;
+ALTER TABLE remote_hosts DROP COLUMN bind_iface;
+ALTER TABLE remote_hosts DROP COLUMN bind_port;
+|]

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -537,6 +537,10 @@ CREATE TABLE remote_hosts(
   id_key BLOB NOT NULL, -- long-term/identity signing key
   host_fingerprint BLOB NOT NULL, -- remote host CA cert fingerprint, set when connected
   host_dh_pub BLOB NOT NULL -- last session DH key
+  ,
+  bind_addr TEXT,
+  bind_iface TEXT,
+  bind_port INTEGER
 );
 CREATE TABLE remote_controllers(
   -- e.g., desktops known to a mobile app

src/Simplex/Chat/Mobile.hs

@@ -4,13 +4,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
-
 {-# OPTIONS_GHC -fobject-code #-}
 
 module Simplex.Chat.Mobile where
 
 import Control.Concurrent.STM
-import Control.Exception (catch, SomeException)
+import Control.Exception (SomeException, catch)
 import Control.Monad.Except
 import Control.Monad.Reader
 import qualified Data.Aeson as J
@@ -31,7 +30,7 @@ import Foreign.C.Types (CInt (..))
 import Foreign.Ptr
 import Foreign.StablePtr
 import Foreign.Storable (poke)
-import GHC.IO.Encoding (setLocaleEncoding, setFileSystemEncoding, setForeignEncoding)
+import GHC.IO.Encoding (setFileSystemEncoding, setForeignEncoding, setLocaleEncoding)
 import Simplex.Chat
 import Simplex.Chat.Controller
 import Simplex.Chat.Markdown (ParsedMarkdown (..), parseMaybeMarkdownList)
@@ -219,7 +218,7 @@ chatMigrateInit dbFilePrefix dbKey confirm = runExceptT $ do
       ExceptT $
         (first (DBMErrorMigration dbFile) <$> createStore dbFile dbKey confirmMigrations)
           `catch` (pure . checkDBError)
-            `catchAll` (pure . dbError)
+          `catchAll` (pure . dbError)
       where
         checkDBError e = case sqlError e of
           DB.ErrorNotADatabase -> Left $ DBMErrorNotADatabase dbFile

src/Simplex/Chat/Mobile/Shared.hs

@@ -6,8 +6,8 @@ import qualified Data.ByteString as B
 import Data.ByteString.Internal (ByteString (..), memcpy)
 import qualified Data.ByteString.Lazy as LB
 import qualified Data.ByteString.Lazy.Internal as LB
-import Foreign.C (CInt, CString)
 import Foreign
+import Foreign.C (CInt, CString)
 
 type CJSONString = CString
 

src/Simplex/Chat/Mobile/WebRTC.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE FlexibleContexts #-}
 
-module Simplex.Chat.Mobile.WebRTC (
+module Simplex.Chat.Mobile.WebRTC
-  cChatEncryptMedia,
+  ( cChatEncryptMedia,
-  cChatDecryptMedia,
+    cChatDecryptMedia,
-  chatEncryptMedia,
+    chatEncryptMedia,
-  chatDecryptMedia,
+    chatDecryptMedia,
-  reservedSize,
+    reservedSize,
-) where
+  ) where
 
 import Control.Monad
 import Control.Monad.Except
@@ -21,8 +21,8 @@ import Data.Either (fromLeft)
 import Data.Word (Word8)
 import Foreign.C (CInt, CString, newCAString)
 import Foreign.Ptr (Ptr)
-import qualified Simplex.Messaging.Crypto as C
 import Simplex.Chat.Mobile.Shared
+import qualified Simplex.Messaging.Crypto as C
 
 cChatEncryptMedia :: CString -> Ptr Word8 -> CInt -> IO CString
 cChatEncryptMedia = cTransformMedia chatEncryptMedia

src/Simplex/Chat/Options.hs

@@ -42,6 +42,7 @@ data ChatOpts = ChatOpts
     allowInstantFiles :: Bool,
     autoAcceptFileSize :: Integer,
     muteNotifications :: Bool,
+    markRead :: Bool,
     maintenance :: Bool
   }
 
@@ -206,7 +207,6 @@ chatOptsP appDir defaultDbFileName = do
     optional $
       strOption
         ( long "device-name"
-            <> short 'e'
             <> metavar "DEVICE"
             <> help "Device name to use in connections with remote hosts and controller"
         )
@@ -269,6 +269,12 @@ chatOptsP appDir defaultDbFileName = do
       ( long "mute"
           <> help "Mute notifications"
       )
+  markRead <-
+    switch
+      ( long "mark-read"
+          <> short 'r'
+          <> help "Mark shown messages as read"
+      )
   maintenance <-
     switch
       ( long "maintenance"
@@ -287,6 +293,7 @@ chatOptsP appDir defaultDbFileName = do
         allowInstantFiles,
         autoAcceptFileSize,
         muteNotifications,
+        markRead,
         maintenance
       }
 

src/Simplex/Chat/ProfileGenerator.hs

@@ -18,10 +18,10 @@ generateRandomProfile = do
     pickNoun adjective n
       | n == 0 = pick nouns
       | otherwise = do
-        noun <- pick nouns
+          noun <- pick nouns
-        if noun == adjective
+          if noun == adjective
-          then pickNoun adjective (n - 1)
+            then pickNoun adjective (n - 1)
-          else pure noun
+            else pure noun
 
 adjectives :: [Text]
 adjectives =

src/Simplex/Chat/Protocol.hs

@@ -13,7 +13,6 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Protocol where

src/Simplex/Chat/Remote.hs

@@ -26,13 +26,14 @@ import qualified Data.ByteString.Base64.URL as B64U
 import Data.ByteString.Builder (Builder)
 import qualified Data.ByteString.Char8 as B
 import Data.Functor (($>))
-import Data.List.NonEmpty (nonEmpty)
+import Data.List.NonEmpty (NonEmpty, nonEmpty)
+import qualified Data.List.NonEmpty as L
 import qualified Data.Map.Strict as M
 import Data.Maybe (fromMaybe, isJust)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
-import Data.Word (Word32)
+import Data.Word (Word16, Word32)
 import qualified Network.HTTP.Types as N
 import Network.HTTP2.Server (responseStreaming)
 import qualified Paths_simplex_chat as SC
@@ -97,24 +98,26 @@ discoveryTimeout = 60000000
 getRemoteHostClient :: ChatMonad m => RemoteHostId -> m RemoteHostClient
 getRemoteHostClient rhId = do
   sessions <- asks remoteHostSessions
-  liftIOEither . atomically $ TM.lookup rhKey sessions >>= \case
+  liftIOEither . atomically $
-    Just (_, RHSessionConnected {rhClient}) -> pure $ Right rhClient
+    TM.lookup rhKey sessions >>= \case
-    Just _ -> pure . Left $ ChatErrorRemoteHost rhKey RHEBadState
+      Just (_, RHSessionConnected {rhClient}) -> pure $ Right rhClient
-    Nothing -> pure . Left $ ChatErrorRemoteHost rhKey RHEMissing
+      Just _ -> pure . Left $ ChatErrorRemoteHost rhKey RHEBadState
+      Nothing -> pure . Left $ ChatErrorRemoteHost rhKey RHEMissing
   where
     rhKey = RHId rhId
 
 withRemoteHostSession :: ChatMonad m => RHKey -> SessionSeq -> (RemoteHostSession -> Either ChatError (a, RemoteHostSession)) -> m a
 withRemoteHostSession rhKey sseq f = do
   sessions <- asks remoteHostSessions
-  r <- atomically $
+  r <-
-    TM.lookup rhKey sessions >>= \case
+    atomically $
-      Nothing -> pure . Left $ ChatErrorRemoteHost rhKey RHEMissing
+      TM.lookup rhKey sessions >>= \case
-      Just (stateSeq, state)
+        Nothing -> pure . Left $ ChatErrorRemoteHost rhKey RHEMissing
-        | stateSeq /= sseq -> pure . Left $ ChatErrorRemoteHost rhKey RHEBadState
+        Just (stateSeq, state)
-        | otherwise -> case f state of
+          | stateSeq /= sseq -> pure . Left $ ChatErrorRemoteHost rhKey RHEBadState
-            Right (r, newState) -> Right r <$ TM.insert rhKey (sseq, newState) sessions
+          | otherwise -> case f state of
-            Left ce -> pure $ Left ce
+              Right (r, newState) -> Right r <$ TM.insert rhKey (sseq, newState) sessions
+              Left ce -> pure $ Left ce
   liftEither r
 
 -- | Transition session state with a 'RHNew' ID to an assigned 'RemoteHostId'
@@ -133,8 +136,8 @@ setNewRemoteHostId sseq rhId = do
   where
     err = pure . Left . ChatErrorRemoteHost RHNew
 
-startRemoteHost :: ChatMonad m => Maybe (RemoteHostId, Bool) -> m (Maybe RemoteHostInfo, RCSignedInvitation)
+startRemoteHost :: ChatMonad m => Maybe (RemoteHostId, Bool) -> Maybe RCCtrlAddress -> Maybe Word16 -> m (NonEmpty RCCtrlAddress, Maybe RemoteHostInfo, RCSignedInvitation)
-startRemoteHost rh_ = do
+startRemoteHost rh_ rcAddrPrefs_ port_ = do
   (rhKey, multicast, remoteHost_, pairing) <- case rh_ of
     Just (rhId, multicast) -> do
       rh@RemoteHost {hostPairing} <- withStore $ \db -> getRemoteHost db rhId
@@ -142,19 +145,20 @@ startRemoteHost rh_ = do
     Nothing -> (RHNew,False,Nothing,) <$> rcNewHostPairing
   sseq <- startRemoteHostSession rhKey
   ctrlAppInfo <- mkCtrlAppInfo
-  (invitation, rchClient, vars) <- handleConnectError rhKey sseq . withAgent $ \a -> rcConnectHost a pairing (J.toJSON ctrlAppInfo) multicast
+  (localAddrs, invitation, rchClient, vars) <- handleConnectError rhKey sseq . withAgent $ \a -> rcConnectHost a pairing (J.toJSON ctrlAppInfo) multicast rcAddrPrefs_ port_
+  let rcAddr_ = L.head localAddrs <$ rcAddrPrefs_
   cmdOk <- newEmptyTMVarIO
   rhsWaitSession <- async $ do
     rhKeyVar <- newTVarIO rhKey
     atomically $ takeTMVar cmdOk
-    handleHostError sseq rhKeyVar $ waitForHostSession remoteHost_ rhKey sseq rhKeyVar vars
+    handleHostError sseq rhKeyVar $ waitForHostSession remoteHost_ rhKey sseq rcAddr_ rhKeyVar vars
   let rhs = RHPendingSession {rhKey, rchClient, rhsWaitSession, remoteHost_}
   withRemoteHostSession rhKey sseq $ \case
     RHSessionStarting ->
       let inv = decodeLatin1 $ strEncode invitation
        in Right ((), RHSessionConnecting inv rhs)
     _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
-  (remoteHost_, invitation) <$ atomically (putTMVar cmdOk ())
+  (localAddrs, remoteHost_, invitation) <$ atomically (putTMVar cmdOk ())
   where
     mkCtrlAppInfo = do
       deviceName <- chatReadVar localDeviceName
@@ -167,16 +171,18 @@ startRemoteHost rh_ = do
       when (encoding == PEKotlin && localEncoding == PESwift) $ throwError $ RHEProtocolError RPEIncompatibleEncoding
       pure hostInfo
     handleConnectError :: ChatMonad m => RHKey -> SessionSeq -> m a -> m a
-    handleConnectError rhKey sessSeq action = action `catchChatError` \err -> do
+    handleConnectError rhKey sessSeq action =
-      logError $ "startRemoteHost.rcConnectHost crashed: " <> tshow err
+      action `catchChatError` \err -> do
-      cancelRemoteHostSession (Just (sessSeq, RHSRConnectionFailed err)) rhKey
+        logError $ "startRemoteHost.rcConnectHost crashed: " <> tshow err
-      throwError err
+        cancelRemoteHostSession (Just (sessSeq, RHSRConnectionFailed err)) rhKey
+        throwError err
     handleHostError :: ChatMonad m => SessionSeq -> TVar RHKey -> m () -> m ()
-    handleHostError sessSeq rhKeyVar action = action `catchChatError` \err -> do
+    handleHostError sessSeq rhKeyVar action =
-      logError $ "startRemoteHost.waitForHostSession crashed: " <> tshow err
+      action `catchChatError` \err -> do
-      readTVarIO rhKeyVar >>= cancelRemoteHostSession (Just (sessSeq, RHSRCrashed err))
+        logError $ "startRemoteHost.waitForHostSession crashed: " <> tshow err
-    waitForHostSession :: ChatMonad m => Maybe RemoteHostInfo -> RHKey -> SessionSeq -> TVar RHKey -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> m ()
+        readTVarIO rhKeyVar >>= cancelRemoteHostSession (Just (sessSeq, RHSRCrashed err))
-    waitForHostSession remoteHost_ rhKey sseq rhKeyVar vars = do
+    waitForHostSession :: ChatMonad m => Maybe RemoteHostInfo -> RHKey -> SessionSeq -> Maybe RCCtrlAddress -> TVar RHKey -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> m ()
+    waitForHostSession remoteHost_ rhKey sseq rcAddr_ rhKeyVar vars = do
       (sessId, tls, vars') <- timeoutThrow (ChatErrorRemoteHost rhKey RHETimeout) 60000000 $ takeRCStep vars
       let sessionCode = verificationCode sessId
       withRemoteHostSession rhKey sseq $ \case
@@ -190,7 +196,7 @@ startRemoteHost rh_ = do
       withRemoteHostSession rhKey sseq $ \case
         RHSessionPendingConfirmation _ tls' rhs' -> Right ((), RHSessionConfirmed tls' rhs')
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
-      rhi@RemoteHostInfo {remoteHostId, storePath} <- upsertRemoteHost pairing' rh_' hostDeviceName sseq RHSConfirmed {sessionCode}
+      rhi@RemoteHostInfo {remoteHostId, storePath} <- upsertRemoteHost pairing' rh_' rcAddr_ hostDeviceName sseq RHSConfirmed {sessionCode}
       let rhKey' = RHId remoteHostId -- rhKey may be invalid after upserting on RHNew
       when (rhKey' /= rhKey) $ do
         atomically $ writeTVar rhKeyVar rhKey'
@@ -205,17 +211,17 @@ startRemoteHost rh_ = do
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
       chatWriteVar currentRemoteHost $ Just remoteHostId -- this is required for commands to be passed to remote host
       toView $ CRRemoteHostConnected rhi {sessionState = Just RHSConnected {sessionCode}}
-    upsertRemoteHost :: ChatMonad m => RCHostPairing -> Maybe RemoteHostInfo -> Text -> SessionSeq -> RemoteHostSessionState -> m RemoteHostInfo
+    upsertRemoteHost :: ChatMonad m => RCHostPairing -> Maybe RemoteHostInfo -> Maybe RCCtrlAddress -> Text -> SessionSeq -> RemoteHostSessionState -> m RemoteHostInfo
-    upsertRemoteHost pairing'@RCHostPairing {knownHost = kh_} rhi_ hostDeviceName sseq state = do
+    upsertRemoteHost pairing'@RCHostPairing {knownHost = kh_} rhi_ rcAddr_ hostDeviceName sseq state = do
       KnownHostPairing {hostDhPubKey = hostDhPubKey'} <- maybe (throwError . ChatError $ CEInternalError "KnownHost is known after verification") pure kh_
       case rhi_ of
         Nothing -> do
           storePath <- liftIO randomStorePath
-          rh@RemoteHost {remoteHostId} <- withStore $ \db -> insertRemoteHost db hostDeviceName storePath pairing' >>= getRemoteHost db
+          rh@RemoteHost {remoteHostId} <- withStore $ \db -> insertRemoteHost db hostDeviceName storePath rcAddr_ port_ pairing' >>= getRemoteHost db
           setNewRemoteHostId sseq remoteHostId
           pure $ remoteHostInfo rh $ Just state
         Just rhi@RemoteHostInfo {remoteHostId} -> do
-          withStore' $ \db -> updateHostPairing db remoteHostId hostDeviceName hostDhPubKey'
+          withStore' $ \db -> updateHostPairing db remoteHostId hostDeviceName hostDhPubKey' rcAddr_ port_
           pure (rhi :: RemoteHostInfo) {sessionState = Just state}
     onDisconnected :: ChatMonad m => RHKey -> SessionSeq -> m ()
     onDisconnected rhKey sseq = do
@@ -250,14 +256,15 @@ cancelRemoteHostSession :: ChatMonad m => Maybe (SessionSeq, RemoteHostStopReaso
 cancelRemoteHostSession handlerInfo_ rhKey = do
   sessions <- asks remoteHostSessions
   crh <- asks currentRemoteHost
-  deregistered <- atomically $
+  deregistered <-
-    TM.lookup rhKey sessions >>= \case
+    atomically $
-      Nothing -> pure Nothing
+      TM.lookup rhKey sessions >>= \case
-      Just (sessSeq, _) | maybe False (/= sessSeq) (fst <$> handlerInfo_) -> pure Nothing -- ignore cancel from a ghost session handler
+        Nothing -> pure Nothing
-      Just (_, rhs) -> do
+        Just (sessSeq, _) | maybe False (/= sessSeq) (fst <$> handlerInfo_) -> pure Nothing -- ignore cancel from a ghost session handler
-        TM.delete rhKey sessions
+        Just (_, rhs) -> do
-        modifyTVar' crh $ \cur -> if (RHId <$> cur) == Just rhKey then Nothing else cur -- only wipe the closing RH
+          TM.delete rhKey sessions
-        pure $ Just rhs
+          modifyTVar' crh $ \cur -> if (RHId <$> cur) == Just rhKey then Nothing else cur -- only wipe the closing RH
+          pure $ Just rhs
   forM_ deregistered $ \session -> do
     liftIO $ cancelRemoteHost handlingError session `catchAny` (logError . tshow)
     forM_ (snd <$> handlerInfo_) $ \rhStopReason ->
@@ -312,8 +319,8 @@ switchRemoteHost rhId_ = do
   rhi_ <$ chatWriteVar currentRemoteHost rhId_
 
 remoteHostInfo :: RemoteHost -> Maybe RemoteHostSessionState -> RemoteHostInfo
-remoteHostInfo RemoteHost {remoteHostId, storePath, hostDeviceName} sessionState =
+remoteHostInfo RemoteHost {remoteHostId, storePath, hostDeviceName, bindAddress_, bindPort_} sessionState =
-  RemoteHostInfo {remoteHostId, storePath, hostDeviceName, sessionState}
+  RemoteHostInfo {remoteHostId, storePath, hostDeviceName, bindAddress_, bindPort_, sessionState}
 
 deleteRemoteHost :: ChatMonad m => RemoteHostId -> m ()
 deleteRemoteHost rhId = do
@@ -401,9 +408,10 @@ findKnownRemoteCtrl = do
     (RCCtrlPairing {ctrlFingerprint}, inv@(RCVerifiedInvitation RCInvitation {app})) <-
       timeoutThrow (ChatErrorRemoteCtrl RCETimeout) discoveryTimeout . withAgent $ \a -> rcDiscoverCtrl a pairings
     ctrlAppInfo_ <- (Just <$> parseCtrlAppInfo app) `catchChatError` const (pure Nothing)
-    rc <- withStore' (`getRemoteCtrlByFingerprint` ctrlFingerprint) >>= \case
+    rc <-
-      Nothing -> throwChatError $ CEInternalError "connecting with a stored ctrl"
+      withStore' (`getRemoteCtrlByFingerprint` ctrlFingerprint) >>= \case
-      Just rc  -> pure rc
+        Nothing -> throwChatError $ CEInternalError "connecting with a stored ctrl"
+        Just rc -> pure rc
     atomically $ putTMVar foundCtrl (rc, inv)
     let compatible = isJust $ compatibleAppVersion hostAppVersionRange . appVersionRange =<< ctrlAppInfo_
     toView CRRemoteCtrlFound {remoteCtrl = remoteCtrlInfo rc (Just RCSSearching), ctrlAppInfo_, appVersion = currentAppVersion, compatible}
@@ -422,7 +430,7 @@ confirmRemoteCtrl rcId = do
         pure $ Right (sseq, action, foundCtrl)
       _ -> pure . Left $ ChatErrorRemoteCtrl RCEBadState
   uninterruptibleCancel listener
-  (RemoteCtrl{remoteCtrlId = foundRcId}, verifiedInv) <- atomically $ takeTMVar found
+  (RemoteCtrl {remoteCtrlId = foundRcId}, verifiedInv) <- atomically $ takeTMVar found
   unless (rcId == foundRcId) $ throwError $ ChatErrorRemoteCtrl RCEBadController
   connectRemoteCtrl verifiedInv sseq >>= \case
     (Nothing, _) -> throwChatError $ CEInternalError "connecting with a stored ctrl"
@@ -647,10 +655,12 @@ handleCtrlError sseq mkReason name action =
 cancelActiveRemoteCtrl :: ChatMonad m => Maybe (SessionSeq, RemoteCtrlStopReason) -> m ()
 cancelActiveRemoteCtrl handlerInfo_ = handleAny (logError . tshow) $ do
   var <- asks remoteCtrlSession
-  session_ <- atomically $ readTVar var >>= \case
+  session_ <-
-    Nothing -> pure Nothing
+    atomically $
-    Just (oldSeq, _) | maybe False (/= oldSeq) (fst <$> handlerInfo_) -> pure Nothing
+      readTVar var >>= \case
-    Just (_, s) -> Just s <$ writeTVar var Nothing
+        Nothing -> pure Nothing
+        Just (oldSeq, _) | (maybe False ((oldSeq /=) . fst) handlerInfo_) -> pure Nothing
+        Just (_, s) -> Just s <$ writeTVar var Nothing
   forM_ session_ $ \session -> do
     liftIO $ cancelRemoteCtrl handlingError session
     forM_ (snd <$> handlerInfo_) $ \rcStopReason ->

src/Simplex/Chat/Remote/AppVersion.hs

@@ -11,7 +11,7 @@ module Simplex.Chat.Remote.AppVersion
     compatibleAppVersion,
     isAppCompatible,
   )
-  where
+where
 
 import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Aeson as J

src/Simplex/Chat/Remote/Multicast.hsc

@@ -6,10 +6,8 @@ import Network.Socket
 
 #include <HsNet.h>
 
-{- | Toggle multicast group membership.
+-- | Toggle multicast group membership.
-
+-- NB: Group membership is per-host, not per-process. A socket is only used to access system interface for groups.
-NB: Group membership is per-host, not per-process. A socket is only used to access system interface for groups.
--}
 setMembership :: Socket -> HostAddress -> Bool -> IO (Either CInt ())
 setMembership sock group membership = allocaBytes #{size struct ip_mreq} $ \mReqPtr -> do
   #{poke struct ip_mreq, imr_multiaddr} mReqPtr group

src/Simplex/Chat/Remote/Protocol.hs

@@ -6,8 +6,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Simplex.Chat.Remote.Protocol where
 
@@ -41,16 +41,16 @@ import Simplex.FileTransfer.Description (FileDigest (..))
 import Simplex.Messaging.Agent.Client (agentDRG)
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.File (CryptoFile (..))
-import Simplex.Messaging.Crypto.Lazy  (LazyByteString)
+import Simplex.Messaging.Crypto.Lazy (LazyByteString)
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Parsers (dropPrefix, taggedObjectJSON, pattern SingleFieldJSONTag, pattern TaggedObjectJSONData, pattern TaggedObjectJSONTag)
 import Simplex.Messaging.Transport.Buffer (getBuffered)
 import Simplex.Messaging.Transport.HTTP2 (HTTP2Body (..), HTTP2BodyChunk, getBodyChunk)
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client, HTTP2Response (..), closeHTTP2Client, sendRequestDirect)
 import Simplex.Messaging.Util (liftEitherError, liftEitherWith, liftError, tshow)
-import Simplex.RemoteControl.Types (CtrlSessKeys (..), HostSessKeys (..), RCErrorType (..), SessionCode)
 import Simplex.RemoteControl.Client (xrcpBlockSize)
 import qualified Simplex.RemoteControl.Client as RC
+import Simplex.RemoteControl.Types (CtrlSessKeys (..), HostSessKeys (..), RCErrorType (..), SessionCode)
 import System.FilePath (takeFileName, (</>))
 import UnliftIO
 
@@ -64,10 +64,10 @@ data RemoteCommand
 
 data RemoteResponse
   = RRChatResponse {chatResponse :: ChatResponse}
-  | RRChatEvent {chatEvent :: Maybe ChatResponse} -- ^ 'Nothing' on poll timeout
+  | RRChatEvent {chatEvent :: Maybe ChatResponse} -- 'Nothing' on poll timeout
   | RRFileStored {filePath :: String}
   | RRFile {fileSize :: Word32, fileDigest :: FileDigest} -- provides attachment , fileDigest :: FileDigest
-  | RRProtocolError {remoteProcotolError :: RemoteProtocolError} -- ^ The protocol error happened on the server side
+  | RRProtocolError {remoteProcotolError :: RemoteProtocolError} -- The protocol error happened on the server side
   deriving (Show)
 
 -- Force platform-independent encoding as the types aren't UI-visible
@@ -126,7 +126,7 @@ remoteStoreFile c localPath fileName = do
     r -> badResponse r
 
 remoteGetFile :: RemoteHostClient -> FilePath -> RemoteFile -> ExceptT RemoteProtocolError IO ()
-remoteGetFile c@RemoteHostClient{encryption} destDir rf@RemoteFile {fileSource = CryptoFile {filePath}} =
+remoteGetFile c@RemoteHostClient {encryption} destDir rf@RemoteFile {fileSource = CryptoFile {filePath}} =
   sendRemoteCommand c Nothing RCGetFile {file = rf} >>= \case
     (getChunk, RRFile {fileSize, fileDigest}) -> do
       -- TODO we could optimize by checking size and hash before receiving the file

src/Simplex/Chat/Remote/Transport.hs

@@ -5,15 +5,15 @@ module Simplex.Chat.Remote.Transport where
 
 import Control.Monad
 import Control.Monad.Except
-import Data.ByteString.Builder (Builder, byteString)
 import Data.ByteString (ByteString)
+import Data.ByteString.Builder (Builder, byteString)
 import qualified Data.ByteString.Lazy as LB
 import Data.Word (Word32)
-import Simplex.FileTransfer.Description (FileDigest (..))
 import Simplex.Chat.Remote.Types
+import Simplex.FileTransfer.Description (FileDigest (..))
+import Simplex.FileTransfer.Transport (ReceiveFileError (..), receiveSbFile, sendEncFile)
 import qualified Simplex.Messaging.Crypto as C
 import qualified Simplex.Messaging.Crypto.Lazy as LC
-import Simplex.FileTransfer.Transport (ReceiveFileError (..), receiveSbFile, sendEncFile)
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Util (liftEitherError, liftEitherWith)
 import Simplex.RemoteControl.Types (RCErrorType (..))

src/Simplex/Chat/Remote/Types.hs

@@ -18,16 +18,17 @@ import qualified Data.Aeson.TH as J
 import Data.ByteString (ByteString)
 import Data.Int (Int64)
 import Data.Text (Text)
+import Data.Word (Word16)
 import Simplex.Chat.Remote.AppVersion
 import Simplex.Chat.Types (verificationCode)
 import qualified Simplex.Messaging.Crypto as C
+import Simplex.Messaging.Crypto.File (CryptoFile)
 import Simplex.Messaging.Crypto.SNTRUP761 (KEMHybridSecret)
 import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON)
+import Simplex.Messaging.Transport (TLS (..))
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client)
 import Simplex.RemoteControl.Client
 import Simplex.RemoteControl.Types
-import Simplex.Messaging.Crypto.File (CryptoFile)
-import Simplex.Messaging.Transport (TLS (..))
 
 data RemoteHostClient = RemoteHostClient
   { hostEncoding :: PlatformEncoding,
@@ -48,13 +49,13 @@ data RemoteCrypto = RemoteCrypto
 
 data RemoteSignatures
   = RSSign
-    { idPrivKey :: C.PrivateKeyEd25519,
+      { idPrivKey :: C.PrivateKeyEd25519,
-      sessPrivKey :: C.PrivateKeyEd25519
+        sessPrivKey :: C.PrivateKeyEd25519
-    }
+      }
   | RSVerify
-    { idPubKey :: C.PublicKeyEd25519,
+      { idPubKey :: C.PublicKeyEd25519,
-      sessPubKey :: C.PublicKeyEd25519
+        sessPubKey :: C.PublicKeyEd25519
-    }
+      }
 
 type SessionSeq = Int
 
@@ -71,12 +72,12 @@ data RemoteHostSession
   | RHSessionPendingConfirmation {sessionCode :: Text, tls :: TLS, rhPendingSession :: RHPendingSession}
   | RHSessionConfirmed {tls :: TLS, rhPendingSession :: RHPendingSession}
   | RHSessionConnected
-    { rchClient :: RCHostClient,
+      { rchClient :: RCHostClient,
-      tls :: TLS,
+        tls :: TLS,
-      rhClient :: RemoteHostClient,
+        rhClient :: RemoteHostClient,
-      pollAction :: Async (),
+        pollAction :: Async (),
-      storePath :: FilePath
+        storePath :: FilePath
-    }
+      }
 
 data RemoteHostSessionState
   = RHSStarting
@@ -128,6 +129,8 @@ data RemoteHost = RemoteHost
   { remoteHostId :: RemoteHostId,
     hostDeviceName :: Text,
     storePath :: FilePath,
+    bindAddress_ :: Maybe RCCtrlAddress,
+    bindPort_ :: Maybe Word16,
     hostPairing :: RCHostPairing
   }
 
@@ -136,6 +139,8 @@ data RemoteHostInfo = RemoteHostInfo
   { remoteHostId :: RemoteHostId,
     hostDeviceName :: Text,
     storePath :: FilePath,
+    bindAddress_ :: Maybe RCCtrlAddress,
+    bindPort_ :: Maybe Word16,
     sessionState :: Maybe RemoteHostSessionState
   }
   deriving (Show)
@@ -158,6 +163,7 @@ data PlatformEncoding
   deriving (Show, Eq)
 
 localEncoding :: PlatformEncoding
+
 #if defined(darwin_HOST_OS) && defined(swiftJSON)
 localEncoding = PESwift
 #else

src/Simplex/Chat/Store/Connections.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TypeOperators #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Connections
@@ -25,11 +24,11 @@ import Data.Text (Text)
 import Data.Time.Clock (UTCTime (..))
 import Database.SQLite.Simple (Only (..), (:.) (..))
 import Database.SQLite.Simple.QQ (sql)
+import Simplex.Chat.Protocol
 import Simplex.Chat.Store.Files
 import Simplex.Chat.Store.Groups
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Store.Shared
-import Simplex.Chat.Protocol
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Messaging.Agent.Protocol (ConnId)
@@ -157,8 +156,9 @@ getConnectionEntity db user@User {userId, userContactId} agentConnId = do
 
 getConnectionEntityByConnReq :: DB.Connection -> User -> (ConnReqInvitation, ConnReqInvitation) -> IO (Maybe ConnectionEntity)
 getConnectionEntityByConnReq db user@User {userId} (cReqSchema1, cReqSchema2) = do
-  connId_ <- maybeFirstRow fromOnly $
+  connId_ <-
-    DB.query db "SELECT agent_conn_id FROM connections WHERE user_id = ? AND conn_req_inv IN (?,?) LIMIT 1" (userId, cReqSchema1, cReqSchema2)
+    maybeFirstRow fromOnly $
+      DB.query db "SELECT agent_conn_id FROM connections WHERE user_id = ? AND conn_req_inv IN (?,?) LIMIT 1" (userId, cReqSchema1, cReqSchema2)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getConnectionEntity db user) connId_
 
 -- search connection for connection plan:
@@ -167,21 +167,22 @@ getConnectionEntityByConnReq db user@User {userId} (cReqSchema1, cReqSchema2) =
 -- deleted connections are filtered out to allow re-connecting via same contact address
 getContactConnEntityByConnReqHash :: DB.Connection -> User -> (ConnReqUriHash, ConnReqUriHash) -> IO (Maybe ConnectionEntity)
 getContactConnEntityByConnReqHash db user@User {userId} (cReqHash1, cReqHash2) = do
-  connId_ <- maybeFirstRow fromOnly $
+  connId_ <-
-    DB.query
+    maybeFirstRow fromOnly $
-      db
+      DB.query
-      [sql|
+        db
-        SELECT agent_conn_id FROM (
+        [sql|
-          SELECT
+          SELECT agent_conn_id FROM (
-            agent_conn_id,
+            SELECT
-            (CASE WHEN contact_id IS NOT NULL THEN 1 ELSE 0 END) AS conn_ord
+              agent_conn_id,
-          FROM connections
+              (CASE WHEN contact_id IS NOT NULL THEN 1 ELSE 0 END) AS conn_ord
-          WHERE user_id = ? AND via_contact_uri_hash IN (?,?) AND conn_status != ?
+            FROM connections
-          ORDER BY conn_ord DESC, created_at DESC
+            WHERE user_id = ? AND via_contact_uri_hash IN (?,?) AND conn_status != ?
-          LIMIT 1
+            ORDER BY conn_ord DESC, created_at DESC
-        )
+            LIMIT 1
-      |]
+          )
-      (userId, cReqHash1, cReqHash2, ConnDeleted)
+        |]
+        (userId, cReqHash1, cReqHash2, ConnDeleted)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getConnectionEntity db user) connId_
 
 getConnectionsToSubscribe :: DB.Connection -> IO ([ConnId], [ConnectionEntity])

src/Simplex/Chat/Store/Direct.hs

@@ -1,13 +1,12 @@
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Direct
@@ -310,14 +309,14 @@ deleteUnusedProfile_ db userId profileId =
 updateContactProfile :: DB.Connection -> User -> Contact -> Profile -> ExceptT StoreError IO Contact
 updateContactProfile db user@User {userId} c p'
   | displayName == newName = do
-    liftIO $ updateContactProfile_ db userId profileId p'
+      liftIO $ updateContactProfile_ db userId profileId p'
-    pure c {profile, mergedPreferences}
+      pure c {profile, mergedPreferences}
   | otherwise =
-    ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
+      ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
-      currentTs <- getCurrentTime
+        currentTs <- getCurrentTime
-      updateContactProfile_' db userId profileId p' currentTs
+        updateContactProfile_' db userId profileId p' currentTs
-      updateContact_ db userId contactId localDisplayName ldn currentTs
+        updateContact_ db userId contactId localDisplayName ldn currentTs
-      pure $ Right c {localDisplayName = ldn, profile, mergedPreferences}
+        pure $ Right c {localDisplayName = ldn, profile, mergedPreferences}
   where
     Contact {contactId, localDisplayName, profile = LocalProfile {profileId, displayName, localAlias}, userPreferences} = c
     Profile {displayName = newName, preferences} = p'
@@ -784,10 +783,8 @@ updateConnectionStatus :: DB.Connection -> Connection -> ConnStatus -> IO ()
 updateConnectionStatus db Connection {connId} connStatus = do
   currentTs <- getCurrentTime
   if connStatus == ConnReady
-    then
+    then DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ?, conn_req_inv = NULL WHERE connection_id = ?" (connStatus, currentTs, connId)
-      DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ?, conn_req_inv = NULL WHERE connection_id = ?" (connStatus, currentTs, connId)
+    else DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ? WHERE connection_id = ?" (connStatus, currentTs, connId)
-    else
-      DB.execute db "UPDATE connections SET conn_status = ?, updated_at = ? WHERE connection_id = ?" (connStatus, currentTs, connId)
 
 updateContactSettings :: DB.Connection -> User -> Int64 -> ChatSettings -> IO ()
 updateContactSettings db User {userId} contactId ChatSettings {enableNtfs, sendRcpts, favorite} =
@@ -816,4 +813,3 @@ resetContactConnInitiated db User {userId} Connection {connId} = do
       WHERE user_id = ? AND connection_id = ?
     |]
     (updatedAt, userId, connId)
-

src/Simplex/Chat/Store/Files.hs

@@ -109,7 +109,7 @@ import Simplex.Messaging.Protocol (SubscriptionMode (..))
 
 getLiveSndFileTransfers :: DB.Connection -> User -> IO [SndFileTransfer]
 getLiveSndFileTransfers db User {userId} = do
-  cutoffTs <- addUTCTime (- week) <$> getCurrentTime
+  cutoffTs <- addUTCTime (-week) <$> getCurrentTime
   fileIds :: [Int64] <-
     map fromOnly
       <$> DB.query
@@ -132,7 +132,7 @@ getLiveSndFileTransfers db User {userId} = do
 
 getLiveRcvFileTransfers :: DB.Connection -> User -> IO [RcvFileTransfer]
 getLiveRcvFileTransfers db user@User {userId} = do
-  cutoffTs <- addUTCTime (- week) <$> getCurrentTime
+  cutoffTs <- addUTCTime (-week) <$> getCurrentTime
   fileIds :: [Int64] <-
     map fromOnly
       <$> DB.query
@@ -234,11 +234,12 @@ createSndGroupInlineFT db GroupMember {groupMemberId, localDisplayName = n} Conn
 
 updateSndDirectFTDelivery :: DB.Connection -> Contact -> FileTransferMeta -> Int64 -> ExceptT StoreError IO ()
 updateSndDirectFTDelivery _ Contact {localDisplayName, activeConn = Nothing} _ _ = throwError $ SEContactNotReady localDisplayName
-updateSndDirectFTDelivery db Contact {activeConn = Just Connection {connId}} FileTransferMeta {fileId} msgDeliveryId = liftIO $
+updateSndDirectFTDelivery db Contact {activeConn = Just Connection {connId}} FileTransferMeta {fileId} msgDeliveryId =
-  DB.execute
+  liftIO $
-    db
+    DB.execute
-    "UPDATE snd_files SET last_inline_msg_delivery_id = ? WHERE connection_id = ? AND file_id = ? AND file_inline IS NOT NULL"
+      db
-    (msgDeliveryId, connId, fileId)
+      "UPDATE snd_files SET last_inline_msg_delivery_id = ? WHERE connection_id = ? AND file_id = ? AND file_inline IS NOT NULL"
+      (msgDeliveryId, connId, fileId)
 
 updateSndGroupFTDelivery :: DB.Connection -> GroupMember -> Connection -> FileTransferMeta -> Int64 -> IO ()
 updateSndGroupFTDelivery db GroupMember {groupMemberId} Connection {connId} FileTransferMeta {fileId} msgDeliveryId =
@@ -724,7 +725,7 @@ removeFileCryptoArgs db fileId = do
 
 getRcvFilesToReceive :: DB.Connection -> User -> IO [RcvFileTransfer]
 getRcvFilesToReceive db user@User {userId} = do
-  cutoffTs <- addUTCTime (- (2 * nominalDay)) <$> getCurrentTime
+  cutoffTs <- addUTCTime (-(2 * nominalDay)) <$> getCurrentTime
   fileIds :: [Int64] <-
     map fromOnly
       <$> DB.query
@@ -768,20 +769,20 @@ createRcvFileChunk db RcvFileTransfer {fileId, fileInvitation = FileInvitation {
       pure $ case map fromOnly ns of
         []
           | chunkNo == 1 ->
-            if chunkSize >= fileSize
+              if chunkSize >= fileSize
-              then RcvChunkFinal
+                then RcvChunkFinal
-              else RcvChunkOk
+                else RcvChunkOk
           | otherwise -> RcvChunkError
         n : _
           | chunkNo == n -> RcvChunkDuplicate
           | chunkNo == n + 1 ->
-            let prevSize = n * chunkSize
+              let prevSize = n * chunkSize
-             in if prevSize >= fileSize
+               in if prevSize >= fileSize
-                  then RcvChunkError
+                    then RcvChunkError
-                  else
+                    else
-                    if prevSize + chunkSize >= fileSize
+                      if prevSize + chunkSize >= fileSize
-                      then RcvChunkFinal
+                        then RcvChunkFinal
-                      else RcvChunkOk
+                        else RcvChunkOk
           | otherwise -> RcvChunkError
 
 updatedRcvFileChunkStored :: DB.Connection -> RcvFileTransfer -> Integer -> IO ()

src/Simplex/Chat/Store/Groups.hs

@@ -2,14 +2,13 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE OverloadedRecordDot #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Groups
@@ -122,7 +121,7 @@ import Crypto.Random (ChaChaDRG)
 import Data.Either (rights)
 import Data.Int (Int64)
 import Data.List (partition, sortOn)
-import Data.Maybe (fromMaybe, isNothing, catMaybes, isJust)
+import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing)
 import Data.Ord (Down (..))
 import Data.Text (Text)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
@@ -446,39 +445,39 @@ createGroupInvitedViaLink
     void $ createContactMemberInv_ db user groupId (Just hostMemberId) user invitedMember GCUserMember GSMemAccepted IBUnknown customUserProfileId currentTs supportedChatVRange
     liftIO $ setViaGroupLinkHash db groupId connId
     (,) <$> getGroupInfo db user groupId <*> getGroupMemberById db user hostMemberId
-  where
+    where
-    insertGroup_ currentTs = ExceptT $ do
+      insertGroup_ currentTs = ExceptT $ do
-      let GroupProfile {displayName, fullName, description, image, groupPreferences} = groupProfile
+        let GroupProfile {displayName, fullName, description, image, groupPreferences} = groupProfile
-      withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do
+        withLocalDisplayName db userId displayName $ \localDisplayName -> runExceptT $ do
-        liftIO $ do
+          liftIO $ do
-          DB.execute
+            DB.execute
-            db
+              db
-            "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
+              "INSERT INTO group_profiles (display_name, full_name, description, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-            (displayName, fullName, description, image, userId, groupPreferences, currentTs, currentTs)
+              (displayName, fullName, description, image, userId, groupPreferences, currentTs, currentTs)
-          profileId <- insertedRowId db
+            profileId <- insertedRowId db
-          DB.execute
+            DB.execute
-            db
+              db
-            "INSERT INTO groups (group_profile_id, local_display_name, host_conn_custom_user_profile_id, user_id, enable_ntfs, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?,?)"
+              "INSERT INTO groups (group_profile_id, local_display_name, host_conn_custom_user_profile_id, user_id, enable_ntfs, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?,?)"
-            (profileId, localDisplayName, customUserProfileId, userId, True, currentTs, currentTs, currentTs)
+              (profileId, localDisplayName, customUserProfileId, userId, True, currentTs, currentTs, currentTs)
-          insertedRowId db
+            insertedRowId db
-    insertHost_ currentTs groupId = ExceptT $ do
+      insertHost_ currentTs groupId = ExceptT $ do
-      let fromMemberProfile = profileFromName fromMemberName
+        let fromMemberProfile = profileFromName fromMemberName
-      withLocalDisplayName db userId fromMemberName $ \localDisplayName -> runExceptT $ do
+        withLocalDisplayName db userId fromMemberName $ \localDisplayName -> runExceptT $ do
-        (_, profileId) <- createNewMemberProfile_ db user fromMemberProfile currentTs
+          (_, profileId) <- createNewMemberProfile_ db user fromMemberProfile currentTs
-        let MemberIdRole {memberId, memberRole} = fromMember
+          let MemberIdRole {memberId, memberRole} = fromMember
-        liftIO $ do
+          liftIO $ do
-          DB.execute
+            DB.execute
-            db
+              db
-            [sql|
+              [sql|
-              INSERT INTO group_members
+                INSERT INTO group_members
-                ( group_id, member_id, member_role, member_category, member_status, invited_by,
+                  ( group_id, member_id, member_role, member_category, member_status, invited_by,
-                  user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at)
+                    user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at)
-              VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
+                VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
-            |]
+              |]
-            ( (groupId, memberId, memberRole, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown)
+              ( (groupId, memberId, memberRole, GCHostMember, GSMemAccepted, fromInvitedBy userContactId IBUnknown)
-                :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs)
+                  :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, currentTs, currentTs)
-            )
+              )
-          insertedRowId db
+            insertedRowId db
 
 setViaGroupLinkHash :: DB.Connection -> GroupId -> Int64 -> IO ()
 setViaGroupLinkHash db groupId connId =
@@ -814,22 +813,22 @@ createAcceptedMember
       insertMember_ (MemberId memId) createdAt
       groupMemberId <- liftIO $ insertedRowId db
       pure (groupMemberId, MemberId memId)
-  where
+    where
-    JVersionRange (VersionRange minV maxV) = cReqChatVRange
+      JVersionRange (VersionRange minV maxV) = cReqChatVRange
-    insertMember_ memberId createdAt =
+      insertMember_ memberId createdAt =
-      DB.execute
+        DB.execute
-        db
+          db
-        [sql|
+          [sql|
-          INSERT INTO group_members
+            INSERT INTO group_members
-            ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
+              ( group_id, member_id, member_role, member_category, member_status, invited_by, invited_by_group_member_id,
-              user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
+                user_id, local_display_name, contact_id, contact_profile_id, created_at, updated_at,
-              peer_chat_min_version, peer_chat_max_version)
+                peer_chat_min_version, peer_chat_max_version)
-          VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-        |]
+          |]
-        ( (groupId, memberId, memberRole, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership)
+          ( (groupId, memberId, memberRole, GCInviteeMember, GSMemAccepted, fromInvitedBy userContactId IBUser, groupMemberId' membership)
-            :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, createdAt, createdAt)
+              :. (userId, localDisplayName, Nothing :: (Maybe Int64), profileId, createdAt, createdAt)
-            :. (minV, maxV)
+              :. (minV, maxV)
-        )
+          )
 
 createAcceptedMemberConnection :: DB.Connection -> User -> (CommandId, ConnId) -> UserContactRequest -> GroupMemberId -> SubscriptionMode -> IO ()
 createAcceptedMemberConnection
@@ -957,23 +956,24 @@ createNewMember_
           :. (minV, maxV)
       )
     groupMemberId <- insertedRowId db
-    pure GroupMember {
+    pure
-      groupMemberId,
+      GroupMember
-      groupId,
+        { groupMemberId,
-      memberId,
+          groupId,
-      memberRole,
+          memberId,
-      memberCategory,
+          memberRole,
-      memberStatus,
+          memberCategory,
-      memberSettings = defaultMemberSettings,
+          memberStatus,
-      invitedBy,
+          memberSettings = defaultMemberSettings,
-      invitedByGroupMemberId = memInvitedByGroupMemberId,
+          invitedBy,
-      localDisplayName,
+          invitedByGroupMemberId = memInvitedByGroupMemberId,
-      memberProfile = toLocalProfile memberContactProfileId memberProfile "",
+          localDisplayName,
-      memberContactId,
+          memberProfile = toLocalProfile memberContactProfileId memberProfile "",
-      memberContactProfileId,
+          memberContactId,
-      activeConn,
+          memberContactProfileId,
-      memberChatVRange = JVersionRange mcvr
+          activeConn,
-    }
+          memberChatVRange = JVersionRange mcvr
+        }
 
 checkGroupMemberHasItems :: DB.Connection -> User -> GroupMember -> IO (Maybe ChatItemId)
 checkGroupMemberHasItems db User {userId} GroupMember {groupMemberId, groupId} =
@@ -1104,41 +1104,41 @@ getForwardIntroducedMembers :: DB.Connection -> User -> GroupMember -> Bool -> I
 getForwardIntroducedMembers db user invitee highlyAvailable = do
   memberIds <- map fromOnly <$> query
   filter memberCurrent . rights <$> mapM (runExceptT . getGroupMemberById db user) memberIds
- where
+  where
-  mId = groupMemberId' invitee
+    mId = groupMemberId' invitee
-  query
+    query
-    | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected)
+      | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected)
-    | otherwise =
+      | otherwise =
-        DB.query
+          DB.query
-          db
+            db
-          (q <> " AND intro_chat_protocol_version >= ?")
+            (q <> " AND intro_chat_protocol_version >= ?")
-          (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, minVersion groupForwardVRange)
+            (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, minVersion groupForwardVRange)
-  q =
+    q =
-    [sql|
+      [sql|
-      SELECT re_group_member_id
+        SELECT re_group_member_id
-      FROM group_member_intros
+        FROM group_member_intros
-      WHERE to_group_member_id = ? AND intro_status NOT IN (?,?,?)
+        WHERE to_group_member_id = ? AND intro_status NOT IN (?,?,?)
-    |]
+      |]
 
 getForwardInvitedMembers :: DB.Connection -> User -> GroupMember -> Bool -> IO [GroupMember]
 getForwardInvitedMembers db user forwardMember highlyAvailable = do
   memberIds <- map fromOnly <$> query
   filter memberCurrent . rights <$> mapM (runExceptT . getGroupMemberById db user) memberIds
- where
+  where
-  mId = groupMemberId' forwardMember
+    mId = groupMemberId' forwardMember
-  query
+    query
-    | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected)
+      | highlyAvailable = DB.query db q (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected)
-    | otherwise =
+      | otherwise =
-        DB.query
+          DB.query
-          db
+            db
-          (q <> " AND intro_chat_protocol_version >= ?")
+            (q <> " AND intro_chat_protocol_version >= ?")
-          (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, minVersion groupForwardVRange)
+            (mId, GMIntroReConnected, GMIntroToConnected, GMIntroConnected, minVersion groupForwardVRange)
-  q =
+    q =
-    [sql|
+      [sql|
-      SELECT to_group_member_id
+        SELECT to_group_member_id
-      FROM group_member_intros
+        FROM group_member_intros
-      WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?)
+        WHERE re_group_member_id = ? AND intro_status NOT IN (?,?,?)
-    |]
+      |]
 
 createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> MemberInfo -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> ExceptT StoreError IO GroupMember
 createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupMember {memberContactId, activeConn} memInfo@(MemberInfo _ _ memChatVRange memberProfile) (groupCmdId, groupAgentConnId) directConnIds customUserProfileId subMode = do
@@ -1263,15 +1263,15 @@ getViaGroupContact db user@User {userId} GroupMember {groupMemberId} = do
 updateGroupProfile :: DB.Connection -> User -> GroupInfo -> GroupProfile -> ExceptT StoreError IO GroupInfo
 updateGroupProfile db User {userId} g@GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName}} p'@GroupProfile {displayName = newName, fullName, description, image, groupPreferences}
   | displayName == newName = liftIO $ do
-    currentTs <- getCurrentTime
-    updateGroupProfile_ currentTs
-    pure (g :: GroupInfo) {groupProfile = p', fullGroupPreferences}
-  | otherwise =
-    ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
       currentTs <- getCurrentTime
       updateGroupProfile_ currentTs
-      updateGroup_ ldn currentTs
+      pure (g :: GroupInfo) {groupProfile = p', fullGroupPreferences}
-      pure $ Right (g :: GroupInfo) {localDisplayName = ldn, groupProfile = p', fullGroupPreferences}
+  | otherwise =
+      ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
+        currentTs <- getCurrentTime
+        updateGroupProfile_ currentTs
+        updateGroup_ ldn currentTs
+        pure $ Right (g :: GroupInfo) {localDisplayName = ldn, groupProfile = p', fullGroupPreferences}
   where
     fullGroupPreferences = mergeGroupPreferences groupPreferences
     updateGroupProfile_ currentTs =
@@ -1317,31 +1317,33 @@ getGroupInfo db User {userId, userContactId} groupId =
 
 getGroupInfoByUserContactLinkConnReq :: DB.Connection -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe GroupInfo)
 getGroupInfoByUserContactLinkConnReq db user@User {userId} (cReqSchema1, cReqSchema2) = do
-  groupId_ <- maybeFirstRow fromOnly $
+  groupId_ <-
-    DB.query
+    maybeFirstRow fromOnly $
-      db
+      DB.query
-      [sql|
+        db
-        SELECT group_id
+        [sql|
-        FROM user_contact_links
+          SELECT group_id
-        WHERE user_id = ? AND conn_req_contact IN (?,?)
+          FROM user_contact_links
-      |]
+          WHERE user_id = ? AND conn_req_contact IN (?,?)
-      (userId, cReqSchema1, cReqSchema2)
+        |]
+        (userId, cReqSchema1, cReqSchema2)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getGroupInfo db user) groupId_
 
 getGroupInfoByGroupLinkHash :: DB.Connection -> User -> (ConnReqUriHash, ConnReqUriHash) -> IO (Maybe GroupInfo)
 getGroupInfoByGroupLinkHash db user@User {userId, userContactId} (groupLinkHash1, groupLinkHash2) = do
-  groupId_ <- maybeFirstRow fromOnly $
+  groupId_ <-
-    DB.query
+    maybeFirstRow fromOnly $
-      db
+      DB.query
-      [sql|
+        db
-        SELECT g.group_id
+        [sql|
-        FROM groups g
+          SELECT g.group_id
-        JOIN group_members mu ON mu.group_id = g.group_id
+          FROM groups g
-        WHERE g.user_id = ? AND g.via_group_link_uri_hash IN (?,?)
+          JOIN group_members mu ON mu.group_id = g.group_id
-          AND mu.contact_id = ? AND mu.member_status NOT IN (?,?,?)
+          WHERE g.user_id = ? AND g.via_group_link_uri_hash IN (?,?)
-        LIMIT 1
+            AND mu.contact_id = ? AND mu.member_status NOT IN (?,?,?)
-      |]
+          LIMIT 1
-      (userId, groupLinkHash1, groupLinkHash2, userContactId, GSMemRemoved, GSMemLeft, GSMemGroupDeleted)
+        |]
+        (userId, groupLinkHash1, groupLinkHash2, userContactId, GSMemRemoved, GSMemLeft, GSMemGroupDeleted)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getGroupInfo db user) groupId_
 
 getGroupIdByName :: DB.Connection -> User -> GroupName -> ExceptT StoreError IO GroupId
@@ -1935,18 +1937,18 @@ createMemberContactConn_
 updateMemberProfile :: DB.Connection -> User -> GroupMember -> Profile -> ExceptT StoreError IO GroupMember
 updateMemberProfile db User {userId} m p'
   | displayName == newName = do
-    liftIO $ updateContactProfile_ db userId profileId p'
+      liftIO $ updateContactProfile_ db userId profileId p'
-    pure m {memberProfile = profile}
+      pure m {memberProfile = profile}
   | otherwise =
-    ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
+      ExceptT . withLocalDisplayName db userId newName $ \ldn -> do
-      currentTs <- getCurrentTime
+        currentTs <- getCurrentTime
-      updateContactProfile_' db userId profileId p' currentTs
+        updateContactProfile_' db userId profileId p' currentTs
-      DB.execute
+        DB.execute
-        db
+          db
-        "UPDATE group_members SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND group_member_id = ?"
+          "UPDATE group_members SET local_display_name = ?, updated_at = ? WHERE user_id = ? AND group_member_id = ?"
-        (ldn, currentTs, userId, groupMemberId)
+          (ldn, currentTs, userId, groupMemberId)
-      DB.execute db "DELETE FROM display_names WHERE local_display_name = ? AND user_id = ?" (localDisplayName, userId)
+        DB.execute db "DELETE FROM display_names WHERE local_display_name = ? AND user_id = ?" (localDisplayName, userId)
-      pure $ Right m {localDisplayName = ldn, memberProfile = profile}
+        pure $ Right m {localDisplayName = ldn, memberProfile = profile}
   where
     GroupMember {groupMemberId, localDisplayName, memberProfile = LocalProfile {profileId, displayName, localAlias}} = m
     Profile {displayName = newName} = p'

src/Simplex/Chat/Store/Messages.hs

@@ -10,7 +10,6 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Messages
@@ -199,40 +198,41 @@ createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMs
     createMsgDeliveryEvent_ db msgDeliveryId MDSRcvAgent currentTs
   pure msg
 
-createNewRcvMessage :: forall e. (MsgEncodingI e) => DB.Connection -> ConnOrGroupId -> NewMessage e -> Maybe SharedMsgId -> Maybe GroupMemberId -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
+createNewRcvMessage :: forall e. MsgEncodingI e => DB.Connection -> ConnOrGroupId -> NewMessage e -> Maybe SharedMsgId -> Maybe GroupMemberId -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
-createNewRcvMessage db connOrGroupId NewMessage{chatMsgEvent, msgBody} sharedMsgId_ authorMember forwardedByMember =
+createNewRcvMessage db connOrGroupId NewMessage {chatMsgEvent, msgBody} sharedMsgId_ authorMember forwardedByMember =
   case connOrGroupId of
     ConnectionId connId -> liftIO $ insertRcvMsg (Just connId) Nothing
     GroupId groupId -> case sharedMsgId_ of
-      Just sharedMsgId -> liftIO (duplicateGroupMsgMemberIds groupId sharedMsgId) >>= \case
+      Just sharedMsgId ->
-        Just (duplAuthorId, duplFwdMemberId) ->
+        liftIO (duplicateGroupMsgMemberIds groupId sharedMsgId) >>= \case
-          throwError $ SEDuplicateGroupMessage groupId sharedMsgId duplAuthorId duplFwdMemberId
+          Just (duplAuthorId, duplFwdMemberId) ->
-        Nothing -> liftIO $ insertRcvMsg Nothing $ Just groupId
+            throwError $ SEDuplicateGroupMessage groupId sharedMsgId duplAuthorId duplFwdMemberId
+          Nothing -> liftIO $ insertRcvMsg Nothing $ Just groupId
       Nothing -> liftIO $ insertRcvMsg Nothing $ Just groupId
- where
+  where
-  duplicateGroupMsgMemberIds :: Int64 -> SharedMsgId -> IO (Maybe (Maybe GroupMemberId, Maybe GroupMemberId))
+    duplicateGroupMsgMemberIds :: Int64 -> SharedMsgId -> IO (Maybe (Maybe GroupMemberId, Maybe GroupMemberId))
-  duplicateGroupMsgMemberIds groupId sharedMsgId =
+    duplicateGroupMsgMemberIds groupId sharedMsgId =
-    maybeFirstRow id
+      maybeFirstRow id $
-      $ DB.query
+        DB.query
+          db
+          [sql|
+            SELECT author_group_member_id, forwarded_by_group_member_id
+            FROM messages
+            WHERE group_id = ? AND shared_msg_id = ? LIMIT 1
+          |]
+          (groupId, sharedMsgId)
+    insertRcvMsg connId_ groupId_ = do
+      currentTs <- getCurrentTime
+      DB.execute
         db
         [sql|
-          SELECT author_group_member_id, forwarded_by_group_member_id
+          INSERT INTO messages
-          FROM messages
+            (msg_sent, chat_msg_event, msg_body, created_at, updated_at, connection_id, group_id, shared_msg_id, author_group_member_id, forwarded_by_group_member_id)
-          WHERE group_id = ? AND shared_msg_id = ? LIMIT 1
+          VALUES (?,?,?,?,?,?,?,?,?,?)
         |]
-        (groupId, sharedMsgId)
+        (MDRcv, toCMEventTag chatMsgEvent, msgBody, currentTs, currentTs, connId_, groupId_, sharedMsgId_, authorMember, forwardedByMember)
-  insertRcvMsg connId_ groupId_ = do
+      msgId <- insertedRowId db
-    currentTs <- getCurrentTime
+      pure RcvMessage {msgId, chatMsgEvent = ACME (encoding @e) chatMsgEvent, sharedMsgId_, msgBody, authorMember, forwardedByMember}
-    DB.execute
-      db
-      [sql|
-        INSERT INTO messages
-          (msg_sent, chat_msg_event, msg_body, created_at, updated_at, connection_id, group_id, shared_msg_id, author_group_member_id, forwarded_by_group_member_id)
-        VALUES (?,?,?,?,?,?,?,?,?,?)
-      |]
-      (MDRcv, toCMEventTag chatMsgEvent, msgBody, currentTs, currentTs, connId_, groupId_, sharedMsgId_, authorMember, forwardedByMember)
-    msgId <- insertedRowId db
-    pure RcvMessage{msgId, chatMsgEvent = ACME (encoding @e) chatMsgEvent, sharedMsgId_, msgBody, authorMember, forwardedByMember}
 
 createSndMsgDeliveryEvent :: DB.Connection -> Int64 -> AgentMsgId -> MsgDeliveryStatus 'MDSnd -> ExceptT StoreError IO ()
 createSndMsgDeliveryEvent db connId agentMsgId sndMsgDeliveryStatus = do
@@ -528,12 +528,12 @@ getDirectChatPreviews_ db user@User {userId} = do
         JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
         LEFT JOIN connections c ON c.contact_id = ct.contact_id
         LEFT JOIN (
-          SELECT contact_id, MAX(chat_item_id) AS MaxId
+          SELECT contact_id, chat_item_id, MAX(created_at)
           FROM chat_items
           GROUP BY contact_id
-        ) MaxIds ON MaxIds.contact_id = ct.contact_id
+        ) LastItems ON LastItems.contact_id = ct.contact_id
-        LEFT JOIN chat_items i ON i.contact_id = MaxIds.contact_id
+        LEFT JOIN chat_items i ON i.contact_id = LastItems.contact_id
-                               AND i.chat_item_id = MaxIds.MaxId
+                               AND i.chat_item_id = LastItems.chat_item_id
         LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
         LEFT JOIN (
           SELECT contact_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
@@ -615,12 +615,12 @@ getGroupChatPreviews_ db User {userId, userContactId} = do
         JOIN group_members mu ON mu.group_id = g.group_id
         JOIN contact_profiles pu ON pu.contact_profile_id = COALESCE(mu.member_profile_id, mu.contact_profile_id)
         LEFT JOIN (
-          SELECT group_id, MAX(chat_item_id) AS MaxId
+          SELECT group_id, chat_item_id, MAX(item_ts)
           FROM chat_items
           GROUP BY group_id
-        ) MaxIds ON MaxIds.group_id = g.group_id
+        ) LastItems ON LastItems.group_id = g.group_id
-        LEFT JOIN chat_items i ON i.group_id = MaxIds.group_id
+        LEFT JOIN chat_items i ON i.group_id = LastItems.group_id
-                               AND i.chat_item_id = MaxIds.MaxId
+                               AND i.chat_item_id = LastItems.chat_item_id
         LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
         LEFT JOIN (
           SELECT group_id, COUNT(1) AS UnreadCount, MIN(chat_item_id) AS MinUnread
@@ -724,7 +724,7 @@ getDirectChatItemsLast db User {userId} contactId count search = ExceptT $ do
         LEFT JOIN files f ON f.chat_item_id = i.chat_item_id
         LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
         WHERE i.user_id = ? AND i.contact_id = ? AND i.item_text LIKE '%' || ? || '%'
-        ORDER BY i.chat_item_id DESC
+        ORDER BY i.created_at DESC, i.chat_item_id DESC
         LIMIT ?
       |]
       (userId, contactId, search, count)
@@ -754,7 +754,7 @@ getDirectChatAfter_ db User {userId} ct@Contact {contactId} afterChatItemId coun
             LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
             WHERE i.user_id = ? AND i.contact_id = ? AND i.item_text LIKE '%' || ? || '%'
               AND i.chat_item_id > ?
-            ORDER BY i.chat_item_id ASC
+            ORDER BY i.created_at ASC, i.chat_item_id ASC
             LIMIT ?
           |]
           (userId, contactId, search, afterChatItemId, count)
@@ -784,7 +784,7 @@ getDirectChatBefore_ db User {userId} ct@Contact {contactId} beforeChatItemId co
             LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
             WHERE i.user_id = ? AND i.contact_id = ? AND i.item_text LIKE '%' || ? || '%'
               AND i.chat_item_id < ?
-            ORDER BY i.chat_item_id DESC
+            ORDER BY i.created_at DESC, i.chat_item_id DESC
             LIMIT ?
           |]
           (userId, contactId, search, beforeChatItemId, count)
@@ -1802,22 +1802,22 @@ getDirectReactions db ct itemSharedMId sent =
 setDirectReaction :: DB.Connection -> Contact -> SharedMsgId -> Bool -> MsgReaction -> Bool -> MessageId -> UTCTime -> IO ()
 setDirectReaction db ct itemSharedMId sent reaction add msgId reactionTs
   | add =
-    DB.execute
+      DB.execute
-      db
+        db
-      [sql|
+        [sql|
-        INSERT INTO chat_item_reactions
+          INSERT INTO chat_item_reactions
-          (contact_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
+            (contact_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
-          VALUES (?,?,?,?,?,?)
+            VALUES (?,?,?,?,?,?)
-      |]
+        |]
-      (contactId' ct, itemSharedMId, sent, reaction, msgId, reactionTs)
+        (contactId' ct, itemSharedMId, sent, reaction, msgId, reactionTs)
   | otherwise =
-    DB.execute
+      DB.execute
-      db
+        db
-      [sql|
+        [sql|
-        DELETE FROM chat_item_reactions
+          DELETE FROM chat_item_reactions
-        WHERE contact_id = ? AND shared_msg_id = ? AND reaction_sent = ? AND reaction = ?
+          WHERE contact_id = ? AND shared_msg_id = ? AND reaction_sent = ? AND reaction = ?
-      |]
+        |]
-      (contactId' ct, itemSharedMId, sent, reaction)
+        (contactId' ct, itemSharedMId, sent, reaction)
 
 getGroupReactions :: DB.Connection -> GroupInfo -> GroupMember -> MemberId -> SharedMsgId -> Bool -> IO [MsgReaction]
 getGroupReactions db GroupInfo {groupId} m itemMemberId itemSharedMId sent =
@@ -1834,22 +1834,22 @@ getGroupReactions db GroupInfo {groupId} m itemMemberId itemSharedMId sent =
 setGroupReaction :: DB.Connection -> GroupInfo -> GroupMember -> MemberId -> SharedMsgId -> Bool -> MsgReaction -> Bool -> MessageId -> UTCTime -> IO ()
 setGroupReaction db GroupInfo {groupId} m itemMemberId itemSharedMId sent reaction add msgId reactionTs
   | add =
-    DB.execute
+      DB.execute
-      db
+        db
-      [sql|
+        [sql|
-        INSERT INTO chat_item_reactions
+          INSERT INTO chat_item_reactions
-          (group_id, group_member_id, item_member_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
+            (group_id, group_member_id, item_member_id, shared_msg_id, reaction_sent, reaction, created_by_msg_id, reaction_ts)
-          VALUES (?,?,?,?,?,?,?,?)
+            VALUES (?,?,?,?,?,?,?,?)
-      |]
+        |]
-      (groupId, groupMemberId' m, itemMemberId, itemSharedMId, sent, reaction, msgId, reactionTs)
+        (groupId, groupMemberId' m, itemMemberId, itemSharedMId, sent, reaction, msgId, reactionTs)
   | otherwise =
-    DB.execute
+      DB.execute
-      db
+        db
-      [sql|
+        [sql|
-        DELETE FROM chat_item_reactions
+          DELETE FROM chat_item_reactions
-        WHERE group_id = ? AND group_member_id = ? AND shared_msg_id = ? AND item_member_id = ? AND reaction_sent = ? AND reaction = ?
+          WHERE group_id = ? AND group_member_id = ? AND shared_msg_id = ? AND item_member_id = ? AND reaction_sent = ? AND reaction = ?
-      |]
+        |]
-      (groupId, groupMemberId' m, itemSharedMId, itemMemberId, sent, reaction)
+        (groupId, groupMemberId' m, itemSharedMId, itemMemberId, sent, reaction)
 
 getTimedItems :: DB.Connection -> User -> UTCTime -> IO [((ChatRef, ChatItemId), UTCTime)]
 getTimedItems db User {userId} startTimedThreadCutoff =

src/Simplex/Chat/Store/Migrations.hs

@@ -90,6 +90,7 @@ import Simplex.Chat.Migrations.M20231030_xgrplinkmem_received
 import Simplex.Chat.Migrations.M20231107_indexes
 import Simplex.Chat.Migrations.M20231113_group_forward
 import Simplex.Chat.Migrations.M20231114_remote_control
+import Simplex.Chat.Migrations.M20231126_remote_ctrl_address
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -179,7 +180,8 @@ schemaMigrations =
     ("20231030_xgrplinkmem_received", m20231030_xgrplinkmem_received, Just down_m20231030_xgrplinkmem_received),
     ("20231107_indexes", m20231107_indexes, Just down_m20231107_indexes),
     ("20231113_group_forward", m20231113_group_forward, Just down_m20231113_group_forward),
-    ("20231114_remote_control", m20231114_remote_control, Just down_m20231114_remote_control)
+    ("20231114_remote_control", m20231114_remote_control, Just down_m20231114_remote_control),
+    ("20231126_remote_ctrl_address", m20231126_remote_ctrl_address, Just down_m20231126_remote_ctrl_address)
   ]
 
 -- | The list of migrations in ascending order by date

src/Simplex/Chat/Store/Profiles.hs

@@ -8,7 +8,6 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
-
 {-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Profiles
@@ -66,9 +65,9 @@ import Control.Monad.IO.Class
 import qualified Data.Aeson.TH as J
 import Data.Functor (($>))
 import Data.Int (Int64)
+import Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as L
 import Data.Maybe (fromMaybe)
-import Data.List.NonEmpty (NonEmpty)
 import Data.Text (Text)
 import Data.Text.Encoding (decodeLatin1, encodeUtf8)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
@@ -89,7 +88,7 @@ import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (defaultJSON)
 import Simplex.Messaging.Protocol (BasicAuth (..), ProtoServerWithAuth (..), ProtocolServer (..), ProtocolTypeI (..), SubscriptionMode)
 import Simplex.Messaging.Transport.Client (TransportHost)
-import Simplex.Messaging.Util (safeDecodeUtf8, eitherToMaybe)
+import Simplex.Messaging.Util (eitherToMaybe, safeDecodeUtf8)
 
 createUserRecord :: DB.Connection -> AgentUserId -> Profile -> Bool -> ExceptT StoreError IO User
 createUserRecord db auId p activeUser = createUserRecordAt db auId p activeUser =<< liftIO getCurrentTime
@@ -248,19 +247,19 @@ updateUserGroupReceipts db User {userId} UserMsgReceiptSettings {enable, clearOv
 updateUserProfile :: DB.Connection -> User -> Profile -> ExceptT StoreError IO User
 updateUserProfile db user p'
   | displayName == newName = do
-    liftIO $ updateContactProfile_ db userId profileId p'
+      liftIO $ updateContactProfile_ db userId profileId p'
-    pure user {profile, fullPreferences}
+      pure user {profile, fullPreferences}
   | otherwise =
-    checkConstraint SEDuplicateName . liftIO $ do
+      checkConstraint SEDuplicateName . liftIO $ do
-      currentTs <- getCurrentTime
+        currentTs <- getCurrentTime
-      DB.execute db "UPDATE users SET local_display_name = ?, updated_at = ? WHERE user_id = ?" (newName, currentTs, userId)
+        DB.execute db "UPDATE users SET local_display_name = ?, updated_at = ? WHERE user_id = ?" (newName, currentTs, userId)
-      DB.execute
+        DB.execute
-        db
+          db
-        "INSERT INTO display_names (local_display_name, ldn_base, user_id, created_at, updated_at) VALUES (?,?,?,?,?)"
+          "INSERT INTO display_names (local_display_name, ldn_base, user_id, created_at, updated_at) VALUES (?,?,?,?,?)"
-        (newName, newName, userId, currentTs, currentTs)
+          (newName, newName, userId, currentTs, currentTs)
-      updateContactProfile_' db userId profileId p' currentTs
+        updateContactProfile_' db userId profileId p' currentTs
-      updateContact_ db userId userContactId localDisplayName newName currentTs
+        updateContact_ db userId userContactId localDisplayName newName currentTs
-      pure user {localDisplayName = newName, profile, fullPreferences}
+        pure user {localDisplayName = newName, profile, fullPreferences}
   where
     User {userId, userContactId, localDisplayName, profile = LocalProfile {profileId, displayName, localAlias}} = user
     Profile {displayName = newName, preferences} = p'
@@ -457,17 +456,18 @@ getUserContactLinkByConnReq db User {userId} (cReqSchema1, cReqSchema2) =
 
 getContactWithoutConnViaAddress :: DB.Connection -> User -> (ConnReqContact, ConnReqContact) -> IO (Maybe Contact)
 getContactWithoutConnViaAddress db user@User {userId} (cReqSchema1, cReqSchema2) = do
-  ctId_ <- maybeFirstRow fromOnly $
+  ctId_ <-
-    DB.query
+    maybeFirstRow fromOnly $
-      db
+      DB.query
-      [sql|
+        db
-        SELECT ct.contact_id
+        [sql|
-        FROM contacts ct
+          SELECT ct.contact_id
-        JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
+          FROM contacts ct
-        LEFT JOIN connections c ON c.contact_id = ct.contact_id
+          JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
-        WHERE cp.user_id = ? AND cp.contact_link IN (?,?) AND c.connection_id IS NULL
+          LEFT JOIN connections c ON c.contact_id = ct.contact_id
-      |]
+          WHERE cp.user_id = ? AND cp.contact_link IN (?,?) AND c.connection_id IS NULL
-      (userId, cReqSchema1, cReqSchema2)
+        |]
+        (userId, cReqSchema1, cReqSchema2)
   maybe (pure Nothing) (fmap eitherToMaybe . runExceptT . getContact db user) ctId_
 
 updateUserAddressAutoAccept :: DB.Connection -> User -> Maybe AutoAccept -> ExceptT StoreError IO UserContactLink