fix chatView

.github/workflows/build.yml

@@ -131,10 +131,6 @@ jobs:
           echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
           echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
           echo "    flags: +openssl"                                           >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package rocksdb-haskell-jprupp"                                >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/rocksdb/include"     >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib"             >> cabal.project.local
 
       - name: Unix prepare cabal.project.local for Mac
         if: matrix.os == 'macos-13'
@@ -149,22 +145,14 @@ jobs:
           echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
           echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
           echo "    flags: +openssl"                                           >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package rocksdb-haskell-jprupp"                                >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/rocksdb/include"     >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib"             >> cabal.project.local
 
       - name: Install AppImage dependencies
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
-      - name: Install package dependencies
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
-        run: sudo apt install -y librocksdb-dev
-
       - name: Install pkg-config for Mac
         if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
-        run: brew install pkg-config rocksdb
+        run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
@@ -334,7 +322,6 @@ jobs:
             git
             perl
             make
-            mingw-w64-x86_64-rocksdb
           pacboy: >-
             toolchain:p
             cmake:p
@@ -354,10 +341,6 @@ jobs:
           echo "    flags: +openssl" >> cabal.project.local
           echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
           echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
-          echo ""                                                >> cabal.project.local
-          echo "package rocksdb-haskell-jprupp"                  >> cabal.project.local
-          echo "    extra-include-dirs: /mingw64/include"        >> cabal.project.local
-          echo "    extra-lib-dirs: /mingw64/lib"                >> cabal.project.local
 
           rm -rf dist-newstyle/src/direct-sq*
           sed -i "s/, unix /--, unix /" simplex-chat.cabal

apps/ios/Shared/ContentView.swift

@@ -13,7 +13,6 @@ struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
-    @ObservedObject var appSheetState = AppSheetState.shared
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var theme: AppTheme
     @EnvironmentObject var sceneDelegate: SceneDelegate
@@ -28,7 +27,6 @@ struct ContentView: View {
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
-    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_NOTIFICATION_ALERT_SHOWN) private var notificationAlertShown = false
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
@@ -252,7 +250,6 @@ struct ContentView: View {
     private func mainView() -> some View {
         ZStack(alignment: .top) {
             ChatListView(activeUserPickerSheet: $chatListUserPickerSheet)
-                .redacted(reason: appSheetState.redactionReasons(protectScreen))
             .onAppear {
                 requestNtfAuthorization()
                 // Local Authentication notice is to be shown on next start after onboarding is complete

apps/ios/Shared/Model/ChatModel.swift

@@ -147,7 +147,6 @@ final class ChatModel: ObservableObject {
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
     @Published var ctrlInitInProgress: Bool = false
-    @Published var notificationResponse: UNNotificationResponse?
     // local authentication
     @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?

apps/ios/Shared/Model/NtfManager.swift

@@ -29,33 +29,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
     private var granted = false
     private var prevNtfTime: Dictionary<ChatId, Date> = [:]
 
-    override init() {
-        super.init()
-        UNUserNotificationCenter.current().delegate = self
-    }
-
     // Handle notification when app is in background
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 didReceive response: UNNotificationResponse,
                                 withCompletionHandler handler: () -> Void) {
         logger.debug("NtfManager.userNotificationCenter: didReceive")
-        if appStateGroupDefault.get() == .active {
-            processNotificationResponse(response)
-        } else {
-            logger.debug("NtfManager.userNotificationCenter: remember response in model")
-            ChatModel.shared.notificationResponse = response
-        }
-        handler()
-    }
-
-    func processNotificationResponse(_ ntfResponse: UNNotificationResponse) {
+        let content = response.notification.request.content
         let chatModel = ChatModel.shared
-        let content = ntfResponse.notification.request.content
-        let action = ntfResponse.actionIdentifier
-        logger.debug("NtfManager.processNotificationResponse: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
+        let action = response.actionIdentifier
+        logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
         if let userId = content.userInfo["userId"] as? Int64,
            userId != chatModel.currentUser?.userId {
-            logger.debug("NtfManager.processNotificationResponse changeActiveUser")
             changeActiveUser(userId, viewPwd: nil)
         }
         if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
@@ -77,6 +61,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 ItemsModel.shared.loadOpenChat(chatId)
             }
         }
+        handler()
     }
 
     private func ntfCallAction(_ content: UNNotificationContent, _ action: String) -> (ChatId, NtfCallAction)? {
@@ -91,6 +76,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         return nil
     }
 
+
     // Handle notification when the app is in foreground
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 willPresent notification: UNNotification,
@@ -199,12 +185,6 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 actions: [],
                 intentIdentifiers: [],
                 hiddenPreviewsBodyPlaceholder: NSLocalizedString("SimpleX encrypted message or connection event", comment: "notification")
-            ),
-            UNNotificationCategory(
-                identifier: ntfCategoryManyEvents,
-                actions: [],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: NSLocalizedString("New events", comment: "notification")
             )
         ])
     }
@@ -230,28 +210,29 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 }
             }
         }
+        center.delegate = self
     }
 
     func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
         logger.debug("NtfManager.notifyContactRequest")
-        addNotification(createContactRequestNtf(user, contactRequest, 0))
+        addNotification(createContactRequestNtf(user, contactRequest))
     }
 
     func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
         logger.debug("NtfManager.notifyContactConnected")
-        addNotification(createContactConnectedNtf(user, contact, 0))
+        addNotification(createContactConnectedNtf(user, contact))
     }
 
     func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
         if cInfo.ntfsEnabled {
-            addNotification(createMessageReceivedNtf(user, cInfo, cItem, 0))
+            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
         }
     }
 
     func notifyCallInvitation(_ invitation: RcvCallInvitation) {
         logger.debug("NtfManager.notifyCallInvitation")
-        addNotification(createCallInvitationNtf(invitation, 0))
+        addNotification(createCallInvitationNtf(invitation))
     }
 
     func setNtfBadgeCount(_ count: Int) {

apps/ios/Shared/SimpleXApp.swift

@@ -82,17 +82,11 @@ struct SimpleXApp: App {
 
                         if appState != .stopped {
                             startChatAndActivate {
-                                if chatModel.chatRunning == true {
-                                    if let ntfResponse = chatModel.notificationResponse {
-                                        chatModel.notificationResponse = nil
-                                        NtfManager.shared.processNotificationResponse(ntfResponse)
-                                    }
-                                    if appState.inactive {
-                                        Task {
-                                            await updateChats()
-                                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                                await updateCallInvitations()
-                                            }
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    Task {
+                                        await updateChats()
+                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                            await updateCallInvitations()
                                         }
                                     }
                                 }

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

@@ -48,6 +48,7 @@ struct ChatView: View {
     @State private var allowToDeleteSelectedMessagesForAll: Bool = false
 
     @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
 
     var body: some View {
         if #available(iOS 16.0, *) {
@@ -116,6 +117,7 @@ struct ChatView: View {
         .background(theme.colors.background)
         .navigationBarTitleDisplayMode(.inline)
         .environmentObject(theme)
+        .privacySensitive(protectScreen)
         .confirmationDialog(selectedChatItems?.count == 1 ? "Delete message?" : "Delete \((selectedChatItems?.count ?? 0)) messages?", isPresented: $showDeleteSelectedMessages, titleVisibility: .visible) {
             Button("Delete for me", role: .destructive) {
                 if let selected = selectedChatItems {
@@ -211,126 +213,130 @@ struct ChatView: View {
         }
         .toolbar {
             ToolbarItem(placement: .principal) {
-                if selectedChatItems != nil {
-                    SelectedItemsTopToolbar(selectedChatItems: $selectedChatItems)
-                } else if case let .direct(contact) = cInfo {
-                    Button {
-                        Task {
-                            showChatInfoSheet = true
+                Group {
+                    if selectedChatItems != nil {
+                        SelectedItemsTopToolbar(selectedChatItems: $selectedChatItems)
+                    } else if case let .direct(contact) = cInfo {
+                        Button {
+                            Task {
+                                showChatInfoSheet = true
+                            }
+                        } label: {
+                            ChatInfoToolbar(chat: chat)
                         }
-                    } label: {
+                        .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                            ChatInfoView(
+                                chat: chat,
+                                contact: contact,
+                                localAlias: chat.chatInfo.localAlias,
+                                onSearch: { focusSearch() }
+                            )
+                        }
+                    } else if case let .group(groupInfo) = cInfo {
+                        Button {
+                            Task { await chatModel.loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
+                        } label: {
+                            ChatInfoToolbar(chat: chat)
+                                .tint(theme.colors.primary)
+                        }
+                        .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                            GroupChatInfoView(
+                                chat: chat,
+                                groupInfo: Binding(
+                                    get: { groupInfo },
+                                    set: { gInfo in
+                                        chat.chatInfo = .group(groupInfo: gInfo)
+                                        chat.created = Date.now
+                                    }
+                                ),
+                                onSearch: { focusSearch() }
+                            )
+                        }
+                    } else if case .local = cInfo {
                         ChatInfoToolbar(chat: chat)
                     }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
-                        ChatInfoView(
-                            chat: chat,
-                            contact: contact,
-                            localAlias: chat.chatInfo.localAlias,
-                            onSearch: { focusSearch() }
-                        )
-                    }
-                } else if case let .group(groupInfo) = cInfo {
-                    Button {
-                        Task { await chatModel.loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
-                    } label: {
-                        ChatInfoToolbar(chat: chat)
-                            .tint(theme.colors.primary)
-                    }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
-                        GroupChatInfoView(
-                            chat: chat,
-                            groupInfo: Binding(
-                                get: { groupInfo },
-                                set: { gInfo in
-                                    chat.chatInfo = .group(groupInfo: gInfo)
-                                    chat.created = Date.now
-                                }
-                            ),
-                            onSearch: { focusSearch() }
-                        )
-                    }
-                } else if case .local = cInfo {
-                    ChatInfoToolbar(chat: chat)
-                }
+                }.privacySensitive(protectScreen)
             }
             ToolbarItem(placement: .navigationBarTrailing) {
-                let isLoading = im.isLoading && im.showLoadingProgress
-                if selectedChatItems != nil {
-                    Button {
-                        withAnimation {
-                            selectedChatItems = nil
-                        }
-                    } label: {
-                        Text("Cancel")
-                    }
-                } else {
-                    switch cInfo {
-                    case let .direct(contact):
-                        HStack {
-                            let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
-                            if callsPrefEnabled {
-                                if chatModel.activeCall == nil {
-                                    callButton(contact, .audio, imageName: "phone")
-                                        .disabled(!contact.ready || !contact.active)
-                                } else if let call = chatModel.activeCall, call.contact.id == cInfo.id {
-                                    endCallButton(call)
-                                }
+                Group {
+                    let isLoading = im.isLoading && im.showLoadingProgress
+                    if selectedChatItems != nil {
+                        Button {
+                            withAnimation {
+                                selectedChatItems = nil
                             }
-                            Menu {
-                                if !isLoading {
-                                    if callsPrefEnabled && chatModel.activeCall == nil {
-                                        Button {
-                                            CallController.shared.startCall(contact, .video)
-                                        } label: {
-                                            Label("Video call", systemImage: "video")
-                                        }
-                                        .disabled(!contact.ready || !contact.active)
+                        } label: {
+                            Text("Cancel")
+                        }
+                    } else {
+                        switch cInfo {
+                        case let .direct(contact):
+                            HStack {
+                                let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
+                                if callsPrefEnabled {
+                                    if chatModel.activeCall == nil {
+                                        callButton(contact, .audio, imageName: "phone")
+                                            .disabled(!contact.ready || !contact.active)
+                                    } else if let call = chatModel.activeCall, call.contact.id == cInfo.id {
+                                        endCallButton(call)
                                     }
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                        .disabled(!contact.ready || !contact.active)
                                 }
-                            } label: {
-                                Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
-                            }
-                        }
-                    case let .group(groupInfo):
-                        HStack {
-                            if groupInfo.canAddMembers {
-                                if (chat.chatInfo.incognito) {
-                                    groupLinkButton()
-                                        .appSheet(isPresented: $showGroupLinkSheet) {
-                                            GroupLinkView(
-                                                groupId: groupInfo.groupId,
-                                                groupLink: $groupLink,
-                                                groupLinkMemberRole: $groupLinkMemberRole,
-                                                showTitle: true,
-                                                creatingGroup: false
-                                            )
+                                Menu {
+                                    if !isLoading {
+                                        if callsPrefEnabled && chatModel.activeCall == nil {
+                                            Button {
+                                                CallController.shared.startCall(contact, .video)
+                                            } label: {
+                                                Label("Video call", systemImage: "video")
+                                            }
+                                            .disabled(!contact.ready || !contact.active)
                                         }
-                                } else {
-                                    addMembersButton()
+                                        searchButton()
+                                        ToggleNtfsButton(chat: chat)
+                                            .disabled(!contact.ready || !contact.active)
+                                    }
+                                } label: {
+                                    Image(systemName: "ellipsis")
+                                        .tint(isLoading ? Color.clear : nil)
+                                        .overlay { if isLoading { ProgressView() } }
                                 }
                             }
-                            Menu {
-                                if !isLoading {
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
+                        case let .group(groupInfo):
+                            HStack {
+                                if groupInfo.canAddMembers {
+                                    if (chat.chatInfo.incognito) {
+                                        groupLinkButton()
+                                            .appSheet(isPresented: $showGroupLinkSheet) {
+                                                GroupLinkView(
+                                                    groupId: groupInfo.groupId,
+                                                    groupLink: $groupLink,
+                                                    groupLinkMemberRole: $groupLinkMemberRole,
+                                                    showTitle: true,
+                                                    creatingGroup: false
+                                                )
+                                            }
+                                    } else {
+                                        addMembersButton()
+                                    }
+                                }
+                                Menu {
+                                    if !isLoading {
+                                        searchButton()
+                                        ToggleNtfsButton(chat: chat)
+                                    }
+                                } label: {
+                                    Image(systemName: "ellipsis")
+                                        .tint(isLoading ? Color.clear : nil)
+                                        .overlay { if isLoading { ProgressView() } }
                                 }
-                            } label: {
-                                Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
                             }
+                        case .local:
+                            searchButton()
+                        default:
+                            EmptyView()
                         }
-                    case .local:
-                        searchButton()
-                    default:
-                        EmptyView()
                     }
-                }
+                }.privacySensitive(protectScreen)
             }
         }
     }

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

@@ -287,8 +287,8 @@ struct ComposeView: View {
     // this is a workaround to fire an explicit event in certain cases
     @State private var stopPlayback: Bool = false
 
-    @UserDefault(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @UserDefault(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     var body: some View {
         VStack(spacing: 0) {

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

@@ -40,7 +40,7 @@ struct SendMessageView: View {
     @State private var showCustomTimePicker = false
     @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
     @State private var progressByTimeout = false
-    @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
+    @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
 
     var body: some View {
         ZStack {

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

@@ -78,7 +78,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
             self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
                 tableView: tableView
             ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8 {
+                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
                     self.representer.loadPage()
                 }
                 let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)

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

@@ -95,6 +95,7 @@ struct ChatListView: View {
     @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
     @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
     @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
 
     var body: some View {
         if #available(iOS 16.0, *) {
@@ -119,6 +120,7 @@ struct ChatListView: View {
         .modifier(
             Sheet(isPresented: $userPickerShown) {
                 UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
+                    .privacySensitive(protectScreen)
             }
         )
         .appSheet(
@@ -142,6 +144,7 @@ struct ChatListView: View {
                 .background(theme.colors.background)
                 .navigationBarTitleDisplayMode(.inline)
                 .navigationBarHidden(searchMode || oneHandUI)
+                .privacySensitive(protectScreen)
         }
         .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
         .onDisappear() { activeUserPickerSheet = nil }
@@ -215,6 +218,7 @@ struct ChatListView: View {
                 Spacer()
                 trailingToolbarItem.padding(.bottom, padding)
             }
+            .privacySensitive(protectScreen)
             .contentShape(Rectangle())
             .onTapGesture { scrollToSearchBar = true }
         }
@@ -243,17 +247,20 @@ struct ChatListView: View {
                 unreadBadge(size: 12)
             }
         }
+        .privacySensitive(protectScreen)
         .onTapGesture {
             userPickerShown = true
         }
     }
 
     @ViewBuilder var trailingToolbarItem: some View {
-        switch chatModel.chatRunning {
-        case .some(true): NewChatMenuButton()
-        case .some(false): chatStoppedIcon()
-        case .none: EmptyView()
-        }
+        Group {
+            switch chatModel.chatRunning {
+            case .some(true): NewChatMenuButton()
+            case .some(false): chatStoppedIcon()
+            case .none: EmptyView()
+            }
+        }.privacySensitive(protectScreen)
     }
 
     @ViewBuilder private var chatList: some View {
@@ -410,6 +417,7 @@ struct SubsStatusIndicator: View {
     @State private var showServersSummary = false
 
     @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false
+    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
 
     var body: some View {
         Button {
@@ -424,6 +432,7 @@ struct SubsStatusIndicator: View {
             }
         }
         .disabled(ChatModel.shared.chatRunning != true)
+        .privacySensitive(protectScreen)
         .onAppear {
             startTask()
         }

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

@@ -11,12 +11,8 @@ import SwiftUI
 class AppSheetState: ObservableObject {
     static let shared = AppSheetState()
     @Published var scenePhaseActive: Bool = false
-
-    func redactionReasons(_ protectScreen: Bool) -> RedactionReasons {
-        !protectScreen || scenePhaseActive
-        ? RedactionReasons()
-        : RedactionReasons.placeholder
-    }
+    // Scehe phase is also be inactive while faceID is requested
+    @Published var biometricAuth: Bool = false
 }
 
 private struct PrivacySensitive: ViewModifier {
@@ -25,7 +21,11 @@ private struct PrivacySensitive: ViewModifier {
     @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared
 
     func body(content: Content) -> some View {
-        content.redacted(reason: appSheetState.redactionReasons(protectScreen))
+        if !protectScreen {
+            content
+        } else {
+            content.privacySensitive(!appSheetState.scenePhaseActive && !appSheetState.biometricAuth).redacted(reason: .privacy)
+        }
     }
 }
 

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

@@ -63,9 +63,11 @@ func systemAuthenticate(_ reason: String, _ completed: @escaping (LAResult) -> V
     var authAvailabilityError: NSError?
     if laContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: &authAvailabilityError) {
         logger.debug("DEBUGGING: systemAuthenticate: canEvaluatePolicy callback")
+        AppSheetState.shared.biometricAuth = true
         laContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { success, authError in
             logger.debug("DEBUGGING: systemAuthenticate evaluatePolicy callback")
             DispatchQueue.main.async {
+                AppSheetState.shared.biometricAuth = false
                 if success {
                     completed(LAResult.success)
                 } else {

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

@@ -16,7 +16,6 @@ struct UserWallpaperEditor: View {
     @State var themeModeOverride: ThemeModeOverride
     @State var applyToMode: DefaultThemeMode?
     @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
     @Binding var globalThemeUsed: Bool
     var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
 
@@ -126,27 +125,24 @@ struct UserWallpaperEditor: View {
 
                 CustomizeThemeColorsSection(editColor: { name in editColor(name, theme) })
 
-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
             } else {
                 AdvancedSettingsButton(theme.colors.primary) { showMore = true }
             }
         }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
     }
 
     private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
@@ -220,7 +216,6 @@ struct ChatWallpaperEditor: View {
     @State var themeModeOverride: ThemeModeOverride
     @State var applyToMode: DefaultThemeMode?
     @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
     @Binding var globalThemeUsed: Bool
     var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
 
@@ -333,27 +328,24 @@ struct ChatWallpaperEditor: View {
 
                 CustomizeThemeColorsSection(editColor: editColor)
 
-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
             } else {
                 AdvancedSettingsButton(theme.colors.primary) { showMore = true }
             }
         }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
     }
 
     private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {

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

@@ -1,62 +0,0 @@
-//
-//  UserDefault.swift
-//  SimpleX (iOS)
-//
-//  Created by user on 14/10/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-
-@propertyWrapper
-public struct UserDefault<Value: Equatable>: DynamicProperty {
-    @StateObject private var observer = UserDefaultObserver()
-    let initialValue: Value
-    let key: String
-    let store: UserDefaults
-
-    public init(
-        wrappedValue: Value,
-        _ key: String,
-        store: UserDefaults = .standard
-    ) {
-        self.initialValue = wrappedValue
-        self.key = key
-        self.store = store
-    }
-
-    public var wrappedValue: Value {
-        get {
-            // Observer can only be accessed after the property wrapper is installed in view (runtime exception)
-            observer.subscribe(to: key)
-            return store.object(forKey: key) as? Value ?? initialValue
-        }
-        nonmutating set {
-            store.set(newValue, forKey: key)
-        }
-    }
-}
-
-private class UserDefaultObserver: ObservableObject {
-    private var subscribed = false
-
-    func subscribe(to key: String) {
-        if !subscribed {
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(userDefaultsDidChange),
-                name: UserDefaults.didChangeNotification,
-                object: nil
-            )
-            subscribed = true
-        }
-    }
-
-    @objc
-    private func userDefaultsDidChange(_ notification: Notification) {
-        Task { @MainActor in objectWillChange.send() }
-    }
-
-    deinit { NotificationCenter.default.removeObserver(self) }
-}

apps/ios/Shared/Views/TerminalView.swift

@@ -105,12 +105,7 @@ struct TerminalView: View {
             }
         }
         .navigationViewStyle(.stack)
-        .toolbar {
-            // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-            ToolbarItem(placement: .principal) {
-                Text("Chat console").font(.headline)
-            }
-        }
+        .navigationTitle("Chat console")
         .modifier(ThemedBackground())
     }
 

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

@@ -583,14 +583,11 @@ struct CustomizeThemeView: View {
                 }
             }
 
-            ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: nil)
-        }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { theme in
+            ImportExportThemeSection(perChat: nil, perUser: nil, save: { theme in
                 ThemeManager.saveAndApplyThemeOverrides(theme)
                 saveThemeToDatabase(nil)
-            }
-        )
+            })
+        }
         /// When changing app theme, user overrides are hidden. User overrides will be returned back after closing Appearance screen, see ThemeDestinationPicker()
         .interactiveDismissDisabled(true)
     }
@@ -598,9 +595,10 @@ struct CustomizeThemeView: View {
 
 struct ImportExportThemeSection: View {
     @EnvironmentObject var theme: AppTheme
-    @Binding var showFileImporter: Bool
     var perChat: ThemeModeOverride?
     var perUser: ThemeModeOverrides?
+    var save: (ThemeOverrides) -> Void
+    @State private var showFileImporter = false
 
     var body: some View {
         Section {
@@ -628,47 +626,39 @@ struct ImportExportThemeSection: View {
             } label: {
                 Text("Import theme").foregroundColor(theme.colors.primary)
             }
-        }
-    }
-}
-
-struct ThemeImporter: ViewModifier {
-    @Binding var isPresented: Bool
-    var save: (ThemeOverrides) -> Void
-
-    func body(content: Content) -> some View {
-        content.fileImporter(
-            isPresented: $isPresented,
-            allowedContentTypes: [.data/*.plainText*/],
-            allowsMultipleSelection: false
-        ) { result in
-            if case let .success(files) = result, let fileURL = files.first {
-                do {
-                    var fileSize: Int? = nil
-                    if fileURL.startAccessingSecurityScopedResource() {
-                        let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
-                        fileSize = resourceValues.fileSize
-                    }
-                    if let fileSize = fileSize,
-                       // Same as Android/desktop
-                       fileSize <= 5_500_000 {
-                        if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
-                            save(theme)
-                            logger.error("Saved theme from file")
-                        } else {
-                            logger.error("Error decoding theme file")
+            .fileImporter(
+                isPresented: $showFileImporter,
+                allowedContentTypes: [.data/*.plainText*/],
+                allowsMultipleSelection: false
+            ) { result in
+                if case let .success(files) = result, let fileURL = files.first {
+                    do {
+                        var fileSize: Int? = nil
+                        if fileURL.startAccessingSecurityScopedResource() {
+                            let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
+                            fileSize = resourceValues.fileSize
                         }
-                        fileURL.stopAccessingSecurityScopedResource()
-                    } else {
-                        fileURL.stopAccessingSecurityScopedResource()
-                        let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
-                        AlertManager.shared.showAlertMsg(
-                            title: "Large file!",
-                            message: "Currently maximum supported file size is \(prettyMaxFileSize)."
-                        )
+                        if let fileSize = fileSize,
+                           // Same as Android/desktop
+                           fileSize <= 5_500_000 {
+                            if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
+                                save(theme)
+                                logger.error("Saved theme from file")
+                            } else {
+                                logger.error("Error decoding theme file")
+                            }
+                            fileURL.stopAccessingSecurityScopedResource()
+                        } else {
+                            fileURL.stopAccessingSecurityScopedResource()
+                            let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
+                            AlertManager.shared.showAlertMsg(
+                                title: "Large file!",
+                                message: "Currently maximum supported file size is \(prettyMaxFileSize)."
+                            )
+                        }
+                    } catch {
+                        logger.error("Appearance fileImporter error \(error.localizedDescription)")
                     }
-                } catch {
-                    logger.error("Appearance fileImporter error \(error.localizedDescription)")
                 }
             }
         }

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

@@ -331,12 +331,7 @@ struct SettingsView: View {
                     chatDatabaseRow()
                     NavigationLink {
                         MigrateFromDevice(showProgressOnSettings: $showProgress)
-                            .toolbar {
-                                // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-                                ToolbarItem(placement: .principal) {
-                                    Text("Migrate device").font(.headline)
-                                }
-                            }
+                            .navigationTitle("Migrate device")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
                     } label: {

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

@@ -59,7 +59,10 @@ struct UserProfilesView: View {
             userProfilesView()
         } else {
             Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
-            .onAppear(perform: runAuth)
+                .onAppear {
+                    // `scenePhase` check Prevents a feedback loop
+                    if AppSheetState.shared.scenePhaseActive { runAuth() }
+                }
         }
     }
 

apps/ios/SimpleX NSE/NotificationService.swift

@@ -26,52 +26,14 @@ enum NSENotification {
     case nse(UNMutableNotificationContent)
     case callkit(RcvCallInvitation)
     case empty
-}
-
-public enum NSENotificationData {
-    case connectionEvent(_ user: User, _ connEntity: ConnectionEntity)
-    case contactConnected(_ user: any UserLike, _ contact: Contact)
-    case contactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest)
-    case messageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem)
-    case callInvitation(_ invitation: RcvCallInvitation)
     case msgInfo(NtfMsgAckInfo)
-    case noNtf
 
-    var callInvitation: RcvCallInvitation? {
+    var isCallInvitation: Bool {
         switch self {
-        case let .callInvitation(invitation): invitation
-        default: nil
-        }
-    }
-
-    func notificationContent(_ badgeCount: Int) -> UNMutableNotificationContent {
-        return switch self {
-        case let .connectionEvent(user, connEntity): createConnectionEventNtf(user, connEntity, badgeCount)
-        case let .contactConnected(user, contact): createContactConnectedNtf(user, contact, badgeCount)
-        case let .contactRequest(user, contactRequest): createContactRequestNtf(user, contactRequest, badgeCount)
-        case let .messageReceived(user, cInfo, cItem): createMessageReceivedNtf(user, cInfo, cItem, badgeCount)
-        case let .callInvitation(invitation): createCallInvitationNtf(invitation, badgeCount)
-        case .msgInfo: UNMutableNotificationContent()
-        case .noNtf: UNMutableNotificationContent()
-        }
-    }
-
-    var notificationEvent: NSENotificationData? {
-        return switch self {
-        case .connectionEvent: self
-        case .contactConnected: self
-        case .contactRequest: self
-        case .messageReceived: self
-        case .callInvitation: self
-        case .msgInfo: nil
-        case .noNtf: nil
-        }
-    }
-
-    var newMsgData: (any UserLike, ChatInfo)? {
-        return switch self {
-        case let .messageReceived(user, cInfo, _): (user, cInfo)
-        default: nil
+        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
+        case .callkit: true
+        case .empty: false
+        case .msgInfo: false
         }
     }
 }
@@ -81,10 +43,9 @@ public enum NSENotificationData {
 // or when background notification is received.
 class NSEThreads {
     static let shared = NSEThreads()
-    static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
+    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
     private var allThreads: Set<UUID> = []
-    var activeThreads: [(UUID, NotificationService)] = []
-    var droppedNotifications: [(ChatId, NSENotificationData)] = []
+    private var activeThreads: [(UUID, NotificationService)] = []
 
     func newThread() -> UUID {
         NSEThreads.queue.sync {
@@ -103,19 +64,22 @@ class NSEThreads {
         }
     }
 
-    func processNotification(_ id: ChatId, _ ntf: NSENotificationData) async -> Void {
-        if let (_, nse) = rcvEntityThread(id),
-           nse.expectedMessages[id]?.shouldProcessNtf ?? false {
-            nse.processReceivedNtf(id, ntf, signalReady: true)
+    func processNotification(_ id: ChatId, _ ntf: NSENotification) async -> Void {
+        var waitTime: Int64 = 5_000_000000
+        while waitTime > 0 {
+            if let (_, nse) = rcvEntityThread(id),
+               nse.shouldProcessNtf && nse.processReceivedNtf(ntf) {
+                break
+            } else {
+                try? await Task.sleep(nanoseconds: 10_000000)
+                waitTime -= 10_000000
+            }
         }
     }
 
     private func rcvEntityThread(_ id: ChatId) -> (UUID, NotificationService)? {
         NSEThreads.queue.sync {
-            // this selects the earliest thread that:
-            // 1) has this connection in nse.expectedMessages
-            // 2) has not completed processing messages for this connection (not ready)
-            activeThreads.first(where: { (_, nse) in nse.expectedMessages[id]?.ready == false })
+            activeThreads.first(where: { (_, nse) in nse.receiveEntityId == id })
         }
     }
 
@@ -142,38 +106,31 @@ class NSEThreads {
     }
 }
 
-struct ExpectedMessage {
-    var ntfConn: UserNtfConn
-    var receiveConnId: String?
-    var expectedMsgId: String?
-    var allowedGetNextAttempts: Int
-    var msgBestAttemptNtf: NSENotificationData?
-    var ready: Bool
-    var shouldProcessNtf: Bool
-    var startedProcessingNewMsgs: Bool
-    var semaphore: DispatchSemaphore
-}
-
 // Notification service extension creates a new instance of the class and calls didReceive for each notification.
 // Each didReceive is called in its own thread, but multiple calls can be made in one process, and, empirically, there is never
 // more than one process of notification service extension exists at a time.
 // Soon after notification service delivers the last notification it is either suspended or terminated.
 class NotificationService: UNNotificationServiceExtension {
     var contentHandler: ((UNNotificationContent) -> Void)?
-    // served as notification if no message attempts (msgBestAttemptNtf) could be produced
-    var serviceBestAttemptNtf: NSENotification?
+    var bestAttemptNtf: NSENotification?
     var badgeCount: Int = 0
     // thread is added to allThreads here - if thread did not start chat,
     // chat does not need to be suspended but NSE state still needs to be set to "suspended".
     var threadId: UUID? = NSEThreads.shared.newThread()
-    var expectedMessages: Dictionary<String, ExpectedMessage> = [:] // key is receiveEntityId
+    var notificationInfo: NtfMessages?
+    var receiveEntityId: String?
+    var receiveConnId: String?
+    var expectedMessage: String?
+    var allowedGetNextAttempts: Int = 3
+    // return true if the message is taken - it prevents sending it to another NotificationService instance for processing
+    var shouldProcessNtf = false
     var appSubscriber: AppSubscriber?
     var returnedSuspension = false
 
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         logger.debug("DEBUGGING: NotificationService.didReceive")
         let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
-        setServiceBestAttemptNtf(ntf)
+        setBestAttemptNtf(ntf)
         self.contentHandler = contentHandler
         registerGroupDefaults()
         let appState = appStateGroupDefault.get()
@@ -181,11 +138,13 @@ class NotificationService: UNNotificationServiceExtension {
         switch appState {
         case .stopped:
             setBadgeCount()
-            setServiceBestAttemptNtf(createAppStoppedNtf(badgeCount))
+            setBestAttemptNtf(createAppStoppedNtf())
             deliverBestAttemptNtf()
         case .suspended:
+            setBadgeCount()
             receiveNtfMessages(request, contentHandler)
         case .suspending:
+            setBadgeCount()
             Task {
                 let state: AppState = await withCheckedContinuation { cont in
                     appSubscriber = appStateSubscriber { s in
@@ -212,9 +171,8 @@ class NotificationService: UNNotificationServiceExtension {
                     deliverBestAttemptNtf()
                 }
             }
-        case .active: contentHandler(UNMutableNotificationContent())
-        case .activating: contentHandler(UNMutableNotificationContent())
-        case .bgRefresh: contentHandler(UNMutableNotificationContent())
+        default:
+            deliverBestAttemptNtf()
         }
     }
 
@@ -234,165 +192,78 @@ class NotificationService: UNNotificationServiceExtension {
             if let t = threadId { NSEThreads.shared.startThread(t, self) }
             let dbStatus = startChat()
             if case .ok = dbStatus,
-               let ntfConns = apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfConns ntfConns count = \(ntfConns.count)")
-
-                for ntfConn in ntfConns {
-                    addExpectedMessage(ntfConn: ntfConn)
-                }
-
-                let connIdsToGet = expectedMessages.compactMap { (id, _) in
-                    let started = NSEThreads.queue.sync {
-                        let canStart = checkCanStart(id)
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: can start: \(canStart)") }
-                        if canStart {
-                            processDroppedNotifications(id)
-                            expectedMessages[id]?.startedProcessingNewMsgs = true
-                            expectedMessages[id]?.shouldProcessNtf = true
-                        }
-                        return canStart
+               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.receivedMsg_ == nil ? 0 : 1))")
+                if let connEntity = ntfInfo.connEntity_ {
+                    setBestAttemptNtf(
+                        ntfInfo.ntfsEnabled
+                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
+                        : .empty
+                    )
+                    if let id = connEntity.id, ntfInfo.expectedMsg_ != nil {
+                        notificationInfo = ntfInfo
+                        receiveEntityId = id
+                        receiveConnId = connEntity.conn.agentConnId
+                        let expectedMsgId = ntfInfo.expectedMsg_?.msgId
+                        let receivedMsgId = ntfInfo.receivedMsg_?.msgId
+                        logger.debug("NotificationService: receiveNtfMessages: expectedMsgId = \(expectedMsgId ?? "nil", privacy: .private), receivedMsgId = \(receivedMsgId ?? "nil", privacy: .private)")
+                        expectedMessage = expectedMsgId
+                        shouldProcessNtf = true
+                        return
                     }
-                    if started {
-                        return expectedMessages[id]?.receiveConnId
-                    } else {
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) waiting on semaphore") }
-                        expectedMessages[id]?.semaphore.wait()
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) proceeding after semaphore") }
-                        Task {
-                            NSEThreads.queue.sync {
-                                processDroppedNotifications(id)
-                                expectedMessages[id]?.startedProcessingNewMsgs = true
-                                expectedMessages[id]?.shouldProcessNtf = true
-                            }
-                            if let connId = expectedMessages[id]?.receiveConnId {
-                                let _ = getConnNtfMessage(connId: connId)
-                            }
-                        }
-                        return nil
-                    }
-                }
-
-                if !connIdsToGet.isEmpty {
-                    if let r = apiGetConnNtfMessages(connIds: connIdsToGet) {
-                        logger.debug("NotificationService: receiveNtfMessages: apiGetConnNtfMessages count = \(r.count)")
-                    }
-                    return
                 }
             } else if let dbStatus = dbStatus {
-                setServiceBestAttemptNtf(createErrorNtf(dbStatus, badgeCount))
+                setBestAttemptNtf(createErrorNtf(dbStatus))
             }
         }
         deliverBestAttemptNtf()
     }
 
-    func addExpectedMessage(ntfConn: UserNtfConn) {
-        if let connEntity = ntfConn.connEntity_,
-           let receiveEntityId = connEntity.id, ntfConn.expectedMsg_ != nil {
-            let expectedMsgId = ntfConn.expectedMsg_?.msgId
-            logger.debug("NotificationService: addExpectedMessage: expectedMsgId = \(expectedMsgId ?? "nil", privacy: .private)")
-            expectedMessages[receiveEntityId] = ExpectedMessage(
-                ntfConn: ntfConn,
-                receiveConnId: connEntity.conn.agentConnId,
-                expectedMsgId: expectedMsgId,
-                allowedGetNextAttempts: 3,
-                msgBestAttemptNtf: ntfConn.defaultBestAttemptNtf,
-                ready: false,
-                shouldProcessNtf: false,
-                startedProcessingNewMsgs: false,
-                semaphore: DispatchSemaphore(value: 0)
-            )
-        }
-    }
-
-    func checkCanStart(_ entityId: String) -> Bool {
-        return !NSEThreads.shared.activeThreads.contains(where: {
-            (tId, nse) in tId != threadId && nse.expectedMessages.contains(where: { $0.key == entityId })
-        })
-    }
-
-    func processDroppedNotifications(_ entityId: String) {
-        if !NSEThreads.shared.droppedNotifications.isEmpty {
-            let messagesToProcess = NSEThreads.shared.droppedNotifications.filter { (eId, _) in eId == entityId }
-            NSEThreads.shared.droppedNotifications.removeAll(where: { (eId, _) in eId == entityId })
-            for (index, (_, ntf)) in messagesToProcess.enumerated() {
-                if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entity \(entityId, privacy: .private): processing dropped notification \(index, privacy: .private)") }
-                processReceivedNtf(entityId, ntf, signalReady: false)
-            }
-        }
-    }
-
     override func serviceExtensionTimeWillExpire() {
         logger.debug("DEBUGGING: NotificationService.serviceExtensionTimeWillExpire")
         deliverBestAttemptNtf(urgent: true)
     }
 
-    var expectingMoreMessages: Bool {
-        !expectedMessages.allSatisfy { $0.value.ready }
-    }
-
-    func processReceivedNtf(_ id: ChatId, _ ntf: NSENotificationData, signalReady: Bool) {
-        guard let expectedMessage = expectedMessages[id] else {
-            return
-        }
-        guard let expectedMsgTs = expectedMessage.ntfConn.expectedMsg_?.msgTs else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
-            return
+    func processReceivedNtf(_ ntf: NSENotification) -> Bool {
+        guard let ntfInfo = notificationInfo, let expectedMsgTs = ntfInfo.expectedMsg_?.msgTs else { return false }
+        if !ntfInfo.user.showNotifications {
+            self.setBestAttemptNtf(.empty)
         }
         if case let .msgInfo(info) = ntf {
-            if info.msgId == expectedMessage.expectedMsgId {
+            if info.msgId == expectedMessage {
+                expectedMessage = nil
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): expected")
-                expectedMessages[id]?.expectedMsgId = nil
-                if signalReady { entityReady(id) }
                 self.deliverBestAttemptNtf()
+                return true
             } else if let msgTs = info.msgTs_, msgTs > expectedMsgTs {
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, let other instance to process it, stopping this one")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
                 self.deliverBestAttemptNtf()
-            } else if (expectedMessages[id]?.allowedGetNextAttempts ?? 0) > 0, let receiveConnId = expectedMessages[id]?.receiveConnId {
+                return false
+            } else if allowedGetNextAttempts > 0, let receiveConnId = receiveConnId {
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, get next message")
-                expectedMessages[id]?.allowedGetNextAttempts -= 1
-                if let receivedMsg = getConnNtfMessage(connId: receiveConnId) {
-                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(receivedMsg.msgId, privacy: .private)")
+                allowedGetNextAttempts -= 1
+                if let receivedMsg = apiGetConnNtfMessage(connId: receiveConnId) {
+                    logger.debug("NotificationService processNtf, on apiGetConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(receivedMsg.msgId, privacy: .private)")
+                    return true
                 } else {
-                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private): no next message, deliver best attempt")
-                    NSEThreads.shared.droppedNotifications.append((id, ntf))
-                    if signalReady { entityReady(id) }
+                    logger.debug("NotificationService processNtf, on apiGetConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private): no next message, deliver best attempt")
                     self.deliverBestAttemptNtf()
+                    return false
                 }
             } else {
                 logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unknown message, let other instance to process it")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
+                self.deliverBestAttemptNtf()
+                return false
+            }
+        } else if ntfInfo.user.showNotifications {
+            logger.debug("NotificationService processNtf: setting best attempt")
+            self.setBestAttemptNtf(ntf)
+            if ntf.isCallInvitation {
                 self.deliverBestAttemptNtf()
             }
-        } else if expectedMessage.ntfConn.user.showNotifications {
-            logger.debug("NotificationService processNtf: setting best attempt")
-            if ntf.notificationEvent != nil {
-                setBadgeCount()
-            }
-            let prevBestAttempt = expectedMessages[id]?.msgBestAttemptNtf
-            if prevBestAttempt?.callInvitation != nil {
-                if ntf.callInvitation != nil { // replace with newer call
-                    expectedMessages[id]?.msgBestAttemptNtf = ntf
-                } // otherwise keep call as best attempt
-            } else {
-                expectedMessages[id]?.msgBestAttemptNtf = ntf
-            }
-        } else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
-        }
-    }
-
-    func entityReady(_ entityId: ChatId) {
-        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: entity \(entityId, privacy: .private)") }
-        expectedMessages[entityId]?.ready = true
-        if let (tNext, nse) = NSEThreads.shared.activeThreads.first(where: { (_, nse) in nse.expectedMessages[entityId]?.startedProcessingNewMsgs == false }) {
-            if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: signal next thread \(tNext, privacy: .private) for entity \(entityId, privacy: .private)") }
-            nse.expectedMessages[entityId]?.semaphore.signal()
+            return true
         }
+        return false
     }
 
     func setBadgeCount() {
@@ -400,32 +271,37 @@ class NotificationService: UNNotificationServiceExtension {
         ntfBadgeCountGroupDefault.set(badgeCount)
     }
 
-    func setServiceBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        logger.debug("NotificationService.setServiceBestAttemptNtf")
-        serviceBestAttemptNtf = .nse(ntf)
+    func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
+        setBestAttemptNtf(.nse(ntf))
     }
 
-    private func deliverBestAttemptNtf(urgent: Bool = false) {
-        if (urgent || !expectingMoreMessages) {
-            logger.debug("NotificationService.deliverBestAttemptNtf")
-            // stop processing other messages
-            for (key, _) in expectedMessages {
-                expectedMessages[key]?.shouldProcessNtf = false
-            }
-
-            let suspend: Bool
-            if let t = threadId {
-                threadId = nil
-                suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
-            } else {
-                suspend = false
-            }
-            deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
+    func setBestAttemptNtf(_ ntf: NSENotification) {
+        logger.debug("NotificationService.setBestAttemptNtf")
+        if case let .nse(notification) = ntf {
+            notification.badge = badgeCount as NSNumber
+            bestAttemptNtf = .nse(notification)
+        } else {
+            bestAttemptNtf = ntf
         }
     }
 
+    private func deliverBestAttemptNtf(urgent: Bool = false) {
+        logger.debug("NotificationService.deliverBestAttemptNtf")
+        // stop processing other messages
+        shouldProcessNtf = false
+
+        let suspend: Bool
+        if let t = threadId {
+            threadId = nil
+            suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
+        } else {
+            suspend = false
+        }
+        deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
+    }
+
     private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if useCallKit() && expectedMessages.contains(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }) {
+        if case .callkit = bestAttemptNtf {
             logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
             if urgent {
                 // suspending NSE even though there may be other notifications
@@ -463,13 +339,19 @@ class NotificationService: UNNotificationServiceExtension {
     }
 
     private func deliverNotification() {
-        if let handler = contentHandler, let ntf = prepareNotification() {
+        if let handler = contentHandler, let ntf = bestAttemptNtf {
             contentHandler = nil
-            serviceBestAttemptNtf = nil
+            bestAttemptNtf = nil
+            let deliver: (UNMutableNotificationContent?) -> Void = { ntf in
+                let useNtf = if let ntf = ntf {
+                    appStateGroupDefault.get().running ? UNMutableNotificationContent() : ntf
+                } else {
+                    UNMutableNotificationContent()
+                }
+                handler(useNtf)
+            }
             switch ntf {
-            case let .nse(content):
-                content.badge = badgeCount as NSNumber
-                handler(content)
+            case let .nse(content): deliver(content)
             case let .callkit(invitation):
                 logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
                 CXProvider.reportNewIncomingVoIPPushPayload([
@@ -480,85 +362,13 @@ class NotificationService: UNNotificationServiceExtension {
                     "callTs": invitation.callTs.timeIntervalSince1970
                 ]) { error in
                     logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    handler(error == nil ? UNMutableNotificationContent() : createCallInvitationNtf(invitation, self.badgeCount))
+                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
                 }
-            case .empty:
-                handler(UNMutableNotificationContent()) // used to mute notifications that did not unsubscribe yet
+            case .empty: deliver(nil) // used to mute notifications that did not unsubscribe yet
+            case .msgInfo: deliver(nil) // unreachable, the best attempt is never set to msgInfo
             }
         }
     }
-
-    private func prepareNotification() -> NSENotification? {
-        if expectedMessages.isEmpty {
-            return serviceBestAttemptNtf
-        } else if let callNtfKV = expectedMessages.first(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }),
-                  let callInv = callNtfKV.value.msgBestAttemptNtf?.callInvitation,
-                  let callNtf = callNtfKV.value.msgBestAttemptNtf {
-            return useCallKit() ? .callkit(callInv) : .nse(callNtf.notificationContent(badgeCount))
-        } else {
-            let ntfEvents = expectedMessages.compactMap { $0.value.msgBestAttemptNtf?.notificationEvent }
-            if ntfEvents.isEmpty {
-                return .empty
-            } else if let ntfEvent = ntfEvents.count == 1 ? ntfEvents.first : nil {
-                return .nse(ntfEvent.notificationContent(badgeCount))
-            } else {
-                return .nse(createJointNtf(ntfEvents))
-            }
-        }
-    }
-
-    private func createJointNtf(_ ntfEvents: [NSENotificationData]) -> UNMutableNotificationContent {
-        let previewMode = ntfPreviewModeGroupDefault.get()
-        let newMsgsData: [(any UserLike, ChatInfo)] = ntfEvents.compactMap { $0.newMsgData }
-        if !newMsgsData.isEmpty, let userId = newMsgsData.first?.0.userId {
-            let newMsgsChats: [ChatInfo] = newMsgsData.map { $0.1 }
-            let uniqueChatsNames = uniqueNewMsgsChatsNames(newMsgsChats)
-            var body: String
-            if previewMode == .hidden {
-                body = String.localizedStringWithFormat(NSLocalizedString("New messages in %d chats", comment: "notification body"), uniqueChatsNames.count)
-            } else {
-                body = String.localizedStringWithFormat(NSLocalizedString("From: %@", comment: "notification body"), newMsgsChatsNamesStr(uniqueChatsNames))
-            }
-            return createNotification(
-                categoryIdentifier: ntfCategoryManyEvents,
-                title: NSLocalizedString("New messages", comment: "notification"),
-                body: body,
-                userInfo: ["userId": userId],
-                badgeCount: badgeCount
-            )
-        } else {
-            return createNotification(
-                categoryIdentifier: ntfCategoryManyEvents,
-                title: NSLocalizedString("New events", comment: "notification"),
-                body: String.localizedStringWithFormat(NSLocalizedString("%d new events", comment: "notification body"), ntfEvents.count),
-                badgeCount: badgeCount
-            )
-        }
-    }
-
-    private func uniqueNewMsgsChatsNames(_ newMsgsChats: [ChatInfo]) -> [String] {
-        var seenChatIds = Set<ChatId>()
-        var uniqueChatsNames: [String] = []
-        for chat in newMsgsChats {
-            if !seenChatIds.contains(chat.id) {
-                seenChatIds.insert(chat.id)
-                uniqueChatsNames.append(chat.chatViewName)
-            }
-        }
-        return uniqueChatsNames
-    }
-
-    private func newMsgsChatsNamesStr(_ names: [String]) -> String {
-        return switch names.count {
-        case 1: names[0]
-        case 2: "\(names[0]) and \(names[1])"
-        case 3: "\(names[0] + ", " + names[1]) and \(names[2])"
-        default:
-            names.count > 3
-            ? "\(names[0]), \(names[1]) and \(names.count - 2) other chats"
-            : ""
-        }
-    }
 }
 
 // nseStateGroupDefault must not be used in NSE directly, only via this singleton
@@ -772,25 +582,28 @@ func chatRecvMsg() async -> ChatResponse? {
 private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }
 
-func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)? {
+func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
     logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
     switch res {
     case let .contactConnected(user, contact, _):
-        return (contact.id, .contactConnected(user, contact))
+        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
     case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .contactRequest(user, contactRequest))
+        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
     case let .newChatItems(user, chatItems):
         // Received items are created one at a time
         if let chatItem = chatItems.first {
             let cInfo = chatItem.chatInfo
             var cItem = chatItem.chatItem
+            if !cInfo.ntfsEnabled {
+                ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
+            }
             if let file = cItem.autoReceiveFile() {
                 cItem = autoReceiveFile(file) ?? cItem
             }
-            let ntf: NSENotificationData = (cInfo.ntfsEnabled && cItem.showNotification) ? .messageReceived(user, cInfo, cItem) : .noNtf
-            return (chatItem.chatId, ntf)
+            let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+            return cItem.showNotification ? (chatItem.chatId, ntf) : nil
         } else {
             return nil
         }
@@ -807,7 +620,10 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)?
         return nil
     case let .callInvitation(invitation):
         // Do not post it without CallKit support, iOS will stop launching the app without showing CallKit
-        return (invitation.contact.id, .callInvitation(invitation))
+        return (
+            invitation.contact.id,
+            useCallKit() ? .callkit(invitation) : .nse(createCallInvitationNtf(invitation))
+        )
     case let .ntfMessage(_, connEntity, ntfMessage):
         return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
     case .chatSuspended:
@@ -888,15 +704,15 @@ func apiSetEncryptLocalFiles(_ enable: Bool) throws {
     throw r
 }
 
-func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
+func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
     guard apiGetActiveUser() != nil else {
         logger.debug("no active user")
         return nil
     }
-    let r = sendSimpleXCmd(.apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfConns(ntfConns) = r {
-        logger.debug("apiGetNtfConns response ntfConns: \(ntfConns.count)")
-        return ntfConns.compactMap { toUserNtfConn($0) }
+    let r = sendSimpleXCmd(.apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo))
+    if case let .ntfMessages(user, connEntity_, expectedMsg_, receivedMsg_) = r, let user = user {
+        logger.debug("apiGetNtfMessage response ntfMessages: \(receivedMsg_ == nil ? 0 : 1)")
+        return NtfMessages(user: user, connEntity_: connEntity_, expectedMsg_: expectedMsg_, receivedMsg_: receivedMsg_)
     } else if case let .chatCmdError(_, error) = r {
         logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
     } else {
@@ -905,33 +721,17 @@ func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
     return nil
 }
 
-func toUserNtfConn(_ ntfConn: NtfConn) -> UserNtfConn? {
-    if let user = ntfConn.user_ {
-        return UserNtfConn(user: user, connEntity_: ntfConn.connEntity_, expectedMsg_: ntfConn.expectedMsg_)
-    } else {
-        return nil
-    }
-}
-
-func apiGetConnNtfMessages(connIds: [String]) -> [NtfMsgInfo?]? {
+func apiGetConnNtfMessage(connId: String) -> NtfMsgInfo? {
     guard apiGetActiveUser() != nil else {
         logger.debug("no active user")
         return nil
     }
-    let r = sendSimpleXCmd(.apiGetConnNtfMessages(connIds: connIds))
-    if case let .connNtfMessages(receivedMsgs) = r {
-        logger.debug("apiGetConnNtfMessages response receivedMsgs: \(receivedMsgs.count)")
-        return receivedMsgs
-    }
-    logger.debug("apiGetConnNtfMessages error: \(responseError(r))")
-    return nil
-}
-
-func getConnNtfMessage(connId: String) -> NtfMsgInfo? {
-    let r_ = apiGetConnNtfMessages(connIds: [connId])
-    if let r = r_, let receivedMsg = r.count == 1 ? r.first : nil {
-        return receivedMsg
+    let r = sendSimpleXCmd(.apiGetConnNtfMessage(connId: connId))
+    if case let .connNtfMessage(receivedMsg_) = r {
+        logger.debug("apiGetConnNtfMessage response receivedMsg_: \(receivedMsg_ == nil ? 0 : 1)")
+        return receivedMsg_
     }
+    logger.debug("apiGetConnNtfMessage error: \(responseError(r))")
     return nil
 }
 
@@ -969,33 +769,13 @@ func setNetworkConfig(_ cfg: NetCfg) throws {
     throw r
 }
 
-struct UserNtfConn {
+struct NtfMessages {
     var user: User
     var connEntity_: ConnectionEntity?
     var expectedMsg_: NtfMsgInfo?
+    var receivedMsg_: NtfMsgInfo?
 
-    var defaultBestAttemptNtf: NSENotificationData {
-        return if !user.showNotifications {
-            .noNtf
-        } else if let connEntity = connEntity_ {
-            switch connEntity {
-            case let .rcvDirectMsgConnection(_, contact):
-                contact?.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case let .rcvGroupMsgConnection(_, groupInfo, _):
-                groupInfo.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case .sndFileConnection: .noNtf
-            case .rcvFileConnection: .noNtf
-            case let .userContactConnection(_, userContact):
-                userContact.groupId == nil
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            }
-        } else {
-            .noNtf
-        }
+    var ntfsEnabled: Bool {
+        user.showNotifications && (connEntity_?.ntfsEnabled ?? false)
     }
 }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -148,11 +148,6 @@
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
 		6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */; };
-		643B3B452CCBEB080083A2CF /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B402CCBEB080083A2CF /* libgmpxx.a */; };
-		643B3B462CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a */; };
-		643B3B472CCBEB080083A2CF /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B422CCBEB080083A2CF /* libffi.a */; };
-		643B3B482CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a */; };
-		643B3B492CCBEB080083A2CF /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B442CCBEB080083A2CF /* libgmp.a */; };
 		6440CA00288857A10062C672 /* CIEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440C9FF288857A10062C672 /* CIEventView.swift */; };
 		6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440CA02288AECA70062C672 /* AddGroupMembersView.swift */; };
 		6442E0BA287F169300CEC0F9 /* AddGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6442E0B9287F169300CEC0F9 /* AddGroupView.swift */; };
@@ -209,7 +204,6 @@
 		CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = CE38A29B2C3FCD72005ED185 /* SwiftyGif */; };
 		CE75480A2C622630009579B7 /* SwipeLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7548092C622630009579B7 /* SwipeLabel.swift */; };
 		CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */; };
-		CEA6E91C2CBD21B0002B5DB4 /* UserDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */; };
 		CEDB245B2C9CD71800FBC5F6 /* StickyScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */; };
 		CEDE70222C48FD9500233B1F /* SEChatState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDE70212C48FD9500233B1F /* SEChatState.swift */; };
 		CEE723AA2C3BD3D70009AE93 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723A92C3BD3D70009AE93 /* ShareViewController.swift */; };
@@ -229,6 +223,11 @@
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
 		E5DCF9982C5906FF007928CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9962C5906FF007928CC /* InfoPlist.strings */; };
+		E5E997C92CBA891A00D7A2FA /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E997C42CBA891A00D7A2FA /* libgmpxx.a */; };
+		E5E997CA2CBA891A00D7A2FA /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E997C52CBA891A00D7A2FA /* libgmp.a */; };
+		E5E997CB2CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E997C62CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a */; };
+		E5E997CC2CBA891A00D7A2FA /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E997C72CBA891A00D7A2FA /* libffi.a */; };
+		E5E997CD2CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E997C82CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -491,11 +490,6 @@
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
 		6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupPreferencesView.swift; sourceTree = "<group>"; };
-		643B3B402CCBEB080083A2CF /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmpxx.a; path = Libraries/libgmpxx.a; sourceTree = "<group>"; };
-		643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a"; path = "Libraries/libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a"; sourceTree = "<group>"; };
-		643B3B422CCBEB080083A2CF /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libffi.a; path = Libraries/libffi.a; sourceTree = "<group>"; };
-		643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a"; path = "Libraries/libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a"; sourceTree = "<group>"; };
-		643B3B442CCBEB080083A2CF /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmp.a; path = Libraries/libgmp.a; sourceTree = "<group>"; };
 		6440C9FF288857A10062C672 /* CIEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIEventView.swift; sourceTree = "<group>"; };
 		6440CA02288AECA70062C672 /* AddGroupMembersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupMembersView.swift; sourceTree = "<group>"; };
 		6442E0B9287F169300CEC0F9 /* AddGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupView.swift; sourceTree = "<group>"; };
@@ -551,7 +545,6 @@
 		CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorAlert.swift; sourceTree = "<group>"; };
 		CE7548092C622630009579B7 /* SwipeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeLabel.swift; sourceTree = "<group>"; };
 		CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemClipShape.swift; sourceTree = "<group>"; };
-		CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefault.swift; sourceTree = "<group>"; };
 		CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickyScrollView.swift; sourceTree = "<group>"; };
 		CEDE70212C48FD9500233B1F /* SEChatState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEChatState.swift; sourceTree = "<group>"; };
 		CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX SE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -619,6 +612,11 @@
 		E5DCF9A62C590731007928CC /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A72C590732007928CC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A82C590732007928CC /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		E5E997C42CBA891A00D7A2FA /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E5E997C52CBA891A00D7A2FA /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E5E997C62CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E5E997C72CBA891A00D7A2FA /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E5E997C82CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -657,14 +655,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				643B3B452CCBEB080083A2CF /* libgmpxx.a in Frameworks */,
-				643B3B472CCBEB080083A2CF /* libffi.a in Frameworks */,
-				643B3B492CCBEB080083A2CF /* libgmp.a in Frameworks */,
+				E5E997C92CBA891A00D7A2FA /* libgmpxx.a in Frameworks */,
+				E5E997CB2CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a in Frameworks */,
+				E5E997CA2CBA891A00D7A2FA /* libgmp.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
+				E5E997CC2CBA891A00D7A2FA /* libffi.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				643B3B482CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a in Frameworks */,
-				643B3B462CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a in Frameworks */,
+				E5E997CD2CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -741,6 +739,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				E5E997C72CBA891A00D7A2FA /* libffi.a */,
+				E5E997C52CBA891A00D7A2FA /* libgmp.a */,
+				E5E997C42CBA891A00D7A2FA /* libgmpxx.a */,
+				E5E997C62CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv-ghc9.6.3.a */,
+				E5E997C82CBA891A00D7A2FA /* libHSsimplex-chat-6.1.0.9-3X73OucN19a19eYgUK66sv.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -799,7 +802,6 @@
 				CE176F1F2C87014C00145DBC /* InvertedForegroundStyle.swift */,
 				CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */,
 				CEFB2EDE2CA1BCC7004B1ECE /* SheetRepresentable.swift */,
-				CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -812,11 +814,6 @@
 				5CC2C0FA2809BF11000C35E3 /* Localizable.strings */,
 				5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */,
 				5C764E5C279C70B7000C6508 /* Libraries */,
-				643B3B422CCBEB080083A2CF /* libffi.a */,
-				643B3B442CCBEB080083A2CF /* libgmp.a */,
-				643B3B402CCBEB080083A2CF /* libgmpxx.a */,
-				643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9-ghc9.6.3.a */,
-				643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-KwHIA7FZqPI5ZTCAoi00n9.a */,
 				5CA059C2279559F40002BEB4 /* Shared */,
 				5CDCAD462818589900503DA2 /* SimpleX NSE */,
 				CEE723A82C3BD3D70009AE93 /* SimpleX SE */,
@@ -1485,7 +1482,6 @@
 				5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */,
 				649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */,
 				5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */,
-				CEA6E91C2CBD21B0002B5DB4 /* UserDefault.swift in Sources */,
 				5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */,
 				5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */,
 				5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */,
@@ -1903,7 +1899,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1928,7 +1924,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1952,7 +1948,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1977,7 +1973,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1993,11 +1989,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2013,11 +2009,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2038,7 +2034,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2053,7 +2049,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2075,7 +2071,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2090,7 +2086,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2112,7 +2108,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2138,7 +2134,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2163,7 +2159,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2189,7 +2185,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2214,7 +2210,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2229,7 +2225,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2248,7 +2244,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 244;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2263,7 +2259,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/APITypes.swift

@@ -55,8 +55,8 @@ public enum ChatCommand {
     case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
     case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
     case apiDeleteToken(token: DeviceToken)
-    case apiGetNtfConns(nonce: String, encNtfInfo: String)
-    case apiGetConnNtfMessages(connIds: [String])
+    case apiGetNtfMessage(nonce: String, encNtfInfo: String)
+    case apiGetConnNtfMessage(connId: String)
     case apiNewGroup(userId: Int64, incognito: Bool, groupProfile: GroupProfile)
     case apiAddMember(groupId: Int64, contactId: Int64, memberRole: GroupMemberRole)
     case apiJoinGroup(groupId: Int64)
@@ -214,8 +214,8 @@ public enum ChatCommand {
             case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
             case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
             case let .apiDeleteToken(token): return "/_ntf delete \(token.cmdString)"
-            case let .apiGetNtfConns(nonce, encNtfInfo): return "/_ntf conns \(nonce) \(encNtfInfo)"
-            case let .apiGetConnNtfMessages(connIds): return "/_ntf conn messages \(connIds.joined(separator: ","))"
+            case let .apiGetNtfMessage(nonce, encNtfInfo): return "/_ntf message \(nonce) \(encNtfInfo)"
+            case let .apiGetConnNtfMessage(connId): return "/_ntf conn message \(connId)"
             case let .apiNewGroup(userId, incognito, groupProfile): return "/_group \(userId) incognito=\(onOff(incognito)) \(encodeJSON(groupProfile))"
             case let .apiAddMember(groupId, contactId, memberRole): return "/_add #\(groupId) \(contactId) \(memberRole)"
             case let .apiJoinGroup(groupId): return "/_join #\(groupId)"
@@ -369,8 +369,8 @@ public enum ChatCommand {
             case .apiRegisterToken: return "apiRegisterToken"
             case .apiVerifyToken: return "apiVerifyToken"
             case .apiDeleteToken: return "apiDeleteToken"
-            case .apiGetNtfConns: return "apiGetNtfConns"
-            case .apiGetConnNtfMessages: return "apiGetConnNtfMessages"
+            case .apiGetNtfMessage: return "apiGetNtfMessage"
+            case .apiGetConnNtfMessage: return "apiGetConnNtfMessage"
             case .apiNewGroup: return "apiNewGroup"
             case .apiAddMember: return "apiAddMember"
             case .apiJoinGroup: return "apiJoinGroup"
@@ -682,8 +682,8 @@ public enum ChatResponse: Decodable, Error {
     case callInvitations(callInvitations: [RcvCallInvitation])
     case ntfTokenStatus(status: NtfTknStatus)
     case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode, ntfServer: String)
-    case ntfConns(ntfConns: [NtfConn])
-    case connNtfMessages(receivedMsgs: [NtfMsgInfo?])
+    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, expectedMsg_: NtfMsgInfo?, receivedMsg_: NtfMsgInfo?)
+    case connNtfMessage(receivedMsg_: NtfMsgInfo?)
     case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
     case contactDisabled(user: UserRef, contact: Contact)
@@ -851,8 +851,8 @@ public enum ChatResponse: Decodable, Error {
             case .callInvitations: return "callInvitations"
             case .ntfTokenStatus: return "ntfTokenStatus"
             case .ntfToken: return "ntfToken"
-            case .ntfConns: return "ntfConns"
-            case .connNtfMessages: return "connNtfMessages"
+            case .ntfMessages: return "ntfMessages"
+            case .connNtfMessage: return "connNtfMessage"
             case .ntfMessage: return "ntfMessage"
             case .contactConnectionDeleted: return "contactConnectionDeleted"
             case .contactDisabled: return "contactDisabled"
@@ -1029,8 +1029,8 @@ public enum ChatResponse: Decodable, Error {
             case let .callInvitations(invs): return String(describing: invs)
             case let .ntfTokenStatus(status): return String(describing: status)
             case let .ntfToken(token, status, ntfMode, ntfServer): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)\nntfServer: \(ntfServer)"
-            case let .ntfConns(ntfConns): return String(describing: ntfConns)
-            case let .connNtfMessages(receivedMsgs): return "receivedMsgs: \(String(describing: receivedMsgs))"
+            case let .ntfMessages(u, connEntity, expectedMsg_, receivedMsg_): return withUser(u, "connEntity: \(String(describing: connEntity))\nexpectedMsg_: \(String(describing: expectedMsg_))\nreceivedMsg_: \(String(describing: receivedMsg_))")
+            case let .connNtfMessage(receivedMsg_): return "receivedMsg_: \(String(describing: receivedMsg_))"
             case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
             case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
@@ -2088,7 +2088,6 @@ public enum ProtocolErrorType: Decodable, Hashable {
     case AUTH
     case CRYPTO
     case QUOTA
-    case STORE(storeErr: String)
     case NO_MSG
     case LARGE_MSG
     case EXPIRED

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2270,13 +2270,16 @@ public enum ConnectionEntity: Decodable, Hashable {
         case let .userContactConnection(entityConnection, _): entityConnection
         }
     }
-}
-
-public struct NtfConn: Decodable, Hashable {
-    public var user_: User?
-    public var connEntity_: ConnectionEntity?
-    public var expectedMsg_: NtfMsgInfo?
 
+    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 .sndFileConnection: return false
+        case .rcvFileConnection: return false
+        case let .userContactConnection(_, userContact): return userContact.groupId == nil
+        }
+    }
 }
 
 public struct NtfMsgInfo: Decodable, Hashable {

apps/ios/SimpleXChat/Notifications.swift

@@ -15,14 +15,13 @@ public let ntfCategoryContactConnected = "NTF_CAT_CONTACT_CONNECTED"
 public let ntfCategoryMessageReceived = "NTF_CAT_MESSAGE_RECEIVED"
 public let ntfCategoryCallInvitation = "NTF_CAT_CALL_INVITATION"
 public let ntfCategoryConnectionEvent = "NTF_CAT_CONNECTION_EVENT"
-public let ntfCategoryManyEvents = "NTF_CAT_MANY_EVENTS"
 public let ntfCategoryCheckMessage = "NTF_CAT_CHECK_MESSAGE"
 
 public let appNotificationId = "chat.simplex.app.notification"
 
 let contactHidden = NSLocalizedString("Contact hidden:", comment: "notification")
 
-public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: UserContactRequest, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: UserContactRequest) -> UNMutableNotificationContent {
     let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
     return createNotification(
         categoryIdentifier: ntfCategoryContactRequest,
@@ -35,12 +34,11 @@ public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: User
             hideContent ? NSLocalizedString("this contact", comment: "notification title") : contactRequest.chatViewName
         ),
         targetContentIdentifier: nil,
-        userInfo: ["chatId": contactRequest.id, "contactRequestId": contactRequest.apiId, "userId": user.userId],
-        badgeCount: badgeCount
+        userInfo: ["chatId": contactRequest.id, "contactRequestId": contactRequest.apiId, "userId": user.userId]
     )
 }
 
-public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact) -> UNMutableNotificationContent {
     let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
     return createNotification(
         categoryIdentifier: ntfCategoryContactConnected,
@@ -53,13 +51,12 @@ public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact,
             hideContent ? NSLocalizedString("this contact", comment: "notification title") : contact.chatViewName
         ),
         targetContentIdentifier: contact.id,
-        userInfo: ["userId": user.userId],
+        userInfo: ["userId": user.userId]
 //            userInfo: ["chatId": contact.id, "contactId": contact.apiId]
-        badgeCount: badgeCount
     )
 }
 
-public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) -> UNMutableNotificationContent {
     let previewMode = ntfPreviewModeGroupDefault.get()
     var title: String
     if case let .group(groupInfo) = cInfo, case let .groupRcv(groupMember) = cItem.chatDir {
@@ -72,13 +69,12 @@ public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _
         title: title,
         body: previewMode == .message ? hideSecrets(cItem) : NSLocalizedString("new message", comment: "notification"),
         targetContentIdentifier: cInfo.id,
-        userInfo: ["userId": user.userId],
+        userInfo: ["userId": user.userId]
 //            userInfo: ["chatId": cInfo.id, "chatItemId": cItem.id]
-        badgeCount: badgeCount
     )
 }
 
-public func createCallInvitationNtf(_ invitation: RcvCallInvitation, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createCallInvitationNtf(_ invitation: RcvCallInvitation) -> UNMutableNotificationContent {
     let text = invitation.callType.media == .video
                 ? NSLocalizedString("Incoming video call", comment: "notification")
                 : NSLocalizedString("Incoming audio call", comment: "notification")
@@ -88,12 +84,11 @@ public func createCallInvitationNtf(_ invitation: RcvCallInvitation, _ badgeCoun
         title: hideContent ? contactHidden : "\(invitation.contact.chatViewName):",
         body: text,
         targetContentIdentifier: nil,
-        userInfo: ["chatId": invitation.contact.id, "userId": invitation.user.userId],
-        badgeCount: badgeCount
+        userInfo: ["chatId": invitation.contact.id, "userId": invitation.user.userId]
     )
 }
 
-public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntity, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntity) -> UNMutableNotificationContent {
     let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
     var title: String
     var body: String? = nil
@@ -123,12 +118,11 @@ public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntit
         title: title,
         body: body,
         targetContentIdentifier: targetContentIdentifier,
-        userInfo: ["userId": user.userId],
-        badgeCount: badgeCount
+        userInfo: ["userId": user.userId]
     )
 }
 
-public func createErrorNtf(_ dbStatus: DBMigrationResult, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createErrorNtf(_ dbStatus: DBMigrationResult) -> UNMutableNotificationContent {
     var title: String
     switch dbStatus {
     case .errorNotADatabase:
@@ -148,16 +142,14 @@ public func createErrorNtf(_ dbStatus: DBMigrationResult, _ badgeCount: Int) ->
     }
     return createNotification(
         categoryIdentifier: ntfCategoryConnectionEvent,
-        title: title,
-        badgeCount: badgeCount
+        title: title
     )
 }
 
-public func createAppStoppedNtf(_ badgeCount: Int) -> UNMutableNotificationContent {
+public func createAppStoppedNtf() -> UNMutableNotificationContent {
     return createNotification(
         categoryIdentifier: ntfCategoryConnectionEvent,
-        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification"),
-        badgeCount: badgeCount
+        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification")
     )
 }
 
@@ -167,15 +159,8 @@ private func groupMsgNtfTitle(_ groupInfo: GroupInfo, _ groupMember: GroupMember
     : "#\(groupInfo.displayName) \(groupMember.chatViewName):"
 }
 
-public func createNotification(
-    categoryIdentifier: String,
-    title: String,
-    subtitle: String? = nil,
-    body: String? = nil,
-    targetContentIdentifier: String? = nil,
-    userInfo: [AnyHashable : Any] = [:],
-    badgeCount: Int
-) -> UNMutableNotificationContent {
+public func createNotification(categoryIdentifier: String, title: String, subtitle: String? = nil, body: String? = nil,
+                        targetContentIdentifier: String? = nil, userInfo: [AnyHashable : Any] = [:]) -> UNMutableNotificationContent {
     let content = UNMutableNotificationContent()
     content.categoryIdentifier = categoryIdentifier
     content.title = title
@@ -185,7 +170,6 @@ public func createNotification(
     content.userInfo = userInfo
     // TODO move logic of adding sound here, so it applies to background notifications too
     content.sound = .default
-    content.badge = badgeCount as NSNumber
 //        content.interruptionLevel = .active
 //        content.relevanceScore = 0.5 // 0-1
     return content

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

@@ -6054,7 +6054,6 @@ sealed class SMPErrorType {
     is AUTH -> "AUTH"
     is CRYPTO -> "CRYPTO"
     is QUOTA -> "QUOTA"
-    is STORE -> "STORE ${storeErr}"
     is NO_MSG -> "NO_MSG"
     is LARGE_MSG -> "LARGE_MSG"
     is EXPIRED -> "EXPIRED"
@@ -6067,7 +6066,6 @@ sealed class SMPErrorType {
   @Serializable @SerialName("AUTH") class AUTH: SMPErrorType()
   @Serializable @SerialName("CRYPTO") class CRYPTO: SMPErrorType()
   @Serializable @SerialName("QUOTA") class QUOTA: SMPErrorType()
-  @Serializable @SerialName("STORE") class STORE(val storeErr: String): SMPErrorType()
   @Serializable @SerialName("NO_MSG") class NO_MSG: SMPErrorType()
   @Serializable @SerialName("LARGE_MSG") class LARGE_MSG: SMPErrorType()
   @Serializable @SerialName("EXPIRED") class EXPIRED: SMPErrorType()

apps/multiplatform/gradle.properties

@@ -26,11 +26,11 @@ android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11
 
-android.version_name=6.1.1
-android.version_code=249
+android.version_name=6.1
+android.version_code=247
 
-desktop.version_name=6.1.1
-desktop.version_code=74
+desktop.version_name=6.1
+desktop.version_code=73
 
 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0

blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md

@@ -23,7 +23,7 @@ permalink: "/blog/20241014-simplex-network-v6-1-security-review-better-calls-use
 
 ## SimpleX cryptographic design review by Trail of Bits
 
-<img src="./images/20221108-trail-of-bits.jpg" width=240 class="float-to-right">
+<img src="./images/20221108-trail-of-bits.jpg" width=240>
 
 It's been almost two years since Trail of Bits did the first security assessment of SimpleX Chat.
 

blog/20241016-wired-attack-on-privacy.md

@@ -1,39 +0,0 @@
----
-layout: layouts/article.html
-title: "Wired’s Attack on Privacy"
-date: 2024-10-16
-previewBody: blog_previews/20241016.html
-image: images/20241016-wired-privacy.jpg
-imageWide: true
-permalink: "/blog/20241016-wired-attack-on-privacy.html"
----
-
-# Wired’s Attack on Privacy
-
-<img src="./images/20241016-wired-privacy.jpg" width="330" class="float-to-right">
-
-The [Wired article](https://www.wired.com/story/neo-nazis-flee-telegram-encrypted-app-simplex/) by David Gilbert focusing on neo-Nazis moving to SimpleX Chat following the Telegram's changes in privacy policy is biased and misleading. By cherry-picking information from [the report](https://www.isdglobal.org/digital_dispatches/neo-nazi-accelerationists-seek-new-digital-refuge-amid-looming-telegram-crackdown/) by the Institute for Strategic Dialogue (ISD), Wired fails to mention that SimpleX network design prioritizes privacy in order to protect human rights defenders, journalists, and everyday users who value their privacy &mdash; many people feel safer using SimpleX than non-private apps, being protected from strangers contacting them.
-
-Yes, privacy-focused SimpleX network offers encryption and anonymity &mdash; that’s the point. To paint this as problematic solely because of who may use such apps misses the broader, critical context.
-
-SimpleX’s true strength lies in protection of [users' metadata](./20240416-dangers-of-metadata-in-messengers.md), which can reveal sensitive information about who is communicating, when, and how often. SimpleX protocols are designed to minimize metadata collection. For countless people, especially vulnerable groups, these features can be life-saving. Wired article ignores these essential protections, and overlooks the positive aspects of having such a unique design, as noted in the publication which [they link to](https://www.maargentino.com/is-telegrams-privacy-shift-driving-extremists-toward-simplex/):
-
-> *“SimpleX also has a significant advantage when it comes to protecting metadata &mdash; the information that can reveal who you’re talking to, when, and how often. SimpleX is designed with privacy at its core, minimizing the amount of metadata collected and ensuring that any temporary data necessary for functionality is not retained or linked to identifiable users.”*
-
-Both publications referenced by Wired also explore how SimpleX design actually hinders extremist groups from spreading propaganda or building large networks. SimpleX design restricts message visibility and file retention, making it far from ideal for those looking to coordinate large networks. Yet these important qualities are ignored by Wired in favor of fear-mongering about encryption &mdash; an argument we've seen before when apps like Signal [faced similar treatment](https://foreignpolicy.com/2021/03/13/telegram-signal-apps-right-wing-extremism-islamic-state-terrorism-violence-europol-encrypted/). Ironically, Wired just a month earlier encouraged its readers to [adopt encrypted messaging apps](https://www.wired.com/story/gadget-lab-podcast-657/), making its current stance even more contradictory.
-
-The vilification of apps that offer critically important privacy, anonymity, and encryption must stop. That a small share of users may abuse these tools doesn’t justify broad criticism. Additionally, the lobbying for client-side scanning, which Wired’s article seems to indirectly endorse, is not only dangerous but goes against fundamental principles of free speech and personal security. We strongly oppose the use of private communications for any kind of monitoring, including AI training, which would undermine the very trust encryption is designed to build.
-
-It’s alarming to see Wired not only criticize SimpleX for its strong privacy protections but also subtly blame the European Court of Human Rights for [upholding basic human rights](https://www.theregister.com/2024/02/15/echr_backdoor_encryption/) by rejecting laws that would force encrypted apps to scan and hand over private messages before encryption. Wired writes:
-
-> *…European Court of Human Rights decision in February of this year ruled that forcing encrypted messaging apps to provide a backdoor to law enforcement was illegal. This decision undermined the EU’s controversial proposal that would potentially force encrypted messaging apps to scan all user content for identifiers of child sexual abuse material.*
-
-This commentary is both inappropriate and misguided &mdash; it plays into the hands of anti-privacy lobbyists attempting to criminalize access to private communications. Framing privacy and anonymity as tools for criminals ignores the reality that these protections are essential for millions of legitimate users, from activists to journalists, to ordinary citizens. Client-side scanning can't have any meaningful effect on reducing CSAM distribution, instead resulting in increase of crime and abuse when criminals get access to this data.
-
-We need to correct this narrative. The real danger lies not in protecting communication, but in failing to do so. Privacy apps like SimpleX are crucial, not just for those resisting mass surveillance, but for everyone who values the right to communicate without fear of their conversations being monitored or misused. This is a right we must defend and incorporate into law, [as we wrote before](./20240704-future-of-privacy-enforcing-privacy-standards.md).
-
-Wired could have stood on the right side of this battle and helped normalize the demand for privacy, genuinely protecting people from criminals and from the exploitation of the increasingly AI-enabled mass surveillance. Instead they chose the path of spreading fear and uncertainty of encrypted messaging and tools that enable privacy and anonymity.
-
-Spreading misinformation about privacy and security undermines trust in the tools that protect us, making it easier to justify more invasive surveillance measures that chip away at our civil liberties.
-
-Wired did not respond to our request for comment.

cabal.project

@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 0b4492879fd36f0b517dca8f5e36dba187bba686
+    tag: c41bfe831d6d3fdf068f7419cbfed6afa46cb5b5
 
 source-repository-package
     type: git

package.yaml

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

scripts/cabal.project.local.mac

@@ -11,8 +11,4 @@ package direct-sqlcipher
     extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib
     flags: +openssl
 
-package rocksdb-haskell-jprupp
-    extra-include-dirs: /opt/homebrew/opt/rocksdb/include
-    extra-lib-dirs: /opt/homebrew/opt/rocksdb/lib
-
 test-show-details: direct

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."0b4492879fd36f0b517dca8f5e36dba187bba686" = "0rrkq84vx9n6rq67v0awfgnwpq3mmyx3rdzg6k9xwir1397bhf7r";
+  "https://github.com/simplex-chat/simplexmq.git"."c41bfe831d6d3fdf068f7419cbfed6afa46cb5b5" = "1awqy4srdgcwmjf7q3s9w75w6wp38qk65fza2k3q1a1s2lj6h8w1";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";

simplex-chat.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        6.1.1.0
+version:        6.1.0.9
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat

src/Simplex/Chat.hs

@@ -203,9 +203,8 @@ _defaultSMPServers =
 
 _defaultNtfServers :: [NtfServer]
 _defaultNtfServers =
-  [ "ntf://FB-Uop7RTaZZEG0ZLD2CIaTjsPh-Fw0zFAnb7QyA8Ks=@ntf2.simplex.im,5ex3mupcazy3zlky64ab27phjhijpemsiby33qzq3pliejipbtx5xgad.onion"
-  -- "ntf://KmpZNNXiVZJx_G2T7jRUmDFxWXM3OAnunz3uLT0tqAA=@ntf3.simplex.im,pxculznuryunjdvtvh6s6szmanyadumpbmvevgdpe4wk5c65unyt4yid.onion",
-  -- "ntf://CJ5o7X6fCxj2FFYRU2KuCo70y4jSqz7td2HYhLnXWbU=@ntf4.simplex.im,wtvuhdj26jwprmomnyfu5wfuq2hjkzfcc72u44vi6gdhrwxldt6xauad.onion"
+  [ "ntf://KmpZNNXiVZJx_G2T7jRUmDFxWXM3OAnunz3uLT0tqAA=@ntf3.simplex.im,pxculznuryunjdvtvh6s6szmanyadumpbmvevgdpe4wk5c65unyt4yid.onion",
+    "ntf://CJ5o7X6fCxj2FFYRU2KuCo70y4jSqz7td2HYhLnXWbU=@ntf4.simplex.im,wtvuhdj26jwprmomnyfu5wfuq2hjkzfcc72u44vi6gdhrwxldt6xauad.onion"
   ]
 
 maxImageSize :: Integer
@@ -1457,31 +1456,26 @@ processChatCommand' vr = \case
     CRNtfTokenStatus <$> withAgent (\a -> registerNtfToken a token mode)
   APIVerifyToken token nonce code -> withUser $ \_ -> withAgent (\a -> verifyNtfToken a token nonce code) >> ok_
   APIDeleteToken token -> withUser $ \_ -> withAgent (`deleteNtfToken` token) >> ok_
-  APIGetNtfConns nonce encNtfInfo -> withUser $ \user -> do
-    ntfInfos <- withAgent $ \a -> getNotificationConns a nonce encNtfInfo
-    (errs, ntfMsgs) <- lift $ partitionEithers <$> withStoreBatch' (\db -> map (getMsgConn db) (L.toList ntfInfos))
-    unless (null errs) $ toView $ CRChatErrors (Just user) errs
-    pure $ CRNtfConns ntfMsgs
-    where
-      getMsgConn :: DB.Connection -> NotificationInfo -> IO NtfConn
-      getMsgConn db NotificationInfo {ntfConnId, ntfMsgMeta = nMsgMeta} = do
-        let agentConnId = AgentConnId ntfConnId
-        user_ <- getUserByAConnId db agentConnId
-        connEntity_ <-
-          pure user_ $>>= \user ->
-            eitherToMaybe <$> runExceptT (getConnectionEntity db vr user agentConnId)
-        pure $
-          NtfConn
-            { user_,
-              connEntity_,
-              -- Decrypted ntf meta of the expected message (the one notification was sent for)
-              expectedMsg_ = expectedMsgInfo <$> nMsgMeta
-            }
-  ApiGetConnNtfMessages connIds -> withUser $ \_ -> do
-    let acIds = L.map (\(AgentConnId acId) -> acId) connIds
-    msgs <- lift $ withAgent' $ \a -> getConnectionMessages a acIds
-    let ntfMsgs = L.map (\msg -> receivedMsgInfo <$> msg) msgs
-    pure $ CRConnNtfMessages ntfMsgs
+  APIGetNtfMessage nonce encNtfInfo -> withUser $ \_ -> do
+    (NotificationInfo {ntfConnId, ntfMsgMeta = nMsgMeta}, msg) <- withAgent $ \a -> getNotificationMessage a nonce encNtfInfo
+    let agentConnId = AgentConnId ntfConnId
+    user_ <- withStore' (`getUserByAConnId` agentConnId)
+    connEntity_ <-
+      pure user_ $>>= \user ->
+        withStore (\db -> Just <$> getConnectionEntity db vr user agentConnId) `catchChatError` (\e -> toView (CRChatError (Just user) e) $> Nothing)
+    pure
+      CRNtfMessages
+        { user_,
+          connEntity_,
+          -- Decrypted ntf meta of the expected message (the one notification was sent for)
+          expectedMsg_ = expectedMsgInfo <$> nMsgMeta,
+          -- Info of the first message retrieved by agent using GET
+          -- (may differ from the expected message due to, for example, coalescing or loss of notifications)
+          receivedMsg_ = receivedMsgInfo <$> msg
+        }
+  ApiGetConnNtfMessage (AgentConnId connId) -> withUser $ \_ -> do
+    msg <- withAgent $ \a -> getConnectionMessage a connId
+    pure $ CRConnNtfMessage (receivedMsgInfo <$> msg)
   APIGetUserProtoServers userId (AProtocolType p) -> withUserId userId $ \user -> withServerProtocol p $ do
     cfg@ChatConfig {defaultServers} <- asks config
     servers <- withFastStore' (`getProtocolServers` user)
@@ -1790,8 +1784,7 @@ processChatCommand' vr = \case
           Nothing -> joinNewConn chatV dm
           Just (RcvDirectMsgConnection conn@Connection {connId, connStatus, contactConnInitiated} Nothing)
             | connStatus == ConnNew && contactConnInitiated -> joinNewConn chatV dm -- own connection link
-            | connStatus == ConnPrepared -> do
-                -- retrying join after error
+            | connStatus == ConnPrepared -> do -- retrying join after error
                 pcc <- withFastStore $ \db -> getPendingContactConnection db userId connId
                 joinPreparedConn (aConnId conn) pcc dm
           Just ent -> throwChatError $ CECommandError $ "connection exists: " <> show (connEntityInfo ent)
@@ -8067,8 +8060,8 @@ chatCommandP =
       "/_ntf register " *> (APIRegisterToken <$> strP_ <*> strP),
       "/_ntf verify " *> (APIVerifyToken <$> strP <* A.space <*> strP <* A.space <*> strP),
       "/_ntf delete " *> (APIDeleteToken <$> strP),
-      "/_ntf conns " *> (APIGetNtfConns <$> strP <* A.space <*> strP),
-      "/_ntf conn messages " *> (ApiGetConnNtfMessages <$> strP),
+      "/_ntf message " *> (APIGetNtfMessage <$> strP <* A.space <*> strP),
+      "/_ntf conn message " *> (ApiGetConnNtfMessage <$> strP),
       "/_add #" *> (APIAddMember <$> A.decimal <* A.space <*> A.decimal <*> memberRole),
       "/_join #" *> (APIJoinGroup <$> A.decimal),
       "/_member role #" *> (APIMemberRole <$> A.decimal <* A.space <*> A.decimal <*> memberRole),

src/Simplex/Chat/Controller.hs

@@ -330,8 +330,8 @@ data ChatCommand
   | APIRegisterToken DeviceToken NotificationsMode
   | APIVerifyToken DeviceToken C.CbNonce ByteString
   | APIDeleteToken DeviceToken
-  | APIGetNtfConns {nonce :: C.CbNonce, encNtfInfo :: ByteString}
-  | ApiGetConnNtfMessages {connIds :: NonEmpty AgentConnId}
+  | APIGetNtfMessage {nonce :: C.CbNonce, encNtfInfo :: ByteString}
+  | ApiGetConnNtfMessage {connId :: AgentConnId}
   | APIAddMember GroupId ContactId GroupMemberRole
   | APIJoinGroup GroupId
   | APIMemberRole GroupId GroupMemberId GroupMemberRole
@@ -745,8 +745,8 @@ data ChatResponse
   | CRUserContactLinkSubError {chatError :: ChatError} -- TODO delete
   | CRNtfTokenStatus {status :: NtfTknStatus}
   | CRNtfToken {token :: DeviceToken, status :: NtfTknStatus, ntfMode :: NotificationsMode, ntfServer :: NtfServer}
-  | CRNtfConns {ntfConns :: [NtfConn]}
-  | CRConnNtfMessages {receivedMsgs :: NonEmpty (Maybe NtfMsgInfo)}
+  | CRNtfMessages {user_ :: Maybe User, connEntity_ :: Maybe ConnectionEntity, expectedMsg_ :: Maybe NtfMsgInfo, receivedMsg_ :: Maybe NtfMsgInfo}
+  | CRConnNtfMessage {receivedMsg_ :: Maybe NtfMsgInfo}
   | CRNtfMessage {user :: User, connEntity :: ConnectionEntity, ntfMessage :: NtfMsgAckInfo}
   | CRContactConnectionDeleted {user :: User, connection :: PendingContactConnection}
   | CRRemoteHostList {remoteHosts :: [RemoteHostInfo]}
@@ -1010,7 +1010,7 @@ defaultSimpleNetCfg =
       smpWebPort = False,
       tcpTimeout_ = Nothing,
       logTLSErrors = False
-    }
+    }  
 
 data ContactSubStatus = ContactSubStatus
   { contact :: Contact,
@@ -1063,13 +1063,6 @@ instance FromJSON ComposedMessage where
   parseJSON invalid =
     JT.prependFailure "bad ComposedMessage, " (JT.typeMismatch "Object" invalid)
 
-data NtfConn = NtfConn
-  { user_ :: Maybe User,
-    connEntity_ :: Maybe ConnectionEntity,
-    expectedMsg_ :: Maybe NtfMsgInfo
-  }
-  deriving (Show)
-
 data NtfMsgInfo = NtfMsgInfo {msgId :: Text, msgTs :: UTCTime}
   deriving (Show)
 
@@ -1542,8 +1535,6 @@ $(JQ.deriveJSON defaultJSON ''UserProfileUpdateSummary)
 
 $(JQ.deriveJSON defaultJSON ''NtfMsgInfo)
 
-$(JQ.deriveJSON defaultJSON ''NtfConn)
-
 $(JQ.deriveJSON defaultJSON ''NtfMsgAckInfo)
 
 $(JQ.deriveJSON defaultJSON ''SwitchProgress)

src/Simplex/Chat/View.hs

@@ -325,8 +325,8 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRContactConnectionDeleted u PendingContactConnection {pccConnId} -> ttyUser u ["connection :" <> sShow pccConnId <> " deleted"]
   CRNtfTokenStatus status -> ["device token status: " <> plain (smpEncode status)]
   CRNtfToken _ status mode srv -> ["device token status: " <> plain (smpEncode status) <> ", notifications mode: " <> plain (strEncode mode) <> ", server: " <> sShow srv]
-  CRNtfConns {} -> []
-  CRConnNtfMessages {} -> []
+  CRNtfMessages {} -> []
+  CRConnNtfMessage {} -> []
   CRNtfMessage {} -> []
   CRCurrentRemoteHost rhi_ ->
     [ maybe

tests/ChatClient.hs

@@ -51,7 +51,6 @@ import qualified Simplex.Messaging.Crypto.Ratchet as CR
 import Simplex.Messaging.Protocol (srvHostnamesSMPClientVersion)
 import Simplex.Messaging.Server (runSMPServerBlocking)
 import Simplex.Messaging.Server.Env.STM
-import Simplex.Messaging.Server.MsgStore.Types (AMSType (..), SMSType (..))
 import Simplex.Messaging.Transport
 import Simplex.Messaging.Transport.Server (ServerCredentials (..), defaultTransportServerConfig)
 import Simplex.Messaging.Version
@@ -424,10 +423,7 @@ smpServerCfg =
     { transports = [(serverPort, transport @TLS, False)],
       tbqSize = 1,
       -- serverTbqSize = 1,
-      msgStoreType = AMSType SMSMemory,
       msgQueueQuota = 16,
-      maxJournalMsgCount = 16,
-      maxJournalStateLines = 16,
       queueIdBytes = 12,
       msgIdBytes = 6,
       storeLogFile = Nothing,

website/src/_includes/blog_previews/20241016.html

@@ -1,4 +0,0 @@
-<p>The Wired article by David Gilbert focusing on neo-Nazis moving to SimpleX Chat following the Telegram's changes in
-    privacy policy is biased and misleading. By cherry-picking information from the report by the Institute for
-    Strategic Dialogue (ISD), Wired fails to mention that SimpleX network design prioritizes privacy in order to protect
-    human rights defenders, journalists, and everyday users who value their privacy.</p>