desktop: disable storing password on password change

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -103,15 +103,9 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         self.onFinishPlayback = onFinishPlayback
     }
 
-    func start(fileSource: CryptoFile, at: TimeInterval?) {
-        let url = getAppFilePath(fileSource.filePath)
-        if let cfArgs = fileSource.cryptoArgs {
-            if let data = try? readCryptoFile(path: url.path, cryptoArgs: cfArgs) {
-                audioPlayer = try? AVAudioPlayer(data: data)
-            }
-        } else {
-            audioPlayer = try? AVAudioPlayer(contentsOf: url)
-        }
+    func start(fileName: String, at: TimeInterval?) {
+        let url = getAppFilePath(fileName)
+        audioPlayer = try? AVAudioPlayer(contentsOf: url)
         audioPlayer?.delegate = self
         audioPlayer?.prepareToPlay()
         if let at = at {

apps/ios/Shared/Model/ImageUtils.swift

@@ -11,43 +11,42 @@ import SimpleXChat
 import SwiftUI
 import AVKit
 
-func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
-    if let file = file, file.loaded {
-        return file.fileSource
+func getLoadedFilePath(_ file: CIFile?) -> String? {
+    if let fileName = getLoadedFileName(file) {
+        return getAppFilePath(fileName).path
+    }
+    return nil
+}
+
+func getLoadedFileName(_ file: CIFile?) -> String? {
+    if let file = file,
+       file.loaded,
+       let fileName = file.filePath {
+        return fileName
     }
     return nil
 }
 
 func getLoadedImage(_ file: CIFile?) -> UIImage? {
-    if let fileSource = getLoadedFileSource(file) {
-        let filePath = getAppFilePath(fileSource.filePath)
+    let loadedFilePath = getLoadedFilePath(file)
+    if let loadedFilePath = loadedFilePath, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
         do {
-            let data = try getFileData(filePath, fileSource.cryptoArgs)
+            let data = try Data(contentsOf: filePath)
             let img = UIImage(data: data)
-            do {
-                try img?.setGifFromData(data, levelOfIntegrity: 1.0)
-                return img
-            } catch {
-                return UIImage(data: data)
-            }
+            try img?.setGifFromData(data, levelOfIntegrity: 1.0)
+            return img
         } catch {
-            return nil
+            return UIImage(contentsOfFile: loadedFilePath)
         }
     }
     return nil
 }
 
-func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
-    if let cfArgs = cfArgs {
-        return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
-    } else {
-        return try Data(contentsOf: path)
-    }
-}
-
 func getLoadedVideo(_ file: CIFile?) -> URL? {
-    if let fileSource = getLoadedFileSource(file) {
-        let filePath = getAppFilePath(fileSource.filePath)
+    let loadedFilePath = getLoadedFilePath(file)
+    if loadedFilePath != nil, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
         if FileManager.default.fileExists(atPath: filePath.path) {
             return filePath
         }
@@ -55,18 +54,18 @@ func getLoadedVideo(_ file: CIFile?) -> URL? {
     return nil
 }
 
-func saveAnimImage(_ image: UIImage) -> CryptoFile? {
+func saveAnimImage(_ image: UIImage) -> String? {
     let fileName = generateNewFileName("IMG", "gif")
     guard let imageData = image.imageData else { return nil }
-    return saveFile(imageData, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+    return saveFile(imageData, fileName)
 }
 
-func saveImage(_ uiImage: UIImage) -> CryptoFile? {
+func saveImage(_ uiImage: UIImage) -> String? {
     let hasAlpha = imageHasAlpha(uiImage)
     let ext = hasAlpha ? "png" : "jpg"
     if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
         let fileName = generateNewFileName("IMG", ext)
-        return saveFile(imageDataResized, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+        return saveFile(imageDataResized, fileName)
     }
     return nil
 }
@@ -158,19 +157,13 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
     return false
 }
 
-func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
-    let savedFile: CryptoFile?
+func saveFileFromURL(_ url: URL) -> String? {
+    let savedFile: String?
     if url.startAccessingSecurityScopedResource() {
         do {
+            let fileData = try Data(contentsOf: url)
             let fileName = uniqueCombine(url.lastPathComponent)
-            let toPath = getAppFilePath(fileName).path
-            if encrypted {
-                let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: toPath)
-                savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-            } else {
-                try FileManager.default.copyItem(atPath: url.path, toPath: toPath)
-                savedFile = CryptoFile.plain(fileName)
-            }
+            savedFile = saveFile(fileData, fileName)
         } catch {
             logger.error("FileUtils.saveFileFromURL error: \(error.localizedDescription)")
             savedFile = nil
@@ -183,16 +176,18 @@ func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
     return savedFile
 }
 
-func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
+func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
+    let savedFile: String?
     do {
         let fileName = uniqueCombine(url.lastPathComponent)
         try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
         ChatModel.shared.filesToDelete.remove(url)
-        return CryptoFile.plain(fileName)
+        savedFile = fileName
     } catch {
-        logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
-        return nil
+        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
+        savedFile = nil
     }
+    return savedFile
 }
 
 func generateNewFileName(_ prefix: String, _ ext: String) -> String {
@@ -293,4 +288,4 @@ extension UIImage {
         }
         return self
     }
-}
+}

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -315,7 +315,7 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
     throw r
 }
 
-func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
     let chatModel = ChatModel.shared
     let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
     let r: ChatResponse
@@ -807,14 +807,14 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func receiveFile(user: any UserLike, fileId: Int64, encrypted: Bool, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: encrypted, auto: auto) {
+func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId, auto: auto) {
         await chatItemSimpleUpdate(user, chatItem)
     }
 }
 
-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
     let am = AlertManager.shared
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     if case .rcvFileAcceptedSndCancelled = r {
@@ -1357,7 +1357,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
         if let file = cItem.autoReceiveFile() {
             Task {
-                await receiveFile(user: user, fileId: file.fileId, encrypted: cItem.encryptLocalFile, auto: true)
+                await receiveFile(user: user, fileId: file.fileId, auto: true)
             }
         }
         if cItem.showNotification {
@@ -1660,3 +1660,15 @@ private struct UserResponse: Decodable {
     var user: User?
     var error: String?
 }
+
+struct RuntimeError: Error {
+    let message: String
+
+    init(_ message: String) {
+        self.message = message
+    }
+
+    public var localizedDescription: String {
+        return message
+    }
+}

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

@@ -16,8 +16,8 @@ struct CIFileView: View {
 
     var body: some View {
         let metaReserve = edited
-        ? "                           "
-        : "                       "
+        ? "                         "
+        : "                     "
         Button(action: fileAction) {
             HStack(alignment: .bottom, spacing: 6) {
                 fileIndicator()
@@ -84,8 +84,7 @@ struct CIFileView: View {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                         if let user = ChatModel.shared.currentUser {
-                            let encrypted = file.fileProtocol == .xftp && privacyEncryptLocalFilesGroupDefault.get()
-                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
+                            await receiveFile(user: user, fileId: file.fileId)
                         }
                     }
                 } else {
@@ -110,8 +109,9 @@ struct CIFileView: View {
                 }
             case .rcvComplete:
                 logger.debug("CIFileView fileAction - in .rcvComplete")
-                if let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
+                if let filePath = getLoadedFilePath(file) {
+                    let url = URL(fileURLWithPath: filePath)
+                    showShareSheet(items: [url])
                 }
             default: break
             }
@@ -193,30 +193,6 @@ struct CIFileView: View {
     }
 }
 
-func saveCryptoFile(_ fileSource: CryptoFile) {
-    if let cfArgs = fileSource.cryptoArgs {
-        let url = getAppFilePath(fileSource.filePath)
-        let tempUrl = getTempFilesDirectory().appendingPathComponent(fileSource.filePath)
-        Task {
-            do {
-                try decryptCryptoFile(fromPath: url.path, cryptoArgs: cfArgs, toPath: tempUrl.path)
-                await MainActor.run {
-                    showShareSheet(items: [tempUrl]) {
-                        removeFile(tempUrl)
-                    }
-                }
-            } catch {
-                await MainActor.run {
-                    AlertManager.shared.showAlertMsg(title: "Error decrypting file", message: "Error: \(error.localizedDescription)")
-                }
-            }
-        }
-    } else {
-        let url = getAppFilePath(fileSource.filePath)
-        showShareSheet(items: [url])
-    }
-}
-
 struct CIFileView_Previews: PreviewProvider {
     static var previews: some View {
         let sentFile: ChatItem = ChatItem(

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

@@ -16,7 +16,6 @@ struct CIImageView: View {
     let maxWidth: CGFloat
     @Binding var imgWidth: CGFloat?
     @State var scrollProxy: ScrollViewProxy?
-    @State var metaColor: Color
     @State private var showFullScreenImage = false
 
     var body: some View {
@@ -37,8 +36,9 @@ struct CIImageView: View {
                             case .rcvInvitation:
                                 Task {
                                     if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
+                                        await receiveFile(user: user, fileId: file.fileId)
                                     }
+                                    // TODO image accepted alert?
                                 }
                             case .rcvAccepted:
                                 switch file.fileProtocol {
@@ -110,7 +110,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(metaColor)
+            .foregroundColor(.white)
             .padding(padding)
     }
 

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

@@ -21,28 +21,27 @@ struct CIMetaView: View {
         } else {
             let meta = chatItem.meta
             let ttl = chat.chatInfo.timedMessagesTTL
-            let encrypted = chatItem.encryptedFile
             switch meta.itemStatus {
             case let .sndSent(sndProgress):
                 switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
+                case .complete: ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .sent)
                 }
             case let .sndRcvd(_, sndProgress):
                 switch sndProgress {
                 case .complete:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
+                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
                     }
                 case .partial:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
+                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd2)
                     }
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
+                ciMetaText(meta, chatTTL: ttl, color: metaColor)
             }
         }
     }
@@ -54,7 +53,7 @@ enum SentCheckmark {
     case rcvd2
 }
 
-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
     if meta.itemEdited {
         r = r + statusIconText("pencil", color)
@@ -81,11 +80,7 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color =
     } else if !meta.disappearing {
         r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
-    if let enc = encrypted {
-        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
-    }
-    r = r + meta.timestampText.foregroundColor(color)
-    return r.font(.caption)
+    return (r + meta.timestampText.foregroundColor(color)).font(.caption)
 }
 
 private func statusIconText(_ icon: String, _ color: Color) -> Text {

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

@@ -118,7 +118,7 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
                 )
             }
             .padding(.horizontal, 12)
@@ -139,7 +139,7 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
             }
             .padding(.horizontal, 12)
             CIMetaView(chatItem: chatItem)

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

@@ -59,7 +59,7 @@ struct CIVideoView: View {
                         if let file = file {
                             switch file.fileStatus {
                             case .rcvInvitation:
-                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
+                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
                                 case .xftp:
@@ -85,7 +85,7 @@ struct CIVideoView: View {
             }
             if let file = file, case .rcvInvitation = file.fileStatus {
                 Button {
-                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                 } label: {
                     playPauseIcon("play.fill")
                 }
@@ -253,11 +253,10 @@ struct CIVideoView: View {
         .padding([.trailing, .top], 11)
     }
 
-    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
         Task {
             if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId, encrypted, false)
+                await receiveFile(user, file.fileId, false)
             }
         }
     }

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

@@ -159,8 +159,7 @@ struct VoiceMessagePlayer: View {
             }
         }
         .onChange(of: chatModel.stopPreviousRecPlay) { it in
-            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
-               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
+            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                 audioPlayer?.stop()
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
@@ -175,8 +174,8 @@ struct VoiceMessagePlayer: View {
         switch playbackState {
         case .noPlayback:
             Button {
-                if let recordingSource = getLoadedFileSource(recordingFile) {
-                    startPlayback(recordingSource)
+                if let recordingFileName = getLoadedFileName(recordingFile) {
+                    startPlayback(recordingFileName)
                 }
             } label: {
                 playPauseIcon("play.fill")
@@ -220,7 +219,7 @@ struct VoiceMessagePlayer: View {
         Button {
             Task {
                 if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+                    await receiveFile(user: user, fileId: recordingFile.fileId)
                 }
             }
         } label: {
@@ -252,8 +251,8 @@ struct VoiceMessagePlayer: View {
             .clipShape(Circle())
     }
 
-    private func startPlayback(_ recordingSource: CryptoFile) {
-        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
+    private func startPlayback(_ recordingFileName: String) {
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
         audioPlayer = AudioPlayer(
             onTimer: { playbackTime = $0 },
             onFinishPlayback: {
@@ -261,7 +260,7 @@ struct VoiceMessagePlayer: View {
                 playbackTime = TimeInterval(0)
             }
         )
-        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -97,7 +97,7 @@ struct FramedItemView: View {
         } else {
             switch (chatItem.content.msgContent) {
             case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
                     .overlay(DetermineWidth())
                 if text == "" && !chatItem.meta.isLive {
                     Color.clear

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

@@ -80,7 +80,7 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, transparent: true)
     }
 }
 

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

@@ -601,15 +601,15 @@ struct ChatView: View {
                 }
                 menu.append(shareUIAction())
                 menu.append(copyUIAction())
-                if let fileSource = getLoadedFileSource(ci.file) {
+                if let filePath = getLoadedFilePath(ci.file) {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
-                            menu.append(saveFileAction(fileSource))
+                            menu.append(saveFileAction(filePath))
                         } else {
                             menu.append(saveImageAction(image))
                         }
                     } else {
-                        menu.append(saveFileAction(fileSource))
+                        menu.append(saveFileAction(filePath))
                     }
                 }
                 if ci.meta.editable && !mc.isVoice && !live {
@@ -747,12 +747,13 @@ struct ChatView: View {
             }
         }
         
-        private func saveFileAction(_ fileSource: CryptoFile) -> UIAction {
+        private func saveFileAction(_ filePath: String) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Save", comment: "chat item action"),
-                image: UIImage(systemName: fileSource.cryptoArgs == nil ? "square.and.arrow.down" : "lock.open")
+                image: UIImage(systemName: "square.and.arrow.down")
             ) { _ in
-                saveCryptoFile(fileSource)
+                let fileURL = URL(fileURLWithPath: filePath)
+                showShareSheet(items: [fileURL])
             }
         }
         

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

@@ -167,23 +167,25 @@ struct ComposeState {
 }
 
 func chatItemPreview(chatItem: ChatItem) -> ComposePreview {
+    let chatItemPreview: ComposePreview
     switch chatItem.content.msgContent {
     case .text:
-        return .noPreview
+        chatItemPreview = .noPreview
     case let .link(_, preview: preview):
-        return .linkPreview(linkPreview: preview)
+        chatItemPreview = .linkPreview(linkPreview: preview)
     case let .image(_, image):
-        return .mediaPreviews(mediaPreviews: [(image, nil)])
+        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .video(_, image, _):
-        return .mediaPreviews(mediaPreviews: [(image, nil)])
+        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .voice(_, duration):
-        return .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
+        chatItemPreview = .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
     case .file:
         let fileName = chatItem.file?.fileName ?? ""
-        return .filePreview(fileName: fileName, file: getAppFilePath(fileName))
+        chatItemPreview = .filePreview(fileName: fileName, file: getAppFilePath(fileName))
     default:
-        return .noPreview
+        chatItemPreview = .noPreview
     }
+    return chatItemPreview
 }
 
 enum UploadContent: Equatable {
@@ -654,10 +656,10 @@ struct ComposeView: View {
                 }
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
-                let file = voiceCryptoFile(recordingFileName)
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
+                chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
             case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
+                if let savedFile = saveFileFromURL(file) {
                     sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                 }
             }
@@ -725,28 +727,13 @@ struct ComposeView: View {
 
         func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             let (image, data) = imageData
-            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
+            if case let .video(_, url, duration) = data, let savedFile = saveFileFromURLWithoutLoad(url) {
                 return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
             }
             return nil
         }
 
-        func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
-            if !privacyEncryptLocalFilesGroupDefault.get() {
-                return CryptoFile.plain(fileName)
-            }
-            let url = getAppFilePath(fileName)
-            let toFile = generateNewFileName("voice", "m4a")
-            let toUrl = getAppFilePath(toFile)
-            if let cfArgs = try? encryptCryptoFile(fromPath: url.path, toPath: toUrl.path) {
-                removeFile(url)
-                return CryptoFile(filePath: toFile, cryptoArgs: cfArgs)
-            } else {
-                return nil
-            }
-        }
-
-        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             if let chatItem = await apiSendMessage(
                 type: chat.chatInfo.chatType,
                 id: chat.chatInfo.apiId,
@@ -763,7 +750,7 @@ struct ComposeView: View {
                 return chatItem
             }
             if let file = file {
-                removeFile(file.filePath)
+                removeFile(file)
             }
             return nil
         }
@@ -783,7 +770,7 @@ struct ComposeView: View {
             }
         }
 
-        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
+        func saveAnyImage(_ img: UploadContent) -> String? {
             switch img {
             case let .simpleImage(image): return saveImage(image)
             case let .animatedImage(image): return saveAnimImage(image)

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

@@ -188,7 +188,7 @@ struct ComposeVoiceView: View {
                 playbackTime = recordingTime // animate progress bar to the end
             }
         )
-        audioPlayer?.start(fileSource: CryptoFile.plain(recordingFileName), at: playbackTime)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -8,15 +8,11 @@
 
 import SwiftUI
 
-func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
+func showShareSheet(items: [Any]) {
     let keyWindowScene = UIApplication.shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
     if let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first,
        let presentedViewController = keyWindow.rootViewController?.presentedViewController ?? keyWindow.rootViewController {
         let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
-        if let completed = completed {
-            let handler: UIActivityViewController.CompletionWithItemsHandler = { _,_,_,_ in completed() }
-            activityViewController.completionWithItemsHandler = handler
-        }
         presentedViewController.present(activityViewController, animated: true)
     }
 }

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

@@ -15,7 +15,6 @@ struct PrivacySettings: View {
     @AppStorage(DEFAULT_PRIVACY_LINK_PREVIEWS) private var useLinkPreviews = true
     @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
     @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
     @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -64,9 +63,6 @@ struct PrivacySettings: View {
                 }
 
                 Section {
-                    settingsRow("lock.doc") {
-                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                    }
                     settingsRow("photo") {
                         Toggle("Auto-accept images", isOn: $autoAcceptImages)
                             .onChange(of: autoAcceptImages) {

apps/ios/SimpleX NSE/NotificationService.swift

@@ -271,7 +271,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
             ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
         }
         if let file = cItem.autoReceiveFile() {
-            cItem = autoReceiveFile(file, encrypted: cItem.encryptLocalFile) ?? cItem
+            cItem = autoReceiveFile(file) ?? cItem
         }
         let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
         return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
@@ -367,25 +367,25 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
     return nil
 }
 
-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
-    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, inline: Bool? = nil) -> AChatItem? {
+    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, inline: inline))
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     logger.error("receiveFile error: \(responseError(r))")
     return nil
 }
 
-func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
-    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, encrypted: encrypted))
+func apiSetFileToReceive(fileId: Int64) {
+    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId))
     if case .cmdOk = r { return }
     logger.error("setFileToReceive error: \(responseError(r))")
 }
 
-func autoReceiveFile(_ file: CIFile, encrypted: Bool) -> ChatItem? {
+func autoReceiveFile(_ file: CIFile) -> ChatItem? {
     switch file.fileProtocol {
     case .smp:
-        return apiReceiveFile(fileId: file.fileId, encrypted: false)?.chatItem
+        return apiReceiveFile(fileId: file.fileId)?.chatItem
     case .xftp:
-        apiSetFileToReceive(fileId: file.fileId, encrypted: encrypted)
+        apiSetFileToReceive(fileId: file.fileId)
         return nil
     }
 }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -77,7 +77,6 @@
 		5C9CC7A928C532AB00BEF955 /* DatabaseErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9CC7A828C532AB00BEF955 /* DatabaseErrorView.swift */; };
 		5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */; };
 		5C9D13A3282187BB00AB8B43 /* WebRTC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D13A2282187BB00AB8B43 /* WebRTC.swift */; };
-		5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */; };
 		5C9F83F42A9A7D98009AD0AA /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83EF2A9A7D98009AD0AA /* libffi.a */; };
 		5C9F83F52A9A7D98009AD0AA /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F02A9A7D98009AD0AA /* libgmp.a */; };
 		5C9F83F62A9A7D98009AD0AA /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9F83F12A9A7D98009AD0AA /* libgmpxx.a */; };
@@ -332,7 +331,6 @@
 		5C9CC7A828C532AB00BEF955 /* DatabaseErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseErrorView.swift; sourceTree = "<group>"; };
 		5C9CC7AC28C55D7800BEF955 /* DatabaseEncryptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseEncryptionView.swift; sourceTree = "<group>"; };
 		5C9D13A2282187BB00AB8B43 /* WebRTC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebRTC.swift; sourceTree = "<group>"; };
-		5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoFile.swift; sourceTree = "<group>"; };
 		5C9F83EF2A9A7D98009AD0AA /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C9F83F02A9A7D98009AD0AA /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 		5C9F83F12A9A7D98009AD0AA /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
@@ -725,10 +723,10 @@
 				5CADE79929211BB900072E13 /* PreferencesView.swift */,
 				5C5DB70D289ABDD200730FFF /* AppearanceSettings.swift */,
 				5C05DF522840AA1D00C683F9 /* CallSettings.swift */,
+				5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */,
 				5CB924E027A867BA00ACCCDD /* UserProfile.swift */,
 				5CC036DF29C488D500C0EF20 /* HiddenProfileView.swift */,
 				5C577F7C27C83AA10006112D /* MarkdownHelp.swift */,
-				5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */,
 				5C93292E29239A170090FFF9 /* ProtocolServersView.swift */,
 				5C93293029239BED0090FFF9 /* ProtocolServerView.swift */,
 				5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */,
@@ -781,7 +779,6 @@
 				5CDCAD7D2818941F00503DA2 /* API.swift */,
 				5CDCAD80281A7E2700503DA2 /* Notifications.swift */,
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
-				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
@@ -1239,7 +1236,6 @@
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
 				5CE2BA8B284533A300EC33A6 /* ChatTypes.swift in Sources */,
 				5CE2BA8F284533A300EC33A6 /* APITypes.swift in Sources */,
-				5C9D811A2AA8727A001D49FD /* CryptoFile.swift in Sources */,
 				5CE2BA8C284533A300EC33A6 /* AppGroup.swift in Sources */,
 				5CE2BA8D284533A300EC33A6 /* CallTypes.swift in Sources */,
 				5CE2BA8E284533A300EC33A6 /* API.swift in Sources */,

apps/ios/SimpleXChat/APITypes.swift

@@ -9,7 +9,7 @@
 import Foundation
 import SwiftUI
 
-public let jsonDecoder = getJSONDecoder()
+let jsonDecoder = getJSONDecoder()
 let jsonEncoder = getJSONEncoder()
 
 public enum ChatCommand {
@@ -39,7 +39,7 @@ public enum ChatCommand {
     case apiGetChats(userId: Int64)
     case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
     case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
-    case apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
+    case apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
     case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
     case apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode)
     case apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64)
@@ -110,8 +110,8 @@ public enum ChatCommand {
     case apiCallStatus(contact: Contact, callStatus: WebRTCCallStatus)
     case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
     case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, encrypted: Bool, inline: Bool?)
-    case setFileToReceive(fileId: Int64, encrypted: Bool)
+    case receiveFile(fileId: Int64, inline: Bool?)
+    case setFileToReceive(fileId: Int64)
     case cancelFile(fileId: Int64)
     case showVersion
     case string(String)
@@ -157,7 +157,7 @@ public enum ChatCommand {
                 (search == "" ? "" : " search=\(search)")
             case let .apiGetChatItemInfo(type, id, itemId): return "/_get item info \(ref(type, id)) \(itemId)"
             case let .apiSendMessage(type, id, file, quotedItemId, mc, live, ttl):
-                let msg = encodeJSON(ComposedMessage(fileSource: file, quotedItemId: quotedItemId, msgContent: mc))
+                let msg = encodeJSON(ComposedMessage(filePath: file, quotedItemId: quotedItemId, msgContent: mc))
                 let ttlStr = ttl != nil ? "\(ttl!)" : "default"
                 return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msg)"
             case let .apiUpdateChatItem(type, id, itemId, mc, live): return "/_update item \(ref(type, id)) \(itemId) live=\(onOff(live)) \(mc.cmdString)"
@@ -239,13 +239,12 @@ public enum ChatCommand {
             case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
             case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
             case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, encrypted, inline):
-                let s = "/freceive \(fileId) encrypt=\(onOff(encrypted))"
+            case let .receiveFile(fileId, inline):
                 if let inline = inline {
-                    return s + " inline=\(onOff(inline))"
+                    return "/freceive \(fileId) inline=\(onOff(inline))"
                 }
-                return s
-            case let .setFileToReceive(fileId, encrypted): return "/_set_file_to_receive \(fileId) encrypt=\(onOff(encrypted))"
+                return "/freceive \(fileId)"
+            case let .setFileToReceive(fileId): return "/_set_file_to_receive \(fileId)"
             case let .cancelFile(fileId): return "/fcancel \(fileId)"
             case .showVersion: return "/version"
             case let .string(str): return str
@@ -482,7 +481,7 @@ public enum ChatResponse: Decodable, Error {
     case groupEmpty(user: UserRef, groupInfo: GroupInfo)
     case userContactLinkSubscribed
     case newChatItem(user: UserRef, chatItem: AChatItem)
-    case chatItemStatusUpdated(user: UserRef, chatItem: AChatItem)
+    case chatItemStatusUpdated(UserRef: User, chatItem: AChatItem)
     case chatItemUpdated(user: UserRef, chatItem: AChatItem)
     case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
     case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
@@ -854,7 +853,7 @@ public enum ChatPagination {
 }
 
 struct ComposedMessage: Encodable {
-    var fileSource: CryptoFile?
+    var filePath: String?
     var quotedItemId: Int64?
     var msgContent: MsgContent
 }

apps/ios/SimpleXChat/AppGroup.swift

@@ -17,7 +17,6 @@ public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal"
 public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
-public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
@@ -60,7 +59,6 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE: false,
         GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
         GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false,
-        GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES: true,
         GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
         GROUP_DEFAULT_CALL_KIT_ENABLED: true,
     ])
@@ -115,7 +113,7 @@ public let ntfEnablePeriodicGroupDefault = BoolDefault(defaults: groupDefaults,
 
 public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES)
 
-public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)
+public let privacyTransferImagesInlineGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE)
 
 public let ntfBadgeCountGroupDefault = IntDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_BADGE_COUNT)
 

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2112,17 +2112,6 @@ public struct ChatItem: Identifiable, Decodable {
         return nil
     }
 
-    public var encryptedFile: Bool? {
-        guard let fileSource = file?.fileSource else { return nil }
-        return fileSource.cryptoArgs != nil
-    }
-
-    public var encryptLocalFile: Bool {
-        file?.fileProtocol == .xftp &&
-        content.msgContent?.isVideo == false &&
-        privacyEncryptLocalFilesGroupDefault.get()
-    }
-
     public var memberDisplayName: String? {
         get {
             if case let .groupRcv(groupMember) = chatDir {
@@ -2701,18 +2690,12 @@ public struct CIFile: Decodable {
     public var fileId: Int64
     public var fileName: String
     public var fileSize: Int64
-    public var fileSource: CryptoFile?
+    public var filePath: String?
     public var fileStatus: CIFileStatus
     public var fileProtocol: FileProtocol
 
     public static func getSample(fileId: Int64 = 1, fileName: String = "test.txt", fileSize: Int64 = 100, filePath: String? = "test.txt", fileStatus: CIFileStatus = .rcvComplete) -> CIFile {
-        let f: CryptoFile?
-        if let filePath = filePath {
-            f = CryptoFile.plain(filePath)
-        } else {
-            f = nil
-        }
-        return CIFile(fileId: fileId, fileName: fileName, fileSize: fileSize, fileSource: f, fileStatus: fileStatus, fileProtocol: .xftp)
+        CIFile(fileId: fileId, fileName: fileName, fileSize: fileSize, filePath: filePath, fileStatus: fileStatus, fileProtocol: .xftp)
     }
 
     public var loaded: Bool {
@@ -2759,25 +2742,6 @@ public struct CIFile: Decodable {
     }
 }
 
-public struct CryptoFile: Codable {
-    public var filePath: String // the name of the file, not a full path
-    public var cryptoArgs: CryptoFileArgs?
-
-    public init(filePath: String, cryptoArgs: CryptoFileArgs?) {
-        self.filePath = filePath
-        self.cryptoArgs = cryptoArgs
-    }
-
-    public static func plain(_ f: String) -> CryptoFile {
-        CryptoFile(filePath: f, cryptoArgs: nil)
-    }
-}
-
-public struct CryptoFileArgs: Codable {
-    public var fileKey: String
-    public var fileNonce: String
-}
-
 public struct CancelAction {
     public var uiAction: String
     public var alert: AlertInfo

apps/ios/SimpleXChat/CryptoFile.swift

@@ -1,69 +0,0 @@
-//
-//  CryptoFile.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 05/09/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-
-enum WriteFileResult: Decodable {
-    case result(cryptoArgs: CryptoFileArgs)
-    case error(writeError: String)
-}
-
-public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
-    let ptr: UnsafeMutableRawPointer = malloc(data.count)
-    memcpy(ptr, (data as NSData).bytes, data.count)
-    var cPath = path.cString(using: .utf8)!
-    let cjson = chat_write_file(&cPath, ptr, Int32(data.count))!
-    let d = fromCString(cjson).data(using: .utf8)!
-    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
-    case let .result(cfArgs): return cfArgs
-    case let .error(err): throw RuntimeError(err)
-    }
-}
-
-public func readCryptoFile(path: String, cryptoArgs: CryptoFileArgs) throws -> Data {
-    var cPath = path.cString(using: .utf8)!
-    var cKey = cryptoArgs.fileKey.cString(using: .utf8)!
-    var cNonce = cryptoArgs.fileNonce.cString(using: .utf8)!
-    let ptr = chat_read_file(&cPath, &cKey, &cNonce)!
-    let status = UInt8(ptr.pointee)
-    switch status {
-    case 0: // ok
-        let dLen = Data(bytes: ptr.advanced(by: 1), count: 4)
-        let len = dLen.withUnsafeBytes { $0.load(as: UInt32.self) }
-        let d = Data(bytes: ptr.advanced(by: 5), count: Int(len))
-        free(ptr)
-        return d
-    case 1: // error
-        let err = String.init(cString: ptr)
-        free(ptr)
-        throw RuntimeError(err)
-    default:
-        throw RuntimeError("unexpected chat_read_file status: \(status)")
-    }
-}
-
-public func encryptCryptoFile(fromPath: String, toPath: String) throws -> CryptoFileArgs {
-    var cFromPath = fromPath.cString(using: .utf8)!
-    var cToPath = toPath.cString(using: .utf8)!
-    let cjson = chat_encrypt_file(&cFromPath, &cToPath)!
-    let d = fromCString(cjson).data(using: .utf8)!
-    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
-    case let .result(cfArgs): return cfArgs
-    case let .error(err): throw RuntimeError(err)
-    }
-}
-
-public func decryptCryptoFile(fromPath: String, cryptoArgs: CryptoFileArgs, toPath: String) throws {
-    var cFromPath = fromPath.cString(using: .utf8)!
-    var cKey = cryptoArgs.fileKey.cString(using: .utf8)!
-    var cNonce = cryptoArgs.fileNonce.cString(using: .utf8)!
-    var cToPath = toPath.cString(using: .utf8)!
-    let cErr = chat_decrypt_file(&cFromPath, &cKey, &cNonce, &cToPath)!
-    let err = fromCString(cErr)
-    if err != "" { throw RuntimeError(err) }
-}

apps/ios/SimpleXChat/FileUtils.swift

@@ -173,16 +173,11 @@ public func getAppFilePath(_ fileName: String) -> URL {
     getAppFilesDirectory().appendingPathComponent(fileName)
 }
 
-public func saveFile(_ data: Data, _ fileName: String, encrypted: Bool) -> CryptoFile? {
+public func saveFile(_ data: Data, _ fileName: String) -> String? {
     let filePath = getAppFilePath(fileName)
     do {
-        if encrypted {
-            let cfArgs = try writeCryptoFile(path: filePath.path, data: data)
-            return CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-        } else {
-            try data.write(to: filePath)
-            return CryptoFile.plain(fileName)
-        }
+        try data.write(to: filePath)
+        return fileName
     } catch {
         logger.error("FileUtils.saveFile error: \(error.localizedDescription)")
         return nil
@@ -215,7 +210,7 @@ public func cleanupFile(_ aChatItem: AChatItem) {
     let cItem = aChatItem.chatItem
     let mc = cItem.content.msgContent
     if case .file = mc,
-       let fileName = cItem.file?.fileSource?.filePath {
+       let fileName = cItem.file?.filePath {
         removeFile(fileName)
     }
 }
@@ -226,15 +221,3 @@ public func getMaxFileSize(_ fileProtocol: FileProtocol) -> Int64 {
     case .smp: return MAX_FILE_SIZE_SMP
     }
 }
-
-public struct RuntimeError: Error {
-    let message: String
-
-    public init(_ message: String) {
-        self.message = message
-    }
-
-    public var localizedDescription: String {
-        return message
-    }
-}

apps/ios/SimpleXChat/SimpleX.h

@@ -25,18 +25,3 @@ extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_encrypt_media(char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
-
-// chat_write_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_write_file(char *path, char *data, int len);
-
-// chat_read_file returns a buffer with:
-// result status (1 byte), then if
-//   status == 0 (success): buffer length (uint32, 4 bytes), buffer of specified length.
-//   status == 1 (error): null-terminated error message string.
-extern char *chat_read_file(char *path, char *key, char *nonce);
-
-// chat_encrypt_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_encrypt_file(char *fromPath, char *toPath);
-
-// chat_decrypt_file returns null-terminated string with the error message
-extern char *chat_decrypt_file(char *fromPath, char *key, char *nonce, char *toPath);

apps/multiplatform/android/build.gradle.kts

@@ -83,15 +83,12 @@ android {
     // Comma separated list of languages that will be included in the apk
     android.defaultConfig.resConfigs(
         "en",
-        "ar",
         "bg",
         "cs",
         "de",
         "es",
-        "fi",
         "fr",
         "it",
-        "iw",
         "ja",
         "nl",
         "pl",

apps/multiplatform/build.gradle.kts

@@ -46,7 +46,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:${rootProject.extra["gradle.plugin.version"]}")
         classpath(kotlin("gradle-plugin", version = rootProject.extra["kotlin.version"] as String))
         classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.2")
-        classpath("dev.icerock.moko:resources-generator:0.23.0")
+        classpath("dev.icerock.moko:resources-generator:0.22.3")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

apps/multiplatform/common/build.gradle.kts

@@ -39,7 +39,7 @@ kotlin {
         api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
         api("com.russhwolf:multiplatform-settings:1.0.0")
         api("com.charleskorn.kaml:kaml:0.43.0")
-        api("dev.icerock.moko:resources-compose:0.23.0")
+        api("dev.icerock.moko:resources-compose:0.22.3")
         api("org.jetbrains.compose.ui:ui-text:${rootProject.extra["compose.version"] as String}")
         implementation("org.jetbrains.compose.components:components-animatedimage:${rootProject.extra["compose.version"] as String}")
         //Barcode
@@ -48,7 +48,7 @@ kotlin {
         // Link Previews
         implementation("org.jsoup:jsoup:1.13.1")
         // Resources
-        implementation("dev.icerock.moko:resources:0.23.0")
+        implementation("dev.icerock.moko:resources:0.22.3")
       }
     }
     val commonTest by getting {
@@ -62,7 +62,7 @@ kotlin {
         val work_version = "2.7.1"
         implementation("androidx.work:work-runtime-ktx:$work_version")
         implementation("com.google.accompanist:accompanist-insets:0.23.0")
-        implementation("dev.icerock.moko:resources:0.23.0")
+        implementation("dev.icerock.moko:resources:0.22.3")
 
         // Video support
         implementation("com.google.android.exoplayer:exoplayer:2.17.1")

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

@@ -23,8 +23,6 @@ actual val agentDatabaseFileName: String = "files_agent.db"
 
 actual val databaseExportDir: File = androidAppContext.cacheDir
 
-actual fun desktopOpenDatabaseDir() {}
-
 @Composable
 actual fun rememberFileChooserLauncher(getContent: Boolean, rememberedValue: Any?, onResult: (URI?) -> Unit): FileChooserLauncher {
   val launcher = rememberLauncherForActivityResult(

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.android.kt

@@ -4,8 +4,7 @@ import SectionItemView
 import SectionTextFooter
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -51,7 +50,7 @@ actual fun SavePassphraseSetting(
 
 @Composable
 actual fun DatabaseEncryptionFooter(
-  useKeychain: MutableState<Boolean>,
+  useKeychain: State<Boolean>,
   chatDbEncrypted: Boolean?,
   storedKey: MutableState<Boolean>,
   initialRandomDBPassphrase: MutableState<Boolean>,

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

@@ -197,25 +197,24 @@ fun AndroidScreen(settingsState: SettingsViewState) {
       StartPartOfScreen(settingsState)
     }
     val scope = rememberCoroutineScope()
-    val onComposed: suspend (chatId: String?) -> Unit = { chatId ->
-      // coroutine, scope and join() because:
-      // - it should be run from coroutine to wait until this function finishes
-      // - without using scope.launch it throws CancellationException when changing user
-      // - join allows to wait until completion
+    val onComposed: () -> Unit = {
       scope.launch {
         offset.animateTo(
-          if (chatId == null) 0f else maxWidth.value,
+          if (chatModel.chatId.value == null) 0f else maxWidth.value,
           chatListAnimationSpec()
         )
-      }.join()
+        if (offset.value == 0f) {
+          currentChatId = null
+        }
+      }
     }
     LaunchedEffect(Unit) {
       launch {
         snapshotFlow { chatModel.chatId.value }
           .distinctUntilChanged()
           .collect {
-            if (it == null) onComposed(null)
-            currentChatId = it
+            if (it != null) currentChatId = it
+            else onComposed()
           }
       }
     }

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

@@ -2024,7 +2024,7 @@ class CIFile(
   val fileId: Long,
   val fileName: String,
   val fileSize: Long,
-  val fileSource: CryptoFile? = null,
+  val filePath: String? = null,
   val fileStatus: CIFileStatus,
   val fileProtocol: FileProtocol
 ) {
@@ -2072,23 +2072,10 @@ class CIFile(
       filePath: String? = "test.txt",
       fileStatus: CIFileStatus = CIFileStatus.RcvComplete
     ): CIFile =
-      CIFile(fileId = fileId, fileName = fileName, fileSize = fileSize, fileSource = if (filePath == null) null else CryptoFile.plain(filePath), fileStatus = fileStatus, fileProtocol = FileProtocol.XFTP)
+      CIFile(fileId = fileId, fileName = fileName, fileSize = fileSize, filePath = filePath, fileStatus = fileStatus, fileProtocol = FileProtocol.XFTP)
   }
 }
 
-@Serializable
-class CryptoFile(
-  val filePath: String,
-  val cryptoArgs: CryptoFileArgs?
-) {
-  companion object {
-    fun plain(f: String): CryptoFile = CryptoFile(f, null)
-  }
-}
-
-@Serializable
-class  CryptoFileArgs(val fileKey: String, val fileNonce: String)
-
 class CancelAction(
   val uiActionId: StringResource,
   val alert: AlertInfo

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

@@ -586,7 +586,7 @@ object ChatController {
     return null
   }
 
-  suspend fun apiSendMessage(type: ChatType, id: Long, file: CryptoFile? = null, quotedItemId: Long? = null, mc: MsgContent, live: Boolean = false, ttl: Int? = null): AChatItem? {
+  suspend fun apiSendMessage(type: ChatType, id: Long, file: String? = null, quotedItemId: Long? = null, mc: MsgContent, live: Boolean = false, ttl: Int? = null): AChatItem? {
     val cmd = CC.ApiSendMessage(type, id, file, quotedItemId, mc, live, ttl)
     val r = sendCmd(cmd)
     return when (r) {
@@ -1079,8 +1079,8 @@ object ChatController {
     return false
   }
 
-  suspend fun apiReceiveFile(fileId: Long, encrypted: Boolean, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
-    val r = sendCmd(CC.ReceiveFile(fileId, encrypted, inline))
+  suspend fun apiReceiveFile(fileId: Long, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
+    val r = sendCmd(CC.ReceiveFile(fileId, inline))
     return when (r) {
       is CR.RcvFileAccepted -> r.chatItem
       is CR.RcvFileAcceptedSndCancelled -> {
@@ -1413,8 +1413,7 @@ object ChatController {
             ((mc is MsgContent.MCImage && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV)
                 || (mc is MsgContent.MCVideo && file.fileSize <= MAX_VIDEO_SIZE_AUTO_RCV)
                 || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))) {
-          // TODO encrypt images and voice
-          withApi { receiveFile(r.user, file.fileId, encrypted = false, auto = true) }
+          withApi { receiveFile(r.user, file.fileId, auto = true) }
         }
         if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id)) {
           ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
@@ -1648,8 +1647,8 @@ object ChatController {
     }
   }
 
-  suspend fun receiveFile(user: UserLike, fileId: Long, encrypted: Boolean, auto: Boolean = false) {
-    val chatItem = apiReceiveFile(fileId, encrypted = encrypted, auto = auto)
+  suspend fun receiveFile(user: UserLike, fileId: Long, auto: Boolean = false) {
+    val chatItem = apiReceiveFile(fileId, auto = auto)
     if (chatItem != null) {
       chatItemSimpleUpdate(user, chatItem)
     }
@@ -1805,7 +1804,7 @@ sealed class CC {
   class ApiGetChats(val userId: Long): CC()
   class ApiGetChat(val type: ChatType, val id: Long, val pagination: ChatPagination, val search: String = ""): CC()
   class ApiGetChatItemInfo(val type: ChatType, val id: Long, val itemId: Long): CC()
-  class ApiSendMessage(val type: ChatType, val id: Long, val file: CryptoFile?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean, val ttl: Int?): CC()
+  class ApiSendMessage(val type: ChatType, val id: Long, val file: String?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean, val ttl: Int?): CC()
   class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent, val live: Boolean): CC()
   class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
   class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
@@ -1868,7 +1867,7 @@ sealed class CC {
   class ApiRejectContact(val contactReqId: Long): CC()
   class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
   class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
-  class ReceiveFile(val fileId: Long, val encrypted: Boolean, val inline: Boolean?): CC()
+  class ReceiveFile(val fileId: Long, val inline: Boolean?): CC()
   class CancelFile(val fileId: Long): CC()
   class ShowVersion(): CC()
 
@@ -1973,7 +1972,7 @@ sealed class CC {
     is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus.value}"
     is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
     is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
-    is ReceiveFile -> "/freceive $fileId encrypt=${onOff(encrypted)}" + (if (inline == null) "" else " inline=${onOff(inline)}")
+    is ReceiveFile -> if (inline == null) "/freceive $fileId" else "/freceive $fileId inline=${onOff(inline)}"
     is CancelFile -> "/fcancel $fileId"
     is ShowVersion -> "/version"
   }
@@ -2135,7 +2134,7 @@ sealed class ChatPagination {
 }
 
 @Serializable
-class ComposedMessage(val fileSource: CryptoFile?, val quotedItemId: Long?, val msgContent: MsgContent)
+class ComposedMessage(val filePath: String?, val quotedItemId: Long?, val msgContent: MsgContent)
 
 @Serializable
 class XFTPFileConfig(val minFileSize: Long)

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

@@ -23,8 +23,6 @@ expect val agentDatabaseFileName: String
 * */
 expect val databaseExportDir: File
 
-expect fun desktopOpenDatabaseDir()
-
 fun copyFileToFile(from: File, to: URI, finally: () -> Unit) {
   try {
     to.outputStream().use { stream ->
@@ -62,9 +60,8 @@ fun getAppFilePath(fileName: String): String {
 }
 
 fun getLoadedFilePath(file: CIFile?): String? {
-  val f = file?.fileSource?.filePath
-  return if (f != null && file.loaded) {
-    val filePath = getAppFilePath(f)
+  return if (file?.filePath != null && file.loaded) {
+    val filePath = getAppFilePath(file.filePath)
     if (File(filePath).exists()) filePath else null
   } else {
     null

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

@@ -24,7 +24,6 @@ import androidx.compose.ui.text.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -279,7 +278,7 @@ fun ChatInfoLayout(
       ChatInfoHeader(chat.chatInfo, contact)
     }
 
-    LocalAliasEditor(chat.id, localAlias, updateValue = onLocalAliasChanged)
+    LocalAliasEditor(localAlias, updateValue = onLocalAliasChanged)
     SectionSpacer()
     if (customUserProfile != null) {
       SectionView(generalGetString(MR.strings.incognito).uppercase()) {
@@ -404,16 +403,13 @@ fun ChatInfoHeader(cInfo: ChatInfo, contact: Contact) {
 
 @Composable
 fun LocalAliasEditor(
-  chatId: String,
   initialValue: String,
   center: Boolean = true,
   leadingIcon: Boolean = false,
   focus: Boolean = false,
   updateValue: (String) -> Unit
 ) {
-  val state = remember(chatId) {
-    mutableStateOf(TextFieldValue(initialValue))
-  }
+  var value by rememberSaveable { mutableStateOf(initialValue) }
   var updatedValueAtLeastOnce = remember { false }
   val modifier = if (center)
     Modifier.padding(horizontal = if (!leadingIcon) DEFAULT_PADDING else 0.dp).widthIn(min = 100.dp)
@@ -422,7 +418,7 @@ fun LocalAliasEditor(
   Row(Modifier.fillMaxWidth(), horizontalArrangement = if (center) Arrangement.Center else Arrangement.Start) {
     DefaultBasicTextField(
       modifier,
-      state,
+      value,
       {
         Text(
           generalGetString(MR.strings.text_field_set_contact_placeholder),
@@ -435,27 +431,27 @@ fun LocalAliasEditor(
       } else null,
       color = MaterialTheme.colors.secondary,
       focus = focus,
-      textStyle = TextStyle.Default.copy(textAlign = if (state.value.text.isEmpty() || !center) TextAlign.Start else TextAlign.Center),
-      keyboardActions = KeyboardActions(onDone = { updateValue(state.value.text) })
+      textStyle = TextStyle.Default.copy(textAlign = if (value.isEmpty() || !center) TextAlign.Start else TextAlign.Center),
+      keyboardActions = KeyboardActions(onDone = { updateValue(value) })
     ) {
-      state.value = it
+      value = it
       updatedValueAtLeastOnce = true
     }
   }
-  LaunchedEffect(chatId) {
-    var prevValue = state.value
-    snapshotFlow { state.value }
+  LaunchedEffect(Unit) {
+    var prevValue = value
+    snapshotFlow { value }
       .distinctUntilChanged()
       .onEach { delay(500) } // wait a little after every new character, don't emit until user stops typing
       .conflate() // get the latest value
-      .filter { it == state.value && it != prevValue } // don't process old ones
+      .filter { it == value && it != prevValue } // don't process old ones
       .collect {
-        updateValue(it.text)
+        updateValue(it)
         prevValue = it
       }
   }
-  DisposableEffect(chatId) {
-    onDispose { if (updatedValueAtLeastOnce) updateValue(state.value.text) } // just in case snapshotFlow will be canceled when user presses Back too fast
+  DisposableEffect(Unit) {
+    onDispose { if (updatedValueAtLeastOnce) updateValue(value) } // just in case snapshotFlow will be canceled when user presses Back too fast
   }
 }
 

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

@@ -43,7 +43,7 @@ import java.net.URI
 import kotlin.math.sign
 
 @Composable
-fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId: String) -> Unit) {
+fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
   val activeChat = remember { mutableStateOf(chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatId }) }
   val searchText = rememberSaveable { mutableStateOf("") }
   val user = chatModel.currentUser.value
@@ -66,11 +66,12 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
     launch {
       snapshotFlow { chatModel.chatId.value }
         .distinctUntilChanged()
-        .filter { it != null && activeChat.value?.id != it }
         .collect { chatId ->
-          // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
-          // Also for situation when chatId changes after clicking in notification, etc
-          activeChat.value = chatModel.getChat(chatId!!)
+          if (activeChat.value?.id != chatId && chatId != null) {
+            // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
+            // Also for situation when chatId changes after clicking in notification, etc
+            activeChat.value = chatModel.getChat(chatId)
+          }
           markUnreadChatAsRead(activeChat, chatModel)
         }
     }
@@ -90,7 +91,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
       }
         .distinctUntilChanged()
         // Only changed chatInfo is important thing. Other properties can be skipped for reducing recompositions
-        .filter { it != null && it?.chatInfo != activeChat.value?.chatInfo }
+        .filter { it?.chatInfo != activeChat.value?.chatInfo && it != null }
         .collect { activeChat.value = it }
     }
   }
@@ -244,8 +245,8 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
           }
         }
       },
-      receiveFile = { fileId, encrypted ->
-        withApi { chatModel.controller.receiveFile(user, fileId, encrypted) }
+      receiveFile = { fileId ->
+        withApi { chatModel.controller.receiveFile(user, fileId) }
       },
       cancelFile = { fileId ->
         withApi { chatModel.controller.cancelFile(user, fileId) }
@@ -403,7 +404,7 @@ fun ChatLayout(
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
   loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   startCall: (CallMediaType) -> Unit,
@@ -421,7 +422,7 @@ fun ChatLayout(
   markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
   changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
   onSearchValueChanged: (String) -> Unit,
-  onComposed: suspend (chatId: String) -> Unit,
+  onComposed: () -> Unit,
 ) {
   val scope = rememberCoroutineScope()
   val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
@@ -656,7 +657,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
   loadPrevMessages: (ChatInfo) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
@@ -671,7 +672,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   showItemDetails: (ChatInfo, ChatItem) -> Unit,
   markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
   setFloatingButton: (@Composable () -> Unit) -> Unit,
-  onComposed: suspend (chatId: String) -> Unit,
+  onComposed: () -> Unit,
 ) {
   val listState = rememberLazyListState()
   val scope = rememberCoroutineScope()
@@ -702,13 +703,13 @@ fun BoxWithConstraintsScope.ChatItemsList(
       scope.launch { listState.animateScrollToItem(kotlin.math.min(reversedChatItems.lastIndex, index + 1), -maxHeightRounded) }
     }
   }
-  LaunchedEffect(chat.id) {
+  LaunchedEffect(Unit) {
     var stopListening = false
     snapshotFlow { listState.layoutInfo.visibleItemsInfo.lastIndex }
       .distinctUntilChanged()
       .filter { !stopListening }
       .collect {
-        onComposed(chat.id)
+        onComposed()
         stopListening = true
       }
   }
@@ -1257,7 +1258,7 @@ fun PreviewChatLayout() {
       showMemberInfo = { _, _ -> },
       loadPrevMessages = { _ -> },
       deleteMessage = { _, _ -> },
-      receiveFile = { _, _ -> },
+      receiveFile = {},
       cancelFile = {},
       joinGroup = {},
       startCall = {},
@@ -1324,7 +1325,7 @@ fun PreviewGroupChatLayout() {
       showMemberInfo = { _, _ -> },
       loadPrevMessages = { _ -> },
       deleteMessage = { _, _ -> },
-      receiveFile = { _, _ -> },
+      receiveFile = {},
       cancelFile = {},
       joinGroup = {},
       startCall = {},

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

@@ -317,7 +317,7 @@ fun ComposeView(
     chatModel.filesToDelete.clear()
   }
 
-  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: CryptoFile? = null, live: Boolean = false, ttl: Int?): ChatItem? {
+  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false, ttl: Int?): ChatItem? {
     val aChatItem = chatModel.controller.apiSendMessage(
       type = cInfo.chatType,
       id = cInfo.apiId,
@@ -331,7 +331,7 @@ fun ComposeView(
       chatModel.addChatItem(cInfo, aChatItem.chatItem)
       return aChatItem.chatItem
     }
-    if (file != null) removeFile(file.filePath)
+    if (file != null) removeFile(file)
     return null
   }
 
@@ -404,7 +404,7 @@ fun ComposeView(
       sent = updateMessage(liveMessage.chatItem, cInfo, live)
     } else {
       val msgs: ArrayList<MsgContent> = ArrayList()
-      val files: ArrayList<CryptoFile> = ArrayList()
+      val files: ArrayList<String> = ArrayList()
       when (val preview = cs.preview) {
         ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(msgText))
         is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
@@ -413,7 +413,7 @@ fun ComposeView(
             val file = when (it) {
               is UploadContent.SimpleImage -> saveImage(it.uri)
               is UploadContent.AnimatedImage -> saveAnimImage(it.uri)
-              is UploadContent.Video -> saveFileFromUri(it.uri, encrypted = false)
+              is UploadContent.Video -> saveFileFromUri(it.uri)
             }
             if (file != null) {
               files.add(file)
@@ -432,13 +432,12 @@ fun ComposeView(
           withContext(Dispatchers.IO) {
             Files.move(tmpFile.toPath(), actualFile.toPath())
           }
-          // TODO encrypt voice files
-          files.add(CryptoFile.plain(actualFile.name))
+          files.add(actualFile.name)
           deleteUnusedFiles()
           msgs.add(MsgContent.MCVoice(if (msgs.isEmpty()) msgText else "", preview.durationMs / 1000))
         }
         is ComposePreview.FilePreview -> {
-          val file = saveFileFromUri(preview.uri, encrypted = false)
+          val file = saveFileFromUri(preview.uri)
           if (file != null) {
             files.add((file))
             msgs.add(MsgContent.MCFile(if (msgs.isEmpty()) msgText else ""))

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

@@ -28,7 +28,7 @@ import java.net.URI
 fun CIFileView(
   file: CIFile?,
   edited: Boolean,
-  receiveFile: (Long, Boolean) -> Unit
+  receiveFile: (Long) -> Unit
 ) {
   val saveFileLauncher = rememberSaveFileLauncher(ciFile = file)
 
@@ -71,7 +71,7 @@ fun CIFileView(
       when (file.fileStatus) {
         is CIFileStatus.RcvInvitation -> {
           if (fileSizeValid()) {
-            receiveFile(file.fileId, false)
+            receiveFile(file.fileId)
           } else {
             AlertManager.shared.showAlertMsg(
               generalGetString(MR.strings.large_file),

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

@@ -31,7 +31,7 @@ fun CIImageView(
   file: CIFile?,
   imageProvider: () -> ImageGalleryProvider,
   showMenu: MutableState<Boolean>,
-  receiveFile: (Long, Boolean) -> Unit
+  receiveFile: (Long) -> Unit
 ) {
   @Composable
   fun progressIndicator() {
@@ -152,8 +152,7 @@ fun CIImageView(
           when (file.fileStatus) {
             CIFileStatus.RcvInvitation ->
               if (fileSizeValid()) {
-                // TODO encrypt image
-                receiveFile(file.fileId, false)
+                receiveFile(file.fileId)
               } else {
                 AlertManager.shared.showAlertMsg(
                   generalGetString(MR.strings.large_file),

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

@@ -31,7 +31,7 @@ fun CIVideoView(
   file: CIFile?,
   imageProvider: () -> ImageGalleryProvider,
   showMenu: MutableState<Boolean>,
-  receiveFile: (Long, Boolean) -> Unit
+  receiveFile: (Long) -> Unit
 ) {
   Box(
     Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID),
@@ -54,7 +54,7 @@ fun CIVideoView(
           if (file != null) {
             when (file.fileStatus) {
               CIFileStatus.RcvInvitation ->
-                receiveFileIfValidSize(file, encrypted = false, receiveFile)
+                receiveFileIfValidSize(file, receiveFile)
               CIFileStatus.RcvAccepted ->
                 when (file.fileProtocol) {
                   FileProtocol.XFTP ->
@@ -80,7 +80,7 @@ fun CIVideoView(
           DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
         }
         if (file?.fileStatus is CIFileStatus.RcvInvitation) {
-          PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, encrypted = false, receiveFile) }
+          PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, receiveFile) }
         }
       }
     }
@@ -301,9 +301,9 @@ private fun fileSizeValid(file: CIFile?): Boolean {
   return false
 }
 
-private fun receiveFileIfValidSize(file: CIFile, encrypted: Boolean, receiveFile: (Long, Boolean) -> Unit) {
+private fun receiveFileIfValidSize(file: CIFile, receiveFile: (Long) -> Unit) {
   if (fileSizeValid(file)) {
-    receiveFile(file.fileId, encrypted)
+    receiveFile(file.fileId)
   } else {
     AlertManager.shared.showAlertMsg(
       generalGetString(MR.strings.large_file),

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

@@ -37,19 +37,18 @@ fun CIVoiceView(
   ci: ChatItem,
   timedMessagesTTL: Int?,
   longClick: () -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
 ) {
   Row(
     Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = if (hasText) 6.dp else 0.dp, end = if (hasText) 6.dp else 0.dp),
     verticalAlignment = Alignment.CenterVertically
   ) {
     if (file != null) {
-      val f = file.fileSource?.filePath
-      val filePath = remember(f, file.fileStatus) { getLoadedFilePath(file) }
-      var brokenAudio by rememberSaveable(f) { mutableStateOf(false) }
-      val audioPlaying = rememberSaveable(f) { mutableStateOf(false) }
-      val progress = rememberSaveable(f) { mutableStateOf(0) }
-      val duration = rememberSaveable(f) { mutableStateOf(providedDurationSec * 1000) }
+      val filePath = remember(file.filePath, file.fileStatus) { getLoadedFilePath(file) }
+      var brokenAudio by rememberSaveable(file.filePath) { mutableStateOf(false) }
+      val audioPlaying = rememberSaveable(file.filePath) { mutableStateOf(false) }
+      val progress = rememberSaveable(file.filePath) { mutableStateOf(0) }
+      val duration = rememberSaveable(file.filePath) { mutableStateOf(providedDurationSec * 1000) }
       val play = {
         AudioPlayer.play(filePath, audioPlaying, progress, duration, true)
         brokenAudio = !audioPlaying.value
@@ -95,7 +94,7 @@ private fun VoiceLayout(
   play: () -> Unit,
   pause: () -> Unit,
   longClick: () -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
   onProgressChanged: (Int) -> Unit,
 ) {
   @Composable
@@ -249,7 +248,7 @@ private fun VoiceMsgIndicator(
   play: () -> Unit,
   pause: () -> Unit,
   longClick: () -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
 ) {
   val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
   val strokeColor = MaterialTheme.colors.primary
@@ -269,8 +268,7 @@ private fun VoiceMsgIndicator(
     }
   } else {
     if (file?.fileStatus is CIFileStatus.RcvInvitation) {
-      // TODO encrypt voice
-      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, true, error, { receiveFile(file.fileId, false) }, {}, longClick = longClick)
+      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, true, error, { receiveFile(file.fileId) }, {}, longClick = longClick)
     } else if (file?.fileStatus is CIFileStatus.RcvTransfer
       || file?.fileStatus is CIFileStatus.RcvAccepted
     ) {

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

@@ -48,7 +48,7 @@ fun ChatItemView(
   useLinkPreviews: Boolean,
   linkMode: SimplexLinkMode,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
   cancelFile: (Long) -> Unit,
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
@@ -566,7 +566,7 @@ fun PreviewChatItemView() {
       linkMode = SimplexLinkMode.DESCRIPTION,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       deleteMessage = { _, _ -> },
-      receiveFile = { _, _ -> },
+      receiveFile = {},
       cancelFile = {},
       joinGroup = {},
       acceptCall = { _ -> },
@@ -595,7 +595,7 @@ fun PreviewChatItemViewDeletedContent() {
       linkMode = SimplexLinkMode.DESCRIPTION,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       deleteMessage = { _, _ -> },
-      receiveFile = { _, _ -> },
+      receiveFile = {},
       cancelFile = {},
       joinGroup = {},
       acceptCall = { _ -> },

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

@@ -36,7 +36,7 @@ fun FramedItemView(
   imageProvider: (() -> ImageGalleryProvider)? = null,
   linkMode: SimplexLinkMode,
   showMenu: MutableState<Boolean>,
-  receiveFile: (Long, Boolean) -> Unit,
+  receiveFile: (Long) -> Unit,
   onLinkLongClick: (link: String) -> Unit = {},
   scrollToItem: (Long) -> Unit = {},
 ) {

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

@@ -1,9 +1,7 @@
 package chat.simplex.common.views.database
 
 import SectionBottomSpacer
-import SectionItemView
 import SectionItemViewSpaceBetween
-import SectionTextFooter
 import SectionView
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -24,13 +22,11 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
+import chat.simplex.common.platform.appPlatform
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.model.*
-import chat.simplex.common.platform.appPlatform
 import chat.simplex.res.MR
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.datetime.Clock
@@ -40,7 +36,7 @@ import kotlin.math.log2
 fun DatabaseEncryptionView(m: ChatModel) {
   val progressIndicator = remember { mutableStateOf(false) }
   val prefs = m.controller.appPrefs
-  val useKeychain = remember { mutableStateOf(prefs.storeDBPassphrase.get()) }
+  val useKeychain = remember { prefs.storeDBPassphrase.state }
   val initialRandomDBPassphrase = remember { mutableStateOf(prefs.initialRandomDBPassphrase.get()) }
   val storedKey = remember { val key = DatabaseUtils.ksDatabasePassword.get(); mutableStateOf(key != null && key != "") }
   // Do not do rememberSaveable on current key to prevent saving it on disk in clear text
@@ -63,7 +59,15 @@ fun DatabaseEncryptionView(m: ChatModel) {
       progressIndicator,
       onConfirmEncrypt = {
         withApi {
-          encryptDatabase(currentKey, newKey, confirmNewKey, initialRandomDBPassphrase, useKeychain, storedKey, progressIndicator)
+          val disableStoring = appPlatform.isDesktop && initialRandomDBPassphrase.value
+          if (disableStoring) {
+            prefs.storeDBPassphrase.set(false)
+          }
+          val success = encryptDatabase(currentKey, newKey, confirmNewKey, initialRandomDBPassphrase, useKeychain, storedKey, progressIndicator)
+          if (!success && disableStoring) {
+            // Rollback in case of it is finished with error in order to allow to repeat the process again
+            prefs.storeDBPassphrase.set(true)
+          }
         }
       }
     )
@@ -86,7 +90,7 @@ fun DatabaseEncryptionView(m: ChatModel) {
 
 @Composable
 fun DatabaseEncryptionLayout(
-  useKeychain: MutableState<Boolean>,
+  useKeychain: State<Boolean>,
   prefs: AppPreferences,
   chatDbEncrypted: Boolean?,
   currentKey: MutableState<String>,
@@ -104,15 +108,15 @@ fun DatabaseEncryptionLayout(
     SectionView(null) {
       SavePassphraseSetting(useKeychain.value, initialRandomDBPassphrase.value, storedKey.value, progressIndicator.value) { checked ->
         if (checked) {
-          setUseKeychain(true, useKeychain, prefs)
+          setUseKeychain(true, prefs)
         } else if (storedKey.value) {
           removePassphraseAlert {
             DatabaseUtils.ksDatabasePassword.remove()
-            setUseKeychain(false, useKeychain, prefs)
+            setUseKeychain(false, prefs)
             storedKey.value = false
           }
         } else {
-          setUseKeychain(false, useKeychain, prefs)
+          setUseKeychain(false, prefs)
         }
       }
 
@@ -135,15 +139,16 @@ fun DatabaseEncryptionLayout(
         keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
       )
       val onClickUpdate = {
+        val disableStoring = appPlatform.isDesktop && initialRandomDBPassphrase.value
         // Don't do things concurrently. Shouldn't be here concurrently, just in case
         if (!progressIndicator.value) {
           if (currentKey.value == "") {
-            if (useKeychain.value)
+            if (useKeychain.value && !disableStoring)
               encryptDatabaseSavedAlert(onConfirmEncrypt)
             else
               encryptDatabaseAlert(onConfirmEncrypt)
           } else {
-            if (useKeychain.value)
+            if (useKeychain.value && !disableStoring)
               changeDatabaseKeySavedAlert(onConfirmEncrypt)
             else
               changeDatabaseKeyAlert(onConfirmEncrypt)
@@ -218,7 +223,7 @@ expect fun SavePassphraseSetting(
 
 @Composable
 expect fun DatabaseEncryptionFooter(
-  useKeychain: MutableState<Boolean>,
+  useKeychain: State<Boolean>,
   chatDbEncrypted: Boolean?,
   storedKey: MutableState<Boolean>,
   initialRandomDBPassphrase: MutableState<Boolean>,
@@ -242,8 +247,7 @@ fun resetFormAfterEncryption(
   storedKey.value = stored
 }
 
-fun setUseKeychain(value: Boolean, useKeychain: MutableState<Boolean>, prefs: AppPreferences) {
-  useKeychain.value = value
+fun setUseKeychain(value: Boolean, prefs: AppPreferences) {
   prefs.storeDBPassphrase.set(value)
 }
 
@@ -361,7 +365,7 @@ suspend fun encryptDatabase(
   newKey: MutableState<String>,
   confirmNewKey: MutableState<String>,
   initialRandomDBPassphrase: MutableState<Boolean>,
-  useKeychain: MutableState<Boolean>,
+  useKeychain: State<Boolean>,
   storedKey: MutableState<Boolean>,
   progressIndicator: MutableState<Boolean>
 ): Boolean {

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

@@ -39,6 +39,7 @@ fun DatabaseView(
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
 ) {
   val progressIndicator = remember { mutableStateOf(false) }
+  val runChat = remember { m.chatRunning }
   val prefs = m.controller.appPrefs
   val useKeychain = remember { mutableStateOf(prefs.storeDBPassphrase.get()) }
   val chatArchiveName = remember { mutableStateOf(prefs.chatArchiveName.get()) }
@@ -59,19 +60,21 @@ fun DatabaseView(
       importArchiveAlert(m, to, appFilesCountAndSize, progressIndicator)
     }
   }
+  LaunchedEffect(m.chatRunning) {
+    runChat.value = m.chatRunning.value ?: true
+  }
   val chatItemTTL = remember { mutableStateOf(m.chatItemTTL.value) }
   Box(
     Modifier.fillMaxSize(),
   ) {
     DatabaseLayout(
       progressIndicator.value,
-      remember { m.chatRunning }.value != false,
+      runChat.value != false,
       m.chatDbChanged.value,
       useKeychain.value,
       m.chatDbEncrypted.value,
       m.controller.appPrefs.storeDBPassphrase.state.value,
       m.controller.appPrefs.initialRandomDBPassphrase,
-      m.controller.appPrefs.developerTools.state.value,
       importArchiveLauncher,
       chatArchiveName,
       chatArchiveTime,
@@ -80,8 +83,8 @@ fun DatabaseView(
       chatItemTTL,
       m.currentUser.value,
       m.users,
-      startChat = { startChat(m, chatLastStart, m.chatDbChanged) },
-      stopChatAlert = { stopChatAlert(m) },
+      startChat = { startChat(m, runChat, chatLastStart, m.chatDbChanged) },
+      stopChatAlert = { stopChatAlert(m, runChat) },
       exportArchive = { exportArchive(m, progressIndicator, chatArchiveName, chatArchiveTime, chatArchiveFile, saveArchiveLauncher) },
       deleteChatAlert = { deleteChatAlert(m, progressIndicator) },
       deleteAppFilesAndMedia = { deleteFilesAndMediaAlert(appFilesCountAndSize) },
@@ -122,7 +125,6 @@ fun DatabaseLayout(
   chatDbEncrypted: Boolean?,
   passphraseSaved: Boolean,
   initialRandomDBPassphrase: SharedPreference<Boolean>,
-  developerTools: Boolean,
   importArchiveLauncher: FileChooserLauncher,
   chatArchiveName: MutableState<String?>,
   chatArchiveTime: MutableState<Instant?>,
@@ -185,14 +187,6 @@ fun DatabaseLayout(
         iconColor = if (unencrypted || (appPlatform.isDesktop && passphraseSaved)) WarningOrange else MaterialTheme.colors.secondary,
         disabled = operationsDisabled
       )
-      if (appPlatform.isDesktop && developerTools) {
-        SettingsActionItem(
-          painterResource(MR.images.ic_folder_open),
-          stringResource(MR.strings.open_database_folder),
-          ::desktopOpenDatabaseDir,
-          disabled = operationsDisabled
-        )
-      }
       SettingsActionItem(
         painterResource(MR.images.ic_ios_share),
         stringResource(MR.strings.export_database),
@@ -335,7 +329,7 @@ fun chatArchiveTitle(chatArchiveTime: Instant, chatLastStart: Instant): String {
   return stringResource(if (chatArchiveTime < chatLastStart) MR.strings.old_database_archive else MR.strings.new_database_archive)
 }
 
-private fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
+private fun startChat(m: ChatModel, runChat: MutableState<Boolean?>, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
   withApi {
     try {
       if (chatDbChanged.value) {
@@ -352,6 +346,7 @@ private fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatD
         return@withApi
       } else {
         m.controller.apiStartChat()
+        runChat.value = true
         m.chatRunning.value = true
       }
       val ts = Clock.System.now()
@@ -359,19 +354,19 @@ private fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatD
       chatLastStart.value = ts
       platform.androidChatStartedAfterBeingOff()
     } catch (e: Error) {
-      m.chatRunning.value = false
+      runChat.value = false
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_starting_chat), e.toString())
     }
   }
 }
 
-private fun stopChatAlert(m: ChatModel) {
+private fun stopChatAlert(m: ChatModel, runChat: MutableState<Boolean?>) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(MR.strings.stop_chat_question),
     text = generalGetString(MR.strings.stop_chat_to_export_import_or_delete_chat_database),
     confirmText = generalGetString(MR.strings.stop_chat_confirmation),
-    onConfirm = { authStopChat(m) },
-    onDismiss = { m.chatRunning.value = true }
+    onConfirm = { authStopChat(m, runChat) },
+    onDismiss = { runChat.value = true }
   )
 }
 
@@ -382,7 +377,7 @@ private fun exportProhibitedAlert() {
   )
 }
 
-private fun authStopChat(m: ChatModel) {
+private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean?>) {
   if (m.controller.appPrefs.performLA.get()) {
     authenticate(
       generalGetString(MR.strings.auth_stop_chat),
@@ -390,29 +385,30 @@ private fun authStopChat(m: ChatModel) {
       completed = { laResult ->
         when (laResult) {
           LAResult.Success, is LAResult.Unavailable -> {
-            stopChat(m)
+            stopChat(m, runChat)
           }
           is LAResult.Error -> {
-            m.chatRunning.value = true
+            runChat.value = true
           }
           is LAResult.Failed -> {
-            m.chatRunning.value = true
+            runChat.value = true
           }
         }
       }
     )
   } else {
-    stopChat(m)
+    stopChat(m, runChat)
   }
 }
 
-private fun stopChat(m: ChatModel) {
+private fun stopChat(m: ChatModel, runChat: MutableState<Boolean?>) {
   withApi {
     try {
+      runChat.value = false
       stopChatAsync(m)
       platform.androidChatStopped()
     } catch (e: Error) {
-      m.chatRunning.value = true
+      runChat.value = true
       AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_stopping_chat), e.toString())
     }
   }
@@ -665,7 +661,6 @@ fun PreviewDatabaseLayout() {
       chatDbEncrypted = false,
       passphraseSaved = false,
       initialRandomDBPassphrase = SharedPreference({ true }, {}),
-      developerTools = true,
       importArchiveLauncher = rememberFileChooserLauncher(true) {},
       chatArchiveName = remember { mutableStateOf("dummy_archive") },
       chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },

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

@@ -32,7 +32,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun DefaultBasicTextField(
   modifier: Modifier,
-  state: MutableState<TextFieldValue>,
+  initialValue: String,
   placeholder: (@Composable () -> Unit)? = null,
   leadingIcon: (@Composable () -> Unit)? = null,
   focus: Boolean = false,
@@ -41,8 +41,11 @@ fun DefaultBasicTextField(
   selectTextOnFocus: Boolean = false,
   keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
   keyboardActions: KeyboardActions = KeyboardActions(),
-  onValueChange: (TextFieldValue) -> Unit,
+  onValueChange: (String) -> Unit,
 ) {
+  val state = remember {
+    mutableStateOf(TextFieldValue(initialValue))
+  }
   val focusRequester = remember { FocusRequester() }
   val keyboard = LocalSoftwareKeyboardController.current
 
@@ -80,7 +83,8 @@ fun DefaultBasicTextField(
         minHeight = TextFieldDefaults.MinHeight
       ),
     onValueChange = {
-      onValueChange(it)
+      state.value = it
+      onValueChange(it.text)
     },
     cursorBrush = SolidColor(colors.cursorColor(false).value),
     visualTransformation = VisualTransformation.None,

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

@@ -8,9 +8,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.LayoutDirection
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
@@ -114,22 +111,13 @@ class ModalManager(private val placement: ModalPlacement? = null) {
       modalViews.lastOrNull()?.second?.invoke(::closeModal)
       return
     }
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
     AnimatedContent(targetState = modalCount.value,
       transitionSpec = {
-        if (isRtl) {
-          if (targetState < initialState) {
-            fromStartToEndTransition()
-          } else {
-            fromStartToEndTransition().using(SizeTransform(clip = true) { _, target -> spring(visibilityThreshold = target) })
-          }
+        if (targetState > initialState) {
+          fromEndToStartTransition()
         } else {
-          if (targetState > initialState) {
-            fromEndToStartTransition()
-          } else {
-            fromStartToEndTransition()
-          }.using(SizeTransform(clip = false))
-        }
+          fromStartToEndTransition()
+        }.using(SizeTransform(clip = false))
       }
     ) {
       modalViews.getOrNull(it - 1)?.second?.invoke(::closeModal)

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

@@ -95,13 +95,12 @@ fun getThemeFromUri(uri: URI, withAlertOnException: Boolean = true): ThemeOverri
   return null
 }
 
-fun saveImage(uri: URI): CryptoFile? {
+fun saveImage(uri: URI): String? {
   val bitmap = getBitmapFromUri(uri) ?: return null
   return saveImage(bitmap)
 }
 
-fun saveImage(image: ImageBitmap): CryptoFile? {
-  // TODO encrypt image
+fun saveImage(image: ImageBitmap): String? {
   return try {
     val ext = if (image.hasAlpha()) "png" else "jpg"
     val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
@@ -111,15 +110,14 @@ fun saveImage(image: ImageBitmap): CryptoFile? {
     dataResized.writeTo(output)
     output.flush()
     output.close()
-    CryptoFile.plain(fileToSave)
+    fileToSave
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt saveImage error: ${e.stackTraceToString()}")
     null
   }
 }
 
-fun saveAnimImage(uri: URI): CryptoFile? {
-  // TODO encrypt image
+fun saveAnimImage(uri: URI): String? {
   return try {
     val filename = getFileName(uri)?.lowercase()
     var ext = when {
@@ -137,7 +135,7 @@ fun saveAnimImage(uri: URI): CryptoFile? {
         input?.copyTo(output)
       }
     }
-    CryptoFile.plain(fileToSave)
+    fileToSave
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt saveAnimImage error: ${e.message}")
     null
@@ -146,16 +144,15 @@ fun saveAnimImage(uri: URI): CryptoFile? {
 
 expect suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean): File?
 
-fun saveFileFromUri(uri: URI, encrypted: Boolean): CryptoFile? {
+fun saveFileFromUri(uri: URI): String? {
   return try {
     val inputStream = uri.inputStream()
     val fileToSave = getFileName(uri)
-    // TODO encrypt file if "encrypted" is true
     if (inputStream != null && fileToSave != null) {
       val destFileName = uniqueCombine(fileToSave)
       val destFile = File(getAppFilePath(destFileName))
       Files.copy(inputStream, destFile.toPath())
-      CryptoFile.plain(destFileName)
+      destFileName
     } else {
       Log.e(TAG, "Util.kt saveFileFromUri null inputStream")
       null

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

@@ -126,7 +126,7 @@ private fun ContactConnectionInfoLayout(
     )
 
     if (contactConnection.groupLinkId == null) {
-      LocalAliasEditor(contactConnection.id, contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
+      LocalAliasEditor(contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
     }
 
     SectionView {

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

@@ -201,15 +201,12 @@ object AppearanceScope {
     val supportedLanguages = mapOf(
       "system" to generalGetString(MR.strings.language_system),
       "en" to "English",
-      "ar" to "العربية",
       "bg" to "Български",
       "cs" to "Čeština",
       "de" to "Deutsch",
       "es" to "Español",
-      "fi" to "Suomi",
       "fr" to "Français",
       "it" to "Italiano",
-      "iw" to "עִברִית",
       "ja" to "日本語",
       "nl" to "Nederlands",
       "pl" to "Polski",

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

@@ -944,7 +944,6 @@
   <string name="import_database">Import database</string>
   <string name="new_database_archive">New database archive</string>
   <string name="old_database_archive">Old database archive</string>
-  <string name="open_database_folder">Open database folder</string>
   <string name="delete_database">Delete database</string>
   <string name="error_starting_chat">Error starting chat</string>
   <string name="stop_chat_question">Stop chat?</string>

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/model/NtfManager.desktop.kt

@@ -104,11 +104,7 @@ object NtfManager {
     actions.forEach {
       builder.action(it.first, it.second)
     }
-    try {
-      prevNtfs.add(chatId to builder.toast())
-    } catch (e: Exception) {
-      Log.e(TAG, e.stackTraceToString())
-    }
+    prevNtfs.add(chatId to builder.toast())
   }
 
   private fun prepareIconPath(icon: ImageBitmap?): String? = if (icon != null) {

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Files.desktop.kt

@@ -2,10 +2,8 @@ package chat.simplex.common.platform
 
 import androidx.compose.runtime.*
 import chat.simplex.common.*
-import chat.simplex.common.views.helpers.AlertManager
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
-import java.awt.Desktop
 import java.io.*
 import java.net.URI
 
@@ -21,20 +19,6 @@ actual val agentDatabaseFileName: String = "simplex_v1_agent.db"
 
 actual val databaseExportDir: File = tmpDir
 
-actual fun desktopOpenDatabaseDir() {
-  if (Desktop.isDesktopSupported()) {
-    try {
-      Desktop.getDesktop().open(dataDir);
-    } catch (e: IOException) {
-      Log.e(TAG, e.stackTraceToString())
-      AlertManager.shared.showAlertMsg(
-        title = generalGetString(MR.strings.unknown_error),
-        text = e.stackTraceToString()
-      )
-    }
-  }
-}
-
 @Composable
 actual fun rememberFileChooserLauncher(getContent: Boolean, rememberedValue: Any?, onResult: (URI?) -> Unit): FileChooserLauncher =
   remember(rememberedValue) { FileChooserLauncher(getContent, onResult) }

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.desktop.kt

@@ -4,8 +4,7 @@ import SectionItemView
 import SectionTextFooter
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -51,7 +50,7 @@ actual fun SavePassphraseSetting(
 
 @Composable
 actual fun DatabaseEncryptionFooter(
-  useKeychain: MutableState<Boolean>,
+  useKeychain: State<Boolean>,
   chatDbEncrypted: Boolean?,
   storedKey: MutableState<Boolean>,
   initialRandomDBPassphrase: MutableState<Boolean>,

cabal.project

@@ -9,7 +9,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 351f42650c57f310fc1ea858ff9b7178823f1fd4
+    tag: 980e5c4d1ec15f44290542fd2a5d1c08456f00d1
 
 source-repository-package
     type: git

docs/protocol/diagrams/group.mmd

@@ -3,31 +3,24 @@ sequenceDiagram
   participant A as Alice
   participant B as Bob
   participant C as Existing<br>contact
-
+  
   note over A, B: 1. send and accept group invitation
   A ->> B: x.grp.inv<br>invite Bob to group<br>(via contact connection)
-  B ->> A: x.grp.acpt<br>accept invitation<br>(via member connection)<br>establish group member connection
+  B ->> A: x.grp.acpt<br>accept invitation<br>(via member connection)
+  B ->> A: establish group member connection
 
   note over M, B: 2. introduce new member Bob to all existing members
   A ->> M: x.grp.mem.new<br>"announce" Bob<br>to existing members<br>(via member connections)
-  loop batched
-    A ->> B: x.grp.mem.intro * N<br>"introduce" members and<br>their chat protocol versions<br>(via member connection)
-    note over B: prepare group member connections
-    opt chat protocol compatible version < 2
-      note over B: prepare direct connections
-    end
-    B ->> A: x.grp.mem.inv * N<br>"invitations" to connect<br>for all members<br>(via member connection)
-  end
-  A ->> M: x.grp.mem.fwd<br>forward "invitations" and<br>Bob's chat protocol version<br>to all members<br>(via member connections)
+  A ->> B: x.grp.mem.intro * N<br>"introduce" members<br>(via member connection)
+  B ->> A: x.grp.mem.inv * N<br>"invitations" to connect<br>for all members<br>(via member connection)
+  A ->> M: x.grp.mem.fwd<br>forward "invitations"<br>to all members<br>(via member connections)
 
   note over M, B: 3. establish direct and group member connections
   M ->> B: establish group member connection
+  M ->> B: establish direct connection
 
-  opt chat protocol compatible version < 2
-    M ->> B: establish direct connection
-    note over M, C: 4. deduplicate new contact
-    B ->> M: x.info.probe<br>"probe" is sent to all new members
-    B ->> C: x.info.probe.check<br>"probe" hash,<br>in case contact and<br>member profiles match
-    C ->> B: x.info.probe.ok<br> original "probe",<br> in case contact and member<br>are the same user
-    note over B: merge existing and new contacts if received and sent probe hashes match
-  end
+  note over M, C: 4. deduplicate new contact
+  B ->> M: x.info.probe<br>"probe" is sent to all new members
+  B ->> C: x.info.probe.check<br>"probe" hash,<br>in case contact and<br>member profiles match
+  C ->> B: x.info.probe.ok<br> original "probe",<br> in case contact and member<br>are the same user
+  note over B: merge existing and new contacts if received and sent probe hashes match

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."351f42650c57f310fc1ea858ff9b7178823f1fd4" = "12r13yc0qk9dkii58808862wraqrk66rzmkrgyp6lg1xrazrd0d2";
+  "https://github.com/simplex-chat/simplexmq.git"."980e5c4d1ec15f44290542fd2a5d1c08456f00d1" = "1lqciyy215dvmbhykyp80bwipqmxybv39p6jff6vjgd5r34958nh";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/kazu-yamamoto/http2.git"."b5a1b7200cf5bc7044af34ba325284271f6dff25" = "0dqb50j57an64nf4qcf5vcz4xkd1vzvghvf8bk529c1k30r9nfzb";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."34309410eb2069b029b8fc1872deb1e0db123294" = "0kwkmhyfsn2lixdlgl15smgr1h5gjk7fky6abzh8rng2h5ymnffd";

simplex-chat.cabal

@@ -109,7 +109,6 @@ library
       Simplex.Chat.Migrations.M20230721_group_snd_item_statuses
       Simplex.Chat.Migrations.M20230814_indexes
       Simplex.Chat.Migrations.M20230827_file_encryption
-      Simplex.Chat.Migrations.M20230829_connections_chat_vrange
       Simplex.Chat.Mobile
       Simplex.Chat.Mobile.File
       Simplex.Chat.Mobile.Shared

src/Simplex/Chat.hs

@@ -94,7 +94,6 @@ import qualified Simplex.Messaging.Protocol as SMP
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport.Client (defaultSocksProxy)
 import Simplex.Messaging.Util
-import Simplex.Messaging.Version
 import System.Exit (exitFailure, exitSuccess)
 import System.FilePath (combine, splitExtensions, takeFileName, (</>))
 import System.IO (Handle, IOMode (..), SeekMode (..), hFlush, stdout)
@@ -114,7 +113,6 @@ defaultChatConfig =
           { tcpPort = undefined, -- agent does not listen to TCP
             tbqSize = 1024
           },
-      chatVRange = supportedChatVRange,
       confirmMigrations = MCConsole,
       defaultServers =
         DefaultAgentServers
@@ -1298,8 +1296,7 @@ processChatCommand = \case
     -- [incognito] generate profile to send
     incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
     let profileToSend = userProfileToSend user incognitoProfile Nothing
-    dm <- directMessage $ XInfo profileToSend
-    connId <- withAgent $ \a -> joinConnection a (aUserId user) True cReq dm
+    connId <- withAgent $ \a -> joinConnection a (aUserId user) True cReq . directMessage $ XInfo profileToSend
     conn <- withStore' $ \db -> createDirectConnection db user connId cReq ConnJoined $ incognitoProfile $> profileToSend
     toView $ CRNewContactConnection user conn
     pure $ CRSentConfirmation user
@@ -1437,16 +1434,11 @@ processChatCommand = \case
             Nothing -> throwChatError $ CEGroupCantResendInvitation gInfo cName
         | otherwise -> throwChatError $ CEGroupDuplicateMember cName
   APIJoinGroup groupId -> withUser $ \user@User {userId} -> do
-    (invitation, ct) <- withStore $ \db -> do
-      inv@ReceivedGroupInvitation {fromMember} <- getGroupInvitation db user groupId
-      (inv,) <$> getContactViaMember db user fromMember
-    let ReceivedGroupInvitation {fromMember, connRequest, groupInfo = g@GroupInfo {membership}} = invitation
-        Contact {activeConn = Connection {peerChatVRange}} = ct
+    ReceivedGroupInvitation {fromMember, connRequest, groupInfo = g@GroupInfo {membership}} <- withStore $ \db -> getGroupInvitation db user groupId
     withChatLock "joinGroup" . procCmd $ do
-      dm <- directMessage $ XGrpAcpt (memberId (membership :: GroupMember))
-      agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest dm
+      agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest . directMessage $ XGrpAcpt (memberId (membership :: GroupMember))
       withStore' $ \db -> do
-        createMemberConnection db userId fromMember agentConnId peerChatVRange
+        createMemberConnection db userId fromMember agentConnId
         updateGroupMemberStatus db userId fromMember GSMemAccepted
         updateGroupMemberStatus db userId membership GSMemAccepted
       updateCIGroupInvitationStatus user
@@ -1848,8 +1840,7 @@ processChatCommand = \case
           -- [incognito] generate profile to send
           incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
           let profileToSend = userProfileToSend user incognitoProfile Nothing
-          dm <- directMessage (XContact profileToSend $ Just xContactId)
-          connId <- withAgent $ \a -> joinConnection a (aUserId user) True cReq dm
+          connId <- withAgent $ \a -> joinConnection a (aUserId user) True cReq $ directMessage (XContact profileToSend $ Just xContactId)
           let groupLinkId = crClientData >>= decodeJSON >>= \(CRDataGroup gli) -> Just gli
           conn <- withStore' $ \db -> createConnReqConnection db userId connId cReqHash xContactId incognitoProfile groupLinkId
           toView $ CRNewContactConnection user conn
@@ -1866,7 +1857,7 @@ processChatCommand = \case
       xftpCfg <- readTVarIO =<< asks userXFTPFileConfig
       fileSize <- liftIO $ CF.getFileContentsSize $ CryptoFile fsFilePath cfArgs
       when (fromInteger fileSize > maxFileSize) $ throwChatError $ CEFileSize f
-      let chunks = - ((- fileSize) `div` fileChunkSize)
+      let chunks = -((-fileSize) `div` fileChunkSize)
           fileInline = inlineFileMode mc inlineFiles chunks n
           fileMode = case xftpCfg of
             Just cfg
@@ -2240,7 +2231,7 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
   case (xftpRcvFile, fileConnReq) of
     -- direct file protocol
     (Nothing, Just connReq) -> do
-      connIds <- joinAgentConnectionAsync user True connReq =<< directMessage (XFileAcpt fName)
+      connIds <- joinAgentConnectionAsync user True connReq . directMessage $ XFileAcpt fName
       filePath <- getRcvFilePath fileId filePath_ fName True
       withStoreCtx (Just "acceptFileReceive, acceptRcvFileTransfer") $ \db -> acceptRcvFileTransfer db user fileId connIds ConnJoined filePath
     -- XFTP
@@ -2355,18 +2346,17 @@ getRcvFilePath fileId fPath_ fn keepHandle = case fPath_ of
            in ifM (doesFileExist f) (tryCombine $ n + 1) (pure f)
 
 acceptContactRequest :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> m Contact
-acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = cp, userContactLinkId, xContactId} incognitoProfile = do
+acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId invId, localDisplayName = cName, profileId, profile = cp, userContactLinkId, xContactId} incognitoProfile = do
   let profileToSend = profileToSendOnAccept user incognitoProfile
-  dm <- directMessage $ XInfo profileToSend
-  acId <- withAgent $ \a -> acceptContact a True invId dm
-  withStore' $ \db -> createAcceptedContact db user acId cReqChatVRange cName profileId cp userContactLinkId xContactId incognitoProfile
+  acId <- withAgent $ \a -> acceptContact a True invId . directMessage $ XInfo profileToSend
+  withStore' $ \db -> createAcceptedContact db user acId cName profileId cp userContactLinkId xContactId incognitoProfile
 
 acceptContactRequestAsync :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> m Contact
-acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile = do
+acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvId invId, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile = do
   let profileToSend = profileToSendOnAccept user incognitoProfile
   (cmdId, acId) <- agentAcceptContactAsync user True invId $ XInfo profileToSend
   withStore' $ \db -> do
-    ct@Contact {activeConn = Connection {connId}} <- createAcceptedContact db user acId cReqChatVRange cName profileId p userContactLinkId xContactId incognitoProfile
+    ct@Contact {activeConn = Connection {connId}} <- createAcceptedContact db user acId cName profileId p userContactLinkId xContactId incognitoProfile
     setCommandConnId db user cmdId connId
     pure ct
 
@@ -2566,7 +2556,7 @@ cleanupManager = do
           `catchChatError` (toView . CRChatError (Just user))
     cleanupMessages = do
       ts <- liftIO getCurrentTime
-      let cutoffTs = addUTCTime (- (30 * nominalDay)) ts
+      let cutoffTs = addUTCTime (-(30 * nominalDay)) ts
       withStoreCtx' (Just "cleanupManager, deleteOldMessages") (`deleteOldMessages` cutoffTs)
 
 startProximateTimedItemThread :: ChatMonad m => User -> (ChatRef, ChatItemId) -> UTCTime -> m ()
@@ -2850,23 +2840,21 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       _ -> Nothing
 
     processDirectMessage :: ACommand 'Agent e -> ConnectionEntity -> Connection -> Maybe Contact -> m ()
-    processDirectMessage agentMsg connEntity conn@Connection {connId, peerChatVRange, viaUserContactLink, groupLinkId, customUserProfileId, connectionCode} = \case
+    processDirectMessage agentMsg connEntity conn@Connection {connId, viaUserContactLink, groupLinkId, customUserProfileId, connectionCode} = \case
       Nothing -> case agentMsg of
         CONF confId _ connInfo -> do
           -- [incognito] send saved profile
           incognitoProfile <- forM customUserProfileId $ \profileId -> withStore (\db -> getProfileById db userId profileId)
           let profileToSend = userProfileToSend user (fromLocalProfile <$> incognitoProfile) Nothing
-          conn' <- saveConnInfo conn connInfo
+          saveConnInfo conn connInfo
           -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-          allowAgentConnectionAsync user conn' confId $ XInfo profileToSend
-        INFO connInfo -> do
-          _conn' <- saveConnInfo conn connInfo
-          pure ()
+          allowAgentConnectionAsync user conn confId $ XInfo profileToSend
+        INFO connInfo ->
+          saveConnInfo conn connInfo
         MSG meta _msgFlags msgBody -> do
           cmdId <- createAckCmd conn
-          withAckMessage agentConnId cmdId meta $ do
-            (_conn', _) <- saveRcvMSG conn (ConnectionId connId) meta msgBody cmdId
-            pure False
+          withAckMessage agentConnId cmdId meta $
+            saveRcvMSG conn (ConnectionId connId) meta msgBody cmdId $> False
         SENT msgId ->
           sentMsgDeliveryEvent conn msgId
         OK ->
@@ -2891,57 +2879,54 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                   setConnConnReqInv db user connId cReq
                   getXGrpMemIntroContDirect db user ct
                 forM_ contData $ \(hostConnId, xGrpMemIntroCont) ->
-                  sendXGrpMemInv hostConnId (Just directConnReq) xGrpMemIntroCont
+                  sendXGrpMemInv hostConnId directConnReq xGrpMemIntroCont
               CRContactUri _ -> throwChatError $ CECommandError "unexpected ConnectionRequestUri type"
         MSG msgMeta _msgFlags msgBody -> do
           cmdId <- createAckCmd conn
           withAckMessage agentConnId cmdId msgMeta $ do
-            (conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveRcvMSG conn (ConnectionId connId) msgMeta msgBody cmdId
-            let ct' = ct {activeConn = conn'} :: Contact
-            assertDirectAllowed user MDRcv ct' $ toCMEventTag event
+            msg@RcvMessage {chatMsgEvent = ACME _ event} <- saveRcvMSG conn (ConnectionId connId) msgMeta msgBody cmdId
+            assertDirectAllowed user MDRcv ct $ toCMEventTag event
             updateChatLock "directMessage" event
             case event of
-              XMsgNew mc -> newContentMessage ct' mc msg msgMeta
-              XMsgFileDescr sharedMsgId fileDescr -> messageFileDescription ct' sharedMsgId fileDescr msgMeta
-              XMsgFileCancel sharedMsgId -> cancelMessageFile ct' sharedMsgId msgMeta
-              XMsgUpdate sharedMsgId mContent ttl live -> messageUpdate ct' sharedMsgId mContent msg msgMeta ttl live
-              XMsgDel sharedMsgId _ -> messageDelete ct' sharedMsgId msg msgMeta
-              XMsgReact sharedMsgId _ reaction add -> directMsgReaction ct' sharedMsgId reaction add msg msgMeta
+              XMsgNew mc -> newContentMessage ct mc msg msgMeta
+              XMsgFileDescr sharedMsgId fileDescr -> messageFileDescription ct sharedMsgId fileDescr msgMeta
+              XMsgFileCancel sharedMsgId -> cancelMessageFile ct sharedMsgId msgMeta
+              XMsgUpdate sharedMsgId mContent ttl live -> messageUpdate ct sharedMsgId mContent msg msgMeta ttl live
+              XMsgDel sharedMsgId _ -> messageDelete ct sharedMsgId msg msgMeta
+              XMsgReact sharedMsgId _ reaction add -> directMsgReaction ct sharedMsgId reaction add msg msgMeta
               -- TODO discontinue XFile
-              XFile fInv -> processFileInvitation' ct' fInv msg msgMeta
-              XFileCancel sharedMsgId -> xFileCancel ct' sharedMsgId msgMeta
-              XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInv ct' sharedMsgId fileConnReq_ fName msgMeta
-              XInfo p -> xInfo ct' p
-              XGrpInv gInv -> processGroupInvitation ct' gInv msg msgMeta
-              XInfoProbe probe -> xInfoProbe ct' probe
-              XInfoProbeCheck probeHash -> xInfoProbeCheck ct' probeHash
-              XInfoProbeOk probe -> xInfoProbeOk ct' probe
-              XCallInv callId invitation -> xCallInv ct' callId invitation msg msgMeta
-              XCallOffer callId offer -> xCallOffer ct' callId offer msg msgMeta
-              XCallAnswer callId answer -> xCallAnswer ct' callId answer msg msgMeta
-              XCallExtra callId extraInfo -> xCallExtra ct' callId extraInfo msg msgMeta
-              XCallEnd callId -> xCallEnd ct' callId msg msgMeta
-              BFileChunk sharedMsgId chunk -> bFileChunk ct' sharedMsgId chunk msgMeta
+              XFile fInv -> processFileInvitation' ct fInv msg msgMeta
+              XFileCancel sharedMsgId -> xFileCancel ct sharedMsgId msgMeta
+              XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInv ct sharedMsgId fileConnReq_ fName msgMeta
+              XInfo p -> xInfo ct p
+              XGrpInv gInv -> processGroupInvitation ct gInv msg msgMeta
+              XInfoProbe probe -> xInfoProbe ct probe
+              XInfoProbeCheck probeHash -> xInfoProbeCheck ct probeHash
+              XInfoProbeOk probe -> xInfoProbeOk ct probe
+              XCallInv callId invitation -> xCallInv ct callId invitation msg msgMeta
+              XCallOffer callId offer -> xCallOffer ct callId offer msg msgMeta
+              XCallAnswer callId answer -> xCallAnswer ct callId answer msg msgMeta
+              XCallExtra callId extraInfo -> xCallExtra ct callId extraInfo msg msgMeta
+              XCallEnd callId -> xCallEnd ct callId msg msgMeta
+              BFileChunk sharedMsgId chunk -> bFileChunk ct sharedMsgId chunk msgMeta
               _ -> messageError $ "unsupported message: " <> T.pack (show event)
-            let Contact {chatSettings = ChatSettings {sendRcpts}} = ct'
+            let Contact {chatSettings = ChatSettings {sendRcpts}} = ct
             pure $ fromMaybe (sendRcptsContacts user) sendRcpts && hasDeliveryReceipt (toCMEventTag event)
         RCVD msgMeta msgRcpt ->
           withAckMessage' agentConnId conn msgMeta $
             directMsgReceived ct conn msgMeta msgRcpt
         CONF confId _ connInfo -> do
           -- confirming direct connection with a member
-          ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-          conn' <- updatePeerChatVRange conn chatVRange
+          ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
           case chatMsgEvent of
             XGrpMemInfo _memId _memProfile -> do
               -- TODO check member ID
               -- TODO update member profile
               -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-              allowAgentConnectionAsync user conn' confId XOk
+              allowAgentConnectionAsync user conn confId XOk
             _ -> messageError "CONF from member must have x.grp.mem.info"
         INFO connInfo -> do
-          ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-          _conn' <- updatePeerChatVRange conn chatVRange
+          ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
           case chatMsgEvent of
             XGrpMemInfo _memId _memProfile -> do
               -- TODO check member ID
@@ -2973,7 +2958,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                     forM_ groupId_ $ \groupId -> do
                       gVar <- asks idsDrg
                       groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpInv True SCMInvitation
-                      withStore $ \db -> createNewContactMemberAsync db gVar user groupId ct gLinkMemRole groupConnIds peerChatVRange
+                      withStore $ \db -> createNewContactMemberAsync db gVar user groupId ct gLinkMemRole groupConnIds
                   _ -> pure ()
             Just (gInfo@GroupInfo {membership}, m@GroupMember {activeConn}) ->
               when (maybe False ((== ConnReady) . connStatus) activeConn) $ do
@@ -3040,30 +3025,22 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           case cReq of
             groupConnReq@(CRInvitationUri _ _) -> case cmdFunction of
               -- [async agent commands] XGrpMemIntro continuation on receiving INV
-              CFCreateConnGrpMemInv
-                | isCompatibleRange (peerChatVRange conn) groupNoDirectVRange -> sendWithDirectCReq -- sendWithoutDirectCReq
-                | otherwise -> sendWithDirectCReq
-                where
-                  sendWithoutDirectCReq = do
-                    let GroupMember {groupMemberId, memberId} = m
-                    hostConnId <- withStore $ \db -> do
-                      liftIO $ setConnConnReqInv db user connId cReq
-                      getHostConnId db user groupId
-                    sendXGrpMemInv hostConnId Nothing XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq}
-                  sendWithDirectCReq = do
-                    let GroupMember {groupMemberId, memberId} = m
-                    contData <- withStore' $ \db -> do
-                      setConnConnReqInv db user connId cReq
-                      getXGrpMemIntroContGroup db user m
-                    forM_ contData $ \(hostConnId, directConnReq) ->
-                      sendXGrpMemInv hostConnId (Just directConnReq) XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq}
+              CFCreateConnGrpMemInv -> do
+                contData <- withStore' $ \db -> do
+                  setConnConnReqInv db user connId cReq
+                  getXGrpMemIntroContGroup db user m
+                forM_ contData $ \(hostConnId, directConnReq) -> do
+                  let GroupMember {groupMemberId, memberId} = m
+                  sendXGrpMemInv hostConnId directConnReq XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq}
               -- [async agent commands] group link auto-accept continuation on receiving INV
-              CFCreateConnGrpInv -> do
-                ct <- withStore $ \db -> getContactViaMember db user m
-                withStore' $ \db -> setNewContactMemberConnRequest db user m cReq
-                groupLinkId <- withStore' $ \db -> getGroupLinkId db user gInfo
-                sendGrpInvitation ct m groupLinkId
-                toView $ CRSentGroupInvitation user gInfo ct m
+              CFCreateConnGrpInv ->
+                withStore' (\db -> getContactViaMember db user m) >>= \case
+                  Nothing -> messageError "implementation error: invitee does not have contact"
+                  Just ct -> do
+                    withStore' $ \db -> setNewContactMemberConnRequest db user m cReq
+                    groupLinkId <- withStore' $ \db -> getGroupLinkId db user gInfo
+                    sendGrpInvitation ct m groupLinkId
+                    toView $ CRSentGroupInvitation user gInfo ct m
                 where
                   sendGrpInvitation :: Contact -> GroupMember -> Maybe GroupLinkId -> m ()
                   sendGrpInvitation ct GroupMember {memberId, memberRole = memRole} groupLinkId = do
@@ -3075,8 +3052,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
               _ -> throwChatError $ CECommandError "unexpected cmdFunction"
             CRContactUri _ -> throwChatError $ CECommandError "unexpected ConnectionRequestUri type"
       CONF confId _ connInfo -> do
-        ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-        conn' <- updatePeerChatVRange conn chatVRange
+        ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
         case memberCategory m of
           GCInviteeMember ->
             case chatMsgEvent of
@@ -3084,7 +3060,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                 | sameMemberId memId m -> do
                   withStore $ \db -> liftIO $ updateGroupMemberStatus db userId m GSMemAccepted
                   -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                  allowAgentConnectionAsync user conn' confId XOk
+                  allowAgentConnectionAsync user conn confId XOk
                 | otherwise -> messageError "x.grp.acpt: memberId is different from expected"
               _ -> messageError "CONF from invited member must have x.grp.acpt"
           _ ->
@@ -3093,12 +3069,11 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                 | sameMemberId memId m -> do
                   -- TODO update member profile
                   -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                  allowAgentConnectionAsync user conn' confId $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
+                  allowAgentConnectionAsync user conn confId $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
                 | otherwise -> messageError "x.grp.mem.info: memberId is different from expected"
               _ -> messageError "CONF from member must have x.grp.mem.info"
       INFO connInfo -> do
-        ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-        _conn' <- updatePeerChatVRange conn chatVRange
+        ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
         case chatMsgEvent of
           XGrpMemInfo memId _memProfile
             | sameMemberId memId m -> do
@@ -3139,7 +3114,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
               processIntro intro `catchChatError` (toView . CRChatError (Just user))
             where
               processIntro intro@GroupMemberIntro {introId} = do
-                void $ sendDirectMessage conn (XGrpMemIntro $ memberInfo (reMember intro)) (GroupId groupId)
+                void $ sendDirectMessage conn (XGrpMemIntro . memberInfo $ reMember intro) (GroupId groupId)
                 withStore' $ \db -> updateIntroStatus db introId GMIntroSent
           _ -> do
             -- TODO send probe and decide whether to use existing contact connection or the new contact connection
@@ -3156,29 +3131,28 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       MSG msgMeta _msgFlags msgBody -> do
         cmdId <- createAckCmd conn
         withAckMessage agentConnId cmdId msgMeta $ do
-          (conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveRcvMSG conn (GroupId groupId) msgMeta msgBody cmdId
-          let m' = m {activeConn = Just conn'} :: GroupMember
+          msg@RcvMessage {chatMsgEvent = ACME _ event} <- saveRcvMSG conn (GroupId groupId) msgMeta msgBody cmdId
           updateChatLock "groupMessage" event
           case event of
-            XMsgNew mc -> canSend m' $ newGroupContentMessage gInfo m' mc msg msgMeta
-            XMsgFileDescr sharedMsgId fileDescr -> canSend m' $ groupMessageFileDescription gInfo m' sharedMsgId fileDescr msgMeta
-            XMsgFileCancel sharedMsgId -> cancelGroupMessageFile gInfo m' sharedMsgId msgMeta
-            XMsgUpdate sharedMsgId mContent ttl live -> canSend m' $ groupMessageUpdate gInfo m' sharedMsgId mContent msg msgMeta ttl live
-            XMsgDel sharedMsgId memberId -> groupMessageDelete gInfo m' sharedMsgId memberId msg msgMeta
-            XMsgReact sharedMsgId (Just memberId) reaction add -> groupMsgReaction gInfo m' sharedMsgId memberId reaction add msg msgMeta
+            XMsgNew mc -> canSend $ newGroupContentMessage gInfo m mc msg msgMeta
+            XMsgFileDescr sharedMsgId fileDescr -> canSend $ groupMessageFileDescription gInfo m sharedMsgId fileDescr msgMeta
+            XMsgFileCancel sharedMsgId -> cancelGroupMessageFile gInfo m sharedMsgId msgMeta
+            XMsgUpdate sharedMsgId mContent ttl live -> canSend $ groupMessageUpdate gInfo m sharedMsgId mContent msg msgMeta ttl live
+            XMsgDel sharedMsgId memberId -> groupMessageDelete gInfo m sharedMsgId memberId msg msgMeta
+            XMsgReact sharedMsgId (Just memberId) reaction add -> groupMsgReaction gInfo m sharedMsgId memberId reaction add msg msgMeta
             -- TODO discontinue XFile
-            XFile fInv -> processGroupFileInvitation' gInfo m' fInv msg msgMeta
-            XFileCancel sharedMsgId -> xFileCancelGroup gInfo m' sharedMsgId msgMeta
-            XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInvGroup gInfo m' sharedMsgId fileConnReq_ fName msgMeta
-            XGrpMemNew memInfo -> xGrpMemNew gInfo m' memInfo msg msgMeta
-            XGrpMemIntro memInfo -> xGrpMemIntro gInfo m' memInfo
-            XGrpMemInv memId introInv -> xGrpMemInv gInfo m' memId introInv
-            XGrpMemFwd memInfo introInv -> xGrpMemFwd gInfo m' memInfo introInv
-            XGrpMemRole memId memRole -> xGrpMemRole gInfo m' memId memRole msg msgMeta
-            XGrpMemDel memId -> xGrpMemDel gInfo m' memId msg msgMeta
-            XGrpLeave -> xGrpLeave gInfo m' msg msgMeta
-            XGrpDel -> xGrpDel gInfo m' msg msgMeta
-            XGrpInfo p' -> xGrpInfo gInfo m' p' msg msgMeta
+            XFile fInv -> processGroupFileInvitation' gInfo m fInv msg msgMeta
+            XFileCancel sharedMsgId -> xFileCancelGroup gInfo m sharedMsgId msgMeta
+            XFileAcptInv sharedMsgId fileConnReq_ fName -> xFileAcptInvGroup gInfo m sharedMsgId fileConnReq_ fName msgMeta
+            XGrpMemNew memInfo -> xGrpMemNew gInfo m memInfo msg msgMeta
+            XGrpMemIntro memInfo -> xGrpMemIntro gInfo m memInfo
+            XGrpMemInv memId introInv -> xGrpMemInv gInfo m memId introInv
+            XGrpMemFwd memInfo introInv -> xGrpMemFwd gInfo m memInfo introInv
+            XGrpMemRole memId memRole -> xGrpMemRole gInfo m memId memRole msg msgMeta
+            XGrpMemDel memId -> xGrpMemDel gInfo m memId msg msgMeta
+            XGrpLeave -> xGrpLeave gInfo m msg msgMeta
+            XGrpDel -> xGrpDel gInfo m msg msgMeta
+            XGrpInfo p' -> xGrpInfo gInfo m p' msg msgMeta
             BFileChunk sharedMsgId chunk -> bFileChunkGroup gInfo sharedMsgId chunk msgMeta
             _ -> messageError $ "unsupported message: " <> T.pack (show event)
           currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
@@ -3188,8 +3162,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
               && hasDeliveryReceipt (toCMEventTag event)
               && currentMemCount <= smallGroupsRcptsMemLimit
         where
-          canSend mem a
-            | memberRole (mem :: GroupMember) <= GRObserver = messageError "member is not allowed to send messages"
+          canSend a
+            | memberRole (m :: GroupMember) <= GRObserver = messageError "member is not allowed to send messages"
             | otherwise = a
       RCVD msgMeta msgRcpt ->
         withAckMessage' agentConnId conn msgMeta $
@@ -3274,15 +3248,14 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         -- SMP CONF for SndFileConnection happens for direct file protocol
         -- when recipient of the file "joins" connection created by the sender
         CONF confId _ connInfo -> do
-          ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-          conn' <- updatePeerChatVRange conn chatVRange
+          ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
           case chatMsgEvent of
             -- TODO save XFileAcpt message
             XFileAcpt name
               | name == fileName -> do
                 withStore' $ \db -> updateSndFileStatus db ft FSAccepted
                 -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                allowAgentConnectionAsync user conn' confId XOk
+                allowAgentConnectionAsync user conn confId XOk
               | otherwise -> messageError "x.file.acpt: fileName is different from expected"
             _ -> messageError "CONF from file connection must have x.file.acpt"
         CON -> do
@@ -3343,10 +3316,9 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         -- when sender of the file "joins" connection created by the recipient
         -- (sender doesn't create connections for all group members)
         CONF confId _ connInfo -> do
-          ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
-          conn' <- updatePeerChatVRange conn chatVRange
+          ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
           case chatMsgEvent of
-            XOk -> allowAgentConnectionAsync user conn' confId XOk -- [async agent commands] no continuation needed, but command should be asynchronous for stability
+            XOk -> allowAgentConnectionAsync user conn confId XOk -- [async agent commands] no continuation needed, but command should be asynchronous for stability
             _ -> pure ()
         CON -> startReceivingFile user fileId
         MSG meta _ msgBody -> do
@@ -3405,10 +3377,10 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
     processUserContactRequest :: ACommand 'Agent e -> ConnectionEntity -> Connection -> UserContact -> m ()
     processUserContactRequest agentMsg connEntity conn UserContact {userContactLinkId} = case agentMsg of
       REQ invId _ connInfo -> do
-        ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
+        ChatMessage {chatMsgEvent} <- parseChatMessage conn connInfo
         case chatMsgEvent of
-          XContact p xContactId_ -> profileContactRequest invId chatVRange p xContactId_
-          XInfo p -> profileContactRequest invId chatVRange p Nothing
+          XContact p xContactId_ -> profileContactRequest invId p xContactId_
+          XInfo p -> profileContactRequest invId p Nothing
           -- TODO show/log error, other events in contact request
           _ -> pure ()
       MERR _ err -> do
@@ -3420,9 +3392,9 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       -- TODO add debugging output
       _ -> pure ()
       where
-        profileContactRequest :: InvitationId -> VersionRange -> Profile -> Maybe XContactId -> m ()
-        profileContactRequest invId chatVRange p xContactId_ = do
-          withStore (\db -> createOrUpdateContactRequest db user userContactLinkId invId chatVRange p xContactId_) >>= \case
+        profileContactRequest :: InvitationId -> Profile -> Maybe XContactId -> m ()
+        profileContactRequest invId p xContactId_ = do
+          withStore (\db -> createOrUpdateContactRequest db user userContactLinkId invId p xContactId_) >>= \case
             CORContact contact -> toView $ CRContactRequestAlreadyAccepted user contact
             CORRequest cReq@UserContactRequest {localDisplayName} -> do
               withStore' (\db -> getUserContactLinkById db userId userContactLinkId) >>= \case
@@ -3920,7 +3892,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         then unless cancelled $ case fileConnReq_ of
           -- receiving via a separate connection
           Just fileConnReq -> do
-            connIds <- joinAgentConnectionAsync user True fileConnReq =<< directMessage XOk
+            connIds <- joinAgentConnectionAsync user True fileConnReq $ directMessage XOk
             withStore' $ \db -> createSndDirectFTConnection db user fileId connIds
           -- receiving inline
           _ -> do
@@ -4017,7 +3989,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           (Just fileConnReq, _) -> do
             -- receiving via a separate connection
             -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-            connIds <- joinAgentConnectionAsync user True fileConnReq =<< directMessage XOk
+            connIds <- joinAgentConnectionAsync user True fileConnReq $ directMessage XOk
             withStore' $ \db -> createSndGroupFileTransferConnection db user fileId connIds m
           (_, Just conn) -> do
             -- receiving inline
@@ -4040,7 +4012,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
 
     processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> m ()
     processGroupInvitation ct inv msg msgMeta = do
-      let Contact {localDisplayName = c, activeConn = Connection {peerChatVRange, customUserProfileId, groupLinkId = groupLinkId'}} = ct
+      let Contact {localDisplayName = c, activeConn = Connection {customUserProfileId, groupLinkId = groupLinkId'}} = ct
           GroupInvitation {fromMember = (MemberIdRole fromMemId fromRole), invitedMember = (MemberIdRole memId memRole), connRequest, groupLinkId} = inv
       checkIntegrityCreateItem (CDDirectRcv ct) msgMeta
       when (fromRole < GRAdmin || fromRole < memRole) $ throwChatError (CEGroupContactRole c)
@@ -4049,9 +4021,9 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       (gInfo@GroupInfo {groupId, localDisplayName, groupProfile, membership = membership@GroupMember {groupMemberId, memberId}}, hostId) <- withStore $ \db -> createGroupInvitation db user ct inv customUserProfileId
       if sameGroupLinkId groupLinkId groupLinkId'
         then do
-          connIds <- joinAgentConnectionAsync user True connRequest =<< directMessage (XGrpAcpt memberId)
+          connIds <- joinAgentConnectionAsync user True connRequest . directMessage $ XGrpAcpt memberId
           withStore' $ \db -> do
-            createMemberConnectionAsync db user hostId connIds peerChatVRange
+            createMemberConnectionAsync db user hostId connIds
             updateGroupMemberStatusById db userId hostId GSMemAccepted
             updateGroupMemberStatus db userId membership GSMemAccepted
           toView $ CRUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
@@ -4251,20 +4223,18 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       withStore' $ \db -> mergeContactRecords db userId c1 c2
       toView $ CRContactsMerged user c1 c2
 
-    saveConnInfo :: Connection -> ConnInfo -> m Connection
+    saveConnInfo :: Connection -> ConnInfo -> m ()
     saveConnInfo activeConn connInfo = do
-      ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage activeConn connInfo
-      conn' <- updatePeerChatVRange activeConn chatVRange
+      ChatMessage {chatMsgEvent} <- parseChatMessage activeConn connInfo
       case chatMsgEvent of
         XInfo p -> do
-          ct <- withStore $ \db -> createDirectContact db user conn' p
+          ct <- withStore $ \db -> createDirectContact db user activeConn p
           toView $ CRContactConnecting user ct
-          pure conn'
         -- TODO show/log error, other events in SMP confirmation
-        _ -> pure conn'
+        _ -> pure ()
 
     xGrpMemNew :: GroupInfo -> GroupMember -> MemberInfo -> RcvMessage -> MsgMeta -> m ()
-    xGrpMemNew gInfo m memInfo@(MemberInfo memId memRole _ memberProfile) msg msgMeta = do
+    xGrpMemNew gInfo m memInfo@(MemberInfo memId memRole memberProfile) msg msgMeta = do
       checkHostRole m memRole
       members <- withStore' $ \db -> getGroupMembers db user gInfo
       unless (sameMemberId memId $ membership gInfo) $
@@ -4277,7 +4247,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
             toView $ CRJoinedGroupMemberConnecting user gInfo m newMember
 
     xGrpMemIntro :: GroupInfo -> GroupMember -> MemberInfo -> m ()
-    xGrpMemIntro gInfo@GroupInfo {membership, chatSettings = ChatSettings {enableNtfs}} m@GroupMember {memberRole, localDisplayName = c} memInfo@(MemberInfo memId _ memberChatVRange _) = do
+    xGrpMemIntro gInfo@GroupInfo {membership, chatSettings = ChatSettings {enableNtfs}} m@GroupMember {memberRole, localDisplayName = c} memInfo@(MemberInfo memId _ _) = do
       case memberCategory m of
         GCHostMember -> do
           members <- withStore' $ \db -> getGroupMembers db user gInfo
@@ -4286,19 +4256,14 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
             else do
               when (memberRole < GRAdmin) $ throwChatError (CEGroupContactRole c)
               -- [async agent commands] commands should be asynchronous, continuation is to send XGrpMemInv - have to remember one has completed and process on second
-              groupConnIds <- createConn
-              directConnIds <- case memberChatVRange of
-                Nothing -> Just <$> createConn
-                Just mcvr
-                  | isCompatibleRange (fromChatVRange mcvr) groupNoDirectVRange -> Just <$> createConn -- pure Nothing
-                  | otherwise -> Just <$> createConn
+              groupConnIds <- createAgentConnectionAsync user CFCreateConnGrpMemInv enableNtfs SCMInvitation
+              directConnIds <- createAgentConnectionAsync user CFCreateConnGrpMemInv enableNtfs SCMInvitation
+              -- [incognito] direct connection with member has to be established using the same incognito profile [that was known to host and used for group membership]
               let customUserProfileId = if memberIncognito membership then Just (localProfileId $ memberProfile membership) else Nothing
               void $ withStore $ \db -> createIntroReMember db user gInfo m memInfo groupConnIds directConnIds customUserProfileId
         _ -> messageError "x.grp.mem.intro can be only sent by host member"
-      where
-        createConn = createAgentConnectionAsync user CFCreateConnGrpMemInv enableNtfs SCMInvitation
 
-    sendXGrpMemInv :: Int64 -> Maybe ConnReqInvitation -> XGrpMemIntroCont -> m ()
+    sendXGrpMemInv :: Int64 -> ConnReqInvitation -> XGrpMemIntroCont -> m ()
     sendXGrpMemInv hostConnId directConnReq XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq} = do
       hostConn <- withStore $ \db -> getConnectionById db user hostConnId
       let msg = XGrpMemInv memberId IntroInvitation {groupConnReq, directConnReq}
@@ -4319,7 +4284,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         _ -> messageError "x.grp.mem.inv can be only sent by invitee member"
 
     xGrpMemFwd :: GroupInfo -> GroupMember -> MemberInfo -> IntroInvitation -> m ()
-    xGrpMemFwd gInfo@GroupInfo {membership, chatSettings = ChatSettings {enableNtfs}} m memInfo@(MemberInfo memId memRole memberChatVRange _) introInv@IntroInvitation {groupConnReq, directConnReq} = do
+    xGrpMemFwd gInfo@GroupInfo {membership, chatSettings = ChatSettings {enableNtfs}} m memInfo@(MemberInfo memId memRole _) introInv@IntroInvitation {groupConnReq, directConnReq} = do
       checkHostRole m memRole
       members <- withStore' $ \db -> getGroupMembers db user gInfo
       toMember <- case find (sameMemberId memId) members of
@@ -4331,13 +4296,12 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         Just m' -> pure m'
       withStore' $ \db -> saveMemberInvitation db toMember introInv
       -- [incognito] send membership incognito profile, create direct connection as incognito
-      dm <- directMessage $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
+      let msg = XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
       -- [async agent commands] no continuation needed, but commands should be asynchronous for stability
-      groupConnIds <- joinAgentConnectionAsync user enableNtfs groupConnReq dm
-      directConnIds <- forM directConnReq $ \dcr -> joinAgentConnectionAsync user enableNtfs dcr dm
+      groupConnIds <- joinAgentConnectionAsync user enableNtfs groupConnReq $ directMessage msg
+      directConnIds <- joinAgentConnectionAsync user enableNtfs directConnReq $ directMessage msg
       let customUserProfileId = if memberIncognito membership then Just (localProfileId $ memberProfile membership) else Nothing
-          mcvr = maybe chatInitialVRange fromChatVRange memberChatVRange
-      withStore' $ \db -> createIntroToMemberContact db user m toMember mcvr groupConnIds directConnIds customUserProfileId
+      withStore' $ \db -> createIntroToMemberContact db user m toMember groupConnIds directConnIds customUserProfileId
 
     xGrpMemRole :: GroupInfo -> GroupMember -> MemberId -> GroupMemberRole -> RcvMessage -> MsgMeta -> m ()
     xGrpMemRole gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId memRole msg msgMeta
@@ -4477,13 +4441,6 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
               toView $ CRChatItemStatusUpdated user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) chatItem)
         _ -> pure ()
 
-updatePeerChatVRange :: ChatMonad m => Connection -> VersionRange -> m Connection
-updatePeerChatVRange conn@Connection {connId, peerChatVRange} msgChatVRange
-  | msgChatVRange /= peerChatVRange = do
-    withStore' $ \db -> setPeerChatVRange db connId msgChatVRange
-    pure conn {peerChatVRange = msgChatVRange}
-  | otherwise = pure conn
-
 parseFileDescription :: (ChatMonad m, FilePartyI p) => Text -> m (ValidFileDescription p)
 parseFileDescription =
   liftEither . first (ChatError . CEInvalidFileDescription) . (strDecode . encodeUtf8)
@@ -4682,15 +4639,12 @@ sendDirectMessage conn chatMsgEvent connOrGroupId = do
 createSndMessage :: (MsgEncodingI e, ChatMonad m) => ChatMsgEvent e -> ConnOrGroupId -> m SndMessage
 createSndMessage chatMsgEvent connOrGroupId = do
   gVar <- asks idsDrg
-  ChatConfig {chatVRange} <- asks config
   withStore $ \db -> createNewSndMessage db gVar connOrGroupId $ \sharedMsgId ->
-    let msgBody = strEncode ChatMessage {chatVRange, msgId = Just sharedMsgId, chatMsgEvent}
+    let msgBody = strEncode ChatMessage {msgId = Just sharedMsgId, chatMsgEvent}
      in NewMessage {chatMsgEvent, msgBody}
 
-directMessage :: (MsgEncodingI e, ChatMonad m) => ChatMsgEvent e -> m ByteString
-directMessage chatMsgEvent = do
-  ChatConfig {chatVRange} <- asks config
-  pure $ strEncode ChatMessage {chatVRange, msgId = Nothing, chatMsgEvent}
+directMessage :: MsgEncodingI e => ChatMsgEvent e -> ByteString
+directMessage chatMsgEvent = strEncode ChatMessage {msgId = Nothing, chatMsgEvent}
 
 deliverMessage :: ChatMonad m => Connection -> CMEventTag e -> MsgBody -> MessageId -> m Int64
 deliverMessage conn@Connection {connId} cmEventTag msgBody msgId = do
@@ -4745,17 +4699,15 @@ sendPendingGroupMessages user GroupMember {groupMemberId, localDisplayName} conn
           _ -> throwChatError $ CEGroupMemberIntroNotFound localDisplayName
         _ -> pure ()
 
-saveRcvMSG :: ChatMonad m => Connection -> ConnOrGroupId -> MsgMeta -> MsgBody -> CommandId -> m (Connection, RcvMessage)
+saveRcvMSG :: ChatMonad m => Connection -> ConnOrGroupId -> MsgMeta -> MsgBody -> CommandId -> m RcvMessage
 saveRcvMSG conn@Connection {connId} connOrGroupId agentMsgMeta msgBody agentAckCmdId = do
-  ACMsg _ ChatMessage {chatVRange, msgId = sharedMsgId_, chatMsgEvent} <- parseAChatMessage conn agentMsgMeta msgBody
-  conn' <- updatePeerChatVRange conn chatVRange
+  ACMsg _ ChatMessage {msgId = sharedMsgId_, chatMsgEvent} <- parseAChatMessage conn agentMsgMeta msgBody
   let agentMsgId = fst $ recipient agentMsgMeta
       newMsg = NewMessage {chatMsgEvent, msgBody}
       rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId}
-  msg <- withStoreCtx'
+  withStoreCtx'
     (Just $ "createNewMessageAndRcvMsgDelivery, rcvMsgDelivery: " <> show rcvMsgDelivery <> ", sharedMsgId_: " <> show sharedMsgId_ <> ", msgDeliveryStatus: MDSRcvAgent")
     $ \db -> createNewMessageAndRcvMsgDelivery db connOrGroupId newMsg sharedMsgId_ rcvMsgDelivery
-  pure (conn', msg)
 
 saveSndChatItem :: ChatMonad m => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> m (ChatItem c 'MDSnd)
 saveSndChatItem user cd msg content = saveSndChatItem' user cd msg content Nothing Nothing Nothing False
@@ -4853,15 +4805,13 @@ joinAgentConnectionAsync user enableNtfs cReqUri cInfo = do
 allowAgentConnectionAsync :: (MsgEncodingI e, ChatMonad m) => User -> Connection -> ConfirmationId -> ChatMsgEvent e -> m ()
 allowAgentConnectionAsync user conn@Connection {connId} confId msg = do
   cmdId <- withStore' $ \db -> createCommand db user (Just connId) CFAllowConn
-  dm <- directMessage msg
-  withAgent $ \a -> allowConnectionAsync a (aCorrId cmdId) (aConnId conn) confId dm
+  withAgent $ \a -> allowConnectionAsync a (aCorrId cmdId) (aConnId conn) confId $ directMessage msg
   withStore' $ \db -> updateConnectionStatus db conn ConnAccepted
 
 agentAcceptContactAsync :: (MsgEncodingI e, ChatMonad m) => User -> Bool -> InvitationId -> ChatMsgEvent e -> m (CommandId, ConnId)
 agentAcceptContactAsync user enableNtfs invId msg = do
   cmdId <- withStore' $ \db -> createCommand db user Nothing CFAcceptContact
-  dm <- directMessage msg
-  connId <- withAgent $ \a -> acceptContactAsync a (aCorrId cmdId) enableNtfs invId dm
+  connId <- withAgent $ \a -> acceptContactAsync a (aCorrId cmdId) enableNtfs invId $ directMessage msg
   pure (cmdId, connId)
 
 deleteAgentConnectionAsync :: ChatMonad m => User -> ConnId -> m ()

src/Simplex/Chat/Controller.hs

@@ -67,7 +67,6 @@ import Simplex.Messaging.TMap (TMap)
 import Simplex.Messaging.Transport (simplexMQVersion)
 import Simplex.Messaging.Transport.Client (TransportHost)
 import Simplex.Messaging.Util (allFinally, catchAllErrors, tryAllErrors, (<$$>))
-import Simplex.Messaging.Version
 import System.IO (Handle)
 import System.Mem.Weak (Weak)
 import UnliftIO.STM
@@ -76,7 +75,7 @@ versionNumber :: String
 versionNumber = showVersion SC.version
 
 versionString :: String -> String
-versionString ver = "SimpleX Chat v" <> ver
+versionString version = "SimpleX Chat v" <> version
 
 updateStr :: String
 updateStr = "To update run: curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash"
@@ -105,7 +104,6 @@ coreVersionInfo simplexmqCommit =
 
 data ChatConfig = ChatConfig
   { agentConfig :: AgentConfig,
-    chatVRange :: VersionRange,
     confirmMigrations :: MigrationConfirmation,
     defaultServers :: DefaultAgentServers,
     tbqSize :: Natural,

src/Simplex/Chat/Migrations/M20230829_connections_chat_vrange.hs

@@ -1,26 +0,0 @@
-{-# LANGUAGE QuasiQuotes #-}
-
-module Simplex.Chat.Migrations.M20230829_connections_chat_vrange where
-
-import Database.SQLite.Simple (Query)
-import Database.SQLite.Simple.QQ (sql)
-
-m20230829_connections_chat_vrange :: Query
-m20230829_connections_chat_vrange =
-  [sql|
-ALTER TABLE connections ADD COLUMN peer_chat_min_version INTEGER NOT NULL DEFAULT 1;
-ALTER TABLE connections ADD COLUMN peer_chat_max_version INTEGER NOT NULL DEFAULT 1;
-
-ALTER TABLE contact_requests ADD COLUMN peer_chat_min_version INTEGER NOT NULL DEFAULT 1;
-ALTER TABLE contact_requests ADD COLUMN peer_chat_max_version INTEGER NOT NULL DEFAULT 1;
-|]
-
-down_m20230829_connections_chat_vrange :: Query
-down_m20230829_connections_chat_vrange =
-  [sql|
-ALTER TABLE contact_requests DROP COLUMN peer_chat_max_version;
-ALTER TABLE contact_requests DROP COLUMN peer_chat_min_version;
-
-ALTER TABLE connections DROP COLUMN peer_chat_max_version;
-ALTER TABLE connections DROP COLUMN peer_chat_min_version;
-|]

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -285,8 +285,6 @@ CREATE TABLE connections(
   security_code TEXT NULL,
   security_code_verified_at TEXT NULL,
   auth_err_counter INTEGER DEFAULT 0 CHECK(auth_err_counter NOT NULL),
-  peer_chat_min_version INTEGER NOT NULL DEFAULT 1,
-  peer_chat_max_version INTEGER NOT NULL DEFAULT 1,
   FOREIGN KEY(snd_file_id, connection_id)
   REFERENCES snd_files(file_id, connection_id)
   ON DELETE CASCADE
@@ -320,8 +318,6 @@ CREATE TABLE contact_requests(
   user_id INTEGER NOT NULL REFERENCES users ON DELETE CASCADE,
   updated_at TEXT CHECK(updated_at NOT NULL),
   xcontact_id BLOB,
-  peer_chat_min_version INTEGER NOT NULL DEFAULT 1,
-  peer_chat_max_version INTEGER NOT NULL DEFAULT 1,
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON UPDATE CASCADE

src/Simplex/Chat/Mobile.hs

@@ -75,10 +75,6 @@ foreign export ccall "chat_write_file" cChatWriteFile :: CString -> Ptr Word8 ->
 
 foreign export ccall "chat_read_file" cChatReadFile :: CString -> CString -> CString -> IO (Ptr Word8)
 
-foreign export ccall "chat_encrypt_file" cChatEncryptFile :: CString -> CString -> IO CJSONString
-
-foreign export ccall "chat_decrypt_file" cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
-
 -- | check / migrate database and initialize chat controller on success
 cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
 cChatMigrateInit fp key conf ctrl = do

src/Simplex/Chat/Mobile/File.hs

@@ -1,14 +1,10 @@
-{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TupleSections #-}
 
 module Simplex.Chat.Mobile.File
   ( cChatWriteFile,
     cChatReadFile,
-    cChatEncryptFile,
-    cChatDecryptFile,
     WriteFileResult (..),
     ReadFileResult (..),
     chatWriteFile,
@@ -23,21 +19,16 @@ import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as LB
 import qualified Data.ByteString.Lazy.Char8 as LB'
-import Data.Char (chr)
-import Data.Either (fromLeft)
-import Data.Word (Word8, Word32)
+import Data.Word (Word8)
 import Foreign.C
 import Foreign.Marshal.Alloc (mallocBytes)
 import Foreign.Ptr
-import Foreign.Storable (poke)
 import GHC.Generics (Generic)
 import Simplex.Chat.Mobile.Shared
-import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..), CryptoFileHandle, FTCryptoError (..))
+import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..))
 import qualified Simplex.Messaging.Crypto.File as CF
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
-import Simplex.Messaging.Util (catchAll)
-import UnliftIO (Handle, IOMode (..), withFile)
 
 data WriteFileResult
   = WFResult {cryptoArgs :: CryptoFileArgs}
@@ -48,7 +39,7 @@ instance ToJSON WriteFileResult where toEncoding = J.genericToEncoding . sumType
 
 cChatWriteFile :: CString -> Ptr Word8 -> CInt -> IO CJSONString
 cChatWriteFile cPath ptr len = do
-  path <- peekCString cPath
+  path <- peekCAString cPath
   s <- getByteString ptr len
   r <- chatWriteFile path s
   newCAString $ LB'.unpack $ J.encode r
@@ -57,8 +48,8 @@ chatWriteFile :: FilePath -> ByteString -> IO WriteFileResult
 chatWriteFile path s = do
   cfArgs <- CF.randomArgs
   let file = CryptoFile path $ Just cfArgs
-  either WFError (\_ -> WFResult cfArgs)
-    <$> runCatchExceptT (withExceptT show $ CF.writeFile file $ LB.fromStrict s)
+  either (WFError . show) (\_ -> WFResult cfArgs)
+    <$> runExceptT (CF.writeFile file $ LB.fromStrict s)
 
 data ReadFileResult
   = RFResult {fileSize :: Int}
@@ -69,85 +60,24 @@ instance ToJSON ReadFileResult where toEncoding = J.genericToEncoding . sumTypeJ
 
 cChatReadFile :: CString -> CString -> CString -> IO (Ptr Word8)
 cChatReadFile cPath cKey cNonce = do
-  path <- peekCString cPath
+  path <- peekCAString cPath
   key <- B.packCString cKey
   nonce <- B.packCString cNonce
-  chatReadFile path key nonce >>= \case
-    Left e -> castPtr <$> newCString (chr 1 : e)
-    Right s -> do
-      let s' = LB.toStrict s
-          len = B.length s'
-      ptr <- mallocBytes $ len + 5
-      poke ptr 0
-      poke (ptr `plusPtr` 1) (fromIntegral len :: Word32)
-      putByteString (ptr `plusPtr` 5) s'
-      pure ptr
+  (r, s) <- chatReadFile path key nonce
+  let r' = LB.toStrict $ J.encode r <> "\NUL"
+  ptr <- mallocBytes $ B.length r' + B.length s
+  putByteString ptr r'
+  unless (B.null s) $ putByteString (ptr `plusPtr` B.length r') s
+  pure ptr
 
-chatReadFile :: FilePath -> ByteString -> ByteString -> IO (Either String LB.ByteString)
-chatReadFile path keyStr nonceStr = runCatchExceptT $ do
-  key <- liftEither $ strDecode keyStr
-  nonce <- liftEither $ strDecode nonceStr
-  let file = CryptoFile path $ Just $ CFArgs key nonce
-  withExceptT show $ CF.readFile file
-
-cChatEncryptFile :: CString -> CString -> IO CJSONString
-cChatEncryptFile cFromPath cToPath = do
-  fromPath <- peekCString cFromPath
-  toPath <- peekCString cToPath
-  r <- chatEncryptFile fromPath toPath
-  newCAString . LB'.unpack $ J.encode r
-
-chatEncryptFile :: FilePath -> FilePath -> IO WriteFileResult
-chatEncryptFile fromPath toPath =
-  either WFError WFResult <$> runCatchExceptT encrypt
+chatReadFile :: FilePath -> ByteString -> ByteString -> IO (ReadFileResult, ByteString)
+chatReadFile path keyStr nonceStr = do
+  either ((,"") . RFError) result <$> runExceptT readFile_
   where
-    encrypt = do
-      cfArgs <- liftIO $ CF.randomArgs
-      let toFile = CryptoFile toPath $ Just cfArgs
-      withExceptT show $
-        withFile fromPath ReadMode $ \r -> CF.withFile toFile WriteMode $ \w -> do
-          encryptChunks r w
-          liftIO $ CF.hPutTag w
-      pure cfArgs
-    encryptChunks r w = do
-      ch <- liftIO $ LB.hGet r chunkSize
-      unless (LB.null ch) $ liftIO $ CF.hPut w ch
-      unless (LB.length ch < chunkSize) $ encryptChunks r w
-
-cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
-cChatDecryptFile cFromPath cKey cNonce cToPath = do
-  fromPath <- peekCString cFromPath
-  key <- B.packCString cKey
-  nonce <- B.packCString cNonce
-  toPath <- peekCString cToPath
-  r <- chatDecryptFile fromPath key nonce toPath
-  newCAString r
-
-chatDecryptFile :: FilePath -> ByteString -> ByteString -> FilePath -> IO String
-chatDecryptFile fromPath keyStr nonceStr toPath = fromLeft "" <$> runCatchExceptT decrypt
-  where
-    decrypt = do
+    result s = let s' = LB.toStrict s in (RFResult $ B.length s', s')
+    readFile_ :: ExceptT String IO LB.ByteString
+    readFile_ = do
       key <- liftEither $ strDecode keyStr
       nonce <- liftEither $ strDecode nonceStr
-      let fromFile = CryptoFile fromPath $ Just $ CFArgs key nonce
-      size <- liftIO $ CF.getFileContentsSize fromFile
-      withExceptT show $
-        CF.withFile fromFile ReadMode $ \r -> withFile toPath WriteMode $ \w -> do
-          decryptChunks r w size
-          CF.hGetTag r
-    decryptChunks :: CryptoFileHandle -> Handle -> Integer -> ExceptT FTCryptoError IO ()
-    decryptChunks r w !size = do
-      let chSize = min size chunkSize
-          chSize' = fromIntegral chSize
-          size' = size - chSize
-      ch <- liftIO $ CF.hGet r chSize'
-      when (B.length ch /= chSize') $ throwError $ FTCEFileIOError "encrypting file: unexpected EOF"
-      liftIO $ B.hPut w ch
-      when (size' > 0) $ decryptChunks r w size'
-
-runCatchExceptT :: ExceptT String IO a -> IO (Either String a)
-runCatchExceptT action = runExceptT action `catchAll` (pure . Left . show)
-
-chunkSize :: Num a => a
-chunkSize = 65536
-{-# INLINE chunkSize #-}
+      let file = CryptoFile path $ Just $ CFArgs key nonce
+      withExceptT show $ CF.readFile file

src/Simplex/Chat/Protocol.hs

@@ -46,17 +46,6 @@ import Simplex.Messaging.Encoding
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, fromTextField_, fstToLower, parseAll, sumTypeJSON, taggedObjectJSON)
 import Simplex.Messaging.Util (eitherToMaybe, safeDecodeUtf8, (<$?>))
-import Simplex.Messaging.Version hiding (version)
-
-currentChatVersion :: Version
-currentChatVersion = 2
-
-supportedChatVRange :: VersionRange
-supportedChatVRange = mkVersionRange 1 currentChatVersion
-
--- version range that supports skipping establishing direct connections in a group
-groupNoDirectVRange :: VersionRange
-groupNoDirectVRange = mkVersionRange 2 currentChatVersion
 
 data ConnectionEntity
   = RcvDirectMsgConnection {entityConnection :: Connection, contact :: Maybe Contact}
@@ -113,8 +102,7 @@ data AppMessage (e :: MsgEncoding) where
 
 -- chat message is sent as JSON with these properties
 data AppMessageJson = AppMessageJson
-  { v :: Maybe ChatVersionRange,
-    msgId :: Maybe SharedMsgId,
+  { msgId :: Maybe SharedMsgId,
     event :: Text,
     params :: J.Object
   }
@@ -173,11 +161,7 @@ instance ToJSON MsgRef where
   toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
   toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
 
-data ChatMessage e = ChatMessage
-  { chatVRange :: VersionRange,
-    msgId :: Maybe SharedMsgId,
-    chatMsgEvent :: ChatMsgEvent e
-  }
+data ChatMessage e = ChatMessage {msgId :: Maybe SharedMsgId, chatMsgEvent :: ChatMsgEvent e}
   deriving (Eq, Show)
 
 data AChatMessage = forall e. MsgEncodingI e => ACMsg (SMsgEncoding e) (ChatMessage e)
@@ -740,17 +724,17 @@ appBinaryToCM :: AppMessageBinary -> Either String (ChatMessage 'Binary)
 appBinaryToCM AppMessageBinary {msgId, tag, body} = do
   eventTag <- strDecode $ B.singleton tag
   chatMsgEvent <- parseAll (msg eventTag) body
-  pure ChatMessage {chatVRange = chatInitialVRange, msgId, chatMsgEvent}
+  pure ChatMessage {msgId, chatMsgEvent}
   where
     msg :: CMEventTag 'Binary -> A.Parser (ChatMsgEvent 'Binary)
     msg = \case
       BFileChunk_ -> BFileChunk <$> (SharedMsgId <$> smpP) <*> (unIFC <$> smpP)
 
 appJsonToCM :: AppMessageJson -> Either String (ChatMessage 'Json)
-appJsonToCM AppMessageJson {v, msgId, event, params} = do
+appJsonToCM AppMessageJson {msgId, event, params} = do
   eventTag <- strDecode $ encodeUtf8 event
   chatMsgEvent <- msg eventTag
-  pure ChatMessage {chatVRange = maybe chatInitialVRange fromChatVRange v, msgId, chatMsgEvent}
+  pure ChatMessage {msgId, chatMsgEvent}
   where
     p :: FromJSON a => J.Key -> Either String a
     p key = JT.parseEither (.: key) params
@@ -800,11 +784,11 @@ appJsonToCM AppMessageJson {v, msgId, event, params} = do
 key .=? value = maybe id ((:) . (key .=)) value
 
 chatToAppMessage :: forall e. MsgEncodingI e => ChatMessage e -> AppMessage e
-chatToAppMessage ChatMessage {chatVRange, msgId, chatMsgEvent} = case encoding @e of
+chatToAppMessage ChatMessage {msgId, chatMsgEvent} = case encoding @e of
   SBinary ->
     let (binaryMsgId, body) = toBody chatMsgEvent
      in AMBinary AppMessageBinary {msgId = binaryMsgId, tag = B.head $ strEncode tag, body}
-  SJson -> AMJson AppMessageJson {v = Just $ ChatVersionRange chatVRange, msgId, event = textEncode tag, params = params chatMsgEvent}
+  SJson -> AMJson AppMessageJson {msgId, event = textEncode tag, params = params chatMsgEvent}
   where
     tag = toCMEventTag chatMsgEvent
     o :: [(J.Key, J.Value)] -> J.Object
@@ -820,7 +804,7 @@ chatToAppMessage ChatMessage {chatVRange, msgId, chatMsgEvent} = case encoding @
       XMsgUpdate msgId' content ttl live -> o $ ("ttl" .=? ttl) $ ("live" .=? live) ["msgId" .= msgId', "content" .= content]
       XMsgDel msgId' memberId -> o $ ("memberId" .=? memberId) ["msgId" .= msgId']
       XMsgDeleted -> JM.empty
-      XMsgReact msgId' memberId reaction add -> o $ ("memberId" .=? memberId) ["msgId" .= msgId', "reaction" .= reaction, "add" .= add]
+      XMsgReact msgId' memberId reaction add -> o $ ("memberId" .=? memberId) ["msgId" .= msgId', "reaction" .= reaction, "add" .= add]        
       XFile fileInv -> o ["file" .= fileInv]
       XFileAcpt fileName -> o ["fileName" .= fileName]
       XFileAcptInv sharedMsgId fileConnReq fileName -> o $ ("fileConnReq" .=? fileConnReq) ["msgId" .= sharedMsgId, "fileName" .= fileName]

src/Simplex/Chat/Store/Connections.hs

@@ -49,8 +49,7 @@ getConnectionEntity db user@User {userId, userContactId} agentConnId = do
           db
           [sql|
             SELECT connection_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, group_link_id, custom_user_profile_id,
-              conn_status, conn_type, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, security_code, security_code_verified_at, auth_err_counter,
-              peer_chat_min_version, peer_chat_max_version
+              conn_status, conn_type, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, security_code, security_code_verified_at, auth_err_counter
             FROM connections
             WHERE user_id = ? AND agent_conn_id = ?
           |]

src/Simplex/Chat/Store/Direct.hs

@@ -75,7 +75,6 @@ import Simplex.Chat.Types.Preferences
 import Simplex.Messaging.Agent.Protocol (ConnId, InvitationId, UserId)
 import Simplex.Messaging.Agent.Store.SQLite (firstRow, maybeFirstRow)
 import qualified Simplex.Messaging.Agent.Store.SQLite.DB as DB
-import Simplex.Messaging.Version
 
 getPendingContactConnection :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO PendingContactConnection
 getPendingContactConnection db userId connId = do
@@ -144,8 +143,7 @@ getConnReqContactXContactId db user@User {userId} cReqHash = do
               cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
               -- Connection
               c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
-              c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-              c.peer_chat_min_version, c.peer_chat_max_version
+              c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
             FROM contacts ct
             JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
             JOIN connections c ON c.contact_id = ct.contact_id
@@ -413,8 +411,8 @@ getUserContacts db user@User {userId} = do
   contactIds <- map fromOnly <$> DB.query db "SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 0" (Only userId)
   rights <$> mapM (runExceptT . getContact db user) contactIds
 
-createOrUpdateContactRequest :: DB.Connection -> User -> Int64 -> InvitationId -> VersionRange -> Profile -> Maybe XContactId -> ExceptT StoreError IO ContactOrRequest
-createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (VersionRange minV maxV) Profile {displayName, fullName, image, contactLink, preferences} xContactId_ =
+createOrUpdateContactRequest :: DB.Connection -> User -> Int64 -> InvitationId -> Profile -> Maybe XContactId -> ExceptT StoreError IO ContactOrRequest
+createOrUpdateContactRequest db user@User {userId} userContactLinkId invId Profile {displayName, fullName, image, contactLink, preferences} xContactId_ =
   liftIO (maybeM getContact' xContactId_) >>= \case
     Just contact -> pure $ CORContact contact
     Nothing -> CORRequest <$> createOrUpdate_
@@ -443,10 +441,10 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
             db
             [sql|
               INSERT INTO contact_requests
-                (user_contact_link_id, agent_invitation_id, peer_chat_min_version, peer_chat_max_version, contact_profile_id, local_display_name, user_id, created_at, updated_at, xcontact_id)
-              VALUES (?,?,?,?,?,?,?,?,?,?)
+                (user_contact_link_id, agent_invitation_id, contact_profile_id, local_display_name, user_id, created_at, updated_at, xcontact_id)
+              VALUES (?,?,?,?,?,?,?,?)
             |]
-            (userContactLinkId, invId, minV, maxV, profileId, ldn, userId, currentTs, currentTs, xContactId_)
+            (userContactLinkId, invId, profileId, ldn, userId, currentTs, currentTs, xContactId_)
           insertedRowId db
     getContact' :: XContactId -> IO (Maybe Contact)
     getContact' xContactId =
@@ -460,8 +458,7 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
               cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
               -- Connection
               c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
-              c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-              c.peer_chat_min_version, c.peer_chat_max_version
+              c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
             FROM contacts ct
             JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
             LEFT JOIN connections c ON c.contact_id = ct.contact_id
@@ -478,8 +475,7 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
           [sql|
             SELECT
               cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.user_contact_link_id,
-              c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at,
-              cr.peer_chat_min_version, cr.peer_chat_max_version
+              c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at
             FROM contact_requests cr
             JOIN connections c USING (user_contact_link_id)
             JOIN contact_profiles p USING (contact_profile_id)
@@ -493,26 +489,10 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
       currentTs <- liftIO getCurrentTime
       updateProfile currentTs
       if displayName == oldDisplayName
-        then
-          Right
-            <$> DB.execute
-              db
-              [sql|
-                UPDATE contact_requests
-                SET agent_invitation_id = ?, peer_chat_min_version = ?, peer_chat_max_version = ?, updated_at = ?
-                WHERE user_id = ? AND contact_request_id = ?
-              |]
-              (invId, minV, maxV, currentTs, userId, cReqId)
+        then Right <$> DB.execute db "UPDATE contact_requests SET agent_invitation_id = ?, updated_at = ? WHERE user_id = ? AND contact_request_id = ?" (invId, currentTs, userId, cReqId)
         else withLocalDisplayName db userId displayName $ \ldn ->
           Right <$> do
-            DB.execute
-              db
-              [sql|
-                UPDATE contact_requests
-                SET agent_invitation_id = ?, peer_chat_min_version = ?, peer_chat_max_version = ?, local_display_name = ?, updated_at = ?
-                WHERE user_id = ? AND contact_request_id = ?
-              |]
-              (invId, minV, maxV, ldn, currentTs, userId, cReqId)
+            DB.execute db "UPDATE contact_requests SET agent_invitation_id = ?, local_display_name = ?, updated_at = ? WHERE user_id = ? AND contact_request_id = ?" (invId, ldn, currentTs, userId, cReqId)
             DB.execute db "DELETE FROM display_names WHERE local_display_name = ? AND user_id = ?" (oldLdn, userId)
       where
         updateProfile currentTs =
@@ -547,8 +527,7 @@ getContactRequest db User {userId} contactRequestId =
       [sql|
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.user_contact_link_id,
-          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at,
-          cr.peer_chat_min_version, cr.peer_chat_max_version
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at
         FROM contact_requests cr
         JOIN connections c USING (user_contact_link_id)
         JOIN contact_profiles p USING (contact_profile_id)
@@ -587,8 +566,8 @@ deleteContactRequest db User {userId} contactRequestId = do
     (userId, userId, contactRequestId)
   DB.execute db "DELETE FROM contact_requests WHERE user_id = ? AND contact_request_id = ?" (userId, contactRequestId)
 
-createAcceptedContact :: DB.Connection -> User -> ConnId -> VersionRange -> ContactName -> ProfileId -> Profile -> Int64 -> Maybe XContactId -> Maybe IncognitoProfile -> IO Contact
-createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}} agentConnId cReqChatVRange localDisplayName profileId profile userContactLinkId xContactId incognitoProfile = do
+createAcceptedContact :: DB.Connection -> User -> ConnId -> ContactName -> ProfileId -> Profile -> Int64 -> Maybe XContactId -> Maybe IncognitoProfile -> IO Contact
+createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}} agentConnId localDisplayName profileId profile userContactLinkId xContactId incognitoProfile = do
   DB.execute db "DELETE FROM contact_requests WHERE user_id = ? AND local_display_name = ?" (userId, localDisplayName)
   createdAt <- getCurrentTime
   customUserProfileId <- forM incognitoProfile $ \case
@@ -600,7 +579,7 @@ createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}
     "INSERT INTO contacts (user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, created_at, updated_at, chat_ts, xcontact_id) VALUES (?,?,?,?,?,?,?,?,?)"
     (userId, localDisplayName, profileId, True, userPreferences, createdAt, createdAt, createdAt, xContactId)
   contactId <- insertedRowId db
-  activeConn <- createConnection_ db userId ConnContact (Just contactId) agentConnId cReqChatVRange Nothing (Just userContactLinkId) customUserProfileId 0 createdAt
+  activeConn <- createConnection_ db userId ConnContact (Just contactId) agentConnId Nothing (Just userContactLinkId) customUserProfileId 0 createdAt
   let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
   pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn, viaGroup = Nothing, contactUsed = False, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt}
 
@@ -624,8 +603,7 @@ getContact_ db user@User {userId} contactId deleted =
           cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
           -- Connection
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
-          c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version
+          c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
         FROM contacts ct
         JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
         LEFT JOIN connections c ON c.contact_id = ct.contact_id
@@ -673,8 +651,7 @@ getContactConnections db userId Contact {contactId} =
         db
         [sql|
           SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-            c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-            c.peer_chat_min_version, c.peer_chat_max_version
+            c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
           FROM connections c
           JOIN contacts ct ON ct.contact_id = c.contact_id
           WHERE c.user_id = ? AND ct.user_id = ? AND ct.contact_id = ?
@@ -690,8 +667,7 @@ getConnectionById db User {userId} connId = ExceptT $ do
       db
       [sql|
         SELECT connection_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, group_link_id, custom_user_profile_id,
-          conn_status, conn_type, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, security_code, security_code_verified_at, auth_err_counter,
-          peer_chat_min_version, peer_chat_max_version
+          conn_status, conn_type, local_alias, contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, security_code, security_code_verified_at, auth_err_counter
         FROM connections
         WHERE user_id = ? AND connection_id = ?
       |]

src/Simplex/Chat/Store/Files.hs

@@ -425,7 +425,7 @@ getChatRefByFileId db User {userId} fileId =
 createSndFileConnection_ :: DB.Connection -> UserId -> Int64 -> ConnId -> IO Connection
 createSndFileConnection_ db userId fileId agentConnId = do
   currentTs <- getCurrentTime
-  createConnection_ db userId ConnSndFile (Just fileId) agentConnId chatInitialVRange Nothing Nothing Nothing 0 currentTs
+  createConnection_ db userId ConnSndFile (Just fileId) agentConnId Nothing Nothing Nothing 0 currentTs
 
 updateSndFileStatus :: DB.Connection -> SndFileTransfer -> FileStatus -> IO ()
 updateSndFileStatus db SndFileTransfer {fileId, connId} status = do

src/Simplex/Chat/Store/Groups.hs

@@ -83,7 +83,6 @@ module Simplex.Chat.Store.Groups
     updateGroupSettings,
     getXGrpMemIntroContDirect,
     getXGrpMemIntroContGroup,
-    getHostConnId,
   )
 where
 
@@ -106,7 +105,6 @@ import Simplex.Messaging.Agent.Store.SQLite (firstRow, maybeFirstRow)
 import qualified Simplex.Messaging.Agent.Store.SQLite.DB as DB
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Util (eitherToMaybe)
-import Simplex.Messaging.Version
 import UnliftIO.STM
 
 type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Maybe ImageData, Maybe ProfileId, Maybe Bool, Maybe Bool, Bool, Maybe GroupPreferences) :. (UTCTime, UTCTime, Maybe UTCTime) :. GroupMemberRow
@@ -144,7 +142,7 @@ createGroupLink db User {userId} groupInfo@GroupInfo {groupId, localDisplayName}
       "INSERT INTO user_contact_links (user_id, group_id, group_link_id, local_display_name, conn_req_contact, group_link_member_role, auto_accept, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
       (userId, groupId, groupLinkId, "group_link_" <> localDisplayName, cReq, memberRole, True, currentTs, currentTs)
     userContactLinkId <- insertedRowId db
-    void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId chatInitialVRange Nothing Nothing Nothing 0 currentTs
+    void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId Nothing Nothing Nothing 0 currentTs
 
 getGroupLinkConnection :: DB.Connection -> User -> GroupInfo -> ExceptT StoreError IO Connection
 getGroupLinkConnection db User {userId} groupInfo@GroupInfo {groupId} =
@@ -153,8 +151,7 @@ getGroupLinkConnection db User {userId} groupInfo@GroupInfo {groupId} =
       db
       [sql|
         SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version
+          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
         FROM connections c
         JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
         WHERE c.user_id = ? AND uc.user_id = ? AND uc.group_id = ?
@@ -235,8 +232,7 @@ getGroupAndMember db User {userId, userContactId} groupMemberId =
           m.group_member_id, m.group_id, m.member_id, m.member_role, m.member_category, m.member_status,
           m.invited_by, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version
+          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
         FROM group_members m
         JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
         JOIN groups g ON g.group_id = m.group_id
@@ -482,21 +478,20 @@ getUserGroupsWithSummary db user _contactId_ search_ =
 -- the statuses on non-current members should match memberCurrent' function
 getGroupSummary :: DB.Connection -> User -> GroupId -> IO GroupSummary
 getGroupSummary db User {userId} groupId = do
-  currentMembers_ <-
-    maybeFirstRow fromOnly $
-      DB.query
-        db
-        [sql|
-          SELECT count (m.group_member_id)
-          FROM groups g
-          JOIN group_members m USING (group_id)
-          WHERE g.user_id = ?
-            AND g.group_id = ?
-            AND m.member_status != ?
-            AND m.member_status != ?
-            AND m.member_status != ?
-        |]
-        (userId, groupId, GSMemRemoved, GSMemLeft, GSMemInvited)
+  currentMembers_ <- maybeFirstRow fromOnly $
+    DB.query
+      db
+      [sql|
+        SELECT count (m.group_member_id)
+        FROM groups g
+        JOIN group_members m USING (group_id)
+        WHERE g.user_id = ?
+          AND g.group_id = ?
+          AND m.member_status != ?
+          AND m.member_status != ?
+          AND m.member_status != ?
+      |]
+      (userId, groupId, GSMemRemoved, GSMemLeft, GSMemInvited)
   pure GroupSummary {currentMembers = fromMaybe 0 currentMembers_}
 
 getContactGroupPreferences :: DB.Connection -> User -> Contact -> IO [FullGroupPreferences]
@@ -529,8 +524,7 @@ groupMemberQuery =
       m.group_member_id, m.group_id, m.member_id, m.member_role, m.member_category, m.member_status,
       m.invited_by, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-      c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-      c.peer_chat_min_version, c.peer_chat_max_version
+      c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
     FROM group_members m
     JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
     LEFT JOIN connections c ON c.connection_id = (
@@ -615,11 +609,11 @@ getGroupInvitation db user groupId =
         DB.query db "SELECT g.inv_queue_info FROM groups g WHERE g.group_id = ? AND g.user_id = ?" (groupId, userId)
 
 createNewContactMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupId -> Contact -> GroupMemberRole -> ConnId -> ConnReqInvitation -> ExceptT StoreError IO GroupMember
-createNewContactMember db gVar User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile, activeConn = Connection {peerChatVRange}} memberRole agentConnId connRequest =
+createNewContactMember db gVar User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile} memberRole agentConnId connRequest =
   createWithRandomId gVar $ \memId -> do
     createdAt <- liftIO getCurrentTime
     member@GroupMember {groupMemberId} <- createMember_ (MemberId memId) createdAt
-    void $ createMemberConnection_ db userId groupMemberId agentConnId peerChatVRange Nothing 0 createdAt
+    void $ createMemberConnection_ db userId groupMemberId agentConnId Nothing 0 createdAt
     pure member
   where
     createMember_ memberId createdAt = do
@@ -654,13 +648,13 @@ createNewContactMember db gVar User {userId, userContactId} groupId Contact {con
                 :. (userId, localDisplayName, contactId, localProfileId profile, connRequest, createdAt, createdAt)
             )
 
-createNewContactMemberAsync :: DB.Connection -> TVar ChaChaDRG -> User -> GroupId -> Contact -> GroupMemberRole -> (CommandId, ConnId) -> VersionRange -> ExceptT StoreError IO ()
-createNewContactMemberAsync db gVar user@User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile} memberRole (cmdId, agentConnId) peerChatVRange =
+createNewContactMemberAsync :: DB.Connection -> TVar ChaChaDRG -> User -> GroupId -> Contact -> GroupMemberRole -> (CommandId, ConnId) -> ExceptT StoreError IO ()
+createNewContactMemberAsync db gVar user@User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile} memberRole (cmdId, agentConnId) =
   createWithRandomId gVar $ \memId -> do
     createdAt <- liftIO getCurrentTime
     insertMember_ (MemberId memId) createdAt
     groupMemberId <- liftIO $ insertedRowId db
-    Connection {connId} <- createMemberConnection_ db userId groupMemberId agentConnId peerChatVRange Nothing 0 createdAt
+    Connection {connId} <- createMemberConnection_ db userId groupMemberId agentConnId Nothing 0 createdAt
     setCommandConnId db user cmdId connId
   where
     insertMember_ memberId createdAt =
@@ -676,32 +670,30 @@ createNewContactMemberAsync db gVar user@User {userId, userContactId} groupId Co
             :. (userId, localDisplayName, contactId, localProfileId profile, createdAt, createdAt)
         )
 
-getContactViaMember :: DB.Connection -> User -> GroupMember -> ExceptT StoreError IO Contact
+getContactViaMember :: DB.Connection -> User -> GroupMember -> IO (Maybe Contact)
 getContactViaMember db user@User {userId} GroupMember {groupMemberId} =
-  ExceptT $
-    firstRow (toContact user) (SEContactNotFoundByMemberId groupMemberId) $
-      DB.query
-        db
-        [sql|
-          SELECT
-            -- Contact
-            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
-            cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
-            -- Connection
-            c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
-            c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-            c.peer_chat_min_version, c.peer_chat_max_version
-          FROM contacts ct
-          JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
-          JOIN connections c ON c.connection_id = (
-            SELECT max(cc.connection_id)
-            FROM connections cc
-            where cc.contact_id = ct.contact_id
-          )
-          JOIN group_members m ON m.contact_id = ct.contact_id
-          WHERE ct.user_id = ? AND m.group_member_id = ? AND ct.deleted = 0
-        |]
-        (userId, groupMemberId)
+  maybeFirstRow (toContact user) $
+    DB.query
+      db
+      [sql|
+        SELECT
+          -- Contact
+          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
+          -- Connection
+          c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
+          c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
+        FROM contacts ct
+        JOIN contact_profiles cp ON cp.contact_profile_id = ct.contact_profile_id
+        JOIN connections c ON c.connection_id = (
+          SELECT max(cc.connection_id)
+          FROM connections cc
+          where cc.contact_id = ct.contact_id
+        )
+        JOIN group_members m ON m.contact_id = ct.contact_id
+        WHERE ct.user_id = ? AND m.group_member_id = ? AND ct.deleted = 0
+      |]
+      (userId, groupMemberId)
 
 setNewContactMemberConnRequest :: DB.Connection -> User -> GroupMember -> ConnReqInvitation -> IO ()
 setNewContactMemberConnRequest db User {userId} GroupMember {groupMemberId} connRequest = do
@@ -713,15 +705,15 @@ getMemberInvitation db User {userId} groupMemberId =
   fmap join . maybeFirstRow fromOnly $
     DB.query db "SELECT sent_inv_queue_info FROM group_members WHERE group_member_id = ? AND user_id = ?" (groupMemberId, userId)
 
-createMemberConnection :: DB.Connection -> UserId -> GroupMember -> ConnId -> VersionRange -> IO ()
-createMemberConnection db userId GroupMember {groupMemberId} agentConnId peerChatVRange = do
+createMemberConnection :: DB.Connection -> UserId -> GroupMember -> ConnId -> IO ()
+createMemberConnection db userId GroupMember {groupMemberId} agentConnId = do
   currentTs <- getCurrentTime
-  void $ createMemberConnection_ db userId groupMemberId agentConnId peerChatVRange Nothing 0 currentTs
+  void $ createMemberConnection_ db userId groupMemberId agentConnId Nothing 0 currentTs
 
-createMemberConnectionAsync :: DB.Connection -> User -> GroupMemberId -> (CommandId, ConnId) -> VersionRange -> IO ()
-createMemberConnectionAsync db user@User {userId} groupMemberId (cmdId, agentConnId) peerChatVRange = do
+createMemberConnectionAsync :: DB.Connection -> User -> GroupMemberId -> (CommandId, ConnId) -> IO ()
+createMemberConnectionAsync db user@User {userId} groupMemberId (cmdId, agentConnId) = do
   currentTs <- getCurrentTime
-  Connection {connId} <- createMemberConnection_ db userId groupMemberId agentConnId peerChatVRange Nothing 0 currentTs
+  Connection {connId} <- createMemberConnection_ db userId groupMemberId agentConnId Nothing 0 currentTs
   setCommandConnId db user cmdId connId
 
 updateGroupMemberStatus :: DB.Connection -> UserId -> GroupMember -> GroupMemberStatus -> IO ()
@@ -741,30 +733,25 @@ updateGroupMemberStatusById db userId groupMemberId memStatus = do
 
 -- | add new member with profile
 createNewGroupMember :: DB.Connection -> User -> GroupInfo -> MemberInfo -> GroupMemberCategory -> GroupMemberStatus -> ExceptT StoreError IO GroupMember
-createNewGroupMember db user gInfo memInfo memCategory memStatus = do
-  currentTs <- liftIO getCurrentTime
-  (localDisplayName, memProfileId) <- createNewMemberProfile_ db user memInfo currentTs
-  let newMember =
-        NewGroupMember
-          { memInfo,
-            memCategory,
-            memStatus,
-            memInvitedBy = IBUnknown,
-            localDisplayName,
-            memContactId = Nothing,
-            memProfileId
-          }
-  liftIO $ createNewMember_ db user gInfo newMember currentTs
-
-createNewMemberProfile_ :: DB.Connection -> User -> MemberInfo -> UTCTime -> ExceptT StoreError IO (Text, ProfileId)
-createNewMemberProfile_ db User {userId} (MemberInfo _ _ _ Profile {displayName, fullName, image, contactLink, preferences}) createdAt =
-  ExceptT . withLocalDisplayName db userId displayName $ \ldn -> do
+createNewGroupMember db user@User {userId} gInfo memInfo@(MemberInfo _ _ Profile {displayName, fullName, image, contactLink, preferences}) memCategory memStatus =
+  ExceptT . withLocalDisplayName db userId displayName $ \localDisplayName -> do
+    currentTs <- getCurrentTime
     DB.execute
       db
       "INSERT INTO contact_profiles (display_name, full_name, image, contact_link, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-      (displayName, fullName, image, contactLink, userId, preferences, createdAt, createdAt)
-    profileId <- insertedRowId db
-    pure $ Right (ldn, profileId)
+      (displayName, fullName, image, contactLink, userId, preferences, currentTs, currentTs)
+    memProfileId <- insertedRowId db
+    let newMember =
+          NewGroupMember
+            { memInfo,
+              memCategory,
+              memStatus,
+              memInvitedBy = IBUnknown,
+              localDisplayName,
+              memContactId = Nothing,
+              memProfileId
+            }
+    Right <$> createNewMember_ db user gInfo newMember currentTs
 
 createNewMember_ :: DB.Connection -> User -> GroupInfo -> NewGroupMember -> UTCTime -> IO GroupMember
 createNewMember_
@@ -772,7 +759,7 @@ createNewMember_
   User {userId, userContactId}
   GroupInfo {groupId}
   NewGroupMember
-    { memInfo = MemberInfo memberId memberRole _ memberProfile,
+    { memInfo = MemberInfo memberId memberRole memberProfile,
       memCategory = memberCategory,
       memStatus = memberStatus,
       memInvitedBy = invitedBy,
@@ -916,41 +903,43 @@ getIntroduction_ db reMember toMember = ExceptT $ do
   where
     toIntro :: [(Int64, Maybe ConnReqInvitation, Maybe ConnReqInvitation, GroupMemberIntroStatus)] -> Either StoreError GroupMemberIntro
     toIntro [(introId, groupConnReq, directConnReq, introStatus)] =
-      let introInvitation = IntroInvitation <$> groupConnReq <*> pure directConnReq
+      let introInvitation = IntroInvitation <$> groupConnReq <*> directConnReq
        in Right GroupMemberIntro {introId, reMember, toMember, introStatus, introInvitation}
     toIntro _ = Left SEIntroNotFound
 
-createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> MemberInfo -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> ExceptT StoreError IO GroupMember
-createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupMember {memberContactId, activeConn} memInfo@(MemberInfo _ _ memberChatVRange memberProfile) (groupCmdId, groupAgentConnId) directConnIds customUserProfileId = do
-  let mcvr = maybe chatInitialVRange fromChatVRange memberChatVRange
-      cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
+createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> MemberInfo -> (CommandId, ConnId) -> (CommandId, ConnId) -> Maybe ProfileId -> ExceptT StoreError IO GroupMember
+createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupMember {memberContactId, activeConn} memInfo@(MemberInfo _ _ memberProfile) (groupCmdId, groupAgentConnId) (directCmdId, directAgentConnId) customUserProfileId = do
+  let cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
   currentTs <- liftIO getCurrentTime
-  newMember <- case directConnIds of
-    Just (directCmdId, directAgentConnId) -> do
-      Connection {connId = directConnId} <- liftIO $ createConnection_ db userId ConnContact Nothing directAgentConnId mcvr memberContactId Nothing customUserProfileId cLevel currentTs
-      liftIO $ setCommandConnId db user directCmdId directConnId
-      (localDisplayName, contactId, memProfileId) <- createContact_ db userId directConnId memberProfile "" (Just groupId) currentTs Nothing
-      pure $ NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memInvitedBy = IBUnknown, localDisplayName, memContactId = Just contactId, memProfileId}
-    Nothing -> do
-      (localDisplayName, memProfileId) <- createNewMemberProfile_ db user memInfo currentTs
-      pure $ NewGroupMember {memInfo, memCategory = GCPreMember, memStatus = GSMemIntroduced, memInvitedBy = IBUnknown, localDisplayName, memContactId = Nothing, memProfileId}
+  Connection {connId = directConnId} <- liftIO $ createConnection_ db userId ConnContact Nothing directAgentConnId memberContactId Nothing customUserProfileId cLevel currentTs
+  liftIO $ setCommandConnId db user directCmdId directConnId
+  (localDisplayName, contactId, memProfileId) <- createContact_ db userId directConnId memberProfile "" (Just groupId) currentTs Nothing
   liftIO $ do
+    let newMember =
+          NewGroupMember
+            { memInfo,
+              memCategory = GCPreMember,
+              memStatus = GSMemIntroduced,
+              memInvitedBy = IBUnknown,
+              localDisplayName,
+              memContactId = Just contactId,
+              memProfileId
+            }
     member <- createNewMember_ db user gInfo newMember currentTs
-    conn@Connection {connId = groupConnId} <- createMemberConnection_ db userId (groupMemberId' member) groupAgentConnId mcvr memberContactId cLevel currentTs
+    conn@Connection {connId = groupConnId} <- createMemberConnection_ db userId (groupMemberId' member) groupAgentConnId memberContactId cLevel currentTs
     liftIO $ setCommandConnId db user groupCmdId groupConnId
     pure (member :: GroupMember) {activeConn = Just conn}
 
-createIntroToMemberContact :: DB.Connection -> User -> GroupMember -> GroupMember -> VersionRange -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> IO ()
-createIntroToMemberContact db user@User {userId} GroupMember {memberContactId = viaContactId, activeConn} _to@GroupMember {groupMemberId, localDisplayName} mcvr (groupCmdId, groupAgentConnId) directConnIds customUserProfileId = do
+createIntroToMemberContact :: DB.Connection -> User -> GroupMember -> GroupMember -> (CommandId, ConnId) -> (CommandId, ConnId) -> Maybe ProfileId -> IO ()
+createIntroToMemberContact db user@User {userId} GroupMember {memberContactId = viaContactId, activeConn} _to@GroupMember {groupMemberId, localDisplayName} (groupCmdId, groupAgentConnId) (directCmdId, directAgentConnId) customUserProfileId = do
   let cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
   currentTs <- getCurrentTime
-  Connection {connId = groupConnId} <- createMemberConnection_ db userId groupMemberId groupAgentConnId mcvr viaContactId cLevel currentTs
+  Connection {connId = groupConnId} <- createMemberConnection_ db userId groupMemberId groupAgentConnId viaContactId cLevel currentTs
   setCommandConnId db user groupCmdId groupConnId
-  forM_ directConnIds $ \(directCmdId, directAgentConnId) -> do
-    Connection {connId = directConnId} <- createConnection_ db userId ConnContact Nothing directAgentConnId mcvr viaContactId Nothing customUserProfileId cLevel currentTs
-    setCommandConnId db user directCmdId directConnId
-    contactId <- createMemberContact_ directConnId currentTs
-    updateMember_ contactId currentTs
+  Connection {connId = directConnId} <- createConnection_ db userId ConnContact Nothing directAgentConnId viaContactId Nothing customUserProfileId cLevel currentTs
+  setCommandConnId db user directCmdId directConnId
+  contactId <- createMemberContact_ directConnId currentTs
+  updateMember_ contactId currentTs
   where
     createMemberContact_ :: Int64 -> UTCTime -> IO Int64
     createMemberContact_ connId ts = do
@@ -977,8 +966,8 @@ createIntroToMemberContact db user@User {userId} GroupMember {memberContactId =
         |]
         [":contact_id" := contactId, ":updated_at" := ts, ":group_member_id" := groupMemberId]
 
-createMemberConnection_ :: DB.Connection -> UserId -> Int64 -> ConnId -> VersionRange -> Maybe Int64 -> Int -> UTCTime -> IO Connection
-createMemberConnection_ db userId groupMemberId agentConnId peerChatVRange viaContact = createConnection_ db userId ConnMember (Just groupMemberId) agentConnId peerChatVRange viaContact Nothing Nothing
+createMemberConnection_ :: DB.Connection -> UserId -> Int64 -> ConnId -> Maybe Int64 -> Int -> UTCTime -> IO Connection
+createMemberConnection_ db userId groupMemberId agentConnId viaContact = createConnection_ db userId ConnMember (Just groupMemberId) agentConnId viaContact Nothing Nothing
 
 getViaGroupMember :: DB.Connection -> User -> Contact -> IO (Maybe (GroupInfo, GroupMember))
 getViaGroupMember db User {userId, userContactId} Contact {contactId} =
@@ -998,8 +987,7 @@ getViaGroupMember db User {userId, userContactId} Contact {contactId} =
           m.group_member_id, m.group_id, m.member_id, m.member_role, m.member_category, m.member_status,
           m.invited_by, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, p.preferences,
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version
+          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
         FROM group_members m
         JOIN contacts ct ON ct.contact_id = m.contact_id
         JOIN contact_profiles p ON p.contact_profile_id = COALESCE(m.member_profile_id, m.contact_profile_id)
@@ -1032,8 +1020,7 @@ getViaGroupContact db user@User {userId} GroupMember {groupMemberId} =
           ct.contact_id, ct.contact_profile_id, ct.local_display_name, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, ct.via_group, ct.contact_used, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
           p.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts,
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version
+          c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
         FROM contacts ct
         JOIN contact_profiles p ON ct.contact_profile_id = p.contact_profile_id
         JOIN connections c ON c.connection_id = (
@@ -1349,9 +1336,3 @@ getXGrpMemIntroContGroup db User {userId} GroupMember {groupMemberId} = do
     toCont (hostConnId, connReq_) = case connReq_ of
       Just connReq -> Just (hostConnId, connReq)
       _ -> Nothing
-
-getHostConnId :: DB.Connection -> User -> GroupId -> ExceptT StoreError IO GroupMemberId
-getHostConnId db user@User {userId} groupId = do
-  hostMemberId <- getHostMemberId_ db user groupId
-  ExceptT . firstRow fromOnly (SEConnectionNotFoundByMemberId hostMemberId) $
-    DB.query db "SELECT connection_id FROM connections WHERE user_id = ? AND group_member_id = ?" (userId, hostMemberId)

src/Simplex/Chat/Store/Messages.hs

@@ -479,7 +479,6 @@ getDirectChatPreviews_ db user@User {userId} = do
           -- Connection
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.local_alias,
           c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version,
           -- ChatStats
           COALESCE(ChatStats.UnreadCount, 0), COALESCE(ChatStats.MinUnread, 0), ct.unread_chat,
           -- ChatItem
@@ -610,8 +609,7 @@ getContactRequestChatPreviews_ db User {userId} =
       [sql|
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id, cr.user_contact_link_id,
-          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at,
-          cr.peer_chat_min_version, cr.peer_chat_max_version
+          c.agent_conn_id, cr.contact_profile_id, p.display_name, p.full_name, p.image, p.contact_link, cr.xcontact_id, p.preferences, cr.created_at, cr.updated_at
         FROM contact_requests cr
         JOIN connections c ON c.user_contact_link_id = cr.user_contact_link_id
         JOIN contact_profiles p ON p.contact_profile_id = cr.contact_profile_id

src/Simplex/Chat/Store/Migrations.hs

@@ -77,7 +77,6 @@ import Simplex.Chat.Migrations.M20230705_delivery_receipts
 import Simplex.Chat.Migrations.M20230721_group_snd_item_statuses
 import Simplex.Chat.Migrations.M20230814_indexes
 import Simplex.Chat.Migrations.M20230827_file_encryption
-import Simplex.Chat.Migrations.M20230829_connections_chat_vrange
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -154,8 +153,7 @@ schemaMigrations =
     ("20230705_delivery_receipts", m20230705_delivery_receipts, Just down_m20230705_delivery_receipts),
     ("20230721_group_snd_item_statuses", m20230721_group_snd_item_statuses, Just down_m20230721_group_snd_item_statuses),
     ("20230814_indexes", m20230814_indexes, Just down_m20230814_indexes),
-    ("20230827_file_encryption", m20230827_file_encryption, Just down_m20230827_file_encryption),
-    ("20230829_connections_chat_vrange", m20230829_connections_chat_vrange, Just down_m20230829_connections_chat_vrange)
+    ("20230827_file_encryption", m20230827_file_encryption, Just down_m20230827_file_encryption)
   ]
 
 -- | The list of migrations in ascending order by date

src/Simplex/Chat/Store/Profiles.hs

@@ -302,7 +302,7 @@ createUserContactLink db User {userId} agentConnId cReq =
       "INSERT INTO user_contact_links (user_id, conn_req_contact, created_at, updated_at) VALUES (?,?,?,?)"
       (userId, cReq, currentTs, currentTs)
     userContactLinkId <- insertedRowId db
-    void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId chatInitialVRange Nothing Nothing Nothing 0 currentTs
+    void $ createConnection_ db userId ConnUserContact (Just userContactLinkId) agentConnId Nothing Nothing Nothing 0 currentTs
 
 getUserAddressConnections :: DB.Connection -> User -> ExceptT StoreError IO [Connection]
 getUserAddressConnections db User {userId} = do
@@ -316,8 +316,7 @@ getUserAddressConnections db User {userId} = do
           db
           [sql|
             SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
-              c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-              c.peer_chat_min_version, c.peer_chat_max_version
+              c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter
             FROM connections c
             JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id
             WHERE c.user_id = ? AND uc.user_id = ? AND uc.local_display_name = '' AND uc.group_id IS NULL
@@ -332,7 +331,6 @@ getUserContactLinks db User {userId} =
       [sql|
         SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id,
           c.conn_status, c.conn_type, c.local_alias, c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.auth_err_counter,
-          c.peer_chat_min_version, c.peer_chat_max_version,
           uc.user_contact_link_id, uc.conn_req_contact, uc.group_id
         FROM connections c
         JOIN user_contact_links uc ON c.user_contact_link_id = uc.user_contact_link_id

src/Simplex/Chat/Store/Shared.hs

@@ -17,8 +17,8 @@ import Control.Monad.Except
 import Crypto.Random (ChaChaDRG, randomBytesGenerate)
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as J
-import qualified Data.ByteString.Base64 as B64
 import Data.ByteString.Char8 (ByteString)
+import qualified Data.ByteString.Base64 as B64
 import Data.Int (Int64)
 import Data.Maybe (fromMaybe, isJust, listToMaybe)
 import Data.Text (Text)
@@ -37,7 +37,6 @@ import Simplex.Messaging.Agent.Store.SQLite (firstRow, maybeFirstRow)
 import qualified Simplex.Messaging.Agent.Store.SQLite.DB as DB
 import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
 import Simplex.Messaging.Util (allFinally)
-import Simplex.Messaging.Version
 import UnliftIO.STM
 
 -- These error type constructors must be added to mobile apps
@@ -51,7 +50,6 @@ data StoreError
   | SEUserNotFoundByContactRequestId {contactRequestId :: Int64}
   | SEContactNotFound {contactId :: ContactId}
   | SEContactNotFoundByName {contactName :: ContactName}
-  | SEContactNotFoundByMemberId {groupMemberId :: GroupMemberId}
   | SEContactNotReady {contactName :: ContactName}
   | SEDuplicateContactLink
   | SEUserContactLinkNotFound
@@ -79,7 +77,6 @@ data StoreError
   | SERcvFileNotFoundXFTP {agentRcvFileId :: AgentRcvFileId}
   | SEConnectionNotFound {agentConnId :: AgentConnId}
   | SEConnectionNotFoundById {connId :: Int64}
-  | SEConnectionNotFoundByMemberId {groupMemberId :: GroupMemberId}
   | SEPendingConnectionNotFound {connId :: Int64}
   | SEIntroNotFound
   | SEUniqueID
@@ -135,16 +132,15 @@ toFileInfo (fileId, fileStatus, filePath) = CIFileInfo {fileId, fileStatus, file
 
 type EntityIdsRow = (Maybe Int64, Maybe Int64, Maybe Int64, Maybe Int64, Maybe Int64)
 
-type ConnectionRow = (Int64, ConnId, Int, Maybe Int64, Maybe Int64, Bool, Maybe GroupLinkId, Maybe Int64, ConnStatus, ConnType, LocalAlias) :. EntityIdsRow :. (UTCTime, Maybe Text, Maybe UTCTime, Int, Version, Version)
+type ConnectionRow = (Int64, ConnId, Int, Maybe Int64, Maybe Int64, Bool, Maybe GroupLinkId, Maybe Int64, ConnStatus, ConnType, LocalAlias) :. EntityIdsRow :. (UTCTime, Maybe Text, Maybe UTCTime, Int)
 
-type MaybeConnectionRow = (Maybe Int64, Maybe ConnId, Maybe Int, Maybe Int64, Maybe Int64, Maybe Bool, Maybe GroupLinkId, Maybe Int64, Maybe ConnStatus, Maybe ConnType, Maybe LocalAlias) :. EntityIdsRow :. (Maybe UTCTime, Maybe Text, Maybe UTCTime, Maybe Int, Maybe Version, Maybe Version)
+type MaybeConnectionRow = (Maybe Int64, Maybe ConnId, Maybe Int, Maybe Int64, Maybe Int64, Maybe Bool, Maybe GroupLinkId, Maybe Int64, Maybe ConnStatus, Maybe ConnType, Maybe LocalAlias) :. EntityIdsRow :. (Maybe UTCTime, Maybe Text, Maybe UTCTime, Maybe Int)
 
 toConnection :: ConnectionRow -> Connection
-toConnection ((connId, acId, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (createdAt, code_, verifiedAt_, authErrCounter, minVer, maxVer)) =
+toConnection ((connId, acId, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (createdAt, code_, verifiedAt_, authErrCounter)) =
   let entityId = entityId_ connType
       connectionCode = SecurityCode <$> code_ <*> verifiedAt_
-      peerChatVRange = fromMaybe (versionToRange maxVer) $ safeVersionRange minVer maxVer
-   in Connection {connId, agentConnId = AgentConnId acId, peerChatVRange, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias, entityId, connectionCode, authErrCounter, createdAt}
+   in Connection {connId, agentConnId = AgentConnId acId, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias, entityId, connectionCode, authErrCounter, createdAt}
   where
     entityId_ :: ConnType -> Maybe Int64
     entityId_ ConnContact = contactId
@@ -154,12 +150,12 @@ toConnection ((connId, acId, connLevel, viaContact, viaUserContactLink, viaGroup
     entityId_ ConnUserContact = userContactLinkId
 
 toMaybeConnection :: MaybeConnectionRow -> Maybe Connection
-toMaybeConnection ((Just connId, Just agentConnId, Just connLevel, viaContact, viaUserContactLink, Just viaGroupLink, groupLinkId, customUserProfileId, Just connStatus, Just connType, Just localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (Just createdAt, code_, verifiedAt_, Just authErrCounter, Just minVer, Just maxVer)) =
-  Just $ toConnection ((connId, agentConnId, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (createdAt, code_, verifiedAt_, authErrCounter, minVer, maxVer))
+toMaybeConnection ((Just connId, Just agentConnId, Just connLevel, viaContact, viaUserContactLink, Just viaGroupLink, groupLinkId, customUserProfileId, Just connStatus, Just connType, Just localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (Just createdAt, code_, verifiedAt_, Just authErrCounter)) =
+  Just $ toConnection ((connId, agentConnId, connLevel, viaContact, viaUserContactLink, viaGroupLink, groupLinkId, customUserProfileId, connStatus, connType, localAlias) :. (contactId, groupMemberId, sndFileId, rcvFileId, userContactLinkId) :. (createdAt, code_, verifiedAt_, authErrCounter))
 toMaybeConnection _ = Nothing
 
-createConnection_ :: DB.Connection -> UserId -> ConnType -> Maybe Int64 -> ConnId -> VersionRange -> Maybe ContactId -> Maybe Int64 -> Maybe ProfileId -> Int -> UTCTime -> IO Connection
-createConnection_ db userId connType entityId acId peerChatVRange@(VersionRange minV maxV) viaContact viaUserContactLink customUserProfileId connLevel currentTs = do
+createConnection_ :: DB.Connection -> UserId -> ConnType -> Maybe Int64 -> ConnId -> Maybe ContactId -> Maybe Int64 -> Maybe ProfileId -> Int -> UTCTime -> IO Connection
+createConnection_ db userId connType entityId acId viaContact viaUserContactLink customUserProfileId connLevel currentTs = do
   viaLinkGroupId :: Maybe Int64 <- fmap join . forM viaUserContactLink $ \ucLinkId ->
     maybeFirstRow fromOnly $ DB.query db "SELECT group_id FROM user_contact_links WHERE user_id = ? AND user_contact_link_id = ? AND group_id IS NOT NULL" (userId, ucLinkId)
   let viaGroupLink = isJust viaLinkGroupId
@@ -168,30 +164,17 @@ createConnection_ db userId connType entityId acId peerChatVRange@(VersionRange
     [sql|
       INSERT INTO connections (
         user_id, agent_conn_id, conn_level, via_contact, via_user_contact_link, via_group_link, custom_user_profile_id, conn_status, conn_type,
-        contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, updated_at,
-        peer_chat_min_version, peer_chat_max_version
-      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+        contact_id, group_member_id, snd_file_id, rcv_file_id, user_contact_link_id, created_at, updated_at
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
     |]
     ( (userId, acId, connLevel, viaContact, viaUserContactLink, viaGroupLink, customUserProfileId, ConnNew, connType)
         :. (ent ConnContact, ent ConnMember, ent ConnSndFile, ent ConnRcvFile, ent ConnUserContact, currentTs, currentTs)
-        :. (minV, maxV)
     )
   connId <- insertedRowId db
-  pure Connection {connId, agentConnId = AgentConnId acId, peerChatVRange, connType, entityId, viaContact, viaUserContactLink, viaGroupLink, groupLinkId = Nothing, customUserProfileId, connLevel, connStatus = ConnNew, localAlias = "", createdAt = currentTs, connectionCode = Nothing, authErrCounter = 0}
+  pure Connection {connId, agentConnId = AgentConnId acId, connType, entityId, viaContact, viaUserContactLink, viaGroupLink, groupLinkId = Nothing, customUserProfileId, connLevel, connStatus = ConnNew, localAlias = "", createdAt = currentTs, connectionCode = Nothing, authErrCounter = 0}
   where
     ent ct = if connType == ct then entityId else Nothing
 
-setPeerChatVRange :: DB.Connection -> Int64 -> VersionRange -> IO ()
-setPeerChatVRange db connId (VersionRange minVer maxVer) =
-  DB.execute
-    db
-    [sql|
-      UPDATE connections
-      SET peer_chat_min_version = ?, peer_chat_max_version = ?
-      WHERE connection_id = ?
-    |]
-    (minVer, maxVer, connId)
-
 setCommandConnId :: DB.Connection -> User -> CommandId -> Int64 -> IO ()
 setCommandConnId db User {userId} cmdId connId = do
   updatedAt <- getCurrentTime
@@ -273,13 +256,12 @@ getProfileById db userId profileId =
     toProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Preferences) -> LocalProfile
     toProfile (displayName, fullName, image, contactLink, localAlias, preferences) = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
 
-type ContactRequestRow = (Int64, ContactName, AgentInvId, Int64, AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact) :. (Maybe XContactId, Maybe Preferences, UTCTime, UTCTime, Version, Version)
+type ContactRequestRow = (Int64, ContactName, AgentInvId, Int64, AgentConnId, Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact) :. (Maybe XContactId, Maybe Preferences, UTCTime, UTCTime)
 
 toContactRequest :: ContactRequestRow -> UserContactRequest
-toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, userContactLinkId, agentContactConnId, profileId, displayName, fullName, image, contactLink) :. (xContactId, preferences, createdAt, updatedAt, minVer, maxVer)) = do
+toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, userContactLinkId, agentContactConnId, profileId, displayName, fullName, image, contactLink) :. (xContactId, preferences, createdAt, updatedAt)) = do
   let profile = Profile {displayName, fullName, image, contactLink, preferences}
-      cReqChatVRange = fromMaybe (versionToRange maxVer) $ safeVersionRange minVer maxVer
-   in UserContactRequest {contactRequestId, agentInvitationId, userContactLinkId, agentContactConnId, cReqChatVRange, localDisplayName, profileId, profile, xContactId, createdAt, updatedAt}
+   in UserContactRequest {contactRequestId, agentInvitationId, userContactLinkId, agentContactConnId, localDisplayName, profileId, profile, xContactId, createdAt, updatedAt}
 
 userQuery :: Query
 userQuery =

src/Simplex/Chat/Types.hs

@@ -47,7 +47,6 @@ import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, fromTextField_, sumTypeJSON, taggedObjectJSON)
 import Simplex.Messaging.Protocol (ProtoServerWithAuth, ProtocolTypeI)
 import Simplex.Messaging.Util ((<$?>))
-import Simplex.Messaging.Version
 
 class IsContact a where
   contactId' :: a -> ContactId
@@ -233,7 +232,6 @@ data UserContactRequest = UserContactRequest
     agentInvitationId :: AgentInvId,
     userContactLinkId :: Int64,
     agentContactConnId :: AgentConnId, -- connection id of user contact
-    cReqChatVRange :: VersionRange,
     localDisplayName :: ContactName,
     profileId :: Int64,
     profile :: Profile,
@@ -540,31 +538,24 @@ instance ToJSON MemberIdRole where toEncoding = J.genericToEncoding J.defaultOpt
 
 data IntroInvitation = IntroInvitation
   { groupConnReq :: ConnReqInvitation,
-    directConnReq :: Maybe ConnReqInvitation
+    directConnReq :: ConnReqInvitation
   }
   deriving (Eq, Show, Generic, FromJSON)
 
-instance ToJSON IntroInvitation where
-  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
-  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+instance ToJSON IntroInvitation where toEncoding = J.genericToEncoding J.defaultOptions
 
 data MemberInfo = MemberInfo
   { memberId :: MemberId,
     memberRole :: GroupMemberRole,
-    v :: Maybe ChatVersionRange,
     profile :: Profile
   }
   deriving (Eq, Show, Generic, FromJSON)
 
-instance ToJSON MemberInfo where
-  toJSON = J.genericToJSON J.defaultOptions {J.omitNothingFields = True}
-  toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
+instance ToJSON MemberInfo where toEncoding = J.genericToEncoding J.defaultOptions
 
 memberInfo :: GroupMember -> MemberInfo
-memberInfo GroupMember {memberId, memberRole, memberProfile, activeConn} =
-  MemberInfo memberId memberRole memberChatVRange (fromLocalProfile memberProfile)
-  where
-    memberChatVRange = ChatVersionRange . peerChatVRange <$> activeConn
+memberInfo GroupMember {memberId, memberRole, memberProfile} =
+  MemberInfo memberId memberRole (fromLocalProfile memberProfile)
 
 data ReceivedGroupInvitation = ReceivedGroupInvitation
   { fromMember :: GroupMember,
@@ -1167,7 +1158,6 @@ type ConnReqContact = ConnectionRequestUri 'CMContact
 data Connection = Connection
   { connId :: Int64,
     agentConnId :: AgentConnId,
-    peerChatVRange :: VersionRange,
     connLevel :: Int,
     viaContact :: Maybe Int64, -- group member contact ID, if not direct connection
     viaUserContactLink :: Maybe Int64, -- user contact link ID, if connected via "user address"
@@ -1478,15 +1468,3 @@ instance ProtocolTypeI p => ToJSON (ServerCfg p) where
 
 instance ProtocolTypeI p => FromJSON (ServerCfg p) where
   parseJSON = J.genericParseJSON J.defaultOptions {J.omitNothingFields = True}
-
-newtype ChatVersionRange = ChatVersionRange {fromChatVRange :: VersionRange} deriving (Eq, Show)
-
-chatInitialVRange :: VersionRange
-chatInitialVRange = versionToRange 1
-
-instance FromJSON ChatVersionRange where
-  parseJSON v = ChatVersionRange <$> strParseJSON "ChatVersionRange" v
-
-instance ToJSON ChatVersionRange where
-  toJSON (ChatVersionRange vr) = strToJSON vr
-  toEncoding (ChatVersionRange vr) = strToJEncoding vr

src/Simplex/Chat/View.hs

@@ -59,7 +59,6 @@ import Simplex.Messaging.Protocol (AProtoServerWithAuth (..), AProtocolType, Pro
 import qualified Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.Transport.Client (TransportHost (..))
 import Simplex.Messaging.Util (bshow, tshow)
-import Simplex.Messaging.Version hiding (version)
 import System.Console.ANSI.Types
 
 type CurrentTime = UTCTime
@@ -953,7 +952,7 @@ viewNetworkConfig NetworkConfig {socksProxy, tcpTimeout} =
   ]
 
 viewContactInfo :: Contact -> ConnectionStats -> Maybe Profile -> [StyledString]
-viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}, activeConn} stats incognitoProfile =
+viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}} stats incognitoProfile =
   ["contact ID: " <> sShow contactId]
     <> viewConnectionStats stats
     <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) l]) contactLink
@@ -963,7 +962,6 @@ viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, conta
       incognitoProfile
     <> ["alias: " <> plain localAlias | localAlias /= ""]
     <> [viewConnectionVerified (contactSecurityCode ct)]
-    <> [viewPeerChatVRange (peerChatVRange activeConn)]
 
 viewGroupInfo :: GroupInfo -> GroupSummary -> [StyledString]
 viewGroupInfo GroupInfo {groupId} s =
@@ -972,22 +970,18 @@ viewGroupInfo GroupInfo {groupId} s =
   ]
 
 viewGroupMemberInfo :: GroupInfo -> GroupMember -> Maybe ConnectionStats -> [StyledString]
-viewGroupMemberInfo GroupInfo {groupId} m@GroupMember {groupMemberId, memberProfile = LocalProfile {localAlias}, activeConn} stats =
+viewGroupMemberInfo GroupInfo {groupId} m@GroupMember {groupMemberId, memberProfile = LocalProfile {localAlias}} stats =
   [ "group ID: " <> sShow groupId,
     "member ID: " <> sShow groupMemberId
   ]
     <> maybe ["member not connected"] viewConnectionStats stats
     <> ["alias: " <> plain localAlias | localAlias /= ""]
     <> [viewConnectionVerified (memberSecurityCode m) | isJust stats]
-    <> maybe [] (\ac -> [viewPeerChatVRange (peerChatVRange ac)]) activeConn
 
 viewConnectionVerified :: Maybe SecurityCode -> StyledString
 viewConnectionVerified (Just _) = "connection verified" -- TODO show verification time?
 viewConnectionVerified _ = "connection not verified, use " <> highlight' "/code" <> " command to see security code"
 
-viewPeerChatVRange :: VersionRange -> StyledString
-viewPeerChatVRange (VersionRange minVer maxVer) = "peer chat protocol version range: (" <> sShow minVer <> ", " <> sShow maxVer <> ")"
-
 viewConnectionStats :: ConnectionStats -> [StyledString]
 viewConnectionStats ConnectionStats {rcvQueuesInfo, sndQueuesInfo} =
   ["receiving messages via: " <> viewRcvQueuesInfo rcvQueuesInfo | not $ null rcvQueuesInfo]

stack.yaml

@@ -49,7 +49,7 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: 351f42650c57f310fc1ea858ff9b7178823f1fd4
+    commit: 980e5c4d1ec15f44290542fd2a5d1c08456f00d1
   - github: kazu-yamamoto/http2
     commit: b5a1b7200cf5bc7044af34ba325284271f6dff25
   # - ../direct-sqlcipher

tests/Bots/DirectoryTests.hs

@@ -13,14 +13,13 @@ import Control.Monad (forM_)
 import Directory.Options
 import Directory.Service
 import Directory.Store
-import GHC.IO.Handle (hClose)
 import Simplex.Chat.Bot.KnownContacts
-import Simplex.Chat.Controller (ChatConfig (..))
 import Simplex.Chat.Core
 import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..))
 import Simplex.Chat.Types (GroupMemberRole (..), Profile (..))
 import System.FilePath ((</>))
 import Test.Hspec
+import GHC.IO.Handle (hClose)
 
 directoryServiceTests :: SpecWith FilePath
 directoryServiceTests = do
@@ -233,10 +232,10 @@ testJoinGroup tmp =
                 dan <## "bob (Bob): contact is connected"
                 dan <## "#privacy: you joined the group"
                 dan <# ("#privacy bob> " <> welcomeMsg)
-                dan
-                  <### [ "#privacy: member SimpleX-Directory is connected",
-                         "#privacy: member cath (Catherine) is connected"
-                       ],
+                dan <###
+                  [ "#privacy: member SimpleX-Directory is connected",
+                    "#privacy: member cath (Catherine) is connected"
+                  ],
               do
                 cath <## "#privacy: bob added dan (Daniel) to the group (connecting...)"
                 cath <## "#privacy: new member dan is connected"
@@ -244,9 +243,9 @@ testJoinGroup tmp =
 
 testDelistedOwnerLeaves :: HasCallStack => FilePath -> IO ()
 testDelistedOwnerLeaves tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -260,9 +259,9 @@ testDelistedOwnerLeaves tmp =
 
 testDelistedOwnerRemoved :: HasCallStack => FilePath -> IO ()
 testDelistedOwnerRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -275,9 +274,9 @@ testDelistedOwnerRemoved tmp =
 
 testNotDelistedMemberLeaves :: HasCallStack => FilePath -> IO ()
 testNotDelistedMemberLeaves tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -287,10 +286,10 @@ testNotDelistedMemberLeaves tmp =
         groupFound cath "privacy"
 
 testNotDelistedMemberRemoved :: HasCallStack => FilePath -> IO ()
-testNotDelistedMemberRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+testNotDelistedMemberRemoved tmp = 
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -300,9 +299,9 @@ testNotDelistedMemberRemoved tmp =
 
 testDelistedServiceRemoved :: HasCallStack => FilePath -> IO ()
 testDelistedServiceRemoved tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -317,9 +316,9 @@ testDelistedServiceRemoved tmp =
 
 testDelistedRoleChanges :: HasCallStack => FilePath -> IO ()
 testDelistedRoleChanges tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -363,9 +362,9 @@ testDelistedRoleChanges tmp =
 
 testNotDelistedMemberRoleChanged :: HasCallStack => FilePath -> IO ()
 testNotDelistedMemberRoleChanged tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -427,9 +426,9 @@ testNotApprovedBadRoles tmp =
 
 testRegOwnerChangedProfile :: HasCallStack => FilePath -> IO ()
 testRegOwnerChangedProfile tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -446,9 +445,9 @@ testRegOwnerChangedProfile tmp =
 
 testAnotherOwnerChangedProfile :: HasCallStack => FilePath -> IO ()
 testAnotherOwnerChangedProfile tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -465,9 +464,9 @@ testAnotherOwnerChangedProfile tmp =
 
 testRegOwnerRemovedLink :: HasCallStack => FilePath -> IO ()
 testRegOwnerRemovedLink tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -498,9 +497,9 @@ testRegOwnerRemovedLink tmp =
 
 testAnotherOwnerRemovedLink :: HasCallStack => FilePath -> IO ()
 testAnotherOwnerRemovedLink tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
         addCathAsOwner bob cath
@@ -647,9 +646,9 @@ testDuplicateProhibitApproval tmp =
 
 testListUserGroups :: HasCallStack => FilePath -> IO ()
 testListUserGroups tmp =
-  withDirectoryServiceCfg tmp testCfgCreateGroupDirect $ \superUser dsLink ->
-    withNewTestChatCfg tmp testCfgCreateGroupDirect "bob" bobProfile $ \bob ->
-      withNewTestChatCfg tmp testCfgCreateGroupDirect "cath" cathProfile $ \cath -> do
+  withDirectoryService tmp $ \superUser dsLink ->
+    withNewTestChat tmp "bob" bobProfile $ \bob ->
+      withNewTestChat tmp "cath" cathProfile $ \cath -> do
         bob `connectVia` dsLink
         cath `connectVia` dsLink
         registerGroup superUser bob "privacy" "Privacy"
@@ -687,15 +686,15 @@ testRestoreDirectory tmp = do
     withTestChat tmp "bob" $ \bob ->
       withTestChat tmp "cath" $ \cath -> do
         bob <## "2 contacts connected (use /cs for the list)"
-        bob
-          <### [ "#privacy (Privacy): connected to server(s)",
-                 "#security (Security): connected to server(s)"
-               ]
+        bob <###
+          [ "#privacy (Privacy): connected to server(s)",
+            "#security (Security): connected to server(s)"
+          ] 
         cath <## "2 contacts connected (use /cs for the list)"
-        cath
-          <### [ "#privacy (Privacy): connected to server(s)",
-                 "#anonymity (Anonymity): connected to server(s)"
-               ]
+        cath <###
+          [ "#privacy (Privacy): connected to server(s)",
+            "#anonymity (Anonymity): connected to server(s)"
+          ]
         listGroups superUser bob cath
         groupFoundN 3 bob "privacy"
         groupFound bob "security"
@@ -785,17 +784,14 @@ addCathAsOwner bob cath = do
   cath <## "#privacy: member SimpleX-Directory is connected"
 
 withDirectoryService :: HasCallStack => FilePath -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryService tmp = withDirectoryServiceCfg tmp testCfg
-
-withDirectoryServiceCfg :: HasCallStack => FilePath -> ChatConfig -> (TestCC -> String -> IO ()) -> IO ()
-withDirectoryServiceCfg tmp cfg test = do
+withDirectoryService tmp test = do
   dsLink <-
-    withNewTestChatCfg tmp cfg serviceDbPrefix directoryProfile $ \ds ->
-      withNewTestChatCfg tmp cfg "super_user" aliceProfile $ \superUser -> do
+    withNewTestChat tmp serviceDbPrefix directoryProfile $ \ds ->
+      withNewTestChat tmp "super_user" aliceProfile $ \superUser -> do
         connectUsers ds superUser
         ds ##> "/ad"
         getContactLink ds True
-  withDirectory tmp cfg dsLink test
+  withDirectory tmp dsLink test
 
 restoreDirectoryService :: HasCallStack => FilePath -> Int -> Int -> (TestCC -> String -> IO ()) -> IO ()
 restoreDirectoryService tmp ctCount grCount test = do
@@ -804,29 +800,29 @@ restoreDirectoryService tmp ctCount grCount test = do
       ds <## (show ctCount <> " contacts connected (use /cs for the list)")
       ds <## "Your address is active! To show: /sa"
       ds <## (show grCount <> " group links active")
-      forM_ [1 .. grCount] $ \_ -> ds <##. "#"
+      forM_ [1..grCount] $ \_ -> ds <##. "#"
       ds ##> "/sa"
       dsLink <- getContactLink ds False
       ds <## "auto_accept on"
       pure dsLink
-  withDirectory tmp testCfg dsLink test
+  withDirectory tmp dsLink test
 
-withDirectory :: HasCallStack => FilePath -> ChatConfig -> String -> (TestCC -> String -> IO ()) -> IO ()
-withDirectory tmp cfg dsLink test = do
+withDirectory :: HasCallStack => FilePath -> String -> (TestCC -> String -> IO ()) -> IO ()
+withDirectory tmp dsLink test = do
   let opts = mkDirectoryOpts tmp [KnownContact 2 "alice"]
-  runDirectory cfg opts $
-    withTestChatCfg tmp cfg "super_user" $ \superUser -> do
+  runDirectory opts $
+    withTestChat tmp "super_user" $ \superUser -> do
       superUser <## "1 contacts connected (use /cs for the list)"
       test superUser dsLink
 
-runDirectory :: ChatConfig -> DirectoryOpts -> IO () -> IO ()
-runDirectory cfg opts@DirectoryOpts {directoryLog} action = do
+runDirectory :: DirectoryOpts -> IO () -> IO ()
+runDirectory opts@DirectoryOpts {directoryLog} action = do
   st <- restoreDirectoryStore directoryLog
   t <- forkIO $ bot st
   threadDelay 500000
   action `finally` (mapM_ hClose (directoryLogFile st) >> killThread t)
   where
-    bot st = simplexChatCore cfg (mkChatOpts opts) Nothing $ directoryService st opts
+    bot st = simplexChatCore testCfg (mkChatOpts opts) Nothing $ directoryService st opts
 
 registerGroup :: TestCC -> TestCC -> String -> String -> IO ()
 registerGroup su u n fn = registerGroupId su u n fn 1 1

tests/ChatClient.hs

@@ -133,16 +133,6 @@ testAgentCfgV1 =
 testCfgV1 :: ChatConfig
 testCfgV1 = testCfg {agentConfig = testAgentCfgV1}
 
-testCfgCreateGroupDirect :: ChatConfig
-testCfgCreateGroupDirect =
-  mkCfgCreateGroupDirect testCfg
-
-mkCfgCreateGroupDirect :: ChatConfig -> ChatConfig
-mkCfgCreateGroupDirect cfg = cfg {chatVRange = groupCreateDirectVRange}
-
-groupCreateDirectVRange :: VersionRange
-groupCreateDirectVRange = mkVersionRange 1 1
-
 createTestChat :: FilePath -> ChatConfig -> ChatOpts -> String -> Profile -> IO TestCC
 createTestChat tmp cfg opts@ChatOpts {coreOptions = CoreChatOpts {dbKey}} dbPrefix profile = do
   Right db@ChatDatabase {chatStore} <- createChatDatabase (tmp </> dbPrefix) dbKey MCError
@@ -298,10 +288,7 @@ testChatCfgOpts3 cfg opts p1 p2 p3 test = testChatN cfg opts [p1, p2, p3] test_
     test_ _ = error "expected 3 chat clients"
 
 testChat4 :: HasCallStack => Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-testChat4 = testChatCfg4 testCfg
-
-testChatCfg4 :: HasCallStack => ChatConfig -> Profile -> Profile -> Profile -> Profile -> (HasCallStack => TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> FilePath -> IO ()
-testChatCfg4 cfg p1 p2 p3 p4 test = testChatN cfg testOpts [p1, p2, p3, p4] test_
+testChat4 p1 p2 p3 p4 test = testChatN testCfg testOpts [p1, p2, p3, p4] test_
   where
     test_ :: HasCallStack => [TestCC] -> IO ()
     test_ [tc1, tc2, tc3, tc4] = test tc1 tc2 tc3 tc4

tests/ChatTests/Direct.hs

@@ -17,11 +17,9 @@ import qualified Data.ByteString.Lazy.Char8 as LB
 import Simplex.Chat.Call
 import Simplex.Chat.Controller (ChatConfig (..))
 import Simplex.Chat.Options (ChatOpts (..))
-import Simplex.Chat.Protocol (supportedChatVRange)
 import Simplex.Chat.Store (agentStoreFile, chatStoreFile)
 import Simplex.Chat.Types (authErrDisableCount, sameVerificationCode, verificationCode)
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Version
 import System.Directory (copyFile, doesDirectoryExist, doesFileExist)
 import System.FilePath ((</>))
 import Test.Hspec
@@ -96,21 +94,6 @@ chatDirectTests = do
   describe "delivery receipts" $ do
     it "should send delivery receipts" testSendDeliveryReceipts
     it "should send delivery receipts depending on configuration" testConfigureDeliveryReceipts
-  describe "negotiate connection peer chat protocol version range" $ do
-    describe "peer version range correctly set for new connection via invitation" $ do
-      testInvVRange supportedChatVRange supportedChatVRange
-      testInvVRange supportedChatVRange vr11
-      testInvVRange vr11 supportedChatVRange
-      testInvVRange vr11 vr11
-    describe "peer version range correctly set for new connection via contact request" $ do
-      testReqVRange supportedChatVRange supportedChatVRange
-      testReqVRange supportedChatVRange vr11
-      testReqVRange vr11 supportedChatVRange
-      testReqVRange vr11 vr11
-    it "update peer version range on received messages" testUpdatePeerChatVRange
-  where
-    testInvVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnInvChatVRange vr1 vr2
-    testReqVRange vr1 vr2 = it (vRangeStr vr1 <> " - " <> vRangeStr vr2) $ testConnReqChatVRange vr1 vr2
 
 testAddContact :: HasCallStack => SpecWith FilePath
 testAddContact = versionTestMatrix2 runTestAddContact
@@ -1956,7 +1939,8 @@ testMarkContactVerified =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     connectUsers alice bob
     alice ##> "/i bob"
-    bobInfo alice False
+    bobInfo alice
+    alice <## "connection not verified, use /code command to see security code"
     alice ##> "/code bob"
     bCode <- getTermLine alice
     bob ##> "/code alice"
@@ -1967,31 +1951,28 @@ testMarkContactVerified =
     alice ##> ("/verify bob " <> aCode)
     alice <## "connection verified"
     alice ##> "/i bob"
-    bobInfo alice True
+    bobInfo alice
+    alice <## "connection verified"
     alice ##> "/verify bob"
     alice <##. "connection not verified, current code is "
     alice ##> "/i bob"
-    bobInfo alice False
+    bobInfo alice
+    alice <## "connection not verified, use /code command to see security code"
   where
-    bobInfo :: HasCallStack => TestCC -> Bool -> IO ()
-    bobInfo alice verified = do
+    bobInfo :: HasCallStack => TestCC -> IO ()
+    bobInfo alice = do
       alice <## "contact ID: 2"
       alice <## "receiving messages via: localhost"
       alice <## "sending messages via: localhost"
       alice <## "you've shared main profile with this contact"
-      alice <## connVerified
-      alice <## currentChatVRangeInfo
-      where
-        connVerified
-          | verified = "connection verified"
-          | otherwise = "connection not verified, use /code command to see security code"
 
 testMarkGroupMemberVerified :: HasCallStack => FilePath -> IO ()
 testMarkGroupMemberVerified =
   testChat2 aliceProfile bobProfile $ \alice bob -> do
     createGroup2 "team" alice bob
     alice ##> "/i #team bob"
-    bobInfo alice False
+    bobInfo alice
+    alice <## "connection not verified, use /code command to see security code"
     alice ##> "/code #team bob"
     bCode <- getTermLine alice
     bob ##> "/code #team alice"
@@ -2002,24 +1983,20 @@ testMarkGroupMemberVerified =
     alice ##> ("/verify #team bob " <> aCode)
     alice <## "connection verified"
     alice ##> "/i #team bob"
-    bobInfo alice True
+    bobInfo alice
+    alice <## "connection verified"
     alice ##> "/verify #team bob"
     alice <##. "connection not verified, current code is "
     alice ##> "/i #team bob"
-    bobInfo alice False
+    bobInfo alice
+    alice <## "connection not verified, use /code command to see security code"
   where
-    bobInfo :: HasCallStack => TestCC -> Bool -> IO ()
-    bobInfo alice verified = do
+    bobInfo :: HasCallStack => TestCC -> IO ()
+    bobInfo alice = do
       alice <## "group ID: 1"
       alice <## "member ID: 2"
       alice <## "receiving messages via: localhost"
       alice <## "sending messages via: localhost"
-      alice <## connVerified
-      alice <## currentChatVRangeInfo
-      where
-        connVerified
-          | verified = "connection verified"
-          | otherwise = "connection not verified, use /code command to see security code"
 
 testMsgDecryptError :: HasCallStack => FilePath -> IO ()
 testMsgDecryptError tmp =
@@ -2111,7 +2088,8 @@ testSyncRatchetCodeReset tmp =
       alice <# "bob> hey"
       -- connection not verified
       bob ##> "/i alice"
-      aliceInfo bob False
+      aliceInfo bob
+      bob <## "connection not verified, use /code command to see security code"
       -- verify connection
       alice ##> "/code bob"
       bCode <- getTermLine alice
@@ -2119,7 +2097,8 @@ testSyncRatchetCodeReset tmp =
       bob <## "connection verified"
       -- connection verified
       bob ##> "/i alice"
-      aliceInfo bob True
+      aliceInfo bob
+      bob <## "connection verified"
     setupDesynchronizedRatchet tmp alice
     withTestChat tmp "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
@@ -2136,25 +2115,20 @@ testSyncRatchetCodeReset tmp =
 
       -- connection not verified
       bob ##> "/i alice"
-      aliceInfo bob False
+      aliceInfo bob
+      bob <## "connection not verified, use /code command to see security code"
 
       alice #> "@bob hello again"
       bob <# "alice> hello again"
       bob #> "@alice received!"
       alice <# "bob> received!"
   where
-    aliceInfo :: HasCallStack => TestCC -> Bool -> IO ()
-    aliceInfo bob verified = do
+    aliceInfo :: HasCallStack => TestCC -> IO ()
+    aliceInfo bob = do
       bob <## "contact ID: 2"
       bob <## "receiving messages via: localhost"
       bob <## "sending messages via: localhost"
       bob <## "you've shared main profile with this contact"
-      bob <## connVerified
-      bob <## currentChatVRangeInfo
-      where
-        connVerified
-          | verified = "connection verified"
-          | otherwise = "connection not verified, use /code command to see security code"
 
 testSetMessageReactions :: HasCallStack => FilePath -> IO ()
 testSetMessageReactions =
@@ -2297,85 +2271,3 @@ testConfigureDeliveryReceipts tmp =
       cc1 #> ("@" <> name2 <> " " <> msg)
       cc2 <# (name1 <> "> " <> msg)
       cc1 <// 50000
-
-testConnInvChatVRange :: HasCallStack => VersionRange -> VersionRange -> FilePath -> IO ()
-testConnInvChatVRange ct1VRange ct2VRange tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
-      connectUsers alice bob
-
-      alice ##> "/i bob"
-      contactInfoChatVRange alice ct2VRange
-
-      bob ##> "/i alice"
-      contactInfoChatVRange bob ct1VRange
-
-testConnReqChatVRange :: HasCallStack => VersionRange -> VersionRange -> FilePath -> IO ()
-testConnReqChatVRange ct1VRange ct2VRange tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = ct1VRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = ct2VRange} "bob" bobProfile $ \bob -> do
-      alice ##> "/ad"
-      cLink <- getContactLink alice True
-      bob ##> ("/c " <> cLink)
-      alice <#? bob
-      alice ##> "/ac bob"
-      alice <## "bob (Bob): accepting contact request..."
-      concurrently_
-        (bob <## "alice (Alice): contact is connected")
-        (alice <## "bob (Bob): contact is connected")
-
-      alice ##> "/i bob"
-      contactInfoChatVRange alice ct2VRange
-
-      bob ##> "/i alice"
-      contactInfoChatVRange bob ct1VRange
-
-testUpdatePeerChatVRange :: HasCallStack => FilePath -> IO ()
-testUpdatePeerChatVRange tmp =
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg11 "bob" bobProfile $ \bob -> do
-      connectUsers alice bob
-
-      alice ##> "/i bob"
-      contactInfoChatVRange alice vr11
-
-      bob ##> "/i alice"
-      contactInfoChatVRange bob supportedChatVRange
-
-    withTestChat tmp "bob" $ \bob -> do
-      bob <## "1 contacts connected (use /cs for the list)"
-
-      bob #> "@alice hello 1"
-      alice <# "bob> hello 1"
-
-      alice ##> "/i bob"
-      contactInfoChatVRange alice supportedChatVRange
-
-      bob ##> "/i alice"
-      contactInfoChatVRange bob supportedChatVRange
-
-    withTestChatCfg tmp cfg11 "bob" $ \bob -> do
-      bob <## "1 contacts connected (use /cs for the list)"
-
-      bob #> "@alice hello 2"
-      alice <# "bob> hello 2"
-
-      alice ##> "/i bob"
-      contactInfoChatVRange alice vr11
-
-      bob ##> "/i alice"
-      contactInfoChatVRange bob supportedChatVRange
-  where
-    cfg11 = testCfg {chatVRange = vr11} :: ChatConfig
-
-vr11 :: VersionRange
-vr11 = mkVersionRange 1 1
-
-contactInfoChatVRange :: TestCC -> VersionRange -> IO ()
-contactInfoChatVRange cc (VersionRange minVer maxVer) = do
-  cc <## "contact ID: 2"
-  cc <## "receiving messages via: localhost"
-  cc <## "sending messages via: localhost"
-  cc <## "you've shared main profile with this contact"
-  cc <## "connection not verified, use /code command to see security code"
-  cc <## ("peer chat protocol version range: (" <> show minVer <> ", " <> show maxVer <> ")")

tests/ChatTests/Files.hs

@@ -51,7 +51,7 @@ chatFileTests = do
     it "files folder: sender deleted file during transfer" testFilesFoldersImageSndDelete
     it "files folder: recipient deleted file during transfer" testFilesFoldersImageRcvDelete
     it "send and receive image with text and quote" testSendImageWithTextAndQuote
-    it "send and receive image to group" testGroupSendImage
+    describe "send and receive image to group" testGroupSendImage
     it "send and receive image with text and quote to group" testGroupSendImageWithTextAndQuote
   describe "async sending and receiving files" $ do
     -- fails on CI
@@ -730,10 +730,11 @@ testSendImageWithTextAndQuote =
         (alice <## "completed sending file 3 (test.jpg) to bob")
       B.readFile "./tests/tmp/test_1.jpg" `shouldReturn` src
 
-testGroupSendImage :: HasCallStack => FilePath -> IO ()
-testGroupSendImage =
-  testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
+testGroupSendImage :: SpecWith FilePath
+testGroupSendImage = versionTestMatrix3 runTestGroupSendImage
+  where
+    runTestGroupSendImage :: HasCallStack => TestCC -> TestCC -> TestCC -> IO ()
+    runTestGroupSendImage alice bob cath = do
       createGroup3 "team" alice bob cath
       threadDelay 1000000
       alice ##> "/_send #1 json {\"filePath\": \"./tests/fixtures/test.jpg\", \"msgContent\": {\"text\":\"\",\"type\":\"image\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\"}}"
@@ -1041,9 +1042,9 @@ testXFTPFileTransferEncrypted =
       alice <## "completed uploading file 1 (test.pdf) for bob"
       bob <## "started receiving file 1 (test.pdf) from alice"
       bob <## "completed receiving file 1 (test.pdf) from alice"
-      Right dest <- chatReadFile "./tests/tmp/bob/test.pdf" (strEncode key) (strEncode nonce)
-      LB.length dest `shouldBe` fromIntegral srcLen
-      LB.toStrict dest `shouldBe` src
+      (RFResult destLen, dest) <- chatReadFile "./tests/tmp/bob/test.pdf" (strEncode key) (strEncode nonce)
+      fromIntegral destLen `shouldBe` srcLen
+      dest `shouldBe` src
   where
     cfg = testCfg {xftpFileConfig = Just $ XFTPFileConfig {minFileSize = 0}, tempDir = Just "./tests/tmp"}
 

tests/ChatTests/Groups.hs

@@ -10,10 +10,8 @@ import Control.Concurrent.Async (concurrently_)
 import Control.Monad (when)
 import qualified Data.Text as T
 import Simplex.Chat.Controller (ChatConfig (..))
-import Simplex.Chat.Protocol (supportedChatVRange)
 import Simplex.Chat.Store (agentStoreFile, chatStoreFile)
 import Simplex.Chat.Types (GroupMemberRole (..))
-import Simplex.Messaging.Version
 import System.Directory (copyFile)
 import System.FilePath ((</>))
 import Test.Hspec
@@ -21,7 +19,7 @@ import Test.Hspec
 chatGroupTests :: SpecWith FilePath
 chatGroupTests = do
   describe "chat groups" $ do
-    it "add contacts, create group and send/receive messages" testGroup
+    describe "add contacts, create group and send/receive messages" testGroup
     it "add contacts, create group and send/receive messages, check messages" testGroupCheckMessages
     it "create and join group with 4 members" testGroup2
     it "create and delete group" testGroupDelete
@@ -66,54 +64,15 @@ chatGroupTests = do
   describe "group delivery receipts" $ do
     it "should send delivery receipts in group" testSendGroupDeliveryReceipts
     it "should send delivery receipts in group depending on configuration" testConfigureGroupDeliveryReceipts
-  describe "direct connections in group are not established based on chat protocol version" $ do
-    describe "3 members group" $ do
-      testNoDirect _0 _0 False -- True
-      testNoDirect _0 _1 False -- True
-      testNoDirect _1 _0 False
-      testNoDirect _1 _1 False
-    describe "4 members group" $ do
-      testNoDirect4 _0 _0 _0 False False False -- True True True
-      testNoDirect4 _0 _0 _1 False False False -- True True True
-      testNoDirect4 _0 _1 _0 False False False -- True True False
-      testNoDirect4 _0 _1 _1 False False False -- True True False
-      testNoDirect4 _1 _0 _0 False False False -- False False True
-      testNoDirect4 _1 _0 _1 False False False -- False False True
-      testNoDirect4 _1 _1 _0 False False False
-      testNoDirect4 _1 _1 _1 False False False
-  where
-    _0 = supportedChatVRange -- don't create direct connections
-    _1 = groupCreateDirectVRange
-    -- having host configured with older version doesn't have effect in tests
-    -- because host uses current code and sends version in MemberInfo
-    testNoDirect vrMem2 vrMem3 noConns =
-      it
-        ( "host " <> vRangeStr supportedChatVRange
-            <> (", 2nd mem " <> vRangeStr vrMem2)
-            <> (", 3rd mem " <> vRangeStr vrMem3)
-            <> (if noConns then " : 2 <!!> 3" else " : 2 <##> 3")
-        )
-        $ testNoGroupDirectConns supportedChatVRange vrMem2 vrMem3 noConns
-    testNoDirect4 vrMem2 vrMem3 vrMem4 noConns23 noConns24 noConns34 =
-      it
-        ( "host " <> vRangeStr supportedChatVRange
-            <> (", 2nd mem " <> vRangeStr vrMem2)
-            <> (", 3rd mem " <> vRangeStr vrMem3)
-            <> (", 4th mem " <> vRangeStr vrMem4)
-            <> (if noConns23 then " : 2 <!!> 3" else " : 2 <##> 3")
-            <> (if noConns24 then " : 2 <!!> 4" else " : 2 <##> 4")
-            <> (if noConns34 then " : 3 <!!> 4" else " : 3 <##> 4")
-        )
-        $ testNoGroupDirectConns4Members supportedChatVRange vrMem2 vrMem3 vrMem4 noConns23 noConns24 noConns34
 
-testGroup :: HasCallStack => FilePath -> IO ()
-testGroup =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> testGroupShared alice bob cath False
+testGroup :: HasCallStack => SpecWith FilePath
+testGroup = versionTestMatrix3 runTestGroup
+  where
+    runTestGroup alice bob cath = testGroupShared alice bob cath False
 
 testGroupCheckMessages :: HasCallStack => FilePath -> IO ()
 testGroupCheckMessages =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> testGroupShared alice bob cath True
 
 testGroupShared :: HasCallStack => TestCC -> TestCC -> TestCC -> Bool -> IO ()
@@ -274,7 +233,7 @@ testGroupShared alice bob cath checkMessages = do
 
 testGroup2 :: HasCallStack => FilePath -> IO ()
 testGroup2 =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
     \alice bob cath dan -> do
       connectUsers alice bob
       connectUsers alice cath
@@ -720,7 +679,7 @@ testDeleteGroupMemberProfileKept =
 
 testGroupRemoveAdd :: HasCallStack => FilePath -> IO ()
 testGroupRemoveAdd =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       -- remove member
@@ -795,7 +754,7 @@ testGroupList =
 
 testGroupMessageQuotedReply :: HasCallStack => FilePath -> IO ()
 testGroupMessageQuotedReply =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       threadDelay 1000000
@@ -1273,7 +1232,7 @@ testGroupDeleteUnusedContacts =
       cath <## "alice (Alice)"
       cath `hasContactProfiles` ["alice", "cath"]
   where
-    cfg = mkCfgCreateGroupDirect $ testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
+    cfg = testCfg {initialCleanupManagerDelay = 0, cleanupManagerInterval = 1, cleanupManagerStepDelay = 0}
     deleteGroup :: HasCallStack => TestCC -> TestCC -> TestCC -> String -> IO ()
     deleteGroup alice bob cath group = do
       alice ##> ("/d #" <> group)
@@ -1362,7 +1321,7 @@ testGroupDescription = testChat4 aliceProfile bobProfile cathProfile danProfile
 
 testGroupModerate :: HasCallStack => FilePath -> IO ()
 testGroupModerate =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       alice ##> "/mr team cath member"
@@ -1393,7 +1352,7 @@ testGroupModerate =
 
 testGroupModerateFullDelete :: HasCallStack => FilePath -> IO ()
 testGroupModerateFullDelete =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       alice ##> "/mr team cath member"
@@ -1431,10 +1390,10 @@ testGroupModerateFullDelete =
 
 testGroupDelayedModeration :: HasCallStack => FilePath -> IO ()
 testGroupDelayedModeration tmp = do
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+    withNewTestChat tmp "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
-    withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+    withNewTestChat tmp "cath" cathProfile $ \cath -> do
       connectUsers alice cath
       addMember "team" alice cath GRMember
       cath ##> "/j team"
@@ -1448,11 +1407,11 @@ testGroupDelayedModeration tmp = do
       alice ##> "\\\\ #team @cath hi"
       alice <## "message marked deleted by you"
       cath <# "#team cath> [marked deleted by alice] hi"
-    withTestChatCfg tmp cfg "bob" $ \bob -> do
+    withTestChat tmp "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
-      withTestChatCfg tmp cfg "cath" $ \cath -> do
+      withTestChat tmp "cath" $ \cath -> do
         cath <## "2 contacts connected (use /cs for the list)"
         cath <## "#team: connected to server(s)"
         cath <## "#team: member bob (Bob) is connected"
@@ -1465,15 +1424,13 @@ testGroupDelayedModeration tmp = do
         bob ##> "/_get chat #1 count=2"
         r <- chat <$> getTermLine bob
         r `shouldMatchList` [(0, "connected"), (0, "hi [marked deleted by alice]")]
-  where
-    cfg = testCfgCreateGroupDirect
 
 testGroupDelayedModerationFullDelete :: HasCallStack => FilePath -> IO ()
 testGroupDelayedModerationFullDelete tmp = do
-  withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp cfg "bob" bobProfile $ \bob -> do
+  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
+    withNewTestChat tmp "bob" bobProfile $ \bob -> do
       createGroup2 "team" alice bob
-    withNewTestChatCfg tmp cfg "cath" cathProfile $ \cath -> do
+    withNewTestChat tmp "cath" cathProfile $ \cath -> do
       connectUsers alice cath
       addMember "team" alice cath GRMember
       cath ##> "/j team"
@@ -1495,14 +1452,14 @@ testGroupDelayedModerationFullDelete tmp = do
       cath <## "alice updated group #team:"
       cath <## "updated group preferences:"
       cath <## "Full deletion: on"
-    withTestChatCfg tmp cfg "bob" $ \bob -> do
+    withTestChat tmp "bob" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
       bob <## "#team: connected to server(s)"
       bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
       bob <## "alice updated group #team:"
       bob <## "updated group preferences:"
       bob <## "Full deletion: on"
-      withTestChatCfg tmp cfg "cath" $ \cath -> do
+      withTestChat tmp "cath" $ \cath -> do
         cath <## "2 contacts connected (use /cs for the list)"
         cath <## "#team: connected to server(s)"
         cath <## "#team: member bob (Bob) is connected"
@@ -1515,8 +1472,6 @@ testGroupDelayedModerationFullDelete tmp = do
         bob ##> "/_get chat #1 count=3"
         r <- chat <$> getTermLine bob
         r `shouldMatchList` [(0, "Full deletion: on"), (0, "connected"), (0, "moderated [deleted by alice]")]
-  where
-    cfg = testCfgCreateGroupDirect
 
 testGroupAsync :: HasCallStack => FilePath -> IO ()
 testGroupAsync tmp = do
@@ -2172,7 +2127,7 @@ testGroupLinkMemberRole =
 
 testGroupLinkLeaveDelete :: HasCallStack => FilePath -> IO ()
 testGroupLinkLeaveDelete =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       connectUsers alice bob
       connectUsers cath bob
@@ -2334,7 +2289,8 @@ testGroupSyncRatchetCodeReset tmp =
       alice <# "#team bob> hey"
       -- connection not verified
       bob ##> "/i #team alice"
-      aliceInfo bob False
+      aliceInfo bob
+      bob <## "connection not verified, use /code command to see security code"
       -- verify connection
       alice ##> "/code #team bob"
       bCode <- getTermLine alice
@@ -2342,7 +2298,8 @@ testGroupSyncRatchetCodeReset tmp =
       bob <## "connection verified"
       -- connection verified
       bob ##> "/i #team alice"
-      aliceInfo bob True
+      aliceInfo bob
+      bob <## "connection verified"
     setupDesynchronizedRatchet tmp alice
     withTestChat tmp "bob_old" $ \bob -> do
       bob <## "1 contacts connected (use /cs for the list)"
@@ -2360,25 +2317,20 @@ testGroupSyncRatchetCodeReset tmp =
 
       -- connection not verified
       bob ##> "/i #team alice"
-      aliceInfo bob False
+      aliceInfo bob
+      bob <## "connection not verified, use /code command to see security code"
 
       alice #> "#team hello again"
       bob <# "#team alice> hello again"
       bob #> "#team received!"
       alice <# "#team bob> received!"
   where
-    aliceInfo :: HasCallStack => TestCC -> Bool -> IO ()
-    aliceInfo bob verified = do
+    aliceInfo :: HasCallStack => TestCC -> IO ()
+    aliceInfo bob = do
       bob <## "group ID: 1"
       bob <## "member ID: 1"
       bob <## "receiving messages via: localhost"
       bob <## "sending messages via: localhost"
-      bob <## connVerified
-      bob <## currentChatVRangeInfo
-      where
-        connVerified
-          | verified = "connection verified"
-          | otherwise = "connection not verified, use /code command to see security code"
 
 testSetGroupMessageReactions :: HasCallStack => FilePath -> IO ()
 testSetGroupMessageReactions =
@@ -2607,7 +2559,7 @@ testConfigureGroupDeliveryReceipts tmp =
         receipt bob alice cath "team" "25"
         noReceipt bob alice cath "club" "26"
   where
-    cfg = mkCfgCreateGroupDirect $ testCfg {showReceipts = True}
+    cfg = testCfg {showReceipts = True}
     receipt cc1 cc2 cc3 gName msg = do
       name1 <- userName cc1
       cc1 #> ("#" <> gName <> " " <> msg)
@@ -2627,62 +2579,3 @@ testConfigureGroupDeliveryReceipts tmp =
       cc2 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
       cc3 <# ("#" <> gName <> " " <> name1 <> "> " <> msg)
       cc1 <// 50000
-
-testNoGroupDirectConns :: HasCallStack => VersionRange -> VersionRange -> VersionRange -> Bool -> FilePath -> IO ()
-testNoGroupDirectConns hostVRange mem2VRange mem3VRange noDirectConns tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = hostVRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = mem2VRange} "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp testCfg {chatVRange = mem3VRange} "cath" cathProfile $ \cath -> do
-        createGroup3 "team" alice bob cath
-        if noDirectConns
-          then contactsDontExist bob cath
-          else bob <##> cath
-  where
-    contactsDontExist bob cath = do
-      bob ##> "@cath hi"
-      bob <## "no contact cath"
-      cath ##> "@bob hi"
-      cath <## "no contact bob"
-
-testNoGroupDirectConns4Members :: HasCallStack => VersionRange -> VersionRange -> VersionRange -> VersionRange -> Bool -> Bool -> Bool -> FilePath -> IO ()
-testNoGroupDirectConns4Members hostVRange mem2VRange mem3VRange mem4VRange noConns23 noConns24 noConns34 tmp =
-  withNewTestChatCfg tmp testCfg {chatVRange = hostVRange} "alice" aliceProfile $ \alice -> do
-    withNewTestChatCfg tmp testCfg {chatVRange = mem2VRange} "bob" bobProfile $ \bob -> do
-      withNewTestChatCfg tmp testCfg {chatVRange = mem3VRange} "cath" cathProfile $ \cath -> do
-        withNewTestChatCfg tmp testCfg {chatVRange = mem4VRange} "dan" danProfile $ \dan -> do
-          createGroup3 "team" alice bob cath
-          connectUsers alice dan
-          addMember "team" alice dan GRMember
-          dan ##> "/j team"
-          concurrentlyN_
-            [ alice <## "#team: dan joined the group",
-              do
-                dan <## "#team: you joined the group"
-                dan
-                  <### [ "#team: member bob (Bob) is connected",
-                         "#team: member cath (Catherine) is connected"
-                       ],
-              aliceAddedDan bob,
-              aliceAddedDan cath
-            ]
-          if noConns23
-            then contactsDontExist bob cath
-            else bob <##> cath
-          if noConns24
-            then contactsDontExist bob dan
-            else bob <##> dan
-          if noConns34
-            then contactsDontExist cath dan
-            else cath <##> dan
-  where
-    aliceAddedDan :: HasCallStack => TestCC -> IO ()
-    aliceAddedDan cc = do
-      cc <## "#team: alice added dan (Daniel) to the group (connecting...)"
-      cc <## "#team: new member dan is connected"
-    contactsDontExist cc1 cc2 = do
-      name1 <- userName cc1
-      name2 <- userName cc2
-      cc1 ##> ("@" <> name2 <> " hi")
-      cc1 <## ("no contact " <> name2)
-      cc2 ##> ("@" <> name1 <> " hi")
-      cc2 <## ("no contact " <> name1)

tests/ChatTests/Profiles.hs

@@ -18,7 +18,7 @@ chatProfileTests = do
     it "update user profile and notify contacts" testUpdateProfile
     it "update user profile with image" testUpdateProfileImage
   describe "user contact link" $ do
-    it "create and connect via contact link" testUserContactLink
+    describe "create and connect via contact link" testUserContactLink
     it "add contact link to profile" testProfileLink
     it "auto accept contact requests" testUserContactLinkAutoAccept
     it "deduplicate contact requests" testDeduplicateContactRequests
@@ -57,7 +57,7 @@ chatProfileTests = do
 
 testUpdateProfile :: HasCallStack => FilePath -> IO ()
 testUpdateProfile =
-  testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
+  testChat3 aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
       alice ##> "/p"
@@ -117,35 +117,33 @@ testUpdateProfileImage =
       bob <## "use @alice2 <message> to send messages"
       (bob </)
 
-testUserContactLink :: HasCallStack => FilePath -> IO ()
-testUserContactLink =
-  testChat3 aliceProfile bobProfile cathProfile $
-    \alice bob cath -> do
-      alice ##> "/ad"
-      cLink <- getContactLink alice True
-      bob ##> ("/c " <> cLink)
-      alice <#? bob
-      alice @@@ [("<@bob", "")]
-      alice ##> "/ac bob"
-      alice <## "bob (Bob): accepting contact request..."
-      concurrently_
-        (bob <## "alice (Alice): contact is connected")
-        (alice <## "bob (Bob): contact is connected")
-      threadDelay 100000
-      alice @@@ [("@bob", lastChatFeature)]
-      alice <##> bob
+testUserContactLink :: SpecWith FilePath
+testUserContactLink = versionTestMatrix3 $ \alice bob cath -> do
+  alice ##> "/ad"
+  cLink <- getContactLink alice True
+  bob ##> ("/c " <> cLink)
+  alice <#? bob
+  alice @@@ [("<@bob", "")]
+  alice ##> "/ac bob"
+  alice <## "bob (Bob): accepting contact request..."
+  concurrently_
+    (bob <## "alice (Alice): contact is connected")
+    (alice <## "bob (Bob): contact is connected")
+  threadDelay 100000
+  alice @@@ [("@bob", lastChatFeature)]
+  alice <##> bob
 
-      cath ##> ("/c " <> cLink)
-      alice <#? cath
-      alice @@@ [("<@cath", ""), ("@bob", "hey")]
-      alice ##> "/ac cath"
-      alice <## "cath (Catherine): accepting contact request..."
-      concurrently_
-        (cath <## "alice (Alice): contact is connected")
-        (alice <## "cath (Catherine): contact is connected")
-      threadDelay 100000
-      alice @@@ [("@cath", lastChatFeature), ("@bob", "hey")]
-      alice <##> cath
+  cath ##> ("/c " <> cLink)
+  alice <#? cath
+  alice @@@ [("<@cath", ""), ("@bob", "hey")]
+  alice ##> "/ac cath"
+  alice <## "cath (Catherine): accepting contact request..."
+  concurrently_
+    (cath <## "alice (Alice): contact is connected")
+    (alice <## "cath (Catherine): contact is connected")
+  threadDelay 100000
+  alice @@@ [("@cath", lastChatFeature), ("@bob", "hey")]
+  alice <##> cath
 
 testProfileLink :: HasCallStack => FilePath -> IO ()
 testProfileLink =
@@ -216,7 +214,6 @@ testProfileLink =
       cc <## ("contact address: " <> cLink)
       cc <## "you've shared main profile with this contact"
       cc <## "connection not verified, use /code command to see security code"
-      cc <## currentChatVRangeInfo
     checkAliceNoProfileLink cc = do
       cc ##> "/info alice"
       cc <## "contact ID: 2"
@@ -224,7 +221,6 @@ testProfileLink =
       cc <##. "sending messages via"
       cc <## "you've shared main profile with this contact"
       cc <## "connection not verified, use /code command to see security code"
-      cc <## currentChatVRangeInfo
 
 testUserContactLinkAutoAccept :: HasCallStack => FilePath -> IO ()
 testUserContactLinkAutoAccept =
@@ -764,193 +760,192 @@ testSetResetSetConnectionIncognito = testChat2 aliceProfile bobProfile $
     bob `hasContactProfiles` ["bob", T.pack aliceIncognito]
 
 testJoinGroupIncognito :: HasCallStack => FilePath -> IO ()
-testJoinGroupIncognito =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
-    \alice bob cath dan -> do
-      -- non incognito connections
-      connectUsers alice bob
-      connectUsers alice dan
-      connectUsers bob cath
-      connectUsers bob dan
-      connectUsers cath dan
-      -- cath connected incognito to alice
-      alice ##> "/c"
-      inv <- getInvitation alice
-      cath ##> ("/c i " <> inv)
-      cath <## "confirmation sent!"
-      cathIncognito <- getTermLine cath
-      concurrentlyN_
-        [ do
-            cath <## ("alice (Alice): contact is connected, your incognito profile for this contact is " <> cathIncognito)
-            cath <## "use /i alice to print out this incognito profile again",
-          alice <## (cathIncognito <> ": contact is connected")
-        ]
-      -- alice creates group
-      alice ##> "/g secret_club"
-      alice <## "group #secret_club is created"
-      alice <## "to add members use /a secret_club <name> or /create link #secret_club"
-      -- alice invites bob
-      alice ##> "/a secret_club bob admin"
-      concurrentlyN_
-        [ alice <## "invitation to join the group #secret_club sent to bob",
-          do
-            bob <## "#secret_club: alice invites you to join the group as admin"
-            bob <## "use /j secret_club to accept"
-        ]
-      bob ##> "/j secret_club"
-      concurrently_
-        (alice <## "#secret_club: bob joined the group")
-        (bob <## "#secret_club: you joined the group")
-      -- alice invites cath
-      alice ##> ("/a secret_club " <> cathIncognito <> " admin")
-      concurrentlyN_
-        [ alice <## ("invitation to join the group #secret_club sent to " <> cathIncognito),
-          do
-            cath <## "#secret_club: alice invites you to join the group as admin"
-            cath <## ("use /j secret_club to join incognito as " <> cathIncognito)
-        ]
-      -- cath uses the same incognito profile when joining group, cath and bob don't merge contacts
-      cath ##> "/j secret_club"
-      concurrentlyN_
-        [ alice <## ("#secret_club: " <> cathIncognito <> " joined the group"),
-          do
-            cath <## ("#secret_club: you joined the group incognito as " <> cathIncognito)
-            cath <## "#secret_club: member bob_1 (Bob) is connected",
-          do
-            bob <## ("#secret_club: alice added " <> cathIncognito <> " to the group (connecting...)")
-            bob <## ("#secret_club: new member " <> cathIncognito <> " is connected")
-        ]
-      -- cath cannot invite to the group because her membership is incognito
-      cath ##> "/a secret_club dan"
-      cath <## "you've connected to this group using an incognito profile - prohibited to invite contacts"
-      -- alice invites dan
-      alice ##> "/a secret_club dan admin"
-      concurrentlyN_
-        [ alice <## "invitation to join the group #secret_club sent to dan",
-          do
-            dan <## "#secret_club: alice invites you to join the group as admin"
-            dan <## "use /j secret_club to accept"
-        ]
-      dan ##> "/j secret_club"
-      -- cath and dan don't merge contacts
-      concurrentlyN_
-        [ alice <## "#secret_club: dan joined the group",
-          do
-            dan <## "#secret_club: you joined the group"
-            dan
-              <### [ ConsoleString $ "#secret_club: member " <> cathIncognito <> " is connected",
-                     "#secret_club: member bob_1 (Bob) is connected",
-                     "contact bob_1 is merged into bob",
-                     "use @bob <message> to send messages"
-                   ],
-          do
-            bob <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
-            bob <## "#secret_club: new member dan_1 is connected"
-            bob <## "contact dan_1 is merged into dan"
-            bob <## "use @dan <message> to send messages",
-          do
-            cath <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
-            cath <## "#secret_club: new member dan_1 is connected"
-        ]
-      -- send messages - group is incognito for cath
-      alice #> "#secret_club hello"
-      concurrentlyN_
-        [ bob <# "#secret_club alice> hello",
-          cath ?<# "#secret_club alice> hello",
-          dan <# "#secret_club alice> hello"
-        ]
-      bob #> "#secret_club hi there"
-      concurrentlyN_
-        [ alice <# "#secret_club bob> hi there",
-          cath ?<# "#secret_club bob_1> hi there",
-          dan <# "#secret_club bob> hi there"
-        ]
-      cath ?#> "#secret_club hey"
-      concurrentlyN_
-        [ alice <# ("#secret_club " <> cathIncognito <> "> hey"),
-          bob <# ("#secret_club " <> cathIncognito <> "> hey"),
-          dan <# ("#secret_club " <> cathIncognito <> "> hey")
-        ]
-      dan #> "#secret_club how is it going?"
-      concurrentlyN_
-        [ alice <# "#secret_club dan> how is it going?",
-          bob <# "#secret_club dan> how is it going?",
-          cath ?<# "#secret_club dan_1> how is it going?"
-        ]
-      -- cath and bob can send messages via new direct connection, cath is incognito
-      bob #> ("@" <> cathIncognito <> " hi, I'm bob")
-      cath ?<# "bob_1> hi, I'm bob"
-      cath ?#> "@bob_1 hey, I'm incognito"
-      bob <# (cathIncognito <> "> hey, I'm incognito")
-      -- cath and dan can send messages via new direct connection, cath is incognito
-      dan #> ("@" <> cathIncognito <> " hi, I'm dan")
-      cath ?<# "dan_1> hi, I'm dan"
-      cath ?#> "@dan_1 hey, I'm incognito"
-      dan <# (cathIncognito <> "> hey, I'm incognito")
-      -- non incognito connections are separate
-      bob <##> cath
-      dan <##> cath
-      -- list groups
-      cath ##> "/gs"
-      cath <## "i #secret_club (4 members)"
-      -- list group members
-      alice ##> "/ms secret_club"
-      alice
-        <### [ "alice (Alice): owner, you, created group",
-               "bob (Bob): admin, invited, connected",
-               ConsoleString $ cathIncognito <> ": admin, invited, connected",
-               "dan (Daniel): admin, invited, connected"
-             ]
-      bob ##> "/ms secret_club"
-      bob
-        <### [ "alice (Alice): owner, host, connected",
-               "bob (Bob): admin, you, connected",
-               ConsoleString $ cathIncognito <> ": admin, connected",
-               "dan (Daniel): admin, connected"
-             ]
-      cath ##> "/ms secret_club"
-      cath
-        <### [ "alice (Alice): owner, host, connected",
-               "bob_1 (Bob): admin, connected",
-               ConsoleString $ "i " <> cathIncognito <> ": admin, you, connected",
-               "dan_1 (Daniel): admin, connected"
-             ]
-      dan ##> "/ms secret_club"
-      dan
-        <### [ "alice (Alice): owner, host, connected",
-               "bob (Bob): admin, connected",
-               ConsoleString $ cathIncognito <> ": admin, connected",
-               "dan (Daniel): admin, you, connected"
-             ]
-      -- remove member
-      bob ##> ("/rm secret_club " <> cathIncognito)
-      concurrentlyN_
-        [ bob <## ("#secret_club: you removed " <> cathIncognito <> " from the group"),
-          alice <## ("#secret_club: bob removed " <> cathIncognito <> " from the group"),
-          dan <## ("#secret_club: bob removed " <> cathIncognito <> " from the group"),
-          do
-            cath <## "#secret_club: bob_1 removed you from the group"
-            cath <## "use /d #secret_club to delete the group"
-        ]
-      bob #> "#secret_club hi"
-      concurrentlyN_
-        [ alice <# "#secret_club bob> hi",
-          dan <# "#secret_club bob> hi",
-          (cath </)
-        ]
-      alice #> "#secret_club hello"
-      concurrentlyN_
-        [ bob <# "#secret_club alice> hello",
-          dan <# "#secret_club alice> hello",
-          (cath </)
-        ]
-      cath ##> "#secret_club hello"
-      cath <## "you are no longer a member of the group"
-      -- cath can still message members directly
-      bob #> ("@" <> cathIncognito <> " I removed you from group")
-      cath ?<# "bob_1> I removed you from group"
-      cath ?#> "@bob_1 ok"
-      bob <# (cathIncognito <> "> ok")
+testJoinGroupIncognito = testChat4 aliceProfile bobProfile cathProfile danProfile $
+  \alice bob cath dan -> do
+    -- non incognito connections
+    connectUsers alice bob
+    connectUsers alice dan
+    connectUsers bob cath
+    connectUsers bob dan
+    connectUsers cath dan
+    -- cath connected incognito to alice
+    alice ##> "/c"
+    inv <- getInvitation alice
+    cath ##> ("/c i " <> inv)
+    cath <## "confirmation sent!"
+    cathIncognito <- getTermLine cath
+    concurrentlyN_
+      [ do
+          cath <## ("alice (Alice): contact is connected, your incognito profile for this contact is " <> cathIncognito)
+          cath <## "use /i alice to print out this incognito profile again",
+        alice <## (cathIncognito <> ": contact is connected")
+      ]
+    -- alice creates group
+    alice ##> "/g secret_club"
+    alice <## "group #secret_club is created"
+    alice <## "to add members use /a secret_club <name> or /create link #secret_club"
+    -- alice invites bob
+    alice ##> "/a secret_club bob admin"
+    concurrentlyN_
+      [ alice <## "invitation to join the group #secret_club sent to bob",
+        do
+          bob <## "#secret_club: alice invites you to join the group as admin"
+          bob <## "use /j secret_club to accept"
+      ]
+    bob ##> "/j secret_club"
+    concurrently_
+      (alice <## "#secret_club: bob joined the group")
+      (bob <## "#secret_club: you joined the group")
+    -- alice invites cath
+    alice ##> ("/a secret_club " <> cathIncognito <> " admin")
+    concurrentlyN_
+      [ alice <## ("invitation to join the group #secret_club sent to " <> cathIncognito),
+        do
+          cath <## "#secret_club: alice invites you to join the group as admin"
+          cath <## ("use /j secret_club to join incognito as " <> cathIncognito)
+      ]
+    -- cath uses the same incognito profile when joining group, cath and bob don't merge contacts
+    cath ##> "/j secret_club"
+    concurrentlyN_
+      [ alice <## ("#secret_club: " <> cathIncognito <> " joined the group"),
+        do
+          cath <## ("#secret_club: you joined the group incognito as " <> cathIncognito)
+          cath <## "#secret_club: member bob_1 (Bob) is connected",
+        do
+          bob <## ("#secret_club: alice added " <> cathIncognito <> " to the group (connecting...)")
+          bob <## ("#secret_club: new member " <> cathIncognito <> " is connected")
+      ]
+    -- cath cannot invite to the group because her membership is incognito
+    cath ##> "/a secret_club dan"
+    cath <## "you've connected to this group using an incognito profile - prohibited to invite contacts"
+    -- alice invites dan
+    alice ##> "/a secret_club dan admin"
+    concurrentlyN_
+      [ alice <## "invitation to join the group #secret_club sent to dan",
+        do
+          dan <## "#secret_club: alice invites you to join the group as admin"
+          dan <## "use /j secret_club to accept"
+      ]
+    dan ##> "/j secret_club"
+    -- cath and dan don't merge contacts
+    concurrentlyN_
+      [ alice <## "#secret_club: dan joined the group",
+        do
+          dan <## "#secret_club: you joined the group"
+          dan
+            <### [ ConsoleString $ "#secret_club: member " <> cathIncognito <> " is connected",
+                   "#secret_club: member bob_1 (Bob) is connected",
+                   "contact bob_1 is merged into bob",
+                   "use @bob <message> to send messages"
+                 ],
+        do
+          bob <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
+          bob <## "#secret_club: new member dan_1 is connected"
+          bob <## "contact dan_1 is merged into dan"
+          bob <## "use @dan <message> to send messages",
+        do
+          cath <## "#secret_club: alice added dan_1 (Daniel) to the group (connecting...)"
+          cath <## "#secret_club: new member dan_1 is connected"
+      ]
+    -- send messages - group is incognito for cath
+    alice #> "#secret_club hello"
+    concurrentlyN_
+      [ bob <# "#secret_club alice> hello",
+        cath ?<# "#secret_club alice> hello",
+        dan <# "#secret_club alice> hello"
+      ]
+    bob #> "#secret_club hi there"
+    concurrentlyN_
+      [ alice <# "#secret_club bob> hi there",
+        cath ?<# "#secret_club bob_1> hi there",
+        dan <# "#secret_club bob> hi there"
+      ]
+    cath ?#> "#secret_club hey"
+    concurrentlyN_
+      [ alice <# ("#secret_club " <> cathIncognito <> "> hey"),
+        bob <# ("#secret_club " <> cathIncognito <> "> hey"),
+        dan <# ("#secret_club " <> cathIncognito <> "> hey")
+      ]
+    dan #> "#secret_club how is it going?"
+    concurrentlyN_
+      [ alice <# "#secret_club dan> how is it going?",
+        bob <# "#secret_club dan> how is it going?",
+        cath ?<# "#secret_club dan_1> how is it going?"
+      ]
+    -- cath and bob can send messages via new direct connection, cath is incognito
+    bob #> ("@" <> cathIncognito <> " hi, I'm bob")
+    cath ?<# "bob_1> hi, I'm bob"
+    cath ?#> "@bob_1 hey, I'm incognito"
+    bob <# (cathIncognito <> "> hey, I'm incognito")
+    -- cath and dan can send messages via new direct connection, cath is incognito
+    dan #> ("@" <> cathIncognito <> " hi, I'm dan")
+    cath ?<# "dan_1> hi, I'm dan"
+    cath ?#> "@dan_1 hey, I'm incognito"
+    dan <# (cathIncognito <> "> hey, I'm incognito")
+    -- non incognito connections are separate
+    bob <##> cath
+    dan <##> cath
+    -- list groups
+    cath ##> "/gs"
+    cath <## "i #secret_club (4 members)"
+    -- list group members
+    alice ##> "/ms secret_club"
+    alice
+      <### [ "alice (Alice): owner, you, created group",
+             "bob (Bob): admin, invited, connected",
+             ConsoleString $ cathIncognito <> ": admin, invited, connected",
+             "dan (Daniel): admin, invited, connected"
+           ]
+    bob ##> "/ms secret_club"
+    bob
+      <### [ "alice (Alice): owner, host, connected",
+             "bob (Bob): admin, you, connected",
+             ConsoleString $ cathIncognito <> ": admin, connected",
+             "dan (Daniel): admin, connected"
+           ]
+    cath ##> "/ms secret_club"
+    cath
+      <### [ "alice (Alice): owner, host, connected",
+             "bob_1 (Bob): admin, connected",
+             ConsoleString $ "i " <> cathIncognito <> ": admin, you, connected",
+             "dan_1 (Daniel): admin, connected"
+           ]
+    dan ##> "/ms secret_club"
+    dan
+      <### [ "alice (Alice): owner, host, connected",
+             "bob (Bob): admin, connected",
+             ConsoleString $ cathIncognito <> ": admin, connected",
+             "dan (Daniel): admin, you, connected"
+           ]
+    -- remove member
+    bob ##> ("/rm secret_club " <> cathIncognito)
+    concurrentlyN_
+      [ bob <## ("#secret_club: you removed " <> cathIncognito <> " from the group"),
+        alice <## ("#secret_club: bob removed " <> cathIncognito <> " from the group"),
+        dan <## ("#secret_club: bob removed " <> cathIncognito <> " from the group"),
+        do
+          cath <## "#secret_club: bob_1 removed you from the group"
+          cath <## "use /d #secret_club to delete the group"
+      ]
+    bob #> "#secret_club hi"
+    concurrentlyN_
+      [ alice <# "#secret_club bob> hi",
+        dan <# "#secret_club bob> hi",
+        (cath </)
+      ]
+    alice #> "#secret_club hello"
+    concurrentlyN_
+      [ bob <# "#secret_club alice> hello",
+        dan <# "#secret_club alice> hello",
+        (cath </)
+      ]
+    cath ##> "#secret_club hello"
+    cath <## "you are no longer a member of the group"
+    -- cath can still message members directly
+    bob #> ("@" <> cathIncognito <> " I removed you from group")
+    cath ?<# "bob_1> I removed you from group"
+    cath ?#> "@bob_1 ok"
+    bob <# (cathIncognito <> "> ok")
 
 testCantInviteContactIncognito :: HasCallStack => FilePath -> IO ()
 testCantInviteContactIncognito = testChat2 aliceProfile bobProfile $
@@ -1359,55 +1354,54 @@ testAllowFullDeletionGroup =
 
 testProhibitDirectMessages :: HasCallStack => FilePath -> IO ()
 testProhibitDirectMessages =
-  testChatCfg4 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile danProfile $
-    \alice bob cath dan -> do
-      createGroup3 "team" alice bob cath
-      threadDelay 1000000
-      alice ##> "/set direct #team off"
-      alice <## "updated group preferences:"
-      alice <## "Direct messages: off"
-      directProhibited bob
-      directProhibited cath
-      threadDelay 1000000
-      -- still can send direct messages to direct contacts
-      alice #> "@bob hello again"
-      bob <# "alice> hello again"
-      alice #> "@cath hello again"
-      cath <# "alice> hello again"
-      bob ##> "@cath hello again"
-      bob <## "direct messages to indirect contact cath are prohibited"
-      (cath </)
-      connectUsers cath dan
-      addMember "team" cath dan GRMember
-      dan ##> "/j #team"
-      concurrentlyN_
-        [ cath <## "#team: dan joined the group",
-          do
-            dan <## "#team: you joined the group"
-            dan
-              <### [ "#team: member alice (Alice) is connected",
-                     "#team: member bob (Bob) is connected"
-                   ],
-          do
-            alice <## "#team: cath added dan (Daniel) to the group (connecting...)"
-            alice <## "#team: new member dan is connected",
-          do
-            bob <## "#team: cath added dan (Daniel) to the group (connecting...)"
-            bob <## "#team: new member dan is connected"
-        ]
-      alice ##> "@dan hi"
-      alice <## "direct messages to indirect contact dan are prohibited"
-      bob ##> "@dan hi"
-      bob <## "direct messages to indirect contact dan are prohibited"
-      (dan </)
-      dan ##> "@alice hi"
-      dan <## "direct messages to indirect contact alice are prohibited"
-      dan ##> "@bob hi"
-      dan <## "direct messages to indirect contact bob are prohibited"
-      dan #> "@cath hi"
-      cath <# "dan> hi"
-      cath #> "@dan hi"
-      dan <# "cath> hi"
+  testChat4 aliceProfile bobProfile cathProfile danProfile $ \alice bob cath dan -> do
+    createGroup3 "team" alice bob cath
+    threadDelay 1000000
+    alice ##> "/set direct #team off"
+    alice <## "updated group preferences:"
+    alice <## "Direct messages: off"
+    directProhibited bob
+    directProhibited cath
+    threadDelay 1000000
+    -- still can send direct messages to direct contacts
+    alice #> "@bob hello again"
+    bob <# "alice> hello again"
+    alice #> "@cath hello again"
+    cath <# "alice> hello again"
+    bob ##> "@cath hello again"
+    bob <## "direct messages to indirect contact cath are prohibited"
+    (cath </)
+    connectUsers cath dan
+    addMember "team" cath dan GRMember
+    dan ##> "/j #team"
+    concurrentlyN_
+      [ cath <## "#team: dan joined the group",
+        do
+          dan <## "#team: you joined the group"
+          dan
+            <### [ "#team: member alice (Alice) is connected",
+                   "#team: member bob (Bob) is connected"
+                 ],
+        do
+          alice <## "#team: cath added dan (Daniel) to the group (connecting...)"
+          alice <## "#team: new member dan is connected",
+        do
+          bob <## "#team: cath added dan (Daniel) to the group (connecting...)"
+          bob <## "#team: new member dan is connected"
+      ]
+    alice ##> "@dan hi"
+    alice <## "direct messages to indirect contact dan are prohibited"
+    bob ##> "@dan hi"
+    bob <## "direct messages to indirect contact dan are prohibited"
+    (dan </)
+    dan ##> "@alice hi"
+    dan <## "direct messages to indirect contact alice are prohibited"
+    dan ##> "@bob hi"
+    dan <## "direct messages to indirect contact bob are prohibited"
+    dan #> "@cath hi"
+    cath <# "dan> hi"
+    cath #> "@dan hi"
+    dan <# "cath> hi"
   where
     directProhibited :: HasCallStack => TestCC -> IO ()
     directProhibited cc = do

tests/ChatTests/Utils.hs

@@ -18,13 +18,11 @@ import Data.Maybe (fromMaybe)
 import Data.String
 import qualified Data.Text as T
 import Simplex.Chat.Controller (ChatConfig (..), ChatController (..), InlineFilesConfig (..), defaultInlineFilesConfig)
-import Simplex.Chat.Protocol
 import Simplex.Chat.Store.Profiles (getUserContactProfiles)
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
 import Simplex.Messaging.Agent.Store.SQLite (withTransaction)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Version
 import System.Directory (doesFileExist)
 import System.Environment (lookupEnv)
 import System.FilePath ((</>))
@@ -67,9 +65,9 @@ versionTestMatrix2 runTest = do
   it "v1 to v2" $ runTestCfg2 testCfg testCfgV1 runTest
   it "v2 to v1" $ runTestCfg2 testCfgV1 testCfg runTest
 
--- versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
--- versionTestMatrix3 runTest = do
---   it "v2" $ testChat3 aliceProfile bobProfile cathProfile runTest
+versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
+versionTestMatrix3 runTest = do
+  it "v2" $ testChat3 aliceProfile bobProfile cathProfile runTest
 
 -- it "v1" $ testChatCfg3 testCfgV1 aliceProfile bobProfile cathProfile runTest
 -- it "v1 to v2" $ runTestCfg3 testCfg testCfgV1 testCfgV1 runTest
@@ -358,7 +356,7 @@ dropTime_ msg = case splitAt 6 msg of
   _ -> Nothing
 
 dropStrPrefix :: HasCallStack => String -> String -> String
-dropStrPrefix pfx s =
+dropStrPrefix pfx s = 
   let (p, rest) = splitAt (length pfx) s
    in if p == pfx then rest else error $ "no prefix " <> pfx <> " in string : " <> s
 
@@ -525,10 +523,3 @@ startFileTransferWithDest' cc1 cc2 fileName fileSize fileDest_ = do
   concurrently_
     (cc2 <## ("started receiving file 1 (" <> fileName <> ") from " <> name1))
     (cc1 <## ("started sending file 1 (" <> fileName <> ") to " <> name2))
-
-currentChatVRangeInfo :: String
-currentChatVRangeInfo =
-  "peer chat protocol version range: " <> vRangeStr supportedChatVRange
-
-vRangeStr :: VersionRange -> String
-vRangeStr (VersionRange minVer maxVer) = "(" <> show minVer <> ", " <> show maxVer <> ")"

tests/MobileTests.hs

@@ -13,14 +13,11 @@ import qualified Data.Aeson as J
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BS
-import Data.ByteString.Internal (create, memcpy)
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Word (Word8, Word32)
+import Data.Word (Word8)
 import Foreign.C
 import Foreign.Marshal.Alloc (mallocBytes)
 import Foreign.Ptr
-import Foreign.Storable (peek)
-import GHC.IO.Encoding (setLocaleEncoding, setFileSystemEncoding, setForeignEncoding)
 import Simplex.Chat.Mobile
 import Simplex.Chat.Mobile.File
 import Simplex.Chat.Mobile.Shared
@@ -30,36 +27,20 @@ import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types (AgentUserId (..), Profile (..))
 import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..))
 import qualified Simplex.Messaging.Crypto as C
-import Simplex.Messaging.Crypto.File (CryptoFile(..), CryptoFileArgs (..))
-import qualified Simplex.Messaging.Crypto.File as CF
+import Simplex.Messaging.Crypto.File (CryptoFileArgs (..))
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
-import System.Directory (copyFile)
 import System.FilePath ((</>))
-import System.IO (utf8)
 import Test.Hspec
 
 mobileTests :: HasCallStack => SpecWith FilePath
 mobileTests = do
   describe "mobile API" $ do
-    runIO $ do
-      setLocaleEncoding utf8
-      setFileSystemEncoding utf8
-      setForeignEncoding utf8
     it "start new chat without user" testChatApiNoUser
     it "start new chat with existing user" testChatApi
     it "should encrypt/decrypt WebRTC frames" testMediaApi
     it "should encrypt/decrypt WebRTC frames via C API" testMediaCApi
-    describe "should read/write encrypted files via C API" $ do
-      it "latin1 name" $ testFileCApi "test"
-      it "utf8 name 1" $ testFileCApi "тест"
-      it "utf8 name 2" $ testFileCApi "👍"
-      it "no exception on missing file" testMissingFileCApi
-    describe "should encrypt/decrypt files via C API" $ do
-      it "latin1 name" $ testFileEncryptionCApi "test"
-      it "utf8 name 1" $ testFileEncryptionCApi "тест"
-      it "utf8 name 2" $ testFileEncryptionCApi "👍"
-      it "no exception on missing file" testMissingFileEncryptionCApi
+    it "should read/write encrypted files via C API" testFileCApi
 
 noActiveUser :: String
 #if defined(darwin_HOST_OS) && defined(swiftJSON)
@@ -194,79 +175,27 @@ instance FromJSON WriteFileResult where parseJSON = J.genericParseJSON . sumType
 
 instance FromJSON ReadFileResult where parseJSON = J.genericParseJSON . sumTypeJSON $ dropPrefix "RF"
 
-testFileCApi :: FilePath -> FilePath -> IO ()
-testFileCApi fileName tmp = do
+testFileCApi :: FilePath -> IO ()
+testFileCApi tmp = do
   src <- B.readFile "./tests/fixtures/test.pdf"
-  let path = tmp </> (fileName <> ".pdf")
-  cPath <- newCString path
+  cPath <- newCAString $ tmp </> "test.pdf"
   let len = B.length src
       cLen = fromIntegral len
   ptr <- mallocBytes $ B.length src
   putByteString ptr src
   r <- peekCAString =<< cChatWriteFile cPath ptr cLen
-  Just (WFResult cfArgs@(CFArgs key nonce)) <- jDecode r
-  let encryptedFile = CryptoFile path $ Just cfArgs
-  CF.getFileContentsSize encryptedFile `shouldReturn` fromIntegral (B.length src)
+  Just (WFResult (CFArgs key nonce)) <- jDecode r
   cKey <- encodedCString key
   cNonce <- encodedCString nonce
-  -- the returned pointer contains 0, buffer length as Word32, then buffer
   ptr' <- cChatReadFile cPath cKey cNonce
-  peek ptr' `shouldReturn` (0 :: Word8)
-  sz :: Word32 <- peek (ptr' `plusPtr` 1)
-  let sz' = fromIntegral sz
-  contents <- create sz' $ \toPtr -> memcpy toPtr (ptr' `plusPtr` 5) sz'
+  -- the returned pointer contains NUL-terminated JSON string of ReadFileResult followed by the file contents
+  r' <- peekCAString $ castPtr ptr'
+  Just (RFResult sz) <- jDecode r'
+  contents <- getByteString (ptr' `plusPtr` (length r' + 1)) $ fromIntegral sz
   contents `shouldBe` src
-  sz' `shouldBe` fromIntegral len
-
-testMissingFileCApi :: FilePath -> IO ()
-testMissingFileCApi tmp = do
-  let path = tmp </> "missing_file"
-  cPath <- newCString path
-  CFArgs key nonce <- CF.randomArgs
-  cKey <- encodedCString key
-  cNonce <- encodedCString nonce
-  ptr <- cChatReadFile cPath cKey cNonce
-  peek ptr `shouldReturn` 1
-  err <- peekCAString (ptr `plusPtr` 1)
-  err `shouldContain` "missing_file: openBinaryFile: does not exist"
-
-testFileEncryptionCApi :: FilePath -> FilePath -> IO ()
-testFileEncryptionCApi fileName tmp = do
-  let fromPath = tmp </> (fileName <> ".source.pdf")
-  copyFile "./tests/fixtures/test.pdf" fromPath
-  src <- B.readFile fromPath
-  cFromPath <- newCString fromPath
-  let toPath = tmp </> (fileName <> ".encrypted.pdf")
-  cToPath <- newCString toPath
-  r <- peekCAString =<< cChatEncryptFile cFromPath cToPath
-  Just (WFResult cfArgs@(CFArgs key nonce)) <- jDecode r
-  CF.getFileContentsSize (CryptoFile toPath $ Just cfArgs) `shouldReturn` fromIntegral (B.length src)
-  cKey <- encodedCString key
-  cNonce <- encodedCString nonce
-  let toPath' = tmp </> (fileName <> ".decrypted.pdf")
-  cToPath' <- newCString toPath'
-  "" <- peekCAString =<< cChatDecryptFile cToPath cKey cNonce cToPath'
-  B.readFile toPath' `shouldReturn` src
-
-testMissingFileEncryptionCApi :: FilePath -> IO ()
-testMissingFileEncryptionCApi tmp = do
-  let fromPath = tmp </> "missing_file.source.pdf"
-      toPath = tmp </> "missing_file.encrypted.pdf"
-  cFromPath <- newCString fromPath
-  cToPath <- newCString toPath
-  r <- peekCAString =<< cChatEncryptFile cFromPath cToPath
-  Just (WFError err) <- jDecode r
-  err `shouldContain` fromPath
-  CFArgs key nonce <- CF.randomArgs
-  cKey <- encodedCString key
-  cNonce <- encodedCString nonce
-  let toPath' = tmp </> "missing_file.decrypted.pdf"
-  cToPath' <- newCString toPath'
-  err' <- peekCAString =<< cChatDecryptFile cToPath cKey cNonce cToPath'
-  err' `shouldContain` toPath
-
-jDecode :: FromJSON a => String -> IO (Maybe a)
-jDecode = pure . J.decode . LB.pack
-
-encodedCString :: StrEncoding a => a -> IO CString
-encodedCString = newCAString . BS.unpack . strEncode
+  sz `shouldBe` len
+  where
+    jDecode :: FromJSON a => String -> IO (Maybe a)
+    jDecode = pure . J.decode . LB.pack
+    encodedCString :: StrEncoding a => a -> IO CString
+    encodedCString = newCAString . BS.unpack . strEncode

tests/ProtocolTests.hs

@@ -76,10 +76,10 @@ s ##==## msg = do
   s ==## msg
 
 (==#) :: MsgEncodingI e => ByteString -> ChatMsgEvent e -> Expectation
-s ==# msg = s ==## ChatMessage chatInitialVRange Nothing msg
+s ==# msg = s ==## ChatMessage Nothing msg
 
 (#==) :: MsgEncodingI e => ByteString -> ChatMsgEvent e -> Expectation
-s #== msg = s ##== ChatMessage chatInitialVRange Nothing msg
+s #== msg = s ##== ChatMessage Nothing msg
 
 (#==#) :: MsgEncodingI e => ByteString -> ChatMsgEvent e -> Expectation
 s #==# msg = do
@@ -101,66 +101,59 @@ testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", descri
 decodeChatMessageTest :: Spec
 decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
   it "x.msg.new simple text" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing))
   it "x.msg.new simple text - timed message TTL" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"ttl\":3600}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"ttl\":3600}}"
       #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") Nothing (Just 3600) Nothing))
   it "x.msg.new simple text - live message" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"live\":true}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"live\":true}}"
       #==# XMsgNew (MCSimple (ExtMsgContent (MCText "hello") Nothing Nothing (Just True)))
   it "x.msg.new simple link" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"https://simplex.chat\",\"type\":\"link\",\"preview\":{\"description\":\"SimpleX Chat\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgA\",\"title\":\"SimpleX Chat\",\"uri\":\"https://simplex.chat\"}}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"https://simplex.chat\",\"type\":\"link\",\"preview\":{\"description\":\"SimpleX Chat\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgA\",\"title\":\"SimpleX Chat\",\"uri\":\"https://simplex.chat\"}}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCLink "https://simplex.chat" $ LinkPreview {uri = "https://simplex.chat", title = "SimpleX Chat", description = "SimpleX Chat", image = ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgA", content = Nothing}) Nothing))
   it "x.msg.new simple image" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"\",\"type\":\"image\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\"}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"\",\"type\":\"image\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCImage "" $ ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=") Nothing))
   it "x.msg.new simple image with text" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"here's an image\",\"type\":\"image\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\"}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"here's an image\",\"type\":\"image\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCImage "here's an image" $ ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=") Nothing))
-  it "x.msg.new chat message" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing)))
-  it "x.msg.new chat message with chat version range" $
-    "{\"v\":\"1-2\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
-      ##==## ChatMessage supportedChatVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing)))
+  it "x.msg.new chat message " $
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+      ##==## ChatMessage (Just $ SharedMsgId "\1\2\3\4") (XMsgNew (MCSimple (extMsgContent (MCText "hello") Nothing)))
   it "x.msg.new quote" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}}}}"
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}}}}"
       ##==## ChatMessage
-        chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
         (XMsgNew (MCQuote quotedMsg (extMsgContent (MCText "hello to you too") Nothing)))
   it "x.msg.new quote - timed message TTL" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"ttl\":3600}}"
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"ttl\":3600}}"
       ##==## ChatMessage
-        chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
         (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") Nothing (Just 3600) Nothing)))
   it "x.msg.new quote - live message" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"live\":true}}"
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"live\":true}}"
       ##==## ChatMessage
-        chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
         (XMsgNew (MCQuote quotedMsg (ExtMsgContent (MCText "hello to you too") Nothing Nothing (Just True))))
   it "x.msg.new forward" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") Nothing))
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true}}"
+      ##==## ChatMessage (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") Nothing))
   it "x.msg.new forward - timed message TTL" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"ttl\":3600}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing (Just 3600) Nothing))
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"ttl\":3600}}"
+      ##==## ChatMessage (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing (Just 3600) Nothing))
   it "x.msg.new forward - live message" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"live\":true}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing Nothing (Just True)))
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"live\":true}}"
+      ##==## ChatMessage (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (ExtMsgContent (MCText "hello") Nothing Nothing (Just True)))
   it "x.msg.new simple text with file" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCText "hello") (Just FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
   it "x.msg.new simple file with file" $
-    "{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"\",\"type\":\"file\"},\"file\":{\"fileSize\":12345,\"fileName\":\"file.txt\"}}}"
+    "{\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"\",\"type\":\"file\"},\"file\":{\"fileSize\":12345,\"fileName\":\"file.txt\"}}}"
       #==# XMsgNew (MCSimple (extMsgContent (MCFile "") (Just FileInvitation {fileName = "file.txt", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
   it "x.msg.new quote with file" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello to you too\",\"type\":\"text\"},\"quote\":{\"content\":{\"text\":\"hello there!\",\"type\":\"text\"},\"msgRef\":{\"msgId\":\"BQYHCA==\",\"sent\":true,\"sentAt\":\"1970-01-01T00:00:01.000000001Z\"}},\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       ##==## ChatMessage
-        chatInitialVRange
         (Just $ SharedMsgId "\1\2\3\4")
         ( XMsgNew
             ( MCQuote
@@ -172,113 +165,101 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
             )
         )
   it "x.msg.new forward with file" $
-    "{\"v\":\"1\",\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
-      ##==## ChatMessage chatInitialVRange (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") (Just FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
+    "{\"msgId\":\"AQIDBA==\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"forward\":true,\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+      ##==## ChatMessage (Just $ SharedMsgId "\1\2\3\4") (XMsgNew $ MCForward (extMsgContent (MCText "hello") (Just FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing})))
   it "x.msg.update" $
-    "{\"v\":\"1\",\"event\":\"x.msg.update\",\"params\":{\"msgId\":\"AQIDBA==\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+    "{\"event\":\"x.msg.update\",\"params\":{\"msgId\":\"AQIDBA==\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
       #==# XMsgUpdate (SharedMsgId "\1\2\3\4") (MCText "hello") Nothing Nothing
   it "x.msg.del" $
-    "{\"v\":\"1\",\"event\":\"x.msg.del\",\"params\":{\"msgId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.msg.del\",\"params\":{\"msgId\":\"AQIDBA==\"}}"
       #==# XMsgDel (SharedMsgId "\1\2\3\4") Nothing
   it "x.msg.deleted" $
-    "{\"v\":\"1\",\"event\":\"x.msg.deleted\",\"params\":{}}"
+    "{\"event\":\"x.msg.deleted\",\"params\":{}}"
       #==# XMsgDeleted
   it "x.file" $
-    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       #==# XFile FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Just testConnReq, fileInline = Nothing, fileDescr = Nothing}
   it "x.file without file invitation" $
-    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"event\":\"x.file\",\"params\":{\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
       #==# XFile FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Nothing, fileInline = Nothing, fileDescr = Nothing}
   it "x.file.acpt" $
-    "{\"v\":\"1\",\"event\":\"x.file.acpt\",\"params\":{\"fileName\":\"photo.jpg\"}}"
+    "{\"event\":\"x.file.acpt\",\"params\":{\"fileName\":\"photo.jpg\"}}"
       #==# XFileAcpt "photo.jpg"
   it "x.file.acpt.inv" $
-    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
+    "{\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
       #==# XFileAcptInv (SharedMsgId "\1\2\3\4") (Just testConnReq) "photo.jpg"
   it "x.file.acpt.inv" $
-    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\"}}"
+    "{\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\"}}"
       #==# XFileAcptInv (SharedMsgId "\1\2\3\4") Nothing "photo.jpg"
   it "x.file.cancel" $
-    "{\"v\":\"1\",\"event\":\"x.file.cancel\",\"params\":{\"msgId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.file.cancel\",\"params\":{\"msgId\":\"AQIDBA==\"}}"
       #==# XFileCancel (SharedMsgId "\1\2\3\4")
   it "x.info" $
-    "{\"v\":\"1\",\"event\":\"x.info\",\"params\":{\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.info\",\"params\":{\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XInfo testProfile
   it "x.info with empty full name" $
-    "{\"v\":\"1\",\"event\":\"x.info\",\"params\":{\"profile\":{\"fullName\":\"\",\"displayName\":\"alice\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.info\",\"params\":{\"profile\":{\"fullName\":\"\",\"displayName\":\"alice\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XInfo Profile {displayName = "alice", fullName = "", image = Nothing, contactLink = Nothing, preferences = testChatPreferences}
   it "x.contact with xContactId" $
-    "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"contactReqId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.contact\",\"params\":{\"contactReqId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XContact testProfile (Just $ XContactId "\1\2\3\4")
   it "x.contact without XContactId" $
-    "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.contact\",\"params\":{\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XContact testProfile Nothing
   it "x.contact with content null" $
-    "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"content\":null,\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.contact\",\"params\":{\"content\":null,\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       ==# XContact testProfile Nothing
   it "x.contact with content (ignored)" $
-    "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.contact\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       ==# XContact testProfile Nothing
   it "x.grp.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
+    "{\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
       #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, groupLinkId = Nothing}
   it "x.grp.inv with group link id" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
+    "{\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
       #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, groupLinkId = Just $ GroupLinkId "\1\2\3\4"}
   it "x.grp.acpt without incognito profile" $
-    "{\"v\":\"1\",\"event\":\"x.grp.acpt\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.grp.acpt\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpAcpt (MemberId "\1\2\3\4")
   it "x.grp.mem.new" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile}
-  it "x.grp.mem.new with member chat version range" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-2\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile}
+    "{\"event\":\"x.grp.mem.new\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+      #==# XGrpMemNew MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, profile = testProfile}
   it "x.grp.mem.intro" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile}
-  it "x.grp.mem.intro with member chat version range" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-2\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile}
+    "{\"event\":\"x.grp.mem.intro\",\"params\":{\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+      #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, profile = testProfile}
   it "x.grp.mem.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
-      #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
-  it "x.grp.mem.inv w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
-      #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
+    "{\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
+      #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = testConnReq}
   it "x.grp.mem.fwd" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
-  it "x.grp.mem.fwd with member chat version range and w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-2\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
-      #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
+    "{\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D1-2%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+      #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = testConnReq}
   it "x.grp.mem.info" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.info\",\"params\":{\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
+    "{\"event\":\"x.grp.mem.info\",\"params\":{\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XGrpMemInfo (MemberId "\1\2\3\4") testProfile
   it "x.grp.mem.con" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.con\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.grp.mem.con\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpMemCon (MemberId "\1\2\3\4")
   it "x.grp.mem.con.all" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.con.all\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.grp.mem.con.all\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpMemConAll (MemberId "\1\2\3\4")
   it "x.grp.mem.del" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.del\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.grp.mem.del\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
       #==# XGrpMemDel (MemberId "\1\2\3\4")
   it "x.grp.leave" $
-    "{\"v\":\"1\",\"event\":\"x.grp.leave\",\"params\":{}}"
+    "{\"event\":\"x.grp.leave\",\"params\":{}}"
       ==# XGrpLeave
   it "x.grp.del" $
-    "{\"v\":\"1\",\"event\":\"x.grp.del\",\"params\":{}}"
+    "{\"event\":\"x.grp.del\",\"params\":{}}"
       ==# XGrpDel
   it "x.info.probe" $
-    "{\"v\":\"1\",\"event\":\"x.info.probe\",\"params\":{\"probe\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.info.probe\",\"params\":{\"probe\":\"AQIDBA==\"}}"
       #==# XInfoProbe (Probe "\1\2\3\4")
   it "x.info.probe.check" $
-    "{\"v\":\"1\",\"event\":\"x.info.probe.check\",\"params\":{\"probeHash\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.info.probe.check\",\"params\":{\"probeHash\":\"AQIDBA==\"}}"
       #==# XInfoProbeCheck (ProbeHash "\1\2\3\4")
   it "x.info.probe.ok" $
-    "{\"v\":\"1\",\"event\":\"x.info.probe.ok\",\"params\":{\"probe\":\"AQIDBA==\"}}"
+    "{\"event\":\"x.info.probe.ok\",\"params\":{\"probe\":\"AQIDBA==\"}}"
       #==# XInfoProbeOk (Probe "\1\2\3\4")
   it "x.ok" $
-    "{\"v\":\"1\",\"event\":\"x.ok\",\"params\":{}}"
+    "{\"event\":\"x.ok\",\"params\":{}}"
       ==# XOk

website/src/blogs-atom-feed.njk

@@ -5,7 +5,7 @@ metadata:
     title: SimpleX Chat Blog
     subtitle: It allows you to stay up to date with the latest Blogs from SimpleX Chat.
     language: en
-    url: https://simplex.chat/
+    url: https://simplex.chat/,
     author:
         name: SimpleX Chat
         email: chat@simplex.chat

website/src/blogs-rss-feed.njk

@@ -5,7 +5,7 @@ metadata:
     title: SimpleX Chat Blog
     subtitle: It allows you to stay up to date with the latest Blogs from SimpleX Chat.
     language: en
-    url: https://simplex.chat/
+    url: https://simplex.chat/,
     author:
         name: SimpleX Chat
         email: chat@simplex.chat