simplexmq

apps/ios/Shared/Model/ChatModel.swift

@@ -43,21 +43,6 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
     items.append(item)
 }
 
-class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
-    private let publisher = ObservableObjectPublisher()
-    private var bag = Set<AnyCancellable>()
-    var reversedChatItems: [ChatItem] = [] {
-        willSet { publisher.send() }
-    }
-    init() {
-        publisher
-            .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
-            .sink { self.objectWillChange.send() }
-            .store(in: &bag)
-    }
-}
-
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var setDeliveryReceipts = false
@@ -84,6 +69,7 @@ final class ChatModel: ObservableObject {
     @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
+    @Published var reversedChatItems: [ChatItem] = []
     var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
     @Published var groupMembers: [GMember] = []
@@ -131,8 +117,6 @@ final class ChatModel: ObservableObject {
 
     static let shared = ChatModel()
 
-    let im = ItemsModel.shared
-
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
     let ntfEnableLocal = true
@@ -359,7 +343,7 @@ final class ChatModel: ObservableObject {
         var res: Bool
         if let chat = getChat(cInfo.id) {
             if let pItem = chat.chatItems.last {
-                if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
+                if pItem.id == cItem.id || (chatId == cInfo.id && reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
                     chat.chatItems = [cItem]
                 }
             } else {
@@ -389,7 +373,7 @@ final class ChatModel: ObservableObject {
                 if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
                     ci.meta.itemStatus = status
                 }
-                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -413,12 +397,12 @@ final class ChatModel: ObservableObject {
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+        reversedChatItems[i] = cItem
+        reversedChatItems[i].viewTimestamp = .now
     }
 
     func getChatItemIndex(_ cItem: ChatItem) -> Int? {
-        im.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+        reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
@@ -435,7 +419,7 @@ final class ChatModel: ObservableObject {
         if chatId == cInfo.id {
             if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+                    self.reversedChatItems.remove(at: i)
                 }
             }
         }
@@ -443,16 +427,16 @@ final class ChatModel: ObservableObject {
     }
 
     func nextChatItemData<T>(_ chatItemId: Int64, previous: Bool, map: @escaping (ChatItem) -> T?) -> T? {
-        guard var i = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
+        guard var i = reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
         if previous {
-            while i < im.reversedChatItems.count - 1 {
+            while i < reversedChatItems.count - 1 {
                 i += 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         } else {
             while i > 0 {
                 i -= 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         }
         return nil
@@ -483,7 +467,7 @@ final class ChatModel: ObservableObject {
     func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
-            im.reversedChatItems.insert(cItem, at: 0)
+            reversedChatItems.insert(cItem, at: 0)
         }
         return cItem
     }
@@ -491,15 +475,15 @@ final class ChatModel: ObservableObject {
     func removeLiveDummy(animated: Bool = true) {
         if hasLiveDummy {
             if animated {
-                withAnimation { _ = im.reversedChatItems.removeFirst() }
+                withAnimation { _ = reversedChatItems.removeFirst() }
             } else {
-                _ = im.reversedChatItems.removeFirst()
+                _ = reversedChatItems.removeFirst()
             }
         }
     }
 
     private var hasLiveDummy: Bool {
-        im.reversedChatItems.first?.isLiveDummy == true
+        reversedChatItems.first?.isLiveDummy == true
     }
 
     func markChatItemsRead(_ cInfo: ChatInfo) {
@@ -516,7 +500,7 @@ final class ChatModel: ObservableObject {
 
     private func markCurrentChatRead(fromIndex i: Int = 0) {
         var j = i
-        while j < im.reversedChatItems.count {
+        while j < reversedChatItems.count {
             markChatItemRead_(j)
             j += 1
         }
@@ -530,7 +514,7 @@ final class ChatModel: ObservableObject {
                     var unreadBelow = 0
                     var j = i - 1
                     while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
+                        if case .rcvNew = self.reversedChatItems[j].meta.itemStatus {
                             unreadBelow += 1
                         }
                         j -= 1
@@ -565,7 +549,7 @@ final class ChatModel: ObservableObject {
         // clear current chat
         if chatId == cInfo.id {
             chatItemStatuses = [:]
-            im.reversedChatItems = []
+            reversedChatItems = []
         }
     }
 
@@ -573,58 +557,32 @@ final class ChatModel: ObservableObject {
         if chatId == cInfo.id,
            let itemIndex = getChatItemIndex(cItem),
            let chatIndex = getChatIndex(cInfo.id),
-           im.reversedChatItems[itemIndex].isRcvNew {
+           reversedChatItems[itemIndex].isRcvNew {
             await MainActor.run {
                 withTransaction(Transaction()) {
                     // update current chat
                     markChatItemRead_(itemIndex)
                     // update preview
-                    unreadCollector.decreaseUnreadCounter(chatIndex)
+                    decreaseUnreadCounter(chatIndex)
                 }
             }
         }
     }
 
-    private let unreadCollector = UnreadCollector()
-
-    class UnreadCollector {
-        private let subject = PassthroughSubject<Int, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var dictionary = Dictionary<Int, Int>()
-
-        init() {
-            subject
-                .debounce(for: 1, scheduler: DispatchQueue.main)
-                .sink { _ in
-                    self.dictionary.forEach { key, value in
-                        ChatModel.shared.decreaseUnreadCounter(key, by: value)
-                    }
-                    self.dictionary = Dictionary<Int, Int>()
-                }
-                .store(in: &bag)
-        }
-        
-        // Only call from main thread
-        func decreaseUnreadCounter(_ chatIndex: Int) {
-            dictionary[chatIndex] = (dictionary[chatIndex] ?? 0) + 1
-            subject.send(chatIndex)
-        }
-    }
-
     private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+        let meta = reversedChatItems[i].meta
         if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            reversedChatItems[i].meta.itemStatus = .rcvRead
+            reversedChatItems[i].viewTimestamp = .now
             if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
             }
         }
     }
 
-    func decreaseUnreadCounter(_ chatIndex: Int, by count: Int = 1) {
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount - count
-        decreaseUnreadCounter(user: currentUser!, by: count)
+    func decreaseUnreadCounter(_ chatIndex: Int) {
+        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount - 1
+        decreaseUnreadCounter(user: currentUser!)
     }
 
     func increaseUnreadCounter(user: any UserLike) {
@@ -654,8 +612,8 @@ final class ChatModel: ObservableObject {
         var ns: [String] = []
         if let ciCategory = chatItem.mergeCategory,
            var i = getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count {
-                let ci = im.reversedChatItems[i]
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
                 if ci.mergeCategory != ciCategory { break }
                 if let m = ci.memberConnected {
                     ns.append(m.displayName)
@@ -670,7 +628,7 @@ final class ChatModel: ObservableObject {
     // returns the index of the passed item and the next item (it has smaller index)
     func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
         if let i = getChatItemIndex(ci) {
-            (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
         } else {
             (nil, nil)
         }
@@ -680,10 +638,10 @@ final class ChatModel: ObservableObject {
     // and the previous visible item with another merge category
     func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
         guard var i = ciIndex else { return (nil, nil) }
-        let fst = im.reversedChatItems.count - 1
+        let fst = reversedChatItems.count - 1
         while i < fst {
             i = i + 1
-            let ci = im.reversedChatItems[i]
+            let ci = reversedChatItems[i]
             if ciCategory == nil || ciCategory != ci.mergeCategory {
                 return (i - 1, ci)
             }
@@ -696,7 +654,7 @@ final class ChatModel: ObservableObject {
         var prevMember: GroupMember? = nil
         var memberIds: Set<Int64> = []
         for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
                 if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
                 memberIds.insert(m.groupMemberId)
             }
@@ -771,9 +729,9 @@ final class ChatModel: ObservableObject {
         var i = 0
         var totalBelow = 0
         var unreadBelow = 0
-        while i < im.reversedChatItems.count - 1 && !itemsInView.contains(im.reversedChatItems[i].viewId) {
+        while i < reversedChatItems.count - 1 && !itemsInView.contains(reversedChatItems[i].viewId) {
             totalBelow += 1
-            if im.reversedChatItems[i].isRcvNew {
+            if reversedChatItems[i].isRcvNew {
                 unreadBelow += 1
             }
             i += 1
@@ -782,12 +740,12 @@ final class ChatModel: ObservableObject {
     }
 
     func topItemInView(itemsInView: Set<String>) -> ChatItem? {
-        let maxIx = im.reversedChatItems.count - 1
+        let maxIx = reversedChatItems.count - 1
         var i = 0
-        let inView = { itemsInView.contains(self.im.reversedChatItems[$0].viewId) }
+        let inView = { itemsInView.contains(self.reversedChatItems[$0].viewId) }
         while i < maxIx && !inView(i) { i += 1 }
         while i < maxIx && inView(i) { i += 1 }
-        return im.reversedChatItems[min(i - 1, maxIx)]
+        return reversedChatItems[min(i - 1, maxIx)]
     }
 
     func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -334,12 +334,11 @@ func loadChat(chat: Chat, search: String = "") {
     do {
         let cInfo = chat.chatInfo
         let m = ChatModel.shared
-        let im = ItemsModel.shared
         m.chatItemStatuses = [:]
-        im.reversedChatItems = []
+        m.reversedChatItems = []
         let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
         m.updateChatInfo(chat.chatInfo)
-        im.reversedChatItems = chat.chatItems.reversed()
+        m.reversedChatItems = chat.chatItems.reversed()
     } catch let error {
         logger.error("loadChat error: \(responseError(error))")
     }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct CIChatFeatureView: View {
     @EnvironmentObject var m: ChatModel
-    @ObservedObject var im = ItemsModel.shared
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
@@ -54,8 +53,8 @@ struct CIChatFeatureView: View {
         var fs: [FeatureInfo] = []
         var icons: Set<String> = []
         if var i = m.getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count,
-                  let f = featureInfo(im.reversedChatItems[i]) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
                 if !icons.contains(f.icon) {
                     fs.insert(f, at: 0)
                     icons.insert(f.icon)

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

@@ -49,7 +49,7 @@ struct FramedItemView: View {
                 if let qi = chatItem.quotedItem {
                     ciQuoteView(qi)
                         .onTapGesture {
-                            if let ci = ItemsModel.shared.reversedChatItems.first(where: { $0.id == qi.itemId }) {
+                            if let ci = m.reversedChatItems.first(where: { $0.id == qi.itemId }) {
                                 withAnimation {
                                     scrollModel.scrollToItem(id: ci.id)
                                 }

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

@@ -35,8 +35,8 @@ struct MarkedDeletedItemView: View {
             var blockedByAdmin = 0
             var deleted = 0
             var moderatedBy: Set<String> = []
-            while i < ItemsModel.shared.reversedChatItems.count,
-                  let ci = .some(ItemsModel.shared.reversedChatItems[i]),
+            while i < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
                   ci.mergeCategory == ciCategory,
                   let itemDeleted = ci.meta.itemDeleted {
                 switch itemDeleted {

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

@@ -15,7 +15,6 @@ private let memberImageSize: CGFloat = 34
 
 struct ChatView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var im = ItemsModel.shared
     @State var theme: AppTheme = buildTheme()
     @Environment(\.dismiss) var dismiss
     @Environment(\.colorScheme) var colorScheme
@@ -111,7 +110,7 @@ struct ChatView: View {
         .onChange(of: revealedChatItem) { _ in
             NotificationCenter.postReverseListNeedsLayout()
         }
-        .onChange(of: im.reversedChatItems) { reversedChatItems in
+        .onChange(of: chatModel.reversedChatItems) { reversedChatItems in
             if reversedChatItems.count <= loadItemsPerPage && filtered(reversedChatItems).count < 10 {
                 loadChatItems(chat.chatInfo)
             }
@@ -125,7 +124,7 @@ struct ChatView: View {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
                         chatModel.chatItemStatuses = [:]
-                        ItemsModel.shared.reversedChatItems = []
+                        chatModel.reversedChatItems = []
                         chatModel.groupMembers = []
                         chatModel.groupMembersIndexes.removeAll()
                         chatModel.membersLoaded = false
@@ -340,7 +339,7 @@ struct ChatView: View {
 
     private func chatItemsList() -> some View {
         let cInfo = chat.chatInfo
-        let mergedItems = filtered(im.reversedChatItems)
+        let mergedItems = filtered(chatModel.reversedChatItems)
         return GeometryReader { g in
             ReverseList(items: mergedItems, scrollState: $scrollModel.state) { ci in
                 let voiceNoFrame = voiceWithoutFrame(ci)
@@ -373,7 +372,7 @@ struct ChatView: View {
                         loadChat(chat: c)
                     }
                 }
-                .onChange(of: im.reversedChatItems) { _ in
+                .onChange(of: chatModel.reversedChatItems) { _ in
                     floatingButtonModel.chatItemsChanged()
                 }
         }
@@ -563,7 +562,7 @@ struct ChatView: View {
                 // Load additional items until the page is +50 large after merging
                 while chatItemsAvailable && filtered(reversedPage).count < loadItemsPerPage {
                     let pagination: ChatPagination =
-                        if let lastItem = reversedPage.last ?? im.reversedChatItems.last {
+                        if let lastItem = reversedPage.last ?? chatModel.reversedChatItems.last {
                             .before(chatItemId: lastItem.id, count: loadItemsPerPage)
                         } else {
                             .last(count: loadItemsPerPage)
@@ -581,7 +580,7 @@ struct ChatView: View {
                     if reversedPage.count == 0 {
                         firstPage = true
                     } else {
-                        im.reversedChatItems.append(contentsOf: reversedPage)
+                        chatModel.reversedChatItems.append(contentsOf: reversedPage)
                     }
                     loadingItems = false
                 }
@@ -635,12 +634,11 @@ struct ChatView: View {
             let ciCategory = chatItem.mergeCategory
             let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
             let range = itemsRange(currIndex, prevHidden)
-            let im = ItemsModel.shared
             Group {
                 if revealed, let range = range {
-                    let items = Array(zip(Array(range), im.reversedChatItems[range]))
+                    let items = Array(zip(Array(range), m.reversedChatItems[range]))
                     ForEach(items, id: \.1.viewId) { (i, ci) in
-                        let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
+                        let prev = i == prevHidden ? prevItem : m.reversedChatItems[i + 1]
                         chatItemView(ci, nil, prev)
                     }
                 } else {
@@ -665,10 +663,9 @@ struct ChatView: View {
         }
         
         private func unreadItems(_ range: ClosedRange<Int>) -> [ChatItem]? {
-            let im = ItemsModel.shared
             let items = range.compactMap { i in
-                if i >= 0 && i < im.reversedChatItems.count {
-                    let ci = im.reversedChatItems[i]
+                if i >= 0 && i < m.reversedChatItems.count {
+                    let ci = m.reversedChatItems[i]
                     return if ci.isRcvNew { ci } else { nil }
                 } else {
                     return nil
@@ -1159,7 +1156,7 @@ struct ChatView: View {
                     if let range = itemsRange(currIndex, prevHidden) {
                         var itemIds: [Int64] = []
                         for i in range {
-                            itemIds.append(ItemsModel.shared.reversedChatItems[i].id)
+                            itemIds.append(m.reversedChatItems[i].id)
                         }
                         showDeleteMessages = true
                         deletingItems = itemIds
@@ -1402,7 +1399,7 @@ struct ChatView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
         chatModel.chatId = "@1"
-        ItemsModel.shared.reversedChatItems = [
+        chatModel.reversedChatItems = [
             ChatItem.getSample(1, .directSnd, .now, "hello"),
             ChatItem.getSample(2, .directRcv, .now, "hi"),
             ChatItem.getSample(3, .directRcv, .now, "hi there"),

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

@@ -257,9 +257,6 @@ struct SendMessageView: View {
         var body: some View {
             Button(action: {}) {
                 Image(systemName: "mic.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 20, height: 20)
                     .foregroundColor(theme.colors.primary)
             }
             .disabled(disabled)
@@ -313,9 +310,6 @@ struct SendMessageView: View {
             }
         } label: {
             Image(systemName: "mic")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
                 .foregroundColor(theme.colors.secondary)
         }
         .disabled(composeState.inProgress)

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

@@ -9,37 +9,30 @@
 import SwiftUI
 import SimpleXChat
 
-typealias DynamicSizes = (
-    rowHeight: CGFloat,
-    profileImageSize: CGFloat,
-    mediaSize: CGFloat,
-    incognitoSize: CGFloat,
-    chatInfoSize: CGFloat,
-    unreadCorner: CGFloat,
-    unreadPadding: CGFloat
-)
-
-private let dynamicSizes: [DynamicTypeSize: DynamicSizes] = [
-    .xSmall: (68, 55, 33, 22, 18, 9, 3),
-    .small: (72, 57, 34, 22, 18, 9, 3),
-    .medium: (76, 60, 36, 22, 18, 10, 4),
-    .large: (80, 63, 38, 24, 20, 10, 4),
-    .xLarge: (88, 67, 41, 24, 20, 10, 4),
-    .xxLarge: (100, 71, 44, 27, 22, 11, 4),
-    .xxxLarge: (110, 75, 48, 30, 24, 12, 5),
-    .accessibility1: (110, 75, 48, 30, 24, 12, 5),
-    .accessibility2: (114, 75, 48, 30, 24, 12, 5),
-    .accessibility3: (124, 75, 48, 30, 24, 12, 5),
-    .accessibility4: (134, 75, 48, 30, 24, 12, 5),
-    .accessibility5: (144, 75, 48, 30, 24, 12, 5)
+let dynamicSizes: [
+    DynamicTypeSize: (
+        rowHeight: CGFloat,
+        profileImageSize: CGFloat,
+        mediaSize: CGFloat,
+        chatInfoSize: CGFloat,
+        unreadCorner: CGFloat,
+        unreadPadding: CGFloat
+    )
+] = [
+    .xSmall: (68, 55, 33, 18, 9, 3),
+    .small: (72, 57, 34, 18, 9, 3),
+    .medium: (76, 60, 36, 18, 10, 4),
+    .large: (80, 63, 38, 20, 10, 4),
+    .xLarge: (88, 67, 41, 20, 10, 4),
+    .xxLarge: (94, 71, 44, 22, 11, 4),
+    .xxxLarge: (104, 75, 48, 24, 12, 5),
+    .accessibility1: (104, 75, 48, 24, 12, 5),
+    .accessibility2: (114, 75, 48, 24, 12, 5),
+    .accessibility3: (124, 75, 48, 24, 12, 5),
+    .accessibility4: (134, 75, 48, 24, 12, 5),
+    .accessibility5: (144, 75, 48, 24, 12, 5)
 ]
 
-private let defaultDynamicSizes: DynamicSizes = dynamicSizes[.large]!
-
-func dynamicSize(_ font: DynamicTypeSize) -> DynamicSizes {
-    dynamicSizes[font] ?? defaultDynamicSizes
-}
-
 struct ChatListNavLink: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme

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

@@ -22,14 +22,14 @@ struct ChatPreviewView: View {
 
     @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
 
-    var dynamicMediaSize: CGFloat { dynamicSize(userFont).mediaSize }
-    var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+    var dynamicMediaSize: CGFloat { dynamicSizes[userFont]?.mediaSize ?? 36 }
+    var dynamicChatInfoSize: CGFloat { dynamicSizes[userFont]?.chatInfoSize ?? 18 }
     
     var body: some View {
         let cItem = chat.chatItems.last
         return HStack(spacing: 8) {
             ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
+                ChatInfoImage(chat: chat, size: dynamicSizes[userFont]?.profileImageSize ?? 63)
                 chatPreviewImageOverlayIcon()
                     .padding([.bottom, .trailing], 1)
             }
@@ -77,7 +77,7 @@ struct ChatPreviewView: View {
                         checkActiveContentPreview(chat, ci, mc)
                     }
                     chatStatusImage()
-                        .padding(.top, dynamicChatInfoSize * 1.44)
+                        .padding(.top, 26)
                         .frame(maxWidth: .infinity, alignment: .trailing)
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -198,10 +198,10 @@ struct ChatPreviewView: View {
             unreadCountText(s.unreadCount)
                 .font(userFont <= .xxxLarge ? .caption  : .caption2)
                 .foregroundColor(.white)
-                .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+                .padding(.horizontal, dynamicSizes[userFont]?.unreadPadding ?? 4)
                 .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
                 .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
-                .cornerRadius(dynamicSize(userFont).unreadCorner)
+                .cornerRadius(dynamicSizes[userFont]?.unreadCorner ?? 10)
         } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
             Image(systemName: "speaker.slash.fill")
                 .resizable()
@@ -372,42 +372,41 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder private func chatStatusImage() -> some View {
-        let size = dynamicSize(userFont).incognitoSize
         switch chat.chatInfo {
         case let .direct(contact):
             if contact.active && contact.activeConn != nil {
                 switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
                 case .error:
                     Image(systemName: "exclamationmark.circle")
                         .resizable()
                         .scaledToFit()
-                        .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
+                        .frame(width: 17, height: 17)
                         .foregroundColor(theme.colors.secondary)
                 default:
                     ProgressView()
                 }
             } else {
-                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
             }
         case .group:
             if progressByTimeout {
                 ProgressView()
             } else {
-                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
             }
         default:
-            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
         }
     }
 }
 
-@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color, size: CGFloat) -> some View {
+@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color) -> some View {
     if incognito {
         Image(systemName: "theatermasks")
             .resizable()
             .scaledToFit()
-            .frame(width: size, height: size)
+            .frame(width: 22, height: 22)
             .foregroundColor(secondaryColor)
     } else {
         EmptyView()

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

@@ -13,7 +13,6 @@ struct ContactConnectionView: View {
     @EnvironmentObject var m: ChatModel
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
-    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
     @State private var localAlias = ""
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var showContactConnectionInfo = false
@@ -63,7 +62,7 @@ struct ContactConnectionView: View {
                 ZStack(alignment: .topTrailing) {
                     Text(contactConnection.description)
                         .frame(maxWidth: .infinity, alignment: .leading)
-                    incognitoIcon(contactConnection.incognito, theme.colors.secondary, size: dynamicSize(userFont).incognitoSize)
+                    incognitoIcon(contactConnection.incognito, theme.colors.secondary)
                         .padding(.top, 26)
                         .frame(maxWidth: .infinity, alignment: .trailing)
                 }

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

@@ -18,7 +18,7 @@ struct ContactRequestView: View {
 
     var body: some View {
         HStack(spacing: 8) {
-            ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
+            ChatInfoImage(chat: chat, size: dynamicSizes[userFont]?.profileImageSize ?? 63)
                 .padding(.leading, 4)
             VStack(alignment: .leading, spacing: 0) {
                 HStack(alignment: .top) {

apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift

@@ -64,7 +64,7 @@ struct LocalAuthView: View {
                 deleteAppDatabaseAndFiles()
                 // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                 m.chatId = nil
-                ItemsModel.shared.reversedChatItems = []
+                m.reversedChatItems = []
                 m.chats = []
                 m.users = []
                 _ = kcAppPassword.set(password)

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -212,12 +212,12 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E50581062C3DDD9D009C3F71 /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = E50581052C3DDD9D009C3F71 /* Yams */; };
+		E5DCF8D52C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8D02C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a */; };
+		E5DCF8D62C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8D12C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a */; };
+		E5DCF8D72C56F7EF007928CC /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8D22C56F7EF007928CC /* libffi.a */; };
+		E5DCF8D82C56F7EF007928CC /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8D32C56F7EF007928CC /* libgmp.a */; };
+		E5DCF8D92C56F7EF007928CC /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8D42C56F7EF007928CC /* libgmpxx.a */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
-		E5DCF8E12C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */; };
-		E5DCF8E22C5847EB007928CC /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DD2C5847EB007928CC /* libgmp.a */; };
-		E5DCF8E32C5847EB007928CC /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DE2C5847EB007928CC /* libgmpxx.a */; };
-		E5DCF8E42C5847EB007928CC /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DF2C5847EB007928CC /* libffi.a */; };
-		E5DCF8E52C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -542,11 +542,11 @@
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
-		E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a"; sourceTree = "<group>"; };
-		E5DCF8DD2C5847EB007928CC /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E5DCF8DE2C5847EB007928CC /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E5DCF8DF2C5847EB007928CC /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E5DCF8D02C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E5DCF8D12C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a"; sourceTree = "<group>"; };
+		E5DCF8D22C56F7EF007928CC /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E5DCF8D32C56F7EF007928CC /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E5DCF8D42C56F7EF007928CC /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -587,13 +587,13 @@
 			files = (
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
+				E5DCF8D82C56F7EF007928CC /* libgmp.a in Frameworks */,
 				E50581062C3DDD9D009C3F71 /* Yams in Frameworks */,
-				E5DCF8E52C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a in Frameworks */,
-				E5DCF8E42C5847EB007928CC /* libffi.a in Frameworks */,
-				E5DCF8E12C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a in Frameworks */,
-				E5DCF8E22C5847EB007928CC /* libgmp.a in Frameworks */,
+				E5DCF8D62C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a in Frameworks */,
+				E5DCF8D72C56F7EF007928CC /* libffi.a in Frameworks */,
+				E5DCF8D92C56F7EF007928CC /* libgmpxx.a in Frameworks */,
+				E5DCF8D52C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				E5DCF8E32C5847EB007928CC /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -668,11 +668,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5DCF8DF2C5847EB007928CC /* libffi.a */,
-				E5DCF8DD2C5847EB007928CC /* libgmp.a */,
-				E5DCF8DE2C5847EB007928CC /* libgmpxx.a */,
-				E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */,
-				E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */,
+				E5DCF8D22C56F7EF007928CC /* libffi.a */,
+				E5DCF8D32C56F7EF007928CC /* libgmp.a */,
+				E5DCF8D42C56F7EF007928CC /* libgmpxx.a */,
+				E5DCF8D02C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp-ghc9.6.3.a */,
+				E5DCF8D12C56F7EF007928CC /* libHSsimplex-chat-6.0.0.2-B4oiZFZeYN0AY2321yyqdp.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1728,7 +1728,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1777,7 +1777,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1863,7 +1863,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1900,7 +1900,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1937,7 +1937,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1988,7 +1988,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 229;
+				CURRENT_PROJECT_VERSION = 228;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;

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

@@ -341,7 +341,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
               }
             },
             openDirectChat = { contactId ->
-              scope.launch {
+              withBGApi {
                 openDirectChat(chatRh, contactId, chatModel)
               }
             },
@@ -1156,8 +1156,6 @@ private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems:
            * this coroutine will be canceled with the message "Current mutation had a higher priority" because of animatedScroll.
            * Which breaks auto-scrolling to bottom. So just ignoring the exception
            * */
-        } catch (e: IllegalArgumentException) {
-          Log.e(TAG, "Failed to scroll: ${e.stackTraceToString()}")
         }
       }
   }

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

@@ -28,7 +28,7 @@ import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.*
+import kotlinx.coroutines.delay
 import kotlinx.datetime.Clock
 
 @Composable
@@ -56,8 +56,6 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
     }
   }
 
-  val scope = rememberCoroutineScope()
-
   when (chat.chatInfo) {
     is ChatInfo.Direct -> {
       val contactNetworkStatus = chatModel.contactNetworkStatus(chat.chatInfo.contact)
@@ -67,7 +65,7 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
             ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, contactNetworkStatus, disabled, linkMode, inProgress = false, progressByTimeout = false)
           }
         },
-        click = { scope.launch { directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel) } },
+        click = { directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel) },
         dropdownMenuItems = {
           tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
             ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu, showMarkRead)
@@ -86,7 +84,7 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
             ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, disabled, linkMode, inProgress.value, progressByTimeout)
           }
         },
-        click = { if (!inProgress.value) scope.launch { groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel, inProgress) } },
+        click = { if (!inProgress.value) groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel, inProgress) },
         dropdownMenuItems = {
           tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
             GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, inProgress, showMarkRead)
@@ -104,7 +102,7 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
             ChatPreviewView(chat, showChatPreviews, chatModel.draft.value, chatModel.draftChatId.value, chatModel.currentUser.value?.profile?.displayName, null, disabled, linkMode, inProgress = false, progressByTimeout = false)
           }
         },
-        click = { scope.launch { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) } },
+        click = { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) },
         dropdownMenuItems = {
           tryOrShowError("${chat.id}ChatListNavLinkDropdown", error = {}) {
             NoteFolderMenuItems(chat, showMenu, showMarkRead)
@@ -180,42 +178,42 @@ private fun ErrorChatListItem() {
   }
 }
 
-suspend fun directChatAction(rhId: Long?, contact: Contact, chatModel: ChatModel) {
+fun directChatAction(rhId: Long?, contact: Contact, chatModel: ChatModel) {
   when {
     contact.activeConn == null && contact.profile.contactLink != null -> askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close = null, openChat = true)
-    else -> openChat(rhId, ChatInfo.Direct(contact), chatModel)
+    else -> withBGApi { openChat(rhId, ChatInfo.Direct(contact), chatModel) }
   }
 }
 
-suspend fun groupChatAction(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, inProgress: MutableState<Boolean>? = null) {
+fun groupChatAction(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, inProgress: MutableState<Boolean>? = null) {
   when (groupInfo.membership.memberStatus) {
     GroupMemberStatus.MemInvited -> acceptGroupInvitationAlertDialog(rhId, groupInfo, chatModel, inProgress)
     GroupMemberStatus.MemAccepted -> groupInvitationAcceptedAlert(rhId)
-    else -> openChat(rhId, ChatInfo.Group(groupInfo), chatModel)
+    else -> withBGApi { openChat(rhId, ChatInfo.Group(groupInfo), chatModel) }
   }
 }
 
-suspend fun noteFolderChatAction(rhId: Long?, noteFolder: NoteFolder) {
-  openChat(rhId, ChatInfo.Local(noteFolder), chatModel)
+fun noteFolderChatAction(rhId: Long?, noteFolder: NoteFolder) {
+  withBGApi { openChat(rhId, ChatInfo.Local(noteFolder), chatModel) }
 }
 
-suspend fun openDirectChat(rhId: Long?, contactId: Long, chatModel: ChatModel) = coroutineScope {
+suspend fun openDirectChat(rhId: Long?, contactId: Long, chatModel: ChatModel) {
   val chat = chatModel.controller.apiGetChat(rhId, ChatType.Direct, contactId)
-  if (chat != null && isActive) {
+  if (chat != null) {
     openLoadedChat(chat, chatModel)
   }
 }
 
-suspend fun openGroupChat(rhId: Long?, groupId: Long, chatModel: ChatModel) = coroutineScope {
+suspend fun openGroupChat(rhId: Long?, groupId: Long, chatModel: ChatModel) {
   val chat = chatModel.controller.apiGetChat(rhId, ChatType.Group, groupId)
-  if (chat != null && isActive) {
+  if (chat != null) {
     openLoadedChat(chat, chatModel)
   }
 }
 
-suspend fun openChat(rhId: Long?, chatInfo: ChatInfo, chatModel: ChatModel) = coroutineScope {
+suspend fun openChat(rhId: Long?, chatInfo: ChatInfo, chatModel: ChatModel) {
   val chat = chatModel.controller.apiGetChat(rhId, chatInfo.chatType, chatInfo.apiId)
-  if (chat != null && isActive) {
+  if (chat != null) {
     openLoadedChat(chat, chatModel)
   }
 }

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

@@ -13,7 +13,6 @@ import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.launch
 
 @Composable
 fun ShareListNavLinkView(
@@ -24,7 +23,6 @@ fun ShareListNavLinkView(
   hasSimplexLink: Boolean
 ) {
   val stopped = chatModel.chatRunning.value == false
-  val scope = rememberCoroutineScope()
   when (chat.chatInfo) {
     is ChatInfo.Direct -> {
       val voiceProhibited = isVoice && !chat.chatInfo.featureEnabled(ChatFeature.Voice)
@@ -34,7 +32,7 @@ fun ShareListNavLinkView(
           if (voiceProhibited) {
             showForwardProhibitedByPrefAlert()
           } else {
-            scope.launch { directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel) }
+            directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel)
           }
         },
         stopped
@@ -51,7 +49,7 @@ fun ShareListNavLinkView(
           if (prohibitedByPref) {
             showForwardProhibitedByPrefAlert()
           } else {
-            scope.launch { groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel) }
+            groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel)
           }
         },
         stopped
@@ -60,7 +58,7 @@ fun ShareListNavLinkView(
     is ChatInfo.Local ->
       ShareListNavLinkLayout(
         chatLinkPreview = { SharePreviewView(chat, disabled = false) },
-        click = { scope.launch { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) } },
+        click = { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) },
         stopped
       )
     is ChatInfo.ContactRequest, is ChatInfo.ContactConnection, is ChatInfo.InvalidJSON -> {}

apps/multiplatform/gradle.properties

@@ -26,11 +26,11 @@ android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11
 
-android.version_name=6.0-beta.2
-android.version_code=227
+android.version_name=6.0-beta.1
+android.version_code=226
 
-desktop.version_name=6.0-beta.2
-desktop.version_code=58
+desktop.version_name=6.0-beta.1
+desktop.version_code=57
 
 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0

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: 83f8622b2397afe2635c8f60f1ec5f6fdc16ef7c
+    tag: 3753379ae47a1201c8e546eaabc7bdf245463a70
 
 source-repository-package
     type: git

package.yaml

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

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."83f8622b2397afe2635c8f60f1ec5f6fdc16ef7c" = "1dn7b0pjlk32crp943l6lz4r376nf444kjfi167mrv1pgccri6ns";
+  "https://github.com/simplex-chat/simplexmq.git"."3753379ae47a1201c8e546eaabc7bdf245463a70" = "1h6wnjp1bqcjn55h3d9jbfz6fp49shy50izp649cvpyvls3difcm";
   "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.0.0.3
+version:        6.0.0.2
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat