Merge branch 'master-ghc8107' into master-android

* 5.3.1

* 5.3.1: ios 174, desktop 11

---------

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - users
     tags:
       - "v*"
+      - "!*-fdroid"
   pull_request:
 
 jobs:
@@ -78,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: "9.6.2"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -187,7 +188,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -258,15 +259,15 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: bash
+        shell: cmd
         run: |
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)

README.md

@@ -119,19 +119,22 @@ Join our translators to help SimpleX grow!
 |locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 en|English   | |✓|✓|✓|✓|
-|ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
-|🇧🇬 bg|Български |-|[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>-|||
+|ar|العربية   |[jermanuts](https://github.com/jermanuts)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/ar/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ar/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|🇧🇬 bg|Български | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>[![ios app](https://hosted.weblate.org/widget/simplex-chat/ios/bg/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/bg/)|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
+|🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
+|🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|||
+|🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
 |🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
 |🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
+|🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
 
 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -227,24 +230,18 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 ## News and updates
 
-Recent updates:
+Recent and important updates:
 
-[July 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.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).
+
+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
 
 [May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.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 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.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).
 
-[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
-
-[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
-
-[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.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).
@@ -290,18 +287,20 @@ What is already implemented:
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
 4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
 5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
 7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
 8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
 12. Manual messaging queue rotations to move conversation to another SMP relay.
+13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+14. Local files encryption, except videos (to be added later).
 
 We plan to add:
 
-1. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. This is currently in progress.
-2. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+2. Post-quantum resistant key exchange in double ratchet protocol.
 3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
 4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
 5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
@@ -365,22 +364,26 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
 - ✅ Message delivery confirmation (with sender opt-out per contact).
-- 🏗 Desktop client.
+- ✅ Desktop client.
+- ✅ Encryption of local files stored in the app.
+- 🏗 Using mobile profiles from the desktop app.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Post-quantum resistant key exchange in double ratchet protocol.
+- Large groups, communities and public channels.
+- Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
-- Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
-- Large groups, communities and public channels.
 - Feeds/broadcasts.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
 - Privately share your location.
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
-- Supporting the same profile on multiple devices.
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
   - keep all your contacts and groups even if you lose the domain.
   - the server doesn't have information about your contacts and groups.
-- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.
 
 ## Disclaimers

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

@@ -440,9 +440,9 @@ struct ChatInfoView: View {
                     do {
                         try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
                         await MainActor.run {
-                            chatModel.removeChat(chat.chatInfo.id)
-                            chatModel.chatId = nil
                             dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
                         }
                     } catch let error {
                         logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")

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

@@ -84,7 +84,7 @@ struct CIFileView: View {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                         if let user = ChatModel.shared.currentUser {
-                            let encrypted = file.fileProtocol == .xftp && privacyEncryptLocalFilesGroupDefault.get()
+                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
                             await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                         }
                     }

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

@@ -60,6 +60,7 @@ struct ChatItemContentView<Content: View>: View {
     var chatInfo: ChatInfo
     var chatItem: ChatItem
     var msgContentView: () -> Content
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     var body: some View {
         switch chatItem.content {
@@ -69,7 +70,12 @@ struct ChatItemContentView<Content: View>: View {
         case .rcvDeleted: deletedItemView()
         case let .sndCall(status, duration): callItemView(status, duration)
         case let .rcvCall(status, duration): callItemView(status, duration)
-        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
+        case let .rcvIntegrityError(msgError):
+            if developerTools {
+                IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
+            } else {
+                ZStack {}
+            }
         case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)

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

@@ -299,9 +299,9 @@ struct GroupChatInfoView: View {
                     do {
                         try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
                         await MainActor.run {
-                            chatModel.removeChat(chat.chatInfo.id)
-                            chatModel.chatId = nil
                             dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
                         }
                     } catch let error {
                         logger.error("deleteGroupAlert apiDeleteChat error: \(error.localizedDescription)")

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

@@ -53,7 +53,7 @@ struct AdvancedNetworkSettings: View {
 
                     timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [10_000, 20_000, 40_000, 75_000, 100_000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 60_000, 90_000, 120_000], label: secondsLabel)
                     timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                     intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                     Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)

apps/ios/SimpleX NSE/NotificationService.swift

@@ -383,7 +383,7 @@ func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
 func autoReceiveFile(_ file: CIFile, encrypted: Bool) -> ChatItem? {
     switch file.fileProtocol {
     case .smp:
-        return apiReceiveFile(fileId: file.fileId, encrypted: false)?.chatItem
+        return apiReceiveFile(fileId: file.fileId, encrypted: encrypted)?.chatItem
     case .xftp:
         apiSetFileToReceive(fileId: file.fileId, encrypted: encrypted)
         return nil

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -48,11 +48,11 @@
 		5C55A921283CCCB700C4E99E /* IncomingCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A920283CCCB700C4E99E /* IncomingCallView.swift */; };
 		5C55A923283CEDE600C4E99E /* SoundPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C55A922283CEDE600C4E99E /* SoundPlayer.swift */; };
 		5C55A92E283D0FDE00C4E99E /* sounds in Resources */ = {isa = PBXBuildFile; fileRef = 5C55A92D283D0FDE00C4E99E /* sounds */; };
-		5C5624FC2ABB39B900A21210 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5624F72ABB39B900A21210 /* libgmpxx.a */; };
-		5C5624FD2ABB39B900A21210 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5624F82ABB39B900A21210 /* libgmp.a */; };
-		5C5624FE2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5624F92ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a */; };
-		5C5624FF2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5624FA2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a */; };
-		5C5625002ABB39B900A21210 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5624FB2ABB39B900A21210 /* libffi.a */; };
+		5C56251A2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */; };
+		5C56251B2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */; };
+		5C56251C2AC1DE5900A21210 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625172AC1DE5900A21210 /* libgmpxx.a */; };
+		5C56251D2AC1DE5900A21210 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625182AC1DE5900A21210 /* libgmp.a */; };
+		5C56251E2AC1DE5900A21210 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C5625192AC1DE5900A21210 /* libffi.a */; };
 		5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C577F7C27C83AA10006112D /* MarkdownHelp.swift */; };
 		5C58BCD6292BEBE600AF9E4F /* CIChatFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C58BCD5292BEBE600AF9E4F /* CIChatFeatureView.swift */; };
 		5C5DB70E289ABDD200730FFF /* AppearanceSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5DB70D289ABDD200730FFF /* AppearanceSettings.swift */; };
@@ -293,11 +293,11 @@
 		5C55A920283CCCB700C4E99E /* IncomingCallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingCallView.swift; sourceTree = "<group>"; };
 		5C55A922283CEDE600C4E99E /* SoundPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundPlayer.swift; sourceTree = "<group>"; };
 		5C55A92D283D0FDE00C4E99E /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sounds; sourceTree = "<group>"; };
-		5C5624F72ABB39B900A21210 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C5624F82ABB39B900A21210 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C5624F92ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5C5624FA2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a"; sourceTree = "<group>"; };
-		5C5624FB2ABB39B900A21210 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a"; sourceTree = "<group>"; };
+		5C5625172AC1DE5900A21210 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C5625182AC1DE5900A21210 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C5625192AC1DE5900A21210 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C577F7C27C83AA10006112D /* MarkdownHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownHelp.swift; sourceTree = "<group>"; };
 		5C58BCD5292BEBE600AF9E4F /* CIChatFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIChatFeatureView.swift; sourceTree = "<group>"; };
 		5C5B67912ABAF4B500DA9412 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -507,12 +507,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C5624FE2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a in Frameworks */,
-				5C5624FF2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a in Frameworks */,
-				5C5624FC2ABB39B900A21210 /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C5625002ABB39B900A21210 /* libffi.a in Frameworks */,
-				5C5624FD2ABB39B900A21210 /* libgmp.a in Frameworks */,
+				5C56251C2AC1DE5900A21210 /* libgmpxx.a in Frameworks */,
+				5C56251B2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a in Frameworks */,
+				5C56251A2AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a in Frameworks */,
+				5C56251E2AC1DE5900A21210 /* libffi.a in Frameworks */,
+				5C56251D2AC1DE5900A21210 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -574,11 +574,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C5624FB2ABB39B900A21210 /* libffi.a */,
-				5C5624F82ABB39B900A21210 /* libgmp.a */,
-				5C5624F72ABB39B900A21210 /* libgmpxx.a */,
-				5C5624F92ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY-ghc8.10.7.a */,
-				5C5624FA2ABB39B900A21210 /* libHSsimplex-chat-5.3.0.8-D1oMkI9pySuA3Aa2cfRrBY.a */,
+				5C5625192AC1DE5900A21210 /* libffi.a */,
+				5C5625182AC1DE5900A21210 /* libgmp.a */,
+				5C5625172AC1DE5900A21210 /* libgmpxx.a */,
+				5C5625152AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7-ghc8.10.7.a */,
+				5C5625162AC1DE5900A21210 /* libHSsimplex-chat-5.3.1.0-625aldG8rLm27VEosiv5y7.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1486,7 +1486,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1507,7 +1507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1528,7 +1528,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1549,7 +1549,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1608,7 +1608,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1621,7 +1621,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1640,7 +1640,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1653,7 +1653,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1672,7 +1672,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1696,7 +1696,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1718,7 +1718,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 171;
+				CURRENT_PROJECT_VERSION = 174;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1742,7 +1742,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.3;
+				MARKETING_VERSION = 5.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/APITypes.swift

@@ -1092,7 +1092,7 @@ public struct NetCfg: Codable, Equatable {
         sessionMode: TransportSessionMode.user,
         tcpConnectTimeout: 15_000_000,
         tcpTimeout: 10_000_000,
-        tcpTimeoutPerKb: 20_000,
+        tcpTimeoutPerKb: 30_000,
         tcpKeepAlive: KeepAliveOpts.defaults,
         smpPingInterval: 1200_000_000,
         smpPingCount: 3,
@@ -1104,7 +1104,7 @@ public struct NetCfg: Codable, Equatable {
         sessionMode: TransportSessionMode.user,
         tcpConnectTimeout: 30_000_000,
         tcpTimeout: 20_000_000,
-        tcpTimeoutPerKb: 40_000,
+        tcpTimeoutPerKb: 60_000,
         tcpKeepAlive: KeepAliveOpts.defaults,
         smpPingInterval: 1200_000_000,
         smpPingCount: 3,

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2144,7 +2144,6 @@ public struct ChatItem: Identifiable, Decodable {
     }
 
     public var encryptLocalFile: Bool {
-        file?.fileProtocol == .xftp &&
         content.msgContent?.isVideo == false &&
         privacyEncryptLocalFilesGroupDefault.get()
     }

apps/multiplatform/android/build.gradle.kts

@@ -139,8 +139,6 @@ dependencies {
     //implementation("androidx.compose.material:material-icons-extended:$compose_version")
     //implementation("androidx.compose.ui:ui-util:$compose_version")
 
-    implementation("com.google.accompanist:accompanist-pager:0.25.1")
-
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")

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

@@ -73,7 +73,7 @@ class MainActivity: FragmentActivity() {
 
   override fun onStop() {
     super.onStop()
-    VideoPlayer.stopAll()
+    VideoPlayerHolder.stopAll()
     AppLock.appWasHidden()
   }
 

apps/multiplatform/common/build.gradle.kts

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

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

@@ -27,7 +27,7 @@ actual class RecorderNative: RecorderInterface {
     }
 
   override fun start(onProgressUpdate: (position: Int?, finished: Boolean) -> Unit): String {
-    VideoPlayer.stopAll()
+    VideoPlayerHolder.stopAll()
     AudioPlayer.stop()
     val rec: MediaRecorder
     recorder = initRecorder().also { rec = it }
@@ -140,7 +140,7 @@ actual object AudioPlayer: AudioPlayerInterface {
       return null
     }
 
-    VideoPlayer.stopAll()
+    VideoPlayerHolder.stopAll()
     RecorderInterface.stopRecording?.invoke()
     val current = currentlyPlaying.value
     if (current == null || current.first != fileSource.filePath) {

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

@@ -1,10 +1,13 @@
 package chat.simplex.common.platform
 
+import android.media.MediaMetadataRetriever
 import android.media.session.PlaybackState
 import android.net.Uri
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import chat.simplex.common.helpers.toUri
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import com.google.android.exoplayer2.*
@@ -17,49 +20,15 @@ import kotlinx.coroutines.*
 import java.io.File
 import java.net.URI
 
-actual class VideoPlayer private constructor(
-  private val uri: URI,
-  private val gallery: Boolean,
+actual class VideoPlayer actual constructor(
+  override val uri: URI,
+  override val gallery: Boolean,
   private val defaultPreview: ImageBitmap,
   defaultDuration: Long,
   soundEnabled: Boolean
 ): VideoPlayerInterface {
-  actual companion object {
-    private val players: MutableMap<Pair<URI, Boolean>, VideoPlayer> = mutableMapOf()
-    private val previewsAndDurations: MutableMap<URI, VideoPlayerInterface.PreviewAndDuration> = mutableMapOf()
-
-    actual fun getOrCreate(
-      uri: URI,
-      gallery: Boolean,
-      defaultPreview: ImageBitmap,
-      defaultDuration: Long,
-      soundEnabled: Boolean
-    ): VideoPlayer =
-      players.getOrPut(uri to gallery) { VideoPlayer(uri, gallery, defaultPreview, defaultDuration, soundEnabled) }
-
-    actual fun enableSound(enable: Boolean, fileName: String?, gallery: Boolean): Boolean =
-      player(fileName, gallery)?.enableSound(enable) == true
-
-    private fun player(fileName: String?, gallery: Boolean): VideoPlayer? {
-      fileName ?: return null
-      return players.values.firstOrNull { player -> player.uri.path?.endsWith(fileName) == true && player.gallery == gallery }
-    }
-
-    actual fun release(uri: URI, gallery: Boolean, remove: Boolean) =
-      player(uri.path, gallery)?.release(remove).run {  }
-
-    actual fun stopAll() {
-      players.values.forEach { it.stop() }
-    }
-
-    actual fun releaseAll() {
-      players.values.forEach { it.release(false) }
-      players.clear()
-      previewsAndDurations.clear()
-    }
-  }
-
   private val currentVolume: Float
+
   override val soundEnabled: MutableState<Boolean> = mutableStateOf(soundEnabled)
   override val brokenVideo: MutableState<Boolean> = mutableStateOf(false)
   override val videoPlaying: MutableState<Boolean> = mutableStateOf(false)
@@ -114,7 +83,7 @@ actual class VideoPlayer private constructor(
       RecorderInterface.stopRecording?.invoke()
     }
     AudioPlayer.stop()
-    stopAll()
+    VideoPlayerHolder.stopAll()
     if (listener.value == null) {
       runCatching {
         val dataSourceFactory = DefaultDataSource.Factory(androidAppContext, DefaultHttpDataSource.Factory())
@@ -224,14 +193,14 @@ actual class VideoPlayer private constructor(
   override fun release(remove: Boolean) {
     player.release()
     if (remove) {
-      players.remove(uri to gallery)
+      VideoPlayerHolder.players.remove(uri to gallery)
     }
   }
 
   private fun setPreviewAndDuration() {
     // It freezes main thread, doing it in IO thread
     CoroutineScope(Dispatchers.IO).launch {
-      val previewAndDuration = previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(uri) }
+      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(uri) }
       withContext(Dispatchers.Main) {
         preview.value = previewAndDuration.preview ?: defaultPreview
         duration.value = (previewAndDuration.duration ?: 0)

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

@@ -51,7 +51,7 @@ actual fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap:
 }
 
 @Composable
-actual fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier) {
+actual fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier, close: () -> Unit) {
   AndroidView(
     factory = { ctx ->
       StyledPlayerView(ctx).apply {

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

@@ -309,7 +309,7 @@ actual suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean)
   }
 }
 
-actual fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
+actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
   val mmr = MediaMetadataRetriever()
   mmr.setDataSource(androidAppContext, uri.toUri())
   val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()

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

@@ -60,7 +60,7 @@ Java_chat_simplex_common_platform_CoreKt_chatMigrateInit(JNIEnv *env, __unused j
     jstring res = (*env)->NewStringUTF(env, chat_migrate_init(_dbPath, _dbKey, _confirm, &_ctrl));
     (*env)->ReleaseStringUTFChars(env, dbPath, _dbPath);
     (*env)->ReleaseStringUTFChars(env, dbKey, _dbKey);
-    (*env)->ReleaseStringUTFChars(env, dbKey, _confirm);
+    (*env)->ReleaseStringUTFChars(env, confirm, _confirm);
 
     // Creating array of Object's (boxed values can be passed, eg. Long instead of long)
     jobjectArray ret = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/Object"), NULL);

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

@@ -67,7 +67,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}/deps/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/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -7,13 +7,12 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
 import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.chat.ComposeState
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
-import chat.simplex.common.platform.AudioPlayer
-import chat.simplex.common.platform.chatController
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
@@ -1417,8 +1416,7 @@ data class ChatItem (
   val encryptedFile: Boolean? = if (file?.fileSource == null) null else file.fileSource.cryptoArgs != null
 
   val encryptLocalFile: Boolean
-    get() = file?.fileProtocol == FileProtocol.XFTP &&
-        content.msgContent !is MsgContent.MCVideo &&
+    get() = content.msgContent !is MsgContent.MCVideo &&
         chatController.appPrefs.privacyEncryptLocalFiles.get()
 
   val memberDisplayName: String? get() =
@@ -2113,6 +2111,23 @@ data class CryptoFile(
   val isAbsolutePath: Boolean
     get() = File(filePath).isAbsolute
 
+  @Transient
+  private var tmpFile: File? = null
+
+  fun createTmpFileIfNeeded(): File {
+    if (tmpFile == null) {
+      val tmpFile = File(tmpDir, UUID.randomUUID().toString())
+      tmpFile.deleteOnExit()
+      ChatModel.filesToDelete.add(tmpFile)
+      this.tmpFile = tmpFile
+    }
+    return tmpFile!!
+  }
+
+  fun deleteTmpFile() {
+    tmpFile?.delete()
+  }
+
   companion object {
     fun plain(f: String): CryptoFile = CryptoFile(f, null)
   }

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

@@ -2392,7 +2392,7 @@ data class NetCfg(
         sessionMode = TransportSessionMode.User,
         tcpConnectTimeout = 15_000_000,
         tcpTimeout = 10_000_000,
-        tcpTimeoutPerKb = 20_000,
+        tcpTimeoutPerKb = 30_000,
         tcpKeepAlive = KeepAliveOpts.defaults,
         smpPingInterval = 1200_000_000,
         smpPingCount = 3
@@ -2406,7 +2406,7 @@ data class NetCfg(
         sessionMode = TransportSessionMode.User,
         tcpConnectTimeout = 30_000_000,
         tcpTimeout = 20_000_000,
-        tcpTimeoutPerKb = 40_000,
+        tcpTimeoutPerKb = 60_000,
         tcpKeepAlive = KeepAliveOpts.defaults,
         smpPingInterval = 1200_000_000,
         smpPingCount = 3

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

@@ -7,6 +7,8 @@ import java.net.URI
 interface VideoPlayerInterface {
   data class PreviewAndDuration(val preview: ImageBitmap?, val duration: Long?, val timestamp: Long)
 
+  val uri: URI
+  val gallery: Boolean
   val soundEnabled: MutableState<Boolean>
   val brokenVideo: MutableState<Boolean>
   val videoPlaying: MutableState<Boolean>
@@ -20,18 +22,45 @@ interface VideoPlayerInterface {
   fun release(remove: Boolean)
 }
 
-expect class VideoPlayer: VideoPlayerInterface {
-  companion object {
-    fun getOrCreate(
-      uri: URI,
-      gallery: Boolean,
-      defaultPreview: ImageBitmap,
-      defaultDuration: Long,
-      soundEnabled: Boolean
-    ): VideoPlayer
-    fun enableSound(enable: Boolean, fileName: String?, gallery: Boolean): Boolean
-    fun release(uri: URI, gallery: Boolean, remove: Boolean)
-    fun stopAll()
-    fun releaseAll()
+expect class VideoPlayer(
+  uri: URI,
+  gallery: Boolean,
+  defaultPreview: ImageBitmap,
+  defaultDuration: Long,
+  soundEnabled: Boolean
+): VideoPlayerInterface
+
+object VideoPlayerHolder {
+  val players: MutableMap<Pair<URI, Boolean>, VideoPlayer> = mutableMapOf()
+  val previewsAndDurations: MutableMap<URI, VideoPlayerInterface.PreviewAndDuration> = mutableMapOf()
+
+  fun getOrCreate(
+    uri: URI,
+    gallery: Boolean,
+    defaultPreview: ImageBitmap,
+    defaultDuration: Long,
+    soundEnabled: Boolean
+  ): VideoPlayer =
+    players.getOrPut(uri to gallery) { VideoPlayer(uri, gallery, defaultPreview, defaultDuration, soundEnabled) }
+
+  fun enableSound(enable: Boolean, fileName: String?, gallery: Boolean): Boolean =
+    player(fileName, gallery)?.enableSound(enable) == true
+
+  private fun player(fileName: String?, gallery: Boolean): VideoPlayer? {
+    fileName ?: return null
+    return players.values.firstOrNull { player -> player.uri.path?.endsWith(fileName) == true && player.gallery == gallery }
+  }
+
+  fun release(uri: URI, gallery: Boolean, remove: Boolean) =
+    player(uri.path, gallery)?.release(remove).run { }
+
+  fun stopAll() {
+    players.values.forEach { it.stop() }
+  }
+
+  fun releaseAll() {
+    players.values.forEach { it.release(false) }
+    players.clear()
+    previewsAndDurations.clear()
   }
 }

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

@@ -394,6 +394,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
         }
       },
       onComposed,
+      developerTools = chatModel.controller.appPrefs.developerTools.get(),
     )
   }
 }
@@ -435,6 +436,7 @@ fun ChatLayout(
   changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
   onSearchValueChanged: (String) -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
+  developerTools: Boolean,
 ) {
   val scope = rememberCoroutineScope()
   val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
@@ -449,7 +451,7 @@ fun ChatLayout(
           val images = groups[true] ?: emptyList()
           val files = groups[false] ?: emptyList()
           if (images.isNotEmpty()) {
-            composeState.processPickedMedia(images, null)
+            CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(images, null) }
           } else if (files.isNotEmpty()) {
             composeState.processPickedFile(uris.first(), null)
           }
@@ -459,7 +461,7 @@ fun ChatLayout(
           tmpFile.deleteOnExit()
           chatModel.filesToDelete.add(tmpFile)
           val uri = tmpFile.toURI()
-          composeState.processPickedMedia(listOf(uri), null)
+          CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(listOf(uri), null) }
         },
         onText = {
           // Need to parse HTML in order to correctly display the content
@@ -500,7 +502,7 @@ fun ChatLayout(
               useLinkPreviews, linkMode, showMemberInfo, loadPrevMessages, deleteMessage,
               receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat,
               updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-              setReaction, showItemDetails, markRead, setFloatingButton, onComposed,
+              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools,
             )
           }
         }
@@ -695,6 +697,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
   setFloatingButton: (@Composable () -> Unit) -> Unit,
   onComposed: suspend (chatId: String) -> Unit,
+  developerTools: Boolean,
 ) {
   val listState = rememberLazyListState()
   val scope = rememberCoroutineScope()
@@ -737,7 +740,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
   }
   DisposableEffectOnGone(
     whenGone = {
-      VideoPlayer.releaseAll()
+      VideoPlayerHolder.releaseAll()
     }
   )
   LazyColumn(Modifier.align(Alignment.BottomCenter), state = listState, reverseLayout = true) {
@@ -831,7 +834,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
                     ) {
                       MemberImage(member)
                     }
-                    ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, getConnectedMemberNames = ::getConnectedMemberNames)
+                    ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, getConnectedMemberNames = ::getConnectedMemberNames, developerTools = developerTools)
                   }
                 }
               } else {
@@ -840,7 +843,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
                     .padding(start = 8.dp + MEMBER_IMAGE_SIZE + 4.dp, end = if (voiceWithTransparentBack) 12.dp else 66.dp)
                     .then(swipeableModifier)
                 ) {
-                  ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, getConnectedMemberNames = ::getConnectedMemberNames)
+                  ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, getConnectedMemberNames = ::getConnectedMemberNames, developerTools = developerTools)
                 }
               }
             }
@@ -850,7 +853,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
                 .padding(start = if (voiceWithTransparentBack) 12.dp else 104.dp, end = 12.dp)
                 .then(swipeableModifier)
             ) {
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
             }
           }
         } else { // direct message
@@ -861,7 +864,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
               end = if (sent || voiceWithTransparentBack) 12.dp else 76.dp,
             ).then(swipeableModifier)
           ) {
-            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
           }
         }
 
@@ -1300,6 +1303,7 @@ fun PreviewChatLayout() {
       changeNtfsState = { _, _ -> },
       onSearchValueChanged = {},
       onComposed = {},
+      developerTools = false,
     )
   }
 }
@@ -1368,6 +1372,7 @@ fun PreviewGroupChatLayout() {
       changeNtfsState = { _, _ -> },
       onSearchValueChanged = {},
       onComposed = {},
+      developerTools = false,
     )
   }
 }

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

@@ -176,7 +176,7 @@ fun MutableState<ComposeState>.processPickedFile(uri: URI?, text: String?) {
   }
 }
 
-fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text: String?) {
+suspend fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text: String?) {
   val content = ArrayList<UploadContent>()
   val imagesPreview = ArrayList<String>()
   uris.forEach { uri ->
@@ -237,7 +237,7 @@ fun ComposeView(
   val textStyle = remember(MaterialTheme.colors.isLight) { mutableStateOf(smallFont) }
   val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }
 
-  AttachmentSelection(composeState, attachmentOption, composeState::processPickedFile, composeState::processPickedMedia)
+  AttachmentSelection(composeState, attachmentOption, composeState::processPickedFile) { uris, text -> CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(uris, text) } }
 
   fun isSimplexLink(link: String): Boolean =
     link.startsWith("https://simplex.chat", true) || link.startsWith("http://simplex.chat", true)

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

@@ -71,7 +71,7 @@ fun CIFileView(
       when (file.fileStatus) {
         is CIFileStatus.RcvInvitation -> {
           if (fileSizeValid()) {
-            val encrypted = file.fileProtocol == FileProtocol.XFTP && chatController.appPrefs.privacyEncryptLocalFiles.get()
+            val encrypted = chatController.appPrefs.privacyEncryptLocalFiles.get()
             receiveFile(file.fileId, encrypted)
           } else {
             AlertManager.shared.showAlertMsg(

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

@@ -50,7 +50,7 @@ fun CIVideoView(
       })
     } else {
       Box {
-        ImageView(preview, showMenu, onClick = {
+        VideoPreviewImageView(preview, onClick = {
           if (file != null) {
             when (file.fileStatus) {
               CIFileStatus.RcvInvitation ->
@@ -75,7 +75,10 @@ fun CIVideoView(
               else -> {}
             }
           }
-        })
+        },
+          onLongClick = {
+            showMenu.value = true
+          })
         if (file != null) {
           DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
         }
@@ -90,7 +93,7 @@ fun CIVideoView(
 
 @Composable
 private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defaultDuration: Long, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
-  val player = remember(uri) { VideoPlayer.getOrCreate(uri, false, defaultPreview, defaultDuration, true) }
+  val player = remember(uri) { VideoPlayerHolder.getOrCreate(uri, false, defaultPreview, defaultDuration, true) }
   val videoPlaying = remember(uri.path) { player.videoPlaying }
   val progress = remember(uri.path) { player.progress }
   val duration = remember(uri.path) { player.duration }
@@ -111,6 +114,7 @@ private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defau
       stop()
     }
   }
+  val onLongClick = { showMenu.value = true }
   Box {
     val windowWidth = LocalWindowWidth()
     val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else DEFAULT_MAX_IMAGE_WIDTH }
@@ -118,12 +122,12 @@ private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defau
       player,
       width,
       onClick = onClick,
-      onLongClick = { showMenu.value = true },
+      onLongClick = onLongClick,
       stop
     )
     if (showPreview.value) {
-      ImageView(preview, showMenu, onClick)
-      PlayButton(brokenVideo, onLongClick =  { showMenu.value = true }, play)
+      VideoPreviewImageView(preview, onClick, onLongClick)
+      PlayButton(brokenVideo, onLongClick = onLongClick, if (appPlatform.isAndroid) play else onClick)
     }
     DurationProgress(file, videoPlaying, duration, progress/*, soundEnabled*/)
   }
@@ -201,7 +205,7 @@ private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, durat
 }
 
 @Composable
-private fun ImageView(preview: ImageBitmap, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
+fun VideoPreviewImageView(preview: ImageBitmap, onClick: () -> Unit, onLongClick: () -> Unit) {
   val windowWidth = LocalWindowWidth()
   val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else DEFAULT_MAX_IMAGE_WIDTH }
   Image(
@@ -210,10 +214,10 @@ private fun ImageView(preview: ImageBitmap, showMenu: MutableState<Boolean>, onC
     modifier = Modifier
       .width(width)
       .combinedClickable(
-        onLongClick = { showMenu.value = true },
+        onLongClick = onLongClick,
         onClick = onClick
       )
-      .onRightClick { showMenu.value = true },
+      .onRightClick(onLongClick),
     contentScale = ContentScale.FillWidth,
   )
 }

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

@@ -64,6 +64,7 @@ fun ChatItemView(
   setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
   showItemDetails: (ChatInfo, ChatItem) -> Unit,
   getConnectedMemberNames: (() -> List<String>)? = null,
+  developerTools: Boolean,
 ) {
   val uriHandler = LocalUriHandler.current
   val sent = cItem.chatDir.sent
@@ -343,7 +344,11 @@ fun ChatItemView(
           is CIContent.RcvDeleted -> DeletedItem()
           is CIContent.SndCall -> CallItem(c.status, c.duration)
           is CIContent.RcvCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvIntegrityError -> IntegrityErrorItemView(c.msgError, cItem, cInfo.timedMessagesTTL)
+          is CIContent.RcvIntegrityError -> if (developerTools) {
+            IntegrityErrorItemView(c.msgError, cItem, cInfo.timedMessagesTTL)
+          } else {
+            Box(Modifier.size(0.dp)) {}
+          }
           is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cInfo, cItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember)
           is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
           is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
@@ -583,6 +588,7 @@ fun PreviewChatItemView() {
       findModelMember = { null },
       setReaction = { _, _, _, _ -> },
       showItemDetails = { _, _ -> },
+      developerTools = false,
     )
   }
 }
@@ -613,6 +619,7 @@ fun PreviewChatItemViewDeletedContent() {
       findModelMember = { null },
       setReaction = { _, _, _, _ -> },
       showItemDetails = { _, _ -> },
+      developerTools = false,
     )
   }
 }

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

@@ -46,9 +46,11 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
   val scope = rememberCoroutineScope()
   val playersToRelease = rememberSaveable { mutableSetOf<URI>() }
   DisposableEffectOnGone(
-    whenGone = { playersToRelease.forEach { VideoPlayer.release(it, true, true) } }
+    whenGone = { playersToRelease.forEach { VideoPlayerHolder.release(it, true, true) } }
   )
-  HorizontalPager(pageCount = remember { provider.totalMediaSize }.value, state = pagerState) { index ->
+
+  @Composable
+  fun Content(index: Int) {
     Column(
       Modifier
         .fillMaxSize()
@@ -127,7 +129,7 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
           FullScreenImageView(modifier, data, imageBitmap)
         } else if (media is ProviderMedia.Video) {
           val preview = remember(media.uri.path) { base64ToBitmap(media.preview) }
-          VideoView(modifier, media.uri, preview, index == settledCurrentPage)
+          VideoView(modifier, media.uri, preview, index == settledCurrentPage, close)
           DisposableEffect(Unit) {
             onDispose { playersToRelease.add(media.uri) }
           }
@@ -135,14 +137,19 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
       }
     }
   }
+  if (appPlatform.isAndroid) {
+    HorizontalPager(pageCount = remember { provider.totalMediaSize }.value, state = pagerState) { index -> Content(index) }
+  } else {
+    Content(pagerState.currentPage)
+  }
 }
 
 @Composable
 expect fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap: ImageBitmap)
 
 @Composable
-private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap, currentPage: Boolean) {
-  val player = remember(uri) { VideoPlayer.getOrCreate(uri, true, defaultPreview, 0L, true) }
+private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap, currentPage: Boolean, close: () -> Unit) {
+  val player = remember(uri) { VideoPlayerHolder.getOrCreate(uri, true, defaultPreview, 0L, true) }
   val isCurrentPage = rememberUpdatedState(currentPage)
   val play = {
     player.play(true)
@@ -154,13 +161,16 @@ private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap,
     player.enableSound(true)
     snapshotFlow { isCurrentPage.value }
       .distinctUntilChanged()
-      .collect { if (it) play() else stop() }
+      .collect {
+        // Do not autoplay on desktop because it needs workaround
+        if (it && appPlatform.isAndroid) play() else if (!it) stop()
+      }
   }
 
   Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    FullScreenVideoView(player, modifier)
+    FullScreenVideoView(player, modifier, close)
   }
 }
 
 @Composable
-expect fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier)
+expect fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier, close: () -> Unit)

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

@@ -117,9 +117,7 @@ fun groupChatAction(groupInfo: GroupInfo, chatModel: ChatModel) {
 suspend fun openDirectChat(contactId: Long, chatModel: ChatModel) {
   val chat = chatModel.controller.apiGetChat(ChatType.Direct, contactId)
   if (chat != null) {
-    chatModel.chatItems.clear()
-    chatModel.chatItems.addAll(chat.chatItems)
-    chatModel.chatId.value = "@$contactId"
+    openChat(chat, chatModel)
   }
 }
 
@@ -139,11 +137,13 @@ suspend fun openChat(chat: Chat, chatModel: ChatModel) {
 suspend fun apiLoadPrevMessages(chatInfo: ChatInfo, chatModel: ChatModel, beforeChatItemId: Long, search: String) {
   val pagination = ChatPagination.Before(beforeChatItemId, ChatPagination.PRELOAD_COUNT)
   val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, pagination, search) ?: return
+  if (chatModel.chatId.value != chat.id) return
   chatModel.chatItems.addAll(0, chat.chatItems)
 }
 
 suspend fun apiFindMessages(chatInfo: ChatInfo, chatModel: ChatModel, search: String) {
   val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, search = search) ?: return
+  if (chatModel.chatId.value != chat.id) return
   chatModel.chatItems.clear()
   chatModel.chatItems.addAll(0, chat.chatItems)
 }

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

@@ -66,6 +66,8 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
       if (chatModel.chatId.value != null) {
         ModalManager.end.closeModalsExceptFirst()
       }
+      AudioPlayer.stop()
+      VideoPlayerHolder.stopAll()
     }
   }
   val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp

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

@@ -267,7 +267,7 @@ fun getMaxFileSize(fileProtocol: FileProtocol): Long {
   }
 }
 
-expect fun getBitmapFromVideo(uri: URI, timestamp: Long? = null, random: Boolean = true): VideoPlayerInterface.PreviewAndDuration
+expect suspend fun getBitmapFromVideo(uri: URI, timestamp: Long? = null, random: Boolean = true): VideoPlayerInterface.PreviewAndDuration
 
 fun Color.darker(factor: Float = 0.1f): Color =
   Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)

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

@@ -164,9 +164,10 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
         )
       }
       SectionItemView {
+        // can't be higher than 130ms to avoid overflow on 32bit systems
         TimeoutSettingRow(
           stringResource(MR.strings.network_option_protocol_timeout_per_kb), networkTCPTimeoutPerKb,
-          listOf(10_000, 20_000, 40_000, 75_000, 100_000), secondsLabel
+          listOf(15_000, 30_000, 60_000, 90_000, 120_000), secondsLabel
         )
       }
       SectionItemView {

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

@@ -29,6 +29,10 @@ fun initApp() {
   //testCrypto()
 }
 
+fun discoverVlcLibs(path: String) {
+  uk.co.caprica.vlcj.binding.LibC.INSTANCE.setenv("VLC_PLUGIN_PATH", path, 1)
+}
+
 private fun applyAppLocale() {
   val lang = ChatController.appPrefs.appLanguage.get()
   if (lang == null || lang == Locale.getDefault().language) return

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

@@ -21,6 +21,8 @@ actual val agentDatabaseFileName: String = "simplex_v1_agent.db"
 
 actual val databaseExportDir: File = tmpDir
 
+val vlcDir: File = File(System.getProperty("java.io.tmpdir") + File.separator + "simplex-vlc").also { it.deleteOnExit() }
+
 actual fun desktopOpenDatabaseDir() {
   if (Desktop.isDesktopSupported()) {
     try {

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

@@ -1,9 +1,17 @@
 package chat.simplex.common.platform
 
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
 import chat.simplex.common.model.*
-import chat.simplex.common.views.usersettings.showInDevelopingAlert
-import kotlinx.coroutines.CoroutineScope
+import chat.simplex.common.views.helpers.AlertManager
+import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.res.MR
+import kotlinx.coroutines.*
+import uk.co.caprica.vlcj.player.base.MediaPlayer
+import uk.co.caprica.vlcj.player.base.State
+import uk.co.caprica.vlcj.player.component.AudioPlayerComponent
+import java.io.File
+import kotlin.math.max
 
 actual class RecorderNative: RecorderInterface {
   override fun start(onProgressUpdate: (position: Int?, finished: Boolean) -> Unit): String {
@@ -18,36 +26,187 @@ actual class RecorderNative: RecorderInterface {
 }
 
 actual object AudioPlayer: AudioPlayerInterface {
-  override fun play(fileSource: CryptoFile, audioPlaying: MutableState<Boolean>, progress: MutableState<Int>, duration: MutableState<Int>, resetOnEnd: Boolean) {
-    showInDevelopingAlert()
+  val player by lazy { AudioPlayerComponent().mediaPlayer() }
+
+  // Filepath: String, onProgressUpdate
+  private val currentlyPlaying: MutableState<Pair<CryptoFile, (position: Int?, state: TrackState) -> Unit>?> = mutableStateOf(null)
+  private var progressJob: Job? = null
+
+  enum class TrackState {
+    PLAYING, PAUSED, REPLACED
+  }
+
+  // Returns real duration of the track
+  private fun start(fileSource: CryptoFile, seek: Int? = null, onProgressUpdate: (position: Int?, state: TrackState) -> Unit): Int? {
+    val absoluteFilePath = getAppFilePath(fileSource.filePath)
+    if (!File(absoluteFilePath).exists()) {
+      Log.e(TAG, "No such file: ${fileSource.filePath}")
+      return null
+    }
+
+    VideoPlayerHolder.stopAll()
+    RecorderInterface.stopRecording?.invoke()
+    val current = currentlyPlaying.value
+    if (current == null || current.first != fileSource) {
+      stopListener()
+      player.stop()
+      runCatching {
+        if (fileSource.cryptoArgs != null) {
+          val tmpFile = fileSource.createTmpFileIfNeeded()
+          decryptCryptoFile(absoluteFilePath, fileSource.cryptoArgs, tmpFile.absolutePath)
+          player.media().prepare("file://${tmpFile.absolutePath}")
+        } else {
+          player.media().prepare("file://$absoluteFilePath")
+        }
+      }.onFailure {
+        Log.e(TAG, it.stackTraceToString())
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.unknown_error), it.message)
+        return null
+      }
+    }
+    if (seek != null) player.seekTo(seek)
+    player.start()
+    currentlyPlaying.value = fileSource to onProgressUpdate
+    progressJob = CoroutineScope(Dispatchers.Default).launch {
+      onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+      while(isActive && (player.isPlaying || player.status().state() == State.OPENING)) {
+        // Even when current position is equal to duration, the player has isPlaying == true for some time,
+        // so help to make the playback stopped in UI immediately
+        if (player.currentPosition == player.duration) {
+          onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+          break
+        }
+        delay(50)
+        onProgressUpdate(player.currentPosition, TrackState.PLAYING)
+      }
+      onProgressUpdate(null, TrackState.PAUSED)
+      currentlyPlaying.value?.first?.deleteTmpFile()
+    }
+    return player.duration
+  }
+
+  private fun pause(): Int {
+    progressJob?.cancel()
+    progressJob = null
+    val position = player.currentPosition
+    player.pause()
+    return position
   }
 
   override fun stop() {
-    /*LALAL*/
+    if (currentlyPlaying.value == null) return
+    player.stop()
+    stopListener()
   }
 
-  override fun stop(item: ChatItem) {
-    /*LALAL*/
-  }
+  override fun stop(item: ChatItem) = stop(item.file?.fileName)
 
+  // FileName or filePath are ok
   override fun stop(fileName: String?) {
-    TODO("Not yet implemented")
+    if (fileName != null && currentlyPlaying.value?.first?.filePath?.endsWith(fileName) == true) {
+      stop()
+    }
+  }
+
+  private fun stopListener() {
+    val afterCoroutineCancel: CompletionHandler = {
+      // Notify prev audio listener about stop
+      currentlyPlaying.value?.second?.invoke(null, TrackState.REPLACED)
+      currentlyPlaying.value?.first?.deleteTmpFile()
+      currentlyPlaying.value = null
+    }
+    /** Preventing race by calling a code AFTER coroutine ends, so [TrackState] will be:
+     * [TrackState.PLAYING] -> [TrackState.PAUSED] -> [TrackState.REPLACED] (in this order)
+     * */
+    if (progressJob != null) {
+      progressJob?.invokeOnCompletion(afterCoroutineCancel)
+    } else {
+      afterCoroutineCancel(null)
+    }
+    progressJob?.cancel()
+    progressJob = null
+  }
+
+  override fun play(
+    fileSource: CryptoFile,
+    audioPlaying: MutableState<Boolean>,
+    progress: MutableState<Int>,
+    duration: MutableState<Int>,
+    resetOnEnd: Boolean,
+  ) {
+    if (progress.value == duration.value) {
+      progress.value = 0
+    }
+    val realDuration = start(fileSource, progress.value) { pro, state ->
+      if (pro != null) {
+        progress.value = pro
+      }
+      if (pro == null || pro == duration.value) {
+        audioPlaying.value = false
+        if (pro == duration.value) {
+          progress.value = if (resetOnEnd) 0 else duration.value
+        } else if (state == TrackState.REPLACED) {
+          progress.value = 0
+        }
+      }
+    }
+    audioPlaying.value = realDuration != null
+    // Update to real duration instead of what was received in ChatInfo
+    realDuration?.let { duration.value = it }
   }
 
   override fun pause(audioPlaying: MutableState<Boolean>, pro: MutableState<Int>) {
-    TODO("Not yet implemented")
+    pro.value = pause()
+    audioPlaying.value = false
   }
 
   override fun seekTo(ms: Int, pro: MutableState<Int>, filePath: String?) {
-    /*LALAL*/
+    pro.value = ms
+    if (currentlyPlaying.value?.first?.filePath == filePath) {
+      player.seekTo(ms)
+    }
   }
 
   override fun duration(unencryptedFilePath: String): Int? {
-    /*LALAL*/
-    return null
+    var res: Int? = null
+    try {
+      val helperPlayer = AudioPlayerComponent().mediaPlayer()
+      helperPlayer.media().startPaused("file://$unencryptedFilePath")
+      res = helperPlayer.duration
+      helperPlayer.stop()
+      helperPlayer.release()
+    } catch (e: Exception) {
+      Log.e(TAG, e.stackTraceToString())
+    }
+    return res
   }
 }
 
+val MediaPlayer.isPlaying: Boolean
+  get() = status().isPlaying
+
+fun MediaPlayer.seekTo(time: Int) {
+  controls().setTime(time.toLong())
+}
+
+fun MediaPlayer.start() {
+  controls().start()
+}
+
+fun MediaPlayer.pause() {
+  controls().pause()
+}
+
+fun MediaPlayer.stop() {
+  controls().stop()
+}
+
+private val MediaPlayer.currentPosition: Int
+  get() = max(0, status().time().toInt())
+
+val MediaPlayer.duration: Int
+  get() = media().info().duration().toInt()
+
 actual object SoundPlayer: SoundPlayerInterface {
   override fun start(scope: CoroutineScope, sound: Boolean) { /*LALAL*/ }
   override fun stop() { /*LALAL*/ }

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

@@ -3,51 +3,214 @@ package chat.simplex.common.platform
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.ImageBitmap
-import chat.simplex.common.views.usersettings.showInDevelopingAlert
+import androidx.compose.ui.graphics.toComposeImageBitmap
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import kotlinx.coroutines.*
+import uk.co.caprica.vlcj.player.base.MediaPlayer
+import uk.co.caprica.vlcj.player.component.CallbackMediaPlayerComponent
+import uk.co.caprica.vlcj.player.component.EmbeddedMediaPlayerComponent
+import java.awt.Component
+import java.io.File
 import java.net.URI
+import kotlin.math.max
 
-actual class VideoPlayer: VideoPlayerInterface {
-  actual companion object {
-    actual fun getOrCreate(
-      uri: URI,
-      gallery: Boolean,
-      defaultPreview: ImageBitmap,
-      defaultDuration: Long,
-      soundEnabled: Boolean
-    ): VideoPlayer = VideoPlayer().also {
-      it.preview.value = defaultPreview
-      it.duration.value = defaultDuration
-      it.soundEnabled.value = soundEnabled
-    }
-    actual fun enableSound(enable: Boolean, fileName: String?, gallery: Boolean): Boolean { /*TODO*/ return false }
-    actual fun release(uri: URI, gallery: Boolean, remove: Boolean) { /*TODO*/ }
-    actual fun stopAll() { /*LALAL*/ }
-    actual fun releaseAll() { /*LALAL*/ }
-  }
-
+actual class VideoPlayer actual constructor(
+  override val uri: URI,
+  override val gallery: Boolean,
+  private val defaultPreview: ImageBitmap,
+  defaultDuration: Long,
+  soundEnabled: Boolean
+): VideoPlayerInterface {
   override val soundEnabled: MutableState<Boolean> = mutableStateOf(false)
   override val brokenVideo: MutableState<Boolean> = mutableStateOf(false)
   override val videoPlaying: MutableState<Boolean> = mutableStateOf(false)
   override val progress: MutableState<Long> = mutableStateOf(0L)
   override val duration: MutableState<Long> = mutableStateOf(0L)
-  override val preview: MutableState<ImageBitmap> = mutableStateOf(ImageBitmap(0, 0))
+  override val preview: MutableState<ImageBitmap> = mutableStateOf(defaultPreview)
+
+  val mediaPlayerComponent = initializeMediaPlayerComponent()
+  val player by lazy { mediaPlayerComponent.mediaPlayer() }
+
+  init {
+    withBGApi {
+      setPreviewAndDuration()
+    }
+  }
+
+  private val currentVolume: Int by lazy { player.audio().volume() }
+  private var isReleased: Boolean = false
+
+  private val listener: MutableState<((position: Long?, state: TrackState) -> Unit)?> = mutableStateOf(null)
+  private var progressJob: Job? = null
+
+  enum class TrackState {
+    PLAYING, PAUSED, STOPPED
+  }
+
+  private fun start(seek: Long? = null, onProgressUpdate: (position: Long?, state: TrackState) -> Unit): Boolean {
+    val filepath = getAppFilePath(uri)
+    if (filepath == null || !File(filepath).exists()) {
+      Log.e(TAG, "No such file: $uri")
+      brokenVideo.value = true
+      return false
+    }
+
+    if (soundEnabled.value)  {
+      RecorderInterface.stopRecording?.invoke()
+    }
+    AudioPlayer.stop()
+    VideoPlayerHolder.stopAll()
+    val playerFilePath = uri.toString().replaceFirst("file:", "file://")
+    if (listener.value == null) {
+      runCatching {
+        player.media().prepare(playerFilePath)
+        if (seek != null) {
+          player.seekTo(seek.toInt())
+        }
+      }.onFailure {
+        Log.e(TAG, it.stackTraceToString())
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.unknown_error), it.message)
+        brokenVideo.value = true
+        return false
+      }
+    }
+    player.start()
+    if (seek != null) player.seekTo(seek.toInt())
+    if (!player.isPlaying) {
+      // Can happen when video file is broken
+      AlertManager.shared.showAlertMsg(generalGetString(MR.strings.unknown_error))
+      brokenVideo.value = true
+      return false
+    }
+    listener.value = onProgressUpdate
+    // Player can only be accessed in one specific thread
+    progressJob = CoroutineScope(Dispatchers.Main).launch {
+      onProgressUpdate(player.currentPosition.toLong(), TrackState.PLAYING)
+      while (isActive && !isReleased && player.isPlaying) {
+        // Even when current position is equal to duration, the player has isPlaying == true for some time,
+        // so help to make the playback stopped in UI immediately
+        if (player.currentPosition == player.duration) {
+          onProgressUpdate(player.currentPosition.toLong(), TrackState.PLAYING)
+          break
+        }
+        delay(50)
+        onProgressUpdate(player.currentPosition.toLong(), TrackState.PLAYING)
+      }
+      if (isActive && !isReleased) {
+        onProgressUpdate(player.currentPosition.toLong(), TrackState.PAUSED)
+      }
+      onProgressUpdate(null, TrackState.PAUSED)
+    }
+
+    return true
+  }
 
   override fun stop() {
-    /*TODO*/
+    if (isReleased || !videoPlaying.value) return
+    player.controls().stop()
+    stopListener()
+  }
+
+  private fun stopListener() {
+    val afterCoroutineCancel: CompletionHandler = {
+      // Notify prev video listener about stop
+      listener.value?.invoke(null, TrackState.STOPPED)
+    }
+    /** Preventing race by calling a code AFTER coroutine ends, so [TrackState] will be:
+     * [TrackState.PLAYING] -> [TrackState.PAUSED] -> [TrackState.STOPPED] (in this order)
+     * */
+    if (progressJob != null) {
+      progressJob?.invokeOnCompletion(afterCoroutineCancel)
+    } else {
+      afterCoroutineCancel(null)
+    }
+    progressJob?.cancel()
+    progressJob = null
   }
 
   override fun play(resetOnEnd: Boolean) {
-    if (appPlatform.isDesktop) {
-      showInDevelopingAlert()
+    if (progress.value == duration.value) {
+      progress.value = 0
+    }
+    videoPlaying.value = start(progress.value) { pro, _ ->
+      if (pro != null) {
+        progress.value = pro
+      }
+      if ((pro == null || pro == duration.value) && duration.value != 0L) {
+        videoPlaying.value = false
+        if (pro == duration.value) {
+          progress.value = if (resetOnEnd) 0 else duration.value
+        }/* else if (state == TrackState.STOPPED) {
+          progress.value = 0 //
+        }*/
+      }
     }
   }
 
   override fun enableSound(enable: Boolean): Boolean {
-    /*TODO*/
-    return false
+    if (isReleased) return false
+    if (soundEnabled.value == enable) return false
+    soundEnabled.value = enable
+    player.audio().setVolume(if (enable) currentVolume else 0)
+    return true
   }
 
-  override fun release(remove: Boolean) {
-    /*TODO*/
+  override fun release(remove: Boolean) { withApi {
+    if (isReleased) return@withApi
+    isReleased = true
+    // TODO
+    /** [player.release] freezes thread for some reason. It happens periodically. So doing this we don't see the freeze, but it's still there */
+    if (player.isPlaying) player.stop()
+    CoroutineScope(Dispatchers.IO).launch { player.release() }
+    if (remove) {
+      VideoPlayerHolder.players.remove(uri to gallery)
+    }
+  }}
+
+  private val MediaPlayer.currentPosition: Int
+    get() = if (isReleased) 0 else max(0, player.status().time().toInt())
+
+  private suspend fun setPreviewAndDuration() {
+    // It freezes main thread, doing it in IO thread
+    CoroutineScope(Dispatchers.IO).launch {
+      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(defaultPreview, uri) }
+      withContext(Dispatchers.Main) {
+        preview.value = previewAndDuration.preview ?: defaultPreview
+        duration.value = (previewAndDuration.duration ?: 0)
+      }
+    }
+  }
+
+  private fun initializeMediaPlayerComponent(): Component {
+    return if (desktopPlatform.isMac()) {
+      CallbackMediaPlayerComponent()
+    } else {
+      EmbeddedMediaPlayerComponent()
+    }
+  }
+
+  private fun Component.mediaPlayer() = when (this) {
+    is CallbackMediaPlayerComponent -> mediaPlayer()
+    is EmbeddedMediaPlayerComponent -> mediaPlayer()
+    else -> error("mediaPlayer() can only be called on vlcj player components")
+  }
+
+  companion object {
+    suspend fun getBitmapFromVideo(defaultPreview: ImageBitmap?, uri: URI?): VideoPlayerInterface.PreviewAndDuration {
+      val player = CallbackMediaPlayerComponent().mediaPlayer()
+      if (uri == null || !File(uri.rawPath).exists()) {
+        return VideoPlayerInterface.PreviewAndDuration(preview = defaultPreview, timestamp = 0L, duration = 0L)
+      }
+      player.media().startPaused(uri.toString().replaceFirst("file:", "file://"))
+      val start = System.currentTimeMillis()
+      while (player.snapshots()?.get() == null && start + 5000 > System.currentTimeMillis()) {
+        delay(10)
+      }
+      val preview = player.snapshots()?.get()?.toComposeImageBitmap()
+      val duration = player.duration.toLong()
+      CoroutineScope(Dispatchers.IO).launch { player.release() }
+      return VideoPlayerInterface.PreviewAndDuration(preview = preview, timestamp = 0L, duration = duration)
+    }
   }
 }

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/CIVideoView.desktop.kt

@@ -6,9 +6,7 @@ import androidx.compose.ui.unit.Dp
 import chat.simplex.common.platform.VideoPlayer
 
 @Composable
-actual fun PlayerView(player: VideoPlayer, width: Dp, onClick: () -> Unit, onLongClick: () -> Unit, stop: () -> Unit) {
-  /* LALAL */
-}
+actual fun PlayerView(player: VideoPlayer, width: Dp, onClick: () -> Unit, onLongClick: () -> Unit, stop: () -> Unit) {}
 
 @Composable
 actual fun LocalWindowWidth(): Dp {

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

@@ -1,14 +1,23 @@
 package chat.simplex.common.views.chat.item
 
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.Composable
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.awt.SwingPanel
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.layout.ContentScale
-import chat.simplex.common.platform.VideoPlayer
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.platform.*
+import chat.simplex.common.simplexWindowState
 import chat.simplex.common.views.helpers.getBitmapFromByteArray
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.delay
+import kotlin.math.max
 
 @Composable
 actual fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap: ImageBitmap) {
@@ -20,6 +29,43 @@ actual fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap:
   )
 }
 @Composable
-actual fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier) {
-
+actual fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier, close: () -> Unit) {
+  // Workaround. Without changing size of the window the screen flashes a lot even if it's not being recomposed
+  LaunchedEffect(Unit) {
+    simplexWindowState.windowState.size = simplexWindowState.windowState.size.copy(width = simplexWindowState.windowState.size.width + 1.dp)
+    delay(50)
+    player.play(true)
+    simplexWindowState.windowState.size = simplexWindowState.windowState.size.copy(width = simplexWindowState.windowState.size.width - 1.dp)
+  }
+  Box {
+    Box(Modifier.fillMaxSize().padding(bottom = 50.dp)) {
+      val factory = remember { { player.mediaPlayerComponent } }
+      SwingPanel(
+        background = Color.Transparent,
+        modifier = Modifier,
+        factory = factory
+      )
+    }
+    Controls(player, close)
+  }
+}
+
+@Composable
+private fun BoxScope.Controls(player: VideoPlayer, close: () -> Unit) {
+  val playing = remember(player) { player.videoPlaying }
+  val progress = remember(player) { player.progress }
+  val duration = remember(player) { player.duration }
+  Row(Modifier.fillMaxWidth().align(Alignment.BottomCenter).height(50.dp)) {
+    IconButton(onClick = { if (playing.value) player.player.pause() else player.play(true) },) {
+      Icon(painterResource(if (playing.value) MR.images.ic_pause_filled else MR.images.ic_play_arrow_filled), null, Modifier.size(30.dp), tint = MaterialTheme.colors.primary)
+    }
+    Slider(
+      value = progress.value.toFloat() / max(0.0001f, duration.value.toFloat()),
+      onValueChange = { player.player.seekTo((it * duration.value).toInt()) },
+      modifier = Modifier.fillMaxWidth().weight(1f)
+    )
+    IconButton(onClick = close,) {
+      Icon(painterResource(MR.images.ic_close), null, Modifier.size(30.dp), tint = MaterialTheme.colors.primary)
+    }
+  }
 }

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/ChooseAttachmentView.desktop.kt

@@ -11,10 +11,14 @@ import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
 actual fun ChooseAttachmentButtons(attachmentOption: MutableState<AttachmentOption?>, hide: () -> Unit) {
-  ActionButton(Modifier.fillMaxWidth(0.5f), null, stringResource(MR.strings.gallery_image_button), icon = painterResource(MR.images.ic_add_photo)) {
+  ActionButton(Modifier.fillMaxWidth(0.33f), null, stringResource(MR.strings.gallery_image_button), icon = painterResource(MR.images.ic_add_photo)) {
     attachmentOption.value = AttachmentOption.GalleryImage
     hide()
   }
+  ActionButton(Modifier.fillMaxWidth(0.5f), null, stringResource(MR.strings.gallery_video_button), icon = painterResource(MR.images.ic_smart_display)) {
+    attachmentOption.value = AttachmentOption.GalleryVideo
+    hide()
+  }
   ActionButton(Modifier.fillMaxWidth(1f), null, stringResource(MR.strings.choose_file), icon = painterResource(MR.images.ic_note_add)) {
     attachmentOption.value = AttachmentOption.File
     hide()

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

@@ -132,9 +132,8 @@ actual suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean)
   } else null
 }
 
-actual fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
-  // LALAL
-  return VideoPlayerInterface.PreviewAndDuration(preview = null, timestamp = 0L, duration = 0L)
+actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
+  return VideoPlayer.getBitmapFromVideo(null, uri)
 }
 
 @OptIn(ExperimentalEncodingApi::class)

apps/multiplatform/desktop/build.gradle.kts

@@ -1,6 +1,5 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
-import java.util.*
 
 plugins {
   kotlin("multiplatform")
@@ -22,6 +21,7 @@ kotlin {
       dependencies {
         implementation(project(":common"))
         implementation(compose.desktop.currentOs)
+        implementation("net.java.dev.jna:jna:5.13.0")
       }
     }
     val jvmTest by getting
@@ -33,16 +33,23 @@ compose {
   desktop {
     application {
       // For debugging via VisualVM
-      /*jvmArgs += listOf(
-        "-Dcom.sun.management.jmxremote.port=8080",
-        "-Dcom.sun.management.jmxremote.ssl=false",
-        "-Dcom.sun.management.jmxremote.authenticate=false"
-      )*/
+      val debugJava = false
+      if (debugJava) {
+        jvmArgs += listOf(
+          "-Dcom.sun.management.jmxremote.port=8080",
+          "-Dcom.sun.management.jmxremote.ssl=false",
+          "-Dcom.sun.management.jmxremote.authenticate=false"
+        )
+      }
       mainClass = "chat.simplex.desktop.MainKt"
       nativeDistributions {
         // For debugging via VisualVM
-        //modules("jdk.zipfs", "jdk.management.agent")
-        modules("jdk.zipfs")
+        if (debugJava) {
+          modules("jdk.zipfs", "jdk.unsupported", "jdk.management.agent")
+        } else {
+          // 'jdk.unsupported' is for vlcj
+          modules("jdk.zipfs", "jdk.unsupported")
+        }
         //includeAllModules = true
         outputBaseDir.set(project.file("../release"))
         targetFormats(
@@ -145,6 +152,7 @@ tasks.named("compileJava") {
 afterEvaluate {
   tasks.create("cmakeBuildAndCopy") {
     dependsOn("cmakeBuild")
+    val copyDetails = mutableMapOf<String, ArrayList<FileCopyDetails>>()
     doLast {
       copy {
         from("${project(":desktop").buildDir}/cmake/main/linux-amd64", "$cppPath/desktop/libs/linux-x86_64", "$cppPath/desktop/libs/linux-x86_64/deps")
@@ -156,6 +164,14 @@ afterEvaluate {
         includeEmptyDirs = false
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
       }
+      copy {
+        val destinationDir = "src/jvmMain/resources/libs/linux-x86_64/vlc"
+        from("$cppPath/desktop/libs/linux-x86_64/deps/vlc")
+        into(destinationDir)
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        copyIfNeeded(destinationDir, copyDetails)
+      }
       copy {
         from("${project(":desktop").buildDir}/cmake/main/linux-aarch64", "$cppPath/desktop/libs/linux-aarch64", "$cppPath/desktop/libs/linux-aarch64/deps")
         into("src/jvmMain/resources/libs/linux-aarch64")
@@ -166,6 +182,14 @@ afterEvaluate {
         includeEmptyDirs = false
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
       }
+      copy {
+        val destinationDir = "src/jvmMain/resources/libs/linux-aarch64/vlc"
+        from("$cppPath/desktop/libs/linux-aarch64/deps/vlc")
+        into(destinationDir)
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        copyIfNeeded(destinationDir, copyDetails)
+      }
       copy {
         from("${project(":desktop").buildDir}/cmake/main/win-amd64", "$cppPath/desktop/libs/windows-x86_64", "$cppPath/desktop/libs/windows-x86_64/deps")
         into("src/jvmMain/resources/libs/windows-x86_64")
@@ -176,6 +200,14 @@ afterEvaluate {
         includeEmptyDirs = false
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
       }
+      copy {
+        val destinationDir = "src/jvmMain/resources/libs/windows-x86_64/vlc"
+        from("$cppPath/desktop/libs/windows-x86_64/deps/vlc")
+        into(destinationDir)
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        copyIfNeeded(destinationDir, copyDetails)
+      }
       copy {
         from("${project(":desktop").buildDir}/cmake/main/mac-x86_64", "$cppPath/desktop/libs/mac-x86_64", "$cppPath/desktop/libs/mac-x86_64/deps")
         into("src/jvmMain/resources/libs/mac-x86_64")
@@ -186,6 +218,14 @@ afterEvaluate {
         includeEmptyDirs = false
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
       }
+      copy {
+        val destinationDir = "src/jvmMain/resources/libs/mac-x86_64/vlc"
+        from("$cppPath/desktop/libs/mac-x86_64/deps/vlc")
+        into(destinationDir)
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        copyIfNeeded(destinationDir, copyDetails)
+      }
       copy {
         from("${project(":desktop").buildDir}/cmake/main/mac-aarch64", "$cppPath/desktop/libs/mac-aarch64", "$cppPath/desktop/libs/mac-aarch64/deps")
         into("src/jvmMain/resources/libs/mac-aarch64")
@@ -196,6 +236,39 @@ afterEvaluate {
         includeEmptyDirs = false
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
       }
+      copy {
+        val destinationDir = "src/jvmMain/resources/libs/mac-aarch64/vlc"
+        from("$cppPath/desktop/libs/mac-aarch64/deps/vlc")
+        into(destinationDir)
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        copyIfNeeded(destinationDir, copyDetails)
+      }
+    }
+    afterEvaluate {
+      doLast {
+        copyDetails.forEach { (destinationDir, details) ->
+          details.forEach { detail ->
+            val target = File(projectDir.absolutePath + File.separator + destinationDir + File.separator + detail.path)
+            if (target.exists()) {
+              target.setLastModified(detail.lastModified)
+            }
+          }
+        }
+      }
     }
   }
 }
+
+fun CopySpec.copyIfNeeded(destinationDir: String, into: MutableMap<String, ArrayList<FileCopyDetails>>) {
+  val details = arrayListOf<FileCopyDetails>()
+  eachFile {
+    val targetFile = File(destinationDir, path)
+    if (file.lastModified() == targetFile.lastModified() && file.length() == targetFile.length()) {
+      exclude()
+    } else {
+      details.add(this)
+    }
+  }
+  into[destinationDir] = details
+}

apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt

@@ -5,6 +5,8 @@ import chat.simplex.common.showApp
 import java.io.File
 import java.nio.file.*
 import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.attribute.FileTime
+import kotlin.io.path.setLastModifiedTime
 
 fun main() {
   initHaskell()
@@ -20,6 +22,15 @@ private fun initHaskell() {
   val libsTmpDir = File(tmpDir.absolutePath + File.separator + "libs")
   copyResources(desktopPlatform.libPath, libsTmpDir.toPath())
   System.load(File(libsTmpDir, libApp).absolutePath)
+
+  vlcDir.deleteRecursively()
+  Files.move(File(libsTmpDir, "vlc").toPath(), vlcDir.toPath(), StandardCopyOption.REPLACE_EXISTING)
+  // No picture without preloading it, only sound. However, with libs from AppImage it works without preloading
+  //val libXcb = "libvlc_xcb_events.so.0.0.0"
+  //System.load(File(File(vlcDir, "vlc"), libXcb).absolutePath)
+  System.setProperty("jna.library.path", vlcDir.absolutePath)
+  //discoverVlcLibs(File(File(vlcDir, "vlc"), "plugins").absolutePath)
+
   libsTmpDir.deleteRecursively()
   initHS()
 }
@@ -34,7 +45,12 @@ private fun copyResources(from: String, to: Path) {
       return FileVisitResult.CONTINUE
     }
     override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
-      Files.copy(file, to.resolve(resPath.relativize(file).toString()), StandardCopyOption.REPLACE_EXISTING)
+      val dest = to.resolve(resPath.relativize(file).toString())
+      Files.copy(file, dest, StandardCopyOption.REPLACE_EXISTING)
+      // Setting the same time on file as the time set in script that generates VLC libs
+      if (dest.toString().contains("." + desktopPlatform.libExtension)) {
+        dest.setLastModifiedTime(FileTime.fromMillis(0))
+      }
       return FileVisitResult.CONTINUE
     }
   })

apps/multiplatform/desktop/src/jvmMain/resources/distribute/SimpleX.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=SimpleX Chat
-Comment=Private and secure open-source messenger - no user IDs (not even random numbers).
+Comment=Private and secure open-source messenger - no user IDs (not even random numbers)
 Exec=/opt/simplex/bin/simplex
 Icon=/opt/simplex/lib/simplex
 Categories=Network;Chat;

apps/multiplatform/desktop/src/jvmMain/resources/distribute/chat.simplex.app.appdata.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>chat.simplex.app</id>
+  <launchable type="desktop-id">chat.simplex.app.desktop</launchable>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>AGPL-3.0</project_license>
+  <name>SimpleX</name>
+  <summary>Private and secure open-source messenger - no user IDs (not even random numbers)</summary>
+
+  <description>
+    <p>Security assessment was done by Trail of Bits in November 2022.</p>
+    <p>SimpleX Chat features:</p>
+    <ul>
+      <li>end-to-end encrypted messages, with editing, replies and deletion of messages.</li>
+      <li>sending end-to-end encrypted images and files.</li>
+      <li>single-use and long-term user addresses.</li>
+      <li>secret chat groups - only group members know it exists and who is the member.</li>
+      <li>end-to-end encrypted audio and video calls.</li>
+      <li>private instant notifications.</li>
+      <li>portable chat profile - you can transfer your chat contacts and history to another device (terminal or mobile).</li>
+      <li>encrypted app database and files in the app storage (except videos).</li>
+      <li>18 interface languages.</li>
+    </ul>
+    <p>SimpleX Chat advantages:</p>
+    <ul>
+      <li><em>Full privacy of your identity, profile, contacts and metadata</em>: unlike any other existing messaging platform, SimpleX uses no phone numbers or any other identifiers assigned to the users - not even random numbers. This protects the privacy of who you are communicating with, hiding it from SimpleX platform servers and from any observers.</li>
+      <li><em>Complete protection against spam and abuse</em>: as you have no identifier on SimpleX platform, you cannot be contacted unless you share a one-time invitation link or an optional temporary user address.</li>
+      <li><em>Full ownership, control and security of your data</em>: SimpleX stores all user data on client devices, the messages are only held temporarily on SimpleX relay servers until they are received.</li>
+      <li><em>Decentralized network</em>: you can use SimpleX with your own servers and still communicate with people using the servers that are pre-configured in the apps or any other SimpleX servers.</li>
+    </ul>
+    <p>You can connect to anybody you know via link or scan QR code (in the video call or in person) and start sending messages instantly - no emails, phone numbers or passwords needed.</p> 
+    <p>Your profile and contacts are only stored in the app on your device - our servers do not have access to this information.</p>
+    <p>All messages are end-to-end encrypted using open-source double-ratchet protocol; the messages are routed via our servers using open-source SimpleX Messaging Protocol.</p>
+    <p>Please send us any questions via the app or submit an issue on GitHub.</p>
+    <p>Follow us on Mastodon, Twitter and Reddit for the latest updates.</p>
+    <p>Once you install SimpleX Chat, "connect to developers" for any questions, to share feedback, and to discover the groups (the link for directory service will be in response).</p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://simplex.chat/img/simplex-desktop-linux-light.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://simplex.chat/img/simplex-desktop-linux-dark-1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://simplex.chat/img/simplex-desktop-linux-dark-2.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://simplex.chat</url>
+  <url type="bugtracker">https://github.com/simplex-chat/simplex-chat/issues</url>
+  <url type="translate">https://github.com/simplex-chat/simplex-chat#help-translating-simplex-chat</url>
+  <url type="contact">https://simplex.chat/connect-team</url>
+  <url type="donation">https://github.com/simplex-chat/simplex-chat#help-us-with-donations</url>
+
+  <content_rating type="oars-1.1"/>
+
+  <releases>
+    <release version="5.3" date="2023-09-19">
+      <description>
+        <p>- the first release of the desktop app!</p>
+        <p>- encrypted local files</p>
+        <p>- message delivery receipts in small groups</p>
+        <p>- 6 new interface languages: Arabic, Bulgarian, Finnish, Hebrew, Thai and Ukrainian</p>
+      </description>
+    </release>
+  </releases>
+</component>

apps/multiplatform/gradle.properties

@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-android.version_name=5.3-beta.8
-android.version_code=150
+android.version_name=5.3.1
+android.version_code=154
 
-desktop.version_name=1.6.0
-desktop.version_code=8
+desktop.version_name=5.3.1
+desktop.version_code=11
 
 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2

apps/simplex-bot-advanced/Main.hs

@@ -8,7 +8,7 @@ module Main where
 
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad
+import Control.Monad.Reader
 import qualified Data.Text as T
 import Simplex.Chat.Bot
 import Simplex.Chat.Controller

apps/simplex-broadcast-bot/src/Broadcast/Bot.hs

@@ -9,7 +9,7 @@ module Broadcast.Bot where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad
+import Control.Monad.Reader
 import qualified Data.Text as T
 import Broadcast.Options
 import Simplex.Chat.Bot

apps/simplex-chat/Server.hs

@@ -8,7 +8,6 @@
 
 module Server where
 
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.Aeson (FromJSON, ToJSON)

apps/simplex-directory-service/src/Directory/Service.hs

@@ -15,7 +15,7 @@ where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad
+import Control.Monad.Reader
 import qualified Data.ByteString.Char8 as B
 import Data.List (sortOn)
 import Data.Maybe (fromMaybe, maybeToList)

blog/20230301-simplex-file-transfer-protocol.md

@@ -4,6 +4,7 @@ title: "SimpleX File Transfer Protocol - a new protocol for sending large files
 date: 2023-03-01
 preview: CLI and relays implementing the new XFTP protocol are released - you can use them now!
 image: images/20230301-xftp.jpg
+imageWide: true
 permalink: "/blog/20230301-simplex-file-transfer-protocol.html"
 ---
 

blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md

@@ -63,7 +63,7 @@ To accelerate product development and growth we will be raising a seed funding t
 
 ### Send videos and files up to 1gb!
 
-<img src="./images/20230422-video.png" width="288">
+<img src="./images/20230422-video.png" width="288" class="float-to-left">
 
 In the beginning of March [we released servers and command-line utility to send and receive files via XFTP protocol](./20230301-simplex-file-transfer-protocol.md) - a very private and secure protocol that sends end-to-end encrypted files in chunks, protecting meta-data better than any alternatives we know of.
 
@@ -88,7 +88,7 @@ Now you can choose whether to use faster and more convenient system biometric au
 
 ### Networking improvements
 
-<img src="./images/20230422-socks.png" width="288">
+<img src="./images/20230422-socks.png" width="288" class="float-to-left">
 
 Two small improvements to the app networking capabilities were added in this version.
 

blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md

@@ -36,7 +36,7 @@ Also, we added Japanese and Portuguese (Brazil)<sup>*</sup> interface languages,
 
 ## Message reactions
 
-<img src="./images/20230523-reactions.png" width="288">
+<img src="./images/20230523-reactions.png" width="288" class="float-to-left">
 
 No idea why it took us so long to add them – finally we have them, and they are great.
 
@@ -50,7 +50,7 @@ The next app version will allow prohibiting the reactions per conversation, as y
 
 ### Voice messages: up to 5 minutes, better quality, playback control
 
-<img src="./images/20230523-voice.png" width="288">
+<img src="./images/20230523-voice.png" width="288" class="float-to-left">
 
 Since [v4.3](./20221206-simplex-chat-v4.3-voice-messages.md#instant-voice-messages) voice messages were sent in small 16kb chunks, so we had to limit them to 30-40 seconds for better user experience, as sending larger files would require the sender to be online.
 
@@ -66,7 +66,7 @@ This version allows to configure the time for messages to disappear more granula
 
 ### Message editing history
 
-<img src="./images/20230523-info.png" width="288">
+<img src="./images/20230523-info.png" width="288" class="float-to-left">
 
 I [wrote previously](./20221206-simplex-chat-v4.3-voice-messages.md#irreversible-message-deletion) why we decided to require the recipient concent before the messages can be fully deleted by the sender - in short, it is to support recipient's data sovereignty and prevent the possibility of offensive messages being removed without any trace. By default, when the sender deletes the message it is marked as deleted, rather than fully deleted, and you can reveal the original message.
 
@@ -74,7 +74,7 @@ You've found the workaround for it of course - it's enough to simply edit the me
 
 ## Customize and share color themes
 
-<img src="./images/20230523-theme.png" width="288">
+<img src="./images/20230523-theme.png" width="288" class="float-to-left">
 
 Android app now allows choosing between three color themes - Light, Dark and SimpleX (a dark blue theme). You can customize any theme by setting 9 different colors used in the app, including titles, menus, accent colors and colors for sent and received messages.
 
@@ -82,7 +82,7 @@ You can share your theme with other users by exporting it to a file and sending
 
 ## Self-destruct passcode
 
-<img src="./images/20230523-self-destruct.png" width="288">
+<img src="./images/20230523-self-destruct.png" width="288" class="float-to-left">
 
 This is something many of you asked before - when asked to enter the app passcode under duress, to be able to enter a special self-destruct code that would remove the app data. This feature is offered in many security tools, and now you can configure it in SimpleX Chat as well.
 

blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md

@@ -38,7 +38,7 @@ permalink: "/blog/20230722-simplex-chat-v5-2-message-delivery-receipts.html"
 
 ### Message delivery receipts
 
-<img src="./images/20230722-receipts.png" width="330">
+<img src="./images/20230722-receipts.png" width="330" class="float-to-left">
 
 Most messaging apps add two ticks to sent messages – the first one to show that the message is accepted by the server, and the second – that it is delivered to the recipient's device. It confirms that the network is functioning, and that the message is not lost or delayed. SimpleX Chat now has this feature too!
 
@@ -48,7 +48,7 @@ To avoid compromising your privacy, sending delivery receipts is disabled for al
 
 ### Filter favorite and unread chats
 
-<img src="./images/20230722-filter.png" width="288">
+<img src="./images/20230722-filter.png" width="288" class="float-to-left">
 
 You can now mark your contacts and groups as _favorite_, to be able to find them faster. With filter enabled, you will only see favorite chats, chats that contain unread messages and also any unaccepted group invitations and contact requests.
 
@@ -58,13 +58,13 @@ Active SimpleX Chat users know how broken the current group experience is, and t
 
 #### What is this in reply to?
 
-<img src="./images/20230722-quoted.png" width="330">
+<img src="./images/20230722-quoted.png" width="330" class="float-to-left">
 
 A major problem is that you can see replies to the messages you've not seen before - this would happen both when you just join the group, and didn't connect to most other members, and also when other new members join the group and they didn't yet connect to you – so literally all the time, and the bigger the group gets, the worse it becomes. While this problem cannot be solved without major group protocol changes, at least there is now ability to see the original message that was replied to via the message information.
 
 #### How to connect to this member?
 
-<img src="./images/20230722-search.png" width="330">
+<img src="./images/20230722-search.png" width="330" class="float-to-left">
 
 To simplify direct connections with other group members, you can now share your SimpleX address via your chat profile, and group members can send you a contact request even if the group does not allow direct messages.
 

blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md

@@ -2,14 +2,130 @@
 layout: layouts/article.html
 title: "SimpleX Chat v5.3 released: desktop app, local file encryption and improved groups with directory service"
 date: 2023-09-25
-# image: images/20230925-desktop-app.png
-# previewBody: blog_previews/20230722.html
+image: /docs/images/simplex-desktop-light.png
+imageWide: true
+previewBody: blog_previews/20230925.html
 permalink: "/blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.html"
-draft: true
 ---
 
 # SimpleX Chat v5.3 released: desktop app, local file encryption and improved groups
 
 **Published:** September 25, 2023
 
-This is a placeholder for the release announcement
+**What's new in v5.3:**
+- [new desktop app!](#multiplatform-desktop-app)!
+- [directory service and other group improvements](#group-directory-service-and-other-group-improvements).
+- [encrypted local files and media with forward secrecy](#encrypted-local-files-and-media-with-forward-secrecy).
+- [simplified incognito mode](#simplified-incognito-mode).
+
+There are a lot of other improvements and fixes in this release:
+- improved app responsiveness and stability.
+- app memory usage is reduced by 40%.
+- new privacy settings: show last messages & save draft.
+- fixes:
+  - bug preventing group members connecting (it will only help the new connections).
+  - playing videos on full screen<sup>**</sup>.
+  - screen reader for messages<sup>**</sup>.
+  - reduced background crashes<sup>**</sup>.
+
+Also, we added 6 new interface languages: Arabic<sup>*</sup>, Bulgarian, Finnish, Hebrew<sup>*</sup>, Thai and Ukrainian - thanks to [our users and Weblate](https://github.com/simplex-chat/simplex-chat#help-translating-simplex-chat).
+
+\* Android app.
+
+\*\* iOS app.
+
+## Multiplatform desktop app
+
+<img src="/docs/images/simplex-desktop-light.png" width="640">
+
+Thanks a lot to everybody who was testing the desktop app since July – it really helped to make it stable!
+
+To use desktop app you need to **create a new profile**. As SimpleX platform has no user accounts, it's not as simple as for centralized apps to access the same profile from two devices.
+
+The next app version will allow using your mobile profile from desktop app. For now, as a workaround, you can join groups from both mobile and desktop devices, and use small groups instead of direct conversations.
+
+When you start the app first time, you will be offered to **set database passphrase** – you have to memorize it, as there is no way to recover it. If you skip it, a random passphrase will be generated and stored on your desktop device as plaintext (unencrypted) – you can change it later.
+
+Other limitations of the desktop app:
+- you cannot send voice messages.
+- there is no support for calls yet.
+
+## Group directory service and other group improvements
+
+<img src="./images/20230925-directory.png" width="330" class="float-to-left">
+
+Directory service provides a way to search for public groups submitted by the users. To use it, you need to connect to it via SimpleX Chat, as you would connect to any other contact, and type some words to search.
+
+You can also create and register your group, with some limitations explained [here](../docs/DIRECTORY.md).
+
+Other group improvements in this release:
+
+- you can send delivery receipts to the groups up to 20 members.
+
+- if the group settings allow it, you can send direct messages to group members even after you deleted the contact.
+
+- connections between members are made faster, and the bug that prevented the connections in some cases is fixed in this release.
+
+The next release will reduce the time it takes to send messages to the group, especially when there are many members or when you have a slow device storage.
+
+## Encrypted local files and media with forward secrecy
+
+<img src="./images/20230925-encrypted.png" width="330" class="float-to-left">
+
+All messages, files and media sent via SimpleX Chat were always end-to-end encrypted from the very beginning. SimpleX Chat uses double-ratchet algorithm with encrypted message headers, for the best possible meta-data protection.
+
+You contacts, groups and messages are stored in the local database on your device, and this database was encrypted from [v4.0 released a year ago](./20220928-simplex-chat-v4-encrypted-database.md).
+
+But until this version all files and media in the app storage were not encrypted, and when you exported the chat archive, they were unencrypted there as well.
+
+From v5.3 all files and media (except videos, for now) are encrypted with a random symmetric key - in many cases they are encrypted before they are written to the storage. Local file encryption can be disabled via Privacy & Security settings, for example, if you need to access the files from the storage outside of the app.
+
+In addition to the videos that are stored unencrypted, there are other rare scenarios when the received files may be unencrypted in this release. Files have an open or closed lock icons to indicate whether they were encrypted locally. These limitations will be addressed in the next release. In any case, all files and media are always sent end-to-end encrypted, without any exceptions.
+
+The keys used to encrypt files locally are associated with the messages and stored in the encrypted database. If you delete a message with the attached file or media, the key will be irreversibly deleted as well. Even if an attacker gains access to your database passphrase later and to the copy of the encrypted file, they won't be able to decrypt the file.
+
+This approach provides forward secrecy for locally stored files, unlike file encryption schemes used in some other apps when the same passphrase is used for all files.
+
+## Simplified incognito mode
+
+<img src="./images/20230925-incognito.png" width="330" class="float-to-left">
+
+Incognito mode was [added a year ago](./20220901-simplex-chat-v3.2-incognito-mode.md) to improve anonymity of your profile, but it was confusing for some users - it was a global setting, but it only affected the new connections.
+
+It is now simpler to use - you can decide whether to connect to a contact or join a group using your main profile at a point when you create an invitation link or connect via a link or QR code.
+
+When you are connecting to people your know you usually want to share your main profile, and when connecting to public groups or strangers, you may prefer to use a random profile.
+
+## SimpleX platform
+
+Some links to answer the most common questions:
+
+[SimpleX Chat security assessment](./20221108-simplex-chat-v4.2-security-audit-new-website.md).
+
+[How can SimpleX deliver messages without user identifiers](https://simplex.chat/#how-simplex-works).
+
+[What are the risks to have identifiers assigned to the users](https://simplex.chat/#why-ids-bad-for-privacy).
+
+[Technical details and limitations](https://github.com/simplex-chat/simplex-chat#privacy-technical-details-and-limitations).
+
+[How SimpleX is different from Session, Matrix, Signal, etc.](https://github.com/simplex-chat/simplex-chat/blob/stable/README.md#frequently-asked-questions).
+
+Visit our [website](https://simplex.chat) to learn more.
+
+## Help us with donations
+
+Huge thank you to everybody who donated to SimpleX Chat!
+
+We are prioritizing users privacy and security - it would be impossible without your support.
+
+Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
+
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, makes a big difference for us.
+
+See [this section](https://github.com/simplex-chat/simplex-chat/tree/master#help-us-with-donations) for the ways to donate.
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder

cabal.project

@@ -2,14 +2,14 @@ packages: .
 -- packages: . ../simplexmq
 -- packages: . ../simplexmq ../direct-sqlcipher ../sqlcipher-simple
 
-with-compiler: ghc-9.6.2
+with-compiler: ghc-8.10.7
 
 constraints: zip +disable-bzip2 +disable-zstd
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 3828a9591c095651d3eb12c7b9edf564b21451d4
+    tag: 53c793d5590d3c781aa3fbf72993eee262c7aa83
 
 source-repository-package
     type: git
@@ -24,17 +24,17 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/direct-sqlcipher.git
-    tag: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
+    tag: 34309410eb2069b029b8fc1872deb1e0db123294
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/sqlcipher-simple.git
-    tag: a46bd361a19376c5211f1058908fc0ae6bf42446
+    tag: 5e154a2aeccc33ead6c243ec07195ab673137221
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/aeson.git
-    tag: 68330dce8208173c6acf5f62b23acb500ab5d873
+    tag: 3eb66f9a68f103b5f1489382aad89f5712a64db7
 
 source-repository-package
     type: git
@@ -43,10 +43,5 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://github.com/simplex-chat/android-support.git
-    tag: 9aa09f148089d6752ce563b14c2df1895718d806
-
-source-repository-package
-    type: git
-    location: https://github.com/simplex-chat/network-transport.git
-    tag: 0013798272a683e35ca38d2fdaf480942311fba8
+    location: https://github.com/zw3rk/android-support.git
+    tag: 3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb

docs/CLI.md

@@ -16,7 +16,7 @@ revision: 31.01.2023
     - [Windows](#windows)
   - [Build from source](#build-from-source)
     - [Using Docker](#using-docker)
-    - [Using Haskell stack](#using-haskell-stack)
+    - [Using Haskell in any OS](#in-any-os)
 - [Usage](#usage)
   - [Running the chat client](#running-the-chat-client)
   - [Access messaging servers via Tor](#access-messaging-servers-via-tor-beta)
@@ -102,27 +102,49 @@ DOCKER_BUILDKIT=1 docker build --output ~/.local/bin .
 
 #### In any OS
 
-1. Install [Haskell GHCup](https://www.haskell.org/ghcup/), GHC 8.10.7 and cabal:
+1. Install [Haskell GHCup](https://www.haskell.org/ghcup/), GHC 9.6.2 and cabal 3.10.1.0:
 
 ```shell
 curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 ```
 
-2. Build the project:
+You can use `ghcup tui` to check or add GHC and cabal versions.
+
+2. Clone the source code:
 
 ```shell
 git clone git@github.com:simplex-chat/simplex-chat.git
 cd simplex-chat
 git checkout stable
-# on Linux
+# or to build a specific version:
+# git checkout v5.3.0-beta.8
+```
+
+`master` is a development branch, it may containt unstable code.
+
+3. Prepare the system:
+
+On Linux:
+
+```shell
 apt-get update && apt-get install -y build-essential libgmp3-dev zlib1g-dev
 cp scripts/cabal.project.local.linux cabal.project.local
-# or on MacOS:
-# brew install openssl@1.1
-# cp scripts/cabal.project.local.mac cabal.project.local
-# you may need to amend cabal.project.local to point to the actual openssl location
+```
+
+On Mac:
+
+```
+brew install openssl@1.1
+cp scripts/cabal.project.local.mac cabal.project.local
+```
+
+You may need to amend cabal.project.local to point to the actual openssl location.
+
+4. Build the app:
+
+```shell
 cabal update
-cabal install
+cabal install simplex-chat
 ```
 
 ## Usage

docs/DOWNLOADS.md

@@ -0,0 +1,42 @@
+---
+title: Download SimpleX apps
+permalink: /downloads/index.html
+revision: 20.09.2023
+---
+
+| Updated 20.09.2023 | Languages: EN |
+# Download SimpleX apps
+
+The latest version is v5.3.
+
+- [desktop](#desktop-app)
+- [mobile](#mobile-apps)
+- [terminal](#terminal-console-app) (console)
+
+## Desktop app
+
+<img src="/docs/images/simplex-desktop-light.png" alt="desktop app" width=500>
+
+Using the same profile as on mobile device is not yet supported – you need to create a separate profile to use desktop apps.
+
+**Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-desktop-ubuntu-22_04-x86_64.deb).
+
+**Mac**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-desktop-macos-x86_64.dmg) (Intel), [aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-desktop-macos-aarch64.dmg) (Apple Silicon).
+
+**Windows**: coming soon.
+
+## Mobile apps
+
+**iOS**: [App store](https://apps.apple.com/us/app/simplex-chat/id1605771084) (v5.2.3), [TestFlight](https://testflight.apple.com/join/DWuT2LQu) (v5.3-beta.9).
+
+**Android**: [Play store](https://play.google.com/store/apps/details?id=chat.simplex.app), [F-Droid](https://simplex.chat/fdroid/), [APK aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex.apk), [APK armv7](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-armv7a.apk).
+
+## Terminal (console) app
+
+See [Using terminal app](/docs/CLI.md).
+
+**Linux**: [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-chat-ubuntu-20_04-x86-64), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-chat-ubuntu-22_04-x86-64).
+
+**Mac** [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-chat-macos-x86-64), aarch64 - [compile from source](./CLI.md#).
+
+**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.3.0/simplex-chat-windows-x86-64).

docs/JOIN_TEAM.md

@@ -1,3 +1,9 @@
+---
+title: Join SimpleX Chat team
+permalink: /jobs/index.html
+layout: layouts/jobs.html
+---
+
 # Join SimpleX Chat team
 
 SimpleX Chat Ltd is a seed stage startup with a lot of user growth in 2022-2023, and a lot of exciting technical and product problems to solve to grow faster.

package.yaml

@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.3.0.8
+version: 5.3.1.0
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -13,25 +13,25 @@ extra-source-files:
   - cabal.project
 
 dependencies:
-  - aeson == 2.2.*
+  - aeson == 2.0.*
   - ansi-terminal >= 0.10 && < 0.12
   - async == 2.2.*
   - attoparsec == 0.14.*
   - base >= 4.7 && < 5
   - base64-bytestring >= 1.0 && < 1.3
-  - bytestring == 0.11.*
+  - bytestring == 0.10.*
   - composition == 1.0.*
   - constraints >= 0.12 && < 0.14
   - containers == 0.6.*
-  - cryptonite == 0.30.*
+  - cryptonite >= 0.27 && < 0.30
   - directory == 1.3.*
   - direct-sqlcipher == 2.3.*
   - email-validate == 2.3.*
   - exceptions == 0.10.*
   - filepath == 1.4.*
   - http-types == 0.12.*
-  - memory == 0.18.*
-  - mtl == 2.3.*
+  - memory == 0.15.*
+  - mtl == 2.2.*
   - network >= 3.1.2.7 && < 3.2
   - optparse-applicative >= 0.15 && < 0.17
   - process == 1.6.*
@@ -42,13 +42,13 @@ dependencies:
   - socks == 0.6.*
   - sqlcipher-simple == 0.4.*
   - stm == 2.5.*
-  - template-haskell == 2.20.*
+  - template-haskell == 2.16.*
   - terminal == 0.2.*
-  - text == 2.0.*
+  - text == 1.2.*
   - time == 1.9.*
   - unliftio == 0.2.*
   - unliftio-core == 0.2.*
-  - zip == 2.0.*
+  - zip == 1.7.*
 
 flags:
   swift:
@@ -118,7 +118,7 @@ tests:
       - simplex-chat
       - async == 2.2.*
       - deepseq == 1.4.*
-      - hspec == 2.11.*
+      - hspec == 2.7.*
       - network == 3.1.*
       - silently == 1.2.*
       - stm == 2.5.*

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 - > /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

@@ -2,12 +2,12 @@
 
 OS=linux
 ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`}
-GHC_VERSION=9.6.2
+GHC_VERSION=8.10.7
 
 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-*
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded'
+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"
 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
@@ -23,3 +23,4 @@ rm -rf apps/multiplatform/desktop/build/cmake
 mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 cp -r $BUILD_DIR/build/deps apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 cp $BUILD_DIR/build/libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
+scripts/desktop/prepare-vlc-linux.sh

scripts/desktop/build-lib-mac.sh

@@ -2,12 +2,9 @@
 
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
-GHC_VERSION=9.6.2
-
 if [ "$ARCH" == "arm64" ]; then
     ARCH=aarch64
 fi
-
 LIB_EXT=dylib
 LIB=libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT
 GHC_LIBS_DIR=$(ghc --print-libdir)
@@ -15,26 +12,13 @@ GHC_LIBS_DIR=$(ghc --print-libdir)
 BUILD_DIR=dist-newstyle/build/$ARCH-*/ghc-*/simplex-chat-*
 
 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"
+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"
 
 cd $BUILD_DIR/build
 mkdir deps 2> /dev/null
 
 # 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 "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`
@@ -75,13 +59,11 @@ 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`
 
 if [ -e deps/libHSdrct-*.$LIB_EXT ]; then
     LIBCRYPTO_PATH=$(otool -l deps/libHSdrct-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT deps/libHSdrct-*.$LIB_EXT
+    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT deps/libHSdrct*.$LIB_EXT
     cp $LIBCRYPTO_PATH deps/libcrypto.1.1.$LIB_EXT
     chmod 755 deps/libcrypto.1.1.$LIB_EXT
 fi
@@ -95,3 +77,4 @@ rm -rf apps/multiplatform/desktop/build/cmake
 mkdir -p apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 cp -r $BUILD_DIR/build/deps apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
 cp $BUILD_DIR/build/libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT apps/multiplatform/common/src/commonMain/cpp/desktop/libs/$OS-$ARCH/
+scripts/desktop/prepare-vlc-mac.sh

scripts/desktop/make-appimage-linux.sh

@@ -12,7 +12,7 @@ release_app_dir=$root_dir/apps/multiplatform/release/main/app
 
 cd $multiplatform_dir
 libcrypto_path=$(ldd common/src/commonMain/cpp/desktop/libs/*/deps/libHSdirect-sqlcipher-*.so | grep libcrypto | cut -d'=' -f 2 | cut -d ' ' -f 2)
-
+trap "rm common/src/commonMain/cpp/desktop/libs/*/deps/`basename $libcrypto_path` 2> /dev/null || true" EXIT
 cp $libcrypto_path common/src/commonMain/cpp/desktop/libs/*/deps
 
 ./gradlew createDistributable
@@ -27,13 +27,15 @@ cp -r ../*imple*/{bin,lib} usr
 cp usr/lib/simplex.png .
 
 # For https://github.com/TheAssassin/AppImageLauncher to be able to show the icon
-mkdir -p usr/share/icons
+mkdir -p usr/share/{icons,metainfo,applications}
 cp usr/lib/simplex.png usr/share/icons
 
 ln -s usr/bin/*imple* AppRun
-cp $multiplatform_dir/desktop/src/jvmMain/resources/distribute/*imple*.desktop .
+cp $multiplatform_dir/desktop/src/jvmMain/resources/distribute/*imple*.desktop chat.simplex.app.desktop
 sed -i 's|Exec=.*|Exec=simplex|g' *imple*.desktop
 sed -i 's|Icon=.*|Icon=simplex|g' *imple*.desktop
+cp *imple*.desktop usr/share/applications/
+cp $multiplatform_dir/desktop/src/jvmMain/resources/distribute/*.appdata.xml usr/share/metainfo
 
 if [ ! -f ../appimagetool-x86_64.AppImage ]; then
     wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -O ../appimagetool-x86_64.AppImage

scripts/desktop/prepare-vlc-linux.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+set -e
+
+function readlink() {
+  echo "$(cd "$(dirname "$1")"; pwd -P)"
+}
+root_dir="$(dirname "$(dirname "$(readlink "$0")")")"
+vlc_dir=$root_dir/apps/multiplatform/common/src/commonMain/cpp/desktop/libs/linux-x86_64/deps/vlc
+
+mkdir $vlc_dir || exit 0
+
+
+cd /tmp
+mkdir tmp 2>/dev/null || true
+cd tmp
+curl https://github.com/cmatomic/VLCplayer-AppImage/releases/download/3.0.11.1/VLC_media_player-3.0.11.1-x86_64.AppImage -L -o appimage
+chmod +x appimage
+./appimage --appimage-extract
+cp -r squashfs-root/usr/lib/* $vlc_dir
+cd ../
+rm -rf tmp
+exit 0
+
+
+# This is currently unneeded
+cd /tmp
+(
+mkdir tmp
+cd tmp
+curl http://archive.ubuntu.com/ubuntu/pool/universe/v/vlc/libvlc5_3.0.9.2-1_amd64.deb -o libvlc
+ar p libvlc data.tar.xz > data.tar.xz
+tar -xvf data.tar.xz
+mv usr/lib/x86_64-linux-gnu/libvlc.so{.5,}
+cp usr/lib/x86_64-linux-gnu/libvlc.so* $vlc_dir
+cd ../
+rm -rf tmp
+)
+
+(
+mkdir tmp
+cd tmp
+curl http://archive.ubuntu.com/ubuntu/pool/universe/v/vlc/libvlccore9_3.0.9.2-1_amd64.deb -o libvlccore
+ar p libvlccore data.tar.xz > data.tar.xz
+tar -xvf data.tar.xz
+cp usr/lib/x86_64-linux-gnu/libvlccore.so* $vlc_dir
+cd ../
+rm -rf tmp
+)
+
+(
+mkdir tmp
+cd tmp
+curl http://mirrors.edge.kernel.org/ubuntu/pool/universe/v/vlc/vlc-plugin-base_3.0.9.2-1_amd64.deb -o plugins
+ar p plugins data.tar.xz > data.tar.xz
+tar -xvf data.tar.xz
+find usr/lib/x86_64-linux-gnu/vlc/plugins/ -name "lib*.so*" -exec patchelf --set-rpath '$ORIGIN/../../' {} \;
+cp -r usr/lib/x86_64-linux-gnu/vlc/{libvlc*,plugins} $vlc_dir
+cd ../
+rm -rf tmp
+)
+
+(
+mkdir tmp
+cd tmp
+curl http://archive.ubuntu.com/ubuntu/pool/main/libi/libidn/libidn11_1.33-2.2ubuntu2_amd64.deb -o idn
+ar p idn data.tar.xz > data.tar.xz
+tar -xvf data.tar.xz
+cp lib/x86_64-linux-gnu/lib* $vlc_dir
+cd ../
+rm -rf tmp
+)
+
+find $vlc_dir -maxdepth 1 -name "lib*.so*" -exec patchelf --set-rpath '$ORIGIN' {} \;

scripts/desktop/prepare-vlc-mac.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
+if [ "$ARCH" == "arm64" ]; then
+    ARCH=aarch64
+    vlc_arch=arm64
+else
+    vlc_arch=intel64
+fi
+vlc_version=3.0.19
+
+function readlink() {
+  echo "$(cd "$(dirname "$1")"; pwd -P)"
+}
+
+root_dir="$(dirname "$(dirname "$(readlink "$0")")")"
+vlc_dir=$root_dir/apps/multiplatform/common/src/commonMain/cpp/desktop/libs/mac-$ARCH/deps/vlc
+#rm -rf $vlc_dir
+mkdir -p $vlc_dir/vlc || exit 0
+
+cd /tmp
+mkdir tmp 2>/dev/null || true
+cd tmp
+curl https://github.com/simplex-chat/vlc/releases/download/v$vlc_version/vlc-macos-$ARCH.zip -L -o vlc
+unzip -oqq vlc
+install_name_tool -add_rpath "@loader_path/VLC.app/Contents/MacOS/lib" vlc-cache-gen
+cd VLC.app/Contents/MacOS/lib
+for lib in $(ls *.dylib); do install_name_tool -add_rpath "@loader_path" $lib 2> /dev/null || true; done
+cd ../plugins
+for lib in $(ls *.dylib); do
+    install_name_tool -add_rpath "@loader_path/../../" $lib 2> /dev/null || true
+done
+cd ..
+../../../vlc-cache-gen plugins
+cp lib/* $vlc_dir/
+cp -r -p plugins/ $vlc_dir/vlc/plugins
+cd ../../../../
+rm -rf tmp

scripts/nix/sha256map.nix

@@ -1,11 +1,10 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."3828a9591c095651d3eb12c7b9edf564b21451d4" = "0zw33q9x1ppd64qilw0yvh0h9z0ijchk6qsb2i3gs4n1icj15vp5";
+  "https://github.com/simplex-chat/simplexmq.git"."53c793d5590d3c781aa3fbf72993eee262c7aa83" = "0f0ldlgqwrapgfw5gnaj00xvb14c8nykyjr9fhy79h4r16g614x8";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/kazu-yamamoto/http2.git"."b5a1b7200cf5bc7044af34ba325284271f6dff25" = "0dqb50j57an64nf4qcf5vcz4xkd1vzvghvf8bk529c1k30r9nfzb";
-  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "0kiwhvml42g9anw4d2v0zd1fpc790pj9syg5x3ik4l97fnkbbwpp";
-  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
-  "https://github.com/simplex-chat/aeson.git"."68330dce8208173c6acf5f62b23acb500ab5d873" = "1l51p1v54c88c1jmxcvbz4gy0cns7l46ihzzfjwxxrvcrrrxgcjp";
+  "https://github.com/simplex-chat/direct-sqlcipher.git"."34309410eb2069b029b8fc1872deb1e0db123294" = "0kwkmhyfsn2lixdlgl15smgr1h5gjk7fky6abzh8rng2h5ymnffd";
+  "https://github.com/simplex-chat/sqlcipher-simple.git"."5e154a2aeccc33ead6c243ec07195ab673137221" = "1d1gc5wax4vqg0801ajsmx1sbwvd9y7p7b8mmskvqsmpbwgbh0m0";
+  "https://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
-  "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
-  "https://github.com/simplex-chat/network-transport.git"."0013798272a683e35ca38d2fdaf480942311fba8" = "0dnn62apgvc248df0m8ib7phrzn63wm0xs71xvlypv52j6cgwzkb";
+  "https://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
 }

simplex-chat.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        5.3.0.8
+version:        5.3.1.0
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -145,25 +145,25 @@ library
       src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network >=3.1.2.7 && <3.2
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -174,13 +174,13 @@ library
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -193,25 +193,25 @@ executable simplex-bot
       apps/simplex-bot
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network >=3.1.2.7 && <3.2
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -223,13 +223,13 @@ executable simplex-bot
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -242,25 +242,25 @@ executable simplex-bot-advanced
       apps/simplex-bot-advanced
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network >=3.1.2.7 && <3.2
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -272,13 +272,13 @@ executable simplex-bot-advanced
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -293,25 +293,25 @@ executable simplex-broadcast-bot
       apps/simplex-broadcast-bot/src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network >=3.1.2.7 && <3.2
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -323,13 +323,13 @@ executable simplex-broadcast-bot
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -343,25 +343,25 @@ executable simplex-chat
       apps/simplex-chat
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network ==3.1.*
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -373,14 +373,14 @@ executable simplex-chat
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
     , websockets ==0.12.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -397,25 +397,25 @@ executable simplex-directory-service
       apps/simplex-directory-service/src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network >=3.1.2.7 && <3.2
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -427,13 +427,13 @@ executable simplex-directory-service
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON
@@ -470,27 +470,27 @@ test-suite simplex-chat-test
       apps/simplex-directory-service/src
   ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
-      aeson ==2.2.*
+      aeson ==2.0.*
     , ansi-terminal >=0.10 && <0.12
     , async ==2.2.*
     , attoparsec ==0.14.*
     , base >=4.7 && <5
     , base64-bytestring >=1.0 && <1.3
-    , bytestring ==0.11.*
+    , bytestring ==0.10.*
     , composition ==1.0.*
     , constraints >=0.12 && <0.14
     , containers ==0.6.*
-    , cryptonite ==0.30.*
+    , cryptonite >=0.27 && <0.30
     , deepseq ==1.4.*
     , direct-sqlcipher ==2.3.*
     , directory ==1.3.*
     , email-validate ==2.3.*
     , exceptions ==0.10.*
     , filepath ==1.4.*
-    , hspec ==2.11.*
+    , hspec ==2.7.*
     , http-types ==0.12.*
-    , memory ==0.18.*
-    , mtl ==2.3.*
+    , memory ==0.15.*
+    , mtl ==2.2.*
     , network ==3.1.*
     , optparse-applicative >=0.15 && <0.17
     , process ==1.6.*
@@ -503,13 +503,13 @@ test-suite simplex-chat-test
     , socks ==0.6.*
     , sqlcipher-simple ==0.4.*
     , stm ==2.5.*
-    , template-haskell ==2.20.*
+    , template-haskell ==2.16.*
     , terminal ==0.2.*
-    , text ==2.0.*
+    , text ==1.2.*
     , time ==1.9.*
     , unliftio ==0.2.*
     , unliftio-core ==0.2.*
-    , zip ==2.0.*
+    , zip ==1.7.*
   default-language: Haskell2010
   if flag(swift)
     cpp-options: -DswiftJSON

src/Simplex/Chat.hs

@@ -5,7 +5,6 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -13,15 +12,12 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat where
 
 import Control.Applicative (optional, (<|>))
-import Control.Concurrent.STM (retry)
+import Control.Concurrent.STM (retry, stateTVar)
 import qualified Control.Exception as E
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
@@ -217,8 +213,8 @@ newChatController ChatDatabase {chatStore, agentStore} user cfg@ChatConfig {agen
   where
     configServers :: DefaultAgentServers
     configServers =
-      let smp' = fromMaybe (defaultServers.smp) (nonEmpty smpServers)
-          xftp' = fromMaybe (defaultServers.xftp) (nonEmpty xftpServers)
+      let smp' = fromMaybe (smp (defaultServers :: DefaultAgentServers)) (nonEmpty smpServers)
+          xftp' = fromMaybe (xftp (defaultServers :: DefaultAgentServers)) (nonEmpty xftpServers)
        in defaultServers {smp = smp', xftp = xftp', netCfg = networkConfig}
     agentServers :: ChatConfig -> IO InitialAgentServers
     agentServers config@ChatConfig {defaultServers = defServers@DefaultAgentServers {ntf, netCfg}} = do
@@ -245,9 +241,9 @@ activeAgentServers ChatConfig {defaultServers} p =
     . filter (\ServerCfg {enabled} -> enabled)
 
 cfgServers :: UserProtocol p => SProtocolType p -> (DefaultAgentServers -> NonEmpty (ProtoServerWithAuth p))
-cfgServers p s = case p of
-  SPSMP -> s.smp
-  SPXFTP -> s.xftp
+cfgServers = \case
+  SPSMP -> smp
+  SPXFTP -> xftp
 
 startChatController :: forall m. ChatMonad' m => Bool -> Bool -> Bool -> m (Async ())
 startChatController subConns enableExpireCIs startXFTPWorkers = do
@@ -703,9 +699,7 @@ processChatCommand = \case
             MCVoice {} -> False
             MCUnknown {} -> True
           qText = msgContentText qmc
-          getFileName :: CIFile d -> String
-          getFileName CIFile{fileName} = fileName
-          qFileName = maybe qText (T.pack . getFileName) ciFile_
+          qFileName = maybe qText (T.pack . (fileName :: CIFile d -> String)) ciFile_
           qTextOrFile = if T.null qText then qFileName else qText
       xftpSndFileTransfer :: User -> CryptoFile -> Integer -> Int -> ContactOrGroup -> m (FileInvitation, CIFile 'MDSnd, FileTransferMeta)
       xftpSndFileTransfer user file@(CryptoFile filePath cfArgs) fileSize n contactOrGroup = do
@@ -918,7 +912,7 @@ processChatCommand = \case
       pure $ CRContactConnectionDeleted user conn
     CTGroup -> do
       Group gInfo@GroupInfo {membership} members <- withStore $ \db -> getGroup db user chatId
-      let isOwner = membership.memberRole == GROwner
+      let isOwner = memberRole (membership :: GroupMember) == GROwner
           canDelete = isOwner || not (memberCurrent membership)
       unless canDelete $ throwChatError $ CEGroupUserRole gInfo GROwner
       filesInfo <- withStore' $ \db -> getGroupFileInfo db user gInfo
@@ -1095,9 +1089,7 @@ processChatCommand = \case
   APIGetNtfMessage nonce encNtfInfo -> withUser $ \_ -> do
     (NotificationInfo {ntfConnId, ntfMsgMeta}, msgs) <- withAgent $ \a -> getNotificationMessage a nonce encNtfInfo
     let ntfMessages = map (\SMP.SMPMsgMeta {msgTs, msgFlags} -> NtfMsgInfo {msgTs = systemToUTCTime msgTs, msgFlags}) msgs
-        getMsgTs :: SMP.NMsgMeta -> SystemTime
-        getMsgTs SMP.NMsgMeta{msgTs} = msgTs
-        msgTs' = systemToUTCTime . getMsgTs <$> ntfMsgMeta
+        msgTs' = systemToUTCTime . (SMP.msgTs :: SMP.NMsgMeta -> SystemTime) <$> ntfMsgMeta
         agentConnId = AgentConnId ntfConnId
     user_ <- withStore' (`getUserByAConnId` agentConnId)
     connEntity <-
@@ -1504,7 +1496,7 @@ processChatCommand = \case
         Contact {activeConn = Connection {peerChatVRange}} = ct
     withChatLock "joinGroup" . procCmd $ do
       subMode <- chatReadVar subscriptionMode
-      dm <- directMessage $ XGrpAcpt membership.memberId
+      dm <- directMessage $ XGrpAcpt (memberId (membership :: GroupMember))
       agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest dm subMode
       withStore' $ \db -> do
         createMemberConnection db userId fromMember agentConnId (fromJVersionRange peerChatVRange) subMode
@@ -1658,7 +1650,7 @@ processChatCommand = \case
     case memberConn m of
       Just mConn -> do
         let msg = XGrpDirectInv cReq msgContent_
-        (sndMsg, _) <- sendDirectMessage mConn msg (GroupId $ g.groupId)
+        (sndMsg, _) <- sendDirectMessage mConn msg (GroupId $ groupId (g :: GroupInfo))
         withStore' $ \db -> setContactGrpInvSent db ct True
         let ct' = ct {contactGrpInvSent = True}
         forM_ msgContent_ $ \mc -> do
@@ -2022,7 +2014,7 @@ processChatCommand = \case
       pure $ CRGroupUpdated user g g' Nothing
     assertUserGroupRole :: GroupInfo -> GroupMemberRole -> m ()
     assertUserGroupRole g@GroupInfo {membership} requiredRole = do
-      when (membership.memberRole < requiredRole) $ throwChatError $ CEGroupUserRole g requiredRole
+      when (memberRole (membership :: GroupMember) < requiredRole) $ throwChatError $ CEGroupUserRole g requiredRole
       when (memberStatus membership == GSMemInvited) $ throwChatError (CEGroupNotJoined g)
       when (memberRemoved membership) $ throwChatError CEGroupMemberUserRemoved
       unless (memberActive membership) $ throwChatError CEGroupMemberNotActive
@@ -2040,7 +2032,7 @@ processChatCommand = \case
       runUpdateGroupProfile user g $ update p
     isReady :: Contact -> Bool
     isReady ct =
-      let s = connStatus $ ct.activeConn
+      let s = connStatus $ activeConn (ct :: Contact)
        in s == ConnReady || s == ConnSndReady
     withCurrentCall :: ContactId -> (User -> Contact -> Call -> m (Maybe Call)) -> m ChatResponse
     withCurrentCall ctId action = do
@@ -3222,7 +3214,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                 | sameMemberId memId m -> do
                   -- TODO update member profile
                   -- [async agent commands] no continuation needed, but command should be asynchronous for stability
-                  allowAgentConnectionAsync user conn' confId $ XGrpMemInfo membership.memberId (fromLocalProfile $ memberProfile membership)
+                  allowAgentConnectionAsync user conn' confId $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
                 | otherwise -> messageError "x.grp.mem.info: memberId is different from expected"
               _ -> messageError "CONF from member must have x.grp.mem.info"
       INFO connInfo -> do
@@ -3261,7 +3253,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
             toView $ CRJoinedGroupMember user gInfo m {memberStatus = GSMemConnected}
             whenGroupNtfs user gInfo $ do
               setActive $ ActiveG gName
-              showToast ("#" <> gName) $ "member " <> m.localDisplayName <> " is connected"
+              showToast ("#" <> gName) $ "member " <> localDisplayName (m :: GroupMember) <> " is connected"
             intros <- withStore' $ \db -> createIntroductions db members m
             void . sendGroupMessage user gInfo members . XGrpMemNew $ memberInfo m
             forM_ intros $ \intro ->
@@ -3321,9 +3313,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
               && hasDeliveryReceipt (toCMEventTag event)
               && currentMemCount <= smallGroupsRcptsMemLimit
         where
-          canSend :: GroupMember -> m () -> m ()
           canSend mem a
-            | mem.memberRole <= GRObserver = messageError "member is not allowed to send messages"
+            | memberRole (mem :: GroupMember) <= GRObserver = messageError "member is not allowed to send messages"
             | otherwise = a
       RCVD msgMeta msgRcpt ->
         withAckMessage' agentConnId conn msgMeta $
@@ -4520,7 +4511,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
       withStore' $ \db -> saveMemberInvitation db toMember introInv
       subMode <- chatReadVar subscriptionMode
       -- [incognito] send membership incognito profile, create direct connection as incognito
-      dm <- directMessage $ XGrpMemInfo membership.memberId (fromLocalProfile $ memberProfile membership)
+      dm <- directMessage $ XGrpMemInfo (memberId (membership :: GroupMember)) (fromLocalProfile $ memberProfile membership)
       -- [async agent commands] no continuation needed, but commands should be asynchronous for stability
       groupConnIds <- joinAgentConnectionAsync user enableNtfs groupConnReq dm subMode
       directConnIds <- forM directConnReq $ \dcr -> joinAgentConnectionAsync user enableNtfs dcr dm subMode
@@ -4530,7 +4521,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
 
     xGrpMemRole :: GroupInfo -> GroupMember -> MemberId -> GroupMemberRole -> RcvMessage -> MsgMeta -> m ()
     xGrpMemRole gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId memRole msg msgMeta
-      | membership.memberId == memId =
+      | memberId (membership :: GroupMember) == memId =
         let gInfo' = gInfo {membership = membership {memberRole = memRole}}
          in changeMemberRole gInfo' membership $ RGEUserRole memRole
       | otherwise = do
@@ -4554,7 +4545,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
     xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> RcvMessage -> MsgMeta -> m ()
     xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId msg msgMeta = do
       members <- withStore' $ \db -> getGroupMembers db user gInfo
-      if membership.memberId == memId
+      if memberId (membership :: GroupMember) == memId
         then checkRole membership $ do
           deleteGroupLinkIfExists user gInfo
           -- member records are not deleted to keep history
@@ -4796,7 +4787,7 @@ parseFileChunk :: ChatMonad m => ByteString -> m FileChunk
 parseFileChunk = liftEither . first (ChatError . CEFileRcvChunk) . smpDecode
 
 appendFileChunk :: forall m. ChatMonad m => RcvFileTransfer -> Integer -> ByteString -> Bool -> m ()
-appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs} chunkNo chunk final =
+appendFileChunk ft@RcvFileTransfer {fileId, fileInvitation, fileStatus, cryptoArgs} chunkNo chunk final =
   case fileStatus of
     RFSConnected RcvFileInfo {filePath} -> append_ filePath
     -- sometimes update of file transfer status to FSConnected
@@ -4814,7 +4805,7 @@ appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs} chunkNo chun
       when final $ do
         closeFileHandle fileId rcvFiles
         forM_ cryptoArgs $ \cfArgs -> do
-          tmpFile <- getChatTempDirectory >>= (`uniqueCombine` ft.fileInvitation.fileName)
+          tmpFile <- getChatTempDirectory >>= (`uniqueCombine` fileName (fileInvitation :: FileInvitation))
           tryChatError (liftError encryptErr $ encryptFile fsFilePath tmpFile cfArgs) >>= \case
             Right () -> do
               removeFile fsFilePath `catchChatError` \_ -> pure ()
@@ -5153,7 +5144,7 @@ createSndFeatureItems :: forall m. ChatMonad m => User -> Contact -> Contact ->
 createSndFeatureItems user ct ct' =
   createFeatureItems user ct ct' CDDirectSnd CISndChatFeature CISndChatPreference getPref
   where
-    getPref u = (userPreference u).preference
+    getPref = (preference :: ContactUserPref (FeaturePreference f) -> FeaturePreference f) . userPreference
 
 type FeatureContent a d = ChatFeature -> a -> Maybe Int -> CIContent d
 
@@ -5238,7 +5229,7 @@ getCreateActiveUser st testView = do
             Right user -> pure user
     selectUser :: [User] -> IO User
     selectUser [user] = do
-      withTransaction st (`setActiveUser` user.userId)
+      withTransaction st (`setActiveUser` userId (user :: User))
       pure user
     selectUser users = do
       putStrLn "Select user profile:"
@@ -5253,7 +5244,7 @@ getCreateActiveUser st testView = do
               | n <= 0 || n > length users -> putStrLn "invalid user number" >> loop
               | otherwise -> do
                 let user = users !! (n - 1)
-                withTransaction st (`setActiveUser` user.userId)
+                withTransaction st (`setActiveUser` userId (user :: User))
                 pure user
     userStr :: User -> String
     userStr User {localDisplayName, profile = LocalProfile {fullName}} =

src/Simplex/Chat/Archive.hs

@@ -13,7 +13,6 @@ module Simplex.Chat.Archive
 where
 
 import qualified Codec.Archive.Zip as Z
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.Functor (($>))

src/Simplex/Chat/Bot.hs

@@ -8,7 +8,7 @@ module Simplex.Chat.Bot where
 
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad
+import Control.Monad.Reader
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Text as T
 import Simplex.Chat.Controller

src/Simplex/Chat/Messages.hs

@@ -6,14 +6,11 @@
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Messages where
 
 import Control.Applicative ((<|>))
@@ -376,7 +373,7 @@ contactTimedTTL Contact {mergedPreferences = ContactUserPreferences {timedMessag
   | forUser enabled && forContact enabled = Just ttl
   | otherwise = Nothing
   where
-    TimedMessagesPreference {ttl} =  userPreference.preference
+    TimedMessagesPreference {ttl} = preference (userPreference :: ContactUserPref TimedMessagesPreference)
 
 groupTimedTTL :: GroupInfo -> Maybe (Maybe Int)
 groupTimedTTL GroupInfo {fullGroupPreferences = FullGroupPreferences {timedMessages = TimedMessagesGroupPreference {enable, ttl}}}

src/Simplex/Chat/Mobile.hs

@@ -14,14 +14,12 @@ import Data.Aeson (ToJSON (..))
 import qualified Data.Aeson as J
 import Data.Bifunctor (first)
 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.Functor (($>))
 import Data.List (find)
 import qualified Data.List.NonEmpty as L
 import Data.Maybe (fromMaybe)
-import qualified Data.Text as T
-import Data.Text.Encoding (encodeUtf8)
 import Data.Word (Word8)
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB
@@ -95,36 +93,36 @@ cChatMigrateInit fp key conf ctrl = do
     chatMigrateInit dbPath dbKey confirm >>= \case
       Right cc -> (newStablePtr cc >>= poke ctrl) $> DBMOk
       Left e -> pure e
-  newCAString . LB.unpack $ J.encode r
+  newCStringFromLazyBS $ J.encode r
 
 -- | send command to chat (same syntax as in terminal for now)
 cChatSendCmd :: StablePtr ChatController -> CString -> IO CJSONString
 cChatSendCmd cPtr cCmd = do
   c <- deRefStablePtr cPtr
-  cmd <- peekCAString cCmd
-  newCAString =<< chatSendCmd c cmd
+  cmd <- B.packCString cCmd
+  newCStringFromLazyBS =<< chatSendCmd c cmd
 
 -- | receive message from chat (blocking)
 cChatRecvMsg :: StablePtr ChatController -> IO CJSONString
-cChatRecvMsg cc = deRefStablePtr cc >>= chatRecvMsg >>= newCAString
+cChatRecvMsg cc = deRefStablePtr cc >>= chatRecvMsg >>= newCStringFromLazyBS
 
 -- |  receive message from chat (blocking up to `t` microseconds (1/10^6 sec), returns empty string if times out)
 cChatRecvMsgWait :: StablePtr ChatController -> CInt -> IO CJSONString
-cChatRecvMsgWait cc t = deRefStablePtr cc >>= (`chatRecvMsgWait` fromIntegral t) >>= newCAString
+cChatRecvMsgWait cc t = deRefStablePtr cc >>= (`chatRecvMsgWait` fromIntegral t) >>= newCStringFromLazyBS
 
 -- | parse markdown - returns ParsedMarkdown type JSON
 cChatParseMarkdown :: CString -> IO CJSONString
-cChatParseMarkdown s = newCAString . chatParseMarkdown =<< peekCAString s
+cChatParseMarkdown s = newCStringFromLazyBS . chatParseMarkdown =<< B.packCString s
 
 -- | parse server address - returns ParsedServerAddress JSON
 cChatParseServer :: CString -> IO CJSONString
-cChatParseServer s = newCAString . chatParseServer =<< peekCAString s
+cChatParseServer s = newCStringFromLazyBS . chatParseServer =<< B.packCString s
 
 cChatPasswordHash :: CString -> CString -> IO CString
 cChatPasswordHash cPwd cSalt = do
-  pwd <- peekCAString cPwd
-  salt <- peekCAString cSalt
-  newCAString $ chatPasswordHash pwd salt
+  pwd <- B.packCString cPwd
+  salt <- B.packCString cSalt
+  newCStringFromBS $ chatPasswordHash pwd salt
 
 mobileChatOpts :: String -> String -> ChatOpts
 mobileChatOpts dbFilePrefix dbKey =
@@ -197,22 +195,22 @@ chatMigrateInit dbFilePrefix dbKey confirm = runExceptT $ do
           _ -> dbError e
         dbError e = Left . DBMErrorSQL dbFile $ show e
 
-chatSendCmd :: ChatController -> String -> IO JSONString
-chatSendCmd cc s = LB.unpack . J.encode . APIResponse Nothing <$> runReaderT (execChatCommand $ B.pack s) cc
+chatSendCmd :: ChatController -> ByteString -> IO JSONByteString
+chatSendCmd cc s = J.encode . APIResponse Nothing <$> runReaderT (execChatCommand s) cc
 
-chatRecvMsg :: ChatController -> IO JSONString
+chatRecvMsg :: ChatController -> IO JSONByteString
 chatRecvMsg ChatController {outputQ} = json <$> atomically (readTBQueue outputQ)
   where
-    json (corr, resp) = LB.unpack $ J.encode APIResponse {corr, resp}
+    json (corr, resp) = J.encode APIResponse {corr, resp}
 
-chatRecvMsgWait :: ChatController -> Int -> IO JSONString
+chatRecvMsgWait :: ChatController -> Int -> IO JSONByteString
 chatRecvMsgWait cc time = fromMaybe "" <$> timeout time (chatRecvMsg cc)
 
-chatParseMarkdown :: String -> JSONString
-chatParseMarkdown = LB.unpack . J.encode . ParsedMarkdown . parseMaybeMarkdownList . safeDecodeUtf8 . B.pack
+chatParseMarkdown :: ByteString -> JSONByteString
+chatParseMarkdown = J.encode . ParsedMarkdown . parseMaybeMarkdownList . safeDecodeUtf8
 
-chatParseServer :: String -> JSONString
-chatParseServer = LB.unpack . J.encode . toServerAddress . strDecode . B.pack
+chatParseServer :: ByteString -> JSONByteString
+chatParseServer = J.encode . toServerAddress . strDecode
   where
     toServerAddress :: Either String AProtoServerWithAuth -> ParsedServerAddress
     toServerAddress = \case
@@ -223,11 +221,11 @@ chatParseServer = LB.unpack . J.encode . toServerAddress . strDecode . B.pack
     enc :: StrEncoding a => a -> String
     enc = B.unpack . strEncode
 
-chatPasswordHash :: String -> String -> String
+chatPasswordHash :: ByteString -> ByteString -> ByteString
 chatPasswordHash pwd salt = either (const "") passwordHash salt'
   where
-    salt' = U.decode $ B.pack salt
-    passwordHash = B.unpack . U.encode . C.sha512Hash . (encodeUtf8 (T.pack pwd) <>)
+    salt' = U.decode salt
+    passwordHash = U.encode . C.sha512Hash . (pwd <>)
 
 data APIResponse = APIResponse {corr :: Maybe CorrId, resp :: ChatResponse}
   deriving (Generic)

src/Simplex/Chat/Mobile/File.hs

@@ -16,9 +16,7 @@ module Simplex.Chat.Mobile.File
   )
 where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as J
 import Data.ByteString (ByteString)
@@ -27,11 +25,11 @@ import qualified Data.ByteString.Lazy as LB
 import qualified Data.ByteString.Lazy.Char8 as LB'
 import Data.Char (chr)
 import Data.Either (fromLeft)
-import Data.Word (Word8, Word32)
+import Data.Word (Word32, Word8)
 import Foreign.C
 import Foreign.Marshal.Alloc (mallocBytes)
 import Foreign.Ptr
-import Foreign.Storable (poke)
+import Foreign.Storable (poke, pokeByteOff)
 import GHC.Generics (Generic)
 import Simplex.Chat.Mobile.Shared
 import Simplex.Chat.Util (chunkSize, encryptFile)
@@ -54,7 +52,7 @@ cChatWriteFile cPath ptr len = do
   path <- peekCString cPath
   s <- getByteString ptr len
   r <- chatWriteFile path s
-  newCAString $ LB'.unpack $ J.encode r
+  newCStringFromLazyBS $ J.encode r
 
 chatWriteFile :: FilePath -> ByteString -> IO WriteFileResult
 chatWriteFile path s = do
@@ -78,12 +76,11 @@ cChatReadFile cPath cKey cNonce = do
   chatReadFile path key nonce >>= \case
     Left e -> castPtr <$> newCString (chr 1 : e)
     Right s -> do
-      let s' = LB.toStrict s
-          len = B.length s'
+      let len = fromIntegral $ LB.length s
       ptr <- mallocBytes $ len + 5
-      poke ptr 0
-      poke (ptr `plusPtr` 1) (fromIntegral len :: Word32)
-      putByteString (ptr `plusPtr` 5) s'
+      poke ptr (0 :: Word8)
+      pokeByteOff ptr 1 (fromIntegral len :: Word32)
+      putLazyByteString (ptr `plusPtr` 5) s
       pure ptr
 
 chatReadFile :: FilePath -> ByteString -> ByteString -> IO (Either String LB.ByteString)

src/Simplex/Chat/Mobile/Shared.hs

@@ -1,19 +1,48 @@
+{-# LANGUAGE LambdaCase #-}
+
 module Simplex.Chat.Mobile.Shared where
 
 import qualified Data.ByteString as B
-import Data.ByteString.Internal (ByteString (PS), memcpy)
+import Data.ByteString.Internal (ByteString (..), memcpy)
+import qualified Data.ByteString.Lazy as LB
+import qualified Data.ByteString.Lazy.Internal as LB
 import Foreign.C (CInt, CString)
-import Foreign (Ptr, Word8, newForeignPtr_, plusPtr)
-import Foreign.ForeignPtr.Unsafe
+import Foreign
 
 type CJSONString = CString
 
+type JSONByteString = LB.ByteString
+
 getByteString :: Ptr Word8 -> CInt -> IO ByteString
 getByteString ptr len = do
   fp <- newForeignPtr_ ptr
   pure $ PS fp 0 $ fromIntegral len
+{-# INLINE getByteString #-}
 
 putByteString :: Ptr Word8 -> ByteString -> IO ()
-putByteString ptr bs@(PS fp offset _)  = do
-  let p = unsafeForeignPtrToPtr fp `plusPtr` offset
-  memcpy ptr p $ B.length bs
+putByteString ptr (PS fp offset len) =
+  withForeignPtr fp $ \p -> memcpy ptr (p `plusPtr` offset) len
+{-# INLINE putByteString #-}
+
+putLazyByteString :: Ptr Word8 -> LB.ByteString -> IO ()
+putLazyByteString ptr = \case
+  LB.Empty -> pure ()
+  LB.Chunk ch s -> do
+    putByteString ptr ch
+    putLazyByteString (ptr `plusPtr` B.length ch) s
+
+newCStringFromBS :: ByteString -> IO CString
+newCStringFromBS s = do
+  let len = B.length s
+  buf <- mallocBytes (len + 1)
+  putByteString buf s
+  pokeByteOff buf len (0 :: Word8)
+  pure $ castPtr buf
+
+newCStringFromLazyBS :: LB.ByteString -> IO CString
+newCStringFromLazyBS s = do
+  let len = fromIntegral $ LB.length s
+  buf <- mallocBytes (len + 1)
+  putLazyByteString buf s
+  pokeByteOff buf len (0 :: Word8)
+  pure $ castPtr buf

src/Simplex/Chat/Mobile/WebRTC.hs

@@ -8,9 +8,7 @@ module Simplex.Chat.Mobile.WebRTC (
   reservedSize,
 ) where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import qualified Crypto.Cipher.Types as AES
 import Data.Bifunctor (bimap)
 import qualified Data.ByteArray as BA

src/Simplex/Chat/Protocol.hs

@@ -13,8 +13,6 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TypeApplications #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Protocol where
 
 import Control.Applicative ((<|>))

src/Simplex/Chat/Store/Connections.hs

@@ -5,8 +5,6 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TypeOperators #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Store.Connections
   ( getConnectionEntity,
     getConnectionsToSubscribe,
@@ -15,7 +13,6 @@ module Simplex.Chat.Store.Connections
 where
 
 import Control.Applicative ((<|>))
-import Control.Monad
 import Control.Monad.Except
 import Data.Int (Int64)
 import Data.Maybe (catMaybes, fromMaybe)

src/Simplex/Chat/Store/Direct.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
@@ -8,8 +7,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Store.Direct
   ( updateContact_,
     updateContactProfile_,
@@ -64,9 +61,7 @@ module Simplex.Chat.Store.Direct
   )
 where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Data.Either (rights)
 import Data.Functor (($>))
 import Data.Int (Int64)
@@ -461,7 +456,7 @@ createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (Vers
         ExceptT $
           maybeM getContactRequestByXContactId xContactId_ >>= \case
             Nothing -> createContactRequest
-            Just cr -> updateContactRequest cr $> Right cr.contactRequestId
+            Just cr -> updateContactRequest cr $> Right (contactRequestId (cr :: UserContactRequest))
       getContactRequest db user cReqId
     createContactRequest :: IO (Either StoreError Int64)
     createContactRequest = do

src/Simplex/Chat/Store/Files.hs

@@ -76,9 +76,7 @@ module Simplex.Chat.Store.Files
 where
 
 import Control.Applicative ((<|>))
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Data.Either (rights)
 import Data.Int (Int64)
 import Data.Maybe (fromMaybe, isJust, listToMaybe)
@@ -486,7 +484,7 @@ createRcvFileTransfer :: DB.Connection -> UserId -> Contact -> FileInvitation ->
 createRcvFileTransfer db userId Contact {contactId, localDisplayName = c} f@FileInvitation {fileName, fileSize, fileConnReq, fileInline, fileDescr} rcvFileInline chunkSize = do
   currentTs <- liftIO getCurrentTime
   rfd_ <- mapM (createRcvFD_ db userId currentTs) fileDescr
-  let rfdId = (\RcvFileDescr {fileDescrId} -> fileDescrId) <$> rfd_
+  let rfdId = (fileDescrId :: RcvFileDescr -> Int64) <$> rfd_
       -- cryptoArgs = Nothing here, the decision to encrypt is made when receiving it
       xftpRcvFile = (\rfd -> XFTPRcvFile {rcvFileDescription = rfd, agentRcvFileId = Nothing, agentRcvFileDeleted = False}) <$> rfd_
       fileProtocol = if isJust rfd_ then FPXFTP else FPSMP
@@ -507,7 +505,7 @@ createRcvGroupFileTransfer :: DB.Connection -> UserId -> GroupMember -> FileInvi
 createRcvGroupFileTransfer db userId GroupMember {groupId, groupMemberId, localDisplayName = c} f@FileInvitation {fileName, fileSize, fileConnReq, fileInline, fileDescr} rcvFileInline chunkSize = do
   currentTs <- liftIO getCurrentTime
   rfd_ <- mapM (createRcvFD_ db userId currentTs) fileDescr
-  let rfdId = (\RcvFileDescr {fileDescrId} -> fileDescrId) <$> rfd_
+  let rfdId = (fileDescrId :: RcvFileDescr -> Int64) <$> rfd_
       -- cryptoArgs = Nothing here, the decision to encrypt is made when receiving it
       xftpRcvFile = (\rfd -> XFTPRcvFile {rcvFileDescription = rfd, agentRcvFileId = Nothing, agentRcvFileDeleted = False}) <$> rfd_
       fileProtocol = if isJust rfd_ then FPXFTP else FPSMP

src/Simplex/Chat/Store/Groups.hs

@@ -8,9 +8,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE OverloadedRecordDot #-}
-
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Store.Groups
   ( -- * Util methods
@@ -98,9 +95,7 @@ module Simplex.Chat.Store.Groups
   )
 where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG)
 import Data.Either (rights)
 import Data.Int (Int64)
@@ -890,7 +885,7 @@ saveIntroInvitation db reMember toMember introInv = do
         WHERE group_member_intro_id = :intro_id
       |]
       [ ":intro_status" := GMIntroInvReceived,
-        ":group_queue_info" := introInv.groupConnReq,
+        ":group_queue_info" := groupConnReq (introInv :: IntroInvitation),
         ":direct_queue_info" := directConnReq introInv,
         ":updated_at" := currentTs,
         ":intro_id" := introId intro
@@ -938,7 +933,7 @@ getIntroduction_ db reMember toMember = ExceptT $ do
 createIntroReMember :: DB.Connection -> User -> GroupInfo -> GroupMember -> MemberInfo -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> ExceptT StoreError IO GroupMember
 createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupMember {memberContactId, activeConn} memInfo@(MemberInfo _ _ memberChatVRange memberProfile) (groupCmdId, groupAgentConnId) directConnIds customUserProfileId subMode = do
   let mcvr = maybe chatInitialVRange fromChatVRange memberChatVRange
-      cLevel = 1 + maybe 0 (\Connection {connLevel} -> connLevel) activeConn
+      cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
   currentTs <- liftIO getCurrentTime
   newMember <- case directConnIds of
     Just (directCmdId, directAgentConnId) -> do
@@ -957,7 +952,7 @@ createIntroReMember db user@User {userId} gInfo@GroupInfo {groupId} _host@GroupM
 
 createIntroToMemberContact :: DB.Connection -> User -> GroupMember -> GroupMember -> VersionRange -> (CommandId, ConnId) -> Maybe (CommandId, ConnId) -> Maybe ProfileId -> SubscriptionMode -> IO ()
 createIntroToMemberContact db user@User {userId} GroupMember {memberContactId = viaContactId, activeConn} _to@GroupMember {groupMemberId, localDisplayName} mcvr (groupCmdId, groupAgentConnId) directConnIds customUserProfileId subMode = do
-  let cLevel = 1 + maybe 0 (\Connection {connLevel} -> connLevel) activeConn
+  let cLevel = 1 + maybe 0 (connLevel :: Connection -> Int) activeConn
   currentTs <- getCurrentTime
   Connection {connId = groupConnId} <- createMemberConnection_ db userId groupMemberId groupAgentConnId mcvr viaContactId cLevel currentTs subMode
   setCommandConnId db user groupCmdId groupConnId
@@ -1558,7 +1553,7 @@ createMemberContactInvited
     contactId <- createContactUpdateMember currentTs userPreferences
     ctConn <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
     let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = ctConn, viaGroup = Nothing, contactUsed = True, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False}
+        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = ctConn, viaGroup = Nothing, contactUsed = True, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
         m' = m {memberContactId = Just contactId}
     pure (mCt', m')
     where

src/Simplex/Chat/Store/Messages.hs

@@ -10,8 +10,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Store.Messages
   ( getContactConnIds_,
     getDirectChatReactions_,
@@ -98,9 +96,7 @@ module Simplex.Chat.Store.Messages
   )
 where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG)
 import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)

src/Simplex/Chat/Store/Profiles.hs

@@ -7,8 +7,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
 
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
-
 module Simplex.Chat.Store.Profiles
   ( AutoAccept (..),
     UserMsgReceiptSettings (..),
@@ -56,9 +54,7 @@ module Simplex.Chat.Store.Profiles
   )
 where
 
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as J
 import Data.Functor (($>))
@@ -294,7 +290,7 @@ getUserContactProfiles db User {userId} =
       |]
       (Only userId)
   where
-    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) -> Profile
+    toContactProfile :: (ContactName, Text, Maybe ImageData, Maybe ConnReqContact, Maybe Preferences) -> (Profile)
     toContactProfile (displayName, fullName, image, contactLink, preferences) = Profile {displayName, fullName, image, contactLink, preferences}
 
 createUserContactLink :: DB.Connection -> User -> ConnId -> ConnReqContact -> SubscriptionMode -> ExceptT StoreError IO ()

src/Simplex/Chat/Store/Shared.hs

@@ -10,11 +10,10 @@
 
 module Simplex.Chat.Store.Shared where
 
+import Control.Concurrent.STM (stateTVar)
 import Control.Exception (Exception)
 import qualified Control.Exception as E
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG, randomBytesGenerate)
 import Data.Aeson (ToJSON)
 import qualified Data.Aeson as J

src/Simplex/Chat/Terminal.hs

@@ -5,7 +5,7 @@
 module Simplex.Chat.Terminal where
 
 import Control.Exception (handle, throwIO)
-import Control.Monad
+import Control.Monad.Except
 import qualified Data.List.NonEmpty as L
 import Database.SQLite.Simple (SQLError (..))
 import qualified Database.SQLite.Simple as DB

src/Simplex/Chat/Terminal/Input.hs

@@ -12,7 +12,6 @@ module Simplex.Chat.Terminal.Input where
 
 import Control.Applicative (optional, (<|>))
 import Control.Concurrent (forkFinally, forkIO, killThread, mkWeakThreadId, threadDelay)
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import qualified Data.Attoparsec.ByteString.Char8 as A

src/Simplex/Chat/Terminal/Output.hs

@@ -9,7 +9,6 @@
 module Simplex.Chat.Terminal.Output where
 
 import Control.Concurrent (ThreadId)
-import Control.Monad
 import Control.Monad.Catch (MonadMask)
 import Control.Monad.Except
 import Control.Monad.Reader

src/Simplex/Chat/Types.hs

@@ -16,8 +16,6 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE OverloadedRecordDot #-}
-
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 {-# HLINT ignore "Use newtype instead of data" #-}
@@ -58,21 +56,21 @@ class IsContact a where
   preferences' :: a -> Maybe Preferences
 
 instance IsContact User where
-  contactId' u = u.userContactId
+  contactId' = userContactId
   {-# INLINE contactId' #-}
-  profile' u = u.profile
+  profile' = profile
   {-# INLINE profile' #-}
-  localDisplayName' u = u.localDisplayName
+  localDisplayName' = localDisplayName
   {-# INLINE localDisplayName' #-}
   preferences' User {profile = LocalProfile {preferences}} = preferences
   {-# INLINE preferences' #-}
 
 instance IsContact Contact where
-  contactId' c = c.contactId
+  contactId' = contactId
   {-# INLINE contactId' #-}
-  profile' c = c.profile
+  profile' = profile
   {-# INLINE profile' #-}
-  localDisplayName' c = c.localDisplayName
+  localDisplayName' = localDisplayName
   {-# INLINE localDisplayName' #-}
   preferences' Contact {profile = LocalProfile {preferences}} = preferences
   {-# INLINE preferences' #-}
@@ -185,7 +183,7 @@ instance ToJSON Contact where
   toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
 
 contactConn :: Contact -> Connection
-contactConn Contact{activeConn} = activeConn
+contactConn = activeConn
 
 contactConnId :: Contact -> ConnId
 contactConnId = aConnId . contactConn
@@ -468,7 +466,7 @@ instance ToJSON LocalProfile where
   toEncoding = J.genericToEncoding J.defaultOptions {J.omitNothingFields = True}
 
 localProfileId :: LocalProfile -> ProfileId
-localProfileId LocalProfile{profileId} = profileId
+localProfileId = profileId
 
 toLocalProfile :: ProfileId -> Profile -> LocalAlias -> LocalProfile
 toLocalProfile profileId Profile {displayName, fullName, image, contactLink, preferences} localAlias =
@@ -629,7 +627,7 @@ groupMemberRef GroupMember {groupMemberId, memberProfile = p} =
   GroupMemberRef {groupMemberId, profile = fromLocalProfile p}
 
 memberConn :: GroupMember -> Maybe Connection
-memberConn GroupMember{activeConn} = activeConn
+memberConn = activeConn
 
 memberConnId :: GroupMember -> Maybe ConnId
 memberConnId GroupMember {activeConn} = aConnId <$> activeConn
@@ -1393,8 +1391,6 @@ serializeIntroStatus = \case
 
 data Notification = Notification {title :: Text, text :: Text}
 
-type JSONString = String
-
 textParseJSON :: TextEncoding a => String -> J.Value -> JT.Parser a
 textParseJSON name = J.withText name $ maybe (fail $ "bad " <> name) pure . textDecode
 

src/Simplex/Chat/Types/Preferences.hs

@@ -8,15 +8,12 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
-
 {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 {-# HLINT ignore "Use newtype instead of data" #-}
 
@@ -88,12 +85,12 @@ allChatFeatures =
   ]
 
 chatPrefSel :: SChatFeature f -> Preferences -> Maybe (FeaturePreference f)
-chatPrefSel f ps = case f of
-  SCFTimedMessages -> ps.timedMessages
-  SCFFullDelete -> ps.fullDelete
-  SCFReactions -> ps.reactions
-  SCFVoice -> ps.voice
-  SCFCalls -> ps.calls
+chatPrefSel = \case
+  SCFTimedMessages -> timedMessages
+  SCFFullDelete -> fullDelete
+  SCFReactions -> reactions
+  SCFVoice -> voice
+  SCFCalls -> calls
 
 chatFeature :: SChatFeature f -> ChatFeature
 chatFeature = \case
@@ -113,12 +110,12 @@ instance PreferenceI (Maybe Preferences) where
   getPreference f prefs = fromMaybe (getPreference f defaultChatPrefs) (chatPrefSel f =<< prefs)
 
 instance PreferenceI FullPreferences where
-  getPreference f ps = case f of
-    SCFTimedMessages -> ps.timedMessages
-    SCFFullDelete -> ps.fullDelete
-    SCFReactions -> ps.reactions
-    SCFVoice -> ps.voice
-    SCFCalls -> ps.calls
+  getPreference = \case
+    SCFTimedMessages -> timedMessages
+    SCFFullDelete -> fullDelete
+    SCFReactions -> reactions
+    SCFVoice -> voice
+    SCFCalls -> calls
   {-# INLINE getPreference #-}
 
 setPreference :: forall f. FeatureI f => SChatFeature f -> Maybe FeatureAllowed -> Maybe Preferences -> Preferences
@@ -218,13 +215,13 @@ allGroupFeatures =
   ]
 
 groupPrefSel :: SGroupFeature f -> GroupPreferences -> Maybe (GroupFeaturePreference f)
-groupPrefSel f ps = case f of
-  SGFTimedMessages -> ps.timedMessages
-  SGFDirectMessages -> ps.directMessages
-  SGFFullDelete -> ps.fullDelete
-  SGFReactions -> ps.reactions
-  SGFVoice -> ps.voice
-  SGFFiles -> ps.files
+groupPrefSel = \case
+  SGFTimedMessages -> timedMessages
+  SGFDirectMessages -> directMessages
+  SGFFullDelete -> fullDelete
+  SGFReactions -> reactions
+  SGFVoice -> voice
+  SGFFiles -> files
 
 toGroupFeature :: SGroupFeature f -> GroupFeature
 toGroupFeature = \case
@@ -245,13 +242,13 @@ instance GroupPreferenceI (Maybe GroupPreferences) where
   getGroupPreference pt prefs = fromMaybe (getGroupPreference pt defaultGroupPrefs) (groupPrefSel pt =<< prefs)
 
 instance GroupPreferenceI FullGroupPreferences where
-  getGroupPreference f ps = case f of
-    SGFTimedMessages -> ps.timedMessages
-    SGFDirectMessages -> ps.directMessages
-    SGFFullDelete -> ps.fullDelete
-    SGFReactions -> ps.reactions
-    SGFVoice -> ps.voice
-    SGFFiles -> ps.files
+  getGroupPreference = \case
+    SGFTimedMessages -> timedMessages
+    SGFDirectMessages -> directMessages
+    SGFFullDelete -> fullDelete
+    SGFReactions -> reactions
+    SGFVoice -> voice
+    SGFFiles -> files
   {-# INLINE getGroupPreference #-}
 
 -- collection of optional group preferences
@@ -431,19 +428,19 @@ class (Eq (FeaturePreference f), HasField "allow" (FeaturePreference f) FeatureA
   prefParam :: FeaturePreference f -> Maybe Int
 
 instance HasField "allow" TimedMessagesPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, p.allow)
+  hasField p = (\allow -> p {allow}, allow (p :: TimedMessagesPreference))
 
 instance HasField "allow" FullDeletePreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, p.allow)
+  hasField p = (\allow -> p {allow}, allow (p :: FullDeletePreference))
 
 instance HasField "allow" ReactionsPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, p.allow)
+  hasField p = (\allow -> p {allow}, allow (p :: ReactionsPreference))
 
 instance HasField "allow" VoicePreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, p.allow)
+  hasField p = (\allow -> p {allow}, allow (p :: VoicePreference))
 
 instance HasField "allow" CallsPreference FeatureAllowed where
-  hasField p = (\allow -> p {allow}, p.allow)
+  hasField p = (\allow -> p {allow}, allow (p :: CallsPreference))
 
 instance FeatureI 'CFTimedMessages where
   type FeaturePreference 'CFTimedMessages = TimedMessagesPreference
@@ -520,25 +517,25 @@ class (Eq (GroupFeaturePreference f), HasField "enable" (GroupFeaturePreference
   groupPrefParam :: GroupFeaturePreference f -> Maybe Int
 
 instance HasField "enable" GroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: GroupPreference))
 
 instance HasField "enable" TimedMessagesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: TimedMessagesGroupPreference))
 
 instance HasField "enable" DirectMessagesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: DirectMessagesGroupPreference))
 
 instance HasField "enable" ReactionsGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: ReactionsGroupPreference))
 
 instance HasField "enable" FullDeleteGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: FullDeleteGroupPreference))
 
 instance HasField "enable" VoiceGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: VoiceGroupPreference))
 
 instance HasField "enable" FilesGroupPreference GroupFeatureEnabled where
-  hasField p = (\enable -> p {enable}, p.enable)
+  hasField p = (\enable -> p {enable}, enable (p :: FilesGroupPreference))
 
 instance GroupFeatureI 'GFTimedMessages where
   type GroupFeaturePreference 'GFTimedMessages = TimedMessagesGroupPreference
@@ -773,9 +770,9 @@ preferenceState pref =
    in (allow, param)
 
 getContactUserPreference :: SChatFeature f -> ContactUserPreferences -> ContactUserPreference (FeaturePreference f)
-getContactUserPreference f ps = case f of
-  SCFTimedMessages -> ps.timedMessages
-  SCFFullDelete -> ps.fullDelete
-  SCFReactions -> ps.reactions
-  SCFVoice -> ps.voice
-  SCFCalls -> ps.calls
+getContactUserPreference = \case
+  SCFTimedMessages -> timedMessages
+  SCFFullDelete -> fullDelete
+  SCFReactions -> reactions
+  SCFVoice -> voice
+  SCFCalls -> calls

src/Simplex/Chat/View.hs

@@ -7,7 +7,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 
 module Simplex.Chat.View where
 
@@ -192,7 +191,7 @@ responseToView user_ ChatConfig {logLevel, showReactions, showReceipts, testView
   CRContactConnecting u _ -> ttyUser u []
   CRContactConnected u ct userCustomProfile -> ttyUser u $ viewContactConnected ct userCustomProfile testView
   CRContactAnotherClient u c -> ttyUser u [ttyContact' c <> ": contact is connected to another client"]
-  CRSubscriptionEnd u acEntity -> ttyUser u [sShow ((entityConnection acEntity).connId) <> ": END"]
+  CRSubscriptionEnd u acEntity -> ttyUser u [sShow (connId (entityConnection acEntity :: Connection)) <> ": END"]
   CRContactsDisconnected srv cs -> [plain $ "server disconnected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
   CRContactsSubscribed srv cs -> [plain $ "server connected " <> showSMPServer srv <> " (" <> contactList cs <> ")"]
   CRContactSubError u c e -> ttyUser u [ttyContact' c <> ": contact error " <> sShow e]
@@ -687,9 +686,7 @@ viewChatCleared (AChatInfo _ chatInfo) = case chatInfo of
 
 viewContactsList :: [Contact] -> [StyledString]
 viewContactsList =
-  let getLDN :: Contact -> ContactName
-      getLDN Contact{localDisplayName} = localDisplayName
-      ldn = T.toLower . getLDN
+  let ldn = T.toLower . (localDisplayName :: Contact -> ContactName)
    in map (\ct -> ctIncognito ct <> ttyFullContact ct <> muted' ct <> alias ct) . sortOn ldn
   where
     muted' Contact {chatSettings, localDisplayName = ldn}
@@ -827,8 +824,7 @@ viewGroupMembers (Group GroupInfo {membership} members) = map groupMember . filt
   where
     removedOrLeft m = let s = memberStatus m in s == GSMemRemoved || s == GSMemLeft
     groupMember m = memIncognito m <> ttyFullMember m <> ": " <> role m <> ", " <> category m <> status m
-    role :: GroupMember -> StyledString
-    role m = plain . strEncode $ m.memberRole
+    role m = plain . strEncode $ memberRole (m :: GroupMember)
     category m = case memberCategory m of
       GCUserMember -> "you, "
       GCInviteeMember -> "invited, "
@@ -860,10 +856,9 @@ viewContactConnected ct@Contact {localDisplayName} userIncognitoProfile testView
 
 viewGroupsList :: [(GroupInfo, GroupSummary)] -> [StyledString]
 viewGroupsList [] = ["you have no groups!", "to create: " <> highlight' "/g <name>"]
-viewGroupsList gs = map groupSS $ sortOn (ldn_ . fst) gs
+viewGroupsList gs = map groupSS $ sortOn ldn_ gs
   where
-    ldn_ :: GroupInfo -> Text
-    ldn_ g = T.toLower g.localDisplayName
+    ldn_ = T.toLower . (localDisplayName :: GroupInfo -> GroupName) . fst
     groupSS (g@GroupInfo {localDisplayName = ldn, groupProfile = GroupProfile {fullName}, membership, chatSettings}, GroupSummary {currentMembers}) =
       case memberStatus membership of
         GSMemInvited -> groupInvitation' g
@@ -1411,8 +1406,7 @@ viewFileTransferStatus (FTSnd FileTransferMeta {cancelled} fts@(ft : _), chunksN
       case concatMap recipientsTransferStatus $ groupBy ((==) `on` fs) $ sortOn fs fts of
         [recipientsStatus] -> ["sending " <> sndFile ft <> " " <> recipientsStatus]
         recipientsStatuses -> ("sending " <> sndFile ft <> ": ") : map ("  " <>) recipientsStatuses
-    fs :: SndFileTransfer -> FileStatus
-    fs SndFileTransfer{fileStatus} = fileStatus
+    fs = fileStatus :: SndFileTransfer -> FileStatus
     recipientsTransferStatus [] = []
     recipientsTransferStatus ts@(SndFileTransfer {fileStatus, fileSize, chunkSize} : _) = [sndStatus <> ": " <> listRecipients ts]
       where
@@ -1675,8 +1669,7 @@ viewChatError logLevel = \case
         Just entity@(UserContactConnection conn UserContact {userContactLinkId}) ->
           "[" <> connEntityLabel entity <> ", userContactLinkId: " <> sShow userContactLinkId <> ", connId: " <> cId conn <> "] "
         Nothing -> ""
-      cId :: Connection -> StyledString
-      cId conn = sShow conn.connId
+      cId conn = sShow (connId (conn :: Connection))
   where
     fileNotFound fileId = ["file " <> sShow fileId <> " not found"]
     sqliteError' = \case

stack.yaml

@@ -49,24 +49,20 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: 3828a9591c095651d3eb12c7b9edf564b21451d4
+    commit: 53c793d5590d3c781aa3fbf72993eee262c7aa83
   - github: kazu-yamamoto/http2
     commit: b5a1b7200cf5bc7044af34ba325284271f6dff25
   # - ../direct-sqlcipher
   - github: simplex-chat/direct-sqlcipher
-    commit: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
+    commit: 34309410eb2069b029b8fc1872deb1e0db123294
   # - ../sqlcipher-simple
   - github: simplex-chat/sqlcipher-simple
-    commit: a46bd361a19376c5211f1058908fc0ae6bf42446
+    commit: 5e154a2aeccc33ead6c243ec07195ab673137221
   # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
   - github: simplex-chat/aeson
-    commit: 68330dce8208173c6acf5f62b23acb500ab5d873
+    commit: 3eb66f9a68f103b5f1489382aad89f5712a64db7
   - github: simplex-chat/haskell-terminal
     commit: f708b00009b54890172068f168bf98508ffcd495
-  - github: simplex-chat/android-support
-    commit: 9aa09f148089d6752ce563b14c2df1895718d806
-  - github: simplex-chat/network-transport
-    commit: 0013798272a683e35ca38d2fdaf480942311fba8
 #
 # extra-deps: []
 

tests/Bots/BroadcastTests.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Bots.BroadcastTests where
@@ -34,7 +33,7 @@ broadcastBotProfile = Profile {displayName = "broadcast_bot", fullName = "Broadc
 mkBotOpts :: FilePath -> [KnownContact] -> BroadcastBotOpts
 mkBotOpts tmp publishers =
   BroadcastBotOpts
-    { coreOptions = testOpts.coreOptions {dbFilePrefix = tmp </> botDbPrefix},
+    { coreOptions = (coreOptions (testOpts :: ChatOpts)) {dbFilePrefix = tmp </> botDbPrefix},
       publishers,
       welcomeMessage = defaultWelcomeMessage publishers,
       prohibitedMessage = defaultWelcomeMessage publishers

tests/Bots/DirectoryTests.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PostfixOperators #-}
 
@@ -61,7 +60,7 @@ directoryProfile = Profile {displayName = "SimpleX-Directory", fullName = "", im
 mkDirectoryOpts :: FilePath -> [KnownContact] -> DirectoryOpts
 mkDirectoryOpts tmp superUsers =
   DirectoryOpts
-    { coreOptions = testOpts.coreOptions {dbFilePrefix = tmp </> serviceDbPrefix},
+    { coreOptions = (coreOptions (testOpts :: ChatOpts)) {dbFilePrefix = tmp </> serviceDbPrefix},
       superUsers,
       directoryLog = Just $ tmp </> "directory_service.log",
       serviceName = "SimpleX-Directory",