Merge branch 'master-ghc8107' into master-android

.github/workflows/build.yml

@@ -79,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: "9.6.2"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -188,7 +188,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -259,15 +259,15 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: bash
+        shell: cmd
         run: |
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)
@@ -293,37 +293,4 @@ jobs:
           body: |
             ${{ steps.windows_build.outputs.bin_hash }}
 
-      - name: Windows build desktop
-        id: windows_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        env:
-          SIMPLEX_CI_REPO_URL: ${{ secrets.SIMPLEX_CI_REPO_URL }}
-        shell: bash
-        run: |
-          scripts/desktop/build-lib-windows.sh
-          cd apps/multiplatform
-          ./gradlew packageMsi
-          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-      
-      - name: Windows upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Windows update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_desktop_build.outputs.package_hash }}
-
       # Windows /

.github/workflows/web.yml

@@ -9,7 +9,6 @@ on:
       - website/**
       - images/**
       - blog/**
-      - docs/**
       - .github/workflows/web.yml
 
 jobs:

Dockerfile

@@ -8,12 +8,12 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
     chmod +x /usr/bin/ghcup
 
 # Install ghc
-RUN ghcup install ghc 9.6.2
+RUN ghcup install ghc 8.10.7
 # Install cabal
-RUN ghcup install cabal 3.10.1.0
+RUN ghcup install cabal
 # Set both as default
-RUN ghcup set ghc 9.6.2 && \
-    ghcup set cabal 3.10.1.0
+RUN ghcup set ghc 8.10.7 && \
+    ghcup set cabal
 
 COPY . /project
 WORKDIR /project

apps/ios/Shared/ContentView.swift

@@ -31,11 +31,11 @@ struct ContentView: View {
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
     private enum ChatListActionSheet: Identifiable {
-        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
+        case connectViaUrl(action: ConnReqType, link: String)
 
         var id: String {
             switch self {
-            case let .planAndConnectSheet(sheet): return sheet.id
+            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
             }
         }
     }
@@ -93,7 +93,7 @@ struct ContentView: View {
                 mainView()
                 .actionSheet(item: $chatListActionSheet) { sheet in
                     switch sheet {
-                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
                     }
                 }
             } else {
@@ -290,16 +290,12 @@ struct ContentView: View {
             if let url = m.appOpenUrl {
                 m.appOpenUrl = nil
                 var path = url.path
+                logger.debug("ContentView.connectViaUrl path: \(path)")
                 if (path == "/contact" || path == "/invitation") {
                     path.removeFirst()
+                    let action: ConnReqType = path == "contact" ? .contact : .invitation
                     let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                    planAndConnect(
-                        link,
-                        showAlert: showPlanAndConnectAlert,
-                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
-                        dismiss: false,
-                        incognito: nil
-                    )
+                    chatListActionSheet = .connectViaUrl(action: action, link: link)
                 } else {
                     AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
                 }
@@ -307,8 +303,20 @@ struct ContentView: View {
         }
     }
 
-    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
-        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
+        let title: LocalizedStringKey
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
+        )
     }
 }
 

apps/ios/Shared/Model/ChatModel.swift

@@ -62,7 +62,6 @@ final class ChatModel: ObservableObject {
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
     @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
@@ -153,16 +152,6 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func getGroupChat(_ groupId: Int64) -> Chat? {
-        chats.first { chat in
-            if case let .group(groupInfo) = chat.chatInfo {
-                return groupInfo.groupId == groupId
-            } else {
-                return false
-            }
-        }
-    }
-
     private func getChatIndex(_ id: String) -> Int? {
         chats.firstIndex(where: { $0.id == id })
     }
@@ -307,11 +296,7 @@ final class ChatModel: ObservableObject {
             return false
         } else {
             withAnimation(itemAnimation()) {
-                var ci = cItem
-                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                    ci.meta.itemStatus = status
-                }
-                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -324,19 +309,23 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
             withAnimation {
                 _updateChatItem(at: i, with: cItem)
             }
-        } else if let status = status {
-            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
+        let ci = reversedChatItems[i]
         reversedChatItems[i] = cItem
         reversedChatItems[i].viewTimestamp = .now
+        // on some occasions the confirmation of message being accepted by the server (tick)
+        // arrives earlier than the response from API, and item remains without tick
+        if case .sndNew = cItem.meta.itemStatus {
+            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
+        }
     }
 
     private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
@@ -475,7 +464,6 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             reversedChatItems = []
         }
     }
@@ -700,3 +688,41 @@ final class Chat: ObservableObject, Identifiable {
 
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
+
+enum NetworkStatus: Decodable, Equatable {
+    case unknown
+    case connected
+    case disconnected
+    case error(String)
+
+    var statusString: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "connected"
+            case .error: return "error"
+            default: return "connecting"
+            }
+        }
+    }
+
+    var statusExplanation: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "You are connected to the server used to receive messages from this contact."
+            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+            default: return "Trying to connect to the server used to receive messages from this contact."
+            }
+        }
+    }
+
+    var imageName: String {
+        get {
+            switch self {
+            case .unknown: return "circle.dotted"
+            case .connected: return "circle.fill"
+            case .disconnected: return "ellipsis.circle.fill"
+            case .error: return "exclamationmark.circle.fill"
+            }
+        }
+    }
+}

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -257,12 +257,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
-func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = chatSendCmdSync(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
     try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -312,7 +306,6 @@ func loadChat(chat: Chat, search: String = "") {
     do {
         let cInfo = chat.chatInfo
         let m = ChatModel.shared
-        m.chatItemStatuses = [:]
         m.reversedChatItems = []
         let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
         m.updateChatInfo(chat.chatInfo)
@@ -593,14 +586,6 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
     throw r
 }
 
-func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
-    let userId = try currentUserId("apiConnectPlan")
-    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
-    if case let .connectionPlan(_, connectionPlan) = r { return connectionPlan }
-    logger.error("apiConnectPlan error: \(responseError(r))")
-    throw r
-}
-
 func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
     let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
@@ -625,7 +610,10 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
-        let alert = contactAlreadyExistsAlert(contact)
+        let alert = mkAlert(
+            title: "Contact already exists",
+            message: "You are already connected to \(contact.displayName)."
+        )
         return (nil, alert)
     case .chatCmdError(_, .error(.invalidConnReq)):
         let alert = mkAlert(
@@ -653,13 +641,6 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
     return (nil, alert)
 }
 
-func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connected to \(contact.displayName)."
-    )
-}
-
 private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     if let networkErrorAlert = networkErrorAlert(r) {
         return networkErrorAlert
@@ -671,18 +652,18 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     }
 }
 
-func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
+func apiDeleteChat(type: ChatType, id: Int64) async throws {
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
     throw r
 }
 
-func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
+func deleteChat(_ chat: Chat) async {
     do {
         let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId)
         DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
     } catch let error {
         logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -963,12 +944,6 @@ func apiCallStatus(_ contact: Contact, _ status: String) async throws {
     }
 }
 
-func apiGetNetworkStatuses() throws -> [ConnNetworkStatus] {
-    let r = chatSendCmdSync(.apiGetNetworkStatuses)
-    if case let .networkStatuses(_, statuses) = r { return statuses }
-    throw r
-}
-
 func markChatRead(_ chat: Chat, aboveItem: ChatItem? = nil) async {
     do {
         if chat.chatStats.unreadCount > 0 {
@@ -1158,7 +1133,6 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
     try setXFTPConfig(getXFTPCfg())
-    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
@@ -1311,12 +1285,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(connection.id)
             }
         }
-    case let .contactDeletedByContact(user, contact):
-        if active(user) && contact.directOrUsed {
-            await MainActor.run {
-                m.updateContact(contact)
-            }
-        }
     case let .contactConnected(user, contact, _):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
@@ -1374,6 +1342,13 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await updateContactsStatus(contactRefs, status: .connected)
     case let .contactsDisconnected(_, contactRefs):
         await updateContactsStatus(contactRefs, status: .disconnected)
+    case let .contactSubError(user, contact, chatError):
+        await MainActor.run {
+            if active(user) {
+                m.updateContact(contact)
+            }
+            processContactSubError(contact, chatError)
+        }
     case let .contactSubSummary(_, contactSubscriptions):
         await MainActor.run {
             for sub in contactSubscriptions {
@@ -1388,18 +1363,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 }
             }
         }
-    case let .networkStatus(status, connections):
-        await MainActor.run {
-            for cId in connections {
-                m.networkStatuses[cId] = status
-            }
-        }
-    case let .networkStatuses(_, statuses): ()
-        await MainActor.run {
-            for s in statuses {
-                m.networkStatuses[s.agentConnId] = s.networkStatus
-            }
-        }
     case let .newChatItem(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
@@ -1421,8 +1384,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .chatItemStatusUpdated(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent && active(user) {
-            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
+        if !cItem.isDeletedContent {
+            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
+            if added && cItem.showNotification {
+                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+            }
         }
         if let endTask = m.messageDelivery[cItem.id] {
             switch cItem.meta.itemStatus {
@@ -1677,7 +1643,7 @@ func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
     case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
     default: err = String(describing: chatError)
     }
-    m.setContactNetworkStatus(contact, .error(connectionError: err))
+    m.setContactNetworkStatus(contact, .error(err))
 }
 
 func refreshCallInvitations() throws {

apps/ios/Shared/Model/SuspendChat.swift

@@ -19,11 +19,7 @@ let bgSuspendTimeout: Int = 5 // seconds
 let terminationTimeout: Int = 3 // seconds
 
 private func _suspendChat(timeout: Int) {
-    // this is a redundant check to prevent logical errors, like the one fixed in this PR
-    let state = appStateGroupDefault.get()
-    if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
-    } else if ChatModel.ok {
+    if ChatModel.ok {
         appStateGroupDefault.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
@@ -35,7 +31,9 @@ private func _suspendChat(timeout: Int) {
 
 func suspendChat() {
     suspendLockQueue.sync {
-        _suspendChat(timeout: appSuspendTimeout)
+        if appStateGroupDefault.get() != .stopped {
+            _suspendChat(timeout: appSuspendTimeout)
+        }
     }
 }
 
@@ -47,25 +45,15 @@ func suspendBgRefresh() {
     }
 }
 
-private var terminating = false
-
 func terminateChat() {
-    logger.debug("terminateChat")
     suspendLockQueue.sync {
         switch appStateGroupDefault.get() {
         case .suspending:
             // suspend instantly if already suspending
             _chatSuspended()
-            // when apiSuspendChat is called with timeout 0, it won't send any events on suspension
             if ChatModel.ok { apiSuspendChat(timeoutMicroseconds: 0) }
-            chatCloseStore()
-        case .suspended:
-            chatCloseStore()
-        case .stopped:
-            chatCloseStore()
+        case .stopped: ()
         default:
-            terminating = true
-            // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
     }
@@ -85,14 +73,10 @@ private func _chatSuspended() {
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
-    if terminating {
-         chatCloseStore()
-    }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
-    terminating = false
     suspendLockQueue.sync {
         appStateGroupDefault.set(appState)
         if ChatModel.ok { apiActivateChat() }
@@ -101,7 +85,6 @@ func activateChat(appState: AppState = .active) {
 }
 
 func initChatAndMigrate(refreshInvitations: Bool = true) {
-    terminating = false
     let m = ChatModel.shared
     if (!m.chatInitialized) {
         do {
@@ -114,7 +97,6 @@ func initChatAndMigrate(refreshInvitations: Bool = true) {
 }
 
 func startChatAndActivate() {
-    terminating = false
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()

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

@@ -99,12 +99,12 @@ struct ChatInfoView: View {
     @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
-    @State private var showDeleteContactActionSheet = false
     @State private var sendReceipts = SendReceipts.userDefault(true)
     @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum ChatInfoViewAlert: Identifiable {
+        case deleteContactAlert
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
@@ -114,6 +114,7 @@ struct ChatInfoView: View {
 
         var id: String {
             switch self {
+            case .deleteContactAlert: return "deleteContactAlert"
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
@@ -163,13 +164,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
-                .disabled(!contact.ready || !contact.active)
+                .disabled(!contact.ready)
 
                 if let contactLink = contact.contactLink {
                     Section {
-                        SimpleXLinkQRCode(uri: contactLink)
+                        QRCode(uri: contactLink)
                         Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
+                            showShareSheet(items: [contactLink])
                         } label: {
                             Label("Share address", systemImage: "square.and.arrow.up")
                         }
@@ -180,7 +181,7 @@ struct ChatInfoView: View {
                     }
                 }
 
-                if contact.ready && contact.active {
+                if contact.ready {
                     Section("Servers") {
                         networkStatusRow()
                             .onTapGesture {
@@ -191,7 +192,8 @@ struct ChatInfoView: View {
                                 alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                !contact.ready
+                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || connStats.ratchetSyncSendProhibited
                             )
                             if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
@@ -232,6 +234,7 @@ struct ChatInfoView: View {
         }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
+            case .deleteContactAlert: return deleteContactAlert()
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
@@ -240,26 +243,6 @@ struct ChatInfoView: View {
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
-                        .destructive(Text("Delete")) { deleteContact(notify: false) },
-                        .cancel()
-                    ]
-                )
-            } else {
-                ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { deleteContact() },
-                        .cancel()
-                    ]
-                )
-            }
-        }
     }
 
     private func contactInfoHeader() -> some View {
@@ -432,7 +415,7 @@ struct ChatInfoView: View {
 
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            showDeleteContactActionSheet = true
+            alert = .deleteContactAlert
         } label: {
             Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
@@ -448,23 +431,30 @@ struct ChatInfoView: View {
         }
     }
 
-    private func deleteContact(notify: Bool? = nil) {
-        Task {
-            do {
-                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
-                await MainActor.run {
-                    dismiss()
-                    chatModel.chatId = nil
-                    chatModel.removeChat(chat.chatInfo.id)
+    private func deleteContactAlert() -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task {
+                    do {
+                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
+                        await MainActor.run {
+                            dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
+                        }
+                    } catch let error {
+                        logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                        let a = getErrorAlert(error, "Error deleting contact")
+                        await MainActor.run {
+                            alert = .error(title: a.title, error: a.message)
+                        }
+                    }
                 }
-            } catch let error {
-                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                let a = getErrorAlert(error, "Error deleting contact")
-                await MainActor.run {
-                    alert = .error(title: a.title, error: a.message)
-                }
-            }
-        }
+            },
+            secondaryButton: .cancel()
+        )
     }
 
     private func clearChatAlert() -> Alert {

apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift

@@ -121,11 +121,13 @@ private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
         case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
         case let .colored(color): return Text(t).foregroundColor(color.uiColor)
         case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, trustedUri, smpHosts):
             switch privacySimplexLinkModeDefault.get() {
             case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
             case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return linkText(t, simplexUri, preview, prefix: "")
+            case .browser: return trustedUri
+                                    ? linkText(t, t, preview, prefix: "")
+                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
             }
         case .email: return linkText(t, t, preview, prefix: "mailto:")
         case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")

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

@@ -79,7 +79,6 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvDirectEvent: eventItemView()
         case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()

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

@@ -91,7 +91,6 @@ struct ChatView: View {
                 chatModel.chatId = nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
-                        chatModel.chatItemStatuses = [:]
                         chatModel.reversedChatItems = []
                     }
                 }
@@ -151,7 +150,7 @@ struct ChatView: View {
                     HStack {
                         if contact.allowsFeature(.calls) {
                             callButton(contact, .audio, imageName: "phone")
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         }
                         Menu {
                             if contact.allowsFeature(.calls) {
@@ -160,11 +159,11 @@ struct ChatView: View {
                                 } label: {
                                     Label("Video call", systemImage: "video")
                                 }
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                             }
                             searchButton()
                             toggleNtfsButton(chat)
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         } label: {
                             Image(systemName: "ellipsis")
                         }
@@ -322,7 +321,6 @@ struct ChatView: View {
     @ViewBuilder private func connectingText() -> some View {
         if case let .direct(contact) = chat.chatInfo,
            !contact.ready,
-           contact.active,
            !contact.nextSendGrpInv {
             Text("connecting…")
                 .font(.caption)
@@ -966,7 +964,7 @@ struct ChatView: View {
 
 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
     var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs ? .all : .none
+    chatSettings.enableNtfs = enableNtfs
     updateChatSettings(chat, chatSettings: chatSettings)
 }
 

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

@@ -41,9 +41,9 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
+                    QRCode(uri: groupLink)
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }

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

@@ -19,7 +19,7 @@ struct GroupMemberInfoView: View {
     @State private var connectionCode: String? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
+    @State private var connectToMemberDialog: Bool = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
     @State private var progressIndicator = false
@@ -30,8 +30,9 @@ struct GroupMemberInfoView: View {
         case switchAddressAlert
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
-        case planAndConnectAlert(alert: PlanAndConnectAlert)
+        case connRequestSentAlert(type: ConnReqType)
         case error(title: LocalizedStringKey, error: LocalizedStringKey)
+        case other(alert: Alert)
 
         var id: String {
             switch self {
@@ -40,8 +41,9 @@ struct GroupMemberInfoView: View {
             case .switchAddressAlert: return "switchAddressAlert"
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
+            case .connRequestSentAlert: return "connRequestSentAlert"
             case let .error(title, _): return "error \(title)"
+            case let .other(alert): return "other \(alert)"
             }
         }
     }
@@ -94,9 +96,9 @@ struct GroupMemberInfoView: View {
 
                     if let contactLink = member.contactLink {
                         Section {
-                            SimpleXLinkQRCode(uri: contactLink)
+                            QRCode(uri: contactLink)
                             Button {
-                                showShareSheet(items: [simplexChatLink(contactLink)])
+                                showShareSheet(items: [contactLink])
                             } label: {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
@@ -204,11 +206,11 @@ struct GroupMemberInfoView: View {
                 case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
                 case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                 case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
-                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
+                case let .connRequestSentAlert(type): return connReqSentAlert(type)
                 case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                case let .other(alert): return alert
                 }
             }
-            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
 
             if progressIndicator {
                 ProgressView().scaleEffect(2)
@@ -218,16 +220,25 @@ struct GroupMemberInfoView: View {
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            planAndConnect(
-                contactLink,
-                showAlert: { alert = .planAndConnectAlert(alert: $0) },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: nil
-            )
+            connectToMemberDialog = true
         } label: {
             Label("Connect", systemImage: "link")
         }
+        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
+            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
+            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
+        }
+    }
+
+    func connectViaAddress(incognito: Bool, contactLink: String) {
+        Task {
+            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
+            if let connReqType = connReqType {
+                alert = .connRequestSentAlert(type: connReqType)
+            } else if let connectAlert = connectAlert {
+                alert = .other(alert: connectAlert)
+            }
+        }
     }
 
     func knownDirectChatButton(_ chat: Chat) -> some View {

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

@@ -27,7 +27,8 @@ struct GroupPreferencesView: View {
                 featureSection(.directMessages, $preferences.directMessages.enable)
                 featureSection(.reactions, $preferences.reactions.enable)
                 featureSection(.voice, $preferences.voice.enable)
-                featureSection(.files, $preferences.files.enable)
+//                TODO uncomment in 5.3
+//                featureSection(.files, $preferences.files.enable)
 
                 if groupInfo.canEdit {
                     Section {

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

@@ -9,18 +9,6 @@
 import SwiftUI
 import SimpleXChat
 
-enum GroupProfileAlert: Identifiable {
-    case saveError(err: String)
-    case invalidName(validName: String)
-
-    var id: String {
-        switch self {
-        case let .saveError(err): return "saveError \(err)"
-        case let .invalidName(validName): return "invalidName \(validName)"
-        }
-    }
-}
-
 struct GroupProfileView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -30,7 +18,8 @@ struct GroupProfileView: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: GroupProfileAlert?
+    @State private var showSaveErrorAlert = false
+    @State private var saveGroupError: String? = nil
     @FocusState private var focusDisplayName
 
     var body: some View {
@@ -58,29 +47,20 @@ struct GroupProfileView: View {
             .frame(maxWidth: .infinity, alignment: .center)
 
             VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
-                    if !validNewProfileName() {
-                        Button {
-                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
-                        } label: {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                ZStack(alignment: .leading) {
+                    if !validDisplayName(groupProfile.displayName) {
+                        Image(systemName: "exclamationmark.circle")
+                            .foregroundColor(.red)
+                            .padding(.bottom, 10)
                     }
                     profileNameTextEdit("Group display name", $groupProfile.displayName)
                         .focused($focusDisplayName)
                 }
-                .padding(.bottom)
-                let fullName = groupInfo.groupProfile.fullName
-                if fullName != "" && fullName != groupProfile.displayName {
-                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
-                        .padding(.bottom)
-                }
+                profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
                 HStack(spacing: 20) {
                     Button("Cancel") { dismiss() }
                     Button("Save group profile") { saveProfile() }
-                        .disabled(!canUpdateProfile())
+                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
                 }
             }
             .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -119,39 +99,27 @@ struct GroupProfileView: View {
                 focusDisplayName = true
             }
         }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .saveError(err):
-                return Alert(
-                    title: Text("Error saving group profile"),
-                    message: Text(err)
-                )
-            case let .invalidName(name):
-                return createInvalidNameAlert(name, $groupProfile.displayName)
-            }
+        .alert(isPresented: $showSaveErrorAlert) {
+            Alert(
+                title: Text("Error saving group profile"),
+                message: Text("\(saveGroupError ?? "Unexpected error")")
+            )
         }
         .contentShape(Rectangle())
         .onTapGesture { hideKeyboard() }
     }
 
-    private func canUpdateProfile() -> Bool {
-        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
-    }
-
-    private func validNewProfileName() -> Bool {
-        groupProfile.displayName == groupInfo.groupProfile.displayName
-            || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
-    }
-
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func saveProfile() {
         Task {
             do {
-                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
                     groupInfo = gInfo
@@ -160,7 +128,8 @@ struct GroupProfileView: View {
                 }
             } catch let error {
                 let err = responseError(error)
-                alert = .saveError(err: err)
+                saveGroupError = err
+                showSaveErrorAlert = true
                 logger.error("GroupProfile apiUpdateGroup error: \(err)")
             }
         }

apps/ios/Shared/Views/ChatList/ChatListNavLink.swift

@@ -32,7 +32,6 @@ struct ChatListNavLink: View {
     @State private var showJoinGroupDialog = false
     @State private var showContactConnectionInfo = false
     @State private var showInvalidJSON = false
-    @State private var showDeleteContactActionSheet = false
 
     var body: some View {
         switch chat.chatInfo {
@@ -65,37 +64,17 @@ struct ChatListNavLink: View {
                 clearChatButton()
             }
             Button {
-                if contact.ready || !contact.active {
-                    showDeleteContactActionSheet = true
-                } else {
-                    AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
-                }
+                AlertManager.shared.showAlert(
+                    contact.ready
+                    ? deleteContactAlert(chat.chatInfo)
+                    : deletePendingContactAlert(chat, contact)
+                )
             } label: {
                 Label("Delete", systemImage: "trash")
             }
             .tint(.red)
         }
         .frame(height: rowHeights[dynamicTypeSize])
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
-                        .cancel()
-                    ]
-                )
-            } else {
-                ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
-                        .cancel()
-                    ]
-                )
-            }
-        }
     }
 
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
@@ -290,6 +269,17 @@ struct ChatListNavLink: View {
         }
     }
 
+    private func deleteContactAlert(_ chatInfo: ChatInfo) -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task { await deleteChat(chat) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group?"),

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -57,26 +57,19 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            if !contact.active {
-                inactiveIcon()
-            } else {
-                EmptyView()
-            }
-        case let .group(groupInfo):
+        if case let .group(groupInfo) = chat.chatInfo {
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: inactiveIcon()
-            case .memRemoved: inactiveIcon()
-            case .memGroupDeleted: inactiveIcon()
+            case .memLeft: groupInactiveIcon()
+            case .memRemoved: groupInactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
             default: EmptyView()
             }
-        default:
+        } else {
             EmptyView()
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    @ViewBuilder private func groupInactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -87,6 +80,7 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             previewTitle(contact.verified == true ? verifiedIcon + t : t)
+                .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
         case let .group(groupInfo):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
@@ -111,17 +105,14 @@ struct ChatPreviewView: View {
 
     private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
         ZStack(alignment: .topTrailing) {
-            let t = text
+            text
                 .lineLimit(2)
                 .multilineTextAlignment(.leading)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-            if !showChatPreviews && !draft {
-                t.privacySensitive(true).redacted(reason: .privacy)
-            } else {
-                t
-            }
+                .privacySensitive(!showChatPreviews && !draft)
+                .redacted(reason: .privacy)
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -192,7 +183,7 @@ struct ChatPreviewView: View {
                 if !contact.ready {
                     if contact.nextSendGrpInv {
                         chatPreviewInfoText("send direct message")
-                    } else if contact.active {
+                    } else {
                         chatPreviewInfoText("connecting…")
                     }
                 }
@@ -237,20 +228,16 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatStatusImage() -> some View {
         switch chat.chatInfo {
         case let .direct(contact):
-            if contact.active {
-                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito)
-                case .error:
-                    Image(systemName: "exclamationmark.circle")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 17, height: 17)
-                        .foregroundColor(.secondary)
-                default:
-                    ProgressView()
-                }
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
+            switch (chatModel.contactNetworkStatus(contact)) {
+            case .connected: incognitoIcon(chat.chatInfo.incognito)
+            case .error:
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 17, height: 17)
+                    .foregroundColor(.secondary)
+            default:
+                ProgressView()
             }
         default:
             incognitoIcon(chat.chatInfo.incognito)

apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift

@@ -61,7 +61,7 @@ struct ContactConnectionInfo: View {
 
                     if contactConnection.initiated,
                        let connReqInv = contactConnection.connReqInv {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                        QRCode(uri: connReqInv)
                         incognitoEnabled()
                         shareLinkButton(connReqInv)
                         oneTimeLinkLearnMoreButton()

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

@@ -21,7 +21,7 @@ struct AddContactView: View {
             List {
                 Section {
                     if connReqInvitation != "" {
-                        SimpleXLinkQRCode(uri: connReqInvitation)
+                        QRCode(uri: connReqInvitation)
                     } else {
                         ProgressView()
                             .progressViewStyle(.circular)
@@ -99,7 +99,7 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {
 
 func shareLinkButton(_ connReqInvitation: String) -> some View {
     Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
+        showShareSheet(items: [connReqInvitation])
     } label: {
         settingsRow("square.and.arrow.up") {
             Text("Share 1-time link")

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

@@ -16,11 +16,11 @@ struct AddGroupView: View {
     @State private var groupInfo: GroupInfo?
     @State private var profile = GroupProfile(displayName: "", fullName: "")
     @FocusState private var focusDisplayName
+    @FocusState private var focusFullName
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var showInvalidNameAlert = false
 
     var body: some View {
         if let chat = chat, let groupInfo = groupInfo {
@@ -76,24 +76,26 @@ struct AddGroupView: View {
             .padding(.bottom, 4)
 
             ZStack(alignment: .topLeading) {
-                let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-                if name != mkValidName(name) {
-                    Button {
-                        showInvalidNameAlert = true
-                    } label: {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                    }
-                } else {
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                if !validDisplayName(profile.displayName) {
+                    Image(systemName: "exclamationmark.circle")
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
                 }
-                textField("Enter group name…", text: $profile.displayName)
+                textField("Group display name", text: $profile.displayName)
                     .focused($focusDisplayName)
-                    .submitLabel(.go)
+                    .submitLabel(.next)
                     .onSubmit {
-                        if canCreateProfile() { createGroup() }
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
                     }
             }
-            .padding(.bottom)
+            textField("Group full name (optional)", text: $profile.fullName)
+                .focused($focusFullName)
+                .submitLabel(.go)
+                .onSubmit {
+                    if canCreateProfile() { createGroup() }
+                    else { focusFullName = true }
+                }
 
             Spacer()
 
@@ -131,9 +133,6 @@ struct AddGroupView: View {
                 didSelectItem in showImagePicker = false
             }
         }
-        .alert(isPresented: $showInvalidNameAlert) {
-            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
-        }
         .onChange(of: chosenImage) { image in
             if let image = image {
                 profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
@@ -147,13 +146,15 @@ struct AddGroupView: View {
 
     func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
         TextField(placeholder, text: text)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
     }
 
     func createGroup() {
         hideKeyboard()
         do {
-            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
             let gInfo = try apiNewGroup(profile)
             Task {
                 let groupMembers = await apiListMembers(gInfo.groupId)
@@ -179,8 +180,7 @@ struct AddGroupView: View {
     }
 
     func canCreateProfile() -> Bool {
-        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-        return name != "" && validDisplayName(name)
+        profile.displayName != "" && validDisplayName(profile.displayName)
     }
 }
 

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

@@ -58,369 +58,65 @@ struct NewChatButton: View {
     }
 }
 
-enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
-
-    var id: String {
-        switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
-        }
-    }
+enum ConnReqType: Equatable {
+    case contact
+    case invitation
 }
 
-func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
-    switch alert {
-    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own one-time link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case .invitationLinkConnecting:
-        return Alert(
-            title: Text("Already connecting!"),
-            message: Text("You are already connecting via this one-time link!")
-        )
-    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own SimpleX address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat connection request?"),
-            message: Text("You have already requested connection via this address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Join group?"),
-            message: Text("You will connect to all group members."),
-            primaryButton: .default(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat join request?"),
-            message: Text("You are already joining the group via this link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnecting(_, groupInfo):
-        if let groupInfo = groupInfo {
-            return Alert(
-                title: Text("Group already exists!"),
-                message: Text("You are already joining the group \(groupInfo.displayName).")
-            )
-        } else {
-            return Alert(
-                title: Text("Already joining the group!"),
-                message: Text("You are already joining the group via this link.")
-            )
-        }
-    }
-}
-
-enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
-
-    var id: String {
-        switch self {
-        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool) -> ActionSheet {
-    switch sheet {
-    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
-        if let incognito = incognito {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) },
-                    .cancel()
-                ]
-            )
-        } else {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                    .cancel()
-                ]
-            )
-        }
-    }
-}
-
-func planAndConnect(
-    _ connectionLink: String,
-    showAlert: @escaping (PlanAndConnectAlert) -> Void,
-    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
-    dismiss: Bool,
-    incognito: Bool?
-) {
-    Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
-            switch connectionPlan {
-            case let .invitationLink(ilp):
-                switch ilp {
-                case .ok:
-                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
-                    }
-                case let .connecting(contact_):
-                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                }
-            case let .contactAddress(cap):
-                switch cap {
-                case .ok:
-                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
-                    }
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
-                    }
-                case let .connectingProhibit(contact):
-                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                }
-            case let .groupLink(glp):
-                switch glp {
-                case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
-                    }
-                case let .ownLink(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
-                    }
-                case let .connectingProhibit(groupInfo_):
-                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
-                case let .known(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
-                }
-            }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
-            }
-        }
-    }
-}
-
-private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
+func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
     Task {
         if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
-            } else {
-                crt = connReqType
-            }
             DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(crt))
-                    }
-                } else {
-                    AlertManager.shared.showAlert(connReqSentAlert(crt))
-                }
+                dismiss?()
+                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
             }
         } else {
-            if dismiss {
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true)
-                }
-            }
-        }
-    }
-}
-
-func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
             DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = c.id
-                    showAlreadyExistsAlert?()
-                }
+                dismiss?()
             }
         }
     }
 }
 
-func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = g.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
+struct CReqClientData: Decodable {
+    var type: String
+    var groupLinkId: String?
+}
+
+func parseLinkQueryData(_ connectionLink: String) -> CReqClientData? {
+    if let hashIndex = connectionLink.firstIndex(of: "#"),
+       let urlQuery = URL(string: String(connectionLink[connectionLink.index(after: hashIndex)...])),
+       let components = URLComponents(url: urlQuery, resolvingAgainstBaseURL: false),
+       let data = components.queryItems?.first(where: { $0.name == "data" })?.value,
+       let d = data.data(using: .utf8),
+       let crData = try? getJSONDecoder().decode(CReqClientData.self, from: d) {
+        return crData
+    } else {
+        return nil
     }
 }
 
-func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connecting to \(contact.displayName)."
+func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
+    return crData.type == "group" && crData.groupLinkId != nil
+}
+
+func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
+    return Alert(
+        title: Text("Connect via group link?"),
+        message: Text("You will join a group this link refers to and connect to its group members."),
+        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
+            connectViaLink(connectionLink, incognito: incognito)
+        },
+        secondaryButton: .cancel()
     )
 }
 
-func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    mkAlert(
-        title: "Group already exists",
-        message: "You are already in group \(groupInfo.displayName)."
-    )
-}
-
-enum ConnReqType: Equatable {
-    case invitation
-    case contact
-    case groupLink
-
-    var connReqSentText: LocalizedStringKey {
-        switch self {
-        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
-        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
-        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
-        }
-    }
-}
-
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
-    switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
-    }
-}
-
 func connReqSentAlert(_ type: ConnReqType) -> Alert {
     return mkAlert(
         title: "Connection request sent!",
-        message: type.connReqSentText
+        message: type == .contact
+            ? "You will be connected when your connection request is accepted, please wait or check later!"
+            : "You will be connected when your contact's device is online, please wait or check later!"
     )
 }
 

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

@@ -14,8 +14,6 @@ struct PasteToConnectView: View {
     @State private var connectionLink: String = ""
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @FocusState private var linkEditorFocused: Bool
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         List {
@@ -59,8 +57,6 @@ struct PasteToConnectView: View {
                 + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
             }
         }
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     private func linkEditor() -> some View {
@@ -87,13 +83,13 @@ struct PasteToConnectView: View {
 
     private func connect() {
         let link = connectionLink.trimmingCharacters(in: .whitespaces)
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: incognitoDefault
-        )
+        if let crData = parseLinkQueryData(link),
+           checkCRDataGroup(crData) {
+            dismiss()
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
+        } else {
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
+        }
     }
 }
 

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

@@ -28,22 +28,6 @@ struct MutableQRCode: View {
     }
 }
 
-struct SimpleXLinkQRCode: View {
-    let uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-
-    var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor)
-    }
-}
-
-func simplexChatLink(_ uri: String) -> String {
-    uri.starts(with: "simplex:/")
-    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
-    : uri
-}
-
 struct QRCode: View {
     let uri: String
     var withLogo: Bool = true

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

@@ -13,8 +13,6 @@ import CodeScanner
 struct ScanToConnectView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         ScrollView {
@@ -51,20 +49,18 @@ struct ScanToConnectView: View {
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
         .background(Color(.systemGroupedBackground))
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     func processQRCode(_ resp: Result<ScanResult, ScanError>) {
         switch resp {
         case let .success(r):
-            planAndConnect(
-                r.string,
-                showAlert: { alert = $0 },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: incognitoDefault
-            )
+            if let crData = parseLinkQueryData(r.string),
+               checkCRDataGroup(crData) {
+                dismiss()
+                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
+            } else {
+                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
+            }
         case let .failure(e):
             logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
             dismiss()

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

@@ -9,244 +9,175 @@
 import SwiftUI
 import SimpleXChat
 
-enum UserProfileAlert: Identifiable {
-    case duplicateUserError
-    case createUserError(error: LocalizedStringKey)
-    case invalidNameError(validName: String)
-
-    var id: String {
-        switch self {
-        case .duplicateUserError: return "duplicateUserError"
-        case .createUserError: return "createUserError"
-        case let .invalidNameError(validName): return "invalidNameError \(validName)"
-        }
-    }
-}
-
 struct CreateProfile: View {
-    @Environment(\.dismiss) var dismiss
-    @State private var displayName: String = ""
-    @FocusState private var focusDisplayName
-    @State private var alert: UserProfileAlert?
-
-    var body: some View {
-        List {
-            Section {
-                TextField("Enter your name…", text: $displayName)
-                    .focused($focusDisplayName)
-                Button {
-                    createProfile(displayName, showAlert: { alert = $0 }, dismiss: dismiss)
-                } label: {
-                    Label("Create profile", systemImage: "checkmark")
-                }
-                .disabled(!canCreateProfile(displayName))
-            } header: {
-                HStack {
-                    Text("Your profile")
-                    let name = displayName.trimmingCharacters(in: .whitespaces)
-                    let validName = mkValidName(name)
-                    if name != validName {
-                        Spacer()
-                        Image(systemName: "exclamationmark.circle")
-                            .foregroundColor(.red)
-                            .onTapGesture {
-                                alert = .invalidNameError(validName: validName)
-                            }
-                    }
-                }
-                .frame(height: 20)
-            } footer: {
-                VStack(alignment: .leading, spacing: 8) {
-                    Text("Your profile, contacts and delivered messages are stored on your device.")
-                    Text("The profile is only shared with your contacts.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-            }
-        }
-        .navigationTitle("Create your profile")
-        .alert(item: $alert) { a in userProfileAlert(a, $displayName) }
-        .onAppear() {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                focusDisplayName = true
-            }
-        }
-        .keyboardPadding()
-    }
-}
-
-struct CreateFirstProfile: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss
     @State private var displayName: String = ""
+    @State private var fullName: String = ""
     @FocusState private var focusDisplayName
+    @FocusState private var focusFullName
+    @State private var alert: CreateProfileAlert?
+
+    private enum CreateProfileAlert: Identifiable {
+        case duplicateUserError
+        case createUserError(error: LocalizedStringKey)
+
+        var id: String {
+            switch self {
+            case .duplicateUserError: return "duplicateUserError"
+            case .createUserError: return "createUserError"
+            }
+        }
+    }
 
     var body: some View {
         VStack(alignment: .leading) {
-            Group {
-                Text("Create your profile")
-                    .font(.largeTitle)
-                    .bold()
-                Text("Your profile, contacts and delivered messages are stored on your device.")
-                    .foregroundColor(.secondary)
-                Text("The profile is only shared with your contacts.")
-                    .foregroundColor(.secondary)
-                    .padding(.bottom)
-            }
-            .padding(.bottom)
-
+            Text("Create your profile")
+                .font(.largeTitle)
+                .bold()
+                .padding(.bottom, 4)
+                .frame(maxWidth: .infinity)
+            Text("Your profile, contacts and delivered messages are stored on your device.")
+                .padding(.bottom, 4)
+            Text("The profile is only shared with your contacts.")
+                .padding(.bottom)
             ZStack(alignment: .topLeading) {
-                let name = displayName.trimmingCharacters(in: .whitespaces)
-                let validName = mkValidName(name)
-                if name != validName {
-                    Button {
-                        showAlert(.invalidNameError(validName: validName))
-                    } label: {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                    }
-                } else {
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                if !validDisplayName(displayName) {
+                    Image(systemName: "exclamationmark.circle")
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
                 }
-                TextField("Enter your name…", text: $displayName)
+                textField("Display name", text: $displayName)
                     .focused($focusDisplayName)
-                    .padding(.leading, 32)
+                    .submitLabel(.next)
+                    .onSubmit {
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
+                    }
             }
-            .padding(.bottom)
+            textField("Full name (optional)", text: $fullName)
+                .focused($focusFullName)
+                .submitLabel(.go)
+                .onSubmit {
+                    if canCreateProfile() { createProfile() }
+                    else { focusFullName = true }
+                }
+
             Spacer()
-            onboardingButtons()
+
+            HStack {
+                if m.users.isEmpty {
+                    Button {
+                        hideKeyboard()
+                        withAnimation {
+                            m.onboardingStage = .step1_SimpleXInfo
+                        }
+                    } label: {
+                        HStack {
+                            Image(systemName: "lessthan")
+                            Text("About SimpleX")
+                        }
+                    }
+                }
+
+                Spacer()
+
+                HStack {
+                    Button {
+                        createProfile()
+                    } label: {
+                        Text("Create")
+                        Image(systemName: "greaterthan")
+                    }
+                    .disabled(!canCreateProfile())
+                }
+            }
         }
         .onAppear() {
             focusDisplayName = true
             setLastVersionDefault()
         }
+        .alert(item: $alert) { a in
+            switch a {
+            case .duplicateUserError: return duplicateUserAlert
+            case let .createUserError(err): return creatUserErrorAlert(err)
+            }
+        }
         .padding()
-        .frame(maxWidth: .infinity, alignment: .leading)
         .keyboardPadding()
     }
 
-    func onboardingButtons() -> some View {
-        HStack {
-            Button {
-                hideKeyboard()
+    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
+        TextField(placeholder, text: text)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
+    }
+
+    func createProfile() {
+        hideKeyboard()
+        let profile = Profile(
+            displayName: displayName,
+            fullName: fullName
+        )
+        do {
+            m.currentUser = try apiCreateActiveUser(profile)
+            if m.users.isEmpty {
+                try startChat()
                 withAnimation {
-                    m.onboardingStage = .step1_SimpleXInfo
+                    onboardingStageDefault.set(.step3_CreateSimpleXAddress)
+                    m.onboardingStage = .step3_CreateSimpleXAddress
                 }
-            } label: {
-                HStack {
-                    Image(systemName: "lessthan")
-                    Text("About SimpleX")
-                }
-            }
-
-            Spacer()
-
-            Button {
-                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
-            } label: {
-                HStack {
-                    Text("Create")
-                    Image(systemName: "greaterthan")
-                }
-            }
-            .disabled(!canCreateProfile(displayName))
-        }
-    }
-
-    private func showAlert(_ alert: UserProfileAlert) {
-        AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
-    }
-}
-
-private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
-    hideKeyboard()
-    let profile = Profile(
-        displayName: displayName.trimmingCharacters(in: .whitespaces),
-        fullName: ""
-    )
-    let m = ChatModel.shared
-    do {
-        m.currentUser = try apiCreateActiveUser(profile)
-        if m.users.isEmpty {
-            try startChat()
-            withAnimation {
-                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
-                m.onboardingStage = .step3_CreateSimpleXAddress
-            }
-        } else {
-            onboardingStageDefault.set(.onboardingComplete)
-            m.onboardingStage = .onboardingComplete
-            dismiss()
-            m.users = try listUsers()
-            try getUserChatData()
-        }
-    } catch let error {
-        switch error as? ChatResponse {
-        case .chatCmdError(_, .errorStore(.duplicateName)),
-             .chatCmdError(_, .error(.userExists)):
-            if m.currentUser == nil {
-                AlertManager.shared.showAlert(duplicateUserAlert)
             } else {
-                showAlert(.duplicateUserError)
+                onboardingStageDefault.set(.onboardingComplete)
+                m.onboardingStage = .onboardingComplete
+                dismiss()
+                m.users = try listUsers()
+                try getUserChatData()
             }
-        default:
-            let err: LocalizedStringKey = "Error: \(responseError(error))"
-            if m.currentUser == nil {
-                AlertManager.shared.showAlert(creatUserErrorAlert(err))
-            } else {
-                showAlert(.createUserError(error: err))
+        } catch let error {
+            switch error as? ChatResponse {
+            case .chatCmdError(_, .errorStore(.duplicateName)),
+                 .chatCmdError(_, .error(.userExists)):
+                if m.currentUser == nil {
+                    AlertManager.shared.showAlert(duplicateUserAlert)
+                } else {
+                    alert = .duplicateUserError
+                }
+            default:
+                let err: LocalizedStringKey = "Error: \(responseError(error))"
+                if m.currentUser == nil {
+                    AlertManager.shared.showAlert(creatUserErrorAlert(err))
+                } else {
+                    alert = .createUserError(error: err)
+                }
             }
+            logger.error("Failed to create user or start chat: \(responseError(error))")
         }
-        logger.error("Failed to create user or start chat: \(responseError(error))")
     }
-}
 
-private func canCreateProfile(_ displayName: String) -> Bool {
-    let name = displayName.trimmingCharacters(in: .whitespaces)
-    return name != "" && mkValidName(name) == name
-}
-
-func userProfileAlert(_ alert: UserProfileAlert, _ displayName: Binding<String>) -> Alert {
-    switch alert {
-    case .duplicateUserError: return duplicateUserAlert
-    case let .createUserError(err): return creatUserErrorAlert(err)
-    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
+    func canCreateProfile() -> Bool {
+        displayName != "" && validDisplayName(displayName)
     }
-}
 
-private var duplicateUserAlert: Alert {
-    Alert(
-        title: Text("Duplicate display name!"),
-        message: Text("You already have a chat profile with the same display name. Please choose another name.")
-    )
-}
+    private var duplicateUserAlert: Alert {
+        Alert(
+            title: Text("Duplicate display name!"),
+            message: Text("You already have a chat profile with the same display name. Please choose another name.")
+        )
+    }
 
-private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
-    Alert(
-        title: Text("Error creating profile!"),
-        message: Text(err)
-    )
-}
-
-func createInvalidNameAlert(_ name: String, _ displayName: Binding<String>) -> Alert {
-    name == ""
-    ? Alert(title: Text("Invalid name!"))
-    : Alert(
-        title: Text("Invalid name!"),
-        message: Text("Correct name to \(name)?"),
-        primaryButton: .default(
-            Text("Ok"),
-            action: { displayName.wrappedValue = name }
-        ),
-        secondaryButton: .cancel()
-    )
+    private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
+        Alert(
+            title: Text("Error creating profile!"),
+            message: Text(err)
+        )
+    }
 }
 
 func validDisplayName(_ name: String) -> Bool {
-    mkValidName(name.trimmingCharacters(in: .whitespaces)) == name
-}
-
-func mkValidName(_ s: String) -> String {
-    var c = s.cString(using: .utf8)!
-    return fromCString(chat_valid_name(&c)!)
+    name.firstIndex(of: " ") == nil && name.first != "@" && name.first != "#"
 }
 
 struct CreateProfile_Previews: PreviewProvider {

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

@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                         Spacer()
 
                         if let userAddress = m.userAddress {
-                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                            QRCode(uri: userAddress.connReqContact)
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -126,7 +126,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [userAddress.connReqContact])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -194,7 +194,7 @@ struct SendAddressMailView: View {
         let messageBody = String(format: NSLocalizedString("""
             <p>Hi!</p>
             <p><a href="%@">Connect to me via SimpleX Chat</a></p>
-            """, comment: "email text"), simplexChatLink(userAddress.connReqContact))
+            """, comment: "email text"), userAddress.connReqContact)
         MailView(
             isShowing: self.$showMailView,
             result: $mailViewResult,

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

@@ -14,7 +14,7 @@ struct OnboardingView: View {
     var body: some View {
         switch onboarding {
         case .step1_SimpleXInfo: SimpleXInfo(onboarding: true)
-        case .step2_CreateProfile: CreateFirstProfile()
+        case .step2_CreateProfile: CreateProfile()
         case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
         case .step4_SetNotificationsMode: SetNotificationsMode()
         case .onboardingComplete: EmptyView()

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

@@ -66,9 +66,6 @@ struct PrivacySettings: View {
                 Section {
                     settingsRow("lock.doc") {
                         Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                            .onChange(of: encryptLocalFiles) {
-                                setEncryptLocalFiles($0)
-                            }
                     }
                     settingsRow("photo") {
                         Toggle("Auto-accept images", isOn: $autoAcceptImages)
@@ -93,9 +90,7 @@ struct PrivacySettings: View {
                     }
                     settingsRow("link") {
                         Picker("SimpleX links", selection: $simplexLinkMode) {
-                            ForEach(
-                                SimpleXLinkMode.values + (SimpleXLinkMode.values.contains(simplexLinkMode) ? [] : [simplexLinkMode])
-                            ) { mode in
+                            ForEach(SimpleXLinkMode.values) { mode in
                                 Text(mode.text)
                             }
                         }
@@ -106,6 +101,10 @@ struct PrivacySettings: View {
                     }
                 } header: {
                     Text("Chats")
+                } footer: {
+                    if case .browser = simplexLinkMode {
+                        Text("Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.")
+                    }
                 }
 
                 Section {
@@ -184,16 +183,6 @@ struct PrivacySettings: View {
         }
     }
 
-    private func setEncryptLocalFiles(_ enable: Bool) {
-        do {
-            try apiSetEncryptLocalFiles(enable)
-        } catch let error {
-            let err = responseError(error)
-            logger.error("apiSetEncryptLocalFiles \(err)")
-            alert = .error(title: "Error", error: "\(err)")
-        }
-    }
-
     private func setOrAskSendReceiptsContacts(_ enable: Bool) {
         contactReceiptsOverrides = m.chats.reduce(0) { count, chat in
             let sendRcpts = chat.chatInfo.contact?.chatSettings.sendRcpts
@@ -356,7 +345,7 @@ struct SimplexLockView: View {
         var id: Self { self }
     }
 
-    let laDelays: [Int] = [10, 30, 60, 180, 600, 0]
+    let laDelays: [Int] = [10, 30, 60, 180, 0]
 
     func laDelayText(_ t: Int) -> LocalizedStringKey {
         let m = t / 60
@@ -378,7 +367,6 @@ struct SimplexLockView: View {
                             Text(mode.text)
                         }
                     }
-                    .frame(height: 36)
                     if performLA {
                         Picker("Lock after", selection: $laLockDelay) {
                             let delays = laDelays.contains(laLockDelay) ? laDelays : [laLockDelay] + laDelays
@@ -386,7 +374,6 @@ struct SimplexLockView: View {
                                 Text(laDelayText(t))
                             }
                         }
-                        .frame(height: 36)
                         if showChangePassword && laMode == .passcode {
                             Button("Change passcode") {
                                 changeLAPassword()

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

@@ -93,7 +93,7 @@ enum SimpleXLinkMode: String, Identifiable {
     case full
     case browser
 
-    static var values: [SimpleXLinkMode] = [.description, .full]
+    static var values: [SimpleXLinkMode] = [.description, .full, .browser]
 
     public var id: Self { self }
 
@@ -381,9 +381,7 @@ struct ProfilePreview: View {
                 Text(profileOf.displayName)
                     .fontWeight(.bold)
                     .font(.title2)
-                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
-                    Text(profileOf.fullName)
-                }
+                Text(profileOf.fullName)
             }
         }
     }

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

@@ -190,7 +190,7 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
+            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
             shareQRCodeButton(userAddress)
             if MFMailComposeViewController.canSendMail() {
                 shareViaEmailButton(userAddress)
@@ -248,7 +248,7 @@ struct UserAddressView: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [userAddress.connReqContact])
         } label: {
             settingsRow("square.and.arrow.up") {
                 Text("Share address")

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

@@ -17,8 +17,6 @@ struct UserProfile: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: UserProfileAlert?
-    @FocusState private var focusDisplayName
 
     var body: some View {
         let user: User = chatModel.currentUser!
@@ -49,27 +47,18 @@ struct UserProfile: View {
 
                 VStack(alignment: .leading) {
                     ZStack(alignment: .leading) {
-                        if !validNewProfileName(user) {
-                            Button {
-                                alert = .invalidNameError(validName: mkValidName(profile.displayName))
-                            } label: {
-                                Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                            }
-                        } else {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                        if !validDisplayName(profile.displayName) {
+                            Image(systemName: "exclamationmark.circle")
+                                .foregroundColor(.red)
+                                .padding(.bottom, 10)
                         }
-                        profileNameTextEdit("Profile name", $profile.displayName)
-                            .focused($focusDisplayName)
-                    }
-                    .padding(.bottom)
-                    if showFullName(user) {
-                        profileNameTextEdit("Full name (optional)", $profile.fullName)
-                            .padding(.bottom)
+                        profileNameTextEdit("Display name", $profile.displayName)
                     }
+                    profileNameTextEdit("Full name (optional)", $profile.fullName)
                     HStack(spacing: 20) {
                         Button("Cancel") { editProfile = false }
                         Button("Save (and notify contacts)") { saveProfile() }
-                            .disabled(!canSaveProfile(user))
+                            .disabled(profile.displayName == "" || !validDisplayName(profile.displayName))
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -85,14 +74,11 @@ struct UserProfile: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
                 VStack(alignment: .leading) {
-                    profileNameView("Profile name:", user.profile.displayName)
-                    if showFullName(user) {
-                        profileNameView("Full name:", user.profile.fullName)
-                    }
+                    profileNameView("Display name:", user.profile.displayName)
+                    profileNameView("Full name:", user.profile.fullName)
                     Button("Edit") {
                         profile = fromLocalProfile(user.profile)
                         editProfile = true
-                        focusDisplayName = true
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -131,12 +117,14 @@ struct UserProfile: View {
                 profile.image = nil
             }
         }
-        .alert(item: $alert) { a in userProfileAlert(a, $profile.displayName) }
     }
 
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func profileNameView(_ label: LocalizedStringKey, _ name: String) -> some View {
@@ -153,22 +141,9 @@ struct UserProfile: View {
         showChooseSource = true
     }
 
-    private func validNewProfileName(_ user: User) -> Bool {
-        profile.displayName == user.profile.displayName || validDisplayName(profile.displayName.trimmingCharacters(in: .whitespaces))
-    }
-
-    private func showFullName(_ user: User) -> Bool {
-        user.profile.fullName != "" && user.profile.fullName != user.profile.displayName
-    }
-
-    private func canSaveProfile(_ user: User) -> Bool {
-        profile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName(user)
-    }
-
     func saveProfile() {
         Task {
             do {
-                profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
                 if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                     DispatchQueue.main.async {
                         chatModel.updateCurrentUser(newProfile)

apps/ios/SimpleX NSE/NotificationService.swift

@@ -216,7 +216,6 @@ func startChat() -> DBMigrationResult? {
             try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
             try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
             try setXFTPConfig(xftpConfig)
-            try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
             let justStarted = try apiStartChat()
             chatStarted = true
             if justStarted {
@@ -352,12 +351,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
-func apiSetEncryptLocalFiles(_ enable: Bool) throws {
-    let r = sendSimpleXCmd(.apiSetEncryptLocalFiles(enable: enable))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
     guard apiGetActiveUser() != nil else {
         logger.debug("no active user")

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		18415C6C56DBCEC2CBBD2F11 /* WebRTCClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415323A4082FC92887F906 /* WebRTCClient.swift */; };
 		18415F9A2D551F9757DA4654 /* CIVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415FD2E36F13F596A45BB4 /* CIVideoView.swift */; };
 		18415FEFE153C5920BFB7828 /* GroupWelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1841516F0CE5992B0EDFB377 /* GroupWelcomeView.swift */; };
+		3C71477A281C0F6800CB4D4B /* www in Resources */ = {isa = PBXBuildFile; fileRef = 3C714779281C0F6800CB4D4B /* www */; };
 		3C8C548928133C84000A3EC7 /* PasteToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */; };
 		3CDBCF4227FAE51000354CDD /* ComposeLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */; };
 		3CDBCF4827FF621E00354CDD /* CILinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4727FF621E00354CDD /* CILinkView.swift */; };
@@ -47,6 +48,11 @@
 		5C55A921283CCCB700C4E99E /* IncomingCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A920283CCCB700C4E99E /* IncomingCallView.swift */; };
 		5C55A923283CEDE600C4E99E /* SoundPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A922283CEDE600C4E99E /* SoundPlayer.swift */; };
 		5C55A92E283D0FDE00C4E99E /* sounds in Resources */ = {isa = PBXBuildFile; fileRef = 5C55A92D283D0FDE00C4E99E /* sounds */; };
+		5C56251A2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */; };
+		5C56251B2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */; };
+		5C56251C2AC1DE5900A21210 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625172AC1DE5900A21210 /* libgmpxx.a */; };
+		5C56251D2AC1DE5900A21210 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625182AC1DE5900A21210 /* libgmp.a */; };
+		5C56251E2AC1DE5900A21210 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625192AC1DE5900A21210 /* libffi.a */; };
 		5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C577F7C27C83AA10006112D /* MarkdownHelp.swift */; };
 		5C58BCD6292BEBE600AF9E4F /* CIChatFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C58BCD5292BEBE600AF9E4F /* CIChatFeatureView.swift */; };
 		5C5DB70E289ABDD200730FFF /* AppearanceSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5DB70D289ABDD200730FFF /* AppearanceSettings.swift */; };
@@ -117,11 +123,6 @@
 		5CCB939C297EFCB100399E78 /* NavStackCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCB939B297EFCB100399E78 /* NavStackCompat.swift */; };
 		5CCD403427A5F6DF00368C90 /* AddContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403327A5F6DF00368C90 /* AddContactView.swift */; };
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
-		5CD089312AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */; };
-		5CD089322AE59CB300669208 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892D2AE59CB300669208 /* libffi.a */; };
-		5CD089332AE59CB300669208 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892E2AE59CB300669208 /* libgmpxx.a */; };
-		5CD089342AE59CB300669208 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892F2AE59CB300669208 /* libgmp.a */; };
-		5CD089352AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.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, ); }; };
@@ -256,6 +257,7 @@
 		18415B08031E8FB0F7FC27F9 /* CallViewRenderers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewRenderers.swift; sourceTree = "<group>"; };
 		18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerView.swift; sourceTree = "<group>"; };
 		18415FD2E36F13F596A45BB4 /* CIVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CIVideoView.swift; sourceTree = "<group>"; };
+		3C714779281C0F6800CB4D4B /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../multiplatform/android/src/main/assets/www; sourceTree = "<group>"; };
 		3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteToConnectView.swift; sourceTree = "<group>"; };
 		3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeLinkView.swift; sourceTree = "<group>"; };
 		3CDBCF4727FF621E00354CDD /* CILinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CILinkView.swift; sourceTree = "<group>"; };
@@ -291,6 +293,11 @@
 		5C55A920283CCCB700C4E99E /* IncomingCallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingCallView.swift; sourceTree = "<group>"; };
 		5C55A922283CEDE600C4E99E /* SoundPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundPlayer.swift; sourceTree = "<group>"; };
 		5C55A92D283D0FDE00C4E99E /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sounds; sourceTree = "<group>"; };
+		5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a"; sourceTree = "<group>"; };
+		5C5625172AC1DE5900A21210 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C5625182AC1DE5900A21210 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C5625192AC1DE5900A21210 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C577F7C27C83AA10006112D /* MarkdownHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownHelp.swift; sourceTree = "<group>"; };
 		5C58BCD5292BEBE600AF9E4F /* CIChatFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIChatFeatureView.swift; sourceTree = "<group>"; };
 		5C5B67912ABAF4B500DA9412 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -397,11 +404,6 @@
 		5CCB939B297EFCB100399E78 /* NavStackCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavStackCompat.swift; sourceTree = "<group>"; };
 		5CCD403327A5F6DF00368C90 /* AddContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactView.swift; sourceTree = "<group>"; };
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
-		5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5CD0892D2AE59CB300669208 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CD0892E2AE59CB300669208 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CD0892F2AE59CB300669208 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.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>"; };
@@ -505,13 +507,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CD089352AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CD089332AE59CB300669208 /* libgmpxx.a in Frameworks */,
+				5C56251C2AC1DE5900A21210 /* libgmpxx.a in Frameworks */,
+				5C56251B2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a in Frameworks */,
+				5C56251A2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a in Frameworks */,
+				5C56251E2AC1DE5900A21210 /* libffi.a in Frameworks */,
+				5C56251D2AC1DE5900A21210 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5CD089312AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a in Frameworks */,
-				5CD089342AE59CB300669208 /* libgmp.a in Frameworks */,
-				5CD089322AE59CB300669208 /* libffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -572,11 +574,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CD0892D2AE59CB300669208 /* libffi.a */,
-				5CD0892F2AE59CB300669208 /* libgmp.a */,
-				5CD0892E2AE59CB300669208 /* libgmpxx.a */,
-				5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */,
-				5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a */,
+				5C5625192AC1DE5900A21210 /* libffi.a */,
+				5C5625182AC1DE5900A21210 /* libgmp.a */,
+				5C5625172AC1DE5900A21210 /* libgmpxx.a */,
+				5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */,
+				5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -636,6 +638,7 @@
 			isa = PBXGroup;
 			children = (
 				5C55A92D283D0FDE00C4E99E /* sounds */,
+				3C714779281C0F6800CB4D4B /* www */,
 				5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */,
 				5CC2C0FA2809BF11000C35E3 /* Localizable.strings */,
 				5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */,
@@ -1047,6 +1050,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5C55A92E283D0FDE00C4E99E /* sounds in Resources */,
+				3C71477A281C0F6800CB4D4B /* www in Resources */,
 				5CA059EF279559F40002BEB4 /* Assets.xcassets in Resources */,
 				5CC2C0FC2809BF11000C35E3 /* Localizable.strings in Resources */,
 				5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */,
@@ -1482,7 +1486,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1503,7 +1507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1524,7 +1528,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1545,7 +1549,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1604,7 +1608,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1617,7 +1621,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1636,7 +1640,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1649,7 +1653,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1668,7 +1672,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1692,7 +1696,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1714,7 +1718,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 180;
+				CURRENT_PROJECT_VERSION = 174;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1738,7 +1742,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -50,13 +50,6 @@ public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: Migratio
     return result
 }
 
-public func chatCloseStore() {
-    let err = fromCString(chat_close_store(getChatCtrl()))
-    if err != "" {
-        logger.error("chatCloseStore error: \(err)")
-    }
-}
-
 public func resetChatCtrl() {
     chatController = nil
     migrationResult = nil
@@ -139,11 +132,8 @@ public func chatResponse(_ s: String) -> ChatResponse {
     var type: String?
     var json: String?
     if let j = try? JSONSerialization.jsonObject(with: d) as? NSDictionary {
-        if let jResp = j["resp"] as? NSDictionary, jResp.count == 1 || jResp.count == 2 {
+        if let jResp = j["resp"] as? NSDictionary, jResp.count == 1 {
             type = jResp.allKeys[0] as? String
-            if jResp.count == 2 && type == "_owsf" {
-                type = jResp.allKeys[1] as? String
-            }
             if type == "apiChats" {
                 if let jApiChats = jResp["apiChats"] as? NSDictionary,
                    let user: UserRef = try? decodeObject(jApiChats["user"] as Any),

apps/ios/SimpleXChat/APITypes.swift

@@ -32,7 +32,6 @@ public enum ChatCommand {
     case setTempFolder(tempFolder: String)
     case setFilesFolder(filesFolder: String)
     case apiSetXFTPConfig(config: XFTPFileConfig?)
-    case apiSetEncryptLocalFiles(enable: Bool)
     case apiExportArchive(config: ArchiveConfig)
     case apiImportArchive(config: ArchiveConfig)
     case apiDeleteStorage
@@ -87,9 +86,8 @@ public enum ChatCommand {
     case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
     case apiAddContact(userId: Int64, incognito: Bool)
     case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
-    case apiConnectPlan(userId: Int64, connReq: String)
     case apiConnect(userId: Int64, incognito: Bool, connReq: String)
-    case apiDeleteChat(type: ChatType, id: Int64, notify: Bool?)
+    case apiDeleteChat(type: ChatType, id: Int64)
     case apiClearChat(type: ChatType, id: Int64)
     case apiListContacts(userId: Int64)
     case apiUpdateProfile(userId: Int64, profile: Profile)
@@ -112,11 +110,10 @@ public enum ChatCommand {
     case apiEndCall(contact: Contact)
     case apiGetCallInvitations
     case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
-    case apiGetNetworkStatuses
     case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
     case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, encrypted: Bool?, inline: Bool?)
-    case setFileToReceive(fileId: Int64, encrypted: Bool?)
+    case receiveFile(fileId: Int64, encrypted: Bool, inline: Bool?)
+    case setFileToReceive(fileId: Int64, encrypted: Bool)
     case cancelFile(fileId: Int64)
     case showVersion
     case string(String)
@@ -153,7 +150,6 @@ public enum ChatCommand {
             } else {
                 return "/_xftp off"
             }
-            case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
             case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
             case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
             case .apiDeleteStorage: return "/_db delete"
@@ -222,13 +218,8 @@ public enum ChatCommand {
             case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
             case let .apiAddContact(userId, incognito): return "/_connect \(userId) incognito=\(onOff(incognito))"
             case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
-            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
             case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
-            case let .apiDeleteChat(type, id, notify): if let notify = notify {
-                return "/_delete \(ref(type, id)) notify=\(onOff(notify))"
-            } else {
-                return "/_delete \(ref(type, id))"
-            }
+            case let .apiDeleteChat(type, id): return "/_delete \(ref(type, id))"
             case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
             case let .apiListContacts(userId): return "/_contacts \(userId)"
             case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
@@ -250,11 +241,15 @@ public enum ChatCommand {
             case let .apiEndCall(contact): return "/_call end @\(contact.apiId)"
             case .apiGetCallInvitations: return "/_call get"
             case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
-            case .apiGetNetworkStatuses: return "/_network_statuses"
             case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
             case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, encrypt, inline): return "/freceive \(fileId)\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
-            case let .setFileToReceive(fileId, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("encrypt", encrypt))"
+            case let .receiveFile(fileId, encrypted, inline):
+                let s = "/freceive \(fileId) encrypt=\(onOff(encrypted))"
+                if let inline = inline {
+                    return s + " inline=\(onOff(inline))"
+                }
+                return s
+            case let .setFileToReceive(fileId, encrypted): return "/_set_file_to_receive \(fileId) encrypt=\(onOff(encrypted))"
             case let .cancelFile(fileId): return "/fcancel \(fileId)"
             case .showVersion: return "/version"
             case let .string(str): return str
@@ -284,7 +279,6 @@ public enum ChatCommand {
             case .setTempFolder: return "setTempFolder"
             case .setFilesFolder: return "setFilesFolder"
             case .apiSetXFTPConfig: return "apiSetXFTPConfig"
-            case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
             case .apiExportArchive: return "apiExportArchive"
             case .apiImportArchive: return "apiImportArchive"
             case .apiDeleteStorage: return "apiDeleteStorage"
@@ -339,7 +333,6 @@ public enum ChatCommand {
             case .apiVerifyGroupMember: return "apiVerifyGroupMember"
             case .apiAddContact: return "apiAddContact"
             case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
-            case .apiConnectPlan: return "apiConnectPlan"
             case .apiConnect: return "apiConnect"
             case .apiDeleteChat: return "apiDeleteChat"
             case .apiClearChat: return "apiClearChat"
@@ -363,7 +356,6 @@ public enum ChatCommand {
             case .apiEndCall: return "apiEndCall"
             case .apiGetCallInvitations: return "apiGetCallInvitations"
             case .apiCallStatus: return "apiCallStatus"
-            case .apiGetNetworkStatuses: return "apiGetNetworkStatuses"
             case .apiChatRead: return "apiChatRead"
             case .apiChatUnread: return "apiChatUnread"
             case .receiveFile: return "receiveFile"
@@ -422,13 +414,6 @@ public enum ChatCommand {
         b ? "on" : "off"
     }
 
-    private func onOffParam(_ param: String, _ b: Bool?) -> String {
-        if let b = b {
-            return " \(param)=\(onOff(b))"
-        }
-        return ""
-    }
-
     private func maybePwd(_ pwd: String?) -> String {
         pwd == "" || pwd == nil ? "" : " " + encodeJSON(pwd)
     }
@@ -472,13 +457,11 @@ public enum ChatResponse: Decodable, Error {
     case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
     case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
     case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
-    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
     case sentConfirmation(user: UserRef)
     case sentInvitation(user: UserRef)
     case contactAlreadyExists(user: UserRef, contact: Contact)
     case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
     case contactDeleted(user: UserRef, contact: Contact)
-    case contactDeletedByContact(user: UserRef, contact: Contact)
     case chatCleared(user: UserRef, chatInfo: ChatInfo)
     case userProfileNoChange(user: User)
     case userProfileUpdated(user: User, fromProfile: Profile, toProfile: Profile, updateSummary: UserProfileUpdateSummary)
@@ -496,14 +479,11 @@ public enum ChatResponse: Decodable, Error {
     case acceptingContactRequest(user: UserRef, contact: Contact)
     case contactRequestRejected(user: UserRef)
     case contactUpdated(user: UserRef, toContact: Contact)
-    // TODO remove events below
     case contactsSubscribed(server: String, contactRefs: [ContactRef])
     case contactsDisconnected(server: String, contactRefs: [ContactRef])
+    case contactSubError(user: UserRef, contact: Contact, chatError: ChatError)
     case contactSubSummary(user: UserRef, contactSubscriptions: [ContactSubStatus])
-    // TODO remove events above
-    case networkStatus(networkStatus: NetworkStatus, connections: [String])
-    case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
-    case groupSubscribed(user: UserRef, groupInfo: GroupRef)
+    case groupSubscribed(user: UserRef, groupInfo: GroupInfo)
     case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
     case groupEmpty(user: UserRef, groupInfo: GroupInfo)
     case userContactLinkSubscribed
@@ -614,13 +594,11 @@ public enum ChatResponse: Decodable, Error {
             case .connectionVerified: return "connectionVerified"
             case .invitation: return "invitation"
             case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
-            case .connectionPlan: return "connectionPlan"
             case .sentConfirmation: return "sentConfirmation"
             case .sentInvitation: return "sentInvitation"
             case .contactAlreadyExists: return "contactAlreadyExists"
             case .contactRequestAlreadyAccepted: return "contactRequestAlreadyAccepted"
             case .contactDeleted: return "contactDeleted"
-            case .contactDeletedByContact: return "contactDeletedByContact"
             case .chatCleared: return "chatCleared"
             case .userProfileNoChange: return "userProfileNoChange"
             case .userProfileUpdated: return "userProfileUpdated"
@@ -640,9 +618,8 @@ public enum ChatResponse: Decodable, Error {
             case .contactUpdated: return "contactUpdated"
             case .contactsSubscribed: return "contactsSubscribed"
             case .contactsDisconnected: return "contactsDisconnected"
+            case .contactSubError: return "contactSubError"
             case .contactSubSummary: return "contactSubSummary"
-            case .networkStatus: return "networkStatus"
-            case .networkStatuses: return "networkStatuses"
             case .groupSubscribed: return "groupSubscribed"
             case .memberSubErrors: return "memberSubErrors"
             case .groupEmpty: return "groupEmpty"
@@ -753,13 +730,11 @@ public enum ChatResponse: Decodable, Error {
             case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
             case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
             case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
-            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
             case .sentConfirmation: return noDetails
             case .sentInvitation: return noDetails
             case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
             case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
             case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
-            case let .contactDeletedByContact(u, contact): return withUser(u, String(describing: contact))
             case let .chatCleared(u, chatInfo): return withUser(u, String(describing: chatInfo))
             case .userProfileNoChange: return noDetails
             case let .userProfileUpdated(u, _, toProfile, _): return withUser(u, String(describing: toProfile))
@@ -779,9 +754,8 @@ public enum ChatResponse: Decodable, Error {
             case let .contactUpdated(u, toContact): return withUser(u, String(describing: toContact))
             case let .contactsSubscribed(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
             case let .contactsDisconnected(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
+            case let .contactSubError(u, contact, chatError): return withUser(u, "contact:\n\(String(describing: contact))\nerror:\n\(String(describing: chatError))")
             case let .contactSubSummary(u, contactSubscriptions): return withUser(u, String(describing: contactSubscriptions))
-            case let .networkStatus(status, conns): return "networkStatus: \(String(describing: status))\nconnections: \(String(describing: conns))"
-            case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
             case let .groupSubscribed(u, groupInfo): return withUser(u, String(describing: groupInfo))
             case let .memberSubErrors(u, memberSubErrors): return withUser(u, String(describing: memberSubErrors))
             case let .groupEmpty(u, groupInfo): return withUser(u, String(describing: groupInfo))
@@ -874,35 +848,6 @@ public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
     }
 }
 
-public enum ConnectionPlan: Decodable {
-    case invitationLink(invitationLinkPlan: InvitationLinkPlan)
-    case contactAddress(contactAddressPlan: ContactAddressPlan)
-    case groupLink(groupLinkPlan: GroupLinkPlan)
-}
-
-public enum InvitationLinkPlan: Decodable {
-    case ok
-    case ownLink
-    case connecting(contact_: Contact?)
-    case known(contact: Contact)
-}
-
-public enum ContactAddressPlan: Decodable {
-    case ok
-    case ownLink
-    case connectingConfirmReconnect
-    case connectingProhibit(contact: Contact)
-    case known(contact: Contact)
-}
-
-public enum GroupLinkPlan: Decodable {
-    case ok
-    case ownLink(groupInfo: GroupInfo)
-    case connectingConfirmReconnect
-    case connectingProhibit(groupInfo_: GroupInfo?)
-    case known(groupInfo: GroupInfo)
-}
-
 struct NewUser: Encodable {
     var profile: Profile?
     var sameServers: Bool
@@ -1233,67 +1178,18 @@ public struct KeepAliveOpts: Codable, Equatable {
     public static let defaults: KeepAliveOpts = KeepAliveOpts(keepIdle: 30, keepIntvl: 15, keepCnt: 4)
 }
 
-public enum NetworkStatus: Decodable, Equatable {
-    case unknown
-    case connected
-    case disconnected
-    case error(connectionError: String)
-
-    public var statusString: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "connected"
-            case .error: return "error"
-            default: return "connecting"
-            }
-        }
-    }
-
-    public var statusExplanation: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "You are connected to the server used to receive messages from this contact."
-            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-            default: return "Trying to connect to the server used to receive messages from this contact."
-            }
-        }
-    }
-
-    public var imageName: String {
-        get {
-            switch self {
-            case .unknown: return "circle.dotted"
-            case .connected: return "circle.fill"
-            case .disconnected: return "ellipsis.circle.fill"
-            case .error: return "exclamationmark.circle.fill"
-            }
-        }
-    }
-}
-
-public struct ConnNetworkStatus: Decodable {
-    public var agentConnId: String
-    public var networkStatus: NetworkStatus
-}
-
 public struct ChatSettings: Codable {
-    public var enableNtfs: MsgFilter
+    public var enableNtfs: Bool
     public var sendRcpts: Bool?
     public var favorite: Bool
 
-    public init(enableNtfs: MsgFilter, sendRcpts: Bool?, favorite: Bool) {
+    public init(enableNtfs: Bool, sendRcpts: Bool?, favorite: Bool) {
         self.enableNtfs = enableNtfs
         self.sendRcpts = sendRcpts
         self.favorite = favorite
     }
 
-    public static let defaults: ChatSettings = ChatSettings(enableNtfs: .all, sendRcpts: nil, favorite: false)
-}
-
-public enum MsgFilter: String, Codable {
-    case none
-    case all
-    case mentions
+    public static let defaults: ChatSettings = ChatSettings(enableNtfs: true, sendRcpts: nil, favorite: false)
 }
 
 public struct UserMsgReceiptSettings: Codable {
@@ -1521,11 +1417,9 @@ public enum ChatErrorType: Decodable {
     case chatNotStarted
     case chatNotStopped
     case chatStoreChanged
-    case connectionPlan(connectionPlan: ConnectionPlan)
     case invalidConnReq
     case invalidChatMessage(connection: Connection, message: String)
     case contactNotReady(contact: Contact)
-    case contactNotActive(contact: Contact)
     case contactDisabled(contact: Contact)
     case connectionDisabled(connection: Connection)
     case groupUserRole(groupInfo: GroupInfo, requiredRole: GroupMemberRole)

apps/ios/SimpleXChat/AppGroup.swift

@@ -80,14 +80,6 @@ public enum AppState: String {
         default: return false
         }
     }
-
-    public var canSuspend: Bool {
-        switch self {
-        case .active: true
-        case .bgRefresh: true
-        default: false
-        }
-    }
 }
 
 public enum DBContainer: String {

apps/ios/SimpleXChat/ChatTypes.swift

@@ -1292,7 +1292,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat {
     }
 
     public var ntfsEnabled: Bool {
-        self.chatSettings?.enableNtfs == .all
+        self.chatSettings?.enableNtfs ?? false
     }
 
     public var chatSettings: ChatSettings? {
@@ -1373,7 +1373,6 @@ public struct Contact: Identifiable, Decodable, NamedChat {
     public var activeConn: Connection
     public var viaGroup: Int64?
     public var contactUsed: Bool
-    public var contactStatus: ContactStatus
     public var chatSettings: ChatSettings
     public var userPreferences: Preferences
     public var mergedPreferences: ContactUserPreferences
@@ -1385,9 +1384,8 @@ public struct Contact: Identifiable, Decodable, NamedChat {
     public var id: ChatId { get { "@\(contactId)" } }
     public var apiId: Int64 { get { contactId } }
     public var ready: Bool { get { activeConn.connStatus == .ready } }
-    public var active: Bool { get { contactStatus == .active } }
     public var sendMsgEnabled: Bool { get {
-        (ready && active && !(activeConn.connectionStats?.ratchetSyncSendProhibited ?? false))
+        (ready && !(activeConn.connectionStats?.ratchetSyncSendProhibited ?? false))
         || nextSendGrpInv
     } }
     public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
@@ -1432,7 +1430,6 @@ public struct Contact: Identifiable, Decodable, NamedChat {
         profile: LocalProfile.sampleData,
         activeConn: Connection.sampleData,
         contactUsed: true,
-        contactStatus: .active,
         chatSettings: ChatSettings.defaults,
         userPreferences: Preferences.sampleData,
         mergedPreferences: ContactUserPreferences.sampleData,
@@ -1442,11 +1439,6 @@ public struct Contact: Identifiable, Decodable, NamedChat {
     )
 }
 
-public enum ContactStatus: String, Decodable {
-    case active = "active"
-    case deleted = "deleted"
-}
-
 public struct ContactRef: Decodable, Equatable {
     var contactId: Int64
     public var agentConnId: String
@@ -1729,11 +1721,6 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat {
     )
 }
 
-public struct GroupRef: Decodable {
-    public var groupId: Int64
-    var localDisplayName: GroupName
-}
-
 public struct GroupProfile: Codable, NamedChat {
     public init(displayName: String, fullName: String, description: String? = nil, image: String? = nil, groupPreferences: GroupPreferences? = nil) {
         self.displayName = displayName
@@ -1763,7 +1750,6 @@ public struct GroupMember: Identifiable, Decodable {
     public var memberRole: GroupMemberRole
     public var memberCategory: GroupMemberCategory
     public var memberStatus: GroupMemberStatus
-    public var memberSettings: GroupMemberSettings
     public var invitedBy: InvitedBy
     public var localDisplayName: ContactName
     public var memberProfile: LocalProfile
@@ -1857,7 +1843,6 @@ public struct GroupMember: Identifiable, Decodable {
         memberRole: .admin,
         memberCategory: .inviteeMember,
         memberStatus: .memComplete,
-        memberSettings: GroupMemberSettings(showMessages: true),
         invitedBy: .user,
         localDisplayName: "alice",
         memberProfile: LocalProfile.sampleData,
@@ -1867,20 +1852,11 @@ public struct GroupMember: Identifiable, Decodable {
     )
 }
 
-public struct GroupMemberSettings: Decodable {
-    var showMessages: Bool
-}
-
 public struct GroupMemberRef: Decodable {
     var groupMemberId: Int64
     var profile: Profile
 }
 
-public struct GroupMemberIds: Decodable {
-    var groupMemberId: Int64
-    var groupId: Int64
-}
-
 public enum GroupMemberRole: String, Identifiable, CaseIterable, Comparable, Decodable {
     case observer = "observer"
     case member = "member"
@@ -1973,7 +1949,7 @@ public enum InvitedBy: Decodable {
 }
 
 public struct MemberSubError: Decodable {
-    var member: GroupMemberIds
+    var member: GroupMember
     var memberError: ChatError
 }
 
@@ -1999,8 +1975,8 @@ public enum ConnectionEntity: Decodable {
 
     public var ntfsEnabled: Bool {
         switch self {
-        case let .rcvDirectMsgConnection(contact): return contact?.chatSettings.enableNtfs == .all
-        case let .rcvGroupMsgConnection(groupInfo, _): return groupInfo.chatSettings.enableNtfs == .all
+        case let .rcvDirectMsgConnection(contact): return contact?.chatSettings.enableNtfs ?? false
+        case let .rcvGroupMsgConnection(groupInfo, _): return groupInfo.chatSettings.enableNtfs
         case .sndFileConnection: return false
         case .rcvFileConnection: return false
         case let .userContactConnection(userContact): return userContact.groupId == nil
@@ -2115,7 +2091,6 @@ public struct ChatItem: Identifiable, Decodable {
         case .rcvDecryptionError: return showNtfDir
         case .rcvGroupInvitation: return showNtfDir
         case .sndGroupInvitation: return showNtfDir
-        case .rcvDirectEvent: return false
         case .rcvGroupEvent(rcvGroupEvent: let rcvGroupEvent):
             switch rcvGroupEvent {
             case .groupUpdated: return false
@@ -2538,7 +2513,6 @@ public enum CIContent: Decodable, ItemContent {
     case rcvDecryptionError(msgDecryptError: MsgDecryptError, msgCount: UInt32)
     case rcvGroupInvitation(groupInvitation: CIGroupInvitation, memberRole: GroupMemberRole)
     case sndGroupInvitation(groupInvitation: CIGroupInvitation, memberRole: GroupMemberRole)
-    case rcvDirectEvent(rcvDirectEvent: RcvDirectEvent)
     case rcvGroupEvent(rcvGroupEvent: RcvGroupEvent)
     case sndGroupEvent(sndGroupEvent: SndGroupEvent)
     case rcvConnEvent(rcvConnEvent: RcvConnEvent)
@@ -2568,7 +2542,6 @@ public enum CIContent: Decodable, ItemContent {
             case let .rcvDecryptionError(msgDecryptError, _): return msgDecryptError.text
             case let .rcvGroupInvitation(groupInvitation, _): return groupInvitation.text
             case let .sndGroupInvitation(groupInvitation, _): return groupInvitation.text
-            case let .rcvDirectEvent(rcvDirectEvent): return rcvDirectEvent.text
             case let .rcvGroupEvent(rcvGroupEvent): return rcvGroupEvent.text
             case let .sndGroupEvent(sndGroupEvent): return sndGroupEvent.text
             case let .rcvConnEvent(rcvConnEvent): return rcvConnEvent.text
@@ -3068,7 +3041,7 @@ public enum Format: Decodable, Equatable {
     case secret
     case colored(color: FormatColor)
     case uri
-    case simplexLink(linkType: SimplexLinkType, simplexUri: String, smpHosts: [String])
+    case simplexLink(linkType: SimplexLinkType, simplexUri: String, trustedUri: Bool, smpHosts: [String])
     case email
     case phone
 }
@@ -3222,16 +3195,6 @@ public enum CIGroupInvitationStatus: String, Decodable {
     case expired
 }
 
-public enum RcvDirectEvent: Decodable {
-    case contactDeleted
-
-    var text: String {
-        switch self {
-        case .contactDeleted: return NSLocalizedString("deleted contact", comment: "rcv direct event chat item")
-        }
-    }
-}
-
 public enum RcvGroupEvent: Decodable {
     case memberAdded(groupMemberId: Int64, profile: Profile)
     case memberConnected

apps/ios/SimpleXChat/SimpleX.h

@@ -17,14 +17,12 @@ typedef void* chat_ctrl;
 
 // the last parameter is used to return the pointer to chat controller
 extern char *chat_migrate_init(char *path, char *key, char *confirm, chat_ctrl *ctrl);
-extern char *chat_close_store(chat_ctrl ctl);
 extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
 extern char *chat_recv_msg(chat_ctrl ctl);
 extern char *chat_recv_msg_wait(chat_ctrl ctl, int wait);
 extern char *chat_parse_markdown(char *str);
 extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
-extern char *chat_valid_name(char *name);
 extern char *chat_encrypt_media(char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
 

apps/multiplatform/.gitignore

@@ -11,6 +11,7 @@
 local.properties
 common/src/commonMain/cpp/android/libs/
 common/src/commonMain/cpp/desktop/libs/
+desktop/src/jvmMain/resources/libs/
 android/build
 android/release
 common/build

apps/multiplatform/android/build.gradle.kts

@@ -77,7 +77,6 @@ android {
         }
         jniLibs.useLegacyPackaging = rootProject.extra["compression.level"] as Int != 0
     }
-    android.sourceSets["main"].assets.setSrcDirs(listOf("../common/src/commonMain/resources/assets"))
     val isRelease = gradle.startParameter.taskNames.find { it.toLowerCase().contains("release") } != null
     val isBundle = gradle.startParameter.taskNames.find { it.toLowerCase().contains("bundle") } != null
     //    if (isRelease) {

apps/multiplatform/android/src/main/assets/www/call.js

@@ -23,9 +23,6 @@ var TransformOperation;
 })(TransformOperation || (TransformOperation = {}));
 let activeCall;
 let answerTimeout = 30000;
-var useWorker = false;
-var localizedState = "";
-var localizedDescription = "";
 const processCommand = (function () {
     const defaultIceServers = [
         { urls: ["stun:stun.simplex.im:443"] },
@@ -41,9 +38,9 @@ const processCommand = (function () {
                 iceTransportPolicy: relay ? "relay" : "all",
             },
             iceCandidates: {
-                delay: 750,
-                extrasInterval: 1500,
-                extrasTimeout: 12000,
+                delay: 3000,
+                extrasInterval: 2000,
+                extrasTimeout: 8000,
             },
         };
     }
@@ -84,8 +81,6 @@ const processCommand = (function () {
                 if (delay)
                     clearTimeout(delay);
                 resolved = true;
-                // console.log("resolveIceCandidates", JSON.stringify(candidates))
-                console.log("resolveIceCandidates");
                 const iceCandidates = serialize(candidates);
                 candidates = [];
                 resolve(iceCandidates);
@@ -93,21 +88,19 @@ const processCommand = (function () {
             function sendIceCandidates() {
                 if (candidates.length === 0)
                     return;
-                // console.log("sendIceCandidates", JSON.stringify(candidates))
-                console.log("sendIceCandidates");
                 const iceCandidates = serialize(candidates);
                 candidates = [];
                 sendMessageToNative({ resp: { type: "ice", iceCandidates } });
             }
         });
     }
-    async function initializeCall(config, mediaType, aesKey) {
+    async function initializeCall(config, mediaType, aesKey, useWorker) {
         const pc = new RTCPeerConnection(config.peerConnectionConfig);
         const remoteStream = new MediaStream();
         const localCamera = VideoCamera.User;
         const localStream = await getLocalMediaStream(mediaType, localCamera);
         const iceCandidates = getIceCandidates(pc, config);
-        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey };
+        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey, useWorker };
         await setupMediaStreams(call);
         let connectionTimeout = setTimeout(connectionHandler, answerTimeout);
         pc.addEventListener("connectionstatechange", connectionStateChange);
@@ -185,17 +178,17 @@ const processCommand = (function () {
                     // This request for local media stream is made to prompt for camera/mic permissions on call start
                     if (command.media)
                         await getLocalMediaStream(command.media, VideoCamera.User);
-                    const encryption = supportsInsertableStreams(useWorker);
+                    const encryption = supportsInsertableStreams(command.useWorker);
                     resp = { type: "capabilities", capabilities: { encryption } };
                     break;
                 case "start": {
                     console.log("starting incoming call - create webrtc session");
                     if (activeCall)
                         endCall();
-                    const { media, iceServers, relay } = command;
+                    const { media, useWorker, iceServers, relay } = command;
                     const encryption = supportsInsertableStreams(useWorker);
                     const aesKey = encryption ? command.aesKey : undefined;
-                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey);
+                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey, useWorker);
                     const pc = activeCall.connection;
                     const offer = await pc.createOffer();
                     await pc.setLocalDescription(offer);
@@ -209,6 +202,7 @@ const processCommand = (function () {
                     //   iceServers,
                     //   relay,
                     //   aesKey,
+                    //   useWorker,
                     // }
                     resp = {
                         type: "offer",
@@ -216,23 +210,21 @@ const processCommand = (function () {
                         iceCandidates: await activeCall.iceCandidates,
                         capabilities: { encryption },
                     };
-                    // console.log("offer response", JSON.stringify(resp))
                     break;
                 }
                 case "offer":
                     if (activeCall) {
                         resp = { type: "error", message: "accept: call already started" };
                     }
-                    else if (!supportsInsertableStreams(useWorker) && command.aesKey) {
+                    else if (!supportsInsertableStreams(command.useWorker) && command.aesKey) {
                         resp = { type: "error", message: "accept: encryption is not supported" };
                     }
                     else {
                         const offer = parse(command.offer);
                         const remoteIceCandidates = parse(command.iceCandidates);
-                        const { media, aesKey, iceServers, relay } = command;
-                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey);
+                        const { media, aesKey, useWorker, iceServers, relay } = command;
+                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey, useWorker);
                         const pc = activeCall.connection;
-                        // console.log("offer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
                         await pc.setRemoteDescription(new RTCSessionDescription(offer));
                         const answer = await pc.createAnswer();
                         await pc.setLocalDescription(answer);
@@ -244,7 +236,6 @@ const processCommand = (function () {
                             iceCandidates: await activeCall.iceCandidates,
                         };
                     }
-                    // console.log("answer response", JSON.stringify(resp))
                     break;
                 case "answer":
                     if (!pc) {
@@ -259,7 +250,6 @@ const processCommand = (function () {
                     else {
                         const answer = parse(command.answer);
                         const remoteIceCandidates = parse(command.iceCandidates);
-                        // console.log("answer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
                         await pc.setRemoteDescription(new RTCSessionDescription(answer));
                         addIceCandidates(pc, remoteIceCandidates);
                         resp = { type: "ok" };
@@ -296,11 +286,6 @@ const processCommand = (function () {
                         resp = { type: "ok" };
                     }
                     break;
-                case "description":
-                    localizedState = command.state;
-                    localizedDescription = command.description;
-                    resp = { type: "ok" };
-                    break;
                 case "end":
                     endCall();
                     resp = { type: "ok" };
@@ -325,14 +310,12 @@ const processCommand = (function () {
         catch (e) {
             console.log(e);
         }
-        shutdownCameraAndMic();
         activeCall = undefined;
         resetVideoElements();
     }
     function addIceCandidates(conn, iceCandidates) {
         for (const c of iceCandidates) {
             conn.addIceCandidate(new RTCIceCandidate(c));
-            // console.log("addIceCandidates", JSON.stringify(c))
         }
     }
     async function setupMediaStreams(call) {
@@ -352,11 +335,11 @@ const processCommand = (function () {
         if (call.aesKey) {
             if (!call.key)
                 call.key = await callCrypto.decodeAesKey(call.aesKey);
-            if (useWorker && !call.worker) {
+            if (call.useWorker && !call.worker) {
                 const workerCode = `const callCrypto = (${callCryptoFunction.toString()})(); (${workerFunction.toString()})()`;
                 call.worker = new Worker(URL.createObjectURL(new Blob([workerCode], { type: "text/javascript" })));
-                call.worker.onerror = ({ error, filename, lineno, message }) => console.log({ error, filename, lineno, message });
-                // call.worker.onmessage = ({data}) => console.log(JSON.stringify({message: data}))
+                call.worker.onerror = ({ error, filename, lineno, message }) => console.log(JSON.stringify({ error, filename, lineno, message }));
+                call.worker.onmessage = ({ data }) => console.log(JSON.stringify({ message: data }));
             }
         }
     }
@@ -496,11 +479,6 @@ const processCommand = (function () {
         return (("createEncodedStreams" in RTCRtpSender.prototype && "createEncodedStreams" in RTCRtpReceiver.prototype) ||
             (!!useWorker && "RTCRtpScriptTransform" in window));
     }
-    function shutdownCameraAndMic() {
-        if (activeCall === null || activeCall === void 0 ? void 0 : activeCall.localStream) {
-            activeCall.localStream.getTracks().forEach((track) => track.stop());
-        }
-    }
     function resetVideoElements() {
         const videos = getVideoElements();
         if (!videos)
@@ -529,15 +507,6 @@ const processCommand = (function () {
     }
     return processCommand;
 })();
-function toggleMedia(s, media) {
-    let res = false;
-    const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
-    for (const t of tracks) {
-        t.enabled = !t.enabled;
-        res = t.enabled;
-    }
-    return res;
-}
 // Cryptography function - it is loaded both in the main window and in worker context (if the worker is used)
 function callCryptoFunction() {
     const initialPlainTextRequired = {

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

@@ -91,11 +91,11 @@ class MainActivity: FragmentActivity() {
       // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
       AppLock.clearAuthState()
       AppLock.laFailed.value = true
+      AppLock.destroyedAfterBackPress.value = true
     }
     if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
       // Drop shared content
       SimplexApp.context.chatModel.sharedContent.value = null
-      finish()
     }
   }
 }

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

@@ -9,14 +9,12 @@ import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.requiresIgnoringBattery
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.model.ChatModel.updatingChatsMutex
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.call.RcvCallInvitation
 import com.jakewharton.processphoenix.ProcessPhoenix
 import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.withLock
 import java.io.*
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -54,23 +52,21 @@ class SimplexApp: Application(), LifecycleEventObserver {
         Lifecycle.Event.ON_START -> {
           isAppOnForeground = true
           if (chatModel.chatRunning.value == true) {
-            updatingChatsMutex.withLock {
-              kotlin.runCatching {
-                val currentUserId = chatModel.currentUser.value?.userId
-                val chats = ArrayList(chatController.apiGetChats())
-                /** Active user can be changed in background while [ChatController.apiGetChats] is executing */
-                if (chatModel.currentUser.value?.userId == currentUserId) {
-                  val currentChatId = chatModel.chatId.value
-                  val oldStats = if (currentChatId != null) chatModel.getChat(currentChatId)?.chatStats else null
-                  if (oldStats != null) {
-                    val indexOfCurrentChat = chats.indexOfFirst { it.id == currentChatId }
-                    /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
-                    if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
-                  }
-                  chatModel.updateChats(chats)
+            kotlin.runCatching {
+              val currentUserId = chatModel.currentUser.value?.userId
+              val chats = ArrayList(chatController.apiGetChats())
+              /** Active user can be changed in background while [ChatController.apiGetChats] is executing */
+              if (chatModel.currentUser.value?.userId == currentUserId) {
+                val currentChatId = chatModel.chatId.value
+                val oldStats = if (currentChatId != null) chatModel.getChat(currentChatId)?.chatStats else null
+                if (oldStats != null) {
+                  val indexOfCurrentChat = chats.indexOfFirst { it.id == currentChatId }
+                  /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
+                  if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
                 }
-              }.onFailure { Log.e(TAG, it.stackTraceToString()) }
-            }
+                chatModel.updateChats(chats)
+              }
+            }.onFailure { Log.e(TAG, it.stackTraceToString()) }
           }
         }
         Lifecycle.Event.ON_RESUME -> {

apps/multiplatform/common/build.gradle.kts

@@ -97,9 +97,7 @@ kotlin {
         implementation("com.github.Dansoftowner:jSystemThemeDetector:3.6")
         implementation("com.sshtools:two-slices:0.9.0-SNAPSHOT")
         implementation("org.slf4j:slf4j-simple:2.0.7")
-        implementation("uk.co.caprica:vlcj:4.7.3")
-        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
-        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
+        implementation("uk.co.caprica:vlcj:4.7.0")
       }
     }
     val desktopTest by getting

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

@@ -50,7 +50,6 @@ actual fun PlatformTextField(
   userIsObserver: Boolean,
   onMessageChange: (String) -> Unit,
   onUpArrow: () -> Unit,
-  onFilesPasted: (List<URI>) -> Unit,
   onDone: () -> Unit,
 ) {
   val cs = composeState.value

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

@@ -69,5 +69,3 @@ actual fun hideKeyboard(view: Any?) {
     (androidAppContext.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(view.windowToken, 0)
   }
 }
-
-actual fun androidIsFinishingMainActivity(): Boolean = (mainActivity.get()?.isFinishing == true)

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

@@ -18,7 +18,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -44,9 +43,6 @@ import chat.simplex.res.MR
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.datetime.Clock
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 
@@ -56,7 +52,7 @@ actual fun ActiveCallView() {
   val chatModel = ChatModel
   BackHandler(onBack = {
     val call = chatModel.activeCall.value
-    if (call != null) withBGApi { chatModel.callManager.endCall(call) }
+    if (call != null) withApi { chatModel.callManager.endCall(call) }
   })
   val audioViaBluetooth = rememberSaveable { mutableStateOf(false) }
   val ntfModeService = remember { chatModel.controller.appPrefs.notificationsMode.get() == NotificationsMode.SERVICE }
@@ -116,30 +112,30 @@ actual fun ActiveCallView() {
       if (call != null) {
         Log.d(TAG, "has active call $call")
         when (val r = apiMsg.resp) {
-          is WCallResponse.Capabilities -> withBGApi {
+          is WCallResponse.Capabilities -> withApi {
             val callType = CallType(call.localMedia, r.capabilities)
             chatModel.controller.apiSendCallInvitation(call.contact, callType)
             chatModel.activeCall.value = call.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities)
           }
-          is WCallResponse.Offer -> withBGApi {
+          is WCallResponse.Offer -> withApi {
             chatModel.controller.apiSendCallOffer(call.contact, r.offer, r.iceCandidates, call.localMedia, r.capabilities)
             chatModel.activeCall.value = call.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities)
           }
-          is WCallResponse.Answer -> withBGApi {
+          is WCallResponse.Answer -> withApi {
             chatModel.controller.apiSendCallAnswer(call.contact, r.answer, r.iceCandidates)
             chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
           }
-          is WCallResponse.Ice -> withBGApi {
+          is WCallResponse.Ice -> withApi {
             chatModel.controller.apiSendCallExtraInfo(call.contact, r.iceCandidates)
           }
           is WCallResponse.Connection ->
             try {
               val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
               if (callStatus == WebRTCCallStatus.Connected) {
-                chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectedAt = Clock.System.now())
+                chatModel.activeCall.value = call.copy(callState = CallState.Connected)
                 setCallSound(call.soundSpeaker, audioViaBluetooth)
               }
-              withBGApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
+              withApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
             } catch (e: Error) {
               Log.d(TAG,"call status ${r.state.connectionState} not used")
             }
@@ -149,12 +145,9 @@ actual fun ActiveCallView() {
               setCallSound(call.soundSpeaker, audioViaBluetooth)
             }
           }
-          is WCallResponse.End -> {
-            withBGApi { chatModel.callManager.endCall(call) }
-          }
           is WCallResponse.Ended -> {
             chatModel.activeCall.value = call.copy(callState = CallState.Ended)
-            withBGApi { chatModel.callManager.endCall(call) }
+            withApi { chatModel.callManager.endCall(call) }
             chatModel.showCallView.value = false
           }
           is WCallResponse.Ok -> when (val cmd = apiMsg.command) {
@@ -169,7 +162,7 @@ actual fun ActiveCallView() {
             is WCallCommand.Camera -> {
               chatModel.activeCall.value = call.copy(localCamera = cmd.camera)
               if (!call.audioEnabled) {
-                chatModel.callCommand.add(WCallCommand.Media(CallMediaType.Audio, enable = false))
+                chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = false)
               }
             }
             is WCallCommand.End ->
@@ -194,14 +187,11 @@ actual fun ActiveCallView() {
     // Lock orientation to portrait in order to have good experience with calls
     activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     chatModel.activeCallViewIsVisible.value = true
-    // After the first call, End command gets added to the list which prevents making another calls
-    chatModel.callCommand.removeAll { it is WCallCommand.End }
     onDispose {
       activity.volumeControlStream = prevVolumeControlStream
       // Unlock orientation
       activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
       chatModel.activeCallViewIsVisible.value = false
-      chatModel.callCommand.clear()
     }
   }
 }
@@ -211,9 +201,9 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetoot
   ActiveCallOverlayLayout(
     call = call,
     speakerCanBeEnabled = !audioViaBluetooth.value,
-    dismiss = { withBGApi { chatModel.callManager.endCall(call) } },
-    toggleAudio = { chatModel.callCommand.add(WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled)) },
-    toggleVideo = { chatModel.callCommand.add(WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled)) },
+    dismiss = { withApi { chatModel.callManager.endCall(call) } },
+    toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
+    toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
     toggleSound = {
       var call = chatModel.activeCall.value
       if (call != null) {
@@ -222,7 +212,7 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetoot
         setCallSound(call.soundSpeaker, audioViaBluetooth)
       }
     },
-    flipCamera = { chatModel.callCommand.add(WCallCommand.Camera(call.localCamera.flipped)) }
+    flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
   )
 }
 
@@ -449,7 +439,7 @@ private fun DisabledBackgroundCallsButton() {
 //}
 
 @Composable
-fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIMessage) -> Unit) {
+fun WebRTCView(callCommand: MutableState<WCallCommand?>, onResponse: (WVAPIMessage) -> Unit) {
   val scope = rememberCoroutineScope()
   val webView = remember { mutableStateOf<WebView?>(null) }
   val permissionsState = rememberMultiplePermissionsState(
@@ -480,19 +470,13 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
       webView.value = null
     }
   }
-  val wv = webView.value
-  if (wv != null) {
-    LaunchedEffect(Unit) {
-      snapshotFlow { callCommand.firstOrNull() }
-        .distinctUntilChanged()
-        .filterNotNull()
-        .collect {
-          while (callCommand.isNotEmpty()) {
-            val cmd = callCommand.removeFirst()
-            Log.d(TAG, "WebRTCView LaunchedEffect executing $cmd")
-            processCommand(wv, cmd)
-          }
-        }
+  LaunchedEffect(callCommand.value, webView.value) {
+    val cmd = callCommand.value
+    val wv = webView.value
+    if (cmd != null && wv != null) {
+      Log.d(TAG, "WebRTCView LaunchedEffect executing $cmd")
+      processCommand(wv, cmd)
+      callCommand.value = null
     }
   }
   val assetLoader = WebViewAssetLoader.Builder()
@@ -518,7 +502,7 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
                 }
               }
             }
-            this.webViewClient = LocalContentWebViewClient(webView, assetLoader)
+            this.webViewClient = LocalContentWebViewClient(assetLoader)
             this.clearHistory()
             this.clearCache(true)
             this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
@@ -528,10 +512,19 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
             webViewSettings.javaScriptEnabled = true
             webViewSettings.mediaPlaybackRequiresUserGesture = false
             webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-            this.loadUrl("file:android_asset/www/android/call.html")
+            this.loadUrl("file:android_asset/www/call.html")
           }
         }
-      ) { /* WebView */ }
+      ) { wv ->
+        Log.d(TAG, "WebRTCView: webview ready")
+        // for debugging
+        // wv.evaluateJavascript("sendMessageToNative = ({resp}) => WebRTCInterface.postMessage(JSON.stringify({command: resp}))", null)
+        scope.launch {
+          delay(2000L)
+          wv.evaluateJavascript("sendMessageToNative = (msg) => WebRTCInterface.postMessage(JSON.stringify(msg))", null)
+          webView.value = wv
+        }
+      }
     }
   }
 }
@@ -546,28 +539,19 @@ class WebRTCInterface(private val onResponse: (WVAPIMessage) -> Unit) {
       // for debugging
       // onResponse(message)
       onResponse(json.decodeFromString(message))
-    } catch (e: Exception) {
+    } catch (e: Error) {
       Log.e(TAG, "failed parsing WebView message: $message")
     }
   }
 }
 
-private class LocalContentWebViewClient(val webView: MutableState<WebView?>, private val assetLoader: WebViewAssetLoader) : WebViewClientCompat() {
+private class LocalContentWebViewClient(private val assetLoader: WebViewAssetLoader) : WebViewClientCompat() {
   override fun shouldInterceptRequest(
     view: WebView,
     request: WebResourceRequest
   ): WebResourceResponse? {
     return assetLoader.shouldInterceptRequest(request.url)
   }
-
-  override fun onPageFinished(view: WebView, url: String) {
-    super.onPageFinished(view, url)
-    view.evaluateJavascript("sendMessageToNative = (msg) => WebRTCInterface.postMessage(JSON.stringify(msg))", null)
-    webView.value = view
-    Log.d(TAG, "WebRTCView: webview ready")
-    // for debugging
-    // view.evaluateJavascript("sendMessageToNative = ({resp}) => WebRTCInterface.postMessage(JSON.stringify({command: resp}))", null)
-  }
 }
 
 @Preview

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

@@ -5,8 +5,6 @@ import android.os.Build
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.ui.platform.ClipboardManager
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatItem
@@ -43,7 +41,3 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
     showMenu.value = false
   })
 }
-
-actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) {
-  clipboard.setText(AnnotatedString(cItem.content.text))
-}

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

@@ -1,39 +0,0 @@
-package chat.simplex.common.views.chatlist
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Divider
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import chat.simplex.common.views.helpers.*
-
-@Composable
-actual fun ChatListNavLinkLayout(
-  chatLinkPreview: @Composable () -> Unit,
-  click: () -> Unit,
-  dropdownMenuItems: (@Composable () -> Unit)?,
-  showMenu: MutableState<Boolean>,
-  stopped: Boolean,
-  selectedChat: State<Boolean>
-) {
-  var modifier = Modifier.fillMaxWidth()
-  if (!stopped) modifier = modifier
-    .combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
-    .onRightClick { showMenu.value = true }
-  Box(modifier) {
-    Row(
-      modifier = Modifier
-        .fillMaxWidth()
-        .padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp),
-      verticalAlignment = Alignment.Top
-    ) {
-      chatLinkPreview()
-    }
-    if (dropdownMenuItems != null) {
-      DefaultDropdownMenu(showMenu, dropdownMenuItems = dropdownMenuItems)
-    }
-  }
-  Divider(Modifier.padding(horizontal = 8.dp))
-}

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

@@ -1,8 +0,0 @@
-package chat.simplex.common.views.chatlist
-
-import androidx.compose.runtime.*
-import chat.simplex.common.views.helpers.*
-import kotlinx.coroutines.flow.MutableStateFlow
-
-@Composable
-actual fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>) {}

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

@@ -46,7 +46,6 @@ extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
 extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
-extern char *chat_valid_name(const char *name);
 extern char *chat_write_file(const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(const char *from_path, const char *to_path);
@@ -122,14 +121,6 @@ Java_chat_simplex_common_platform_CoreKt_chatPasswordHash(JNIEnv *env, __unused
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz, jstring name) {
-    const char *_name = (*env)->GetStringUTFChars(env, name, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_valid_name(_name));
-    (*env)->ReleaseStringUTFChars(env, name, _name);
-    return res;
-}
-
 JNIEXPORT jstring JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jstring path, jobject buffer) {
     const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);

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

@@ -31,9 +31,9 @@ else()
     set(CMAKE_BUILD_RPATH "@loader_path")
 endif()
 
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64")
     set(OS_LIB_ARCH "x86_64")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
     set(OS_LIB_ARCH "aarch64")
 else()
     set(OS_LIB_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
@@ -54,13 +54,9 @@ add_library( # Sets the name of the library.
     simplex-api.c)
 
 add_library( simplex SHARED IMPORTED )
-if(WIN32)
-    FILE(GLOB SIMPLEXLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/lib*simplex*.${OS_LIB_EXT})
-    set_target_properties( simplex PROPERTIES IMPORTED_IMPLIB ${SIMPLEXLIB})
-else()
-    FILE(GLOB SIMPLEXLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/lib*simplex-chat*.${OS_LIB_EXT})
-    set_target_properties( simplex PROPERTIES IMPORTED_LOCATION ${SIMPLEXLIB})
-endif()
+# Lib has different name because of version, find it
+FILE(GLOB SIMPLEXLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSsimplex-chat-*.${OS_LIB_EXT})
+set_target_properties( simplex PROPERTIES IMPORTED_LOCATION ${SIMPLEXLIB})
 
 
 # Specifies libraries CMake should link to your target library. You
@@ -71,17 +67,12 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})
 
 	target_link_libraries(app-lib rts simplex)
 endif()
 
-if(APPLE)
-    add_custom_command(TARGET app-lib POST_BUILD
-        COMMAND  ${CMAKE_CURRENT_SOURCE_DIR}/patch-libapp-mac.sh
-)
-endif()
 
 
 # Trying to copy resulting files into needed directory, but none of these work for some reason. This could allow to

apps/multiplatform/common/src/commonMain/cpp/desktop/patch-libapp-mac.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-lib=libapp-lib.dylib
-RPATHS=$(otool -l $lib | grep -E '/Users|/opt/|/usr/local' | cut -d' ' -f11)
-for RPATH in $RPATHS; do
-    install_name_tool -delete_rpath $RPATH $lib
-done

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

@@ -21,7 +21,6 @@ extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
 extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
-extern char *chat_valid_name(const char *name);
 extern char *chat_write_file(const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(const char *from_path, const char *to_path);
@@ -76,7 +75,7 @@ Java_chat_simplex_common_platform_CoreKt_chatMigrateInit(JNIEnv *env, jclass cla
     jstring res = decode_to_utf8_string(env, chat_migrate_init(_dbPath, _dbKey, _confirm, &_ctrl));
     (*env)->ReleaseStringUTFChars(env, dbPath, _dbPath);
     (*env)->ReleaseStringUTFChars(env, dbKey, _dbKey);
-    (*env)->ReleaseStringUTFChars(env, confirm, _confirm);
+    (*env)->ReleaseStringUTFChars(env, dbKey, _confirm);
 
     // Creating array of Object's (boxed values can be passed, eg. Long instead of long)
     jobjectArray ret = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/Object"), NULL);
@@ -134,14 +133,6 @@ Java_chat_simplex_common_platform_CoreKt_chatPasswordHash(JNIEnv *env, jclass cl
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz, jstring name) {
-    const char *_name = encode_to_utf8_chars(env, name);
-    jstring res = decode_to_utf8_string(env, chat_valid_name(_name));
-    (*env)->ReleaseStringUTFChars(env, name, _name);
-    return res;
-}
-
 JNIEXPORT jstring JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jstring path, jobject buffer) {
     const char *_path = encode_to_utf8_chars(env, path);

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

@@ -17,7 +17,6 @@ import chat.simplex.common.views.usersettings.SetDeliveryReceiptsView
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.CreateFirstProfile
 import chat.simplex.common.views.helpers.SimpleButton
 import chat.simplex.common.views.SplashView
 import chat.simplex.common.views.call.ActiveCallView
@@ -136,7 +135,7 @@ fun MainScreen() {
           ModalManager.fullscreen.showInView()
         }
       }
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateFirstProfile(chatModel) {}
+      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
       onboarding == OnboardingStage.Step2_5_SetupDatabasePassphrase -> SetupDatabasePassphrase(chatModel)
       onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel)
       onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
@@ -150,7 +149,7 @@ fun MainScreen() {
       LaunchedEffect(Unit) {
         // With these constrains when user presses back button while on ChatList, activity destroys and shows auth request
         // while the screen moves to a launcher. Detect it and prevent showing the auth
-        if (!(androidIsFinishingMainActivity() && chatModel.controller.appPrefs.laMode.get() == LAMode.SYSTEM)) {
+        if (!(AppLock.destroyedAfterBackPress.value && chatModel.controller.appPrefs.laMode.get() == LAMode.SYSTEM)) {
           AppLock.runAuthenticate()
         }
       }

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

@@ -24,6 +24,7 @@ object AppLock {
 
   // Remember result and show it after orientation change
   val laFailed = mutableStateOf(false)
+  val destroyedAfterBackPress = mutableStateOf(false)
 
   fun clearAuthState() {
     userAuthorized.value = null

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

@@ -6,17 +6,17 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
+import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.chat.ComposeState
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.*
 import kotlinx.datetime.TimeZone
 import kotlinx.serialization.*
@@ -53,7 +53,6 @@ object ChatModel {
   // current chat
   val chatId = mutableStateOf<String?>(null)
   val chatItems = mutableStateListOf<ChatItem>()
-  val chatItemStatuses = mutableMapOf<Long, CIStatus>()
   val groupMembers = mutableStateListOf<GroupMember>()
 
   val terminalItems = mutableStateListOf<TerminalItem>()
@@ -88,7 +87,7 @@ object ChatModel {
   val activeCallInvitation = mutableStateOf<RcvCallInvitation?>(null)
   val activeCall = mutableStateOf<Call?>(null)
   val activeCallViewIsVisible = mutableStateOf<Boolean>(false)
-  val callCommand = mutableStateListOf<WCallCommand>()
+  val callCommand = mutableStateOf<WCallCommand?>(null)
   val showCallView = mutableStateOf(false)
   val switchingCall = mutableStateOf(false)
 
@@ -104,8 +103,6 @@ object ChatModel {
   val filesToDelete = mutableSetOf<File>()
   val simplexLinkMode by lazy { mutableStateOf(ChatController.appPrefs.simplexLinkMode.get()) }
 
-  var updatingChatsMutex: Mutex = Mutex()
-
   fun getUser(userId: Long): User? = if (currentUser.value?.userId == userId) {
     currentUser.value
   } else {
@@ -136,7 +133,6 @@ object ChatModel {
   fun hasChat(id: String): Boolean = chats.toList().firstOrNull { it.id == id } != null
   fun getChat(id: String): Chat? = chats.toList().firstOrNull { it.id == id }
   fun getContactChat(contactId: Long): Chat? = chats.toList().firstOrNull { it.chatInfo is ChatInfo.Direct && it.chatInfo.apiId == contactId }
-  fun getGroupChat(groupId: Long): Chat? = chats.toList().firstOrNull { it.chatInfo is ChatInfo.Group && it.chatInfo.apiId == groupId }
   private fun getChatIndex(id: String): Int = chats.toList().indexOfFirst { it.id == id }
   fun addChat(chat: Chat) = chats.add(index = 0, chat)
 
@@ -203,7 +199,7 @@ object ChatModel {
     }
   }
 
-  suspend fun addChatItem(cInfo: ChatInfo, cItem: ChatItem) = updatingChatsMutex.withLock {
+  suspend fun addChatItem(cInfo: ChatInfo, cItem: ChatItem) {
     // update previews
     val i = getChatIndex(cInfo.id)
     val chat: Chat
@@ -226,25 +222,22 @@ object ChatModel {
     } else {
       addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf(cItem)))
     }
-    Log.d(TAG, "TODOCHAT: addChatItem: adding to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
-    withContext(Dispatchers.Main) {
-      // add to current chat
-      if (chatId.value == cInfo.id) {
-        Log.d(TAG, "TODOCHAT: addChatItem: chatIds are equal, size ${chatItems.size}")
+    // add to current chat
+    if (chatId.value == cInfo.id) {
+      withContext(Dispatchers.Main) {
         // Prevent situation when chat item already in the list received from backend
         if (chatItems.none { it.id == cItem.id }) {
           if (chatItems.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
             chatItems.add(kotlin.math.max(0, chatItems.lastIndex), cItem)
           } else {
             chatItems.add(cItem)
-            Log.d(TAG, "TODOCHAT: addChatItem: added to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
           }
         }
       }
     }
   }
 
-  suspend fun upsertChatItem(cInfo: ChatInfo, cItem: ChatItem): Boolean  = updatingChatsMutex.withLock {
+  suspend fun upsertChatItem(cInfo: ChatInfo, cItem: ChatItem): Boolean {
     // update previews
     val i = getChatIndex(cInfo.id)
     val chat: Chat
@@ -264,41 +257,30 @@ object ChatModel {
       addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf(cItem)))
       res = true
     }
-    Log.d(TAG, "TODOCHAT: upsertChatItem: upserting to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
-    return withContext(Dispatchers.Main) {
-      // update current chat
-      if (chatId.value == cInfo.id) {
+    // update current chat
+    return if (chatId.value == cInfo.id) {
+      withContext(Dispatchers.Main) {
         val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
         if (itemIndex >= 0) {
           chatItems[itemIndex] = cItem
-          Log.d(TAG, "TODOCHAT: upsertChatItem: updated in chat $chatId from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
           false
         } else {
-          val status = chatItemStatuses.remove(cItem.id)
-          val ci = if (status != null && cItem.meta.itemStatus is CIStatus.SndNew) {
-            cItem.copy(meta = cItem.meta.copy(itemStatus = status))
-          } else {
-            cItem
-          }
-          chatItems.add(ci)
-          Log.d(TAG, "TODOCHAT: upsertChatItem: added to chat $chatId from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
+          chatItems.add(cItem)
           true
         }
-      } else {
-        res
       }
+    } else {
+      res
     }
   }
 
-  suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem, status: CIStatus? = null) {
-    withContext(Dispatchers.Main) {
-      if (chatId.value == cInfo.id) {
+  suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem) {
+    if (chatId.value == cInfo.id) {
+      withContext(Dispatchers.Main) {
         val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
         if (itemIndex >= 0) {
           chatItems[itemIndex] = cItem
         }
-      } else if (status != null) {
-        chatItemStatuses[cItem.id] = status
       }
     }
   }
@@ -336,7 +318,6 @@ object ChatModel {
     }
     // clear current chat
     if (chatId.value == cInfo.id) {
-      chatItemStatuses.clear()
       chatItems.clear()
     }
   }
@@ -393,7 +374,6 @@ object ChatModel {
     var markedRead = 0
     if (chatId.value == cInfo.id) {
       var i = 0
-      Log.d(TAG, "TODOCHAT: markItemsReadInCurrentChat: marking read ${cInfo.id}, current chatId ${chatId.value}, size was ${chatItems.size}")
       while (i < chatItems.count()) {
         val item = chatItems[i]
         if (item.meta.itemStatus is CIStatus.RcvNew && (range == null || (range.from <= item.id && item.id <= range.to))) {
@@ -408,7 +388,6 @@ object ChatModel {
         }
         i += 1
       }
-      Log.d(TAG, "TODOCHAT: markItemsReadInCurrentChat: marked read ${cInfo.id}, current chatId ${chatId.value}, size now ${chatItems.size}")
     }
     return markedRead
   }
@@ -740,7 +719,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contactConnection.apiId
     override val ready get() = contactConnection.ready
     override val sendMsgEnabled get() = contactConnection.sendMsgEnabled
-    override val ntfsEnabled get() = false
+    override val ntfsEnabled get() = contactConnection.incognito
     override val incognito get() = contactConnection.incognito
     override fun featureEnabled(feature: ChatFeature) = contactConnection.featureEnabled(feature)
     override val timedMessagesTTL: Int? get() = contactConnection.timedMessagesTTL
@@ -800,19 +779,16 @@ sealed class NetworkStatus {
   val statusExplanation: String get() =
     when (this) {
       is Connected -> generalGetString(MR.strings.connected_to_server_to_receive_messages_from_contact)
-      is Error -> String.format(generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages_with_error), connectionError)
+      is Error -> String.format(generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages_with_error), error)
       else -> generalGetString(MR.strings.trying_to_connect_to_server_to_receive_messages)
     }
 
   @Serializable @SerialName("unknown") class Unknown: NetworkStatus()
   @Serializable @SerialName("connected") class Connected: NetworkStatus()
   @Serializable @SerialName("disconnected") class Disconnected: NetworkStatus()
-  @Serializable @SerialName("error") class Error(val connectionError: String): NetworkStatus()
+  @Serializable @SerialName("error") class Error(val error: String): NetworkStatus()
 }
 
-@Serializable
-data class ConnNetworkStatus(val agentConnId: String, val networkStatus: NetworkStatus)
-
 @Serializable
 data class Contact(
   val contactId: Long,
@@ -821,7 +797,6 @@ data class Contact(
   val activeConn: Connection,
   val viaGroup: Long? = null,
   val contactUsed: Boolean,
-  val contactStatus: ContactStatus,
   val chatSettings: ChatSettings,
   val userPreferences: ChatPreferences,
   val mergedPreferences: ContactUserPreferences,
@@ -834,12 +809,11 @@ data class Contact(
   override val id get() = "@$contactId"
   override val apiId get() = contactId
   override val ready get() = activeConn.connStatus == ConnStatus.Ready
-  val active get() = contactStatus == ContactStatus.Active
   override val sendMsgEnabled get() =
-    (ready && active && !(activeConn.connectionStats?.ratchetSyncSendProhibited ?: false))
+    (ready && !(activeConn.connectionStats?.ratchetSyncSendProhibited ?: false))
         || nextSendGrpInv
   val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
-  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
+  override val ntfsEnabled get() = chatSettings.enableNtfs
   override val incognito get() = contactConnIncognito
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.enabled.forUser
@@ -885,8 +859,7 @@ data class Contact(
       profile = LocalProfile.sampleData,
       activeConn = Connection.sampleData,
       contactUsed = true,
-      contactStatus = ContactStatus.Active,
-      chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
+      chatSettings = ChatSettings(enableNtfs = true, sendRcpts = null, favorite = false),
       userPreferences = ChatPreferences.sampleData,
       mergedPreferences = ContactUserPreferences.sampleData,
       createdAt = Clock.System.now(),
@@ -896,12 +869,6 @@ data class Contact(
   }
 }
 
-@Serializable
-enum class ContactStatus {
-  @SerialName("active") Active,
-  @SerialName("deleted") Deleted;
-}
-
 @Serializable
 class ContactRef(
   val contactId: Long,
@@ -1026,7 +993,7 @@ data class GroupInfo (
   override val apiId get() = groupId
   override val ready get() = membership.memberActive
   override val sendMsgEnabled get() = membership.memberActive
-  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
+  override val ntfsEnabled get() = chatSettings.enableNtfs
   override val incognito get() = membership.memberIncognito
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> fullGroupPreferences.timedMessages.on
@@ -1058,16 +1025,13 @@ data class GroupInfo (
       fullGroupPreferences = FullGroupPreferences.sampleData,
       membership = GroupMember.sampleData,
       hostConnCustomUserProfileId = null,
-      chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
+      chatSettings = ChatSettings(enableNtfs = true, sendRcpts = null, favorite = false),
       createdAt = Clock.System.now(),
       updatedAt = Clock.System.now()
     )
   }
 }
 
-@Serializable
-data class GroupRef(val groupId: Long, val localDisplayName: String)
-
 @Serializable
 data class GroupProfile (
   override val displayName: String,
@@ -1093,7 +1057,6 @@ data class GroupMember (
   var memberRole: GroupMemberRole,
   var memberCategory: GroupMemberCategory,
   var memberStatus: GroupMemberStatus,
-  var memberSettings: GroupMemberSettings,
   var invitedBy: InvitedBy,
   val localDisplayName: String,
   val memberProfile: LocalProfile,
@@ -1161,7 +1124,6 @@ data class GroupMember (
       memberRole = GroupMemberRole.Member,
       memberCategory = GroupMemberCategory.InviteeMember,
       memberStatus = GroupMemberStatus.MemComplete,
-      memberSettings = GroupMemberSettings(showMessages = true),
       invitedBy = InvitedBy.IBUser(),
       localDisplayName = "alice",
       memberProfile = LocalProfile.sampleData,
@@ -1173,20 +1135,11 @@ data class GroupMember (
 }
 
 @Serializable
-data class GroupMemberSettings(val showMessages: Boolean) {}
-
-@Serializable
-data class GroupMemberRef(
+class GroupMemberRef(
   val groupMemberId: Long,
   val profile: Profile
 )
 
-@Serializable
-data class GroupMemberIds(
-  val groupMemberId: Long,
-  val groupId: Long
-)
-
 @Serializable
 enum class GroupMemberRole(val memberRole: String) {
   @SerialName("observer") Observer("observer"), // order matters in comparisons
@@ -1280,7 +1233,7 @@ class LinkPreview (
 
 @Serializable
 class MemberSubError (
-  val member: GroupMemberIds,
+  val member: GroupMember,
   val memberError: ChatError
 )
 
@@ -1518,7 +1471,6 @@ data class ChatItem (
       is CIContent.RcvDecryptionError -> showNtfDir
       is CIContent.RcvGroupInvitation -> showNtfDir
       is CIContent.SndGroupInvitation -> showNtfDir
-      is CIContent.RcvDirectEventContent -> false
       is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
         is RcvGroupEvent.MemberAdded -> false
         is RcvGroupEvent.MemberConnected -> false
@@ -1875,7 +1827,6 @@ enum class SndCIStatusProgress {
 @Serializable
 sealed class CIDeleted {
   @Serializable @SerialName("deleted") class Deleted(val deletedTs: Instant?): CIDeleted()
-  @Serializable @SerialName("blocked") class Blocked(val deletedTs: Instant?): CIDeleted()
   @Serializable @SerialName("moderated") class Moderated(val deletedTs: Instant?, val byGroupMember: GroupMember): CIDeleted()
 }
 
@@ -1903,7 +1854,6 @@ sealed class CIContent: ItemContent {
   @Serializable @SerialName("rcvDecryptionError") class RcvDecryptionError(val msgDecryptError: MsgDecryptError, val msgCount: UInt): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("rcvGroupInvitation") class RcvGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("sndGroupInvitation") class SndGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
-  @Serializable @SerialName("rcvDirectEvent") class RcvDirectEventContent(val rcvDirectEvent: RcvDirectEvent): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("rcvGroupEvent") class RcvGroupEventContent(val rcvGroupEvent: RcvGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("sndGroupEvent") class SndGroupEventContent(val sndGroupEvent: SndGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("rcvConnEvent") class RcvConnEventContent(val rcvConnEvent: RcvConnEvent): CIContent() { override val msgContent: MsgContent? get() = null }
@@ -1931,7 +1881,6 @@ sealed class CIContent: ItemContent {
       is RcvDecryptionError -> msgDecryptError.text
       is RcvGroupInvitation -> groupInvitation.text
       is SndGroupInvitation -> groupInvitation.text
-      is RcvDirectEventContent -> rcvDirectEvent.text
       is RcvGroupEventContent -> rcvGroupEvent.text
       is SndGroupEventContent -> sndGroupEvent.text
       is RcvConnEventContent -> rcvConnEvent.text
@@ -2427,7 +2376,7 @@ sealed class Format {
   @Serializable @SerialName("secret") class Secret: Format()
   @Serializable @SerialName("colored") class Colored(val color: FormatColor): Format()
   @Serializable @SerialName("uri") class Uri: Format()
-  @Serializable @SerialName("simplexLink") class SimplexLink(val linkType: SimplexLinkType, val simplexUri: String, val smpHosts: List<String>): Format()
+  @Serializable @SerialName("simplexLink") class SimplexLink(val linkType: SimplexLinkType, val simplexUri: String, val trustedUri: Boolean, val smpHosts: List<String>): Format()
   @Serializable @SerialName("email") class Email: Format()
   @Serializable @SerialName("phone") class Phone: Format()
 
@@ -2538,15 +2487,6 @@ sealed class MsgErrorType() {
   }
 }
 
-@Serializable
-sealed class RcvDirectEvent() {
-  @Serializable @SerialName("contactDeleted") class ContactDeleted(): RcvDirectEvent()
-
-  val text: String get() = when (this) {
-    is ContactDeleted -> generalGetString(MR.strings.rcv_direct_event_contact_deleted)
-  }
-}
-
 @Serializable
 sealed class RcvGroupEvent() {
   @Serializable @SerialName("memberAdded") class MemberAdded(val groupMemberId: Long, val profile: Profile): RcvGroupEvent()

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

@@ -4,7 +4,6 @@ import chat.simplex.common.views.helpers.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
-import chat.simplex.common.model.ChatModel.updatingChatsMutex
 import dev.icerock.moko.resources.compose.painterResource
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
@@ -17,7 +16,6 @@ import com.charleskorn.kaml.YamlConfiguration
 import chat.simplex.res.MR
 import com.russhwolf.settings.Settings
 import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
@@ -108,7 +106,6 @@ class AppPreferences {
   val chatArchiveTime = mkDatePreference(SHARED_PREFS_CHAT_ARCHIVE_TIME, null)
   val chatLastStart = mkDatePreference(SHARED_PREFS_CHAT_LAST_START, null)
   val developerTools = mkBoolPreference(SHARED_PREFS_DEVELOPER_TOOLS, false)
-  val terminalAlwaysVisible = mkBoolPreference(SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE, false)
   val networkUseSocksProxy = mkBoolPreference(SHARED_PREFS_NETWORK_USE_SOCKS_PROXY, false)
   val networkProxyHostPort = mkStrPreference(SHARED_PREFS_NETWORK_PROXY_HOST_PORT, "localhost:9050")
   private val _networkSessionMode = mkStrPreference(SHARED_PREFS_NETWORK_SESSION_MODE, TransportSessionMode.default.name)
@@ -268,7 +265,6 @@ class AppPreferences {
     private const val SHARED_PREFS_ONBOARDING_STAGE = "OnboardingStage"
     private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
     private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
-    private const val SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE = "TerminalAlwaysVisible"
     private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
     private const val SHARED_PREFS_NETWORK_PROXY_HOST_PORT = "NetworkProxyHostPort"
     private const val SHARED_PREFS_NETWORK_SESSION_MODE = "NetworkSessionMode"
@@ -338,7 +334,6 @@ object ChatController {
       apiSetTempFolder(coreTmpDir.absolutePath)
       apiSetFilesFolder(appFilesDir.absolutePath)
       apiSetXFTPConfig(getXFTPCfg())
-      apiSetEncryptLocalFiles(appPrefs.privacyEncryptLocalFiles.get())
       val justStarted = apiStartChat()
       val users = listUsers()
       chatModel.users.clear()
@@ -352,10 +347,8 @@ object ChatController {
         startReceiver()
         Log.d(TAG, "startChat: started")
       } else {
-        updatingChatsMutex.withLock {
-          val chats = apiGetChats()
-          chatModel.updateChats(chats)
-        }
+        val chats = apiGetChats()
+        chatModel.updateChats(chats)
         Log.d(TAG, "startChat: running")
       }
     } catch (e: Error) {
@@ -389,10 +382,8 @@ object ChatController {
   suspend fun getUserChatData() {
     chatModel.userAddress.value = apiGetUserAddress()
     chatModel.chatItemTTL.value = getChatItemTTL()
-    updatingChatsMutex.withLock {
-      val chats = apiGetChats()
-      chatModel.updateChats(chats)
-    }
+    val chats = apiGetChats()
+    chatModel.updateChats(chats)
   }
 
   private fun startReceiver() {
@@ -560,8 +551,6 @@ object ChatController {
     throw Error("apiSetXFTPConfig bad response: ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(CC.ApiSetEncryptLocalFiles(enable))
-
   suspend fun apiExportArchive(config: ArchiveConfig) {
     val r = sendCmd(CC.ApiExportArchive(config))
     if (r is CR.CmdOk) return
@@ -855,14 +844,6 @@ object ChatController {
     return null
   }
 
-  suspend fun apiConnectPlan(connReq: String): ConnectionPlan? {
-    val userId = kotlin.runCatching { currentUserId("apiConnectPlan") }.getOrElse { return null }
-    val r = sendCmd(CC.APIConnectPlan(userId, connReq))
-    if (r is CR.CRConnectionPlan) return r.connectionPlan
-    Log.e(TAG, "apiConnectPlan bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
   suspend fun apiConnect(incognito: Boolean, connReq: String): Boolean  {
     val userId = chatModel.currentUser.value?.userId ?: run {
       Log.e(TAG, "apiConnect: no current user")
@@ -904,8 +885,8 @@ object ChatController {
     }
   }
 
-  suspend fun apiDeleteChat(type: ChatType, id: Long, notify: Boolean? = null): Boolean {
-    val r = sendCmd(CC.ApiDeleteChat(type, id, notify))
+  suspend fun apiDeleteChat(type: ChatType, id: Long): Boolean {
+    val r = sendCmd(CC.ApiDeleteChat(type, id))
     when {
       r is CR.ContactDeleted && type == ChatType.Direct -> return true
       r is CR.ContactConnectionDeleted && type == ChatType.ContactConnection -> return true
@@ -1093,13 +1074,6 @@ object ChatController {
     return r is CR.CmdOk
   }
 
-  suspend fun apiGetNetworkStatuses(): List<ConnNetworkStatus>? {
-    val r = sendCmd(CC.ApiGetNetworkStatuses())
-    if (r is CR.NetworkStatuses) return r.networkStatuses
-    Log.e(TAG, "apiGetNetworkStatuses bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
   suspend fun apiChatRead(type: ChatType, id: Long, range: CC.ItemRange): Boolean {
     val r = sendCmd(CC.ApiChatRead(type, id, range))
     if (r is CR.CmdOk) return true
@@ -1338,13 +1312,6 @@ object ChatController {
     }
   }
 
-  private suspend fun sendCommandOkResp(cmd: CC): Boolean {
-    val r = sendCmd(cmd)
-    val ok = r is CR.CmdOk
-    if (!ok) apiErrorAlert(cmd.cmdType, generalGetString(MR.strings.error_alert_title), r)
-    return ok
-  }
-
   suspend fun apiGetVersion(): CoreVersionInfo? {
     val r = sendCmd(CC.ShowVersion())
     return if (r is CR.VersionInfo) {
@@ -1399,11 +1366,6 @@ object ChatController {
           chatModel.removeChat(r.connection.id)
         }
       }
-      is CR.ContactDeletedByContact -> {
-        if (active(r.user) && r.contact.directOrUsed) {
-          chatModel.updateContact(r.contact)
-        }
-      }
       is CR.ContactConnected -> {
         if (active(r.user) && r.contact.directOrUsed) {
           chatModel.updateContact(r.contact)
@@ -1450,6 +1412,12 @@ object ChatController {
       }
       is CR.ContactsSubscribed -> updateContactsStatus(r.contactRefs, NetworkStatus.Connected())
       is CR.ContactsDisconnected -> updateContactsStatus(r.contactRefs, NetworkStatus.Disconnected())
+      is CR.ContactSubError -> {
+        if (active(r.user)) {
+          chatModel.updateContact(r.contact)
+        }
+        processContactSubError(r.contact, r.chatError)
+      }
       is CR.ContactSubSummary -> {
         for (sub in r.contactSubscriptions) {
           if (active(r.user)) {
@@ -1463,16 +1431,6 @@ object ChatController {
           }
         }
       }
-      is CR.NetworkStatusResp -> {
-        for (cId in r.connections) {
-          chatModel.networkStatuses[cId] = r.networkStatus
-        }
-      }
-      is CR.NetworkStatuses -> {
-        for (s in r.networkStatuses) {
-          chatModel.networkStatuses[s.agentConnId] = s.networkStatus
-        }
-      }
       is CR.NewChatItem -> {
         val cInfo = r.chatItem.chatInfo
         val cItem = r.chatItem.chatItem
@@ -1497,8 +1455,11 @@ object ChatController {
       is CR.ChatItemStatusUpdated -> {
         val cInfo = r.chatItem.chatInfo
         val cItem = r.chatItem.chatItem
-        if (!cItem.isDeletedContent && active(r.user)) {
-          chatModel.updateChatItem(cInfo, cItem, status = cItem.meta.itemStatus)
+        if (!cItem.isDeletedContent) {
+          val added = if (active(r.user)) chatModel.upsertChatItem(cInfo, cItem) else true
+          if (added && cItem.showNotification) {
+            ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
+          }
         }
       }
       is CR.ChatItemUpdated ->
@@ -1647,25 +1608,25 @@ object ChatController {
           val useRelay = appPrefs.webrtcPolicyRelay.get()
           val iceServers = getIceServers()
           Log.d(TAG, ".callOffer iceServers $iceServers")
-          chatModel.callCommand.add(WCallCommand.Offer(
+          chatModel.callCommand.value = WCallCommand.Offer(
             offer = r.offer.rtcSession,
             iceCandidates = r.offer.rtcIceCandidates,
             media = r.callType.media,
             aesKey = r.sharedKey,
             iceServers = iceServers,
             relay = useRelay
-          ))
+          )
         }
       }
       is CR.CallAnswer -> {
         withCall(r, r.contact) { call ->
           chatModel.activeCall.value = call.copy(callState = CallState.AnswerReceived)
-          chatModel.callCommand.add(WCallCommand.Answer(answer = r.answer.rtcSession, iceCandidates = r.answer.rtcIceCandidates))
+          chatModel.callCommand.value = WCallCommand.Answer(answer = r.answer.rtcSession, iceCandidates = r.answer.rtcIceCandidates)
         }
       }
       is CR.CallExtraInfo -> {
         withCall(r, r.contact) { _ ->
-          chatModel.callCommand.add(WCallCommand.Ice(iceCandidates = r.extraInfo.rtcIceCandidates))
+          chatModel.callCommand.value = WCallCommand.Ice(iceCandidates = r.extraInfo.rtcIceCandidates)
         }
       }
       is CR.CallEnded -> {
@@ -1674,7 +1635,7 @@ object ChatController {
           chatModel.callManager.reportCallRemoteEnded(invitation = invitation)
         }
         withCall(r, r.contact) { _ ->
-          chatModel.callCommand.add(WCallCommand.End)
+          chatModel.callCommand.value = WCallCommand.End
           withApi {
             chatModel.activeCall.value = null
             chatModel.showCallView.value = false
@@ -1873,7 +1834,6 @@ sealed class CC {
   class SetTempFolder(val tempFolder: String): CC()
   class SetFilesFolder(val filesFolder: String): CC()
   class ApiSetXFTPConfig(val config: XFTPFileConfig?): CC()
-  class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
   class ApiExportArchive(val config: ArchiveConfig): CC()
   class ApiImportArchive(val config: ArchiveConfig): CC()
   class ApiDeleteStorage: CC()
@@ -1922,9 +1882,8 @@ sealed class CC {
   class APIVerifyGroupMember(val groupId: Long, val groupMemberId: Long, val connectionCode: String?): CC()
   class APIAddContact(val userId: Long, val incognito: Boolean): CC()
   class ApiSetConnectionIncognito(val connId: Long, val incognito: Boolean): CC()
-  class APIConnectPlan(val userId: Long, val connReq: String): CC()
   class APIConnect(val userId: Long, val incognito: Boolean, val connReq: String): CC()
-  class ApiDeleteChat(val type: ChatType, val id: Long, val notify: Boolean?): CC()
+  class ApiDeleteChat(val type: ChatType, val id: Long): CC()
   class ApiClearChat(val type: ChatType, val id: Long): CC()
   class ApiListContacts(val userId: Long): CC()
   class ApiUpdateProfile(val userId: Long, val profile: Profile): CC()
@@ -1943,12 +1902,11 @@ sealed class CC {
   class ApiSendCallExtraInfo(val contact: Contact, val extraInfo: WebRTCExtraInfo): CC()
   class ApiEndCall(val contact: Contact): CC()
   class ApiCallStatus(val contact: Contact, val callStatus: WebRTCCallStatus): CC()
-  class ApiGetNetworkStatuses(): CC()
   class ApiAcceptContact(val incognito: Boolean, val contactReqId: Long): CC()
   class ApiRejectContact(val contactReqId: Long): CC()
   class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
   class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
-  class ReceiveFile(val fileId: Long, val encrypt: Boolean, val inline: Boolean?): CC()
+  class ReceiveFile(val fileId: Long, val encrypted: Boolean, val inline: Boolean?): CC()
   class CancelFile(val fileId: Long): CC()
   class ShowVersion(): CC()
 
@@ -1980,7 +1938,6 @@ sealed class CC {
     is SetTempFolder -> "/_temp_folder $tempFolder"
     is SetFilesFolder -> "/_files_folder $filesFolder"
     is ApiSetXFTPConfig -> if (config != null) "/_xftp on ${json.encodeToString(config)}" else "/_xftp off"
-    is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
     is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
     is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
     is ApiDeleteStorage -> "/_db delete"
@@ -2032,13 +1989,8 @@ sealed class CC {
     is APIVerifyGroupMember -> "/_verify code #$groupId $groupMemberId" + if (connectionCode != null) " $connectionCode" else ""
     is APIAddContact -> "/_connect $userId incognito=${onOff(incognito)}"
     is ApiSetConnectionIncognito -> "/_set incognito :$connId ${onOff(incognito)}"
-    is APIConnectPlan -> "/_connect plan $userId $connReq"
     is APIConnect -> "/_connect $userId incognito=${onOff(incognito)} $connReq"
-    is ApiDeleteChat -> if (notify != null) {
-      "/_delete ${chatRef(type, id)} notify=${onOff(notify)}"
-    } else {
-      "/_delete ${chatRef(type, id)}"
-    }
+    is ApiDeleteChat -> "/_delete ${chatRef(type, id)}"
     is ApiClearChat -> "/_clear chat ${chatRef(type, id)}"
     is ApiListContacts -> "/_contacts $userId"
     is ApiUpdateProfile -> "/_profile $userId ${json.encodeToString(profile)}"
@@ -2059,13 +2011,9 @@ sealed class CC {
     is ApiSendCallExtraInfo -> "/_call extra @${contact.apiId} ${json.encodeToString(extraInfo)}"
     is ApiEndCall -> "/_call end @${contact.apiId}"
     is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus.value}"
-    is ApiGetNetworkStatuses -> "/_network_statuses"
     is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
     is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
-    is ReceiveFile ->
-      "/freceive $fileId" +
-          (if (encrypt == null) "" else " encrypt=${onOff(encrypt)}") +
-          (if (inline == null) "" else " inline=${onOff(inline)}")
+    is ReceiveFile -> "/freceive $fileId encrypt=${onOff(encrypted)}" + (if (inline == null) "" else " inline=${onOff(inline)}")
     is CancelFile -> "/fcancel $fileId"
     is ShowVersion -> "/version"
   }
@@ -2089,7 +2037,6 @@ sealed class CC {
     is SetTempFolder -> "setTempFolder"
     is SetFilesFolder -> "setFilesFolder"
     is ApiSetXFTPConfig -> "apiSetXFTPConfig"
-    is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
     is ApiExportArchive -> "apiExportArchive"
     is ApiImportArchive -> "apiImportArchive"
     is ApiDeleteStorage -> "apiDeleteStorage"
@@ -2138,7 +2085,6 @@ sealed class CC {
     is APIVerifyGroupMember -> "apiVerifyGroupMember"
     is APIAddContact -> "apiAddContact"
     is ApiSetConnectionIncognito -> "apiSetConnectionIncognito"
-    is APIConnectPlan -> "apiConnectPlan"
     is APIConnect -> "apiConnect"
     is ApiDeleteChat -> "apiDeleteChat"
     is ApiClearChat -> "apiClearChat"
@@ -2161,7 +2107,6 @@ sealed class CC {
     is ApiSendCallExtraInfo -> "apiSendCallExtraInfo"
     is ApiEndCall -> "apiEndCall"
     is ApiCallStatus -> "apiCallStatus"
-    is ApiGetNetworkStatuses -> "apiGetNetworkStatuses"
     is ApiChatRead -> "apiChatRead"
     is ApiChatUnread -> "apiChatUnread"
     is ReceiveFile -> "receiveFile"
@@ -2520,22 +2465,15 @@ data class KeepAliveOpts(
 
 @Serializable
 data class ChatSettings(
-  val enableNtfs: MsgFilter,
+  val enableNtfs: Boolean,
   val sendRcpts: Boolean?,
   val favorite: Boolean
 ) {
   companion object {
-    val defaults: ChatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false)
+    val defaults: ChatSettings = ChatSettings(enableNtfs = true, sendRcpts = null, favorite = false)
   }
 }
 
-@Serializable
-enum class MsgFilter {
-  @SerialName("all") All,
-  @SerialName("none") None,
-  @SerialName("mentions") Mentions,
-}
-
 @Serializable
 data class UserMsgReceiptSettings(val enable: Boolean, val clearOverrides: Boolean)
 
@@ -3352,13 +3290,11 @@ sealed class CR {
   @Serializable @SerialName("connectionVerified") class ConnectionVerified(val user: UserRef, val verified: Boolean, val expectedCode: String): CR()
   @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connReqInvitation: String, val connection: PendingContactConnection): CR()
   @Serializable @SerialName("connectionIncognitoUpdated") class ConnectionIncognitoUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
-  @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connectionPlan: ConnectionPlan): CR()
   @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef): CR()
   @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef): CR()
   @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactRequestAlreadyAccepted") class ContactRequestAlreadyAccepted(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactDeleted") class ContactDeleted(val user: UserRef, val contact: Contact): CR()
-  @Serializable @SerialName("contactDeletedByContact") class ContactDeletedByContact(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("chatCleared") class ChatCleared(val user: UserRef, val chatInfo: ChatInfo): CR()
   @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange(val user: User): CR()
   @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val user: User, val fromProfile: Profile, val toProfile: Profile, val updateSummary: UserProfileUpdateSummary): CR()
@@ -3376,14 +3312,11 @@ sealed class CR {
   @Serializable @SerialName("acceptingContactRequest") class AcceptingContactRequest(val user: UserRef, val contact: Contact): CR()
   @Serializable @SerialName("contactRequestRejected") class ContactRequestRejected(val user: UserRef): CR()
   @Serializable @SerialName("contactUpdated") class ContactUpdated(val user: UserRef, val toContact: Contact): CR()
-  // TODO remove below
   @Serializable @SerialName("contactsSubscribed") class ContactsSubscribed(val server: String, val contactRefs: List<ContactRef>): CR()
   @Serializable @SerialName("contactsDisconnected") class ContactsDisconnected(val server: String, val contactRefs: List<ContactRef>): CR()
+  @Serializable @SerialName("contactSubError") class ContactSubError(val user: UserRef, val contact: Contact, val chatError: ChatError): CR()
   @Serializable @SerialName("contactSubSummary") class ContactSubSummary(val user: UserRef, val contactSubscriptions: List<ContactSubStatus>): CR()
-  // TODO remove above
-  @Serializable @SerialName("networkStatus") class NetworkStatusResp(val networkStatus: NetworkStatus, val connections: List<String>): CR()
-  @Serializable @SerialName("networkStatuses") class NetworkStatuses(val user_: UserRef?, val networkStatuses: List<ConnNetworkStatus>): CR()
-  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val user: UserRef, val group: GroupRef): CR()
+  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val user: UserRef, val group: GroupInfo): CR()
   @Serializable @SerialName("memberSubErrors") class MemberSubErrors(val user: UserRef, val memberSubErrors: List<MemberSubError>): CR()
   @Serializable @SerialName("groupEmpty") class GroupEmpty(val user: UserRef, val group: GroupInfo): CR()
   @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
@@ -3488,13 +3421,11 @@ sealed class CR {
     is ConnectionVerified -> "connectionVerified"
     is Invitation -> "invitation"
     is ConnectionIncognitoUpdated -> "connectionIncognitoUpdated"
-    is CRConnectionPlan -> "connectionPlan"
     is SentConfirmation -> "sentConfirmation"
     is SentInvitation -> "sentInvitation"
     is ContactAlreadyExists -> "contactAlreadyExists"
     is ContactRequestAlreadyAccepted -> "contactRequestAlreadyAccepted"
     is ContactDeleted -> "contactDeleted"
-    is ContactDeletedByContact -> "contactDeletedByContact"
     is ChatCleared -> "chatCleared"
     is UserProfileNoChange -> "userProfileNoChange"
     is UserProfileUpdated -> "userProfileUpdated"
@@ -3514,9 +3445,8 @@ sealed class CR {
     is ContactUpdated -> "contactUpdated"
     is ContactsSubscribed -> "contactsSubscribed"
     is ContactsDisconnected -> "contactsDisconnected"
+    is ContactSubError -> "contactSubError"
     is ContactSubSummary -> "contactSubSummary"
-    is NetworkStatusResp -> "networkStatus"
-    is NetworkStatuses -> "networkStatuses"
     is GroupSubscribed -> "groupSubscribed"
     is MemberSubErrors -> "memberSubErrors"
     is GroupEmpty -> "groupEmpty"
@@ -3619,13 +3549,11 @@ sealed class CR {
     is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
     is Invitation -> withUser(user, connReqInvitation)
     is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
-    is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
     is SentConfirmation -> withUser(user, noDetails())
     is SentInvitation -> withUser(user, noDetails())
     is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
     is ContactRequestAlreadyAccepted -> withUser(user, json.encodeToString(contact))
     is ContactDeleted -> withUser(user, json.encodeToString(contact))
-    is ContactDeletedByContact -> withUser(user, json.encodeToString(contact))
     is ChatCleared -> withUser(user, json.encodeToString(chatInfo))
     is UserProfileNoChange -> withUser(user, noDetails())
     is UserProfileUpdated -> withUser(user, json.encodeToString(toProfile))
@@ -3645,9 +3573,8 @@ sealed class CR {
     is ContactUpdated -> withUser(user, json.encodeToString(toContact))
     is ContactsSubscribed -> "server: $server\ncontacts:\n${json.encodeToString(contactRefs)}"
     is ContactsDisconnected -> "server: $server\ncontacts:\n${json.encodeToString(contactRefs)}"
+    is ContactSubError -> withUser(user, "error:\n${chatError.string}\ncontact:\n${json.encodeToString(contact)}")
     is ContactSubSummary -> withUser(user, json.encodeToString(contactSubscriptions))
-    is NetworkStatusResp -> "networkStatus $networkStatus\nconnections: $connections"
-    is NetworkStatuses -> withUser(user_, json.encodeToString(networkStatuses))
     is GroupSubscribed -> withUser(user, json.encodeToString(group))
     is MemberSubErrors -> withUser(user, json.encodeToString(memberSubErrors))
     is GroupEmpty -> withUser(user, json.encodeToString(group))
@@ -3733,39 +3660,6 @@ fun chatError(r: CR): ChatErrorType? {
       )
 }
 
-@Serializable
-sealed class ConnectionPlan {
-  @Serializable @SerialName("invitationLink") class InvitationLink(val invitationLinkPlan: InvitationLinkPlan): ConnectionPlan()
-  @Serializable @SerialName("contactAddress") class ContactAddress(val contactAddressPlan: ContactAddressPlan): ConnectionPlan()
-  @Serializable @SerialName("groupLink") class GroupLink(val groupLinkPlan: GroupLinkPlan): ConnectionPlan()
-}
-
-@Serializable
-sealed class InvitationLinkPlan {
-  @Serializable @SerialName("ok") object Ok: InvitationLinkPlan()
-  @Serializable @SerialName("ownLink") object OwnLink: InvitationLinkPlan()
-  @Serializable @SerialName("connecting") class Connecting(val contact_: Contact? = null): InvitationLinkPlan()
-  @Serializable @SerialName("known") class Known(val contact: Contact): InvitationLinkPlan()
-}
-
-@Serializable
-sealed class ContactAddressPlan {
-  @Serializable @SerialName("ok") object Ok: ContactAddressPlan()
-  @Serializable @SerialName("ownLink") object OwnLink: ContactAddressPlan()
-  @Serializable @SerialName("connectingConfirmReconnect") object ConnectingConfirmReconnect: ContactAddressPlan()
-  @Serializable @SerialName("connectingProhibit") class ConnectingProhibit(val contact: Contact): ContactAddressPlan()
-  @Serializable @SerialName("known") class Known(val contact: Contact): ContactAddressPlan()
-}
-
-@Serializable
-sealed class GroupLinkPlan {
-  @Serializable @SerialName("ok") object Ok: GroupLinkPlan()
-  @Serializable @SerialName("ownLink") class OwnLink(val groupInfo: GroupInfo): GroupLinkPlan()
-  @Serializable @SerialName("connectingConfirmReconnect") object ConnectingConfirmReconnect: GroupLinkPlan()
-  @Serializable @SerialName("connectingProhibit") class ConnectingProhibit(val groupInfo_: GroupInfo? = null): GroupLinkPlan()
-  @Serializable @SerialName("known") class Known(val groupInfo: GroupInfo): GroupLinkPlan()
-}
-
 abstract class TerminalItem {
   abstract val id: Long
   val date: Instant = Clock.System.now()
@@ -3925,11 +3819,9 @@ sealed class ChatErrorType {
       is ChatNotStarted -> "chatNotStarted"
       is ChatNotStopped -> "chatNotStopped"
       is ChatStoreChanged -> "chatStoreChanged"
-      is ConnectionPlanChatError -> "connectionPlan"
       is InvalidConnReq -> "invalidConnReq"
       is InvalidChatMessage -> "invalidChatMessage"
       is ContactNotReady -> "contactNotReady"
-      is ContactNotActive -> "contactNotActive"
       is ContactDisabled -> "contactDisabled"
       is ConnectionDisabled -> "connectionDisabled"
       is GroupUserRole -> "groupUserRole"
@@ -4002,11 +3894,9 @@ sealed class ChatErrorType {
   @Serializable @SerialName("chatNotStarted") object ChatNotStarted: ChatErrorType()
   @Serializable @SerialName("chatNotStopped") object ChatNotStopped: ChatErrorType()
   @Serializable @SerialName("chatStoreChanged") object ChatStoreChanged: ChatErrorType()
-  @Serializable @SerialName("connectionPlan") class ConnectionPlanChatError(val connectionPlan: ConnectionPlan): ChatErrorType()
   @Serializable @SerialName("invalidConnReq") object InvalidConnReq: ChatErrorType()
   @Serializable @SerialName("invalidChatMessage") class InvalidChatMessage(val connection: Connection, val message: String): ChatErrorType()
   @Serializable @SerialName("contactNotReady") class ContactNotReady(val contact: Contact): ChatErrorType()
-  @Serializable @SerialName("contactNotActive") class ContactNotActive(val contact: Contact): ChatErrorType()
   @Serializable @SerialName("contactDisabled") class ContactDisabled(val contact: Contact): ChatErrorType()
   @Serializable @SerialName("connectionDisabled") class ConnectionDisabled(val connection: Connection): ChatErrorType()
   @Serializable @SerialName("groupUserRole") class GroupUserRole(val groupInfo: GroupInfo, val requiredRole: GroupMemberRole): ChatErrorType()

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

@@ -20,7 +20,6 @@ external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
 external fun chatParseMarkdown(str: String): String
 external fun chatParseServer(str: String): String
 external fun chatPasswordHash(pwd: String, salt: String): String
-external fun chatValidName(name: String): String
 external fun chatWriteFile(path: String, buffer: ByteBuffer): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
 external fun chatEncryptFile(fromPath: String, toPath: String): String

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

@@ -4,8 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.text.TextStyle
 import chat.simplex.common.views.chat.ComposeState
-import java.io.File
-import java.net.URI
 
 @Composable
 expect fun PlatformTextField(
@@ -16,6 +14,5 @@ expect fun PlatformTextField(
   userIsObserver: Boolean,
   onMessageChange: (String) -> Unit,
   onUpArrow: () -> Unit,
-  onFilesPasted: (List<URI>) -> Unit,
   onDone: () -> Unit,
 )

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

@@ -14,5 +14,3 @@ expect fun LocalMultiplatformView(): Any?
 @Composable
 expect fun getKeyboardState(): State<KeyboardState>
 expect fun hideKeyboard(view: Any?)
-
-expect fun androidIsFinishingMainActivity(): Boolean

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

@@ -97,7 +97,6 @@ fun TerminalLayout(
             updateLiveMessage = null,
             editPrevMessage = {},
             onMessageChange = ::onMessageChange,
-            onFilesPasted = {},
             textStyle = textStyle
           )
         }
@@ -124,18 +123,7 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
   DisposableEffect(Unit) {
     onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
   }
-  val reversedTerminalItems by remember {
-    derivedStateOf {
-      // Such logic prevents concurrent modification
-      val res = ArrayList<TerminalItem>()
-      var i = 0
-      while (i < terminalItems.size) {
-        res.add(terminalItems[i])
-        i++
-      }
-      res.asReversed()
-    }
-  }
+  val reversedTerminalItems by remember { derivedStateOf { terminalItems.reversed().toList() } }
   val clipboard = LocalClipboardManager.current
   LazyColumn(state = listState, reverseLayout = true) {
     items(reversedTerminalItems) { item ->

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

@@ -1,10 +1,10 @@
 package chat.simplex.common.views
 
-import SectionTextFooter
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
 import androidx.compose.material.MaterialTheme.colors
 import androidx.compose.runtime.*
@@ -18,160 +18,115 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.Profile
-import chat.simplex.common.platform.*
+import chat.simplex.common.platform.appPlatform
+import chat.simplex.common.platform.navigationBarsWithImePadding
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.onboarding.*
-import chat.simplex.common.views.usersettings.SettingsActionItem
+import chat.simplex.common.views.onboarding.OnboardingStage
+import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch
+
+fun isValidDisplayName(name: String) : Boolean {
+  return (name.firstOrNull { it.isWhitespace() }) == null && !name.startsWith("@") && !name.startsWith("#")
+}
 
 @Composable
-fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val keyboardState by getKeyboardState()
-  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
+fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
+  val displayName = rememberSaveable { mutableStateOf("") }
+  val fullName = rememberSaveable { mutableStateOf("") }
+  val focusRequester = remember { FocusRequester() }
 
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .padding(top = 20.dp)
-    ) {
-      val displayName = rememberSaveable { mutableStateOf("") }
-      val focusRequester = remember { FocusRequester() }
-
-      Column(
-        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-      ) {
-        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-          AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
-          Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(
-              stringResource(MR.strings.display_name),
-              fontSize = 16.sp
-            )
-            val name = displayName.value.trim()
-            val validName = mkValidName(name)
-            Spacer(Modifier.height(20.dp))
-            if (name != validName) {
-              IconButton({ showInvalidNameAlert(mkValidName(displayName.value), displayName) }, Modifier.size(20.dp)) {
-                Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.error)
-              }
-            }
-          }
-          ProfileNameField(displayName, "", { it.trim() == mkValidName(it) }, focusRequester)
-        }
-        SettingsActionItem(
-          painterResource(MR.images.ic_check),
-          stringResource(MR.strings.create_another_profile_button),
-          disabled = !canCreateProfile(displayName.value),
-          textColor = MaterialTheme.colors.primary,
-          iconColor = MaterialTheme.colors.primary,
-          click = { createProfileInProfiles(chatModel, displayName.value, close) },
+  Column(
+    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
+  ) {
+    /*CloseSheetBar(close = {
+      if (chatModel.users.isEmpty()) {
+        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
+      } else {
+        close()
+      }
+    })*/
+    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
+      AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
+      ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues(), style = MaterialTheme.typography.body1)
+      ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Center, style = MaterialTheme.typography.body1)
+      Spacer(Modifier.height(DEFAULT_PADDING))
+      Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+        Text(
+          stringResource(MR.strings.display_name),
+          fontSize = 16.sp
         )
-        SectionTextFooter(generalGetString(MR.strings.your_profile_is_stored_on_your_device))
-        SectionTextFooter(generalGetString(MR.strings.profile_is_only_shared_with_your_contacts))
-
-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
-        }
-      }
-      if (savedKeyboardState != keyboardState) {
-        LaunchedEffect(keyboardState) {
-          scope.launch {
-            savedKeyboardState = keyboardState
-            scrollState.animateScrollTo(scrollState.maxValue)
-          }
+        if (!isValidDisplayName(displayName.value)) {
+          Text(
+            stringResource(MR.strings.no_spaces),
+            fontSize = 16.sp,
+            color = Color.Red
+          )
         }
       }
+      ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
+      Spacer(Modifier.height(DEFAULT_PADDING))
+      Text(
+        stringResource(MR.strings.full_name_optional__prompt),
+        fontSize = 16.sp,
+        modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+      )
+      ProfileNameField(fullName, "")
     }
-  }
-}
-
-@Composable
-fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val keyboardState by getKeyboardState()
-  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .padding(top = 20.dp)
-    ) {
-      val displayName = rememberSaveable { mutableStateOf("") }
-      val focusRequester = remember { FocusRequester() }
-
-      Column(
-        modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-      ) {
-        /*CloseSheetBar(close = {
-          if (chatModel.users.isEmpty()) {
-            chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
+    Spacer(Modifier.fillMaxHeight().weight(1f))
+    Row {
+      if (chatModel.users.isEmpty()) {
+        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) }
+      }
+      Spacer(Modifier.fillMaxWidth().weight(1f))
+      val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+      val createModifier: Modifier
+      val createColor: Color
+      if (enabled) {
+        createModifier = Modifier.clickable {
+          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+            createProfileInProfiles(chatModel, displayName.value, fullName.value, close)
           } else {
-            close()
+            createProfileOnboarding(chatModel, displayName.value, fullName.value, close)
           }
-        })*/
-        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-          AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
-          ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-          ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Center, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-          Spacer(Modifier.height(DEFAULT_PADDING))
-          Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(
-              stringResource(MR.strings.display_name),
-              fontSize = 16.sp
-            )
-            val name = displayName.value.trim()
-            val validName = mkValidName(name)
-            Spacer(Modifier.height(20.dp))
-            if (name != validName) {
-              IconButton({ showInvalidNameAlert(mkValidName(displayName.value), displayName) }, Modifier.size(20.dp)) {
-                Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.error)
-              }
-            }
-          }
-          ProfileNameField(displayName, "", { it.trim() == mkValidName(it) }, focusRequester)
+        }.padding(8.dp)
+        createColor = MaterialTheme.colors.primary
+      } else {
+        createModifier = Modifier.padding(8.dp)
+        createColor = MaterialTheme.colors.secondary
+      }
+      Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
+          Text(stringResource(MR.strings.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
+          Icon(painterResource(MR.images.ic_arrow_forward_ios), stringResource(MR.strings.create_profile_button), tint = createColor)
         }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        OnboardingButtons(displayName, close)
+      }
+    }
 
-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
-        }
-      }
-      LaunchedEffect(Unit) {
-        setLastVersionDefault(chatModel)
-      }
-      if (savedKeyboardState != keyboardState) {
-        LaunchedEffect(keyboardState) {
-          scope.launch {
-            savedKeyboardState = keyboardState
-            scrollState.animateScrollTo(scrollState.maxValue)
-          }
-        }
-      }
+    LaunchedEffect(Unit) {
+      delay(300)
+      focusRequester.requestFocus()
     }
   }
 }
 
-fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: () -> Unit) {
+fun createProfileInProfiles(chatModel: ChatModel, displayName: String, fullName: String, close: () -> Unit) {
   withApi {
     val user = chatModel.controller.apiCreateActiveUser(
-      Profile(displayName.trim(), "", null)
+      Profile(displayName, fullName, null)
     ) ?: return@withApi
     chatModel.currentUser.value = user
     if (chatModel.users.isEmpty()) {
@@ -187,10 +142,10 @@ fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: ()
   }
 }
 
-fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: () -> Unit) {
+fun createProfileOnboarding(chatModel: ChatModel, displayName: String, fullName: String, close: () -> Unit) {
   withApi {
     chatModel.controller.apiCreateActiveUser(
-      Profile(displayName.trim(), "", null)
+      Profile(displayName, fullName, null)
     ) ?: return@withApi
     val onboardingStage = chatModel.controller.appPrefs.onboardingStage
     if (chatModel.users.isEmpty()) {
@@ -208,28 +163,6 @@ fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: ()
   }
 }
 
-@Composable
-fun OnboardingButtons(displayName: MutableState<String>, close: () -> Unit) {
-  Row {
-    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) }
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    val enabled = canCreateProfile(displayName.value)
-    val createModifier: Modifier = Modifier.clickable(enabled) {  createProfileOnboarding(chatModel, displayName.value, close) }.padding(8.dp)
-    val createColor: Color = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-    Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
-      Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
-        Text(stringResource(MR.strings.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
-        Icon(painterResource(MR.images.ic_arrow_forward_ios), stringResource(MR.strings.create_profile_button), tint = createColor)
-      }
-    }
-  }
-}
-
 @Composable
 fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isValid: (String) -> Boolean = { true }, focusRequester: FocusRequester? = null) {
   var valid by rememberSaveable { mutableStateOf(true) }
@@ -262,6 +195,10 @@ fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isVal
       onValueChange = { name.value = it },
       modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
       textStyle = TextStyle(fontSize = 18.sp, color = colors.onBackground),
+      keyboardOptions = KeyboardOptions(
+        capitalization = KeyboardCapitalization.None,
+        autoCorrect = false
+      ),
       singleLine = true,
       cursorBrush = SolidColor(MaterialTheme.colors.secondary)
     )
@@ -274,28 +211,3 @@ fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isVal
       }
   }
 }
-
-private fun canCreateProfile(displayName: String): Boolean {
-  val name = displayName.trim()
-  return name.isNotEmpty() && mkValidName(name) == name
-}
-
-fun showInvalidNameAlert(name: String, displayName: MutableState<String>) {
-  if (name.isEmpty()) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(MR.strings.invalid_name),
-    )
-  } else {
-    AlertManager.shared.showAlertDialog(
-      title = generalGetString(MR.strings.invalid_name),
-      text = generalGetString(MR.strings.correct_name_to).format(name),
-      onConfirm = {
-        displayName.value = name
-      }
-    )
-  }
-}
-
-fun isValidDisplayName(name: String) : Boolean = mkValidName(name.trim()) == name
-
-fun mkValidName(s: String): String = chatValidName(s)

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

@@ -3,6 +3,8 @@ package chat.simplex.common.views.call
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.withApi
+import chat.simplex.common.views.helpers.withBGApi
+import chat.simplex.common.views.usersettings.showInDevelopingAlert
 import kotlinx.datetime.Clock
 import kotlin.time.Duration.Companion.minutes
 
@@ -24,6 +26,10 @@ class CallManager(val chatModel: ChatModel) {
   }
 
   fun acceptIncomingCall(invitation: RcvCallInvitation) {
+    if (appPlatform.isDesktop) {
+      return showInDevelopingAlert()
+    }
+
     val call = chatModel.activeCall.value
     if (call == null) {
       justAcceptIncomingCall(invitation = invitation)
@@ -52,12 +58,12 @@ class CallManager(val chatModel: ChatModel) {
       val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
       val iceServers = getIceServers()
       Log.d(TAG, "answerIncomingCall iceServers: $iceServers")
-      callCommand.add(WCallCommand.Start(
+      callCommand.value = WCallCommand.Start(
         media = invitation.callType.media,
         aesKey = invitation.sharedKey,
         iceServers = iceServers,
         relay = useRelay
-      ))
+      )
       callInvitations.remove(invitation.contact.id)
       if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
         activeCallInvitation.value = null
@@ -74,7 +80,7 @@ class CallManager(val chatModel: ChatModel) {
         showCallView.value = false
       } else {
         Log.d(TAG, "CallManager.endCall: ending call...")
-        callCommand.add(WCallCommand.End)
+        callCommand.value = WCallCommand.End
         showCallView.value = false
         controller.apiEndCall(call.contact)
         activeCall.value = null

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

@@ -1,5 +1,7 @@
 package chat.simplex.common.views.call
 
+import androidx.compose.runtime.Composable
+import dev.icerock.moko.resources.compose.stringResource
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.common.model.*
 import chat.simplex.res.MR
@@ -21,17 +23,16 @@ data class Call(
   val videoEnabled: Boolean = localMedia == CallMediaType.Video,
   val soundSpeaker: Boolean = localMedia == CallMediaType.Video,
   var localCamera: VideoCamera = VideoCamera.User,
-  val connectionInfo: ConnectionInfo? = null,
-  var connectedAt: Instant? = null
+  val connectionInfo: ConnectionInfo? = null
 ) {
   val encrypted: Boolean get() = localEncrypted && sharedKey != null
   val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false
 
-  val encryptionStatus: String get() = when(callState) {
+  val encryptionStatus: String @Composable get() = when(callState) {
     CallState.WaitCapabilities -> ""
-    CallState.InvitationSent -> generalGetString(if (localEncrypted) MR.strings.status_e2e_encrypted else MR.strings.status_no_e2e_encryption)
-    CallState.InvitationAccepted -> generalGetString(if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_contact_has_e2e_encryption)
-    else -> generalGetString(if (!localEncrypted) MR.strings.status_no_e2e_encryption else if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_e2e_encrypted)
+    CallState.InvitationSent -> stringResource(if (localEncrypted) MR.strings.status_e2e_encrypted else MR.strings.status_no_e2e_encryption)
+    CallState.InvitationAccepted -> stringResource(if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_contact_has_e2e_encryption)
+    else -> stringResource(if (!localEncrypted) MR.strings.status_no_e2e_encryption else if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_e2e_encrypted)
   }
 
   val hasMedia: Boolean get() = callState == CallState.OfferSent || callState == CallState.Negotiated || callState == CallState.Connected
@@ -48,16 +49,16 @@ enum class CallState {
   Connected,
   Ended;
 
-  val text: String get() = when(this) {
-    WaitCapabilities -> generalGetString(MR.strings.callstate_starting)
-    InvitationSent -> generalGetString(MR.strings.callstate_waiting_for_answer)
-    InvitationAccepted -> generalGetString(MR.strings.callstate_starting)
-    OfferSent -> generalGetString(MR.strings.callstate_waiting_for_confirmation)
-    OfferReceived -> generalGetString(MR.strings.callstate_received_answer)
-    AnswerReceived -> generalGetString(MR.strings.callstate_received_confirmation)
-    Negotiated -> generalGetString(MR.strings.callstate_connecting)
-    Connected -> generalGetString(MR.strings.callstate_connected)
-    Ended -> generalGetString(MR.strings.callstate_ended)
+  val text: String @Composable get() = when(this) {
+    WaitCapabilities -> stringResource(MR.strings.callstate_starting)
+    InvitationSent -> stringResource(MR.strings.callstate_waiting_for_answer)
+    InvitationAccepted -> stringResource(MR.strings.callstate_starting)
+    OfferSent -> stringResource(MR.strings.callstate_waiting_for_confirmation)
+    OfferReceived -> stringResource(MR.strings.callstate_received_answer)
+    AnswerReceived -> stringResource(MR.strings.callstate_received_confirmation)
+    Negotiated -> stringResource(MR.strings.callstate_connecting)
+    Connected -> stringResource(MR.strings.callstate_connected)
+    Ended -> stringResource(MR.strings.callstate_ended)
   }
 }
 
@@ -66,14 +67,13 @@ enum class CallState {
 
 @Serializable
 sealed class WCallCommand {
-  @Serializable @SerialName("capabilities") data class Capabilities(val media: CallMediaType): WCallCommand()
+  @Serializable @SerialName("capabilities") object Capabilities: WCallCommand()
   @Serializable @SerialName("start") data class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
   @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
   @Serializable @SerialName("answer") data class Answer (val answer: String, val iceCandidates: String): WCallCommand()
   @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallCommand()
   @Serializable @SerialName("media") data class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
   @Serializable @SerialName("camera") data class Camera(val camera: VideoCamera): WCallCommand()
-  @Serializable @SerialName("description") data class Description(val state: String, val description: String): WCallCommand()
   @Serializable @SerialName("end") object End: WCallCommand()
 }
 
@@ -85,7 +85,6 @@ sealed class WCallResponse {
   @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallResponse()
   @Serializable @SerialName("connection") data class Connection(val state: ConnectionState): WCallResponse()
   @Serializable @SerialName("connected") data class Connected(val connectionInfo: ConnectionInfo): WCallResponse()
-  @Serializable @SerialName("end") object End: WCallResponse()
   @Serializable @SerialName("ended") object Ended: WCallResponse()
   @Serializable @SerialName("ok") object Ok: WCallResponse()
   @Serializable @SerialName("error") data class Error(val message: String): WCallResponse()
@@ -107,14 +106,14 @@ sealed class WCallResponse {
 }
 @Serializable data class CallCapabilities(val encryption: Boolean)
 @Serializable data class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
-  val text: String get() {
+  val text: String @Composable get() {
     val local = localCandidate?.candidateType
     val remote = remoteCandidate?.candidateType
     return when {
       local == RTCIceCandidateType.Host && remote == RTCIceCandidateType.Host ->
-        generalGetString(MR.strings.call_connection_peer_to_peer)
+        stringResource(MR.strings.call_connection_peer_to_peer)
       local == RTCIceCandidateType.Relay && remote == RTCIceCandidateType.Relay ->
-        generalGetString(MR.strings.call_connection_via_relay)
+        stringResource(MR.strings.call_connection_via_relay)
       else ->
         "${local?.value ?: "unknown"} / ${remote?.value ?: "unknown"}"
     }

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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.*
 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
@@ -31,10 +32,10 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.newchat.QRCode
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.chatlist.updateChatSettings
-import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
@@ -196,67 +197,28 @@ sealed class SendReceipts {
 }
 
 fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
+  AlertManager.shared.showAlertDialog(
     title = generalGetString(MR.strings.delete_contact_question),
-    text = AnnotatedString(generalGetString(MR.strings.delete_contact_all_messages_deleted_cannot_undo_warning)),
-    buttons = {
-      Column {
-        if (chatInfo is ChatInfo.Direct && chatInfo.contact.ready && chatInfo.contact.active) {
-          // Delete and notify contact
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              deleteContact(chatInfo, chatModel, close, notify = true)
-            }
-          }) {
-            Text(generalGetString(MR.strings.delete_and_notify_contact), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
+    text = generalGetString(MR.strings.delete_contact_all_messages_deleted_cannot_undo_warning),
+    confirmText = generalGetString(MR.strings.delete_verb),
+    onConfirm = {
+      withApi {
+        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
+        if (r) {
+          chatModel.removeChat(chatInfo.id)
+          if (chatModel.chatId.value == chatInfo.id) {
+            chatModel.chatId.value = null
+            ModalManager.end.closeModals()
           }
-          // Delete
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              deleteContact(chatInfo, chatModel, close, notify = false)
-            }
-          }) {
-            Text(generalGetString(MR.strings.delete_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-          }
-        } else {
-          // Delete
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              deleteContact(chatInfo, chatModel, close)
-            }
-          }) {
-            Text(generalGetString(MR.strings.delete_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-          }
-        }
-        // Cancel
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-        }) {
-          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+          ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
         }
       }
-    }
+    },
+    destructive = true,
   )
 }
 
-fun deleteContact(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)?, notify: Boolean? = null) {
-  withApi {
-    val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId, notify)
-    if (r) {
-      chatModel.removeChat(chatInfo.id)
-      if (chatModel.chatId.value == chatInfo.id) {
-        chatModel.chatId.value = null
-        ModalManager.end.closeModals()
-      }
-      ntfManager.cancelNotificationsForChat(chatInfo.id)
-      close?.invoke()
-    }
-  }
-}
-
 fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(MR.strings.clear_chat_question),
@@ -329,7 +291,7 @@ fun ChatInfoLayout(
       SectionDividerSpaced()
     }
 
-    if (contact.ready && contact.active) {
+    if (contact.ready) {
       SectionView {
         if (connectionCode != null) {
           VerifyCodeButton(contact.verified, verifyClicked)
@@ -348,15 +310,15 @@ fun ChatInfoLayout(
 
     if (contact.contactLink != null) {
       SectionView(stringResource(MR.strings.address_section_title).uppercase()) {
-        SimpleXLinkQRCode(contact.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
+        QRCode(contact.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
         val clipboard = LocalClipboardManager.current
-        ShareAddressButton { clipboard.shareText(simplexChatLink(contact.contactLink)) }
+        ShareAddressButton { clipboard.shareText(contact.contactLink) }
         SectionTextFooter(stringResource(MR.strings.you_can_share_this_address_with_your_contacts).format(contact.displayName))
       }
       SectionDividerSpaced()
     }
 
-    if (contact.ready && contact.active) {
+    if (contact.ready) {
       SectionView(title = stringResource(MR.strings.conn_stats_section_title_servers)) {
         SectionItemView({
           AlertManager.shared.showAlertMsg(

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

@@ -33,6 +33,7 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.*
 import chat.simplex.common.platform.AudioPlayer
+import chat.simplex.common.views.usersettings.showInDevelopingAlert
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
@@ -65,13 +66,11 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
     launch {
       snapshotFlow { chatModel.chatId.value }
         .distinctUntilChanged()
-        .onEach { Log.d(TAG, "TODOCHAT: chatId: activeChatId ${activeChat.value?.id} == new chatId $it ${activeChat.value?.id == it} ") }
         .filter { it != null && activeChat.value?.id != it }
         .collect { chatId ->
           // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
           // Also for situation when chatId changes after clicking in notification, etc
           activeChat.value = chatModel.getChat(chatId!!)
-          Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
           markUnreadChatAsRead(activeChat, chatModel)
         }
     }
@@ -90,13 +89,9 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
         }
       }
         .distinctUntilChanged()
-        .onEach { Log.d(TAG, "TODOCHAT: chats: activeChatId ${activeChat.value?.id} == new chatId ${it?.id} ${activeChat.value?.id == it?.id} ") }
         // Only changed chatInfo is important thing. Other properties can be skipped for reducing recompositions
         .filter { it != null && it?.chatInfo != activeChat.value?.chatInfo }
-        .collect {
-          activeChat.value = it
-          Log.d(TAG, "TODOCHAT: chats: activeChatId became ${activeChat.value?.id}")
-        }
+        .collect { activeChat.value = it }
     }
   }
   val view = LocalMultiplatformView()
@@ -123,12 +118,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
           Modifier.fillMaxWidth(),
           horizontalAlignment = Alignment.CenterHorizontally
         ) {
-          if (
-            chat.chatInfo is ChatInfo.Direct
-            && !chat.chatInfo.contact.ready
-            && chat.chatInfo.contact.active
-            && !chat.chatInfo.contact.nextSendGrpInv
-          ) {
+          if (chat.chatInfo is ChatInfo.Direct && !chat.chatInfo.contact.ready && !chat.chatInfo.contact.nextSendGrpInv) {
             Text(
               generalGetString(MR.strings.contact_connection_pending),
               Modifier.padding(top = 4.dp),
@@ -223,9 +213,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
         val firstId = chatModel.chatItems.firstOrNull()?.id
         if (c != null && firstId != null) {
           withApi {
-            Log.d(TAG, "TODOCHAT: loadPrevMessages: loading for ${c.id}, current chatId ${ChatModel.chatId.value}, size was ${ChatModel.chatItems.size}")
             apiLoadPrevMessages(c.chatInfo, chatModel, firstId, searchText.value)
-            Log.d(TAG, "TODOCHAT: loadPrevMessages: loaded for ${c.id}, current chatId ${ChatModel.chatId.value}, size now ${ChatModel.chatItems.size}")
           }
         }
       },
@@ -273,24 +261,23 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
         withApi { chatModel.controller.apiJoinGroup(groupId) }
       },
       startCall = out@ { media ->
+        if (appPlatform.isDesktop) {
+          return@out showInDevelopingAlert()
+        }
         withBGApi {
           val cInfo = chat.chatInfo
           if (cInfo is ChatInfo.Direct) {
             chatModel.activeCall.value = Call(contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media)
             chatModel.showCallView.value = true
-            chatModel.callCommand.add(WCallCommand.Capabilities(media))
+            chatModel.callCommand.value = WCallCommand.Capabilities
           }
         }
       },
-      endCall = {
-        val call = chatModel.activeCall.value
-        if (call != null) withApi { chatModel.callManager.endCall(call) }
-      },
       acceptCall = { contact ->
         hideKeyboard(view)
         val invitation = chatModel.callInvitations.remove(contact.id)
         if (invitation == null) {
-          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.call_already_ended))
+          AlertManager.shared.showAlertMsg("Call already ended!")
         } else {
           chatModel.callManager.acceptIncomingCall(invitation = invitation)
         }
@@ -433,7 +420,6 @@ fun ChatLayout(
   cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   startCall: (CallMediaType) -> Unit,
-  endCall: () -> Unit,
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
   openDirectChat: (Long) -> Unit,
@@ -459,7 +445,17 @@ fun ChatLayout(
       .fillMaxWidth()
       .desktopOnExternalDrag(
         enabled = !attachmentDisabled.value && rememberUpdatedState(chat.userCanSend).value,
-        onFiles = { paths -> composeState.onFilesAttached(paths.map { URI.create(it) }) },
+        onFiles = { paths ->
+          val uris = paths.map { URI.create(it) }
+          val groups =  uris.groupBy { isImage(it) }
+          val images = groups[true] ?: emptyList()
+          val files = groups[false] ?: emptyList()
+          if (images.isNotEmpty()) {
+            CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(images, null) }
+          } else if (files.isNotEmpty()) {
+            composeState.processPickedFile(uris.first(), null)
+          }
+        },
         onImage = {
           val tmpFile = File.createTempFile("image", ".bmp", tmpDir)
           tmpFile.deleteOnExit()
@@ -492,7 +488,7 @@ fun ChatLayout(
         }
 
         Scaffold(
-          topBar = { ChatInfoToolbar(chat, back, info, startCall, endCall, addMembers, changeNtfsState, onSearchValueChanged) },
+          topBar = { ChatInfoToolbar(chat, back, info, startCall, addMembers, changeNtfsState, onSearchValueChanged) },
           bottomBar = composeView,
           modifier = Modifier.navigationBarsWithImePadding(),
           floatingActionButton = { floatingButton.value() },
@@ -521,7 +517,6 @@ fun ChatInfoToolbar(
   back: () -> Unit,
   info: () -> Unit,
   startCall: (CallMediaType) -> Unit,
-  endCall: () -> Unit,
   addMembers: (GroupInfo) -> Unit,
   changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
   onSearchValueChanged: (String) -> Unit,
@@ -542,7 +537,6 @@ fun ChatInfoToolbar(
   }
   val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
   val menuItems = arrayListOf<@Composable () -> Unit>()
-  val activeCall by remember { chatModel.activeCall }
   menuItems.add {
     ItemAction(stringResource(MR.strings.search_verb), painterResource(MR.images.ic_search), onClick = {
       showMenu.value = false
@@ -551,52 +545,20 @@ fun ChatInfoToolbar(
   }
 
   if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.allowsFeature(ChatFeature.Calls)) {
-    if (activeCall == null) {
-      barButtons.add {
-        IconButton(
-          {
-            showMenu.value = false
-            startCall(CallMediaType.Audio)
-          },
-          enabled = chat.chatInfo.contact.ready && chat.chatInfo.contact.active
-        ) {
-          Icon(
-            painterResource(MR.images.ic_call_500),
-            stringResource(MR.strings.icon_descr_more_button),
-            tint = if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-          )
-        }
-      }
-    } else if (activeCall?.contact?.id == chat.id) {
-      barButtons.add {
-        val call = remember { chatModel.activeCall }.value
-        val connectedAt = call?.connectedAt
-        if (connectedAt != null) {
-          val time = remember { mutableStateOf(durationText(0)) }
-          LaunchedEffect(Unit) {
-            while (true) {
-              time.value = durationText((Clock.System.now() - connectedAt).inWholeSeconds.toInt())
-              delay(250)
-            }
-          }
-          val sp50 = with(LocalDensity.current) { 50.sp.toDp() }
-          Text(time.value, Modifier.widthIn(min = sp50))
-        }
-      }
-      barButtons.add {
-        IconButton({
-          showMenu.value = false
-          endCall()
-        }) {
-          Icon(
-            painterResource(MR.images.ic_call_end_filled),
-            null,
-            tint = MaterialTheme.colors.error
-          )
-        }
+    barButtons.add {
+      IconButton({
+        showMenu.value = false
+        startCall(CallMediaType.Audio)
+      },
+      enabled = chat.chatInfo.contact.ready) {
+        Icon(
+          painterResource(MR.images.ic_call_500),
+          stringResource(MR.strings.icon_descr_more_button),
+          tint = if (chat.chatInfo.contact.ready) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+        )
       }
     }
-    if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active && activeCall == null) {
+    if (chat.chatInfo.contact.ready) {
       menuItems.add {
         ItemAction(stringResource(MR.strings.icon_descr_video_call).capitalize(Locale.current), painterResource(MR.images.ic_videocam), onClick = {
           showMenu.value = false
@@ -614,7 +576,7 @@ fun ChatInfoToolbar(
       }
     }
   }
-  if ((chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.ready && chat.chatInfo.contact.active) || chat.chatInfo is ChatInfo.Group) {
+  if ((chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.ready) || chat.chatInfo is ChatInfo.Group) {
     val ntfsEnabled = remember { mutableStateOf(chat.chatInfo.ntfsEnabled) }
     menuItems.add {
       ItemAction(
@@ -1325,7 +1287,6 @@ fun PreviewChatLayout() {
       cancelFile = {},
       joinGroup = {},
       startCall = {},
-      endCall = {},
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
       openDirectChat = { _ -> },
@@ -1395,7 +1356,6 @@ fun PreviewGroupChatLayout() {
       cancelFile = {},
       joinGroup = {},
       startCall = {},
-      endCall = {},
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
       openDirectChat = { _ -> },

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

@@ -159,17 +159,6 @@ expect fun AttachmentSelection(
   processPickedMedia: (List<URI>, String?) -> Unit
 )
 
-fun MutableState<ComposeState>.onFilesAttached(uris: List<URI>) {
-  val groups =  uris.groupBy { isImage(it) }
-  val images = groups[true] ?: emptyList()
-  val files = groups[false] ?: emptyList()
-  if (images.isNotEmpty()) {
-    CoroutineScope(Dispatchers.IO).launch { processPickedMedia(images, null) }
-  } else if (files.isNotEmpty()) {
-    processPickedFile(uris.first(), null)
-  }
-}
-
 fun MutableState<ComposeState>.processPickedFile(uri: URI?, text: String?) {
   if (uri != null) {
     val fileSize = getFileSize(uri)
@@ -827,7 +816,6 @@ fun ComposeView(
           chatModel.removeLiveDummy()
         },
         editPrevMessage = ::editPrevMessage,
-        onFilesPasted = { composeState.onFilesAttached(it) },
         onMessageChange = ::onMessageChange,
         textStyle = textStyle
       )

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

@@ -29,8 +29,6 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import dev.icerock.moko.resources.compose.painterResource
 import kotlinx.coroutines.*
-import java.io.File
-import java.net.URI
 
 @Composable
 fun SendMsgView(
@@ -54,7 +52,6 @@ fun SendMsgView(
   updateLiveMessage: (suspend () -> Unit)? = null,
   cancelLiveMessage: (() -> Unit)? = null,
   editPrevMessage: () -> Unit,
-  onFilesPasted: (List<URI>) -> Unit,
   onMessageChange: (String) -> Unit,
   textStyle: MutableState<TextStyle>
 ) {
@@ -82,7 +79,7 @@ fun SendMsgView(
     val showVoiceButton = !nextSendGrpInv && cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
         cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    PlatformTextField(composeState, sendMsgEnabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
+    PlatformTextField(composeState, sendMsgEnabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage) {
       if (!cs.inProgress) {
         sendMessage(null)
       }
@@ -615,7 +612,6 @@ fun PreviewSendMsgView() {
       sendMessage = {},
       editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }
@@ -649,7 +645,6 @@ fun PreviewSendMsgViewEditing() {
       sendMessage = {},
       editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }
@@ -683,7 +678,6 @@ fun PreviewSendMsgViewInProgress() {
       sendMessage = {},
       editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }

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

@@ -19,7 +19,7 @@ import chat.simplex.common.model.*
 import chat.simplex.common.platform.shareText
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.newchat.*
+import chat.simplex.common.views.newchat.QRCode
 import chat.simplex.res.MR
 
 @Composable
@@ -44,12 +44,14 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
       createLink()
     }
   }
+  val clipboard = LocalClipboardManager.current
   GroupLinkLayout(
     groupLink = groupLink,
     groupInfo,
     groupLinkMemberRole,
     creatingLink,
     createLink = ::createLink,
+    share = { clipboard.shareText(groupLink ?: return@GroupLinkLayout) },
     updateLink = {
       val role = groupLinkMemberRole.value
       if (role != null) {
@@ -93,6 +95,7 @@ fun GroupLinkLayout(
   groupLinkMemberRole: MutableState<GroupMemberRole?>,
   creatingLink: Boolean,
   createLink: () -> Unit,
+  share: () -> Unit,
   updateLink: () -> Unit,
   deleteLink: () -> Unit
 ) {
@@ -122,17 +125,16 @@ fun GroupLinkLayout(
           }
           initialLaunch = false
         }
-        SimpleXLinkQRCode(groupLink, Modifier.aspectRatio(1f).padding(horizontal = DEFAULT_PADDING))
+        QRCode(groupLink, Modifier.aspectRatio(1f).padding(horizontal = DEFAULT_PADDING))
         Row(
           horizontalArrangement = Arrangement.spacedBy(10.dp),
           verticalAlignment = Alignment.CenterVertically,
           modifier = Modifier.padding(horizontal = DEFAULT_PADDING, vertical = 10.dp)
         ) {
-          val clipboard = LocalClipboardManager.current
           SimpleButton(
             stringResource(MR.strings.share_link),
             icon = painterResource(MR.images.ic_share),
-            click = { clipboard.shareText(simplexChatLink(groupLink)) }
+            click = share
           )
           SimpleButton(
             stringResource(MR.strings.delete_link),

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

@@ -3,6 +3,7 @@ package chat.simplex.common.views.chat.group
 import InfoRow
 import SectionBottomSpacer
 import SectionDividerSpaced
+import SectionItemView
 import SectionSpacer
 import SectionTextFooter
 import SectionView
@@ -34,7 +35,7 @@ import chat.simplex.common.views.newchat.*
 import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.chatlist.openLoadedChat
+import chat.simplex.common.views.chatlist.openChat
 import chat.simplex.res.MR
 import kotlinx.datetime.Clock
 
@@ -72,7 +73,6 @@ fun GroupMemberInfoView(
               chatModel.addChat(c)
             }
             chatModel.chatItems.clear()
-            chatModel.chatItemStatuses.clear()
             chatModel.chatItems.addAll(c.chatItems)
             chatModel.chatId.value = c.id
             closeAll()
@@ -86,7 +86,7 @@ fun GroupMemberInfoView(
           if (memberContact != null) {
             val memberChat = Chat(ChatInfo.Direct(memberContact), chatItems = arrayListOf())
             chatModel.addChat(memberChat)
-            openLoadedChat(memberChat, chatModel)
+            openChat(memberChat, chatModel)
             closeAll()
             chatModel.setContactNetworkStatus(memberContact, NetworkStatus.Connected())
           }
@@ -283,9 +283,9 @@ fun GroupMemberInfoLayout(
 
     if (member.contactLink != null) {
       SectionView(stringResource(MR.strings.address_section_title).uppercase()) {
-        SimpleXLinkQRCode(member.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
+        QRCode(member.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
         val clipboard = LocalClipboardManager.current
-        ShareAddressButton { clipboard.shareText(simplexChatLink(member.contactLink)) }
+        ShareAddressButton { clipboard.shareText(member.contactLink) }
         if (contactId != null) {
           if (knownDirectChat(contactId) == null && !groupInfo.fullGroupPreferences.directMessages.on) {
             ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
@@ -472,17 +472,43 @@ private fun updateMemberRoleDialog(
 }
 
 fun connectViaMemberAddressAlert(connReqUri: String) {
-  try {
-    val uri = URI(connReqUri)
-    withApi {
-      planAndConnect(chatModel, uri, incognito = null, close = { ModalManager.closeAllModalsEverywhere() })
+  AlertManager.shared.showAlertDialogButtonsColumn(
+    title = generalGetString(MR.strings.connect_via_member_address_alert_title),
+    text = AnnotatedString(generalGetString(MR.strings.connect_via_member_address_alert_desc)),
+    buttons = {
+      Column {
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+          val uri = URI(connReqUri)
+          withUriAction(uri) { linkType ->
+            withApi {
+              Log.d(TAG, "connectViaUri: connecting")
+              connectViaUri(chatModel, linkType, uri, incognito = false)
+            }
+          }
+        }) {
+          Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+          val uri = URI(connReqUri)
+          withUriAction(uri) { linkType ->
+            withApi {
+              Log.d(TAG, "connectViaUri: connecting incognito")
+              connectViaUri(chatModel, linkType, uri, incognito = true)
+            }
+          }
+        }) {
+          Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+        }) {
+          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+        }
+      }
     }
-  } catch (e: RuntimeException) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(MR.strings.invalid_connection_link),
-      text = generalGetString(MR.strings.this_string_is_not_a_connection_link)
-    )
-  }
+  )
 }
 
 @Preview

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

@@ -103,11 +103,12 @@ private fun GroupPreferencesLayout(
     FeatureSection(GroupFeature.Voice, allowVoice, groupInfo, preferences, onTTLUpdated) {
       applyPrefs(preferences.copy(voice = GroupPreference(enable = it)))
     }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowFiles = remember(preferences) { mutableStateOf(preferences.files.enable) }
-    FeatureSection(GroupFeature.Files, allowFiles, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(files = GroupPreference(enable = it)))
-    }
+//    TODO uncomment in 5.3
+//    SectionDividerSpaced(true, maxBottomPadding = false)
+//    val allowFiles = remember(preferences) { mutableStateOf(preferences.files.enable) }
+//    FeatureSection(GroupFeature.Files, allowFiles, groupInfo, preferences, onTTLUpdated) {
+//      applyPrefs(preferences.copy(files = GroupPreference(enable = it)))
+//    }
     if (groupInfo.canEdit) {
       SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
       ResetSaveButtons(

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

@@ -19,12 +19,12 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.*
+import chat.simplex.common.views.ProfileNameField
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.isValidDisplayName
 import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.net.URI
@@ -65,13 +65,13 @@ fun GroupProfileLayout(
         fullName.value == groupProfile.fullName &&
         groupProfile.image == profileImage.value
   val closeWithAlert = {
-    if (dataUnchanged || !canUpdateProfile(displayName.value, groupProfile)) {
+    if (dataUnchanged || !(displayName.value.isNotEmpty() && isValidDisplayName(displayName.value))) {
       close()
     } else {
       showUnsavedChangesAlert({
         saveProfile(
           groupProfile.copy(
-            displayName = displayName.value.trim(),
+            displayName = displayName.value,
             fullName = fullName.value,
             image = profileImage.value
           )
@@ -125,32 +125,32 @@ fun GroupProfileLayout(
                 stringResource(MR.strings.group_display_name_field),
                 fontSize = 16.sp
               )
-              if (!isValidNewProfileName(displayName.value, groupProfile)) {
+              if (!isValidDisplayName(displayName.value)) {
                 Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-                IconButton({ showInvalidNameAlert(mkValidName(displayName.value), displayName) }, Modifier.size(20.dp)) {
-                  Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.error)
-                }
+                Text(
+                  stringResource(MR.strings.no_spaces),
+                  fontSize = 16.sp,
+                  color = Color.Red
+                )
               }
             }
-            ProfileNameField(displayName, "", { isValidNewProfileName(it, groupProfile) }, focusRequester)
-            if (groupProfile.fullName.isNotEmpty() && groupProfile.fullName != groupProfile.displayName) {
-              Spacer(Modifier.height(DEFAULT_PADDING))
-              Text(
-                stringResource(MR.strings.group_full_name_field),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-              )
-              ProfileNameField(fullName)
-            }
+            ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
             Spacer(Modifier.height(DEFAULT_PADDING))
-            val enabled = !dataUnchanged && canUpdateProfile(displayName.value, groupProfile)
+            Text(
+              stringResource(MR.strings.group_full_name_field),
+              fontSize = 16.sp,
+              modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+            )
+            ProfileNameField(fullName)
+            Spacer(Modifier.height(DEFAULT_PADDING))
+            val enabled = !dataUnchanged && displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
             if (enabled) {
               Text(
                 stringResource(MR.strings.save_group_profile),
                 modifier = Modifier.clickable {
                   saveProfile(
                     groupProfile.copy(
-                      displayName = displayName.value.trim(),
+                      displayName = displayName.value,
                       fullName = fullName.value,
                       image = profileImage.value
                     )
@@ -178,12 +178,6 @@ fun GroupProfileLayout(
   }
 }
 
-private fun canUpdateProfile(displayName: String, groupProfile: GroupProfile): Boolean =
-  displayName.trim().isNotEmpty() && isValidNewProfileName(displayName, groupProfile)
-
-private fun isValidNewProfileName(displayName: String, groupProfile: GroupProfile): Boolean =
-  displayName == groupProfile.displayName || isValidDisplayName(displayName.trim())
-
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
   AlertManager.shared.showAlertDialogStacked(
     title = generalGetString(MR.strings.save_preferences_question),

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

@@ -68,7 +68,7 @@ fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
 //        sharedKey: invitation.sharedKey
 //        )
 //        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey: true)
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
 //      } else {
 //        AlertManager.shared.showAlertMsg(title: "Call already ended!")
 //      }
@@ -141,7 +141,7 @@ fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
 //        sharedKey: invitation.sharedKey
 //        )
 //        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey: true)
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
 //      } else {
 //        AlertManager.shared.showAlertMsg(title: "Call already ended!")
 //      }

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

@@ -127,7 +127,7 @@ private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defau
     )
     if (showPreview.value) {
       VideoPreviewImageView(preview, onClick, onLongClick)
-      PlayButton(brokenVideo, onLongClick = onLongClick, play)
+      PlayButton(brokenVideo, onLongClick = onLongClick, if (appPlatform.isAndroid) play else onClick)
     }
     DurationProgress(file, videoPlaying, duration, progress/*, soundEnabled*/)
   }

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

@@ -201,7 +201,7 @@ fun ChatItemView(
               showMenu.value = false
             })
             ItemAction(stringResource(MR.strings.copy_verb), painterResource(MR.images.ic_content_copy), onClick = {
-              copyItemToClipboard(cItem, clipboard)
+              clipboard.setText(AnnotatedString(cItem.content.text))
               showMenu.value = false
             })
             if ((cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) && getLoadedFilePath(cItem.file) != null) {
@@ -352,7 +352,6 @@ fun ChatItemView(
           is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember)
           is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
           is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
-          is CIContent.RcvDirectEventContent -> EventItemView()
           is CIContent.RcvGroupEventContent -> when (c.rcvGroupEvent) {
             is RcvGroupEvent.MemberConnected -> CIEventView(membersConnectedItemText())
             is RcvGroupEvent.MemberCreatedContact -> CIMemberCreatedContactView(cItem, openDirectChat)
@@ -561,8 +560,6 @@ private fun showMsgDeliveryErrorAlert(description: String) {
   )
 }
 
-expect fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager)
-
 @Preview
 @Composable
 fun PreviewChatItemView() {

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

@@ -158,11 +158,12 @@ private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap,
     player.stop()
   }
   LaunchedEffect(Unit) {
+    player.enableSound(true)
     snapshotFlow { isCurrentPage.value }
       .distinctUntilChanged()
       .collect {
-        if (it) play() else stop()
-        player.enableSound(true)
+        // Do not autoplay on desktop because it needs workaround
+        if (it && appPlatform.isAndroid) play() else if (!it) stop()
       }
   }
 

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

@@ -136,8 +136,12 @@ fun MarkdownText (
             val link = ft.link(linkMode)
             if (link != null) {
               hasLinks = true
-              val ftStyle = ft.format.style
-              withAnnotation(tag = if (ft.format is Format.SimplexLink) "SIMPLEX_URL" else "URL", annotation = link) {
+              val ftStyle = if (ft.format is Format.SimplexLink && !ft.format.trustedUri && linkMode == SimplexLinkMode.BROWSER) {
+                SpanStyle(color = Color.Red, textDecoration = TextDecoration.Underline)
+              } else {
+                ft.format.style
+              }
+              withAnnotation(tag = if (ft.format is Format.SimplexLink && linkMode != SimplexLinkMode.BROWSER) "SIMPLEX_URL" else "URL", annotation = link) {
                 withStyle(ftStyle) { append(ft.viewText(linkMode)) }
               }
             } else {

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

@@ -1,9 +1,11 @@
 package chat.simplex.common.views.chatlist
 
 import SectionItemView
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
@@ -42,7 +44,6 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
     showMenu.value = false
     delay(500L)
   }
-  val selectedChat = remember(chat.id) { derivedStateOf { chat.id == ChatModel.chatId.value } }
   val showChatPreviews = chatModel.showChatPreviews.value
   when (chat.chatInfo) {
     is ChatInfo.Direct -> {
@@ -52,8 +53,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
         click = { directChatAction(chat.chatInfo, chatModel) },
         dropdownMenuItems = { ContactMenuItems(chat, chatModel, showMenu, showMarkRead) },
         showMenu,
-        stopped,
-        selectedChat
+        stopped
       )
     }
     is ChatInfo.Group ->
@@ -62,8 +62,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
         click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
         dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, showMarkRead) },
         showMenu,
-        stopped,
-        selectedChat
+        stopped
       )
     is ChatInfo.ContactRequest ->
       ChatListNavLinkLayout(
@@ -71,8 +70,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
         click = { contactRequestAlertDialog(chat.chatInfo, chatModel) },
         dropdownMenuItems = { ContactRequestMenuItems(chat.chatInfo, chatModel, showMenu) },
         showMenu,
-        stopped,
-        selectedChat
+        stopped
       )
     is ChatInfo.ContactConnection ->
       ChatListNavLinkLayout(
@@ -86,8 +84,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
         },
         dropdownMenuItems = { ContactConnectionMenuItems(chat.chatInfo, chatModel, showMenu) },
         showMenu,
-        stopped,
-        selectedChat
+        stopped
       )
     is ChatInfo.InvalidJSON ->
       ChatListNavLinkLayout(
@@ -100,8 +97,7 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
         },
         dropdownMenuItems = null,
         showMenu,
-        stopped,
-        selectedChat
+        stopped
       )
   }
 }
@@ -121,29 +117,19 @@ fun groupChatAction(groupInfo: GroupInfo, chatModel: ChatModel) {
 suspend fun openDirectChat(contactId: Long, chatModel: ChatModel) {
   val chat = chatModel.controller.apiGetChat(ChatType.Direct, contactId)
   if (chat != null) {
-    openLoadedChat(chat, chatModel)
-  }
-}
-
-suspend fun openGroupChat(groupId: Long, chatModel: ChatModel) {
-  val chat = chatModel.controller.apiGetChat(ChatType.Group, groupId)
-  if (chat != null) {
-    openLoadedChat(chat, chatModel)
+    openChat(chat, chatModel)
   }
 }
 
 suspend fun openChat(chatInfo: ChatInfo, chatModel: ChatModel) {
-  Log.d(TAG, "TODOCHAT: openChat: opening ${chatInfo.id}, current chatId ${ChatModel.chatId.value}, size ${ChatModel.chatItems.size}")
   val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId)
   if (chat != null) {
-    openLoadedChat(chat, chatModel)
-    Log.d(TAG, "TODOCHAT: openChat: opened ${chatInfo.id}, current chatId ${ChatModel.chatId.value}, size ${ChatModel.chatItems.size}")
+    openChat(chat, chatModel)
   }
 }
 
-fun openLoadedChat(chat: Chat, chatModel: ChatModel) {
+suspend fun openChat(chat: Chat, chatModel: ChatModel) {
   chatModel.chatItems.clear()
-  chatModel.chatItemStatuses.clear()
   chatModel.chatItems.addAll(chat.chatItems)
   chatModel.chatId.value = chat.chatInfo.id
 }
@@ -598,8 +584,8 @@ fun groupInvitationAcceptedAlert() {
   )
 }
 
-fun toggleNotifications(chat: Chat, enableAllNtfs: Boolean, chatModel: ChatModel, currentState: MutableState<Boolean>? = null) {
-  val chatSettings = (chat.chatInfo.chatSettings ?: ChatSettings.defaults).copy(enableNtfs = if (enableAllNtfs) MsgFilter.All else MsgFilter.None)
+fun toggleNotifications(chat: Chat, enableNtfs: Boolean, chatModel: ChatModel, currentState: MutableState<Boolean>? = null) {
+  val chatSettings = (chat.chatInfo.chatSettings ?: ChatSettings.defaults).copy(enableNtfs = enableNtfs)
   updateChatSettings(chat, chatSettings, chatModel, currentState)
 }
 
@@ -630,7 +616,7 @@ fun updateChatSettings(chat: Chat, chatSettings: ChatSettings, chatModel: ChatMo
     }
     if (res && newChatInfo != null) {
       chatModel.updateChatInfo(newChatInfo)
-      if (chatSettings.enableNtfs != MsgFilter.All) {
+      if (!chatSettings.enableNtfs) {
         ntfManager.cancelNotificationsForChat(chat.id)
       }
       val current = currentState?.value
@@ -642,14 +628,32 @@ fun updateChatSettings(chat: Chat, chatSettings: ChatSettings, chatModel: ChatMo
 }
 
 @Composable
-expect fun ChatListNavLinkLayout(
+fun ChatListNavLinkLayout(
   chatLinkPreview: @Composable () -> Unit,
   click: () -> Unit,
   dropdownMenuItems: (@Composable () -> Unit)?,
   showMenu: MutableState<Boolean>,
-  stopped: Boolean,
-  selectedChat: State<Boolean>
-)
+  stopped: Boolean
+) {
+  var modifier = Modifier.fillMaxWidth()
+  if (!stopped) modifier = modifier
+    .combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
+    .onRightClick { showMenu.value = true }
+  Box(modifier) {
+    Row(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp),
+      verticalAlignment = Alignment.Top
+    ) {
+      chatLinkPreview()
+    }
+    if (dropdownMenuItems != null) {
+      DefaultDropdownMenu(showMenu, dropdownMenuItems = dropdownMenuItems)
+    }
+  }
+  Divider(Modifier.padding(horizontal = 8.dp))
+}
 
 @Preview/*(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -686,8 +690,7 @@ fun PreviewChatListNavLinkDirect() {
       click = {},
       dropdownMenuItems = null,
       showMenu = remember { mutableStateOf(false) },
-      stopped = false,
-      selectedChat = remember { mutableStateOf(false) }
+      stopped = false
     )
   }
 }
@@ -727,8 +730,7 @@ fun PreviewChatListNavLinkGroup() {
       click = {},
       dropdownMenuItems = null,
       showMenu = remember { mutableStateOf(false) },
-      stopped = false,
-      selectedChat = remember { mutableStateOf(false) }
+      stopped = false
     )
   }
 }
@@ -748,8 +750,7 @@ fun PreviewChatListNavLinkContactRequest() {
       click = {},
       dropdownMenuItems = null,
       showMenu = remember { mutableStateOf(false) },
-      stopped = false,
-      selectedChat = remember { mutableStateOf(false) }
+      stopped = false
     )
   }
 }

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

@@ -12,7 +12,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
@@ -30,9 +29,6 @@ import chat.simplex.common.views.onboarding.shouldShowWhatsNew
 import chat.simplex.common.views.usersettings.SettingsView
 import chat.simplex.common.views.usersettings.simplexTeamUri
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.Call
-import chat.simplex.common.views.call.CallMediaType
-import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
@@ -125,7 +121,6 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
     }
   }
   if (searchInList.isEmpty()) {
-    DesktopActiveCallOverlayLayout(newChatSheetState)
     NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
   }
   if (appPlatform.isAndroid) {
@@ -316,16 +311,51 @@ private fun ProgressIndicator() {
   )
 }
 
-@Composable
-expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>)
-
 fun connectIfOpenedViaUri(uri: URI, chatModel: ChatModel) {
   Log.d(TAG, "connectIfOpenedViaUri: opened via link")
   if (chatModel.currentUser.value == null) {
     chatModel.appOpenUrl.value = uri
   } else {
-    withApi {
-      planAndConnect(chatModel, uri, incognito = null, close = null)
+    withUriAction(uri) { linkType ->
+      val title = when (linkType) {
+        ConnectionLinkType.CONTACT -> generalGetString(MR.strings.connect_via_contact_link)
+        ConnectionLinkType.INVITATION -> generalGetString(MR.strings.connect_via_invitation_link)
+        ConnectionLinkType.GROUP -> generalGetString(MR.strings.connect_via_group_link)
+      }
+      AlertManager.shared.showAlertDialogButtonsColumn(
+        title = title,
+        text = if (linkType == ConnectionLinkType.GROUP)
+          AnnotatedString(generalGetString(MR.strings.you_will_join_group))
+        else
+          AnnotatedString(generalGetString(MR.strings.profile_will_be_sent_to_contact_sending_link)),
+        buttons = {
+          Column {
+            SectionItemView({
+              AlertManager.shared.hideAlert()
+              withApi {
+                Log.d(TAG, "connectIfOpenedViaUri: connecting")
+                connectViaUri(chatModel, linkType, uri, incognito = false)
+              }
+            }) {
+              Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+            }
+            SectionItemView({
+              AlertManager.shared.hideAlert()
+              withApi {
+                Log.d(TAG, "connectIfOpenedViaUri: connecting incognito")
+                connectViaUri(chatModel, linkType, uri, incognito = true)
+              }
+            }) {
+              Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+            }
+            SectionItemView({
+              AlertManager.shared.hideAlert()
+            }) {
+              Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+            }
+          }
+        }
+      )
     }
   }
 }

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

@@ -42,7 +42,7 @@ fun ChatPreviewView(
   val cInfo = chat.chatInfo
 
   @Composable
-  fun inactiveIcon() {
+  fun groupInactiveIcon() {
     Icon(
       painterResource(MR.images.ic_cancel_filled),
       stringResource(MR.strings.icon_descr_group_inactive),
@@ -53,19 +53,13 @@ fun ChatPreviewView(
 
   @Composable
   fun chatPreviewImageOverlayIcon() {
-    when (cInfo) {
-      is ChatInfo.Direct ->
-        if (!cInfo.contact.active) {
-          inactiveIcon()
-        }
-      is ChatInfo.Group ->
-        when (cInfo.groupInfo.membership.memberStatus) {
-          GroupMemberStatus.MemLeft -> inactiveIcon()
-          GroupMemberStatus.MemRemoved -> inactiveIcon()
-          GroupMemberStatus.MemGroupDeleted -> inactiveIcon()
-          else -> {}
+    if (cInfo is ChatInfo.Group) {
+      when (cInfo.groupInfo.membership.memberStatus) {
+        GroupMemberStatus.MemLeft -> groupInactiveIcon()
+        GroupMemberStatus.MemRemoved -> groupInactiveIcon()
+        GroupMemberStatus.MemGroupDeleted -> groupInactiveIcon()
+        else -> {}
       }
-      else -> {}
     }
   }
 
@@ -131,7 +125,7 @@ fun ChatPreviewView(
           if (cInfo.contact.verified) {
             VerifiedIcon()
           }
-          chatPreviewTitleText()
+          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else MaterialTheme.colors.secondary)
         }
       is ChatInfo.Group ->
         when (cInfo.groupInfo.membership.memberStatus) {
@@ -180,7 +174,7 @@ fun ChatPreviewView(
         is ChatInfo.Direct ->
           if (cInfo.contact.nextSendGrpInv) {
             Text(stringResource(MR.strings.member_contact_send_direct_message), color = MaterialTheme.colors.secondary)
-          } else if (!cInfo.ready && cInfo.contact.active) {
+          } else if (!cInfo.ready) {
             Text(stringResource(MR.strings.contact_connection_pending), color = MaterialTheme.colors.secondary)
           }
         is ChatInfo.Group ->
@@ -197,32 +191,28 @@ fun ChatPreviewView(
   @Composable
   fun chatStatusImage() {
     if (cInfo is ChatInfo.Direct) {
-      if (cInfo.contact.active) {
-        val descr = contactNetworkStatus?.statusString
-        when (contactNetworkStatus) {
-          is NetworkStatus.Connected ->
-            IncognitoIcon(chat.chatInfo.incognito)
+      val descr = contactNetworkStatus?.statusString
+      when (contactNetworkStatus) {
+        is NetworkStatus.Connected ->
+          IncognitoIcon(chat.chatInfo.incognito)
 
-          is NetworkStatus.Error ->
-            Icon(
-              painterResource(MR.images.ic_error),
-              contentDescription = descr,
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .size(19.dp)
-            )
+        is NetworkStatus.Error ->
+          Icon(
+            painterResource(MR.images.ic_error),
+            contentDescription = descr,
+            tint = MaterialTheme.colors.secondary,
+            modifier = Modifier
+              .size(19.dp)
+          )
 
-          else ->
-            CircularProgressIndicator(
-              Modifier
-                .padding(horizontal = 2.dp)
-                .size(15.dp),
-              color = MaterialTheme.colors.secondary,
-              strokeWidth = 1.5.dp
-            )
-        }
-      } else {
-        IncognitoIcon(chat.chatInfo.incognito)
+        else ->
+          CircularProgressIndicator(
+            Modifier
+              .padding(horizontal = 2.dp)
+              .size(15.dp),
+            color = MaterialTheme.colors.secondary,
+            strokeWidth = 1.5.dp
+          )
       }
     } else {
       IncognitoIcon(chat.chatInfo.incognito)

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

@@ -20,13 +20,11 @@ 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.updatingChatsMutex
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.platform.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.*
 import java.io.*
 import java.net.URI
@@ -622,10 +620,8 @@ private fun afterSetCiTTL(
   appFilesCountAndSize.value = directoryFileCountAndSize(appFilesDir.absolutePath)
   withApi {
     try {
-      updatingChatsMutex.withLock {
-        val chats = m.controller.apiGetChats()
-        m.updateChats(chats)
-      }
+      val chats = m.controller.apiGetChats()
+      m.updateChats(chats)
     } catch (e: Exception) {
       Log.e(TAG, "apiGetChats error: ${e.message}")
     }

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

@@ -50,12 +50,11 @@ class AlertManager {
   fun showAlertDialogButtonsColumn(
     title: String,
     text: AnnotatedString? = null,
-    onDismissRequest: (() -> Unit)? = null,
     buttons: @Composable () -> Unit,
   ) {
     showAlert {
       AlertDialog(
-        onDismissRequest = { onDismissRequest?.invoke(); hideAlert() },
+        onDismissRequest = ::hideAlert,
         title = {
           Text(
             title,

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

@@ -81,35 +81,6 @@ fun ProfileImage(
   }
 }
 
-/** [AccountCircleFilled] has its inner padding which leads to visible border if there is background underneath.
- * This is workaround
- * */
-@Composable
-fun ProfileImageForActiveCall(
-  size: Dp,
-  image: String? = null,
-  color: Color = MaterialTheme.colors.secondaryVariant,
-) {
-  if (image == null) {
-    Box(Modifier.requiredSize(size).clip(CircleShape)) {
-      Icon(
-        AccountCircleFilled,
-        contentDescription = stringResource(MR.strings.icon_descr_profile_image_placeholder),
-        tint = color,
-        modifier = Modifier.requiredSize(size + 14.dp)
-      )
-    }
-  } else {
-    val imageBitmap = base64ToBitmap(image)
-    Image(
-      imageBitmap,
-      stringResource(MR.strings.image_descr_profile_image),
-      contentScale = ContentScale.Crop,
-      modifier = Modifier.size(size).clip(CircleShape)
-    )
-  }
-}
-
 
 @Preview
 @Composable

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

@@ -34,6 +34,7 @@ fun AddContactView(
     incognitoPref = chatModel.controller.appPrefs.incognito,
     connReq = connReqInvitation,
     contactConnection = contactConnection,
+    share = { clipboard.shareText(connReqInvitation) },
     learnMore = {
       ModalManager.center.showModal {
         Column(
@@ -55,6 +56,7 @@ fun AddContactLayout(
   incognitoPref: SharedPreference<Boolean>,
   connReq: String,
   contactConnection: MutableState<PendingContactConnection?>,
+  share: () -> Unit,
   learnMore: () -> Unit
 ) {
   val incognito = remember { mutableStateOf(incognitoPref.get()) }
@@ -80,7 +82,7 @@ fun AddContactLayout(
 
     SectionView(stringResource(MR.strings.one_time_link_short).uppercase()) {
       if (connReq.isNotEmpty()) {
-        SimpleXLinkQRCode(
+        QRCode(
           connReq, Modifier
             .padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)
             .aspectRatio(1f)
@@ -97,7 +99,7 @@ fun AddContactLayout(
       }
 
       IncognitoToggle(incognitoPref, incognito) { ModalManager.start.showModal { IncognitoView() } }
-      ShareLinkButton(connReq)
+      ShareLinkButton(share)
       OneTimeLinkLearnMoreButton(learnMore)
     }
     SectionTextFooter(sharedProfileInfo(chatModel, incognito.value))
@@ -107,12 +109,11 @@ fun AddContactLayout(
 }
 
 @Composable
-fun ShareLinkButton(connReqInvitation: String) {
-  val clipboard = LocalClipboardManager.current
+fun ShareLinkButton(onClick: () -> Unit) {
   SettingsActionItem(
     painterResource(MR.images.ic_share),
     stringResource(MR.strings.share_invitation_link),
-    click = { clipboard.shareText(simplexChatLink(connReqInvitation)) },
+    onClick,
     iconColor = MaterialTheme.colors.primary,
     textColor = MaterialTheme.colors.primary,
   )
@@ -176,6 +177,7 @@ fun PreviewAddContactView() {
       incognitoPref = SharedPreference({ false }, {}),
       connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
       contactConnection = mutableStateOf(PendingContactConnection.getSampleData()),
+      share = {},
       learnMore = {},
     )
   }

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

@@ -19,14 +19,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.ProfileNameField
 import chat.simplex.common.views.chat.group.AddGroupMembersView
 import chat.simplex.common.views.chatlist.setGroupMembers
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.isValidDisplayName
 import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.common.views.usersettings.DeleteImageButton
 import chat.simplex.common.views.usersettings.EditImageButton
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -41,7 +42,6 @@ fun AddGroupView(chatModel: ChatModel, close: () -> Unit) {
         if (groupInfo != null) {
           chatModel.addChat(Chat(chatInfo = ChatInfo.Group(groupInfo), chatItems = listOf()))
           chatModel.chatItems.clear()
-          chatModel.chatItemStatuses.clear()
           chatModel.chatId.value = groupInfo.id
           setGroupMembers(groupInfo, chatModel)
           close.invoke()
@@ -60,6 +60,7 @@ fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
   val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
   val scope = rememberCoroutineScope()
   val displayName = rememberSaveable { mutableStateOf("") }
+  val fullName = rememberSaveable { mutableStateOf("") }
   val chosenImage = rememberSaveable { mutableStateOf<URI?>(null) }
   val profileImage = rememberSaveable { mutableStateOf<String?>(null) }
   val focusRequester = remember { FocusRequester() }
@@ -109,22 +110,31 @@ fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
               stringResource(MR.strings.group_display_name_field),
               fontSize = 16.sp
             )
-            if (!isValidDisplayName(displayName.value.trim())) {
+            if (!isValidDisplayName(displayName.value)) {
               Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-              IconButton({ showInvalidNameAlert(mkValidName(displayName.value.trim()), displayName) }, Modifier.size(20.dp)) {
-                Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.error)
-              }
+              Text(
+                stringResource(MR.strings.no_spaces),
+                fontSize = 16.sp,
+                color = Color.Red
+              )
             }
           }
-          ProfileNameField(displayName, "", { isValidDisplayName(it.trim()) }, focusRequester)
+          ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Text(
+            stringResource(MR.strings.group_full_name_field),
+            fontSize = 16.sp,
+            modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+          )
+          ProfileNameField(fullName, "")
           Spacer(Modifier.height(8.dp))
-          val enabled = canCreateProfile(displayName.value)
+          val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
           if (enabled) {
             CreateGroupButton(MaterialTheme.colors.primary, Modifier
               .clickable {
                 createGroup(GroupProfile(
-                  displayName = displayName.value.trim(),
-                  fullName = "",
+                  displayName = displayName.value,
+                  fullName = fullName.value,
                   image = profileImage.value
                 ))
               }
@@ -157,8 +167,6 @@ fun CreateGroupButton(color: Color, modifier: Modifier) {
   }
 }
 
-fun canCreateProfile(displayName: String): Boolean = displayName.trim().isNotEmpty() && isValidDisplayName(displayName.trim())
-
 @Preview
 @Composable
 fun PreviewAddGroupLayout() {

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

@@ -131,13 +131,13 @@ private fun ContactConnectionInfoLayout(
 
     SectionView {
       if (!connReq.isNullOrEmpty() && contactConnection.initiated) {
-        SimpleXLinkQRCode(
+        QRCode(
           connReq, Modifier
             .padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)
             .aspectRatio(1f)
         )
         incognitoEnabled()
-        ShareLinkButton(connReq)
+        ShareLinkButton(share)
         OneTimeLinkLearnMoreButton(learnMore)
       } else {
         incognitoEnabled()

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

@@ -53,14 +53,32 @@ fun PasteToConnectLayout(
   fun connectViaLink(connReqUri: String) {
     try {
       val uri = URI(connReqUri)
-      withApi {
-        planAndConnect(chatModel, uri, incognito = incognito.value, close)
+      withUriAction(uri) { linkType ->
+        val action = suspend {
+          Log.d(TAG, "connectViaUri: connecting")
+          if (connectViaUri(chatModel, linkType, uri, incognito = incognito.value)) {
+            close()
+          }
+        }
+        if (linkType == ConnectionLinkType.GROUP) {
+          AlertManager.shared.showAlertDialog(
+            title = generalGetString(MR.strings.connect_via_group_link),
+            text = generalGetString(MR.strings.you_will_join_group),
+            confirmText = if (incognito.value) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
+            onConfirm = { withApi { action() } }
+          )
+        } else action()
       }
     } catch (e: RuntimeException) {
       AlertManager.shared.showAlertMsg(
         title = generalGetString(MR.strings.invalid_connection_link),
         text = generalGetString(MR.strings.this_string_is_not_a_connection_link)
       )
+    } catch (e: URISyntaxException) {
+      AlertManager.shared.showAlertMsg(
+        title = generalGetString(MR.strings.invalid_connection_link),
+        text = generalGetString(MR.strings.this_string_is_not_a_connection_link)
+      )
     }
   }
 
@@ -97,7 +115,6 @@ fun PasteToConnectLayout(
       painterResource(MR.images.ic_link),
       stringResource(MR.strings.connect_button),
       click = { connectViaLink(connectionLink.value) },
-      disabled = connectionLink.value.isEmpty() || connectionLink.value.trim().contains(" ")
     )
 
     IncognitoToggle(incognitoPref, incognito) { ModalManager.start.showModal { IncognitoView() } }

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

@@ -19,29 +19,6 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.launch
 
-@Composable
-fun SimpleXLinkQRCode(
-  connReq: String,
-  modifier: Modifier = Modifier,
-  tintColor: Color = Color(0xff062d56),
-  withLogo: Boolean = true
-) {
-  QRCode(
-    simplexChatLink(connReq),
-    modifier,
-    tintColor,
-    withLogo
-  )
-}
-
-fun simplexChatLink(uri: String): String {
-  return if (uri.startsWith("simplex:/")) {
-    uri.replace("simplex:/", "https://simplex.chat/")
-  } else {
-    uri
-  }
-}
-
 @Composable
 fun QRCode(
   connReq: String,

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

@@ -1,7 +1,6 @@
 package chat.simplex.common.views.newchat
 
 import SectionBottomSpacer
-import SectionItemView
 import SectionTextFooter
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import chat.simplex.common.platform.Log
@@ -11,265 +10,66 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextAlign
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.TAG
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.chatlist.openDirectChat
-import chat.simplex.common.views.chatlist.openGroupChat
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.net.URI
 
 @Composable
 expect fun ScanToConnectView(chatModel: ChatModel, close: () -> Unit)
 
 enum class ConnectionLinkType {
-  INVITATION, CONTACT, GROUP
+  CONTACT, INVITATION, GROUP
 }
 
-suspend fun planAndConnect(
-  chatModel: ChatModel,
-  uri: URI,
-  incognito: Boolean?,
-  close: (() -> Unit)?
-) {
-  val connectionPlan = chatModel.controller.apiConnectPlan(uri.toString())
-  if (connectionPlan != null) {
-    when (connectionPlan) {
-      is ConnectionPlan.InvitationLink -> when (connectionPlan.invitationLinkPlan) {
-        InvitationLinkPlan.Ok -> {
-          Log.d(TAG, "planAndConnect, .InvitationLink, .Ok, incognito=$incognito")
-          if (incognito != null) {
-            connectViaUri(chatModel, uri, incognito, connectionPlan, close)
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_via_invitation_link),
-              text = AnnotatedString(generalGetString(MR.strings.profile_will_be_sent_to_contact_sending_link)),
-              connectDestructive = false
-            )
-          }
-        }
-        InvitationLinkPlan.OwnLink -> {
-          Log.d(TAG, "planAndConnect, .InvitationLink, .OwnLink, incognito=$incognito")
-          if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
-              text = generalGetString(MR.strings.connect_plan_this_is_your_own_one_time_link),
-              confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withApi { connectViaUri(chatModel, uri, incognito, connectionPlan, close) } },
-              destructive = true,
-            )
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
-              text = AnnotatedString(generalGetString(MR.strings.connect_plan_this_is_your_own_one_time_link)),
-              connectDestructive = true
-            )
-          }
-        }
-        is InvitationLinkPlan.Connecting -> {
-          Log.d(TAG, "planAndConnect, .InvitationLink, .Connecting, incognito=$incognito")
-          val contact = connectionPlan.invitationLinkPlan.contact_
-          if (contact != null) {
-            openKnownContact(chatModel, close, contact)
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.contact_already_exists),
-              String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName)
-            )
-          } else {
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.connect_plan_already_connecting),
-              generalGetString(MR.strings.connect_plan_you_are_already_connecting_via_this_one_time_link)
-            )
-          }
-        }
-        is InvitationLinkPlan.Known -> {
-          Log.d(TAG, "planAndConnect, .InvitationLink, .Known, incognito=$incognito")
-          val contact = connectionPlan.invitationLinkPlan.contact
-          openKnownContact(chatModel, close, contact)
-          AlertManager.shared.showAlertMsg(
-            generalGetString(MR.strings.contact_already_exists),
-            String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName)
-          )
-        }
+@Serializable
+sealed class CReqClientData {
+  @Serializable @SerialName("group") data class Group(val groupLinkId: String): CReqClientData()
+}
+
+fun withUriAction(uri: URI, run: suspend (ConnectionLinkType) -> Unit) {
+  val action = uri.path?.drop(1)?.replace("/", "")
+  val data = URI(uri.toString().replaceFirst("#/", "/")).getQueryParameter("data")
+  val type = when {
+    data != null -> {
+      val parsed = runCatching {
+        json.decodeFromString(CReqClientData.serializer(), data)
       }
-      is ConnectionPlan.ContactAddress -> when (connectionPlan.contactAddressPlan) {
-        ContactAddressPlan.Ok -> {
-          Log.d(TAG, "planAndConnect, .ContactAddress, .Ok, incognito=$incognito")
-          if (incognito != null) {
-            connectViaUri(chatModel, uri, incognito, connectionPlan, close)
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_via_contact_link),
-              text = AnnotatedString(generalGetString(MR.strings.profile_will_be_sent_to_contact_sending_link)),
-              connectDestructive = false
-            )
-          }
-        }
-        ContactAddressPlan.OwnLink -> {
-          Log.d(TAG, "planAndConnect, .ContactAddress, .OwnLink, incognito=$incognito")
-          if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
-              text = generalGetString(MR.strings.connect_plan_this_is_your_own_simplex_address),
-              confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withApi { connectViaUri(chatModel, uri, incognito, connectionPlan, close) } },
-              destructive = true,
-            )
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_plan_connect_to_yourself),
-              text = AnnotatedString(generalGetString(MR.strings.connect_plan_this_is_your_own_simplex_address)),
-              connectDestructive = true
-            )
-          }
-        }
-        ContactAddressPlan.ConnectingConfirmReconnect -> {
-          Log.d(TAG, "planAndConnect, .ContactAddress, .ConnectingConfirmReconnect, incognito=$incognito")
-          if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(MR.strings.connect_plan_repeat_connection_request),
-              text = generalGetString(MR.strings.connect_plan_you_have_already_requested_connection_via_this_address),
-              confirmText = if (incognito) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
-              onConfirm = { withApi { connectViaUri(chatModel, uri, incognito, connectionPlan, close) } },
-              destructive = true,
-            )
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_plan_repeat_connection_request),
-              text = AnnotatedString(generalGetString(MR.strings.connect_plan_you_have_already_requested_connection_via_this_address)),
-              connectDestructive = true
-            )
-          }
-        }
-        is ContactAddressPlan.ConnectingProhibit -> {
-          Log.d(TAG, "planAndConnect, .ContactAddress, .ConnectingProhibit, incognito=$incognito")
-          val contact = connectionPlan.contactAddressPlan.contact
-          openKnownContact(chatModel, close, contact)
-          AlertManager.shared.showAlertMsg(
-            generalGetString(MR.strings.contact_already_exists),
-            String.format(generalGetString(MR.strings.connect_plan_you_are_already_connecting_to_vName), contact.displayName)
-          )
-        }
-        is ContactAddressPlan.Known -> {
-          Log.d(TAG, "planAndConnect, .ContactAddress, .Known, incognito=$incognito")
-          val contact = connectionPlan.contactAddressPlan.contact
-          openKnownContact(chatModel, close, contact)
-          AlertManager.shared.showAlertMsg(
-            generalGetString(MR.strings.contact_already_exists),
-            String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), contact.displayName)
-          )
-        }
-      }
-      is ConnectionPlan.GroupLink -> when (connectionPlan.groupLinkPlan) {
-        GroupLinkPlan.Ok -> {
-          Log.d(TAG, "planAndConnect, .GroupLink, .Ok, incognito=$incognito")
-          if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(MR.strings.connect_via_group_link),
-              text = generalGetString(MR.strings.you_will_join_group),
-              confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
-              onConfirm = { withApi { connectViaUri(chatModel, uri, incognito, connectionPlan, close) } }
-            )
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_via_group_link),
-              text = AnnotatedString(generalGetString(MR.strings.you_will_join_group)),
-              connectDestructive = false
-            )
-          }
-        }
-        is GroupLinkPlan.OwnLink -> {
-          Log.d(TAG, "planAndConnect, .GroupLink, .OwnLink, incognito=$incognito")
-          val groupInfo = connectionPlan.groupLinkPlan.groupInfo
-          ownGroupLinkConfirmConnect(chatModel, uri, incognito, connectionPlan, groupInfo, close)
-        }
-        GroupLinkPlan.ConnectingConfirmReconnect -> {
-          Log.d(TAG, "planAndConnect, .GroupLink, .ConnectingConfirmReconnect, incognito=$incognito")
-          if (incognito != null) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(MR.strings.connect_plan_repeat_join_request),
-              text = generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link),
-              confirmText = if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
-              onConfirm = { withApi { connectViaUri(chatModel, uri, incognito, connectionPlan, close) } },
-              destructive = true,
-            )
-          } else {
-            askCurrentOrIncognitoProfileAlert(
-              chatModel, uri, connectionPlan, close,
-              title = generalGetString(MR.strings.connect_plan_repeat_join_request),
-              text = AnnotatedString(generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link)),
-              connectDestructive = true
-            )
-          }
-        }
-        is GroupLinkPlan.ConnectingProhibit -> {
-          Log.d(TAG, "planAndConnect, .GroupLink, .ConnectingProhibit, incognito=$incognito")
-          val groupInfo = connectionPlan.groupLinkPlan.groupInfo_
-          if (groupInfo != null) {
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.connect_plan_group_already_exists),
-              String.format(generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_vName), groupInfo.displayName)
-            )
-          } else {
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.connect_plan_already_joining_the_group),
-              generalGetString(MR.strings.connect_plan_you_are_already_joining_the_group_via_this_link)
-            )
-          }
-        }
-        is GroupLinkPlan.Known -> {
-          Log.d(TAG, "planAndConnect, .GroupLink, .Known, incognito=$incognito")
-          val groupInfo = connectionPlan.groupLinkPlan.groupInfo
-          openKnownGroup(chatModel, close, groupInfo)
-          AlertManager.shared.showAlertMsg(
-            generalGetString(MR.strings.connect_plan_group_already_exists),
-            String.format(generalGetString(MR.strings.connect_plan_you_are_already_in_group_vName), groupInfo.displayName)
-          )
-        }
+      when {
+        parsed.getOrNull() is CReqClientData.Group -> ConnectionLinkType.GROUP
+        else -> null
       }
     }
+
+    action == "contact" -> ConnectionLinkType.CONTACT
+    action == "invitation" -> ConnectionLinkType.INVITATION
+    else -> null
+  }
+  if (type != null) {
+    withApi { run(type) }
   } else {
-    Log.d(TAG, "planAndConnect, plan error")
-    if (incognito != null) {
-      connectViaUri(chatModel, uri, incognito, connectionPlan = null, close)
-    } else {
-      askCurrentOrIncognitoProfileAlert(
-        chatModel, uri, connectionPlan = null, close,
-        title = generalGetString(MR.strings.connect_plan_connect_via_link),
-        connectDestructive = false
-      )
-    }
+    AlertManager.shared.showAlertMsg(
+      title = generalGetString(MR.strings.invalid_contact_link),
+      text = generalGetString(MR.strings.this_link_is_not_a_valid_connection_link)
+    )
   }
 }
 
-suspend fun connectViaUri(
-  chatModel: ChatModel,
-  uri: URI,
-  incognito: Boolean,
-  connectionPlan: ConnectionPlan?,
-  close: (() -> Unit)?
-): Boolean {
+suspend fun connectViaUri(chatModel: ChatModel, action: ConnectionLinkType, uri: URI, incognito: Boolean): Boolean {
   val r = chatModel.controller.apiConnect(incognito, uri.toString())
-  val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
   if (r) {
-    close?.invoke()
     AlertManager.shared.showAlertMsg(
       title = generalGetString(MR.strings.connection_request_sent),
       text =
-      when (connLinkType) {
+      when (action) {
         ConnectionLinkType.CONTACT -> generalGetString(MR.strings.you_will_be_connected_when_your_connection_request_is_accepted)
         ConnectionLinkType.INVITATION -> generalGetString(MR.strings.you_will_be_connected_when_your_contacts_device_is_online)
         ConnectionLinkType.GROUP -> generalGetString(MR.strings.you_will_be_connected_when_group_host_device_is_online)
@@ -279,139 +79,6 @@ suspend fun connectViaUri(
   return r
 }
 
-fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {
-  return when(connectionPlan) {
-    is ConnectionPlan.InvitationLink -> ConnectionLinkType.INVITATION
-    is ConnectionPlan.ContactAddress -> ConnectionLinkType.CONTACT
-    is ConnectionPlan.GroupLink -> ConnectionLinkType.GROUP
-  }
-}
-
-fun askCurrentOrIncognitoProfileAlert(
-  chatModel: ChatModel,
-  uri: URI,
-  connectionPlan: ConnectionPlan?,
-  close: (() -> Unit)?,
-  title: String,
-  text: AnnotatedString? = null,
-  connectDestructive: Boolean,
-) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
-    title = title,
-    text = text,
-    buttons = {
-      Column {
-        val connectColor = if (connectDestructive) MaterialTheme.colors.error else MaterialTheme.colors.primary
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-          withApi {
-            connectViaUri(chatModel, uri, incognito = false, connectionPlan, close)
-          }
-        }) {
-          Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
-        }
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-          withApi {
-            connectViaUri(chatModel, uri, incognito = true, connectionPlan, close)
-          }
-        }) {
-          Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = connectColor)
-        }
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-        }) {
-          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-        }
-      }
-    }
-  )
-}
-
-fun openKnownContact(chatModel: ChatModel, close: (() -> Unit)?, contact: Contact) {
-  withApi {
-    val c = chatModel.getContactChat(contact.contactId)
-    if (c != null) {
-      close?.invoke()
-      openDirectChat(contact.contactId, chatModel)
-    }
-  }
-}
-
-fun ownGroupLinkConfirmConnect(
-  chatModel: ChatModel,
-  uri: URI,
-  incognito: Boolean?,
-  connectionPlan: ConnectionPlan?,
-  groupInfo: GroupInfo,
-  close: (() -> Unit)?,
-) {
-  AlertManager.shared.showAlertDialogButtonsColumn(
-    title = generalGetString(MR.strings.connect_plan_join_your_group),
-    text = AnnotatedString(String.format(generalGetString(MR.strings.connect_plan_this_is_your_link_for_group_vName), groupInfo.displayName)),
-    buttons = {
-      Column {
-        // Open group
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-          openKnownGroup(chatModel, close, groupInfo)
-        }) {
-          Text(generalGetString(MR.strings.connect_plan_open_group), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-        }
-        if (incognito != null) {
-          // Join incognito / Join with current profile
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              connectViaUri(chatModel, uri, incognito, connectionPlan, close)
-            }
-          }) {
-            Text(
-              if (incognito) generalGetString(MR.strings.join_group_incognito_button) else generalGetString(MR.strings.join_group_button),
-              Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error
-            )
-          }
-        } else {
-          // Use current profile
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              connectViaUri(chatModel, uri, incognito = false, connectionPlan, close)
-            }
-          }) {
-            Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-          }
-          // Use new incognito profile
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-            withApi {
-              connectViaUri(chatModel, uri, incognito = true, connectionPlan, close)
-            }
-          }) {
-            Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-          }
-        }
-        // Cancel
-        SectionItemView({
-          AlertManager.shared.hideAlert()
-        }) {
-          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-        }
-      }
-    }
-  )
-}
-
-fun openKnownGroup(chatModel: ChatModel, close: (() -> Unit)?, groupInfo: GroupInfo) {
-  withApi {
-    val g = chatModel.getGroupChat(groupInfo.groupId)
-    if (g != null) {
-      close?.invoke()
-      openGroupChat(groupInfo.groupId, chatModel)
-    }
-  }
-}
-
 @Composable
 fun ConnectContactLayout(
   chatModel: ChatModel,
@@ -425,8 +92,21 @@ fun ConnectContactLayout(
     QRCodeScanner { connReqUri ->
       try {
         val uri = URI(connReqUri)
-        withApi {
-          planAndConnect(chatModel, uri, incognito = incognito.value, close)
+        withUriAction(uri) { linkType ->
+          val action = suspend {
+            Log.d(TAG, "connectViaUri: connecting")
+            if (connectViaUri(ChatModel, linkType, uri, incognito = incognito.value)) {
+              close()
+            }
+          }
+          if (linkType == ConnectionLinkType.GROUP) {
+            AlertManager.shared.showAlertDialog(
+              title = generalGetString(MR.strings.connect_via_group_link),
+              text = generalGetString(MR.strings.you_will_join_group),
+              confirmText = if (incognito.value) generalGetString(MR.strings.connect_via_link_incognito) else generalGetString(MR.strings.connect_via_link_verb),
+              onConfirm = { withApi { action() } }
+            )
+          } else action()
         }
       } catch (e: RuntimeException) {
         AlertManager.shared.showAlertMsg(

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

@@ -18,8 +18,7 @@ import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.newchat.SimpleXLinkQRCode
-import chat.simplex.common.views.newchat.simplexChatLink
+import chat.simplex.common.views.newchat.QRCode
 import chat.simplex.res.MR
 
 @Composable
@@ -39,7 +38,7 @@ fun CreateSimpleXAddress(m: ChatModel) {
     sendEmail = { address ->
       uriHandler.sendEmail(
         generalGetString(MR.strings.email_invite_subject),
-        generalGetString(MR.strings.email_invite_body).format(simplexChatLink(address.connReqContact))
+        generalGetString(MR.strings.email_invite_body).format(address.connReqContact)
       )
     },
     createAddress = {
@@ -92,8 +91,8 @@ private fun CreateSimpleXAddressLayout(
     Spacer(Modifier.weight(1f))
 
     if (userAddress != null) {
-      SimpleXLinkQRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-      ShareAddressButton { share(simplexChatLink(userAddress.connReqContact)) }
+      QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
+      ShareAddressButton { share(userAddress.connReqContact) }
       Spacer(Modifier.weight(1f))
       ShareViaEmailButton { sendEmail(userAddress) }
       Spacer(Modifier.weight(1f))

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

@@ -1,5 +1,16 @@
 package chat.simplex.common.views.onboarding
 
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.ChatModel
+import chat.simplex.common.platform.ProvideWindowInsets
+import chat.simplex.common.views.CreateProfilePanel
+import chat.simplex.common.platform.getKeyboardState
+import kotlinx.coroutines.launch
+
 enum class OnboardingStage {
   Step1_SimpleXInfo,
   Step2_CreateProfile,
@@ -8,3 +19,32 @@ enum class OnboardingStage {
   Step4_SetNotificationsMode,
   OnboardingComplete
 }
+
+@Composable
+fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
+  val scope = rememberCoroutineScope()
+  val scrollState = rememberScrollState()
+  val keyboardState by getKeyboardState()
+  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    Box(
+      modifier = Modifier
+        .fillMaxSize()
+        .padding(top = 20.dp)
+    ) {
+      CreateProfilePanel(chatModel, close)
+      LaunchedEffect(Unit) {
+        setLastVersionDefault(chatModel)
+      }
+      if (savedKeyboardState != keyboardState) {
+        LaunchedEffect(keyboardState) {
+          scope.launch {
+            savedKeyboardState = keyboardState
+            scrollState.animateScrollTo(scrollState.maxValue)
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -34,17 +34,6 @@ fun DeveloperView(
       ChatConsoleItem { withAuth(generalGetString(MR.strings.auth_open_chat_console), generalGetString(MR.strings.auth_log_in_using_credential), showCustomModal { it, close -> TerminalView(it, close) })}
       SettingsPreferenceItem(painterResource(MR.images.ic_drive_folder_upload), stringResource(MR.strings.confirm_database_upgrades), m.controller.appPrefs.confirmDBUpgrades)
       SettingsPreferenceItem(painterResource(MR.images.ic_code), stringResource(MR.strings.show_developer_options), developerTools)
-      if (appPlatform.isDesktop && devTools.value) {
-        TerminalAlwaysVisibleItem(m.controller.appPrefs.terminalAlwaysVisible) { checked ->
-          if (checked) {
-            withAuth(generalGetString(MR.strings.auth_open_chat_console), generalGetString(MR.strings.auth_log_in_using_credential)) {
-              m.controller.appPrefs.terminalAlwaysVisible.set(true)
-            }
-          } else {
-            m.controller.appPrefs.terminalAlwaysVisible.set(false)
-          }
-        }
-      }
     }
     SectionTextFooter(
       generalGetString(if (devTools.value) MR.strings.show_dev_options else MR.strings.hide_dev_options) + " " +

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

@@ -64,9 +64,7 @@ fun PrivacySettingsView(
     SectionDividerSpaced()
 
     SectionView(stringResource(MR.strings.settings_section_title_chats)) {
-      SettingsPreferenceItem(painterResource(MR.images.ic_lock), stringResource(MR.strings.encrypt_local_files), chatModel.controller.appPrefs.privacyEncryptLocalFiles, onChange = { enable ->
-        withBGApi { chatModel.controller.apiSetEncryptLocalFiles(enable) }
-      })
+      SettingsPreferenceItem(painterResource(MR.images.ic_lock), stringResource(MR.strings.encrypt_local_files), chatModel.controller.appPrefs.privacyEncryptLocalFiles)
       SettingsPreferenceItem(painterResource(MR.images.ic_image), stringResource(MR.strings.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
       SettingsPreferenceItem(painterResource(MR.images.ic_travel_explore), stringResource(MR.strings.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
       SettingsPreferenceItem(
@@ -92,6 +90,9 @@ fun PrivacySettingsView(
         chatModel.simplexLinkMode.value = it
       })
     }
+    if (chatModel.simplexLinkMode.value == SimplexLinkMode.BROWSER) {
+      SectionTextFooter(stringResource(MR.strings.simplex_link_mode_browser_warning))
+    }
     SectionDividerSpaced()
 
     val currentUser = chatModel.currentUser.value
@@ -182,10 +183,8 @@ fun PrivacySettingsView(
 
 @Composable
 private fun SimpleXLinkOptions(simplexLinkModeState: State<SimplexLinkMode>, onSelected: (SimplexLinkMode) -> Unit) {
-  val modeValues = listOf(SimplexLinkMode.DESCRIPTION, SimplexLinkMode.FULL)
-  val pickerValues = modeValues + if (modeValues.contains(simplexLinkModeState.value)) emptyList() else listOf(simplexLinkModeState.value)
   val values = remember {
-    pickerValues.map {
+    SimplexLinkMode.values().map {
       when (it) {
         SimplexLinkMode.DESCRIPTION -> it to generalGetString(MR.strings.simplex_link_mode_description)
         SimplexLinkMode.FULL -> it to generalGetString(MR.strings.simplex_link_mode_full)
@@ -317,7 +316,7 @@ private fun showUserGroupsReceiptsAlert(
   )
 }
 
-private val laDelays = listOf(10, 30, 60, 180, 600, 0)
+private val laDelays = listOf(10, 30, 60, 180, 0)
 
 @Composable
 fun SimplexLockView(

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

@@ -322,15 +322,6 @@ fun ChatLockItem(
   }
 }
 
-@Composable fun TerminalAlwaysVisibleItem(pref: SharedPreference<Boolean>, onChange: (Boolean) -> Unit) {
-  SettingsActionItemWithContent(painterResource(MR.images.ic_engineering), stringResource(MR.strings.terminal_always_visible), extraPadding = false) {
-    DefaultSwitch(
-      checked = remember { pref.state }.value,
-      onCheckedChange = onChange,
-    )
-  }
-}
-
 @Composable fun InstallTerminalAppItem(uriHandler: UriHandler) {
   SectionItemView({ uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat") }) {
     Icon(
@@ -364,7 +355,7 @@ fun AppVersionItem(showVersion: () -> Unit) {
       maxLines = 1,
       overflow = TextOverflow.Ellipsis
     )
-    if (profileOf.fullName.isNotEmpty() && profileOf.fullName != profileOf.displayName) {
+    if (profileOf.fullName.isNotEmpty()) {
       Text(
         profileOf.fullName,
         Modifier.padding(vertical = 5.dp),

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

@@ -24,10 +24,10 @@ import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.ShareAddressButton
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.newchat.QRCode
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.MsgContent
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
 
 @Composable
@@ -100,7 +100,7 @@ fun UserAddressView(
       sendEmail = { userAddress ->
         uriHandler.sendEmail(
           generalGetString(MR.strings.email_invite_subject),
-          generalGetString(MR.strings.email_invite_body).format(simplexChatLink( userAddress.connReqContact))
+          generalGetString(MR.strings.email_invite_body).format(userAddress.connReqContact)
         )
       },
       setProfileAddress = ::setProfileAddress,
@@ -201,8 +201,8 @@ private fun UserAddressLayout(
         val autoAcceptState = remember { mutableStateOf(AutoAcceptState(userAddress)) }
         val autoAcceptStateSaved = remember { mutableStateOf(autoAcceptState.value) }
         SectionView(stringResource(MR.strings.address_section_title).uppercase()) {
-          SimpleXLinkQRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-          ShareAddressButton { share(simplexChatLink(userAddress.connReqContact)) }
+          QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
+          ShareAddressButton { share(userAddress.connReqContact) }
           ShareViaEmailButton { sendEmail(userAddress) }
           ShareWithContactsButton(shareViaProfile, setProfileAddress)
           AutoAcceptToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) }