Merge branch 'stable' into stable-android

* Revert "raise lower bound on mtl to a real version (#3499)"

This reverts commit f94c0311c1.

* Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)"

This reverts commit 9a1c7f41f7.

* update simplexmq

* remove netword-transport fork

* compatibility with GHC 8.10.7

* simplexmq

* fix test

* simplexmq, deps

* update sqlcipher deps in sha256nix

* fix index-state in cabal.project

* index-state

* remove import

* add cabal.project.freeze

* simplexmq

* remove freeze

* simplexmq

* bytestring,simplexmq

* template-haskell, simplexmq

* simplexmq

* simplexmq

* simplexmq

* mtl

* simplexmq

* remove duplicate index-state

.github/workflows/build.yml

@@ -102,7 +102,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: "3.10.1.0"
@@ -150,13 +150,9 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
-      - name: Install Linux dependencies
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
-        run: sudo apt install -y libturbojpeg0-dev
-
-      - name: Install pkg-config for Mac
+      - name: Install openssl for Mac
         if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
-        run: brew install openssl@3.0 pkg-config jpeg-turbo
+        run: brew install openssl@3.0
 
       - name: Unix prepare cabal.project.local for Ubuntu
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
@@ -234,7 +230,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -314,7 +310,9 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: 'Setup MSYS2'
         if: matrix.os == 'windows-latest'
@@ -326,7 +324,6 @@ jobs:
             git
             perl
             make
-            mingw-w64-x86_64-libjpeg-turbo
           pacboy: >-
             toolchain:p
             cmake:p

README.md

@@ -233,7 +233,7 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
-[Dec 10, 2024. SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
+[Nov 25, 2025. Servers operated by Flux - true privacy and decentralization for all users](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md)
 
 [Oct 14, 2024. SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
 
@@ -243,14 +243,20 @@ Recent and important updates:
 
 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
 
+[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
+
 [Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).
 
+[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
+
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
 
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
 
 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
+[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
+
 [All updates](./blog)
 
 ## :zap: Quick installation of a terminal app
@@ -378,11 +384,9 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Improve sending videos (including encryption of locally stored videos).
 - ✅ Post-quantum resistant key exchange in double ratchet protocol.
 - ✅ Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
-- ✅ Support multiple network operators in the app.
-- 🏗 Large groups, communities and public channels.
-- 🏗 Short links to connect and join groups.
 - 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
+- 🏗 Large groups, communities and public channels.
 - Privacy & security slider - a simple way to set all settings at once.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.

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

@@ -156,8 +156,8 @@ struct ChatInfoView: View {
                     HStack(alignment: .center, spacing: 8) {
                         let buttonWidth = g.size.width / 4
                         searchButton(width: buttonWidth)
-                        AudioCallButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                        VideoButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
                         muteButton(width: buttonWidth)
                     }
                 }
@@ -314,15 +314,7 @@ struct ChatInfoView: View {
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
             case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
-            case .syncConnectionForceAlert:
-                return syncConnectionForceAlert({
-                    Task {
-                        if let stats = await syncContactConnection(contact, force: true, showAlert: { alert = .someAlert(alert: $0) }) {
-                            connectionStats = stats
-                            dismiss()
-                        }
-                    }
-                })
+            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
             case let .queueInfo(info): return queueInfoAlert(info)
             case let .someAlert(a): return a.alert
             case let .error(title, error): return mkAlert(title: title, message: error)
@@ -501,12 +493,7 @@ struct ChatInfoView: View {
     
     private func synchronizeConnectionButton() -> some View {
         Button {
-            Task {
-                if let stats = await syncContactConnection(contact, force: false, showAlert: { alert = .someAlert(alert: $0) }) {
-                    connectionStats = stats
-                    dismiss()
-                }
-            }
+            syncContactConnection(force: false)
         } label: {
             Label("Fix connection", systemImage: "exclamationmark.arrow.triangle.2.circlepath")
                 .foregroundColor(.orange)
@@ -625,6 +612,25 @@ struct ChatInfoView: View {
         }
     }
     
+    private func syncContactConnection(force: Bool) {
+        Task {
+            do {
+                let stats = try apiSyncContactRatchet(contact.apiId, force)
+                connectionStats = stats
+                await MainActor.run {
+                    chatModel.updateContactConnectionStats(contact, stats)
+                    dismiss()
+                }
+            } catch let error {
+                logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error synchronizing connection")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
+    
     private func savePreferences() {
         Task {
             do {
@@ -643,32 +649,9 @@ struct ChatInfoView: View {
     }
 }
 
-func syncContactConnection(_ contact: Contact, force: Bool, showAlert: (SomeAlert) -> Void) async -> ConnectionStats? {
-    do {
-        let stats = try apiSyncContactRatchet(contact.apiId, force)
-        await MainActor.run {
-            ChatModel.shared.updateContactConnectionStats(contact, stats)
-        }
-        return stats
-    } catch let error {
-        logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
-        let a = getErrorAlert(error, "Error synchronizing connection")
-        await MainActor.run {
-            showAlert(
-                SomeAlert(
-                    alert: mkAlert(title: a.title, message: a.message),
-                    id: "syncContactConnection error"
-                )
-            )
-        }
-        return nil
-    }
-}
-
 struct AudioCallButton: View {
     var chat: Chat
     var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
     var width: CGFloat
     var showAlert: (SomeAlert) -> Void
 
@@ -676,7 +659,6 @@ struct AudioCallButton: View {
         CallButton(
             chat: chat,
             contact: contact,
-            connectionStats: $connectionStats,
             image: "phone.fill",
             title: "call",
             mediaType: .audio,
@@ -689,7 +671,6 @@ struct AudioCallButton: View {
 struct VideoButton: View {
     var chat: Chat
     var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
     var width: CGFloat
     var showAlert: (SomeAlert) -> Void
 
@@ -697,7 +678,6 @@ struct VideoButton: View {
         CallButton(
             chat: chat,
             contact: contact,
-            connectionStats: $connectionStats,
             image: "video.fill",
             title: "video",
             mediaType: .video,
@@ -710,7 +690,6 @@ struct VideoButton: View {
 private struct CallButton: View {
     var chat: Chat
     var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
     var image: String
     var title: LocalizedStringKey
     var mediaType: CallMediaType
@@ -722,40 +701,12 @@ private struct CallButton: View {
 
         InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
             if canCall {
-                if let connStats = connectionStats {
-                    if connStats.ratchetSyncState == .ok {
-                        if CallController.useCallKit() {
-                            CallController.shared.startCall(contact, mediaType)
-                        } else {
-                            // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
-                            dismissAllSheets(animated: true) {
-                                CallController.shared.startCall(contact, mediaType)
-                            }
-                        }
-                    } else if connStats.ratchetSyncAllowed {
-                        showAlert(SomeAlert(
-                            alert: Alert(
-                                title: Text("Fix connection?"),
-                                message: Text("Connection requires encryption renegotiation."),
-                                primaryButton: .default(Text("Fix")) {
-                                    Task {
-                                        if let stats = await syncContactConnection(contact, force: false, showAlert: showAlert) {
-                                            connectionStats = stats
-                                        }
-                                    }
-                                },
-                                secondaryButton: .cancel()
-                            ),
-                            id: "can't call contact, fix connection"
-                        ))
-                    } else {
-                        showAlert(SomeAlert(
-                            alert: mkAlert(
-                                title: "Can't call contact",
-                                message: "Encryption renegotiation in progress."
-                            ),
-                            id: "can't call contact, encryption renegotiation in progress"
-                        ))
+                if CallController.useCallKit() {
+                    CallController.shared.startCall(contact, mediaType)
+                } else {
+                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
+                    dismissAllSheets(animated: true) {
+                        CallController.shared.startCall(contact, mediaType)
                     }
                 }
             } else if contact.nextSendGrpInv {

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

@@ -440,7 +440,6 @@ struct ChatView: View {
                     maxWidth: maxWidth,
                     composeState: $composeState,
                     selectedMember: $selectedMember,
-                    showChatInfoSheet: $showChatInfoSheet,
                     revealedChatItem: $revealedChatItem,
                     selectedChatItems: $selectedChatItems,
                     forwardedChatItems: $forwardedChatItems
@@ -894,14 +893,12 @@ struct ChatView: View {
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var m: ChatModel
         @EnvironmentObject var theme: AppTheme
-        @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileRadius = defaultProfileImageCorner
         @Binding @ObservedObject var chat: Chat
         @ObservedObject var dummyModel: ChatItemDummyModel = .shared
         let chatItem: ChatItem
         let maxWidth: CGFloat
         @Binding var composeState: ComposeState
         @Binding var selectedMember: GMember?
-        @Binding var showChatInfoSheet: Bool
         @Binding var revealedChatItem: ChatItem?
 
         @State private var deletingItem: ChatItem? = nil
@@ -1258,22 +1255,16 @@ struct ChatView: View {
                             setReaction(ci, add: !r.userReacted, reaction: r.reaction)
                         }
                     }
-                    switch chat.chatInfo {
-                    case let .group(groupInfo):
+                    if case let .group(groupInfo) = chat.chatInfo {
                         v.contextMenu {
                             ReactionContextMenu(
                                 groupInfo: groupInfo,
                                 itemId: ci.id,
                                 reactionCount: r,
-                                selectedMember: $selectedMember,
-                                profileRadius: profileRadius
+                                selectedMember: $selectedMember
                             )
                         }
-                    case let .direct(contact):
-                        v.contextMenu {
-                            contactReactionMenu(contact, r)
-                        }
-                    default:
+                    } else {
                         v
                     }
                 }
@@ -1776,20 +1767,6 @@ struct ChatView: View {
                 }
             }
         }
-        
-        @ViewBuilder private func contactReactionMenu(_ contact: Contact, _ r: CIReactionCount) -> some View {
-            if !r.userReacted || r.totalReacted > 1 {
-                Button { showChatInfoSheet = true } label: {
-                    profileMenuItem(Text(contact.displayName), contact.image, radius: profileRadius)
-                }
-            }
-            if r.userReacted {
-                Button {} label: {
-                    profileMenuItem(Text("you"), m.currentUser?.profile.image, radius: profileRadius)
-                }
-                .disabled(true)
-            }
-        }
 
         private struct SelectedChatItem: View {
             @EnvironmentObject var theme: AppTheme
@@ -1882,12 +1859,13 @@ struct ReactionContextMenu: View {
     var itemId: Int64
     var reactionCount: CIReactionCount
     @Binding var selectedMember: GMember?
-    var profileRadius: CGFloat
     @State private var memberReactions: [MemberReaction] = []
+    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
 
     var body: some View {
         groupMemberReactionList()
             .task {
+                logger.debug("ReactionContextMenu task \(radius)")
                 await loadChatItemReaction()
             }
     }
@@ -1911,12 +1889,27 @@ struct ReactionContextMenu: View {
                         selectedMember = member
                     }
                 } label: {
-                    profileMenuItem(Text(mem.displayName), mem.image, radius: profileRadius)
+                    HStack {
+                        Text(mem.displayName)
+                        if let img = cropImage(mem.image) {
+                            Image(uiImage: img)
+                        } else {
+                            Image(systemName: "person.crop.circle")
+                        }
+                    }
                 }
                 .disabled(userMember)
             }
         }
     }
+        
+    private func cropImage(_ img: String?) -> UIImage? {
+        return if let originalImage = imageFromBase64(img) {
+            maskToCustomShape(originalImage, size: 30, radius: radius)
+        } else {
+            nil
+        }
+    }
 
     private func loadChatItemReaction() async {
         do {
@@ -1934,17 +1927,6 @@ struct ReactionContextMenu: View {
     }
 }
 
-func profileMenuItem(_ nameText: Text, _ image: String?, radius: CGFloat) -> some View {
-    HStack {
-        nameText
-        if let image, let img = imageFromBase64(image) {
-            Image(uiImage: maskToCustomShape(img, size: 30, radius: radius))
-        } else {
-            Image(systemName: "person.crop.circle")
-        }
-    }
-}
-
 func maskToCustomShape(_ image: UIImage, size: CGFloat, radius: CGFloat) -> UIImage {
     let path = Path { path in
         if radius >= 50 {

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

@@ -20,9 +20,6 @@ struct GroupMemberInfoView: View {
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
     @State private var connectionLoaded: Bool = false
-    @State private var knownContactChat: Chat? = nil
-    @State private var knownContact: Contact? = nil
-    @State private var knownContactConnectionStats: ConnectionStats? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
     @State private var sheet: PlanAndConnectActionSheet?
@@ -122,8 +119,8 @@ struct GroupMemberInfoView: View {
                             } label: {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
-                            if member.memberContactId != nil {
-                                if knownContactChat == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                            if let contactId = member.memberContactId {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                                     connectViaAddressButton(contactLink)
                                 }
                             } else {
@@ -232,18 +229,6 @@ struct GroupMemberInfoView: View {
                     }
                     logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                 }
-                if let contactId = member.memberContactId, let (contactChat, contact) = knownDirectChat(contactId) {
-                    knownContactChat = contactChat
-                    knownContact = contact
-                    do {
-                        let (stats, _) = try await apiContactInfo(contactChat.chatInfo.apiId)
-                        await MainActor.run {
-                            knownContactConnectionStats = stats
-                        }
-                    } catch let error {
-                        logger.error("apiContactInfo error: \(responseError(error))")
-                    }
-                }
             }
             .onChange(of: newRole) { newRole in
                 if newRole != member.memberRole {
@@ -289,10 +274,10 @@ struct GroupMemberInfoView: View {
         GeometryReader { g in
             let buttonWidth = g.size.width / 4
             HStack(alignment: .center, spacing: 8) {
-                if let chat = knownContactChat, let contact = knownContact {
+                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
                     knownDirectChatButton(chat, width: buttonWidth)
-                    AudioCallButton(chat: chat, contact: contact, connectionStats: $knownContactConnectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                    VideoButton(chat: chat, contact: contact, connectionStats: $knownContactConnectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
                 } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                     if let contactId = member.memberContactId {
                         newDirectChatButton(contactId, width: buttonWidth)
@@ -381,49 +366,25 @@ struct GroupMemberInfoView: View {
 
     func createMemberContactButton(width: CGFloat) -> some View {
         InfoViewButton(image: "message.fill", title: "message", width: width) {
-            if let connStats = connectionStats {
-                if connStats.ratchetSyncState == .ok {
-                    progressIndicator = true
-                    Task {
-                        do {
-                            let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
-                            await MainActor.run {
-                                progressIndicator = false
-                                chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                                ItemsModel.shared.loadOpenChat(memberContact.id) {
-                                    dismissAllSheets(animated: true)
-                                }
-                                NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
-                            }
-                        } catch let error {
-                            logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
-                            let a = getErrorAlert(error, "Error creating member contact")
-                            await MainActor.run {
-                                progressIndicator = false
-                                alert = .error(title: a.title, error: a.message)
-                            }
+            progressIndicator = true
+            Task {
+                do {
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    await MainActor.run {
+                        progressIndicator = false
+                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
+                        ItemsModel.shared.loadOpenChat(memberContact.id) {
+                            dismissAllSheets(animated: true)
                         }
+                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
+                    }
+                } catch let error {
+                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
+                    let a = getErrorAlert(error, "Error creating member contact")
+                    await MainActor.run {
+                        progressIndicator = false
+                        alert = .error(title: a.title, error: a.message)
                     }
-                } else if connStats.ratchetSyncAllowed {
-                    alert = .someAlert(alert: SomeAlert(
-                        alert: Alert(
-                            title: Text("Fix connection?"),
-                            message: Text("Connection requires encryption renegotiation."),
-                            primaryButton: .default(Text("Fix")) {
-                                syncMemberConnection(force: false)
-                            },
-                            secondaryButton: .cancel()
-                        ),
-                        id: "can't message member, fix connection"
-                    ))
-                } else {
-                    alert = .someAlert(alert: SomeAlert(
-                        alert: mkAlert(
-                            title: "Can't message member",
-                            message: "Encryption renegotiation in progress."
-                        ),
-                        id: "can't message contact, encryption renegotiation in progress"
-                    ))
                 }
             }
         }

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

@@ -587,7 +587,7 @@ struct SMPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is private to your device.")
         }
     }
 }
@@ -703,7 +703,7 @@ struct XFTPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is private to your device.")
         }
     }
 }

apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff

@@ -731,8 +731,8 @@
         <target>Всички данни се изтриват при въвеждане.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff

@@ -712,8 +712,8 @@
         <target>Všechna data se při zadání vymažou.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff

@@ -760,8 +760,8 @@
         <target>Alle Daten werden gelöscht, sobald dieser eingegeben wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Alle Daten werden nur auf Ihrem Gerät gespeichert.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff

@@ -760,9 +760,9 @@
         <target>All data is erased when it is entered.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
-        <target>All data is kept private on your device.</target>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
+        <target>All data is private to your device.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff

@@ -760,8 +760,8 @@
         <target>Al introducirlo todos los datos son eliminados.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Todos los datos son privados y están en tu dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff

@@ -707,8 +707,8 @@
         <target>Kaikki tiedot poistetaan, kun se syötetään.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff

@@ -745,8 +745,8 @@
         <target>Toutes les données sont effacées lorsqu'il est saisi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Toutes les données restent confinées dans votre appareil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff

@@ -760,8 +760,8 @@
         <target>A jelkód megadása után az összes adat törlésre kerül.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Az összes adat biztonságban van az eszközén.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff

@@ -759,8 +759,8 @@
         <target>Tutti i dati vengono cancellati quando inserito.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Tutti i dati sono privati, nel tuo dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff

@@ -724,8 +724,8 @@
         <target>入力するとすべてのデータが消去されます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff

@@ -760,8 +760,8 @@
         <target>Alle gegevens worden bij het invoeren gewist.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Alle gegevens zijn privé op uw apparaat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff

@@ -745,8 +745,8 @@
         <target>Wszystkie dane są usuwane po jego wprowadzeniu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Wszystkie dane są prywatne na Twoim urządzeniu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff

@@ -5425,8 +5425,8 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
         <source>Advanced settings</source>
         <target state="translated">Configurações avançadas</target>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve" approved="no">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve" approved="no">
+        <source>All data is private to your device.</source>
         <target state="translated">Toda informação é privada em seu dispositivo.</target>
       </trans-unit>
       <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">

apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff

@@ -760,8 +760,8 @@
         <target>Все данные удаляются при его вводе.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Все данные хранятся только на вашем устройстве.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff

@@ -699,8 +699,8 @@
         <target>ข้อมูลทั้งหมดจะถูกลบเมื่อถูกป้อน</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">

apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff

@@ -745,8 +745,8 @@
         <target>Kullanıldığında bütün veriler silinir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Tüm veriler cihazınıza özeldir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff

@@ -756,8 +756,8 @@
         <target>Всі дані стираються при введенні.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>Всі дані є приватними для вашого пристрою.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff

@@ -739,8 +739,8 @@
         <target>所有数据在输入后将被删除。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All data is kept private on your device." xml:space="preserve">
-        <source>All data is kept private on your device.</source>
+      <trans-unit id="All data is private to your device." xml:space="preserve">
+        <source>All data is private to your device.</source>
         <target>所有数据都是您设备的私有数据.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -1931,7 +1931,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1956,7 +1956,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1980,7 +1980,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -2005,7 +2005,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -2021,11 +2021,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2041,11 +2041,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2066,7 +2066,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2081,7 +2081,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2103,7 +2103,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2118,7 +2118,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2140,7 +2140,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2166,7 +2166,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2191,7 +2191,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2217,7 +2217,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2242,7 +2242,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2257,7 +2257,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2276,7 +2276,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 255;
+				CURRENT_PROJECT_VERSION = 254;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2291,7 +2291,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.2.1;
+				MARKETING_VERSION = 6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/CryptoFile.swift

@@ -25,18 +25,6 @@ public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
     }
 }
 
-public func writeCryptoImage(maxSize: Int, path: String, data: Data, encrypted: Bool) 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_image(getChatCtrl(), maxSize, &cPath, ptr, Int32(data.count), encrypted)!
-    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)!

apps/ios/SimpleXChat/FileUtils.swift

@@ -223,17 +223,6 @@ public func saveFile(_ data: Data, _ fileName: String, encrypted: Bool) -> Crypt
     }
 }
 
-public func saveImage(_ data: Data, _ fileName: String, maxSize: Long, encrypted: Bool) -> CryptoFile? {
-    let filePath = getAppFilePath(fileName)
-    do {
-        let cfArgs = try writeCryptoImage(maxSize: maxSize, path: filePath.path, data: data, encrypted: encrypted)
-        return CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-    } catch {
-        logger.error("FileUtils.saveImage error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
 public func removeFile(_ url: URL) {
     do {
         try FileManager.default.removeItem(atPath: url.path)

apps/ios/SimpleXChat/ImageUtils.swift

@@ -101,27 +101,19 @@ public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha
 }
 
 public func resizeImageToStrSizeSync(_ image: UIImage, maxDataSize: Int64) -> String? {
-    // XXX: only needed when the original encoding isn't available
-    let tmpFile = generateNewFileName(getTempFilesDirectory().path + "/" + "resize", "png", fullPath: true)
-    // encode as png and let the backend deal with alpha and formats
-    guard let d = image.pngData() else { return nil }
-    if let _ = saveFile(d, tmpFile, encrypted: false) {
-        defer { removeFile(tmpFile) }
-        let ptr = chat_resize_image_to_str_size(tmpFile, maxDataSize)
-        if let ptr = ptr {
-            let str = fromCString(ptr)
-            let dataSize = str.count
-            if dataSize <= 0 { return nil }
-            logger.debug("resizeImageToStrSize final \(dataSize)")
-            return str
-        } else {
-            logger.error("resizeImageToStrSize failed")
-            return nil
-        }
-    } else {
-        logger.error("saveFile failed")
-        return nil
+    var img = image
+    let hasAlpha = imageHasAlpha(image)
+    var str = compressImageStr(img, hasAlpha: hasAlpha)
+    var dataSize = str?.count ?? 0
+    while dataSize != 0 && dataSize > maxDataSize {
+        let ratio = sqrt(Double(dataSize) / Double(maxDataSize))
+        let clippedRatio = min(ratio, 2.0)
+        img = reduceSize(img, ratio: clippedRatio, hasAlpha: hasAlpha)
+        str = compressImageStr(img, hasAlpha: hasAlpha)
+        dataSize = str?.count ?? 0
     }
+    logger.debug("resizeImageToStrSize final \(dataSize)")
+    return str
 }
 
 public func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) async -> String? {
@@ -319,7 +311,7 @@ private func getTimestamp() -> String {
 }
 
 public func dropImagePrefix(_ s: String) -> String {
-    dropPrefix(dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,"), "data:image/jpeg;base64,")
+    dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
 }
 
 private func dropPrefix(_ s: String, _ prefix: String) -> String {

apps/ios/SimpleXChat/SimpleX.h

@@ -29,14 +29,10 @@ extern char *chat_valid_name(char *name);
 extern int chat_json_length(char *str);
 extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);
-extern char *chat_resize_image_to_str_size(const char *path, long maxSize);
 
 // chat_write_file returns null-terminated string with JSON of WriteFileResult
 extern char *chat_write_file(chat_ctrl ctl, char *path, char *data, int len);
 
-// chat_write_image returns null-terminated string with JSON of WriteFileResult
-extern char *chat_write_image(chat_ctrl ctl, long maxSize, char *path, char *data, int len, bool encrypted);
-
 // 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.

apps/ios/de.lproj/Localizable.strings

@@ -479,7 +479,7 @@
 "All data is erased when it is entered." = "Alle Daten werden gelöscht, sobald dieser eingegeben wird.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Alle Daten werden nur auf Ihrem Gerät gespeichert.";
+"All data is private to your device." = "Alle Daten werden nur auf Ihrem Gerät gespeichert.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Alle Gruppenmitglieder bleiben verbunden.";

apps/ios/es.lproj/Localizable.strings

@@ -479,7 +479,7 @@
 "All data is erased when it is entered." = "Al introducirlo todos los datos son eliminados.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Todos los datos son privados y están en tu dispositivo.";
+"All data is private to your device." = "Todos los datos son privados y están en tu dispositivo.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Todos los miembros del grupo permanecerán conectados.";

apps/ios/fr.lproj/Localizable.strings

@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Toutes les données sont effacées lorsqu'il est saisi.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Toutes les données restent confinées dans votre appareil.";
+"All data is private to your device." = "Toutes les données restent confinées dans votre appareil.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tous les membres du groupe resteront connectés.";

apps/ios/hu.lproj/Localizable.strings

@@ -479,7 +479,7 @@
 "All data is erased when it is entered." = "A jelkód megadása után az összes adat törlésre kerül.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Az összes adat biztonságban van az eszközén.";
+"All data is private to your device." = "Az összes adat biztonságban van az eszközén.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Az összes csoporttag kapcsolatban marad.";

apps/ios/it.lproj/Localizable.strings

@@ -473,7 +473,7 @@
 "All data is erased when it is entered." = "Tutti i dati vengono cancellati quando inserito.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Tutti i dati sono privati, nel tuo dispositivo.";
+"All data is private to your device." = "Tutti i dati sono privati, nel tuo dispositivo.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tutti i membri del gruppo resteranno connessi.";

apps/ios/nl.lproj/Localizable.strings

@@ -479,7 +479,7 @@
 "All data is erased when it is entered." = "Alle gegevens worden bij het invoeren gewist.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Alle gegevens zijn privé op uw apparaat.";
+"All data is private to your device." = "Alle gegevens zijn privé op uw apparaat.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Alle groepsleden blijven verbonden.";

apps/ios/pl.lproj/Localizable.strings

@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Wszystkie dane są usuwane po jego wprowadzeniu.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Wszystkie dane są prywatne na Twoim urządzeniu.";
+"All data is private to your device." = "Wszystkie dane są prywatne na Twoim urządzeniu.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Wszyscy członkowie grupy pozostaną połączeni.";

apps/ios/ru.lproj/Localizable.strings

@@ -479,7 +479,7 @@
 "All data is erased when it is entered." = "Все данные удаляются при его вводе.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Все данные хранятся только на вашем устройстве.";
+"All data is private to your device." = "Все данные хранятся только на вашем устройстве.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Все члены группы, которые соединились через эту ссылку, останутся в группе.";

apps/ios/tr.lproj/Localizable.strings

@@ -431,7 +431,7 @@
 "All data is erased when it is entered." = "Kullanıldığında bütün veriler silinir.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Tüm veriler cihazınıza özeldir.";
+"All data is private to your device." = "Tüm veriler cihazınıza özeldir.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tüm grup üyeleri bağlı kalacaktır.";

apps/ios/uk.lproj/Localizable.strings

@@ -464,7 +464,7 @@
 "All data is erased when it is entered." = "Всі дані стираються при введенні.";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "Всі дані є приватними для вашого пристрою.";
+"All data is private to your device." = "Всі дані є приватними для вашого пристрою.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Всі учасники групи залишаться на зв'язку.";

apps/ios/zh-Hans.lproj/Localizable.strings

@@ -413,7 +413,7 @@
 "All data is erased when it is entered." = "所有数据在输入后将被删除。";
 
 /* No comment provided by engineer. */
-"All data is kept private on your device." = "所有数据都是您设备的私有数据.";
+"All data is private to your device." = "所有数据都是您设备的私有数据.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "所有群组成员将保持连接。";

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

@@ -14,12 +14,8 @@ import boofcv.android.ConvertBitmap
 import boofcv.struct.image.GrayU8
 import chat.simplex.common.R
 import chat.simplex.common.views.helpers.errorBitmap
-import chat.simplex.common.views.helpers.generateNewFileName
 import chat.simplex.common.views.helpers.getFileName
-import chat.simplex.common.views.helpers.removeFile
 import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
 import java.io.InputStream
 import java.net.URI
 import kotlin.math.min
@@ -29,25 +25,26 @@ actual fun base64ToBitmap(base64ImageString: String): ImageBitmap {
   val imageString = base64ImageString
     .removePrefix("data:image/png;base64,")
     .removePrefix("data:image/jpg;base64,")
-    .removePrefix("data:image/jpeg;base64,")
   return try {
     val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
     BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size).asImageBitmap()
   } catch (e: Exception) {
-    Log.e(TAG, "base64ToBitmap error: $e for input '$base64ImageString' -> '$imageString'")
+    Log.e(TAG, "base64ToBitmap error: $e")
     errorBitmap.asImageBitmap()
   }
 }
 
 actual fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String {
-  val tmpFileName = generateNewFileName("IMG", "png", tmpDir)
-  val tmpFile = File(tmpDir, tmpFileName)
-  val output = FileOutputStream(tmpFile)
-  compressImageData(image, true).writeTo(output)
-  output.flush()
-  output.close()
-  var str = chatResizeImageToStrSize(tmpFile.absolutePath, maxDataSize)
-  removeFile(tmpFileName)
+  var img = image
+  var str = compressImageStr(img)
+  while (str.length > maxDataSize) {
+    val ratio = sqrt(str.length.toDouble() / maxDataSize.toDouble())
+    val clippedRatio = min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
+    str = compressImageStr(img)
+  }
   return str
 }
 
@@ -74,11 +71,11 @@ fun Bitmap.clipToCircle(): Bitmap {
   return circle
 }
 
-// actual fun compressImageStr(bitmap: ImageBitmap): String {
-//   val usePng = bitmap.hasAlpha()
-//   val ext = if (usePng) "png" else "jpg"
-//   return "data:image/$ext;base64," + Base64.encodeToString(compressImageData(bitmap, usePng).toByteArray(), Base64.NO_WRAP)
-// }
+actual fun compressImageStr(bitmap: ImageBitmap): String {
+  val usePng = bitmap.hasAlpha()
+  val ext = if (usePng) "png" else "jpg"
+  return "data:image/$ext;base64," + Base64.encodeToString(compressImageData(bitmap, usePng).toByteArray(), Base64.NO_WRAP)
+}
 
 actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream {
   val stream = ByteArrayOutputStream()
@@ -86,19 +83,19 @@ actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOut
   return stream
 }
 
-// actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
-//   var img = image
-//   var stream = compressImageData(img, usePng)
-//   while (stream.size() > maxDataSize) {
-//     val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
-//     val clippedRatio = min(ratio, 2.0)
-//     val width = (img.width.toDouble() / clippedRatio).toInt()
-//     val height = img.height * width / img.width
-//     img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
-//     stream = compressImageData(img, usePng)
-//   }
-//   return stream
-// }
+actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
+  var img = image
+  var stream = compressImageData(img, usePng)
+  while (stream.size() > maxDataSize) {
+    val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
+    val clippedRatio = min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = Bitmap.createScaledBitmap(img.asAndroidBitmap(), width, height, true).asImageBitmap()
+    stream = compressImageData(img, usePng)
+  }
+  return stream
+}
 
 actual fun GrayU8.toImageBitmap(): ImageBitmap = ConvertBitmap.grayToBitmap(this, Bitmap.Config.RGB_565).asImageBitmap()
 

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

@@ -1,11 +1,10 @@
 package chat.simplex.common.platform
 
 import android.util.Log
-import chat.simplex.common.model.ChatController.appPrefs
 
 actual object Log {
-  actual fun d(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.DEBUG && appPrefs.developerTools.get()) Log.d(tag, text) }
-  actual fun e(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.ERROR || !appPrefs.developerTools.get()) Log.e(tag, text) }
-  actual fun i(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.INFO && appPrefs.developerTools.get()) Log.i(tag, text) }
-  actual fun w(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.WARNING || !appPrefs.developerTools.get()) Log.w(tag, text) }
+  actual fun d(tag: String, text: String) = Log.d(tag, text).run{}
+  actual fun e(tag: String, text: String) = Log.e(tag, text).run{}
+  actual fun i(tag: String, text: String) = Log.i(tag, text).run{}
+  actual fun w(tag: String, text: String) = Log.w(tag, text).run{}
 }

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

@@ -1,8 +1,7 @@
 #include <jni.h>
 #include <string.h>
-#include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
+//#include <stdlib.h>
 //#include <android/log.h>
 
 // from the RTS
@@ -69,31 +68,9 @@ extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
 extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
-extern char *chat_write_image(chat_ctrl ctrl, long max_size, const char *path, char *ptr, int length, bool encrypt);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
-extern char *chat_resize_image_to_str_size(const char *from_path, long max_size);
-
-char * encode_to_utf8_chars(JNIEnv *env, jstring string) {
-    if (!string) return "";
-
-    const jclass cls_string = (*env)->FindClass(env, "java/lang/String");
-    const jmethodID mid_getBytes = (*env)->GetMethodID(env, cls_string, "getBytes", "(Ljava/lang/String;)[B");
-    const jbyteArray jbyte_array = (jbyteArray) (*env)->CallObjectMethod(env, string, mid_getBytes, (*env)->NewStringUTF(env, "UTF-8"));
-    jint length = (jint) (*env)->GetArrayLength(env, jbyte_array);
-    jbyte *jbytes = malloc(length + 1);
-    (*env)->GetByteArrayRegion(env, jbyte_array, 0, length, jbytes);
-    // char * should be null terminated but jbyte * isn't. Terminate it with \0. Otherwise, Haskell will not see the end of string
-    jbytes[length] = '\0';
-
-    //for (int i = 0; i < length; ++i)
-    //    fprintf(stderr, "%d: %02x\n", i, jbytes[i]);
-
-    (*env)->DeleteLocalRef(env, jbyte_array);
-    (*env)->DeleteLocalRef(env, cls_string);
-    return (char *) jbytes;
-}
 
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey, jstring confirm) {
@@ -205,16 +182,6 @@ Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteImage(JNIEnv *env, jclass clazz, jlong controller, jlong maxSize, jstring path, jobject buffer, jboolean encrypt) {
-    const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
-    jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
-    jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = (*env)->NewStringUTF(env, chat_write_image((void*)controller, maxSize, _path, buff, capacity, encrypt));
-    (*env)->ReleaseStringUTFChars(env, path, _path);
-    return res;
-}
-
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz, jstring path, jstring key, jstring nonce) {
     const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
@@ -277,11 +244,3 @@ Java_chat_simplex_common_platform_CoreKt_chatDecryptFile(JNIEnv *env, jclass cla
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;
 }
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatResizeImageToStrSize(JNIEnv *env, jclass clazz, jstring from_path, jlong max_size) {
-    const char *_from_path = (*env)->GetStringUTFChars(env, from_path, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_resize_image_to_str_size(_from_path, max_size));
-    (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
-    return res;
-}

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

@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})
 
 	target_link_libraries(app-lib rts simplex)

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

@@ -1,6 +1,5 @@
 #include <jni.h>
 #include <string.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -42,11 +41,9 @@ extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
 extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
-extern char *chat_write_image(chat_ctrl ctrl, long max_size, const char *path, char *ptr, int length, bool encrypt);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
 extern char *chat_decrypt_file(const char *from_path, const char *key, const char *nonce, const char *to_path);
-extern char *chat_resize_image_to_str_size(const char *from_path, long max_size);
 
 // As a reference: https://stackoverflow.com/a/60002045
 jstring decode_to_utf8_string(JNIEnv *env, char *string) {
@@ -195,16 +192,6 @@ Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz
     return res;
 }
 
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatWriteImage(JNIEnv *env, jclass clazz, jlong controller, jlong maxSize, jstring path, jobject buffer, jboolean encrypt) {
-    const char *_path = encode_to_utf8_chars(env, path);
-    jbyte *buff = (jbyte *) (*env)->GetDirectBufferAddress(env, buffer);
-    jlong capacity = (*env)->GetDirectBufferCapacity(env, buffer);
-    jstring res = decode_to_utf8_string(env, chat_write_image((void*)controller, maxSize, _path, buff, capacity, encrypt));
-    (*env)->ReleaseStringUTFChars(env, path, _path);
-    return res;
-}
-
 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatReadFile(JNIEnv *env, jclass clazz, jstring path, jstring key, jstring nonce) {
     const char *_path = encode_to_utf8_chars(env, path);
@@ -267,11 +254,3 @@ Java_chat_simplex_common_platform_CoreKt_chatDecryptFile(JNIEnv *env, jclass cla
     (*env)->ReleaseStringUTFChars(env, to_path, _to_path);
     return res;
 }
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_common_platform_CoreKt_chatResizeImageToStrSize(JNIEnv *env, jclass clazz, jstring from_path, jlong max_size) {
-    const char *_from_path = encode_to_utf8_chars(env, from_path);
-    jstring res = decode_to_utf8_string(env, chat_resize_image_to_str_size(_from_path, max_size));
-    (*env)->ReleaseStringUTFChars(env, from_path, _from_path);
-    return res;
-}

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

@@ -1,6 +1,5 @@
 package chat.simplex.common.model
 
-import androidx.compose.ui.graphics.ImageBitmap
 import chat.simplex.common.platform.*
 import kotlinx.serialization.*
 import java.nio.ByteBuffer
@@ -33,19 +32,6 @@ fun writeCryptoFile(path: String, data: ByteArray): CryptoFileArgs {
   }
 }
 
-fun writeCryptoImage(maxSize: Long, image: ImageBitmap, path: String, encrypt: Boolean): CryptoFileArgs {
-  val ctrl = ChatController.ctrl ?: throw Exception("Controller is not initialized")
-  val data = compressImageData(image, image.hasAlpha).toByteArray()
-  val buffer = ByteBuffer.allocateDirect(data.size)
-  buffer.put(data)
-  buffer.rewind()
-  val str = chatWriteImage(ctrl, maxSize, path, buffer, encrypt)
-  return when (val d = json.decodeFromString(WriteFileResult.serializer(), str)) {
-    is WriteFileResult.Result -> d.cryptoArgs
-    is WriteFileResult.Error -> throw Exception(d.writeError)
-  }
-}
-
 fun readCryptoFile(path: String, cryptoArgs: CryptoFileArgs): ByteArray {
   val res: Array<Any> = chatReadFile(path, cryptoArgs.fileKey, cryptoArgs.fileNonce)
   val status = (res[0] as Integer).toInt()

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

@@ -132,7 +132,6 @@ class AppPreferences {
   val chatLastStart = mkDatePreference(SHARED_PREFS_CHAT_LAST_START, null)
   val chatStopped = mkBoolPreference(SHARED_PREFS_CHAT_STOPPED, false)
   val developerTools = mkBoolPreference(SHARED_PREFS_DEVELOPER_TOOLS, false)
-  val logLevel = mkEnumPreference(SHARED_PREFS_LOG_LEVEL, LogLevel.WARNING) { LogLevel.entries.firstOrNull { it.name == this } }
   val showInternalErrors = mkBoolPreference(SHARED_PREFS_SHOW_INTERNAL_ERRORS, false)
   val showSlowApiCalls = mkBoolPreference(SHARED_PREFS_SHOW_SLOW_API_CALLS, false)
   val terminalAlwaysVisible = mkBoolPreference(SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE, false)
@@ -394,7 +393,6 @@ class AppPreferences {
     private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
     private const val SHARED_PREFS_CHAT_STOPPED = "ChatStopped"
     private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
-    private const val SHARED_PREFS_LOG_LEVEL = "LogLevel"
     private const val SHARED_PREFS_SHOW_INTERNAL_ERRORS = "ShowInternalErrors"
     private const val SHARED_PREFS_SHOW_SLOW_API_CALLS = "ShowSlowApiCalls"
     private const val SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE = "TerminalAlwaysVisible"

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

@@ -32,11 +32,9 @@ external fun chatPasswordHash(pwd: String, salt: String): String
 external fun chatValidName(name: String): String
 external fun chatJsonLength(str: String): Int
 external fun chatWriteFile(ctrl: ChatCtrl, path: String, buffer: ByteBuffer): String
-external fun chatWriteImage(ctrl: ChatCtrl, maxSize: Long, path: String, buffer: ByteBuffer, encrypt: Boolean): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
 external fun chatEncryptFile(ctrl: ChatCtrl, fromPath: String, toPath: String): String
 external fun chatDecryptFile(fromPath: String, key: String, nonce: String, toPath: String): String
-external fun chatResizeImageToStrSize(fromPath: String, maxSize: Long): String
 
 val chatModel: ChatModel
   get() = chatController.chatModel

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

@@ -7,11 +7,10 @@ import java.io.InputStream
 import java.net.URI
 
 expect fun base64ToBitmap(base64ImageString: String): ImageBitmap
-// XXX: Not a part of platform services anymore?
 expect fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String
-// expect fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream
+expect fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream
 expect fun cropToSquare(image: ImageBitmap): ImageBitmap
-// expect fun compressImageStr(bitmap: ImageBitmap): String
+expect fun compressImageStr(bitmap: ImageBitmap): String
 expect fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream
 
 expect fun GrayU8.toImageBitmap(): ImageBitmap

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

@@ -2,10 +2,6 @@ package chat.simplex.common.platform
 
 const val TAG = "SIMPLEX"
 
-enum class LogLevel {
-  DEBUG, INFO, WARNING, ERROR
-}
-
 expect object Log {
   fun d(tag: String, text: String)
   fun e(tag: String, text: String)

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

@@ -131,14 +131,26 @@ fun ChatInfoView(
       },
       syncContactConnection = {
         withBGApi {
-          syncContactConnection(chatRh, contact, connStats, force = false)
+          val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
+          connStats.value = cStats
+          if (cStats != null) {
+            withChats {
+              updateContactConnectionStats(chatRh, contact, cStats)
+            }
+          }
           close.invoke()
         }
       },
       syncContactConnectionForce = {
         showSyncConnectionForceAlert(syncConnectionForce = {
           withBGApi {
-            syncContactConnection(chatRh, contact, connStats, force = true)
+            val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = true)
+            connStats.value = cStats
+            if (cStats != null) {
+              withChats {
+                updateContactConnectionStats(chatRh, contact, cStats)
+              }
+            }
             close.invoke()
           }
         })
@@ -177,16 +189,6 @@ fun ChatInfoView(
   }
 }
 
-suspend fun syncContactConnection(rhId: Long?, contact: Contact, connectionStats: MutableState<ConnectionStats?>, force: Boolean) {
-  val cStats = chatModel.controller.apiSyncContactRatchet(rhId, contact.contactId, force = force)
-  connectionStats.value = cStats
-  if (cStats != null) {
-    withChats {
-      updateContactConnectionStats(rhId, contact, cStats)
-    }
-  }
-}
-
 sealed class SendReceipts {
   object Yes: SendReceipts()
   object No: SendReceipts()
@@ -503,7 +505,7 @@ fun ChatInfoLayout(
   currentUser: User,
   sendReceipts: State<SendReceipts>,
   setSendReceipts: (SendReceipts) -> Unit,
-  connStats: MutableState<ConnectionStats?>,
+  connStats: State<ConnectionStats?>,
   contactNetworkStatus: NetworkStatus,
   customUserProfile: Profile?,
   localAlias: String,
@@ -551,8 +553,8 @@ fun ChatInfoLayout(
         verticalAlignment = Alignment.CenterVertically
       ) {
         SearchButton(modifier = Modifier.fillMaxWidth(0.25f), chat, contact, close, onSearchClicked)
-        AudioCallButton(modifier = Modifier.fillMaxWidth(0.33f), chat, contact, connStats)
-        VideoButton(modifier = Modifier.fillMaxWidth(0.5f), chat, contact, connStats)
+        AudioCallButton(modifier = Modifier.fillMaxWidth(0.33f), chat, contact)
+        VideoButton(modifier = Modifier.fillMaxWidth(0.5f), chat, contact)
         MuteButton(modifier = Modifier.fillMaxWidth(1f), chat, contact)
       }
     }
@@ -823,14 +825,12 @@ fun MuteButton(
 fun AudioCallButton(
   modifier: Modifier,
   chat: Chat,
-  contact: Contact,
-  connectionStats: MutableState<ConnectionStats?>
+  contact: Contact
 ) {
   CallButton(
     modifier = modifier,
     chat,
     contact,
-    connectionStats,
     icon = painterResource(MR.images.ic_call),
     title = generalGetString(MR.strings.info_view_call_button),
     mediaType = CallMediaType.Audio
@@ -841,14 +841,12 @@ fun AudioCallButton(
 fun VideoButton(
   modifier: Modifier,
   chat: Chat,
-  contact: Contact,
-  connectionStats: MutableState<ConnectionStats?>
+  contact: Contact
 ) {
   CallButton(
     modifier = modifier,
     chat,
     contact,
-    connectionStats,
     icon = painterResource(MR.images.ic_videocam),
     title = generalGetString(MR.strings.info_view_video_button),
     mediaType = CallMediaType.Video
@@ -860,7 +858,6 @@ fun CallButton(
   modifier: Modifier,
   chat: Chat,
   contact: Contact,
-  connectionStats: MutableState<ConnectionStats?>,
   icon: Painter,
   title: String,
   mediaType: CallMediaType
@@ -882,23 +879,7 @@ fun CallButton(
     disabledLook = !canCall,
     onClick =
       when {
-        canCall -> { {
-          val connStats = connectionStats.value
-          if (connStats != null) {
-            if (connStats.ratchetSyncState == RatchetSyncState.Ok) {
-              startChatCall(chat.remoteHostId, chat.chatInfo, mediaType)
-            } else if (connStats.ratchetSyncAllowed) {
-              showFixConnectionAlert(syncConnection = {
-                withBGApi { syncContactConnection(chat.remoteHostId, contact, connectionStats, force = false) }
-              })
-            } else {
-              AlertManager.shared.showAlertMsg(
-                generalGetString(MR.strings.cant_call_contact_alert_title),
-                generalGetString(MR.strings.encryption_renegotiation_in_progress)
-              )
-            }
-          }
-        } }
+        canCall -> { { startChatCall(chat.remoteHostId, chat.chatInfo, mediaType) } }
         contact.nextSendGrpInv -> { { showCantCallContactSendMessageAlert() } }
         !contact.active -> { { showCantCallContactDeletedAlert() } }
         !contact.ready -> { { showCantCallContactConnectingAlert() } }
@@ -1284,15 +1265,6 @@ fun showSyncConnectionForceAlert(syncConnectionForce: () -> Unit) {
   )
 }
 
-fun showFixConnectionAlert(syncConnection: () -> Unit) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(MR.strings.sync_connection_question),
-    text = generalGetString(MR.strings.sync_connection_desc),
-    confirmText = generalGetString(MR.strings.sync_connection_confirm),
-    onConfirm = syncConnection,
-  )
-}
-
 fun queueInfoText(info: Pair<RcvMsgInfo?, ServerQueueInfo>): String {
   val (rcvMsgInfo, qInfo) = info
   val msgInfo: String = if (rcvMsgInfo != null) json.encodeToString(rcvMsgInfo) else generalGetString(MR.strings.message_queue_info_none)

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

@@ -296,7 +296,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         }
       }
       SectionBottomSpacer()
-      SectionBottomSpacer()
     }
   }
 
@@ -310,7 +309,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         QuotedMsgView(qi)
       }
       SectionBottomSpacer()
-      SectionBottomSpacer()
     }
   }
 
@@ -326,7 +324,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         ForwardedFromView(forwardedFromItem)
       }
       SectionBottomSpacer()
-      SectionBottomSpacer()
     }
   }
 
@@ -398,7 +395,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
         }
       }
       SectionBottomSpacer()
-      SectionBottomSpacer()
     }
   }
 
@@ -437,11 +433,12 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
 
   Column {
     if (numTabs() > 1) {
-      Box(
+      Column(
         Modifier
-          .fillMaxHeight()
+          .fillMaxHeight(),
+        verticalArrangement = Arrangement.SpaceBetween
       ) {
-        Column {
+        Column(Modifier.weight(1f)) {
           when (val sel = selection.value) {
             is CIInfoTab.Delivery -> {
               DeliveryTab(sel.memberDeliveryStatuses)
@@ -482,7 +479,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
           }
         }
         val oneHandUI = remember { appPrefs.oneHandUI.state }
-        Box(Modifier.align(Alignment.BottomCenter).navigationBarsPadding().offset(x = 0.dp, y = if (oneHandUI.value) -AppBarHeight * fontSizeSqrtMultiplier else 0.dp)) {
+        Box(Modifier.offset(x = 0.dp, y = if (oneHandUI.value) -AppBarHeight * fontSizeSqrtMultiplier else 0.dp)) {
           TabRow(
             selectedTabIndex = availableTabs.indexOfFirst { it::class == selection.value::class },
             Modifier.height(AppBarHeight * fontSizeSqrtMultiplier),

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

@@ -665,18 +665,13 @@ fun ChatLayout(
         AdaptingBottomPaddingLayout(Modifier, CHAT_COMPOSE_LAYOUT_ID, composeViewHeight) {
           if (chatInfo != null) {
             Box(Modifier.fillMaxSize()) {
-              // disables scrolling to top of chat item on click inside the bubble
-              CompositionLocalProvider(LocalBringIntoViewSpec provides object : BringIntoViewSpec {
-                override fun calculateScrollDistance(offset: Float, size: Float, containerSize: Float): Float = 0f
-              }) {
-                ChatItemsList(
-                  remoteHostId, chatInfo, unreadCount, composeState, composeViewHeight, searchValue,
-                  useLinkPreviews, linkMode, selectedChatItems, showMemberInfo, showChatInfo = info, loadMessages, deleteMessage, deleteMessages,
-                  receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
-                  updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-                  setReaction, showItemDetails, markItemsRead, markChatRead, remember { { onComposed(it) } }, developerTools, showViaProxy,
-                )
-              }
+              ChatItemsList(
+                remoteHostId, chatInfo, unreadCount, composeState, composeViewHeight, searchValue,
+                useLinkPreviews, linkMode, selectedChatItems, showMemberInfo, loadMessages, deleteMessage, deleteMessages,
+                receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
+                updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
+                setReaction, showItemDetails, markItemsRead, markChatRead, remember { { onComposed(it) } }, developerTools, showViaProxy,
+              )
             }
           }
           Box(
@@ -944,7 +939,6 @@ fun BoxScope.ChatItemsList(
   linkMode: SimplexLinkMode,
   selectedChatItems: MutableState<Set<Long>?>,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  showChatInfo: () -> Unit,
   loadMessages: suspend (ChatId, ChatPagination, ActiveChatState, visibleItemIndexesNonReversed: () -> IntRange) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
   deleteMessages: (List<Long>) -> Unit,
@@ -990,7 +984,6 @@ fun BoxScope.ChatItemsList(
   })
   val maxHeight = remember { derivedStateOf { listState.value.layoutInfo.viewportEndOffset - topPaddingToContentPx.value } }
   val loadingMoreItems = remember { mutableStateOf(false) }
-  val animatedScrollingInProgress = remember { mutableStateOf(false) }
   val ignoreLoadingRequests = remember(remoteHostId) { mutableSetOf<Long>() }
   if (!loadingMoreItems.value) {
     PreloadItems(chatInfo.id, if (searchValueIsEmpty.value) ignoreLoadingRequests else mutableSetOf(), mergedItems, listState, ChatPagination.UNTIL_PRELOAD_COUNT) { chatId, pagination ->
@@ -1011,7 +1004,7 @@ fun BoxScope.ChatItemsList(
   val chatInfoUpdated = rememberUpdatedState(chatInfo)
   val highlightedItems = remember { mutableStateOf(setOf<Long>()) }
   val scope = rememberCoroutineScope()
-  val scrollToItem: (Long) -> Unit = remember { scrollToItem(searchValue, loadingMoreItems, animatedScrollingInProgress, highlightedItems, chatInfoUpdated, maxHeight, scope, reversedChatItems, mergedItems, listState, loadMessages) }
+  val scrollToItem: (Long) -> Unit = remember { scrollToItem(searchValue, loadingMoreItems, highlightedItems, chatInfoUpdated, maxHeight, scope, reversedChatItems, mergedItems, listState, loadMessages) }
   val scrollToQuotedItemFromItem: (Long) -> Unit = remember { findQuotedItemFromItem(remoteHostIdUpdated, chatInfoUpdated, scope, scrollToItem) }
 
   LoadLastItems(loadingMoreItems, remoteHostId, chatInfo)
@@ -1072,7 +1065,7 @@ fun BoxScope.ChatItemsList(
                   highlightedItems.value = setOf()
                 }
             }
-            ChatItemView(remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, range = range, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, showChatInfo = showChatInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
+            ChatItemView(remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, range = range, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
           }
         }
 
@@ -1321,7 +1314,7 @@ fun BoxScope.ChatItemsList(
       }
     }
   }
-  FloatingButtons(loadingMoreItems, animatedScrollingInProgress, mergedItems, unreadCount, maxHeight, composeViewHeight, searchValue, markChatRead, listState)
+  FloatingButtons(loadingMoreItems, mergedItems, unreadCount, maxHeight, composeViewHeight, searchValue, markChatRead, listState)
   FloatingDate(Modifier.padding(top = 10.dp + topPaddingToContent(true)).align(Alignment.TopCenter), mergedItems, listState)
 
   LaunchedEffect(Unit) {
@@ -1330,15 +1323,6 @@ fun BoxScope.ChatItemsList(
         chatViewScrollState.value = it
       }
   }
-  LaunchedEffect(Unit) {
-    snapshotFlow { listState.value.isScrollInProgress }
-      .filter { !it }
-      .collect {
-        if (animatedScrollingInProgress.value) {
-          animatedScrollingInProgress.value = false
-        }
-      }
-  }
 }
 
 @Composable
@@ -1416,7 +1400,6 @@ private fun NotifyChatListOnFinishingComposition(
 @Composable
 fun BoxScope.FloatingButtons(
   loadingMoreItems: MutableState<Boolean>,
-  animatedScrollingInProgress: MutableState<Boolean>,
   mergedItems: State<MergedItems>,
   unreadCount: State<Int>,
   maxHeight: State<Int>,
@@ -1456,14 +1439,8 @@ fun BoxScope.FloatingButtons(
     bottomUnreadCount,
     showBottomButtonWithCounter,
     showBottomButtonWithArrow,
-    animatedScrollingInProgress,
     composeViewHeight,
-    onClick = {
-      scope.launch {
-        animatedScrollingInProgress.value = true
-        tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(0) }
-      }
-    }
+    onClick = { scope.launch { tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(0) } } }
   )
   // Don't show top FAB if is in search
   if (searchValue.value.isNotEmpty()) return
@@ -1474,15 +1451,11 @@ fun BoxScope.FloatingButtons(
   TopEndFloatingButton(
     Modifier.padding(end = DEFAULT_PADDING, top = 24.dp + topPaddingToContent(true)).align(Alignment.TopEnd),
     topUnreadCount,
-    animatedScrollingInProgress,
     onClick = {
       val index = mergedItems.value.items.indexOfLast { it.hasUnread() }
       if (index != -1) {
         // scroll to the top unread item
-        scope.launch {
-          animatedScrollingInProgress.value = true
-          tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(index + 1, -maxHeight.value) }
-        }
+        scope.launch { tryBlockAndSetLoadingMore(loadingMoreItems) { listState.value.animateScrollToItem(index + 1, -maxHeight.value) } }
       }
     },
     onLongClick = { showDropDown.value = true }
@@ -1622,11 +1595,10 @@ fun MemberImage(member: GroupMember) {
 private fun TopEndFloatingButton(
   modifier: Modifier = Modifier,
   unreadCount: State<Int>,
-  animatedScrollingInProgress: State<Boolean>,
   onClick: () -> Unit,
   onLongClick: () -> Unit
 ) {
-  if (remember { derivedStateOf { unreadCount.value > 0 && !animatedScrollingInProgress.value } }.value) {
+  if (unreadCount.value > 0) {
     val interactionSource = interactionSourceWithDetection(onClick, onLongClick)
     FloatingActionButton(
       {}, // no action here
@@ -1867,7 +1839,6 @@ private fun lastFullyVisibleIemInListState(topPaddingToContentPx: State<Int>, de
 private fun scrollToItem(
   searchValue: State<String>,
   loadingMoreItems: MutableState<Boolean>,
-  animatedScrollingInProgress: MutableState<Boolean>,
   highlightedItems: MutableState<Set<Long>>,
   chatInfo: State<ChatInfo>,
   maxHeight: State<Int>,
@@ -1905,7 +1876,6 @@ private fun scrollToItem(
          highlightedItems.value = setOf(itemId)
         } else {
           withContext(scope.coroutineContext) {
-            animatedScrollingInProgress.value = true
             listState.value.animateScrollToItem(min(reversedChatItems.value.lastIndex, index + 1), -maxHeight.value)
             highlightedItems.value = setOf(itemId)
           }
@@ -1967,11 +1937,10 @@ private fun BoxScope.BottomEndFloatingButton(
   unreadCount: State<Int>,
   showButtonWithCounter: State<Boolean>,
   showButtonWithArrow: State<Boolean>,
-  animatedScrollingInProgress: State<Boolean>,
   composeViewHeight: State<Dp>,
   onClick: () -> Unit
 ) = when {
-  showButtonWithCounter.value && !animatedScrollingInProgress.value -> {
+  showButtonWithCounter.value -> {
     FloatingActionButton(
       onClick = onClick,
       elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
@@ -1985,7 +1954,7 @@ private fun BoxScope.BottomEndFloatingButton(
       )
     }
   }
-  showButtonWithArrow.value && !animatedScrollingInProgress.value -> {
+  showButtonWithArrow.value -> {
     FloatingActionButton(
       onClick = onClick,
       elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),

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

@@ -8,6 +8,8 @@ import SectionSpacer
 import SectionTextFooter
 import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import java.net.URI
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
@@ -56,19 +58,6 @@ fun GroupMemberInfoView(
   val developerTools = chatModel.controller.appPrefs.developerTools.get()
   var progressIndicator by remember { mutableStateOf(false) }
 
-  fun syncMemberConnection() {
-    withBGApi {
-      val r = chatModel.controller.apiSyncGroupMemberRatchet(rhId, groupInfo.apiId, member.groupMemberId, force = false)
-      if (r != null) {
-        connStats.value = r.second
-        withChats {
-          updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
-        }
-        close.invoke()
-      }
-    }
-  }
-
   if (chat != null) {
     val newRole = remember { mutableStateOf(member.memberRole) }
     GroupMemberInfoLayout(
@@ -89,30 +78,19 @@ fun GroupMemberInfoView(
         }
       },
       createMemberContact = {
-        if (connectionStats != null) {
-          if (connectionStats.ratchetSyncState == RatchetSyncState.Ok) {
-            withBGApi {
-              progressIndicator = true
-              val memberContact = chatModel.controller.apiCreateMemberContact(rhId, groupInfo.apiId, member.groupMemberId)
-              if (memberContact != null) {
-                val memberChat = Chat(remoteHostId = rhId, ChatInfo.Direct(memberContact), chatItems = arrayListOf())
-                withChats {
-                  addChat(memberChat)
-                  openLoadedChat(memberChat)
-                }
-                closeAll()
-                chatModel.setContactNetworkStatus(memberContact, NetworkStatus.Connected())
-              }
-              progressIndicator = false
+        withBGApi {
+          progressIndicator = true
+          val memberContact = chatModel.controller.apiCreateMemberContact(rhId, groupInfo.apiId, member.groupMemberId)
+          if (memberContact != null) {
+            val memberChat = Chat(remoteHostId = rhId, ChatInfo.Direct(memberContact), chatItems = arrayListOf())
+            withChats {
+              addChat(memberChat)
+              openLoadedChat(memberChat)
             }
-          } else if (connectionStats.ratchetSyncAllowed) {
-            showFixConnectionAlert(syncConnection = { syncMemberConnection() })
-          } else {
-            AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.cant_send_message_to_member_alert_title),
-              generalGetString(MR.strings.encryption_renegotiation_in_progress)
-            )
+            closeAll()
+            chatModel.setContactNetworkStatus(memberContact, NetworkStatus.Connected())
           }
+          progressIndicator = false
         }
       },
       connectViaAddress = { connReqUri ->
@@ -171,7 +149,16 @@ fun GroupMemberInfoView(
         })
       },
       syncMemberConnection = {
-        syncMemberConnection()
+        withBGApi {
+          val r = chatModel.controller.apiSyncGroupMemberRatchet(rhId, groupInfo.apiId, member.groupMemberId, force = false)
+          if (r != null) {
+            connStats.value = r.second
+            withChats {
+              updateGroupMemberConnectionStats(rhId, groupInfo, r.first, r.second)
+            }
+            close.invoke()
+          }
+        }
       },
       syncMemberConnectionForce = {
         showSyncConnectionForceAlert(syncConnectionForce = {
@@ -348,20 +335,9 @@ fun GroupMemberInfoLayout(
         val knownChat = if (contactId != null) knownDirectChat(contactId) else null
         if (knownChat != null) {
           val (chat, contact) = knownChat
-          val knownContactConnectionStats: MutableState<ConnectionStats?> = remember { mutableStateOf(null) }
-
-          LaunchedEffect(contact.contactId) {
-            withBGApi {
-              val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, chat.chatInfo.apiId)
-              if (contactInfo != null) {
-                knownContactConnectionStats.value = contactInfo.first
-              }
-            }
-          }
-
           OpenChatButton(modifier = Modifier.fillMaxWidth(0.33f), onClick = { openDirectChat(contact.contactId) })
-          AudioCallButton(modifier = Modifier.fillMaxWidth(0.5f), chat, contact, knownContactConnectionStats)
-          VideoButton(modifier = Modifier.fillMaxWidth(1f), chat, contact, knownContactConnectionStats)
+          AudioCallButton(modifier = Modifier.fillMaxWidth(0.5f), chat, contact)
+          VideoButton(modifier = Modifier.fillMaxWidth(1f), chat, contact)
         } else if (groupInfo.fullGroupPreferences.directMessages.on(groupInfo.membership)) {
           if (contactId != null) {
             OpenChatButton(modifier = Modifier.fillMaxWidth(0.33f), onClick = { openDirectChat(contactId) }) // legacy - only relevant for direct contacts created when joining group

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

@@ -24,12 +24,12 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.ChatModel.currentUser
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlin.math.*
 
@@ -51,12 +51,6 @@ fun chatEventText(eventText: String, ts: String): AnnotatedString =
     withStyle(chatEventStyle) { append("$eventText  $ts") }
   }
 
-data class ChatItemReactionMenuItem (
-  val name: String,
-  val image: String?,
-  val onClick: (() -> Unit)?
-)
-
 @Composable
 fun ChatItemView(
   rhId: Long?,
@@ -93,7 +87,6 @@ fun ChatItemView(
   showItemDetails: (ChatInfo, ChatItem) -> Unit,
   reveal: (Boolean) -> Unit,
   showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  showChatInfo: () -> Unit,
   developerTools: Boolean,
   showViaProxy: Boolean,
   showTimestamp: Boolean,
@@ -127,7 +120,7 @@ fun ChatItemView(
       Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.chatItemOffset(cItem, itemSeparation.largeGap, inverted = true, revealed = true)) {
         cItem.reactions.forEach { r ->
           val showReactionMenu = remember { mutableStateOf(false) }
-          val reactionMenuItems = remember { mutableStateOf(emptyList<ChatItemReactionMenuItem>()) }
+          val reactionMembers = remember { mutableStateOf(emptyList<MemberReaction>()) }
           val interactionSource = remember { MutableInteractionSource() }
           val enterInteraction = remember { HoverInteraction.Enter() }
           KeyChangeEffect(highlighted.value) {
@@ -141,39 +134,18 @@ fun ChatItemView(
           var modifier = Modifier.padding(horizontal = 5.dp, vertical = 2.dp).clip(RoundedCornerShape(8.dp))
           if (cInfo.featureEnabled(ChatFeature.Reactions)) {
             fun showReactionsMenu() {
-              when (cInfo) {
-                is ChatInfo.Group -> {
-                  withBGApi {
-                    try {
-                      val members = controller.apiGetReactionMembers(rhId, cInfo.groupInfo.groupId, cItem.id, r.reaction)
-                      if (members != null) {
-                        showReactionMenu.value = true
-                        reactionMenuItems.value = members.map {
-                          val enabled = cInfo.groupInfo.membership.groupMemberId != it.groupMember.groupMemberId
-                          val click = if (enabled) ({ showMemberInfo(cInfo.groupInfo, it.groupMember) }) else null
-                          ChatItemReactionMenuItem(it.groupMember.displayName, it.groupMember.image, click)
-                        }
-                      }
-                    } catch (e: Exception) {
-                      Log.d(TAG, "chatItemView ChatItemReactions onLongClick: unexpected exception: ${e.stackTraceToString()}")
+              if (cInfo is ChatInfo.Group) {
+                withBGApi {
+                  try {
+                    val members = controller.apiGetReactionMembers(rhId, cInfo.groupInfo.groupId, cItem.id, r.reaction)
+                    if (members != null) {
+                      showReactionMenu.value = true
+                      reactionMembers.value = members
                     }
+                  } catch (e: Exception) {
+                    Log.d(TAG, "hatItemView ChatItemReactions onLongClick: unexpected exception: ${e.stackTraceToString()}")
                   }
                 }
-                is ChatInfo.Direct -> {
-                  showReactionMenu.value = true
-                  val reactions = mutableListOf<ChatItemReactionMenuItem>()
-
-                  if (!r.userReacted || r.totalReacted > 1) {
-                    val contact = cInfo.contact
-                    reactions.add(ChatItemReactionMenuItem(contact.displayName, contact.image, showChatInfo))
-                  }
-
-                  if (r.userReacted) {
-                    reactions.add(ChatItemReactionMenuItem(generalGetString(MR.strings.sender_you_pronoun), currentUser.value?.image, null))
-                  }
-                  reactionMenuItems.value = reactions
-                }
-                else -> {}
               }
             }
             modifier = modifier
@@ -194,19 +166,19 @@ fun ChatItemView(
           Row(modifier.padding(2.dp), verticalAlignment = Alignment.CenterVertically) {
             ReactionIcon(r.reaction.text, fontSize = 12.sp)
             DefaultDropdownMenu(showMenu = showReactionMenu) {
-              reactionMenuItems.value.forEach { m ->
+              reactionMembers.value.forEach { m ->
                 ItemAction(
-                  text = m.name,
-                  composable = { ProfileImage(44.dp, m.image) },
+                  text = m.groupMember.displayName,
+                  composable = { ProfileImage(44.dp, m.groupMember.image) },
                   onClick = {
-                    val click = m.onClick
-                    if (click != null) {
-                      click()
+                    if (cInfo is ChatInfo.Group && cInfo.groupInfo.membership.groupMemberId != m.groupMember.groupMemberId) {
+                      showMemberInfo(cInfo.groupInfo, m.groupMember)
+                      showReactionMenu.value = false
+                    } else {
                       showReactionMenu.value = false
                     }
                   },
-                  lineLimit = 1,
-                  color = if (m.onClick == null) MaterialTheme.colors.secondary else MenuTextColor
+                  lineLimit = 1
                 )
               }
             }
@@ -1216,7 +1188,6 @@ fun PreviewChatItemView(
     showItemDetails = { _, _ -> },
     reveal = {},
     showMemberInfo = { _, _ ->},
-    showChatInfo = {},
     developerTools = false,
     showViaProxy = false,
     showTimestamp = true,
@@ -1262,7 +1233,6 @@ fun PreviewChatItemViewDeletedContent() {
       showItemDetails = { _, _ -> },
       reveal = {},
       showMemberInfo = { _, _ ->},
-      showChatInfo = {},
       developerTools = false,
       showViaProxy = false,
       preview = true,

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

@@ -30,7 +30,6 @@ import kotlinx.datetime.*
 import java.io.*
 import java.net.URI
 import java.nio.file.Files
-import java.nio.file.StandardCopyOption
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.collections.ArrayList
@@ -45,14 +44,11 @@ fun DatabaseView() {
   val chatArchiveFile = remember { mutableStateOf<String?>(null) }
   val stopped = remember { m.chatRunning }.value == false
   val saveArchiveLauncher = rememberFileChooserLauncher(false) { to: URI? ->
-    val archive = chatArchiveFile.value
-    if (archive != null && to != null) {
-      copyFileToFile(File(archive), to) {}
-    }
-    // delete no matter the database was exported or canceled the export process
-    if (archive != null) {
-      File(archive).delete()
-      chatArchiveFile.value = null
+    val file = chatArchiveFile.value
+    if (file != null && to != null) {
+      copyFileToFile(File(file), to) {
+        chatArchiveFile.value = null
+      }
     }
   }
   val appFilesCountAndSize = remember { mutableStateOf(directoryFileCountAndSize(appFilesDir.absolutePath)) }
@@ -684,8 +680,6 @@ suspend fun importArchive(
     } finally {
       File(archivePath).delete()
     }
-  } else {
-    progressIndicator.value = false
   }
   return false
 }
@@ -697,15 +691,14 @@ private fun saveArchiveFromURI(importedArchiveURI: URI): String? {
     if (inputStream != null && archiveName != null) {
       val archivePath = "$databaseExportDir${File.separator}$archiveName"
       val destFile = File(archivePath)
-      Files.copy(inputStream, destFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+      Files.copy(inputStream, destFile.toPath())
       archivePath
     } else {
       Log.e(TAG, "saveArchiveFromURI null inputStream")
       null
     }
   } catch (e: Exception) {
-    AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_saving_database), e.stackTraceToString())
-    Log.e(TAG, "saveArchiveFromURI error: ${e.stackTraceToString()}")
+    Log.e(TAG, "saveArchiveFromURI error: ${e.message}")
     null
   }
 }

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

@@ -169,19 +169,24 @@ fun saveImage(image: ImageBitmap): CryptoFile? {
   return try {
     val encrypted = chatController.appPrefs.privacyEncryptLocalFiles.get()
     val ext = if (image.hasAlpha()) "png" else "jpg"
+    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
     val destFileName = generateNewFileName("IMG", ext, File(getAppFilePath("")))
     val destFile = File(getAppFilePath(destFileName))
-    try {
-      val args = writeCryptoImage(MAX_IMAGE_SIZE, image, destFile.absolutePath, encrypted)
-      if (encrypted) {
+    if (encrypted) {
+      try {
+        val args = writeCryptoFile(destFile.absolutePath, dataResized.toByteArray())
         CryptoFile(destFileName, args)
-      } else {
-        CryptoFile.plain(destFileName)
+      } catch (e: Exception) {
+        Log.e(TAG, "Unable to write crypto file: " + e.stackTraceToString())
+        AlertManager.shared.showAlertMsg(title = generalGetString(MR.strings.error), text = e.stackTraceToString())
+        null
       }
-    } catch (e: Exception) {
-      Log.e(TAG, "Unable to write crypto file: " + e.stackTraceToString())
-      AlertManager.shared.showAlertMsg(title = generalGetString(MR.strings.error), text = e.stackTraceToString())
-      null
+    } else {
+      val output = FileOutputStream(destFile)
+      dataResized.writeTo(output)
+      output.flush()
+      output.close()
+      CryptoFile.plain(destFileName)
     }
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt saveImage error: ${e.stackTraceToString()}")
@@ -193,10 +198,14 @@ fun desktopSaveImageInTmp(uri: URI): CryptoFile? {
   val image = getBitmapFromUri(uri) ?: return null
   return try {
     val ext = if (image.hasAlpha()) "png" else "jpg"
+    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
     val destFileName = generateNewFileName("IMG", ext, tmpDir)
     val destFile = File(tmpDir, destFileName)
-    val args = writeCryptoImage(MAX_IMAGE_SIZE, image, destFile.absolutePath, false)
-    CryptoFile(destFileName, args)
+    val output = FileOutputStream(destFile)
+    dataResized.writeTo(output)
+    output.flush()
+    output.close()
+    CryptoFile.plain(destFile.absolutePath)
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt desktopSaveImageInTmp error: ${e.stackTraceToString()}")
     null
@@ -292,7 +301,11 @@ fun saveWallpaperFile(uri: URI): String? {
 fun saveWallpaperFile(image: ImageBitmap): String {
   val destFileName = generateNewFileName("wallpaper", "jpg", File(getWallpaperFilePath("")))
   val destFile = File(getWallpaperFilePath(destFileName))
-  writeCryptoImage(5_000_000, image, destFile.absolutePath, false)
+  val dataResized = resizeImageToDataSize(image, false, maxDataSize = 5_000_000)
+  val output = FileOutputStream(destFile)
+  dataResized.use {
+    it.writeTo(output)
+  }
   return destFile.name
 }
 
@@ -352,10 +365,7 @@ fun formatBytes(bytes: Long): String {
 }
 
 fun removeFile(fileName: String): Boolean {
-  return removeFile(File(getAppFilePath(fileName)))
-}
-
-fun removeFile(file: File): Boolean {
+  val file = File(getAppFilePath(fileName))
   val fileDeleted = file.delete()
   if (!fileDeleted) {
     Log.e(TAG, "Util.kt removeFile error")

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

@@ -14,7 +14,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -45,12 +44,6 @@ fun DeveloperView(withAuth: (title: String, desc: String, block: () -> Unit) ->
     if (devTools.value) {
       SectionDividerSpaced(maxTopPadding = true)
       SectionView(stringResource(MR.strings.developer_options_section).uppercase()) {
-        SettingsActionItemWithContent(painterResource(MR.images.ic_breaking_news), stringResource(MR.strings.debug_logs)) {
-          DefaultSwitch(
-            checked = remember { appPrefs.logLevel.state }.value <= LogLevel.DEBUG,
-            onCheckedChange = { appPrefs.logLevel.set(if (it) LogLevel.DEBUG else LogLevel.WARNING) }
-          )
-        }
         SettingsPreferenceItem(painterResource(MR.images.ic_drive_folder_upload), stringResource(MR.strings.confirm_database_upgrades), m.controller.appPrefs.confirmDBUpgrades)
         if (appPlatform.isDesktop) {
           TerminalAlwaysVisibleItem(m.controller.appPrefs.terminalAlwaysVisible) { checked ->

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

@@ -735,10 +735,7 @@ private fun ConditionsAppliedToOtherOperatorsText(userServers: List<UserOperator
   }
 
   if (otherOperatorsToApply.value.isNotEmpty()) {
-    ReadableText(
-      MR.strings.operator_conditions_will_be_applied,
-      args = otherOperatorsToApply.value.joinToString(", ") { it.legalName_ }
-    )
+      ReadableText(MR.strings.operator_conditions_will_be_applied)
   }
 }
 

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

@@ -524,10 +524,6 @@
   <string name="sync_connection_force_question">Renegotiate encryption?</string>
   <string name="sync_connection_force_desc">The encryption is working and the new encryption agreement is not required. It may result in connection errors!</string>
   <string name="sync_connection_force_confirm">Renegotiate</string>
-  <string name="sync_connection_question">Fix connection?</string>
-  <string name="sync_connection_desc">Connection requires encryption renegotiation.</string>
-  <string name="sync_connection_confirm">Fix</string>
-  <string name="encryption_renegotiation_in_progress">Encryption renegotiation in progress.</string>
   <string name="view_security_code">View security code</string>
   <string name="verify_security_code">Verify security code</string>
 
@@ -907,7 +903,6 @@
   <string name="show_dev_options">Show:</string>
   <string name="hide_dev_options">Hide:</string>
   <string name="show_developer_options">Show developer options</string>
-  <string name="debug_logs">Enable logs</string>
   <string name="developer_options">Database IDs and Transport isolation option.</string>
   <string name="developer_options_section">Developer options</string>
   <string name="show_internal_errors">Show internal errors</string>
@@ -1339,7 +1334,6 @@
   <string name="chat_database_exported_migrate">You may migrate the exported database.</string>
   <string name="chat_database_exported_not_all_files">Some file(s) were not exported</string>
   <string name="chat_database_exported_continue">Continue</string>
-  <string name="error_saving_database">Error saving database</string>
 
   <!-- DatabaseEncryptionView.kt -->
   <string name="save_passphrase_in_keychain">Save passphrase in Keystore</string>
@@ -2408,7 +2402,7 @@
   <string name="servers_info_messages_sent">Messages sent</string>
   <string name="servers_info_messages_received">Messages received</string>
   <string name="servers_info_details">Details</string>
-  <string name="servers_info_private_data_disclaimer">Starting from %s.\nAll data is kept private on your device..</string>
+  <string name="servers_info_private_data_disclaimer">Starting from %s.\nAll data is private to your device.</string>
   <string name="servers_info_subscriptions_section_header">Message reception</string>
   <string name="servers_info_subscriptions_connections_subscribed">Active connections</string>
   <string name="servers_info_subscriptions_connections_pending">Pending</string>

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

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="22px" viewBox="0 -960 960 960" width="22px" fill="#5f6368"><path d="M262.5-285q11.5 0 20.25-8.5t8.75-20q0-11.5-8.75-20.25t-20.25-8.75q-11.5 0-20 8.75T234-313.5q0 11.5 8.5 20t20 8.5Zm-29-168.5H291v-227h-57.5v227Zm217.5 174h275.5V-337H451v57.5Zm0-174h275.5V-511H451v57.5Zm0-169.5h275.5v-57.5H451v57.5ZM134.5-124.5q-22.97 0-40.23-17.27Q77-159.03 77-182v-596q0-22.97 17.27-40.23 17.26-17.27 40.23-17.27h691q22.97 0 40.23 17.27Q883-800.97 883-778v596q0 22.97-17.27 40.23-17.26 17.27-40.23 17.27h-691Zm0-57.5h691v-596h-691v596Zm0 0v-596 596Z"/></svg>

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

@@ -67,7 +67,7 @@ object NtfManager {
             ntf.second.close()
           } catch (e: Exception) {
             // Can be java.lang.UnsupportedOperationException, for example. May do nothing
-            Log.e(TAG, "Failed to close notification: ${e.stackTraceToString()}")
+            println("Failed to close notification: ${e.stackTraceToString()}")
           }*/
         }
       }
@@ -85,8 +85,7 @@ object NtfManager {
   }
 
   fun cancelAllNotifications() {
-//    prevNtfs.forEach { try { it.second.close() } catch (e: Exception) { Log.e(TAG, "Failed to close notification: ${e
-    //    .stackTraceToString()}") } }
+//    prevNtfs.forEach { try { it.second.close() } catch (e: Exception) { println("Failed to close notification: ${e.stackTraceToString()}") } }
     withBGApi {
       prevNtfsMutex.withLock {
         prevNtfs.clear()
@@ -154,7 +153,7 @@ object NtfManager {
       ImageIO.write(icon.toAwtImage(), "PNG", newFile.outputStream())
       newFile.absolutePath
     } catch (e: Exception) {
-      Log.e(TAG, "Failed to write an icon to tmpDir: ${e.stackTraceToString()}")
+      println("Failed to write an icon to tmpDir: ${e.stackTraceToString()}")
       null
     }
   } else null

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

@@ -5,8 +5,6 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import boofcv.io.image.ConvertBufferedImage
 import boofcv.struct.image.GrayU8
-import chat.simplex.common.views.helpers.generateNewFileName
-import chat.simplex.common.views.helpers.removeFile
 import chat.simplex.res.MR
 import org.jetbrains.skia.Image
 import java.awt.RenderingHints
@@ -27,40 +25,40 @@ actual fun base64ToBitmap(base64ImageString: String): ImageBitmap {
   val imageString = base64ImageString
     .removePrefix("data:image/png;base64,")
     .removePrefix("data:image/jpg;base64,")
-    .removePrefix("data:image/jpeg;base64,")
   return try {
     ImageIO.read(ByteArrayInputStream(Base64.getMimeDecoder().decode(imageString))).toComposeImageBitmap()
-  } catch (e: Exception) { // ByteArrayInputStream returns null
-    Log.e(TAG, "base64ToBitmap error: $e for input '$base64ImageString' -> '$imageString'")
+  } catch (e: IOException) {
+    Log.e(TAG, "base64ToBitmap error: $e")
     errorBitmap()
   }
 }
 
 actual fun resizeImageToStrSize(image: ImageBitmap, maxDataSize: Long): String {
-  val tmpFileName = generateNewFileName("IMG", "png", tmpDir)
-  val tmpFile = File(tmpDir, tmpFileName)
-  val output = FileOutputStream(tmpFile)
-  compressImageData(image, true).writeTo(output)
-  output.flush()
-  output.close()
-  var str = chatResizeImageToStrSize(tmpFile.absolutePath, maxDataSize)
-  removeFile(tmpFile)
+  var img = image
+  var str = compressImageStr(img)
+  while (str.length > maxDataSize) {
+    val ratio = sqrt(str.length.toDouble() / maxDataSize.toDouble())
+    val clippedRatio = kotlin.math.min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = img.scale(width, height)
+    str = compressImageStr(img)
+  }
   return str
 }
-
-// actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
-//   var img = image
-//   var stream = compressImageData(img, usePng)
-//   while (stream.size() > maxDataSize) {
-//     val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
-//     val clippedRatio = kotlin.math.min(ratio, 2.0)
-//     val width = (img.width.toDouble() / clippedRatio).toInt()
-//     val height = img.height * width / img.width
-//     img = img.scale(width, height)
-//     stream = compressImageData(img, usePng)
-//   }
-//   return stream
-// }
+actual fun resizeImageToDataSize(image: ImageBitmap, usePng: Boolean, maxDataSize: Long): ByteArrayOutputStream {
+  var img = image
+  var stream = compressImageData(img, usePng)
+  while (stream.size() > maxDataSize) {
+    val ratio = sqrt(stream.size().toDouble() / maxDataSize.toDouble())
+    val clippedRatio = kotlin.math.min(ratio, 2.0)
+    val width = (img.width.toDouble() / clippedRatio).toInt()
+    val height = img.height * width / img.width
+    img = img.scale(width, height)
+    stream = compressImageData(img, usePng)
+  }
+  return stream
+}
 
 actual fun cropToSquare(image: ImageBitmap): ImageBitmap {
   var xOffset = 0
@@ -83,17 +81,17 @@ actual fun cropToSquare(image: ImageBitmap): ImageBitmap {
   return croppedImage
 }
 
-// actual fun compressImageStr(bitmap: ImageBitmap): String {
-//   val usePng = bitmap.hasAlpha()
-//   val ext = if (usePng) "png" else "jpg"
-//   return try {
-//     val encoded  = Base64.getEncoder().encodeToString(compressImageData(bitmap, usePng).toByteArray())
-//     "data:image/$ext;base64,$encoded"
-//   } catch (e: Exception) {
-//     Log.e(TAG, "resizeImageToStrSize error: $e")
-//     throw e
-//   }
-// }
+actual fun compressImageStr(bitmap: ImageBitmap): String {
+  val usePng = bitmap.hasAlpha()
+  val ext = if (usePng) "png" else "jpg"
+  return try {
+    val encoded  = Base64.getEncoder().encodeToString(compressImageData(bitmap, usePng).toByteArray())
+    "data:image/$ext;base64,$encoded"
+  } catch (e: Exception) {
+    Log.e(TAG, "resizeImageToStrSize error: $e")
+    throw e
+  }
+}
 
 actual fun compressImageData(bitmap: ImageBitmap, usePng: Boolean): ByteArrayOutputStream {
   val writer = ImageIO.getImageWritersByFormatName(if (usePng) "png" else "jpg").next()

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

@@ -1,10 +1,8 @@
 package chat.simplex.common.platform
 
-import chat.simplex.common.model.ChatController.appPrefs
-
 actual object Log {
-  actual fun d(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.DEBUG && appPrefs.developerTools.get()) println("D: $text") }
-  actual fun e(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.ERROR || !appPrefs.developerTools.get()) println("E: $text") }
-  actual fun i(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.INFO && appPrefs.developerTools.get()) println("I: $text") }
-  actual fun w(tag: String, text: String) { if (appPrefs.logLevel.get() <= LogLevel.WARNING || !appPrefs.developerTools.get()) println("W: $text") }
+  actual fun d(tag: String, text: String) = println("D: $text")
+  actual fun e(tag: String, text: String) = println("E: $text")
+  actual fun i(tag: String, text: String) = println("I: $text")
+  actual fun w(tag: String, text: String) = println("W: $text")
 }

apps/multiplatform/gradle.properties

@@ -24,11 +24,11 @@ android.nonTransitiveRClass=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11
 
-android.version_name=6.2.1
-android.version_code=261
+android.version_name=6.2
+android.version_code=259
 
-desktop.version_name=6.2.1
-desktop.version_code=83
+desktop.version_name=6.2
+desktop.version_code=82
 
 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0

blog/20220404-simplex-chat-instant-notifications.md

@@ -68,7 +68,7 @@ So, for Android we can now deliver instant message notifications without comprom
 
 Please let us know what needs to be improved - it's only the first version of instant notifications for Android!
 
-## iOS notifications require a server
+## Our iOS approach has one trade-off
 
 iOS is much more protective of what apps are allowed to run on the devices, and the solution that worked on Android is not viable on iOS.
 

blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.md

@@ -1,88 +1,23 @@
 ---
 layout: layouts/article.html
-title: "SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps"
+title: "Servers operated by Flux - true privacy and decentralization for all users"
 date: 2024-12-10
-previewBody: blog_previews/20241210.html
-image: images/20241210-operators-1.png
+# previewBody: blog_previews/20241210.html
+# image: images/simplexonflux.png
+# imageWide: true
+draft: true
 permalink: "/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html"
 ---
 
 # SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps
 
-**Published:** Dec 10, 2024
+**Will be published:** Dec 10, 2024
 
-What's new in v6.2:
+This is a placeholder page for the upcoming v6.2 release announcement!
 
-- [SimpleX Chat and Flux](#simplex-chat-and-flux-improve-metadata-privacy-in-simplex-network) improve metadata privacy in SimpleX network.
-- [Business chats](#business-chats) to provide support from your business to users of SimpleX network.
-- [Better user experience](#better-user-experience): open on the first unread, jump to quoted messages, see who reacted.
-- [Improving notifications in iOS app](#improving-notifications-in-ios-app).
-
-## What's new in v6.2
-
-### SimpleX Chat and Flux improve metadata privacy in SimpleX network
-
-<img src="./images/20241210-operators-1.png" width=288 class="float-to-right"> <img src="./images/20241210-operators-2.png" width=288 class="float-to-right">
-
-SimpleX Chat and [Flux](https://runonflux.com) (Influx Technology Limited) made an agreement to include messaging and file servers operated by Flux into the app.
-
-SimpleX network is decentralized by design, but in the users of the previous app versions had to find other servers online or host servers themselves to use any other servers than operated by us.
-
-Now all users can choose between servers of two companies, use both of them, and continue using any other servers they host or available online.
-
-To use Flux servers enable them when the app offers it, or at any point later via Network & servers settings in the app.
-
-When both SimpleX Chat and Flux servers are enabled, the app will use servers of both operators in each connection to receive messages and for [private message routing](./20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md), increasing metadata privacy for all users.
-
-Read more about why SimpleX network benefits from multiple operators in [our previous post](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md).
-
-You can also read about our plan [how network operators will make money](https://github.com/simplex-chat/simplex-chat/blob/stable/docs/rfcs/2024-04-26-commercial-model.md), while continuing to protect users privacy, based on network design rather than on trust to operators, and without any cryptocurrency emission.
-
-### Business chats
-
-<img src="./images/20241210-business.png" width=288 class="float-to-right">
-
-We use SimpleX Chat to provide support to SimpleX Chat users, and we also see some other companies offering SimpleX Chat as a support channel.
-
-One of the problem of providing support via general purpose messengers is that the customers don't see who they talk to, as they can in all dedicated support systems.
-
-It is not possible in most messengers, including SimpleX Chat prior to v6.2 - every new customer joins a one-to-one conversation, where the customers see that they talk to a company, not knowing who they talk to, and if it's a bot or a human.
-
-The new business chats in SimpleX Chat solve this problem: to use them enable the toggle under the contact address in your chat profile. It is safe to do, and you can always toggle it off, if needed - the address itself does not change.
-
-Once you do it, the app will be creating a new business chat with each connecting customer where multiple people can participate. Business chat is a hybrid of one-to-one and group conversation. In the list of chats you will see customer names and avatars, and the customer will see your business name and avatar, like with one-to-one conversations. But inside it works as a group, allowing customer to see who sent the message, and allowing you to add other participants from the business side, for delegation and escalation of customer questions.
-
-This can be done manually, or you can automate these conversations using bots that can answer some customer questions and then add a human to the conversation when appropriate or requested by the customer. We will be offering more bot-related features to the app and a simpler way to program bots very soon - watch our announcements.
-
-### Better user experience
-
-<img src="./images/20241210-reactions.png" width=288 class="float-to-right">
-
-**Chat navigation**
-
-This has been a long-standing complaint from the users: *why does the app opens conversations on the last message, and not on the first unread message*?
-
-Android and desktop apps now open the chat on the first unread message. It will soon be done in the iOS app too.
-
-Also, the app can scroll to the replied message anywhere in the conversation (when you tap it), even if it was sent a very long time ago.
-
-**See who reacted!**
-
-This is a small but important change - you can now see who reacted to your messages!
-
-### Improving notifications in iOS app
-
-iOS notifications in a decentralized network is a complex problems. We [support iOS notifications](./20220404-simplex-chat-instant-notifications.md#ios-notifications-require-a-server) from early versions of the app, focussing on preserving privacy as much as possible. But the reliability of notifications was not good enough.
-
-We solved several problems of notification delivery in this release:
-- messaging servers no longer lose notifications while notification servers are restarted.
-- Apple can drop notifications while your device is offline - about 15-20% of notifications are dropped because of it. The servers and the new version of the app work around this problem by delivering several last notifications, to show notifications correctly even when Apple drops them.
-
-With these changes the iOS notifications remained as private and secure as before. The notifications only contain metadata, without the actual messages, and even the metadata is end-to-end encrypted between SimpleX notification servers and the client device, inaccessible to Apple push notification servers.
-
-There are two remaining problems we will solve soon:
-- iOS only allows to use 25mb of device memory when processing notifications in the background. This limit didn't change for many years, and it is challenging for decentralized design. If the app uses more memory, iOS kills it and the notification is not shown – approximately 10% of notifications can be lost because of that.
-- for notifications to work, the app communicates with the notification server. If the user puts the app in background too quickly, the app may fail to enable notification for the new contacts. We plan to change clients and servers to delegate this task to messaging servers, to remove the need for this additional communication entirely, without any impact on privacy and security. This will happen early next year.
+- Preset servers are now operated by two companies - SimpleX Chat and Flux. Read [this post](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md).
+- Business chats to provide support from your business to users of SimpleX network. Read [this page](../docs/BUSINESS.md).
+- and more!
 
 ## SimpleX network
 

blog/README.md

@@ -1,15 +1,6 @@
 # Blog
 
-Dec 10, 2024 [SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
-
-- SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app to improve metadata privacy in SimpleX network.
-- Business chats for better privacy and support of your customers.
-- Better user experience: open on the first unread, jump to quoted messages, see who reacted.
-- Improving notifications in iOS app.
-
---
-
-Nov 25, 2024 [Servers operated by Flux - true privacy and decentralization for all users](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md)
+Nov 25, 2025 [Servers operated by Flux - true privacy and decentralization for all users](./20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.md)
 
 - Welcome, Flux - the new servers in v6.2-beta.1!
 - What's the problem?

cabal.project

@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 0a827307d666de819d5cef17f70a78be5cd0e410
+    tag: 79e9447b73cc315ce35042b0a5f210c07ea39b07
 
 source-repository-package
     type: git
@@ -63,9 +63,3 @@ source-repository-package
     location: https://github.com/simplex-chat/wai.git
     tag: 2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0
     subdir: warp
-
-source-repository-package
-    type: git
-    location: https://gitlab.com/dpwiz/hs-jpeg-turbo
-    tag: d2844e00e7834124e27171cde21cf280d6772aa8
-    subdir: JuicyPixels-jpeg-turbo jpeg-turbo

flake.lock

@@ -16,6 +16,21 @@
         "type": "github"
       }
     },
+    "blank": {
+      "locked": {
+        "lastModified": 1625557891,
+        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
+        "owner": "divnix",
+        "repo": "blank",
+        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "blank",
+        "type": "github"
+      }
+    },
     "cabal-32": {
       "flake": false,
       "locked": {
@@ -83,6 +98,64 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1663445644,
+        "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "dmerge": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ],
+        "yants": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "yants"
+        ]
+      },
+      "locked": {
+        "lastModified": 1659548052,
+        "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=",
+        "owner": "divnix",
+        "repo": "data-merge",
+        "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "data-merge",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -100,34 +173,74 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
+    "flake-compat_2": {
+      "flake": false,
       "locked": {
-        "lastModified": 1698579227,
-        "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "edolstra",
+        "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -153,51 +266,33 @@
         "type": "github"
       }
     },
-    "ghc98X": {
-      "flake": false,
+    "gomod2nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
       "locked": {
-        "lastModified": 1715066704,
-        "narHash": "sha256-F0EVR8x/fcpj1st+hz96Wdsz5uwVIOziGKAwRxLOYJw=",
-        "ref": "ghc-9.8",
-        "rev": "78a253543d466ac511a1664a3e6aff032ca684d5",
-        "revCount": 61757,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "lastModified": 1655245309,
+        "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=",
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58",
+        "type": "github"
       },
       "original": {
-        "ref": "ghc-9.8",
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      }
-    },
-    "ghc99": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726585445,
-        "narHash": "sha256-IdwQBex4boY6s0Plj5+ixf36rfYSUyMdTWrztKvZH30=",
-        "ref": "refs/heads/master",
-        "rev": "7fd9e5e29ab54eb406880077463e8552e2ddd39a",
-        "revCount": 67238,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      },
-      "original": {
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "type": "github"
       }
     },
     "hackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1702513363,
-        "narHash": "sha256-kloro9uEe8aYhPMoMjVNq2rfrXNgMOZhOPwVH5DH2K0=",
+        "lastModified": 1702340598,
+        "narHash": "sha256-CC0HI+6iKPtH+8r/ZfcpW5v/OYvL7zMwpr0xfkXV1zU=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "a9d931d0398da67846fa257922a924829233cb91",
+        "rev": "24617c569995e38bf3b83b48eec6628a50fdb4fb",
         "type": "github"
       },
       "original": {
@@ -214,43 +309,33 @@
         "cabal-36": "cabal-36",
         "cardano-shell": "cardano-shell",
         "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_2",
         "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
-        "ghc98X": "ghc98X",
-        "ghc99": "ghc99",
         "hackage": [
           "hackage"
         ],
-        "hls-1.10": "hls-1.10",
-        "hls-2.0": "hls-2.0",
-        "hls-2.2": "hls-2.2",
-        "hls-2.3": "hls-2.3",
-        "hls-2.4": "hls-2.4",
-        "hls-2.5": "hls-2.5",
-        "hls-2.6": "hls-2.6",
         "hpc-coveralls": "hpc-coveralls",
         "hydra": "hydra",
         "iserv-proxy": "iserv-proxy",
         "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-unstable"
+          "nixpkgs"
         ],
         "nixpkgs-2003": "nixpkgs-2003",
         "nixpkgs-2105": "nixpkgs-2105",
         "nixpkgs-2111": "nixpkgs-2111",
         "nixpkgs-2205": "nixpkgs-2205",
         "nixpkgs-2211": "nixpkgs-2211",
-        "nixpkgs-2305": "nixpkgs-2305",
-        "nixpkgs-2311": "nixpkgs-2311",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "old-ghc-nix": "old-ghc-nix",
-        "stackage": "stackage"
+        "stackage": "stackage",
+        "tullia": "tullia"
       },
       "locked": {
-        "lastModified": 1705833500,
-        "narHash": "sha256-rUIr6JNbCedt1g4gVYVvE9t0oFU6FUspCA0DS5cA8Bg=",
+        "lastModified": 1677975916,
+        "narHash": "sha256-dbe8lEEPyfzjdRwpePClv7J9p9lQg7BwbBqAMCw4RLw=",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "d0c35e75cbbc6858770af42ac32b0b85495fbd71",
+        "rev": "ab5efd87ce3fd8ade38a01d97693d29a4f1ae7e4",
         "type": "github"
       },
       "original": {
@@ -260,125 +345,6 @@
         "type": "github"
       }
     },
-    "hls-1.10": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680000865,
-        "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "1.10.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1687698105,
-        "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "783905f211ac63edf982dd1889c671653327e441",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.0.0.1",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693064058,
-        "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.2.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695910642,
-        "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.3.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1699862708,
-        "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.4.0.1",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.5": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701080174,
-        "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.5.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.6": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705325287,
-        "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.6.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
     "hpc-coveralls": {
       "flake": false,
       "locked": {
@@ -418,14 +384,37 @@
         "type": "indirect"
       }
     },
+    "incl": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669263024,
+        "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=",
+        "owner": "divnix",
+        "repo": "incl",
+        "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "incl",
+        "type": "github"
+      }
+    },
     "iserv-proxy": {
       "flake": false,
       "locked": {
-        "lastModified": 1707968597,
-        "narHash": "sha256-C53NqToxl+n9s1pQ0iLtiH6P5vX3rM+NW/mFt4Ykpsk=",
+        "lastModified": 1670983692,
+        "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=",
         "ref": "hkm/remote-iserv",
-        "rev": "1b7f8aeb37bbc7c00f04e44d9379aa15a4409e8b",
-        "revCount": 18,
+        "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300",
+        "revCount": 10,
         "type": "git",
         "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git"
       },
@@ -451,22 +440,32 @@
         "type": "github"
       }
     },
-    "mac2ios": {
+    "n2c": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1699767871,
-        "narHash": "sha256-kxeCUfwC/Vgh2FvVMlBUq0eVx1JvfHyN+5MPKUik9mE=",
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
-        "rev": "4dcb77d5ea896d749381806dfab5358851b08951",
+        "lastModified": 1665039323,
+        "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a",
         "type": "github"
       },
       "original": {
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
+        "owner": "nlewo",
+        "repo": "nix2container",
         "type": "github"
       }
     },
@@ -491,6 +490,95 @@
         "type": "github"
       }
     },
+    "nix-nomad": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "nix2container",
+          "flake-utils"
+        ],
+        "gomod2nix": "gomod2nix",
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ],
+        "nixpkgs-lib": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1658277770,
+        "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=",
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "type": "github"
+      }
+    },
+    "nix2container": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1658567952,
+        "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
+    "nixago": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixago-exts": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661824785,
+        "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=",
+        "owner": "nix-community",
+        "repo": "nixago",
+        "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixago",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1657693803,
@@ -557,11 +645,11 @@
     },
     "nixpkgs-2205": {
       "locked": {
-        "lastModified": 1685573264,
-        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
         "type": "github"
       },
       "original": {
@@ -573,11 +661,11 @@
     },
     "nixpkgs-2211": {
       "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "lastModified": 1675730325,
+        "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
         "type": "github"
       },
       "original": {
@@ -587,56 +675,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-2305": {
-      "locked": {
-        "lastModified": 1705033721,
-        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-23.05-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-2311": {
-      "locked": {
-        "lastModified": 1719957072,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-23.11-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1696019113,
-        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -655,36 +693,98 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1694822471,
-        "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=",
+        "lastModified": 1675758091,
+        "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
+        "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
-        "rev": "47585496bcb13fb72e4a90daeea2f434e2501998",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1698434055,
-        "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=",
+        "lastModified": 1653581809,
+        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883",
+        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1654807842,
+        "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1665087388,
+        "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1676726892,
+        "narHash": "sha256-M7OYVR6dKmzmlebIjybFf3l18S2uur8lMyWWnHQooLY=",
+        "owner": "angerman",
+        "repo": "nixpkgs",
+        "rev": "729469087592bdea58b360de59dadf6d58714c42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "angerman",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nosys": {
+      "locked": {
+        "lastModified": 1667881534,
+        "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=",
+        "owner": "divnix",
+        "repo": "nosys",
+        "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nosys",
+        "type": "github"
+      }
+    },
     "old-ghc-nix": {
       "flake": false,
       "locked": {
@@ -707,21 +807,17 @@
         "flake-utils": "flake-utils",
         "hackage": "hackage",
         "haskellNix": "haskellNix",
-        "mac2ios": "mac2ios",
-        "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-2305"
-        ]
+        "nixpkgs": "nixpkgs_5"
       }
     },
     "stackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1726532152,
-        "narHash": "sha256-LRXbVY3M2S8uQWdwd2zZrsnVPEvt2GxaHGoy8EFFdJA=",
+        "lastModified": 1677888571,
+        "narHash": "sha256-YkhRNOaN6QVagZo1cfykYV8KqkI8/q6r2F5+jypOma4=",
         "owner": "input-output-hk",
         "repo": "stackage.nix",
-        "rev": "c77b3530cebad603812cb111c6f64968c2d2337d",
+        "rev": "cb50e6fabdfb2d7e655059039012ad0623f06a27",
         "type": "github"
       },
       "original": {
@@ -730,18 +826,110 @@
         "type": "github"
       }
     },
-    "systems": {
+    "std": {
+      "inputs": {
+        "arion": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "blank": "blank",
+        "devshell": "devshell",
+        "dmerge": "dmerge",
+        "flake-utils": "flake-utils_4",
+        "incl": "incl",
+        "makes": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "microvm": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "n2c": "n2c",
+        "nixago": "nixago",
+        "nixpkgs": "nixpkgs_4",
+        "nosys": "nosys",
+        "yants": "yants"
+      },
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1674526466,
+        "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=",
+        "owner": "divnix",
+        "repo": "std",
+        "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "divnix",
+        "repo": "std",
+        "type": "github"
+      }
+    },
+    "tullia": {
+      "inputs": {
+        "nix-nomad": "nix-nomad",
+        "nix2container": "nix2container",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs"
+        ],
+        "std": "std"
+      },
+      "locked": {
+        "lastModified": 1675695930,
+        "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=",
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "rev": "621365f2c725608f381b3ad5b57afef389fd4c31",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "yants": {
+      "inputs": {
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667096281,
+        "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=",
+        "owner": "divnix",
+        "repo": "yants",
+        "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "yants",
         "type": "github"
       }
     }

flake.nix

@@ -1,15 +1,15 @@
 {
   description = "nix flake for simplex-chat";
+  inputs.nixpkgs.url = "github:angerman/nixpkgs/release-22.11";
   inputs.haskellNix.url = "github:input-output-hk/haskell.nix/armv7a";
-  inputs.nixpkgs.follows = "haskellNix/nixpkgs-2305";
-  inputs.mac2ios.url = "github:zw3rk/mobile-core-tools";
+  inputs.haskellNix.inputs.nixpkgs.follows = "nixpkgs";
   inputs.hackage = {
     url = "github:input-output-hk/hackage.nix";
     flake = false;
   };
   inputs.haskellNix.inputs.hackage.follows = "hackage";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  outputs = { self, haskellNix, nixpkgs, flake-utils, mac2ios, ... }:
+  outputs = { self, haskellNix, nixpkgs, flake-utils, ... }:
     let systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; in
     flake-utils.lib.eachSystem systems (system:
       # this android26 overlay makes the pkgsCross.{aarch64-android,armv7a-android-prebuilt} to set stdVer to 26 (Android 8).
@@ -30,7 +30,7 @@
       # `appendOverlays` with a singleton is identical to `extend`.
       let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in
       let drv' = { extra-modules, pkgs', ... }: pkgs'.haskell-nix.project {
-        compiler-nix-name = "ghc963";
+        compiler-nix-name = "ghc8107";
         index-state = "2023-12-12T00:00:00Z";
         # We need this, to specify we want the cabal project.
         # If the stack.yaml was dropped, this would not be necessary.
@@ -40,12 +40,9 @@
           src = ./.;
         };
         sha256map = import ./scripts/nix/sha256map.nix;
-        modules = [
-        ({ pkgs, lib, ...}: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) {
-          # This patch adds `dl` as an extra-library to direct-sqlciper, which is needed
-          # on pretty much all unix platforms, but then blows up on windows m(
+        modules = [{
           packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ];
-        })
+        }
         ({ pkgs,lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) {
           packages.simplex-chat.components.library.ghcOptions = [ "-pie" ];
         })] ++ extra-modules;
@@ -67,9 +64,6 @@
       }); in
       let iosPostInstall = bundleName: ''
         ${pkgs.tree}/bin/tree $out
-        mkdir tmp
-        find ./dist -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
         mkdir -p $out/_pkg
         # copy over includes, we might want those, but maybe not.
         # cp -r $out/lib/*/*/include $out/_pkg/
@@ -80,18 +74,6 @@
         find ${pkgs.gmp6.override { withStatic = true; }}/lib -name "*.a" -exec cp {} $out/_pkg \;
         # There is no static libc
         ${pkgs.tree}/bin/tree $out/_pkg
-        for pkg in $out/_pkg/*.a; do
-          chmod +w $pkg
-          ${mac2ios.packages.${system}.mac2ios}/bin/mac2ios $pkg
-          chmod -w $pkg
-        done
-
-        mkdir tmp
-        find $out/_pkg -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
-
-        sha256sum $out/_pkg/*.a
-
         (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${bundleName}.zip *)
         rm -fR $out/_pkg
         mkdir -p $out/nix-support
@@ -137,151 +119,13 @@
                       hardeningDisable = [ "fortify" ];
                   }
               );in {
-              # STATIC x86_64-linux
               "${pkgs.pkgsCross.musl64.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl64).simplex-chat.components.exes.simplex-chat;
-              # STATIC i686-linux
-              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.musl32;
-                extra-modules = [{
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
-                }];
-              }).simplex-chat.components.exes.simplex-chat;
-              # WINDOWS x86_64-mingwW64
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                 }];
-                }).simplex-chat.components.exes.simplex-chat.override {
-                postInstall = ''
-                  set -x
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp $out/bin/* $out/_pkg
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${pkgs.pkgsCross.mingwW64.hostPlatform.system}-simplex-chat.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              };
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:lib:simplex-chat" = (drv' rec {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  # simd will try to read __cpu_model, which we don't expose
-                  # from the rts (yet!).
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages."jpeg-turbo".flags.static = true;
-                  packages.simplexmq.flags.client_library = true;
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                }];
-              }).simplex-chat.components.library
-              .override (p: {
-                # enableShared = false;
-                setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [
-                  "-shared"
-                  "-threaded"
-                  "-o" "libsimplex.dll"
-                  # "-optl-lHSrts_thr"
-                  "-optl-lffi"
-                  # "-optl-static-libgcc"
-                  # We can't do -optl-static-libstdc++ with gcc. g++ might
-                  # but then we are chaning the compiler altogether.
-                  "${./libsimplex.dll.def}"
-                ];
-                postInstall = ''
-                  set -x
-                  function deps() {
-                    ${pkgs.binutils}/bin/strings "$1" | grep '.\.dll'|grep -v -E 'Winsock|ADVAPI32|dbghelp|KERNEL32|msvcrt|ntdll|ole32|RPCRT4|SHELL32|USER32|WINMM|WS2_32|kernel32|GDI32'|grep -v "$1"
-                  }
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp libsimplex.dll $out/_pkg
-                  cp libsimplex.dll.a $out/_pkg
-                  mkdir $out/libs
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.openssl}             -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.libffi}              -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.gmp}                 -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.stdenv.cc.cc}        -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.windows.mcfgthreads} -name "*.dll" -exec cp {} $out/libs \;
-
-                  pushd $out/_pkg
-                  function copyDeps() {
-                    for dep in $(deps "$1"); do
-                      if [ ! -f "$dep" ]; then
-                        if [ ! -f ../libs/"$dep" ]; then
-                          echo "WARN: $1 -> $dep not found!"
-                        else
-                          cp ../libs/"$dep" .
-                          copyDeps "$dep"
-                        fi
-                      fi
-                    done
-                  }
-                  copyDeps libsimplex.dll
-                  popd
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-${pkgs.pkgsCross.mingwW64.hostPlatform.system}-libsimplex.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              });
+              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl32).simplex-chat.components.exes.simplex-chat;
               # "${pkgs.pkgsCross.muslpi.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.muslpi).simplex-chat.components.exes.simplex-chat;
-
-              # STATIC aarch64-linux
               "${pkgs.pkgsCross.aarch64-multiplatform-musl.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.aarch64-multiplatform-musl).simplex-chat.components.exes.simplex-chat;
-              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # we won't want -dyamic (see aarch64-android:lib:simplex-chat)
-                enableShared = false;
-                # we also do not want to have any dependencies listed (especially no rts!)
-                enableStatic = false;
-
-                # This used to work with 8.10.7...
-                # setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
-                # ... but now with 9.6+
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  armv7a-unknown-linux-androideabi-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                 postInstall = ''
 
                   mkdir -p $out/_pkg
@@ -294,29 +138,14 @@
                   echo "file binary-dist \"$(echo $out/*.zip)\"" \
                         > $out/nix-support/hydra-build-products
                 '';
-              });
-              # The android-support package is at
-              # https://github.com/simplex-chat/android-support
-              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # no -dynamic
-                enableShared = false;
-                # but also no -staticlib
-                enableStatic = false;
-
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  aarch64-unknown-linux-android-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              };
+              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                 postInstall = ''
 
                   mkdir -p $out/_pkg
                   cp libsupport.so $out/_pkg
-                  ls -lah $out/_pkg/*
                   ${pkgs.patchelf}/bin/patchelf --remove-needed libunwind.so.1 $out/_pkg/libsupport.so
                   (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-aarch64-android-libsupport.zip *)
                   rm -fR $out/_pkg
@@ -325,11 +154,10 @@
                   echo "file binary-dist \"$(echo $out/*.zip)\"" \
                         > $out/nix-support/hydra-build-products
                 '';
-              });
+              };
               "armv7a-android:lib:simplex-chat" = (drv' {
                 pkgs' = android32Pkgs;
                 extra-modules = [{
-                  packages.text.flags.simdutf = false;
                   packages.direct-sqlcipher.flags.openssl = true;
                   packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                     (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
@@ -337,63 +165,17 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
                   ];
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
                 }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we want -shared, but not -dyanmic, hence `enableShared = false`.
-                enableShared = false;
-                # we _do_ want rts, and other libs. Hence `enableStatic = true`.
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                 # for android we build a shared library, passing these arguments is a bit tricky, as
                 # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                 # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_json_length"
-                  "chat_write_file"
-                  "chat_write_image"
-                  "chat_resize_image_to_str_size"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                 postInstall = ''
                   set -x
                   ${pkgs.tree}/bin/tree $out
@@ -437,11 +219,10 @@
                   echo "file binary-dist \"$(echo $out/*.zip)\"" \
                       > $out/nix-support/hydra-build-products
                 '';
-              });
+              };
               "aarch64-android:lib:simplex-chat" = (drv' {
                 pkgs' = androidPkgs;
                 extra-modules = [{
-                  packages.text.flags.simdutf = false;
                   packages.direct-sqlcipher.flags.openssl = true;
                   packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                     (androidPkgs.openssl.override { static = true; })
@@ -449,62 +230,17 @@
                   packages.direct-sqlcipher.patches = [
                     ./scripts/nix/direct-sqlcipher-android-log.patch
                   ];
-                  packages.jpeg-turbo.flags.static = true;
-                  packages.jpeg-turbo.components.library.libs = pkgs.lib.mkForce [
-                    (androidPkgs.libjpeg_turbo.override { enableStatic = true; })
-                  ];
-
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (androidPkgs.openssl.override { static = true; })
                   ];
                 }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we do not want a dynamically linked object, even though we _do_
-                # want to produce a _shared_ object. But `shared` implied -dyanmic
-                # with cabal, so we disable and pass `-shared` explicitly.
-                enableShared = false;
-                # we do want static (e.g. pass all dependencies in, so we get -staticlib)
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                 # for android we build a shared library, passing these arguments is a bit tricky, as
                 # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                 # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_json_length"
-                  "chat_write_file"
-                  "chat_write_image"
-                  "chat_resize_image_to_str_size"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                 postInstall = ''
                   set -x
                   ${pkgs.tree}/bin/tree $out
@@ -548,7 +284,7 @@
                   echo "file binary-dist \"$(echo $out/*.zip)\"" \
                       > $out/nix-support/hydra-build-products
                 '';
-              });
+              };
             };
 
             # builds for iOS and iOS simulator
@@ -561,11 +297,9 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    # TODO: have a cross override for iOS, that sets this.
-                    ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
+                    (pkgs.openssl.override { static = true; })
                   ];
                 }];
               }).simplex-chat.components.library.override (
@@ -577,7 +311,6 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
@@ -596,7 +329,6 @@
                   packages.simplexmq.flags.swift = true;
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })
@@ -611,7 +343,6 @@
                 extra-modules = [{
                   packages.direct-sqlcipher.flags.commoncrypto = true;
                   packages.entropy.flags.DoNotGetEntropy = true;
-                  packages."jpeg-turbo".flags.static = true;
                   packages.simplexmq.flags.client_library = true;
                   packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                     (pkgs.openssl.override { static = true; })

libsimplex.dll.def

@@ -16,8 +16,6 @@ EXPORTS
     chat_encrypt_media
     chat_decrypt_media
     chat_write_file
-    chat_write_image
     chat_read_file
     chat_encrypt_file
-    chat_decrypt_file
-    chat_resize_image_to_str_size
+    chat_decrypt_file

package.yaml

@@ -52,9 +52,6 @@ dependencies:
   - unliftio-core == 0.2.*
   - uuid == 1.3.*
   - zip == 2.0.*
-  - JuicyPixels
-  - JuicyPixels-jpeg-turbo
-  - JuicyPixels-stbir
 
 flags:
   swift:

scripts/ci/prepare-keychain-mac.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-security create-keychain -p "" simplex.keychain
-security set-keychain-settings -u simplex.keychain
-security add-certificates -k simplex.keychain "Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T).cer"
-security add-certificates -k simplex.keychain "Developer ID Certification Authority.cer"
-# Private key with access from any app
-security import "SimpleX Chat.p12" -P "" -k simplex.keychain -A
-# Public key
-security import "SimpleX Chat.pem" -k simplex.keychain

scripts/desktop/build-desktop-mac-ci.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-trap "rm apps/multiplatform/local.properties 2> /dev/null || true; rm local.properties 2> /dev/null || true; rm /tmp/simplex.keychain" EXIT
+trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT
 echo "desktop.mac.signing.identity=Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T)" >> apps/multiplatform/local.properties
 echo "desktop.mac.signing.keychain=/tmp/simplex.keychain" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.apple_id=$APPLE_SIMPLEX_NOTARIZATION_APPLE_ID" >> apps/multiplatform/local.properties
@@ -10,10 +10,6 @@ echo "desktop.mac.notarization.password=$APPLE_SIMPLEX_NOTARIZATION_PASSWORD" >>
 echo "desktop.mac.notarization.team_id=5NN7GUYB6T" >> apps/multiplatform/local.properties
 echo "$APPLE_SIMPLEX_SIGNING_KEYCHAIN" | base64 --decode -o /tmp/simplex.keychain
 
-security unlock-keychain -p "" /tmp/simplex.keychain
-# Adding keychain to the list of keychains.
-# Otherwise, it can find cert but exits while signing with "error: The specified item could not be found in the keychain."
-security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
 scripts/desktop/build-lib-mac.sh
 cd apps/multiplatform
 ./gradlew packageDmg

scripts/desktop/build-lib-linux.sh

@@ -8,7 +8,7 @@ function readlink() {
 
 OS=linux
 ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`}
-GHC_VERSION=9.6.3
+GHC_VERSION=8.10.7
 
 if [ "$ARCH" == "aarch64" ]; then
     COMPOSE_ARCH=arm64
@@ -25,7 +25,7 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded' --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN' --ghc-options="-optl-L$(ghc --print-libdir)/rts -optl-Wl,--as-needed,-lHSrts_thr-ghc$GHC_VERSION" --constraint 'simplexmq +client_library'
 cd $BUILD_DIR/build
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
 #patchelf --add-rpath '$ORIGIN' libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so

scripts/desktop/build-lib-mac.sh

@@ -5,14 +5,13 @@ set -e
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
-GHC_VERSION=9.6.3
+GHC_VERSION=8.10.7
 
 if [ "$ARCH" == "arm64" ]; then
     ARCH=aarch64
 else
     COMPOSE_ARCH=x64
 fi
-
 LIB_EXT=dylib
 LIB=libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT
 GHC_LIBS_DIR=$(ghc --print-libdir)
@@ -24,26 +23,13 @@ for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc
 for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi" --constraint 'simplexmq +client_library'
+cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/rts -optl-lHSrts_thr-ghc8.10.7 -optl-lffi" --constraint 'simplexmq +client_library'
 
 cd $BUILD_DIR/build
 mkdir deps 2> /dev/null || true
 
 # It's not included by default for some reason. Compiled lib tries to find system one but it's not always available
-#cp $GHC_LIBS_DIR/libffi.dylib ./deps
-(
-  BUILD=$PWD
-  cp /tmp/libffi-3.4.4/*-apple-darwin*/.libs/libffi.dylib $BUILD/deps || \
-    ( \
-    cd /tmp && \
-    curl --tlsv1.2 "https://gitlab.haskell.org/ghc/libffi-tarballs/-/raw/libffi-3.4.4/libffi-3.4.4.tar.gz?inline=false" -o libffi.tar.gz && \
-    tar -xzvf libffi.tar.gz && \
-    cd "libffi-3.4.4" && \
-    ./configure && \
-    make && \
-    cp *-apple-darwin*/.libs/libffi.dylib $BUILD/deps \
-    )
-)
+cp $GHC_LIBS_DIR/rts/libffi.dylib ./deps
 
 DYLIBS=`otool -L $LIB | grep @rpath | tail -n +2 | cut -d' ' -f 1 | cut -d'/' -f2`
 RPATHS=`otool -l $LIB | grep "path "| cut -d' ' -f11`
@@ -84,8 +70,6 @@ function copy_deps() {
 }
 
 copy_deps $LIB
-# Special case
-cp $(ghc --print-libdir)/$ARCH-osx-ghc-$GHC_VERSION/libHSghc-boot-th-$GHC_VERSION-ghc$GHC_VERSION.dylib deps
 rm deps/`basename $LIB`
 
 cd -

scripts/desktop/make-appimage-linux.sh

@@ -40,10 +40,10 @@ if [ ! -f ../appimagetool-x86_64.AppImage ]; then
     wget --secure-protocol=TLSv1_3 https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -O ../appimagetool-x86_64.AppImage
     chmod +x ../appimagetool-x86_64.AppImage
 fi
-if [ ! -f ../runtime-x86_64 ]; then
-    wget --secure-protocol=TLSv1_3 https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64 -O ../runtime-x86_64
-    chmod +x ../runtime-x86_64
+if [ ! -f ../runtime-fuse3-x86_64 ]; then
+    wget --secure-protocol=TLSv1_3 https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-x86_64 -O ../runtime-fuse3-x86_64
+    chmod +x ../runtime-fuse3-x86_64
 fi
-../appimagetool-x86_64.AppImage --runtime-file ../runtime-x86_64 .
+../appimagetool-x86_64.AppImage --runtime-file ../runtime-fuse3-x86_64 .
 
 mv *imple*.AppImage ../../

scripts/flatpak/chat.simplex.simplex.metainfo.xml

@@ -38,17 +38,6 @@
   </description>
 
   <releases>
-    <release version="6.2.0" date="2024-12-08">
-      <url type="details">https://simplex.chat/blog/20241210-simplex-network-v6-2-servers-by-flux-business-chats.html</url>
-      <description>
-        <p>New in v6.2:</p>
-        <ul>
-          <li>SimpleX Chat and Flux made an agreement to include servers operated by Flux into the app – to improve metadata privacy.</li>
-          <li>Business chats – your customers privacy.</li>
-          <li>Improved user experience in chats: open on the first unread, jump to quoted messages, see who reacted.</li>
-        </ul>
-      </description>
-    </release>
     <release version="6.1.1" date="2024-10-18">
       <url type="details">https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html</url>
       <description>

scripts/nix/basement-pr-573.patch

@@ -1,242 +0,0 @@
-From 38be2c93acb6f459d24ed6c626981c35ccf44095 Mon Sep 17 00:00:00 2001
-From: Sylvain Henry <sylvain@haskus.fr>
-Date: Thu, 16 Feb 2023 15:40:45 +0100
-Subject: [PATCH] Fix build on 32-bit architectures
-
----
- Basement/Bits.hs                 |  4 ++++
- Basement/From.hs                 | 24 -----------------------
- Basement/Numerical/Additive.hs   |  4 ++++
- Basement/Numerical/Conversion.hs | 20 +++++++++++++++++++
- Basement/PrimType.hs             |  6 +++++-
- Basement/Types/OffsetSize.hs     | 22 +++++++++++++++++++--
- 6 files changed, 53 insertions(+), 27 deletions(-)
-
-diff --git a/Basement/Bits.hs b/Basement/Bits.hs
-index 7eeea0f5..24520ed7 100644
---- a/Basement/Bits.hs
-+++ b/Basement/Bits.hs
-@@ -54,8 +54,12 @@ import GHC.Int
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | operation over finite bits
- class FiniteBitsOps bits where
-diff --git a/Basement/From.hs b/Basement/From.hs
-index 7bbe141c..80014b3e 100644
---- a/Basement/From.hs
-+++ b/Basement/From.hs
-@@ -272,23 +272,11 @@ instance (NatWithinBound (CountOf ty) n, KnownNat n, PrimType ty)
-     tryFrom = BlockN.toBlockN . UArray.toBlock . BoxArray.mapToUnboxed id
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn64 n) Word8 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
--#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn64 n) Word16 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
--#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn64 n) Word32 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
--#endif
- instance From (Zn64 n) Word64 where
-     from = unZn64
- instance From (Zn64 n) Word128 where
-@@ -297,23 +285,11 @@ instance From (Zn64 n) Word256 where
-     from = from . unZn64
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn n) Word8 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
--#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn n) Word16 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
--#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn n) Word32 where
--#if __GLASGOW_HASKELL__ >= 904
--    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
--#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
--#endif
- instance (KnownNat n, NatWithinBound Word64 n) => From (Zn n) Word64 where
-     from = naturalToWord64 . unZn
- instance (KnownNat n, NatWithinBound Word128 n) => From (Zn n) Word128 where
-diff --git a/Basement/Numerical/Additive.hs b/Basement/Numerical/Additive.hs
-index d0dfb973..8ab65aa0 100644
---- a/Basement/Numerical/Additive.hs
-+++ b/Basement/Numerical/Additive.hs
-@@ -30,8 +30,12 @@ import qualified Basement.Types.Word128 as Word128
- import qualified Basement.Types.Word256 as Word256
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import           GHC.Exts
-+#else
- import           GHC.IntWord64
- #endif
-+#endif
-
- -- | Represent class of things that can be added together,
- -- contains a neutral element and is commutative.
-diff --git a/Basement/Numerical/Conversion.hs b/Basement/Numerical/Conversion.hs
-index db502c07..fddc8232 100644
---- a/Basement/Numerical/Conversion.hs
-+++ b/Basement/Numerical/Conversion.hs
-@@ -26,8 +26,12 @@ import GHC.Word
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- intToInt64 :: Int -> Int64
- #if WORD_SIZE_IN_BITS == 64
-@@ -96,11 +100,22 @@ int64ToWord64 (I64# i) = W64# (int64ToWord64# i)
- #endif
-
- #if WORD_SIZE_IN_BITS == 64
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord# :: Word64# -> Word#
-+word64ToWord# i = word64ToWord# i
-+#else
- word64ToWord# :: Word# -> Word#
- word64ToWord# i = i
-+#endif
- {-# INLINE word64ToWord# #-}
- #endif
-
-+#if WORD_SIZE_IN_BITS < 64
-+word64ToWord32# :: Word64# -> Word32#
-+word64ToWord32# i = wordToWord32# (word64ToWord# i)
-+{-# INLINE word64ToWord32# #-}
-+#endif
-+
- -- | 2 Word32s
- data Word32x2 = Word32x2 {-# UNPACK #-} !Word32
-                          {-# UNPACK #-} !Word32
-@@ -113,9 +128,14 @@ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# (G
- word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64))
- #endif
- #else
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord32s :: Word64 -> Word32x2
-+word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64))
-+#else
- word64ToWord32s :: Word64 -> Word32x2
- word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
- #endif
-+#endif
-
- wordToChar :: Word -> Char
- wordToChar (W# word) = C# (chr# (word2Int# word))
-diff --git a/Basement/PrimType.hs b/Basement/PrimType.hs
-index f8ca2926..a888ec91 100644
---- a/Basement/PrimType.hs
-+++ b/Basement/PrimType.hs
-@@ -54,7 +54,11 @@ import           Basement.Nat
- import qualified Prelude (quot)
-
- #if WORD_SIZE_IN_BITS < 64
--import           GHC.IntWord64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
-+import GHC.IntWord64
-+#endif
- #endif
-
- #ifdef FOUNDATION_BOUNDS_CHECK
-diff --git a/Basement/Types/OffsetSize.hs b/Basement/Types/OffsetSize.hs
-index cd944927..1ea80dad 100644
---- a/Basement/Types/OffsetSize.hs
-+++ b/Basement/Types/OffsetSize.hs
-@@ -70,8 +70,12 @@ import Data.List (foldl')
- import qualified Prelude
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | File size in bytes
- newtype FileSize = FileSize Word64
-@@ -225,20 +229,26 @@ countOfRoundUp alignment (CountOf n) = CountOf ((n + (alignment-1)) .&. compleme
-
- csizeOfSize :: CountOf Word8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
--
- #else
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz))
--
- #endif
- #endif
-
- csizeOfOffset :: Offset8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
-@@ -250,7 +260,11 @@ csizeOfOffset (Offset (I# sz)) = CSize (W64# (int2Word# sz))
- sizeOfCSSize :: CSsize -> CountOf Word8
- sizeOfCSSize (CSsize (-1))      = error "invalid size: CSSize is -1"
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
-+#else
- sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
-@@ -261,7 +275,11 @@ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# sz)
-
- sizeOfCSize :: CSize -> CountOf Word8
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
-+#else
- sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))

scripts/nix/direct-sqlcipher-2.3.27-win.patch

@@ -1,12 +0,0 @@
-diff --git a/direct-sqlcipher.cabal b/direct-sqlcipher.cabal
-index 728ba3e..c63745e 100644
---- a/direct-sqlcipher.cabal
-+++ b/direct-sqlcipher.cabal
-@@ -84,6 +84,8 @@ library
-       cc-options: -DSQLITE_TEMP_STORE=2
-                   -DSQLITE_HAS_CODEC
-
-+    extra-libraries: ws2_32
-+
-     if !os(windows) && !os(android)
-       extra-libraries: pthread

scripts/nix/memory-pr-99.patch

@@ -1,36 +0,0 @@
-From 2738929ce15b4c8704bbbac24a08539b5d4bf30e Mon Sep 17 00:00:00 2001
-From: sternenseemann <sternenseemann@systemli.org>
-Date: Mon, 14 Aug 2023 10:51:30 +0200
-Subject: [PATCH] Data.Memory.Internal.CompatPrim64: fix 32 bit with GHC >= 9.4
-
-Since 9.4, GHC.Prim exports Word64# operations like timesWord64# even on
-i686 whereas GHC.IntWord64 no longer exists. Therefore, we can just use
-the ready made solution.
-
-Closes #98, as it should be the better solution.
----
- Data/Memory/Internal/CompatPrim64.hs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Data/Memory/Internal/CompatPrim64.hs b/Data/Memory/Internal/CompatPrim64.hs
-index b9eef8a..a134c88 100644
---- a/Data/Memory/Internal/CompatPrim64.hs
-+++ b/Data/Memory/Internal/CompatPrim64.hs
-@@ -150,6 +150,7 @@ w64# :: Word# -> Word# -> Word# -> Word64#
- w64# w _ _ = w
- 
- #elif WORD_SIZE_IN_BITS == 32
-+#if __GLASGOW_HASKELL__ < 904
- import GHC.IntWord64
- import GHC.Prim (Word#)
- 
-@@ -158,6 +159,9 @@ timesWord64# a b =
-     let !ai = word64ToInt64# a
-         !bi = word64ToInt64# b
-      in int64ToWord64# (timesInt64# ai bi)
-+#else
-+import GHC.Prim
-+#endif
- 
- w64# :: Word# -> Word# -> Word# -> Word64#
- w64# _ hw lw =

scripts/nix/sha256map.nix

@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."0a827307d666de819d5cef17f70a78be5cd0e410" = "09z0y6w1c51szd9r90fl259inn76yahfbb164mawd34sr41ccp7g";
+  "https://github.com/simplex-chat/simplexmq.git"."79e9447b73cc315ce35042b0a5f210c07ea39b07" = "16z7z5a3f7gw0h188manykp008d1bqpydlrj7h497mgyjmp4cy9m";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
@@ -9,5 +9,4 @@
   "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
   "https://github.com/yesodweb/wai.git"."ec5e017d896a78e787a5acea62b37a4e677dec2e" = "1ckcpmpjfy9jiqrb52q20lj7ln4hmq9v2jk6kpkf3m68c1m9c2bx";
   "https://github.com/simplex-chat/wai.git"."2f6e5aa5f05ba9140ac99e195ee647b4f7d926b0" = "199g4rjdf1zp1fcw8nqdsyr1h36hmg424qqx03071jk7j00z7ay4";
-  "https://gitlab.com/dpwiz/hs-jpeg-turbo"."d2844e00e7834124e27171cde21cf280d6772aa8" = "1gbvpkx7g2r62bfgpmf8ljdvpccnskdnhqzblm515cb70pyrfq07";
 }

simplex-chat.cabal

@@ -35,7 +35,6 @@ library
       Simplex.Chat.Core
       Simplex.Chat.Files
       Simplex.Chat.Help
-      Simplex.Chat.Image
       Simplex.Chat.Markdown
       Simplex.Chat.Messages
       Simplex.Chat.Messages.Batch
@@ -206,10 +205,7 @@ library
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -274,10 +270,7 @@ executable simplex-bot
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -343,10 +336,7 @@ executable simplex-bot-advanced
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -415,10 +405,7 @@ executable simplex-broadcast-bot
       Paths_simplex_chat
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -485,10 +472,7 @@ executable simplex-chat
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -561,10 +545,7 @@ executable simplex-directory-service
       Paths_simplex_chat
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , aeson ==2.2.*
+      aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
@@ -637,7 +618,6 @@ test-suite simplex-chat-test
       ChatTests.Profiles
       ChatTests.Utils
       JSONTests
-      LinkPreviewTests
       MarkdownTests
       MessageBatching
       MobileTests
@@ -665,10 +645,7 @@ test-suite simplex-chat-test
       StrictData
   ghc-options: -O2 -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-missing-local-signatures -Wno-missing-kind-signatures -Wno-missing-deriving-strategies -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-unused-packages -Wno-implicit-prelude -Wno-missing-safe-haskell-mode -Wno-missing-export-lists -Wno-partial-fields -Wcompat -Werror=incomplete-record-updates -Werror=incomplete-patterns -Werror=missing-methods -Werror=incomplete-uni-patterns -Werror=tabs -Wredundant-constraints -Wincomplete-record-updates -Wunused-type-patterns -threaded
   build-depends:
-      JuicyPixels
-    , JuicyPixels-jpeg-turbo
-    , JuicyPixels-stbir
-    , QuickCheck ==2.14.*
+      QuickCheck ==2.14.*
     , aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*

src/Simplex/Chat.hs

@@ -92,8 +92,9 @@ import Simplex.Chat.Types.Preferences
 import Simplex.Chat.Types.Shared
 import Simplex.Chat.Util (encryptFile, liftIOEither, shuffle)
 import qualified Simplex.Chat.Util as U
+import Simplex.FileTransfer.Client.Main (maxFileSize, maxFileSizeHard)
 import Simplex.FileTransfer.Client.Presets (defaultXFTPServers)
-import Simplex.FileTransfer.Description (FileDescriptionURI (..), ValidFileDescription, maxFileSize, maxFileSizeHard)
+import Simplex.FileTransfer.Description (FileDescriptionURI (..), ValidFileDescription)
 import qualified Simplex.FileTransfer.Description as FD
 import Simplex.FileTransfer.Protocol (FileParty (..), FilePartyI)
 import qualified Simplex.FileTransfer.Transport as XFTP

src/Simplex/Chat/Image.hs

@@ -1,127 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE TupleSections #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Simplex.Chat.Image where
-
-import qualified Codec.Picture as Picture
-import qualified Codec.Picture.JPEGTurbo as JT
-import Codec.Picture.Metadata (Metadatas)
-import Codec.Picture.Png (encodePng)
-import qualified Codec.Picture.STBIR as STBIR
-import Codec.Picture.Types (dropAlphaLayer, pixelFoldMap)
-import Control.Monad.Except (ExceptT (..), runExceptT, throwError)
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Base64.Lazy as LB64
-import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Int (Int64)
-import Data.Monoid (All (..))
-import System.IO.Unsafe (unsafePerformIO)
-
-resizeImageToSize :: Bool -> Int -> Int64 -> ResizeableImage -> LB.ByteString
-resizeImageToSize toURI minJpegQuality maxSize (ResizeableImage fmt img encoder) = either resizePNG resizeJPG encoder
-  where
-    halveAndRetry = resizeImageToSize toURI minJpegQuality maxSize (ResizeableImage fmt imgHalved encoder)
-    imgHalved = downscale img 2.0
-    resizePNG enc
-      | LB.length encoded <= maxSize = encoded
-      | LB.length (encode imgHalved) > maxSize = halveAndRetry
-      | otherwise = fitScale 1.0 2.0
-      where
-        encode
-          | toURI = toDataUri "png" . enc
-          | otherwise = enc
-        encoded = encode img
-        fitScale l u
-          | u - l < 1 / 64 = encode $ downscale img u -- prefer lower resolution
-          | otherwise =
-              case compare maxSize (LB.length result) of
-                LT -> fitScale m u -- over budget, scale harder
-                EQ -> result
-                GT -> fitScale l m -- keep more pixels
-          where
-            m = (l + u) / 2
-            result = encode $ downscale img m
-    resizeJPG enc
-      | minSize > maxSize = halveAndRetry
-      | otherwise = fitQuality minJpegQuality 95
-      where
-        encode q
-          | toURI = toDataUri "jpg" $ enc q img -- the correct mime type is "jpeg", but only "jpg" is supported by older clients
-          | otherwise = enc q img
-        minSize = LB.length $ encode minJpegQuality
-        fitQuality l u
-          | u - l <= 1 = encode l -- prefer higher compression
-          | otherwise =
-              case compare (LB.length result) maxSize of
-                LT -> fitQuality m u -- keep more data
-                EQ -> result
-                GT -> fitQuality l m -- over budget, reduce quality
-          where
-            m = (l + u) `div` 2
-            result = encode m
-
-downscale :: STBIR.STBIRPixel pixel => Picture.Image pixel -> Float -> Picture.Image pixel
-downscale img scale = STBIR.resize STBIR.defaultOptions (scaled Picture.imageWidth) (scaled Picture.imageHeight) img
-  where
-    scaled f = round $ fromIntegral (f img) / min 2.0 (max 0.5 scale)
-
-toDataUri :: LB.ByteString -> LB.ByteString -> LB.ByteString
-toDataUri fmt body = "data:image/" <> fmt <> ";base64," <> LB64.encode body
-
-decodeResizeable :: ByteString -> Either String (ResizeableImage, Metadatas)
-decodeResizeable source = do
-  (input, metadata) <- Picture.decodeImageWithMetadata source
-  maybe (Left "unsupported image format") (pure . (,metadata)) $ resizeableImage (tryDropOpacity input)
-
-readResizeable :: FilePath -> IO (Either String (ResizeableImage, Metadatas))
-readResizeable inputPath = runExceptT $ do
-  (input, metadata) <- ExceptT $ Picture.readImageWithMetadata inputPath -- will use mmap instead of reading the whole file
-  maybe (throwError "unsupported image format") (pure . (,metadata)) $ resizeableImage (tryDropOpacity input)
-
-tryDropOpacity :: Picture.DynamicImage -> Picture.DynamicImage
-tryDropOpacity dyn = case dyn of
-  Picture.ImageRGBA16 img | opaque img -> Picture.ImageRGB16 $ dropAlphaLayer img
-  Picture.ImageRGBA8 img | opaque img -> Picture.ImageRGB8 $ dropAlphaLayer img
-  Picture.ImageYA16 img | opaque img -> Picture.ImageY16 $ dropAlphaLayer img
-  Picture.ImageYA8 img | opaque img -> Picture.ImageY8 $ dropAlphaLayer img
-  _ -> dyn
-  where
-    opaque :: (Picture.Pixel a, Eq (Picture.PixelBaseComponent a), Bounded (Picture.PixelBaseComponent a)) => Picture.Image a -> Bool
-    opaque = getAll . pixelFoldMap (All . \pix -> Picture.pixelOpacity pix == maxBound)
-
-data ResizeableImage where
-  ResizeableImage ::
-    STBIR.STBIRPixel a =>
-    -- | format label
-    String ->
-    -- | current image data
-    Picture.Image a ->
-    ImageEncoder a ->
-    ResizeableImage
-
-type ImageEncoder a = Either (PNGEncoder a) (JPGEncoder a)
-type PNGEncoder a = Picture.Image a -> LB.ByteString
-type JPGEncoder a = Int -> Picture.Image a -> LB.ByteString
-
-resizeableImage :: Picture.DynamicImage -> Maybe ResizeableImage
-resizeableImage dyn = case dyn of
-  Picture.ImageY8 img -> Just $ ResizeableImage "Y8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageY8 -- TODO: directly
-  Picture.ImageY16 img -> Just $ ResizeableImage "Y16" img $ Left encodePng
-  Picture.ImageY32 _ -> Nothing
-  Picture.ImageYF _ -> Nothing
-  Picture.ImageYA8 img -> Just $ ResizeableImage "YA8" img $ Left encodePng
-  Picture.ImageYA16 img -> Just $ ResizeableImage "YA16" img $ Left encodePng
-  Picture.ImageRGB8 img -> Just $ ResizeableImage "RGB8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q
-  Picture.ImageRGB16 img -> Just $ ResizeableImage "RGB16" img $ Left encodePng
-  Picture.ImageRGBF _ -> Nothing
-  Picture.ImageRGBA8 img -> Just $ ResizeableImage "RGBA8" img $ Left encodePng
-  Picture.ImageRGBA16 img -> Just $ ResizeableImage "RGBA16" img $ Left encodePng
-  Picture.ImageYCbCr8 img -> Just $ ResizeableImage "YCbCr8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageYCbCr8 -- TODO: JT.encodeYUV
-  Picture.ImageCMYK8 img -> Just $ ResizeableImage "CMYK8" img $ Right $ \q -> LB.fromStrict . unsafePerformIO . JT.encodeRGB q . Picture.convertRGB8 . Picture.ImageCMYK8
-  Picture.ImageCMYK16 _ -> Nothing

src/Simplex/Chat/Mobile.hs

@@ -21,7 +21,6 @@ import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Either (fromRight)
 import Data.Functor (($>))
 import Data.List (find)
 import qualified Data.List.NonEmpty as L
@@ -30,14 +29,13 @@ import Data.Word (Word8)
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB
 import Foreign.C.String
-import Foreign.C.Types (CBool (..), CInt (..), CLong (..))
+import Foreign.C.Types (CInt (..))
 import Foreign.Ptr
 import Foreign.StablePtr
 import Foreign.Storable (poke)
 import GHC.IO.Encoding (setFileSystemEncoding, setForeignEncoding, setLocaleEncoding)
 import Simplex.Chat
 import Simplex.Chat.Controller
-import Simplex.Chat.Image (readResizeable, resizeImageToSize)
 import Simplex.Chat.Markdown (ParsedMarkdown (..), parseMaybeMarkdownList)
 import Simplex.Chat.Mobile.File
 import Simplex.Chat.Mobile.Shared
@@ -47,7 +45,6 @@ import Simplex.Chat.Remote.Types
 import Simplex.Chat.Store
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
-import Simplex.Chat.Util (liftIOEither)
 import Simplex.Messaging.Agent.Client (agentClientStore)
 import Simplex.Messaging.Agent.Env.SQLite (createAgentStore)
 import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..), MigrationError, closeSQLiteStore, reopenSQLiteStore)
@@ -105,16 +102,12 @@ foreign export ccall "chat_decrypt_media" cChatDecryptMedia :: CString -> Ptr Wo
 
 foreign export ccall "chat_write_file" cChatWriteFile :: StablePtr ChatController -> CString -> Ptr Word8 -> CInt -> IO CJSONString
 
-foreign export ccall "chat_write_image" cChatWriteImage :: StablePtr ChatController -> CLong -> CString -> Ptr Word8 -> CInt -> CBool -> IO CJSONString
-
 foreign export ccall "chat_read_file" cChatReadFile :: CString -> CString -> CString -> IO (Ptr Word8)
 
 foreign export ccall "chat_encrypt_file" cChatEncryptFile :: StablePtr ChatController -> CString -> CString -> IO CJSONString
 
 foreign export ccall "chat_decrypt_file" cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
 
-foreign export ccall "chat_resize_image_to_str_size" cChatResizeImageToStrSize :: CString -> CLong -> IO CString
-
 -- | check / migrate database and initialize chat controller on success
 cChatMigrateInit :: CString -> CString -> CString -> Ptr (StablePtr ChatController) -> IO CJSONString
 cChatMigrateInit fp key conf = cChatMigrateInitKey fp key 0 conf 0
@@ -189,37 +182,6 @@ cChatValidName cName = newCString . mkValidName =<< peekCString cName
 cChatJsonLength :: CString -> IO CInt
 cChatJsonLength s = fromIntegral . subtract 2 . LB.length . J.encode . safeDecodeUtf8 <$> B.packCString s
 
--- -- | Resize image at path to match specified dimensions preserving aspect ratio
--- cChatResizeImageToFit :: CString -> CInt -> CInt -> IO CString
--- cChatResizeImageToFit path maxWidth maxHeight = error "todo"
-
--- -- | Resize image at path to match specified dimensions, cropping the extra pixels
--- cChatResizeImageCrop :: CString -> CInt -> CInt -> IO CString
--- cChatResizeImageCrop path width height = error "todo" -- аватарки
-
--- -- | Downscale image at path until it fits into specified size
--- cChatResizeImageToDataSize :: CString -> CInt -> IO CString
--- cChatResizeImageToDataSize path maxSize = error "todo"
-
--- | Downscale image at path until its data-uri encoding fits into specified size.
--- Returns data-uri/base64 encoded image as 0-terminated string.
--- Empty result string means operation failure.
--- The caller must free the result ptr.
-cChatResizeImageToStrSize :: CString -> CLong -> IO CString
-cChatResizeImageToStrSize fp' maxSize = do
-  fp <- peekCString fp'
-  res <- runExceptT $ do
-    (ri, _) <- liftIOEither $ readResizeable fp
-    let resized = resizeImageToSize True previewMinQuality (fromIntegral maxSize) ri
-    if LB.length resized > fromIntegral maxSize then throwError "unable to fit" else pure resized
-  newCStringFromLazyBS $ fromRight "" res
-  where
-    previewMinQuality = 20
-
--- -- | Strip EXIF etc metadata from image, inlplace
--- cChatStripImageMetadata :: CString -> IO CBool
--- cChatStripImageMetadata path = error "todo"
-
 mobileChatOpts :: String -> ChatOpts
 mobileChatOpts dbFilePrefix =
   ChatOpts

src/Simplex/Chat/Mobile/File.hs

@@ -7,7 +7,6 @@
 
 module Simplex.Chat.Mobile.File
   ( cChatWriteFile,
-    cChatWriteImage,
     cChatReadFile,
     cChatEncryptFile,
     cChatDecryptFile,
@@ -36,8 +35,6 @@ import Foreign.Ptr
 import Foreign.StablePtr
 import Foreign.Storable (poke, pokeByteOff)
 import Simplex.Chat.Controller (ChatController (..))
-import Simplex.Chat.Image (resizeImageToSize)
-import qualified Simplex.Chat.Image as Picture
 import Simplex.Chat.Mobile.Shared
 import Simplex.Chat.Util (chunkSize, encryptFile)
 import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..), CryptoFileHandle, FTCryptoError (..))
@@ -48,7 +45,7 @@ import Simplex.Messaging.Util (catchAll)
 import UnliftIO (Handle, IOMode (..), atomically, withFile)
 
 data WriteFileResult
-  = WFResult {cryptoArgs :: Maybe CryptoFileArgs}
+  = WFResult {cryptoArgs :: CryptoFileArgs}
   | WFError {writeError :: String}
 
 $(JQ.deriveToJSON (sumTypeJSON $ dropPrefix "WF") ''WriteFileResult)
@@ -64,32 +61,10 @@ cChatWriteFile cc cPath ptr len = do
 chatWriteFile :: ChatController -> FilePath -> ByteString -> IO WriteFileResult
 chatWriteFile ChatController {random} path s = do
   cfArgs <- atomically $ CF.randomArgs random
-  chatWriteFile_ (Just cfArgs) path s
-
-chatWriteFile_ :: Maybe CryptoFileArgs -> FilePath -> ByteString -> IO WriteFileResult
-chatWriteFile_ cfArgs_ path s = do
-  let file = CryptoFile path cfArgs_
-  either WFError (\_ -> WFResult cfArgs_)
+  let file = CryptoFile path $ Just cfArgs
+  either WFError (\_ -> WFResult cfArgs)
     <$> runCatchExceptT (withExceptT show $ CF.writeFile file $ LB.fromStrict s)
 
-cChatWriteImage :: StablePtr ChatController -> CLong -> CString -> Ptr Word8 -> CInt -> CBool -> IO CJSONString
-cChatWriteImage cc maxSize cPath ptr len encrypt = do
-  c <- deRefStablePtr cc
-  path <- peekCString cPath
-  src <- getByteString ptr len
-  cfArgs_ <- if encrypt /= 0 then Just <$> atomically (CF.randomArgs $ random c) else pure Nothing
-  r <-
-    case Picture.decodeResizeable src of
-      Left e -> pure $ WFError e
-      Right (ri, _metadata) -> do
-        let resized = resizeImageToSize False storeMinQuality (fromIntegral maxSize) ri
-        if LB.length resized > fromIntegral maxSize
-          then pure $ WFError "unable to fit"
-          else chatWriteFile_ cfArgs_ path (LB.toStrict resized)
-  newCStringFromLazyBS $ J.encode r
-  where
-    storeMinQuality = 20
-
 data ReadFileResult
   = RFResult {fileSize :: Int}
   | RFError {readError :: String}
@@ -131,7 +106,7 @@ chatEncryptFile ChatController {random} fromPath toPath =
     encrypt = do
       cfArgs <- atomically $ CF.randomArgs random
       encryptFile fromPath toPath cfArgs
-      pure $ Just cfArgs
+      pure cfArgs
 
 cChatDecryptFile :: CString -> CString -> CString -> CString -> IO CString
 cChatDecryptFile cFromPath cKey cNonce cToPath = do

tests/ChatTests/Files.hs

@@ -620,7 +620,7 @@ testXFTPFileTransferEncrypted =
     createDirectoryIfMissing True "./tests/tmp/alice/"
     createDirectoryIfMissing True "./tests/tmp/bob/"
     WFResult cfArgs <- chatWriteFile (chatController alice) srcPath src
-    let fileJSON = LB.unpack $ J.encode $ CryptoFile srcPath cfArgs
+    let fileJSON = LB.unpack $ J.encode $ CryptoFile srcPath $ Just cfArgs
     withXFTPServer $ do
       connectUsers alice bob
       alice ##> ("/_send @2 json [{\"msgContent\":{\"type\":\"file\", \"text\":\"\"}, \"fileSource\": " <> fileJSON <> "}]")

tests/LinkPreviewTests.hs

@@ -1,32 +0,0 @@
-module LinkPreviewTests where
-
-import qualified Data.ByteString.Base64.Lazy as LB64
-import qualified Data.ByteString.Lazy.Char8 as LB
-import qualified Codec.Picture as Picture
-import Control.Logger.Simple
-import Control.Monad
-import Simplex.Chat.Image (ResizeableImage (..))
-import qualified Simplex.Chat.Image as Image
-import Simplex.Messaging.Util (tshow)
-import Test.Hspec
-
-linkPreviewTests :: SpecWith FilePath
-linkPreviewTests = do
-  fdescribe "Image resize" $ do
-    it "JPG" $ resizeToStrTest "tests/fixtures/test.jpg"
-    it "PNG with alpha" $ resizeToStrTest "tests/fixtures/logo-large-rgba.png"
-    it "PNG without alpha" $ resizeToStrTest "tests/fixtures/preview-issue1.png"
-
-resizeToStrTest :: FilePath -> FilePath -> IO ()
-resizeToStrTest inputPath tmp = do
-  (ri@(ResizeableImage imgFormat _img encoder), metadata) <- either error pure =<< Image.readResizeable inputPath
-  logDebug $ tshow (metadata, imgFormat, either (const "png") (const "jpg") encoder)
-  let res = Image.resizeImageToSize True 20 maxSize ri
-      finalSize = LB.length res
-  unless (finalSize <= maxSize) $ error $ "Final size larger than maximum size: " <> show (finalSize, maxSize)
-  let (fmt, b64) = fmap (LB.drop 8) . LB.break (== ';') $ LB.drop 11 res
-      outFile = tmp ++ "/out." ++ LB.unpack fmt
-  either error (LB.writeFile outFile) $ LB64.decode b64
-  Picture.readImageWithMetadata outFile >>= either error (logDebug . tshow . snd)
-  where
-    maxSize = 14000

tests/MobileTests.hs

@@ -282,8 +282,8 @@ testFileCApi fileName tmp = do
   ptr <- mallocBytes $ B.length src
   putByteString ptr src
   r <- peekCAString =<< cChatWriteFile cc cPath ptr cLen
-  Just (WFResult cfArgs@(Just (CFArgs key nonce))) <- jDecode r
-  let encryptedFile = CryptoFile path cfArgs
+  Just (WFResult cfArgs@(CFArgs key nonce)) <- jDecode r
+  let encryptedFile = CryptoFile path $ Just cfArgs
   CF.getFileContentsSize encryptedFile `shouldReturn` fromIntegral (B.length src)
   cKey <- encodedCString key
   cNonce <- encodedCString nonce
@@ -318,8 +318,8 @@ testFileEncryptionCApi fileName tmp = do
   let toPath = tmp </> (fileName <> ".encrypted.pdf")
   cToPath <- newCString toPath
   r <- peekCAString =<< cChatEncryptFile cc cFromPath cToPath
-  Just (WFResult cfArgs@(Just (CFArgs key nonce))) <- jDecode r
-  CF.getFileContentsSize (CryptoFile toPath cfArgs) `shouldReturn` fromIntegral (B.length src)
+  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")

tests/Test.hs

@@ -6,7 +6,6 @@ import ChatTests.Utils (xdescribe'')
 import Control.Logger.Simple
 import Data.Time.Clock.System
 import JSONTests
-import LinkPreviewTests
 import MarkdownTests
 import MessageBatching
 import MobileTests
@@ -23,7 +22,7 @@ import WebRTCTests
 
 main :: IO ()
 main = do
-  setLogLevel LogDebug
+  setLogLevel LogError
   withGlobalLogging logCfg . hspec $ do
     describe "Schema dump" schemaDumpTest
     describe "SimpleX chat markdown" markdownTests
@@ -41,7 +40,6 @@ main = do
       xdescribe'' "SimpleX Broadcast bot" broadcastBotTests
       xdescribe'' "SimpleX Directory service bot" directoryServiceTests
       describe "Remote session" remoteTests
-    around testBracket $ describe "Link preview" linkPreviewTests
   where
     testBracket test = withSmpServer $ tmpBracket test
     tmpBracket test = do

website/src/_includes/blog_previews/20241125.html

@@ -1,3 +1,5 @@
+<p></p>
+
 <ul>
     <li><strong>Welcome, Flux</strong> &mdash; the new servers in <strong>v6.2-beta.1!</strong></li>
     <li>What's the problem?</li>

website/src/_includes/blog_previews/20241210.html

@@ -1,8 +0,0 @@
-<p><strong>v6.2 is released:</strong></p>
-
-<ul>
-    <li>SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app to improve metadata privacy in SimpleX network.</li>
-    <li>Business chats for better privacy and support of your customers.</li>
-    <li>Better user experience: open on the first unread, jump to quoted messages, see who reacted.</li>
-    <li>Improving notifications in iOS app.</li>
-</ul>