rfc: user per-service per-device identities

* multiplatform: file structure

* apk file name

* more paths in sources

* lint issues and apk file name

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,68 @@
+name: Bug
+description: File a bug report/issue
+title: "[Bug]: "
+labels: ["bug", "triage"]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: dropdown
+  attributes:
+    label: Platform
+    description: Multiple selections are possible.
+    multiple: true
+    options:
+      - Linux
+      - Mac
+      - Windows
+      - Android
+      - iOS
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: OS version
+    description: Specify the OS version
+    placeholder: ex. Android 12, Ubuntu 20.04
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: App version
+    description: Specify the SimpleX version
+    placeholder: ex. 4.3.2
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+    placeholder: Bug happened!
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+    placeholder: No bug should happen!
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. Go to ...
+      3. Click on ...
+      4. See error...
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Relevant log output
+    description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+    render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,40 @@
+name: Feature
+description: Suggest your feature
+title: "[Feature]: "
+labels: ["enhancement", "triage"]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: dropdown
+  attributes:
+    label: Platform
+    description: Multiple selections are possible. If selected input is "all", this considered to be a general feature.
+    multiple: true
+    options:
+      - Linux
+      - Mac
+      - Windows
+      - Android
+      - iOS
+      - all
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: App version
+    description: Specify the SimpleX version
+    placeholder: ex. 4.3.2
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Feature
+    description: Describe the feature you would like to see added
+    placeholder: SimpleX Chat should make me coffee! 
+  validations:
+    required: true

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,16 @@
+name: Question
+description: Ask your question
+title: "[Q]: "
+labels: ["question", "triage"]
+body:
+- type: markdown
+  attributes:
+    value: |
+      Generally, we encourage you to ask questions in our [official group](https://simplex.chat/invitation/#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3Dsimplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D), but you can do it anyway :)
+- type: textarea
+  attributes:
+    label: Question
+    description: Please ask your question in plain english.
+    placeholder: Is SimpleX - chat?
+  validations:
+    required: true

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - stable
-      - sqlcipher
+      - users
     tags:
       - "v*"
   pull_request:
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v1
+        uses: mikepenz/release-changelog-builder-action@v4
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -52,9 +52,9 @@ jobs:
           - os: ubuntu-20.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
-          - os: ubuntu-18.04
+          - os: ubuntu-22.04
             cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-18_04-x86-64
+            asset_name: simplex-chat-ubuntu-22_04-x86-64
           - os: macos-latest
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
@@ -62,17 +62,25 @@ jobs:
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
     steps:
+      - name: Configure pagefile (Windows)
+        if: matrix.os == 'windows-latest'
+        uses: al-cheb/configure-pagefile-action@v1.3
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
+
       - name: Clone project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: "8.10.7"
           cabal-version: "latest"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ matrix.cache_path }}
@@ -91,8 +99,12 @@ jobs:
           echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
           echo "    flags: +openssl"                                        >> cabal.project.local
 
+      - name: Install pkg-config for Mac
+        if: matrix.os == 'macos-latest'
+        run: brew install pkg-config
+
       - name: Unix prepare cabal.project.local for Ubuntu
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04'
+        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
         shell: bash
         run: |
           echo "ignore-project: False"    >> cabal.project.local
@@ -107,11 +119,6 @@ jobs:
           cabal build --enable-tests
           echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
 
-      - name: Unix test
-        if: matrix.os != 'windows-latest'
-        shell: bash
-        run: cabal test --test-show-details=direct
-
       - name: Unix upload binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: svenstaro/upload-release-action@v2
@@ -121,6 +128,12 @@ jobs:
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 
+      - name: Unix test
+        if: matrix.os != 'windows-latest'
+        timeout-minutes: 30
+        shell: bash
+        run: cabal test --test-show-details=direct
+
       # Unix /
 
       # / Windows

.github/workflows/web.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -42,12 +42,15 @@ stack.yaml.lock
 
 # Temporary test files
 tests/tmp
+tests/tmp*
 logs/
 
-
+*.devcontainer
 # for website
 website/node_modules/
 website/src/blog/
+website/src/docs/
+website/translations.json
 website/src/img/images/
 website/src/images/
 # Generated files
@@ -72,3 +75,4 @@ website/package-lock.json
 # Ignore test files
 website/.cache
 website/test/stubs-layout-cache/_includes/*.js
+apps/android/app/release

Dockerfile

@@ -1,10 +1,32 @@
-FROM haskell:8.10.4 AS build-stage
-# if you encounter "version `GLIBC_2.28' not found" error when running
-# chat client executable, build with the following base image instead:
-# FROM haskell:8.10.4-stretch AS build-stage
+FROM ubuntu:focal AS build
+
+# Install curl and simplex-chat-related dependencies
+RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev libssl-dev
+
+# Install ghcup
+RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup
+
+# Install ghc
+RUN ghcup install ghc 8.10.7
+# Install cabal
+RUN ghcup install cabal
+# Set both as default
+RUN ghcup set ghc 8.10.7 && \
+    ghcup set cabal
+
 COPY . /project
 WORKDIR /project
-RUN stack install
+
+# Adjust PATH
+ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+
+# Adjust build
+RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
+
+# Compile simplex-chat
+RUN cabal update
+RUN cabal install
 
 FROM scratch AS export-stage
-COPY --from=build-stage /root/.local/bin/simplex-chat /
+COPY --from=build /root/.cabal/bin/simplex-chat /

PRIVACY.md

@@ -1,22 +1,26 @@
 # SimpleX Chat Terms & Privacy Policy
 
-SimpleX Chat is the first chat platform that is 100% private by design - not only it has no access to your messages (thanks to open-source double-ratchet end-to-end encryption protocol and additional encryption layers), it also has no access to your profile and contacts - we do not have access to your connections graph.
+SimpleX Chat is the first communication platform that has no user profile IDs of any kind, not even random numbers. Not only it has no access to your messages (thanks to open-source double-ratchet end-to-end encryption protocol and additional encryption layers), it also has no access to your profile and contacts - we cannot observe your connections graph.
+
+If you believe that some of the clauses in this document are not aligned with our mission or principles, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Privacy Policy
 
 SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
 
+SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+
 ### Information you provide
 
 We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
 
-Messages. SimpleX Chat cannot decrypt or otherwise access the content or size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are temporarily offline. Your message history is stored only on your own devices.
+Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
 
-Connections with other users. When you create a connection with another user, two messaging queues are created on our servers (we use separate queues for direct and response messages, that can be on two different servers), or on the servers that you configured in the app, in case it allows such configuration. At the time of updating this document only our terminal app allows configuring the servers, our mobile apps will allow such configuration in the near future. Our servers do not store information about which queues are linked to your profile on the device, and they do not have any information in common that allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of unique encryption keys, different for each queue, and separate for sender and recipient of the messages that are transmitted through the queue.
+Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
 
 Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.
 
-User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support via chat, when it is possible.
+User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
 
 ### Information we may share
 
@@ -31,6 +35,8 @@ The cases when SimpleX Chat may need to share the data we temporarily store on t
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
 - To protect against harm to the rights, property, or safety of SimpleX Chat, our users, or the public as required or permitted by law.
 
+At the time of updating this document, we have never provided or have been requested the access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process.
+
 ### Updates
 
 We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
@@ -47,7 +53,7 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a
 
 **Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
 
-**Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per users - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.
+**Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.
 
 **Operating our services**. For the purpose of operating our Services, you agree that your end-to-end encrypted messages are transferred via our servers in the United Kingdom, the United States and other countries where we have or use facilities and service providers or partners.
 
@@ -87,4 +93,4 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a
 
 **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.
 
-Updated March 1, 2022
+Updated November 8, 2022

README.md

@@ -1,12 +1,28 @@
+[![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
+[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
+[![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
+[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
+[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
+
+| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
+
 <img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
 
 # SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design!
 
-[![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
-[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
-[![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
-[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/SimpleXChat)
-[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
+[<img src="./images/trail-of-bits.jpg" height="100">](http://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html) &nbsp;&nbsp;&nbsp; [<img src="./images/privacy-guides.jpg" height="80">](https://www.privacyguides.org/en/real-time-communication/#simplex-chat) &nbsp;&nbsp;&nbsp; [<img src="./images/kuketz-blog.jpg" height="80">](https://www.kuketz-blog.de/simplex-eindruecke-vom-messenger-ohne-identifier/)
+
+## Welcome to SimpleX Chat!
+
+1. 📲 [Install the app](#install-the-app).
+2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
+3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
+4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
+5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
+
+[Learn more about SimpleX Chat](#contents).
+
+## Install the app
 
 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
 &nbsp;
@@ -16,15 +32,125 @@
 &nbsp;
 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
 &nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)
 
 - 🖲 Protects your messages and metadata - who you talk to and when.
 - 🔐 Double ratchet end-to-end encryption, with additional encryption layer.
-- 📱 Mobile apps for Android ([Google Play](https://play.google.com/store/apps/details?id=chat.simplex.app), [APK](https://github.com/simplex-chat/website/raw/master/simplex.apk)) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084).
+- 📱 Mobile apps for Android ([Google Play](https://play.google.com/store/apps/details?id=chat.simplex.app), [APK](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084).
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
-- 🖥 Available as a terminal (console) app / CLI on Linux, MacOS, Windows.
+- 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
 
-**NEW**: v4.0 is released - now local chat database is encrypted with passphrase! See [the release announcement](./blog/20220928-simplex-chat-v4-encrypted-database.md).
+## Connect to the team via the app
+
+- to ask any questions
+- to suggest any improvements
+- to share anything relevant
+
+## Join user groups
+
+**Please note**: The groups below are created for the users to be able to ask questions, make suggestions and ask questions about SimpleX Chat only.
+
+You also can:
+- criticize the app, and make comparisons with other messengers.
+- share new messengers you think could be interesting for privacy, as long as you don't spam.
+- share some privacy related publications, infrequently.
+- having preliminary approved with the admin in direct message, share the link to a group you created.
+
+You must:
+- be polite to other users
+- avoid spam (too frequent messages, even if they are relevant)
+- avoid any personal attacks or hostility.
+- avoid sharing any content that is not relevant to the above (that includes, but is not limited to, discussing politics or any aspects of society other than privacy, security, technology and communications, sharing any content that may be found offensive by other users, etc.).
+
+Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
+
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-4](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2Fw2GlucRXtRVgYnbt_9ZP-kmt76DekxxS%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0tJhTyMGUxznwmjb7aT24P1I1Wry_iURTuhOFlMb1Eo%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22WoPxjFqGEDlVazECOSi2dg%3D%3D%22%7D)
+
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
+
+- chat bots and automations
+- integrations with other apps
+- social apps and services
+- etc.
+
+There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
+
+[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FaJ8O1O8A8GbeoaHTo_V8dcefaCl7ouPb%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA034qWTA3sWcTsi6aWhNf9BA34vKVCFaEBdP2R66z6Ao%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22wiZ1v_wNjLPlT-nCSB-bRA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
+
+You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
+
+## Make a private connection
+
+You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
+
+The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
+
+<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app1.png" alt="Make a private connection" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app2.png" alt="Conversation" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app3.png" alt="Video call" height="360">
+
+After you connect, you can [verify connection security code](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md#connection-security-verification).
+
+## User guide (NEW)
+
+Read about the app features and settings in the new [User guide](./docs/guide/README.md).
+
+## Help translating SimpleX Chat
+
+Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps, website and documents are translated to many other languages.
+
+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/)||
+|🇨🇿 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/)||
+|🇫🇷 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)|
+|🇮🇹 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/it/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/)|||
+|🇳🇱 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/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/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/)|||
+|🇨🇳 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!
+
+## Contribute
+
+We would love to have you join the development! You can help us with:
+
+- [share the color theme](./docs/THEMES.md) you use in Android app!
+- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
+- contributing to SimpleX Chat knowledge-base.
+- developing features - please connect to us via chat so we can help you get started.
+
+## 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, would make a big difference for us.
+
+It is possible to donate via:
+
+- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
+- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
+- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder
 
 ## Contents
 
@@ -36,14 +162,12 @@
   - [Users own SimpleX network](#users-own-simplex-network)
 - [Frequently asked questions](#frequently-asked-questions)
 - [News and updates](#news-and-updates)
-- [Make a private connection](#make-a-private-connection)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
 - [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
-- [Help us pay for 3rd party security audit](#help-us-pay-for-3rd-party-security-audit)
-- [Disclaimer, License](#disclaimer)
+- [Disclaimers, Security contact, License](#disclaimers)
 
 ## Why privacy matters
 
@@ -73,34 +197,36 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 ## Frequently asked questions
 
-1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release annoucement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.
+1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release announcement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.
 
-2. _Why should I not just use Signal?_ Signal is a centralised platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.
+2. _Why should I not just use Signal?_ Signal is a centralized platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.
 
-3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identites?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.
+3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identities?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.
 
 ## News and updates
 
 Recent updates:
 
-[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.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).
 
-[Sep 1, 2022. v3.2: incognito mode, support .onion server hostnames, setting contact names, changing color scheme, etc. Implementation audit is arranged for October!](./blog/20220901-simplex-chat-v3.2-incognito-mode.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).
 
-[Aug 8, 2022. v3.1: secret chat groups, access via Tor, reduced battery and traffic usage, advanced network settings, etc.](./blog/20220808-simplex-chat-v3.1-chat-groups.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).
 
-[Jul 11, 2022. v3.0: instant push notifications for iOS, e2e encrypted WebRTC audio/video calls, chat database export/import, privacy and performance improvements](./blog/20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.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).
 
 [All updates](./blog)
 
-## Make a private connection
-
-You need to share a link or scan a QR code (in person or during a video call) to make a connection and start messaging.
-
-The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
-
-<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/conversation.png" alt="Make a private connection" width="594" height="360">
-
 ## :zap: Quick installation of a terminal app
 
 ```sh
@@ -131,25 +257,27 @@ See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of m
 
 SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.
 
+We compiled a [glossary of terms](./docs/GLOSSARY.md) used to describe communication systems to help understand some terms below and to help compare advantages and disadvantages of various communication systems.
+
 What is already implemented:
 
-1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses pairwise per-queue identifiers (2 addresses for each unidirectional message queue, with an optional 3rd address for push notificaitons on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
-2. End-to-end encryption in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
-3. [Double ratchet](https://signal.org/docs/specifications/doubleratchet/) 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 (each message is encrypted by its own ephemeral key), break-in recovery (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial key agreement, initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
+1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses [pairwise per-queue identifiers](./docs/GLOSSARY.md#pairwise-pseudonymous-identifier) (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
+2. [End-to-end encryption](./docs/GLOSSARY.md#end-to-end-encryption) in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
+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 to frustrate message size attacks.
+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.
 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.
 
 We plan to add soon:
 
-1. Message queue rotation. Currently the queues created between two users are used until the contact is deleted, providing a long-term pairwise identifiers of the conversation. We are planning to add queue rotation to make these identifiers termporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+1. Automatic message queue rotation. 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).
 2. 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`.
 3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-4. Independent implementation audit.
 
 ## For developers
 
@@ -157,11 +285,13 @@ You can:
 
 - use SimpleX Chat library to integrate chat functionality into your mobile apps.
 - create chat bots and services in Haskell - see [simple](./apps/simplex-bot/) and more [advanced chat bot example](./apps/simplex-bot-advanced/).
-- create chat bots and services in any language running SimpleX Chat terminal CLI as a local WebSocket server. See [TypeScript SimpleX Chat client](./packages/simplex-chat-client/) and [JavaScipt chat bot example](./packages/simplex-chat-client/typescript/examples/squaring-bot.js).
+- create chat bots and services in any language running SimpleX Chat terminal CLI as a local WebSocket server. See [TypeScript SimpleX Chat client](./packages/simplex-chat-client/) and [JavaScript chat bot example](./packages/simplex-chat-client/typescript/examples/squaring-bot.js).
 - run [simplex-chat terminal CLI](./docs/CLI.md) to execute individual chat commands, e.g. to send messages as part of shell script execution.
 
 If you are considering developing with SimpleX platform please get in touch for any advice and support.
 
+Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) group to ask any questions and share your success stories.
+
 ## Roadmap
 
 - ✅ Easy to deploy SimpleX server with in-memory message storage, without any dependencies.
@@ -175,61 +305,78 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ Manual chat history deletion.
 - ✅ End-to-end encrypted WebRTC audio and video calls via the mobile apps.
 - ✅ Privacy preserving instant notifications for iOS using Apple Push Notification service.
-- ✅ Chat database export and import
+- ✅ Chat database export and import.
 - ✅ Chat groups in mobile apps.
 - ✅ Connecting to messaging servers via Tor.
 - ✅ Dual server addresses to access messaging servers as v3 hidden services.
 - ✅ Chat server and TypeScript client SDK to develop chat interfaces, integrations and chat bots (ready for announcement).
 - ✅ Incognito mode to share a new random name with each contact.
 - ✅ Chat database encryption.
-- 🏗 Automatic chat history deletion.
-- 🏗 SMP queue redundancy and rotation.
-- 🏗 Links to join groups and improve groups stability.
-- Feeds/broadcasts
-- Disappearing messages, with mutual agreement.
-- Voice messages
-- Video messages
+- ✅ Automatic chat history deletion.
+- ✅ Links to join groups and improve groups stability.
+- ✅ Voice messages (with recipient opt-out per contact).
+- ✅ Basic authentication for SMP servers (to authorize creating new queues).
+- ✅ View deleted messages, full message deletion by sender (with recipient opt-in per contact).
+- ✅ Block screenshots and view in recent apps.
+- ✅ Advanced server configuration.
+- ✅ Disappearing messages (with recipient opt-in per-contact).
+- ✅ "Live" messages.
+- ✅ Contact verification via a separate out-of-band channel.
+- ✅ Multiple user profiles in the same chat database.
+- ✅ Optionally avoid re-using the same TCP session for multiple connections.
+- ✅ Preserve message drafts.
+- ✅ File server to optimize for efficient and private sending of large files.
+- ✅ Improved audio & video calls.
+- ✅ Support older Android OS and 32-bit CPUs.
+- ✅ Hidden chat profiles.
+- ✅ Sending and receiving large files via [XFTP protocol](./blog/20230301-simplex-file-transfer-protocol.md).
+- ✅ Video messages.
+- ✅ App access passcode.
+- ✅ Improved Android app UI design.
+- ✅ Optional alternative access password.
+- ✅ Message reactions
+- ✅ Message editing history
+- ✅ Reduced battery and traffic usage in large groups.
+- 🏗 Desktop client.
+- 🏗 Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
+- 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.
-- Message delivery confirmation.
+- 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.
-- Channels server for large groups and broadcast channels.
-- Media server to optimize sending large files to groups.
-- Desktop client.
-- Using the same profile on multiple devices.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- High capacity multi-node SMP relays.
 
-## Help us pay for 3rd party security audit
+## Disclaimers
 
-I will get straight to the point: I ask you to support SimpleX Chat with donations.
+[SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed, and had many breaking changes and improvements in v1.0.0.
 
-We are prioritizing users privacy and security - it would be impossible without your support we were lucky to have so far.
+The security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
-We are planning a 3rd party security audit for the app, and it would hugely help us if some part of this $20,000+ expense could be covered with donations.
+SimpleX Chat is still a relatively early stage platform (the mobile apps were released in March 2022), so you may discover some bugs and missing features. We would really appreciate if you let us know anything that needs to be fixed or improved.
 
-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.
+The default servers configured in the app are provided on the best effort basis. We are currently not guaranteeing any SLAs, although historically our servers had over 99.9% uptime each.
 
-If you are already using SimpleX Chat, or plan to use it in the future when it has more features, please consider making a donation - it will help us to raise more funds. Donating any amount, even the price of the cup of coffee, would make a huge difference for us.
+We have never provided or have been requested access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will be following due legal process.
 
-It is possible to donate via:
+We do not log IP addresses of the users and we do not perform any traffic correlation on our servers. If transport level security is critical you must use Tor or some other similar network to access messaging servers. We will be improving the client applications to reduce the opportunities for traffic correlation.
 
-- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
-- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
-- Monero wallet: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin wallet: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+Please read more in [Terms & privacy policy](./PRIVACY.md).
 
-Thank you,
+## Security contact
 
-Evgeny
+To report a security vulnerability, please send us email to chat@simplex.chat. We will coordinate the fix and disclosure. Please do NOT report security vulnerabilities via GitHub issues.
 
-SimpleX Chat founder
-
-## Disclaimer
-
-[SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed and had many improvements in v1.0.0; we are currently arranging for the independent implementation audit.
-
-You are likely to discover some bugs - we would really appreciate if you use it and let us know anything that needs to be fixed or improved.
+Please treat any findings of possible traffic correlation attacks allowing to correlate two different conversations to the same user, other than covered in [the threat model](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md#threat-model), as security vulnerabilities, and follow this disclosure process.
 
 ## License
 
@@ -243,4 +390,4 @@ You are likely to discover some bugs - we would really appreciate if you use it
 &nbsp;
 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
 &nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)

apps/android/.gitignore

@@ -1,19 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/misc.xml
-/.idea/uiDesigner.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
-app/src/main/cpp/libs/

apps/android/.idea/.name

@@ -1 +0,0 @@
-SimpleX

apps/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

apps/android/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

apps/android/.idea/inspectionProfiles/Project_Default.xml

@@ -1,20 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

apps/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>

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

@@ -1,445 +0,0 @@
-package chat.simplex.app
-
-import android.app.Application
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.os.Parcelable
-import android.os.SystemClock.elapsedRealtime
-import android.util.Log
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Replay
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.*
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.NtfManager
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.SplashView
-import chat.simplex.app.views.call.ActiveCallView
-import chat.simplex.app.views.call.IncomingCallAlertView
-import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chatlist.*
-import chat.simplex.app.views.database.DatabaseErrorView
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.connectViaUri
-import chat.simplex.app.views.newchat.withUriAction
-import chat.simplex.app.views.onboarding.*
-import kotlinx.coroutines.delay
-
-class MainActivity: FragmentActivity() {
-  companion object {
-    /**
-     * We don't want these values to be bound to Activity lifecycle since activities are changed often, for example, when a user
-     * clicks on new message in notification. In this case savedInstanceState will be null (this prevents restoring the values)
-     * See [SimplexService.onTaskRemoved] for another part of the logic which nullifies the values when app closed by the user
-     * */
-    val userAuthorized = mutableStateOf<Boolean?>(null)
-    val enteredBackground = mutableStateOf<Long?>(null)
-    // Remember result and show it after orientation change
-    private val laFailed = mutableStateOf(false)
-
-    fun clearAuthState() {
-      userAuthorized.value = null
-      enteredBackground.value = null
-    }
-  }
-  private val vm by viewModels<SimplexViewModel>()
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    // testJson()
-    val m = vm.chatModel
-    // When call ended and orientation changes, it re-process old intent, it's unneeded.
-    // Only needed to be processed on first creation of activity
-    if (savedInstanceState == null) {
-      processNotificationIntent(intent, m)
-      processExternalIntent(intent, m)
-    }
-    setContent {
-      SimpleXTheme {
-        Surface(
-          Modifier
-            .background(MaterialTheme.colors.background)
-            .fillMaxSize()
-        ) {
-          MainPage(
-            m,
-            userAuthorized,
-            laFailed,
-            ::runAuthenticate,
-            ::setPerformLA,
-            showLANotice = { m.controller.showLANotice(this) }
-          )
-        }
-      }
-    }
-    SimplexApp.context.schedulePeriodicServiceRestartWorker()
-    SimplexApp.context.schedulePeriodicWakeUp()
-  }
-
-  override fun onNewIntent(intent: Intent?) {
-    super.onNewIntent(intent)
-    processIntent(intent, vm.chatModel)
-    processExternalIntent(intent, vm.chatModel)
-  }
-
-  override fun onStart() {
-    super.onStart()
-    val enteredBackgroundVal = enteredBackground.value
-    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= 30 * 1e+3) {
-      runAuthenticate()
-    }
-  }
-
-  override fun onStop() {
-    super.onStop()
-    enteredBackground.value = elapsedRealtime()
-  }
-
-  override fun onBackPressed() {
-    super.onBackPressed()
-    if (!onBackPressedDispatcher.hasEnabledCallbacks() && vm.chatModel.controller.appPrefs.performLA.get()) {
-      // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
-      clearAuthState()
-      laFailed.value = true
-    }
-    if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
-      // Drop shared content
-      SimplexApp.context.chatModel.sharedContent.value = null
-    }
-  }
-
-  private fun runAuthenticate() {
-    val m = vm.chatModel
-    if (!m.controller.appPrefs.performLA.get()) {
-      userAuthorized.value = true
-    } else {
-      userAuthorized.value = false
-      ModalManager.shared.closeModals()
-      authenticate(
-        generalGetString(R.string.auth_unlock),
-        generalGetString(R.string.auth_log_in_using_credential),
-        this@MainActivity,
-        completed = { laResult ->
-          when (laResult) {
-            LAResult.Success -> {
-              userAuthorized.value = true
-            }
-            is LAResult.Error -> {
-              laFailed.value = true
-              laErrorToast(applicationContext, laResult.errString)
-            }
-            LAResult.Failed -> {
-              laFailed.value = true
-              laFailedToast(applicationContext)
-            }
-            LAResult.Unavailable -> {
-              userAuthorized.value = true
-              m.performLA.value = false
-              m.controller.appPrefs.performLA.set(false)
-              laUnavailableTurningOffAlert()
-            }
-          }
-        }
-      )
-    }
-  }
-
-  private fun setPerformLA(on: Boolean) {
-    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
-    if (on) {
-      enableLA()
-    } else {
-      disableLA()
-    }
-  }
-
-  private fun enableLA() {
-    val m = vm.chatModel
-    authenticate(
-      generalGetString(R.string.auth_enable_simplex_lock),
-      generalGetString(R.string.auth_confirm_credential),
-      this@MainActivity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laErrorToast(applicationContext, laResult.errString)
-          }
-          LAResult.Failed -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laFailedToast(applicationContext)
-          }
-          LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableInstructionAlert()
-          }
-        }
-      }
-    )
-  }
-
-  private fun disableLA() {
-    val m = vm.chatModel
-    authenticate(
-      generalGetString(R.string.auth_disable_simplex_lock),
-      generalGetString(R.string.auth_confirm_credential),
-      this@MainActivity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-          }
-          is LAResult.Error -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laErrorToast(applicationContext, laResult.errString)
-          }
-          LAResult.Failed -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laFailedToast(applicationContext)
-          }
-          LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableTurningOffAlert()
-          }
-        }
-      }
-    )
-  }
-}
-
-class SimplexViewModel(application: Application): AndroidViewModel(application) {
-  val app = getApplication<SimplexApp>()
-  val chatModel = app.chatModel
-}
-
-@Composable
-fun MainPage(
-  chatModel: ChatModel,
-  userAuthorized: MutableState<Boolean?>,
-  laFailed: MutableState<Boolean>,
-  runAuthenticate: () -> Unit,
-  setPerformLA: (Boolean) -> Unit,
-  showLANotice: () -> Unit
-) {
-  // this with LaunchedEffect(userAuthorized.value) fixes bottom sheet visibly collapsing after authentication
-  var chatsAccessAuthorized by rememberSaveable { mutableStateOf(false) }
-  LaunchedEffect(userAuthorized.value) {
-    if (chatModel.controller.appPrefs.performLA.get()) {
-      delay(500L)
-    }
-    chatsAccessAuthorized = userAuthorized.value == true
-  }
-  var showChatDatabaseError by rememberSaveable {
-    mutableStateOf(chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null)
-  }
-  LaunchedEffect(chatModel.chatDbStatus.value) {
-    showChatDatabaseError = chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null
-  }
-
-  var showAdvertiseLAAlert by remember { mutableStateOf(false) }
-  LaunchedEffect(showAdvertiseLAAlert) {
-    if (
-      !chatModel.controller.appPrefs.laNoticeShown.get()
-      && showAdvertiseLAAlert
-      && chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete
-      && chatModel.chats.isNotEmpty()
-      && chatModel.activeCallInvitation.value == null
-    ) {
-      showLANotice()
-    }
-  }
-  LaunchedEffect(chatModel.showAdvertiseLAUnavailableAlert.value) {
-    if (chatModel.showAdvertiseLAUnavailableAlert.value) {
-      laUnavailableInstructionAlert()
-    }
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value) {
-      ModalManager.shared.closeModals()
-      chatModel.clearOverlays.value = false
-    }
-  }
-
-  @Composable
-  fun retryAuthView() {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      SimpleButton(
-        stringResource(R.string.auth_retry),
-        icon = Icons.Outlined.Replay,
-        click = {
-          laFailed.value = false
-          runAuthenticate()
-        }
-      )
-    }
-  }
-
-  Box {
-    val onboarding = chatModel.onboardingStage.value
-    val userCreated = chatModel.userCreated.value
-    when {
-      showChatDatabaseError -> {
-        chatModel.chatDbStatus.value?.let {
-          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
-        }
-      }
-      onboarding == null || userCreated == null -> SplashView()
-      !chatsAccessAuthorized -> {
-        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-          retryAuthView()
-        } else {
-          SplashView()
-        }
-      }
-      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
-        Box {
-          if (chatModel.showCallView.value) ActiveCallView(chatModel)
-          else {
-            showAdvertiseLAAlert = true
-            val stopped = chatModel.chatRunning.value == false
-            if (chatModel.chatId.value == null) {
-              if (chatModel.sharedContent.value == null)
-                ChatListView(chatModel, setPerformLA, stopped)
-              else
-                ShareListView(chatModel, stopped)
-            }
-            else ChatView(chatModel)
-          }
-        }
-      }
-      onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel)
-    }
-    ModalManager.shared.showInView()
-    val invitation = chatModel.activeCallInvitation.value
-    if (invitation != null) IncomingCallAlertView(invitation, chatModel)
-    AlertManager.shared.showInView()
-  }
-}
-
-fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    NtfManager.OpenChatAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
-      if (chatId != null) {
-        val cInfo = chatModel.getChat(chatId)?.chatInfo
-        chatModel.clearOverlays.value = true
-        if (cInfo != null) withApi { openChat(cInfo, chatModel) }
-      }
-    }
-    NtfManager.ShowChatsAction -> {
-      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-    }
-    NtfManager.AcceptCallAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      if (chatId == null || chatId == "") return
-      Log.d(TAG, "processNotificationIntent: AcceptCallAction $chatId")
-      chatModel.clearOverlays.value = true
-      val invitation = chatModel.callInvitations[chatId]
-      if (invitation == null) {
-        AlertManager.shared.showAlertMsg(generalGetString(R.string.call_already_ended))
-      } else {
-        chatModel.callManager.acceptIncomingCall(invitation = invitation)
-      }
-    }
-  }
-}
-
-fun processIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    "android.intent.action.VIEW" -> {
-      val uri = intent.data
-      if (uri != null) connectIfOpenedViaUri(uri, chatModel)
-    }
-  }
-}
-
-fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    Intent.ACTION_SEND -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      when {
-        "text/plain" == intent.type -> intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-          chatModel.sharedContent.value = SharedContent.Text(it)
-        }
-        intent.type?.startsWith("image/") == true -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-          chatModel.sharedContent.value = SharedContent.Image(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
-        } // All other mime types
-        else -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-          chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
-        }
-      }
-    }
-  }
-}
-
-fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
-  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
-  if (chatModel.currentUser.value == null) {
-    // TODO open from chat list view
-    chatModel.appOpenUrl.value = uri
-  } else {
-    withUriAction(uri) { action ->
-      val title = when (action) {
-        "contact" -> generalGetString(R.string.connect_via_contact_link)
-        "invitation" -> generalGetString(R.string.connect_via_invitation_link)
-        else -> {
-          Log.e(TAG, "URI has unexpected action. Alert shown.")
-          action
-        }
-      }
-      AlertManager.shared.showAlertMsg(
-        title = title,
-        text = generalGetString(R.string.profile_will_be_sent_to_contact_sending_link),
-        confirmText = generalGetString(R.string.connect_via_link_verb),
-        onConfirm = {
-          withApi {
-            Log.d(TAG, "connectIfOpenedViaUri: connecting")
-            connectViaUri(chatModel, action, uri)
-          }
-        }
-      )
-    }
-  }
-}
-//fun testJson() {
-//  val str: String = """
-//  """.trimIndent()
-//
-//  println(json.decodeFromString<APIResponse>(str))
-//}

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt

@@ -1,76 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import android.app.UiModeManager
-import android.content.Context
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.SimplexApp
-import kotlinx.coroutines.flow.MutableStateFlow
-
-enum class DefaultTheme {
-  SYSTEM, DARK, LIGHT
-}
-
-val DEFAULT_PADDING = 16.dp
-val DEFAULT_SPACE_AFTER_ICON = 4.dp
-val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
-
-val DarkColorPalette = darkColors(
-  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexGreen,
-  secondary = DarkGray,
-//  background = Color.Black,
-//  surface = Color.Black,
-//  background = Color(0xFF121212),
-//  surface = Color(0xFF121212),
-//  error = Color(0xFFCF6679),
-  onBackground = Color(0xFFFFFBFA),
-  onSurface = Color(0xFFFFFBFA),
-//  onError: Color = Color.Black,
-)
-val LightColorPalette = lightColors(
-  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexGreen,
-  secondary = LightGray,
-//  background = Color.White,
-//  surface = Color.White
-//  onPrimary = Color.White,
-//  onSecondary = Color.Black,
-//  onBackground = Color.Black,
-//  onSurface = Color.Black,
-)
-
-val CurrentColors: MutableStateFlow<Pair<Colors, DefaultTheme>> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))
-
-// Non-@Composable implementation
-private fun isInNightMode() =
-  (SimplexApp.context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager).nightMode == UiModeManager.MODE_NIGHT_YES
-
-@Composable
-fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.first.isLight
-
-@Composable
-fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
-  LaunchedEffect(darkTheme) {
-    // For preview
-    if (darkTheme != null)
-      CurrentColors.value = ThemeManager.currentColors(darkTheme)
-  }
-  val systemDark = isSystemInDarkTheme()
-  LaunchedEffect(systemDark) {
-    if (CurrentColors.value.second == DefaultTheme.SYSTEM && CurrentColors.value.first.isLight == systemDark) {
-      // Change active colors from light to dark and back based on system theme
-      ThemeManager.applyTheme(DefaultTheme.SYSTEM.name, systemDark)
-    }
-  }
-  val theme by CurrentColors.collectAsState()
-  MaterialTheme(
-    colors = theme.first,
-    typography = Typography,
-    shapes = Shapes,
-    content = content
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt

@@ -1,64 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.material.Colors
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.views.helpers.generalGetString
-
-object ThemeManager {
-  private val appPrefs: AppPreferences by lazy {
-    AppPreferences(SimplexApp.context)
-  }
-
-  fun currentColors(darkForSystemTheme: Boolean): Pair<Colors, DefaultTheme> {
-    val theme = appPrefs.currentTheme.get()!!
-    val systemThemeColors = if (darkForSystemTheme) DarkColorPalette else LightColorPalette
-    val res = when (theme) {
-      DefaultTheme.SYSTEM.name -> Pair(systemThemeColors, DefaultTheme.SYSTEM)
-      DefaultTheme.DARK.name -> Pair(DarkColorPalette, DefaultTheme.DARK)
-      DefaultTheme.LIGHT.name -> Pair(LightColorPalette, DefaultTheme.LIGHT)
-      else -> Pair(systemThemeColors, DefaultTheme.SYSTEM)
-    }
-    return res.copy(first = res.first.copy(primary = Color(appPrefs.primaryColor.get())))
-  }
-
-  // colors, default theme enum, localized name of theme
-  fun allThemes(darkForSystemTheme: Boolean): List<Triple<Colors, DefaultTheme, String>> {
-    val allThemes = ArrayList<Triple<Colors, DefaultTheme, String>>()
-    allThemes.add(
-      Triple(
-        if (darkForSystemTheme) DarkColorPalette else LightColorPalette,
-        DefaultTheme.SYSTEM,
-        generalGetString(R.string.theme_system)
-      )
-    )
-    allThemes.add(
-      Triple(
-        LightColorPalette,
-        DefaultTheme.LIGHT,
-        generalGetString(R.string.theme_light)
-      )
-    )
-    allThemes.add(
-      Triple(
-        DarkColorPalette,
-        DefaultTheme.DARK,
-        generalGetString(R.string.theme_dark)
-      )
-    )
-    return allThemes
-  }
-
-  fun applyTheme(name: String, darkForSystemTheme: Boolean) {
-    appPrefs.currentTheme.set(name)
-    CurrentColors.value = currentColors(darkForSystemTheme)
-  }
-
-  fun saveAndApplyPrimaryColor(color: Color) {
-    appPrefs.primaryColor.set(color.toArgb())
-    CurrentColors.value = currentColors(!CurrentColors.value.first.isLight)
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt

@@ -1,141 +0,0 @@
-package chat.simplex.app.views
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBackIosNew
-import androidx.compose.material.icons.outlined.ArrowForwardIos
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.SimplexService
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.helpers.withApi
-import chat.simplex.app.views.onboarding.OnboardingStage
-import chat.simplex.app.views.onboarding.ReadableText
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.delay
-
-fun isValidDisplayName(name: String) : Boolean {
-  return (name.firstOrNull { it.isWhitespace() }) == null
-}
-
-@Composable
-fun CreateProfilePanel(chatModel: ChatModel) {
-  val displayName = remember { mutableStateOf("") }
-  val fullName = remember { mutableStateOf("") }
-  val focusRequester = remember { FocusRequester() }
-
-  Surface(Modifier.background(MaterialTheme.colors.onBackground)) {
-    Column(
-      modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-    ) {
-      AppBarTitle(stringResource(R.string.create_profile), false)
-      ReadableText(R.string.your_profile_is_stored_on_your_device)
-      ReadableText(R.string.profile_is_only_shared_with_your_contacts)
-      Spacer(Modifier.height(10.dp))
-      Text(
-        stringResource(R.string.display_name),
-        style = MaterialTheme.typography.h6,
-        modifier = Modifier.padding(bottom = 3.dp)
-      )
-      ProfileNameField(displayName, focusRequester)
-      val errorText = if (!isValidDisplayName(displayName.value)) stringResource(R.string.display_name_cannot_contain_whitespace) else ""
-      Text(
-        errorText,
-        fontSize = 15.sp,
-        color = MaterialTheme.colors.error
-      )
-      Spacer(Modifier.height(3.dp))
-      Text(
-        stringResource(R.string.full_name_optional__prompt),
-        style = MaterialTheme.typography.h6,
-        modifier = Modifier.padding(bottom = 5.dp)
-      )
-      ProfileNameField(fullName)
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      Row {
-        SimpleButton(
-          text = stringResource(R.string.about_simplex),
-          icon = Icons.Outlined.ArrowBackIosNew
-        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
-
-        Spacer(Modifier.fillMaxWidth().weight(1f))
-
-        val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-        val createModifier: Modifier
-        val createColor: Color
-        if (enabled) {
-          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value) }.padding(8.dp)
-          createColor = MaterialTheme.colors.primary
-        } else {
-          createModifier = Modifier.padding(8.dp)
-          createColor = HighOrLowlight
-        }
-        Surface(shape = RoundedCornerShape(20.dp)) {
-          Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
-            Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor)
-            Icon(Icons.Outlined.ArrowForwardIos, stringResource(R.string.create_profile_button), tint = createColor)
-          }
-        }
-      }
-
-      LaunchedEffect(Unit) {
-        delay(300)
-        focusRequester.requestFocus()
-      }
-    }
-  }
-}
-
-fun createProfile(chatModel: ChatModel, displayName: String, fullName: String) {
-  withApi {
-    val user = chatModel.controller.apiCreateActiveUser(
-      Profile(displayName, fullName, null)
-    )
-    chatModel.controller.startChat(user)
-    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
-    SimplexService.start(chatModel.controller.appContext)
-    chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
-  }
-}
-
-@Composable
-fun ProfileNameField(name: MutableState<String>, focusRequester: FocusRequester? = null) {
-  val modifier = Modifier
-    .fillMaxWidth()
-    .background(MaterialTheme.colors.secondary)
-    .height(40.dp)
-    .clip(RoundedCornerShape(5.dp))
-    .padding(8.dp)
-    .navigationBarsWithImePadding()
-  BasicTextField(
-    value = name.value,
-    onValueChange = { name.value = it },
-    modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-    keyboardOptions = KeyboardOptions(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    singleLine = true,
-    cursorBrush = SolidColor(HighOrLowlight)
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt

@@ -1,362 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import InfoRowEllipsis
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-import android.widget.Toast
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.ClipboardManager
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
-
-@Composable
-fun ChatInfoView(
-  chatModel: ChatModel,
-  contact: Contact,
-  connStats: ConnectionStats?,
-  customUserProfile: Profile?,
-  localAlias: String,
-  close: () -> Unit,
-  onChatUpdated: (Chat) -> Unit,
-) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null) {
-    ChatInfoLayout(
-      chat,
-      contact,
-      connStats,
-      customUserProfile,
-      localAlias,
-      developerTools,
-      onLocalAliasChanged = {
-        setContactAlias(chat.chatInfo.apiId, it, chatModel, onChatUpdated)
-      },
-      deleteContact = { deleteContactDialog(chat.chatInfo, chatModel, close) },
-      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
-    )
-  }
-}
-
-fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.delete_contact_question),
-    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
-        if (r) {
-          chatModel.removeChat(chatInfo.id)
-          chatModel.chatId.value = null
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    }
-  )
-}
-
-fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.clear_chat_question),
-    text = generalGetString(R.string.clear_chat_warning),
-    confirmText = generalGetString(R.string.clear_verb),
-    onConfirm = {
-      withApi {
-        val updatedChatInfo = chatModel.controller.apiClearChat(chatInfo.chatType, chatInfo.apiId)
-        if (updatedChatInfo != null) {
-          chatModel.clearChat(updatedChatInfo)
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    }
-  )
-}
-
-@Composable
-fun ChatInfoLayout(
-  chat: Chat,
-  contact: Contact,
-  connStats: ConnectionStats?,
-  customUserProfile: Profile?,
-  localAlias: String,
-  developerTools: Boolean,
-  onLocalAliasChanged: (String) -> Unit,
-  deleteContact: () -> Unit,
-  clearChat: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      ChatInfoHeader(chat.chatInfo, contact)
-    }
-
-    LocalAliasEditor(localAlias, updateValue = onLocalAliasChanged)
-
-    if (customUserProfile != null) {
-      SectionSpacer()
-      SectionView(generalGetString(R.string.incognito).uppercase()) {
-        InfoRow(generalGetString(R.string.incognito_random_profile), customUserProfile.chatViewName)
-      }
-    }
-
-    SectionSpacer()
-
-    if (connStats != null) {
-      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-        SectionItemView({
-          AlertManager.shared.showAlertMsg(
-            generalGetString(R.string.network_status),
-            chat.serverInfo.networkStatus.statusExplanation
-          )}) {
-          NetworkStatusRow(chat.serverInfo.networkStatus)
-        }
-        val rcvServers = connStats.rcvServers
-        if (rcvServers != null && rcvServers.isNotEmpty()) {
-          SectionDivider()
-          SimplexServers(stringResource(R.string.receiving_via), rcvServers)
-        }
-        val sndServers = connStats.sndServers
-        if (sndServers != null && sndServers.isNotEmpty()) {
-          SectionDivider()
-          SimplexServers(stringResource(R.string.sending_via), sndServers)
-        }
-      }
-      SectionSpacer()
-    }
-    SectionView {
-      ClearChatButton(clearChat)
-      SectionDivider()
-      DeleteContactButton(deleteContact)
-    }
-    SectionSpacer()
-
-    if (developerTools) {
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), chat.chatInfo.localDisplayName)
-        SectionDivider()
-        InfoRow(stringResource(R.string.info_row_database_id), chat.chatInfo.apiId.toString())
-      }
-      SectionSpacer()
-    }
-  }
-}
-
-@Composable
-fun ChatInfoHeader(cInfo: ChatInfo, contact: Contact) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Text(
-      contact.profile.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-      color = MaterialTheme.colors.onBackground,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
-      modifier = Modifier.padding(bottom = 8.dp)
-    )
-    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName) {
-      Text(
-        cInfo.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-fun LocalAliasEditor(
-  initialValue: String,
-  center: Boolean = true,
-  leadingIcon: Boolean = false,
-  focus: Boolean = false,
-  updateValue: (String) -> Unit
-) {
-  var value by rememberSaveable { mutableStateOf(initialValue) }
-  val modifier = if (center)
-    Modifier.padding(horizontal = if (!leadingIcon) DEFAULT_PADDING else 0.dp).widthIn(min = 100.dp)
-  else
-    Modifier.padding(horizontal = if (!leadingIcon) DEFAULT_PADDING else 0.dp).fillMaxWidth()
-  Row(Modifier.fillMaxWidth(), horizontalArrangement = if (center) Arrangement.Center else Arrangement.Start) {
-    DefaultBasicTextField(
-      modifier,
-      value,
-      {
-        Text(
-          generalGetString(R.string.text_field_set_contact_placeholder),
-          textAlign = if (center) TextAlign.Center else TextAlign.Start,
-          color = HighOrLowlight
-        )
-      },
-      leadingIcon = if (leadingIcon) {{ Icon(Icons.Default.Edit, null, Modifier.padding(start = 7.dp)) }} else null,
-      color = HighOrLowlight,
-      focus = focus,
-      textStyle = TextStyle.Default.copy(textAlign = if (value.isEmpty() || !center) TextAlign.Start else TextAlign.Center),
-      keyboardActions = KeyboardActions(onDone = { updateValue(value) })
-    ) {
-      value = it
-    }
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { value }
-      .onEach { delay(500) } // wait a little after every new character, don't emit until user stops typing
-      .conflate() // get the latest value
-      .filter { it == value } // don't process old ones
-      .collect {
-        updateValue(value)
-      }
-  }
-  DisposableEffect(Unit) {
-    onDispose { updateValue(value) } // just in case snapshotFlow will be canceled when user presses Back too fast
-  }
-}
-
-@Composable
-fun NetworkStatusRow(networkStatus: Chat.NetworkStatus) {
-  Row(
-    Modifier.fillMaxSize(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      Text(stringResource(R.string.network_status))
-      Icon(
-        Icons.Outlined.Info,
-        stringResource(R.string.network_status),
-        tint = MaterialTheme.colors.primary
-      )
-    }
-
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      Text(
-        networkStatus.statusString,
-        color = HighOrLowlight
-      )
-      ServerImage(networkStatus)
-    }
-  }
-}
-
-@Composable
-fun ServerImage(networkStatus: Chat.NetworkStatus) {
-  Box(Modifier.size(18.dp)) {
-    when (networkStatus) {
-      is Chat.NetworkStatus.Connected ->
-        Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-      is Chat.NetworkStatus.Disconnected ->
-        Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
-      is Chat.NetworkStatus.Error ->
-        Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
-      else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
-    }
-  }
-}
-
-@Composable
-fun SimplexServers(text: String, servers: List<String>) {
-  val info = servers.joinToString(separator = ", ") { it.substringAfter("@") }
-  val clipboardManager: ClipboardManager = LocalClipboardManager.current
-  InfoRowEllipsis(text, info) {
-    clipboardManager.setText(AnnotatedString(servers.joinToString(separator = ",")))
-    Toast.makeText(SimplexApp.context, generalGetString(R.string.copied), Toast.LENGTH_SHORT).show()
-  }
-}
-
-@Composable
-fun ClearChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Restore,
-    stringResource(R.string.clear_chat_button),
-    click = onClick,
-    textColor = WarningOrange,
-    iconColor = WarningOrange,
-  )
-}
-
-@Composable
-fun DeleteContactButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Delete,
-    stringResource(R.string.button_delete_contact),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-private fun setContactAlias(contactApiId: Long, localAlias: String, chatModel: ChatModel, onChatUpdated: (Chat) -> Unit) = withApi {
-  chatModel.controller.apiSetContactAlias(contactApiId, localAlias)?.let {
-    chatModel.updateContact(it)
-    onChatUpdated(chatModel.getChat(chatModel.chatId.value ?: return@withApi) ?: return@withApi)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatInfoLayout() {
-  SimpleXTheme {
-    ChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf(),
-        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
-      ),
-      Contact.sampleData,
-      localAlias = "",
-      developerTools = false,
-      connStats = null,
-      onLocalAliasChanged = {},
-      customUserProfile = null,
-      deleteContact = {}, clearChat = {}
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt

@@ -1,53 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING_HALF
-import chat.simplex.app.views.chat.item.SentColorLight
-import chat.simplex.app.views.helpers.base64ToBitmap
-
-@Composable
-fun ComposeImageView(images: List<String>, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  Row(
-    Modifier
-      .padding(top = 8.dp)
-      .background(SentColorLight),
-    verticalAlignment = Alignment.CenterVertically,
-  ) {
-    LazyRow(
-      Modifier.weight(1f).padding(start = DEFAULT_PADDING_HALF, end = if (cancelEnabled) 0.dp else DEFAULT_PADDING_HALF),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING_HALF),
-    ) {
-      items(images.size) { index ->
-        val imageBitmap = base64ToBitmap(images[index]).asImageBitmap()
-        Image(
-          imageBitmap,
-          "preview image",
-          modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
-        )
-      }
-    }
-    if (cancelEnabled) {
-      IconButton(onClick = cancelImages) {
-        Icon(
-          Icons.Outlined.Close,
-          contentDescription = stringResource(R.string.icon_descr_cancel_image_preview),
-          tint = MaterialTheme.colors.primary,
-        )
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt

@@ -1,574 +0,0 @@
-package chat.simplex.app.views.chat
-
-import ComposeFileView
-import android.Manifest
-import android.app.Activity
-import android.content.*
-import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.graphics.ImageDecoder
-import android.graphics.drawable.AnimatedImageDrawable
-import android.net.Uri
-import android.provider.MediaStore
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.annotation.CallSuper
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AttachFile
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.outlined.Reply
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.chat.item.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import java.io.File
-
-@Serializable
-sealed class ComposePreview {
-  @Serializable object NoPreview: ComposePreview()
-  @Serializable class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
-  @Serializable class ImagePreview(val images: List<String>): ComposePreview()
-  @Serializable class FilePreview(val fileName: String): ComposePreview()
-}
-
-@Serializable
-sealed class ComposeContextItem {
-  @Serializable object NoContextItem: ComposeContextItem()
-  @Serializable class QuotedItem(val chatItem: ChatItem): ComposeContextItem()
-  @Serializable class EditingItem(val chatItem: ChatItem): ComposeContextItem()
-}
-
-@Serializable
-data class ComposeState(
-  val message: String = "",
-  val preview: ComposePreview = ComposePreview.NoPreview,
-  val contextItem: ComposeContextItem = ComposeContextItem.NoContextItem,
-  val inProgress: Boolean = false,
-  val useLinkPreviews: Boolean
-) {
-  constructor(editingItem: ChatItem, useLinkPreviews: Boolean): this (
-    editingItem.content.text,
-    chatItemPreview(editingItem),
-    ComposeContextItem.EditingItem(editingItem),
-    useLinkPreviews = useLinkPreviews
-  )
-
-  val editing: Boolean
-    get() =
-      when (contextItem) {
-        is ComposeContextItem.EditingItem -> true
-        else -> false
-      }
-  val sendEnabled: () -> Boolean
-    get() = {
-      val hasContent = when (preview) {
-        is ComposePreview.ImagePreview -> true
-        is ComposePreview.FilePreview -> true
-        else -> message.isNotEmpty()
-      }
-      hasContent && !inProgress
-    }
-  val linkPreviewAllowed: Boolean
-    get() =
-      when (preview) {
-        is ComposePreview.ImagePreview -> false
-        is ComposePreview.FilePreview -> false
-        else -> useLinkPreviews
-      }
-  val linkPreview: LinkPreview?
-    get() =
-      when (preview) {
-        is ComposePreview.CLinkPreview -> preview.linkPreview
-        else -> null
-      }
-
-  companion object {
-    fun saver(): Saver<MutableState<ComposeState>, *> = Saver(
-      save = { json.encodeToString(serializer(), it.value) },
-      restore = {
-        mutableStateOf(json.decodeFromString(it))
-      }
-    )
-  }
-}
-
-fun chatItemPreview(chatItem: ChatItem): ComposePreview {
-  return when (val mc = chatItem.content.msgContent) {
-    is MsgContent.MCText -> ComposePreview.NoPreview
-    is MsgContent.MCLink -> ComposePreview.CLinkPreview(linkPreview = mc.preview)
-    is MsgContent.MCImage -> ComposePreview.ImagePreview(images = listOf(mc.image))
-    is MsgContent.MCFile -> {
-      val fileName = chatItem.file?.fileName ?: ""
-      ComposePreview.FilePreview(fileName)
-    }
-    else -> ComposePreview.NoPreview
-  }
-}
-
-@Composable
-fun ComposeView(
-  chatModel: ChatModel,
-  chat: Chat,
-  composeState: MutableState<ComposeState>,
-  attachmentOption: MutableState<AttachmentOption?>,
-  showChooseAttachment: () -> Unit
-) {
-  val context = LocalContext.current
-  val linkUrl = remember { mutableStateOf<String?>(null) }
-  val prevLinkUrl = remember { mutableStateOf<String?>(null) }
-  val pendingLinkUrl = remember { mutableStateOf<String?>(null) }
-  val cancelledLinks = remember { mutableSetOf<String>() }
-  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  // attachments
-  val chosenContent = remember { mutableStateOf<List<UploadContent>>(emptyList()) }
-  val chosenFile = remember { mutableStateOf<Uri?>(null) }
-  val photoUri = remember { mutableStateOf<Uri?>(null) }
-  val photoTmpFile = remember { mutableStateOf<File?>(null) }
-
-  class ComposeTakePicturePreview: ActivityResultContract<Void?, Bitmap?>() {
-    @CallSuper
-    override fun createIntent(context: Context, input: Void?): Intent {
-      photoTmpFile.value = File.createTempFile("image", ".bmp", SimplexApp.context.filesDir)
-      photoUri.value = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", photoTmpFile.value!!)
-      return Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-        .putExtra(MediaStore.EXTRA_OUTPUT, photoUri.value)
-    }
-
-    override fun getSynchronousResult(
-      context: Context,
-      input: Void?
-    ): SynchronousResult<Bitmap?>? = null
-
-    override fun parseResult(resultCode: Int, intent: Intent?): Bitmap? {
-      val photoUriVal = photoUri.value
-      val photoTmpFileVal = photoTmpFile.value
-      return if (resultCode == Activity.RESULT_OK && photoUriVal != null && photoTmpFileVal != null) {
-        val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, photoUriVal)
-        val bitmap = ImageDecoder.decodeBitmap(source)
-        photoTmpFileVal.delete()
-        bitmap
-      } else {
-        Log.e(TAG, "Getting image from camera cancelled or failed.")
-        photoTmpFile.value?.delete()
-        null
-      }
-    }
-  }
-
-  val cameraLauncher = rememberLauncherForActivityResult(contract = ComposeTakePicturePreview()) { bitmap: Bitmap? ->
-    if (bitmap != null) {
-      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-      chosenContent.value = listOf(UploadContent.SimpleImage(bitmap))
-      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview)))
-    }
-  }
-  val cameraPermissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
-    if (isGranted) {
-      cameraLauncher.launch(null)
-    } else {
-      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
-    }
-  }
-  val processPickedImage = { uris: List<Uri>, text: String? ->
-    val content = ArrayList<UploadContent>()
-    val imagesPreview = ArrayList<String>()
-    uris.forEach { uri ->
-      val source = ImageDecoder.createSource(context.contentResolver, uri)
-      val drawable = ImageDecoder.decodeDrawable(source)
-      var bitmap: Bitmap? = ImageDecoder.decodeBitmap(source)
-      if (drawable is AnimatedImageDrawable) {
-        // It's a gif or webp
-        val fileSize = getFileSize(context, uri)
-        if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
-          content.add(UploadContent.AnimatedImage(uri))
-        } else {
-          bitmap = null
-          AlertManager.shared.showAlertMsg(
-            generalGetString(R.string.large_file),
-            String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
-          )
-        }
-      } else {
-        if (bitmap != null) content.add(UploadContent.SimpleImage(bitmap))
-      }
-      if (bitmap != null) {
-        imagesPreview.add(resizeImageToStrSize(bitmap, maxDataSize = 14000))
-      }
-    }
-
-    if (imagesPreview.isNotEmpty()) {
-      chosenContent.value = content
-      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.ImagePreview(imagesPreview))
-    }
-  }
-  val processPickedFile = { uri: Uri?, text: String? ->
-    if (uri != null) {
-      val fileSize = getFileSize(context, uri)
-      if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
-        val fileName = getFileName(SimplexApp.context, uri)
-        if (fileName != null) {
-          chosenFile.value = uri
-          composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.FilePreview(fileName))
-        }
-      } else {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(R.string.large_file),
-          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
-        )
-      }
-    }
-  }
-  val galleryLauncher = rememberLauncherForActivityResult(contract = PickFromGallery()) { processPickedImage(it, null) }
-  val galleryLauncherFallback = rememberGetMultipleContentsLauncher { processPickedImage(it, null) }
-  val filesLauncher = rememberGetContentLauncher { processPickedFile(it, null) }
-
-  LaunchedEffect(attachmentOption.value) {
-    when (attachmentOption.value) {
-      AttachmentOption.TakePhoto -> {
-        when (PackageManager.PERMISSION_GRANTED) {
-          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
-            cameraLauncher.launch(null)
-          }
-          else -> {
-            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
-          }
-        }
-        attachmentOption.value = null
-      }
-      AttachmentOption.PickImage -> {
-        try {
-          galleryLauncher.launch(0)
-        } catch (e: ActivityNotFoundException) {
-          galleryLauncherFallback.launch("image/*")
-        }
-        attachmentOption.value = null
-      }
-      AttachmentOption.PickFile -> {
-        filesLauncher.launch("*/*")
-        attachmentOption.value = null
-      }
-      else -> {}
-    }
-  }
-
-  fun isSimplexLink(link: String): Boolean =
-    link.startsWith("https://simplex.chat", true) || link.startsWith("http://simplex.chat", true)
-
-  fun parseMessage(msg: String): String? {
-    val parsedMsg = runBlocking { chatModel.controller.apiParseMarkdown(msg) }
-    val link = parsedMsg?.firstOrNull { ft -> ft.format is Format.Uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text) }
-    return link?.text
-  }
-
-  fun loadLinkPreview(url: String, wait: Long? = null) {
-    if (pendingLinkUrl.value == url) {
-      composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(null))
-      withApi {
-        if (wait != null) delay(wait)
-        val lp = getLinkPreview(url)
-        if (lp != null && pendingLinkUrl.value == url) {
-          composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(lp))
-          pendingLinkUrl.value = null
-        }
-      }
-    }
-  }
-
-  fun showLinkPreview(s: String) {
-    prevLinkUrl.value = linkUrl.value
-    linkUrl.value = parseMessage(s)
-    val url = linkUrl.value
-    if (url != null) {
-      if (url != composeState.value.linkPreview?.uri && url != pendingLinkUrl.value) {
-        pendingLinkUrl.value = url
-        loadLinkPreview(url, wait = if (prevLinkUrl.value == url) null else 1500L)
-      }
-    } else {
-      composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    }
-  }
-
-  fun resetLinkPreview() {
-    linkUrl.value = null
-    prevLinkUrl.value = null
-    pendingLinkUrl.value = null
-    cancelledLinks.clear()
-  }
-
-  fun checkLinkPreview(): MsgContent {
-    val cs = composeState.value
-    return when (val composePreview = cs.preview) {
-      is ComposePreview.CLinkPreview -> {
-        val url = parseMessage(cs.message)
-        val lp = composePreview.linkPreview
-        if (lp != null && url == lp.uri) {
-          MsgContent.MCLink(cs.message, preview = lp)
-        } else {
-          MsgContent.MCText(cs.message)
-        }
-      }
-      else -> MsgContent.MCText(cs.message)
-    }
-  }
-
-  fun updateMsgContent(msgContent: MsgContent): MsgContent {
-    val cs = composeState.value
-    return when (msgContent) {
-      is MsgContent.MCText -> checkLinkPreview()
-      is MsgContent.MCLink -> checkLinkPreview()
-      is MsgContent.MCImage -> MsgContent.MCImage(cs.message, image = msgContent.image)
-      is MsgContent.MCFile -> MsgContent.MCFile(cs.message)
-      is MsgContent.MCUnknown -> MsgContent.MCUnknown(type = msgContent.type, text = cs.message, json = msgContent.json)
-    }
-  }
-
-  fun clearState() {
-    composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
-    textStyle.value = smallFont
-    chosenContent.value = emptyList()
-    chosenFile.value = null
-    linkUrl.value = null
-    prevLinkUrl.value = null
-    pendingLinkUrl.value = null
-    cancelledLinks.clear()
-  }
-
-  fun sendMessage() {
-    composeState.value = composeState.value.copy(inProgress = true)
-    val cInfo = chat.chatInfo
-    val cs = composeState.value
-    when (val contextItem = cs.contextItem) {
-      is ComposeContextItem.EditingItem -> {
-        val ei = contextItem.chatItem
-        val oldMsgContent = ei.content.msgContent
-        if (oldMsgContent != null) {
-          withApi {
-            val updatedItem = chatModel.controller.apiUpdateChatItem(
-              type = cInfo.chatType,
-              id = cInfo.apiId,
-              itemId = ei.meta.itemId,
-              mc = updateMsgContent(oldMsgContent)
-            )
-            if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
-            clearState()
-          }
-        }
-      }
-      else -> {
-        val msgs: ArrayList<MsgContent> = ArrayList()
-        val files: ArrayList<String> = ArrayList()
-        when (val preview = cs.preview) {
-          ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(cs.message))
-          is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
-          is ComposePreview.ImagePreview -> {
-            chosenContent.value.forEachIndexed { index, it ->
-              val file = when (it) {
-                is UploadContent.SimpleImage -> saveImage(context, it.bitmap)
-                is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
-              }
-              if (file != null) {
-                files.add(file)
-                msgs.add(MsgContent.MCImage(if (msgs.isEmpty()) cs.message else "", preview.images[index]))
-              }
-            }
-          }
-          is ComposePreview.FilePreview -> {
-            val chosenFileVal = chosenFile.value
-            if (chosenFileVal != null) {
-              val file = saveFileFromUri(context, chosenFileVal)
-              if (file != null) {
-                files.add((file))
-                msgs.add(MsgContent.MCFile(if (msgs.isEmpty()) cs.message else ""))
-              }
-            }
-          }
-        }
-        val quotedItemId: Long? = when (contextItem) {
-          is ComposeContextItem.QuotedItem -> contextItem.chatItem.id
-          else -> null
-        }
-        if (msgs.isNotEmpty()) {
-          withApi {
-            msgs.forEachIndexed { index, content ->
-              if (index > 0) delay(100)
-              val aChatItem = chatModel.controller.apiSendMessage(
-                type = cInfo.chatType,
-                id = cInfo.apiId,
-                file = files.getOrNull(index),
-                quotedItemId = if (index == 0) quotedItemId else null,
-                mc = content
-              )
-              if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
-            }
-            clearState()
-          }
-        } else {
-          clearState()
-        }
-      }
-    }
-  }
-
-  fun onMessageChange(s: String) {
-    composeState.value = composeState.value.copy(message = s)
-    if (isShortEmoji(s)) {
-      textStyle.value = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
-    } else {
-      textStyle.value = smallFont
-      if (composeState.value.linkPreviewAllowed) {
-        if (s.isNotEmpty()) showLinkPreview(s)
-        else resetLinkPreview()
-      }
-    }
-  }
-
-  fun cancelLinkPreview() {
-    val uri = composeState.value.linkPreview?.uri
-    if (uri != null) {
-      cancelledLinks.add(uri)
-    }
-    pendingLinkUrl.value = null
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-  }
-
-  fun cancelImages() {
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    chosenContent.value = emptyList()
-  }
-
-  fun cancelFile() {
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    chosenFile.value = null
-  }
-
-  @Composable
-  fun previewView() {
-    when (val preview = composeState.value.preview) {
-      ComposePreview.NoPreview -> {}
-      is ComposePreview.CLinkPreview -> ComposeLinkView(preview.linkPreview, ::cancelLinkPreview)
-      is ComposePreview.ImagePreview -> ComposeImageView(
-        preview.images,
-        ::cancelImages,
-        cancelEnabled = !composeState.value.editing
-      )
-      is ComposePreview.FilePreview -> ComposeFileView(
-        preview.fileName,
-        ::cancelFile,
-        cancelEnabled = !composeState.value.editing
-      )
-    }
-  }
-
-  @Composable
-  fun contextItemView() {
-    when (val contextItem = composeState.value.contextItem) {
-      ComposeContextItem.NoContextItem -> {}
-      is ComposeContextItem.QuotedItem -> ContextItemView(contextItem.chatItem, Icons.Outlined.Reply) {
-        composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
-      }
-      is ComposeContextItem.EditingItem -> ContextItemView(contextItem.chatItem, Icons.Filled.Edit) {
-        clearState()
-      }
-    }
-  }
-
-  LaunchedEffect(chatModel.sharedContent.value) {
-    when (val shared = chatModel.sharedContent.value) {
-      is SharedContent.Text -> onMessageChange(shared.text)
-      is SharedContent.Image -> processPickedImage(listOf(shared.uri), shared.text)
-      is SharedContent.File -> processPickedFile(shared.uri, shared.text)
-      null -> {}
-    }
-    chatModel.sharedContent.value = null
-  }
-
-  Column {
-    contextItemView()
-    when {
-      composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
-      else -> previewView()
-    }
-    Row(
-      modifier = Modifier.padding(start = 4.dp, end = 8.dp),
-      verticalAlignment = Alignment.Bottom,
-      horizontalArrangement = Arrangement.spacedBy(2.dp)
-    ) {
-      val attachEnabled = !composeState.value.editing
-      Box(Modifier.padding(bottom = 12.dp)) {
-        Icon(
-          Icons.Filled.AttachFile,
-          contentDescription = stringResource(R.string.attach),
-          tint = if (attachEnabled) MaterialTheme.colors.primary else Color.Gray,
-          modifier = Modifier
-            .size(28.dp)
-            .clip(CircleShape)
-            .clickable {
-              if (attachEnabled) {
-                showChooseAttachment()
-              }
-            }
-        )
-      }
-      SendMsgView(
-        composeState,
-        sendMessage = {
-          sendMessage()
-          resetLinkPreview()
-        },
-        ::onMessageChange,
-        textStyle
-      )
-    }
-  }
-}
-
-class PickFromGallery: ActivityResultContract<Int, List<Uri>>() {
-  override fun createIntent(context: Context, input: Int) =
-    Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI).apply {
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      type = "image/*"
-    }
-
-  override fun parseResult(resultCode: Int, intent: Intent?): List<Uri> =
-    if (intent?.data != null)
-      listOf(intent.data!!)
-    else if (intent?.clipData != null)
-      with(intent.clipData!!) {
-        val uris = ArrayList<Uri>()
-        for (i in 0 until kotlin.math.min(itemCount, 10)) {
-          val uri = getItemAt(i).uri
-          if (uri != null) uris.add(uri)
-        }
-        if (itemCount > 10) {
-          AlertManager.shared.showAlertMsg(R.string.images_limit_title, R.string.images_limit_desc)
-        }
-        uris
-      }
-    else
-      emptyList()
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt

@@ -1,184 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.content.res.Configuration
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.outlined.ArrowUpward
-import androidx.compose.runtime.*
-import androidx.compose.ui.*
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import androidx.core.text.BidiFormatter
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import kotlinx.coroutines.delay
-import kotlin.math.min
-
-@OptIn(ExperimentalComposeUiApi::class)
-@Composable
-fun SendMsgView(
-  composeState: MutableState<ComposeState>,
-  sendMessage: () -> Unit,
-  onMessageChange: (String) -> Unit,
-  textStyle: MutableState<TextStyle>
-) {
-  val cs = composeState.value
-  val focusRequester = remember { FocusRequester() }
-  val keyboard = LocalSoftwareKeyboardController.current
-  LaunchedEffect(cs.contextItem) {
-    if (cs.contextItem !is ComposeContextItem.QuotedItem) return@LaunchedEffect
-    // In replying state
-    focusRequester.requestFocus()
-    delay(50)
-    keyboard?.show()
-  }
-  val isRtl = remember(cs.message) { BidiFormatter.getInstance().isRtl(cs.message.subSequence(0, min(50, cs.message.length))) }
-  BasicTextField(
-    value = cs.message,
-    onValueChange = onMessageChange,
-    textStyle = textStyle.value,
-    maxLines = 16,
-    keyboardOptions = KeyboardOptions.Default.copy(
-      capitalization = KeyboardCapitalization.Sentences,
-      autoCorrect = true
-    ),
-    modifier = Modifier.padding(vertical = 8.dp).focusRequester(focusRequester),
-    cursorBrush = SolidColor(HighOrLowlight),
-    decorationBox = { innerTextField ->
-      Surface(
-        shape = RoundedCornerShape(18.dp),
-        border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-      ) {
-        Row(
-          Modifier.background(MaterialTheme.colors.background),
-          verticalAlignment = Alignment.Bottom
-        ) {
-          CompositionLocalProvider(
-            LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LocalLayoutDirection.current
-          ) {
-            Box(
-              Modifier
-                .weight(1f)
-                .padding(horizontal = 12.dp)
-                .padding(top = 5.dp)
-                .padding(bottom = 7.dp)
-            ) {
-              innerTextField()
-            }
-          }
-          val icon = if (cs.editing) Icons.Filled.Check else Icons.Outlined.ArrowUpward
-          val color = if (cs.sendEnabled()) MaterialTheme.colors.primary else HighOrLowlight
-          if (cs.inProgress
-            && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.FilePreview)
-          ) {
-            CircularProgressIndicator(
-              Modifier
-                .size(36.dp)
-                .padding(4.dp),
-              color = HighOrLowlight,
-              strokeWidth = 3.dp
-            )
-          } else {
-            Icon(
-              icon,
-              stringResource(R.string.icon_descr_send_message),
-              tint = Color.White,
-              modifier = Modifier
-                .size(36.dp)
-                .padding(4.dp)
-                .clip(CircleShape)
-                .background(color)
-                .clickable {
-                  if (cs.sendEnabled()) {
-                    sendMessage()
-                  }
-                }
-            )
-          }
-        }
-      }
-    }
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgView() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgViewEditing() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateEditing = ComposeState(editingItem = ChatItem.getSampleData(), useLinkPreviews = true)
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(composeStateEditing) },
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgViewInProgress() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt"), inProgress = true, useLinkPreviews = true)
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(composeStateInProgress) },
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt

@@ -1,336 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.chatlist.cantInviteIncognitoAlert
-import chat.simplex.app.views.chatlist.setGroupMembers
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun GroupChatInfoView(chatModel: ChatModel, close: () -> Unit) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null && chat.chatInfo is ChatInfo.Group) {
-    val groupInfo = chat.chatInfo.groupInfo
-    GroupChatInfoLayout(
-      chat,
-      groupInfo,
-      members = chatModel.groupMembers
-        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
-        .sortedBy { it.displayName.lowercase() },
-      developerTools,
-      addMembers = {
-        withApi {
-          setGroupMembers(groupInfo, chatModel)
-          ModalManager.shared.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, chatModel, close)
-          }
-        }
-      },
-      showMemberInfo = { member ->
-        withApi {
-          val stats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
-          ModalManager.shared.showModalCloseable(true) { closeCurrent ->
-            GroupMemberInfoView(groupInfo, member, stats, chatModel, closeCurrent) { closeCurrent(); close() }
-          }
-        }
-      },
-      editGroupProfile = {
-        ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
-      },
-      deleteGroup = { deleteGroupDialog(chat.chatInfo, groupInfo, chatModel, close) },
-      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
-      leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) },
-    )
-  }
-}
-
-fun deleteGroupDialog(chatInfo: ChatInfo, groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  val alertTextKey =
-    if (groupInfo.membership.memberCurrent) R.string.delete_group_for_all_members_cannot_undo_warning
-    else R.string.delete_group_for_self_cannot_undo_warning
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.delete_group_question),
-    text = generalGetString(alertTextKey),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
-        if (r) {
-          chatModel.removeChat(chatInfo.id)
-          chatModel.chatId.value = null
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    }
-  )
-}
-
-fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.leave_group_question),
-    text = generalGetString(R.string.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
-    confirmText = generalGetString(R.string.leave_group_button),
-    onConfirm = {
-      withApi {
-        chatModel.controller.leaveGroup(groupInfo.groupId)
-        close?.invoke()
-      }
-    }
-  )
-}
-
-@Composable
-fun GroupChatInfoLayout(
-  chat: Chat,
-  groupInfo: GroupInfo,
-  members: List<GroupMember>,
-  developerTools: Boolean,
-  addMembers: () -> Unit,
-  showMemberInfo: (GroupMember) -> Unit,
-  editGroupProfile: () -> Unit,
-  deleteGroup: () -> Unit,
-  clearChat: () -> Unit,
-  leaveGroup: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupChatInfoHeader(chat.chatInfo)
-    }
-    SectionSpacer()
-
-    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
-      if (groupInfo.canAddMembers) {
-        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
-        SectionItemView(onAddMembersClick) {
-          val tint = if (chat.chatInfo.incognito) HighOrLowlight else MaterialTheme.colors.primary
-          AddMembersButton(tint)
-        }
-        SectionDivider()
-      }
-      SectionItemView(minHeight = 50.dp) {
-        MemberRow(groupInfo.membership, user = true)
-      }
-      if (members.isNotEmpty()) {
-        SectionDivider()
-      }
-      MembersList(members, showMemberInfo)
-    }
-    SectionSpacer()
-
-    SectionView {
-      if (groupInfo.canEdit) {
-        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
-        SectionDivider()
-      }
-      ClearChatButton(clearChat)
-      if (groupInfo.canDelete) {
-        SectionDivider()
-        SectionItemView(deleteGroup) { DeleteGroupButton() }
-      }
-      if (groupInfo.membership.memberCurrent) {
-        SectionDivider()
-        SectionItemView(leaveGroup) { LeaveGroupButton() }
-      }
-    }
-    SectionSpacer()
-
-    if (developerTools) {
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
-        SectionDivider()
-        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
-      }
-      SectionSpacer()
-    }
-  }
-}
-
-@Composable
-fun GroupChatInfoHeader(cInfo: ChatInfo) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-      color = MaterialTheme.colors.onBackground,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis
-    )
-    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-      Text(
-        cInfo.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Add,
-      stringResource(R.string.button_add_members),
-      tint = tint
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_add_members), color = tint)
-  }
-}
-
-@Composable
-fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
-  Column {
-    members.forEachIndexed { index, member ->
-      SectionItemView({ showMemberInfo(member) }, minHeight = 50.dp) {
-        MemberRow(member)
-      }
-      if (index < members.lastIndex) {
-        SectionDivider()
-      }
-    }
-  }
-}
-
-@Composable
-fun MemberRow(member: GroupMember, user: Boolean = false) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      ProfileImage(size = 46.dp, member.image)
-      Column {
-        Text(
-          member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-          color = if (member.memberIncognito) Indigo else Color.Unspecified
-        )
-        val s = member.memberStatus.shortText
-        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
-        Text(
-          statusDescr,
-          color = HighOrLowlight,
-          fontSize = 12.sp,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis
-        )
-      }
-    }
-    val role = member.memberRole
-    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
-      Text(role.text, color = HighOrLowlight)
-    }
-  }
-}
-
-@Composable
-fun EditGroupProfileButton() {
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Edit,
-      stringResource(R.string.button_edit_group_profile),
-      tint = MaterialTheme.colors.primary
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_edit_group_profile), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun LeaveGroupButton() {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Logout,
-      stringResource(R.string.button_leave_group),
-      tint = Color.Red
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_leave_group), color = Color.Red)
-  }
-}
-
-@Composable
-fun DeleteGroupButton() {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Delete,
-      stringResource(R.string.button_delete_group),
-      tint = Color.Red
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_delete_group), color = Color.Red)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewGroupChatInfoLayout() {
-  SimpleXTheme {
-    GroupChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf(),
-        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
-      ),
-      groupInfo = GroupInfo.sampleData,
-      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
-      developerTools = false,
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupEventView.kt

@@ -1,59 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun CIGroupEventView(ci: ChatItem) {
-  fun withGroupEventStyle(builder: AnnotatedString.Builder, text: String) {
-    return builder.withStyle(SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)) { append(text) }
-  }
-
-  Surface {
-    Row(
-      Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.Bottom
-    ) {
-      Text(
-        buildAnnotatedString {
-          val memberDisplayName = ci.memberDisplayName
-          if (memberDisplayName != null) {
-            withGroupEventStyle(this, memberDisplayName)
-            append(" ")
-          }
-          withGroupEventStyle(this, ci.content.text)
-          append(" ")
-          withGroupEventStyle(this, ci.timestampText)
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
-      )
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun CIGroupEventViewPreview() {
-  SimpleXTheme {
-    CIGroupEventView(
-      ChatItem.getGroupEventSample()
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt

@@ -1,156 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
-import kotlinx.datetime.Clock
-
-@Composable
-fun CIMetaView(chatItem: ChatItem, metaColor: Color = HighOrLowlight) {
-  Row(verticalAlignment = Alignment.CenterVertically) {
-    if (!chatItem.isDeletedContent) {
-      if (chatItem.meta.itemEdited) {
-        Icon(
-          Icons.Filled.Edit,
-          modifier = Modifier.height(12.dp).padding(end = 1.dp),
-          contentDescription = stringResource(R.string.icon_descr_edited),
-          tint = metaColor,
-        )
-      }
-      CIStatusView(chatItem.meta.itemStatus, metaColor)
-    }
-    Text(
-      chatItem.timestampText,
-      color = metaColor,
-      fontSize = 14.sp,
-      modifier = Modifier.padding(start = 3.dp)
-    )
-  }
-}
-
-
-@Composable
-fun CIStatusView(status: CIStatus, metaColor: Color = HighOrLowlight) {
-  when (status) {
-    is CIStatus.SndSent -> {
-      Icon(Icons.Filled.Check, stringResource(R.string.icon_descr_sent_msg_status_sent), Modifier.height(12.dp), tint = metaColor)
-    }
-    is CIStatus.SndErrorAuth -> {
-      Icon(Icons.Filled.Close,  stringResource(R.string.icon_descr_sent_msg_status_unauthorized_send), Modifier.height(12.dp), tint = Color.Red)
-    }
-    is CIStatus.SndError -> {
-      Icon(Icons.Filled.WarningAmber, stringResource(R.string.icon_descr_sent_msg_status_send_failed), Modifier.height(12.dp), tint = Color.Yellow)
-    }
-    is CIStatus.RcvNew -> {
-      Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_received_msg_status_unread), Modifier.height(12.dp), tint = MaterialTheme.colors.primary)
-    }
-    else -> {}
-  }
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaView() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewUnread() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.RcvNew()
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendFailed() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.SndError(AgentErrorType.CMD(CommandErrorType.SYNTAX()))
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendNoAuth() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndErrorAuth()
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendSent() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndSent()
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEdited() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      itemEdited = true
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEditedUnread() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectRcv(), Clock.System.now(), "hello",
-      itemEdited = true,
-      status=CIStatus.RcvNew()
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEditedSent() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      itemEdited = true,
-      status=CIStatus.SndSent()
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewDeletedContent() {
-  CIMetaView(
-    chatItem = ChatItem.getDeletedContentSampleData()
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt

@@ -1,254 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.*
-import android.net.Uri
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.ComposeContextItem
-import chat.simplex.app.views.chat.ComposeState
-import chat.simplex.app.views.helpers.*
-import kotlinx.datetime.Clock
-
-@Composable
-fun ChatItemView(
-  user: User,
-  cInfo: ChatInfo,
-  cItem: ChatItem,
-  composeState: MutableState<ComposeState>,
-  cxt: Context,
-  uriHandler: UriHandler? = null,
-  imageProvider: (() -> ImageGalleryProvider)? = null,
-  showMember: Boolean = false,
-  chatModelIncognito: Boolean,
-  useLinkPreviews: Boolean,
-  deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long) -> Unit,
-  joinGroup: (Long) -> Unit,
-  acceptCall: (Contact) -> Unit,
-  scrollToItem: (Long) -> Unit,
-) {
-  val context = LocalContext.current
-  val sent = cItem.chatDir.sent
-  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
-  val showMenu = remember { mutableStateOf(false) }
-  val saveFileLauncher = rememberSaveFileLauncher(cxt = context, ciFile = cItem.file)
-  Box(
-    modifier = Modifier
-      .padding(bottom = 4.dp)
-      .fillMaxWidth(),
-    contentAlignment = alignment,
-  ) {
-    Column(
-      Modifier
-        .clip(RoundedCornerShape(18.dp))
-        .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
-    ) {
-      @Composable fun ContentItem() {
-        if (cItem.file == null && cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
-          EmojiItemView(cItem)
-        } else {
-          val onLinkLongClick = { _: String -> showMenu.value = true }
-          FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, showMenu, receiveFile, onLinkLongClick, scrollToItem)
-        }
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          ItemAction(stringResource(R.string.reply_verb), Icons.Outlined.Reply, onClick = {
-            if (composeState.value.editing) {
-              composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-            } else {
-              composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-            }
-            showMenu.value = false
-          })
-          ItemAction(stringResource(R.string.share_verb), Icons.Outlined.Share, onClick = {
-            val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
-            when {
-              filePath != null -> shareFile(cxt, cItem.text, filePath)
-              else -> shareText(cxt, cItem.content.text)
-            }
-            showMenu.value = false
-          })
-          ItemAction(stringResource(R.string.copy_verb), Icons.Outlined.ContentCopy, onClick = {
-            copyText(cxt, cItem.content.text)
-            showMenu.value = false
-          })
-          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCFile) {
-            val filePath = getLoadedFilePath(context, cItem.file)
-            if (filePath != null) {
-              ItemAction(stringResource(R.string.save_verb), Icons.Outlined.SaveAlt, onClick = {
-                when (cItem.content.msgContent) {
-                  is MsgContent.MCImage -> saveImage(context, cItem.file)
-                  is MsgContent.MCFile -> saveFileLauncher.launch(cItem.file?.fileName)
-                  else -> {}
-                }
-                showMenu.value = false
-              })
-            }
-          }
-          if (cItem.meta.editable) {
-            ItemAction(stringResource(R.string.edit_verb), Icons.Filled.Edit, onClick = {
-              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-              showMenu.value = false
-            })
-          }
-          ItemAction(
-            stringResource(R.string.delete_verb),
-            Icons.Outlined.Delete,
-            onClick = {
-              showMenu.value = false
-              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
-            },
-            color = Color.Red
-          )
-        }
-      }
-
-      @Composable fun DeletedItem() {
-        DeletedItemView(cItem, showMember = showMember)
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          ItemAction(
-            stringResource(R.string.delete_verb),
-            Icons.Outlined.Delete,
-            onClick = {
-              showMenu.value = false
-              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
-            },
-            color = Color.Red
-          )
-        }
-      }
-
-      @Composable fun CallItem(status: CICallStatus, duration: Int) {
-        CICallItemView(cInfo, cItem, status, duration, acceptCall)
-      }
-
-      when (val c = cItem.content) {
-        is CIContent.SndMsgContent -> ContentItem()
-        is CIContent.RcvMsgContent -> ContentItem()
-        is CIContent.SndDeleted -> DeletedItem()
-        is CIContent.RcvDeleted -> DeletedItem()
-        is CIContent.SndCall -> CallItem(c.status, c.duration)
-        is CIContent.RcvCall -> CallItem(c.status, c.duration)
-        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, showMember = showMember)
-        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)
-        is CIContent.RcvGroupEventContent -> CIGroupEventView(cItem)
-        is CIContent.SndGroupEventContent -> CIGroupEventView(cItem)
-      }
-    }
-  }
-}
-
-@Composable
-fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
-  DropdownMenuItem(onClick) {
-    Row {
-      Text(
-        text,
-        modifier = Modifier
-          .fillMaxWidth()
-          .weight(1F)
-          .padding(end = 15.dp),
-        color = color
-      )
-      Icon(icon, text, tint = color)
-    }
-  }
-}
-
-fun deleteMessageAlertDialog(chatItem: ChatItem, deleteMessage: (Long, CIDeleteMode) -> Unit) {
-  AlertManager.shared.showAlertDialogButtons(
-    title = generalGetString(R.string.delete_message__question),
-    text = generalGetString(R.string.delete_message_cannot_be_undone_warning),
-    buttons = {
-      Row(
-        Modifier
-          .fillMaxWidth()
-          .padding(horizontal = 8.dp, vertical = 2.dp),
-        horizontalArrangement = Arrangement.End,
-      ) {
-        TextButton(onClick = {
-          deleteMessage(chatItem.id, CIDeleteMode.cidmInternal)
-          AlertManager.shared.hideAlert()
-        }) { Text(stringResource(R.string.for_me_only)) }
-        if (chatItem.meta.editable) {
-          Spacer(Modifier.padding(horizontal = 4.dp))
-          TextButton(onClick = {
-            deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
-            AlertManager.shared.hideAlert()
-          }) { Text(stringResource(R.string.for_everybody)) }
-        }
-      }
-    }
-  )
-}
-
-@Preview
-@Composable
-fun PreviewChatItemView() {
-  SimpleXTheme {
-    ChatItemView(
-      User.sampleData,
-      ChatInfo.Direct.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      useLinkPreviews = true,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      cxt = LocalContext.current,
-      chatModelIncognito = false,
-      deleteMessage = { _, _ -> },
-      receiveFile = {},
-      joinGroup = {},
-      acceptCall = { _ -> },
-      scrollToItem = {},
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatItemViewDeletedContent() {
-  SimpleXTheme {
-    ChatItemView(
-      User.sampleData,
-      ChatInfo.Direct.sampleData,
-      ChatItem.getDeletedContentSampleData(),
-      useLinkPreviews = true,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      cxt = LocalContext.current,
-      chatModelIncognito = false,
-      deleteMessage = { _, _ -> },
-      receiveFile = {},
-      joinGroup = {},
-      acceptCall = { _ -> },
-      scrollToItem = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt

@@ -1,141 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.input.pointer.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.views.helpers.*
-import coil.ImageLoader
-import coil.compose.rememberAsyncImagePainter
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.request.ImageRequest
-import coil.size.Size
-import com.google.accompanist.pager.*
-import kotlinx.coroutines.launch
-
-interface ImageGalleryProvider {
-  val initialIndex: Int
-  val totalImagesSize: MutableState<Int>
-  fun getImage(index: Int): Pair<Bitmap, Uri>?
-  fun currentPageChanged(index: Int)
-  fun scrollToStart()
-  fun onDismiss(index: Int)
-}
-
-@OptIn(ExperimentalPagerApi::class)
-@Composable
-fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () -> Unit) {
-  val provider = remember { imageProvider() }
-  val pagerState = rememberPagerState(provider.initialIndex)
-  val goBack = { provider.onDismiss(pagerState.currentPage); close() }
-  BackHandler(onBack = goBack)
-  // Pager doesn't ask previous page at initialization step who knows why. By not doing this, prev page is not checked and can be blank,
-  // which makes this blank page visible for a moment. Prevent it by doing the check ourselves
-  LaunchedEffect(Unit) {
-    if (provider.getImage(provider.initialIndex - 1) == null) {
-      provider.scrollToStart()
-      pagerState.scrollToPage(0)
-    }
-  }
-  val scope = rememberCoroutineScope()
-  HorizontalPager(count = remember { provider.totalImagesSize }.value, state = pagerState) { index ->
-    Column(
-      Modifier
-        .fillMaxSize()
-        .background(Color.Black)
-        .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = goBack)
-    ) {
-      var settledCurrentPage by remember { mutableStateOf(pagerState.currentPage) }
-      LaunchedEffect(pagerState) {
-        snapshotFlow {
-          if (!pagerState.isScrollInProgress) pagerState.currentPage else settledCurrentPage
-        }.collect {
-          settledCurrentPage = it
-        }
-      }
-      LaunchedEffect(settledCurrentPage) {
-        // Make this pager with infinity scrolling with only 3 pages at a time when left and right pages constructs in real time
-        if (settledCurrentPage != provider.initialIndex)
-          provider.currentPageChanged(index)
-      }
-      val image = provider.getImage(index)
-      if (image == null) {
-        // No such image. Let's shrink total pages size or scroll to start of the list of pages to remove blank page automatically
-        scope.launch {
-          when (settledCurrentPage) {
-            index - 1 -> provider.totalImagesSize.value = settledCurrentPage + 1
-            index + 1 -> {
-              provider.scrollToStart()
-              pagerState.scrollToPage(0)
-            }
-          }
-        }
-      } else {
-        val (imageBitmap: Bitmap, uri: Uri) = image
-        var scale by remember { mutableStateOf(1f) }
-        var translationX by remember { mutableStateOf(0f) }
-        var translationY by remember { mutableStateOf(0f) }
-        LaunchedEffect(settledCurrentPage) {
-          scale = 1f
-          translationX = 0f
-          translationY = 0f
-        }
-        // I'm making a new instance of imageLoader here because if I use one instance in multiple places
-        // after end of composition here a GIF from the first instance will be paused automatically which isn't what I want
-        val imageLoader = ImageLoader.Builder(LocalContext.current)
-          .components {
-            if (Build.VERSION.SDK_INT >= 28) {
-              add(ImageDecoderDecoder.Factory())
-            } else {
-              add(GifDecoder.Factory())
-            }
-          }
-          .build()
-        Image(
-          rememberAsyncImagePainter(
-            ImageRequest.Builder(LocalContext.current).data(data = uri).size(Size.ORIGINAL).build(),
-            placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
-            imageLoader = imageLoader
-          ),
-          contentDescription = stringResource(R.string.image_descr),
-          contentScale = ContentScale.Fit,
-          modifier = Modifier
-            .graphicsLayer(
-              scaleX = scale,
-              scaleY = scale,
-              translationX = translationX,
-              translationY = translationY,
-            )
-            .pointerInput(Unit) {
-              detectTransformGestures(
-                onGesture = { _, pan, gestureZoom, _ ->
-                  scale = (scale * gestureZoom).coerceIn(1f, 20f)
-                  if (scale > 1) {
-                    translationX += pan.x * scale
-                    translationY += pan.y * scale
-                  } else {
-                    translationX = 0f
-                    translationY = 0f
-                  }
-                }
-              )
-            }
-            .fillMaxSize(),
-        )
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt

@@ -1,65 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun IntegrityErrorItemView(ci: ChatItem, showMember: Boolean = false) {
-  Surface(
-    Modifier.clickable(onClick = {
-      AlertManager.shared.showAlertMsg(
-        title = generalGetString(R.string.alert_title_skipped_messages),
-        text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
-      )
-    }),
-    shape = RoundedCornerShape(18.dp),
-    color = ReceivedColorLight,
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.Bottom
-    ) {
-      Text(
-        buildAnnotatedString {
-          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci)
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun IntegrityErrorItemViewPreview() {
-  SimpleXTheme {
-    IntegrityErrorItemView(
-      ChatItem.getDeletedContentSampleData()
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt

@@ -1,219 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Path
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.NewChatSheet
-import chat.simplex.app.views.usersettings.SettingsView
-import chat.simplex.app.views.usersettings.simplexTeamUri
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-
-@Composable
-fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
-  val newChatSheetState by rememberSaveable(stateSaver = NewChatSheetState.saver()) { mutableStateOf(MutableStateFlow(NewChatSheetState.GONE)) }
-  val showNewChatSheet = {
-    newChatSheetState.value = NewChatSheetState.VISIBLE
-  }
-  val hideNewChatSheet: (animated: Boolean) -> Unit = { animated ->
-    if (animated) newChatSheetState.value = NewChatSheetState.HIDING
-    else newChatSheetState.value = NewChatSheetState.GONE
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
-  }
-  var searchInList by rememberSaveable { mutableStateOf("") }
-  val scaffoldState = rememberScaffoldState()
-  Scaffold(
-    topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, stopped) { searchInList = it.trim() } },
-    scaffoldState = scaffoldState,
-    drawerContent = { SettingsView(chatModel, setPerformLA) },
-    floatingActionButton = {
-      if (searchInList.isEmpty()) {
-        FloatingActionButton(
-          onClick = {
-            if (!stopped) {
-              if (newChatSheetState.value.isVisible()) hideNewChatSheet(true) else showNewChatSheet()
-            }
-          },
-          elevation = FloatingActionButtonDefaults.elevation(
-            defaultElevation = 0.dp,
-            pressedElevation = 0.dp,
-            hoveredElevation = 0.dp,
-            focusedElevation = 0.dp,
-          ),
-          backgroundColor = if (!stopped) MaterialTheme.colors.primary else HighOrLowlight,
-          contentColor = Color.White
-        ) {
-          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) Icons.Default.Edit else Icons.Default.Close, stringResource(R.string.add_contact_or_create_group))
-        }
-      }
-    }
-  ) {
-    Box(Modifier.padding(it)) {
-      Column(
-        modifier = Modifier
-          .fillMaxSize()
-          .background(MaterialTheme.colors.background)
-      ) {
-        if (chatModel.chats.isNotEmpty()) {
-          ChatList(chatModel, search = searchInList)
-        } else {
-          Box(Modifier.fillMaxSize()) {
-            if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
-              OnboardingButtons(showNewChatSheet)
-            }
-            Text(stringResource(R.string.you_have_no_chats), Modifier.align(Alignment.Center), color = HighOrLowlight)
-          }
-        }
-      }
-    }
-  }
-  if (searchInList.isEmpty()) {
-    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
-  }
-}
-
-@Composable
-private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
-  Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.Bottom) {
-    val uriHandler = LocalUriHandler.current
-    ConnectButton(generalGetString(R.string.chat_with_developers)) {
-      uriHandler.openUri(simplexTeamUri)
-    }
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    ConnectButton(generalGetString(R.string.tap_to_start_new_chat), openNewChatSheet)
-    val color = MaterialTheme.colors.primary
-    Canvas(modifier = Modifier.width(40.dp).height(10.dp), onDraw = {
-      val trianglePath = Path().apply {
-        moveTo(0.dp.toPx(), 0f)
-        lineTo(16.dp.toPx(), 0.dp.toPx())
-        lineTo(8.dp.toPx(), 10.dp.toPx())
-        lineTo(0.dp.toPx(), 0.dp.toPx())
-      }
-      drawPath(
-        color = color,
-        path = trianglePath
-      )
-    })
-    Spacer(Modifier.height(62.dp))
-  }
-}
-
-@Composable
-private fun ConnectButton(text: String, onClick: () -> Unit) {
-  Button(
-    onClick,
-    shape = RoundedCornerShape(21.dp),
-    colors = ButtonDefaults.textButtonColors(
-      backgroundColor = MaterialTheme.colors.primary
-    ),
-    elevation = null,
-    contentPadding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF),
-    modifier = Modifier.height(42.dp)
-  ) {
-    Text(text, color = Color.White)
-  }
-}
-
-@Composable
-private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
-  var showSearch by rememberSaveable { mutableStateOf(false) }
-  val hideSearchOnBack = { onSearchValueChanged(""); showSearch = false }
-  if (showSearch) {
-    BackHandler(onBack = hideSearchOnBack)
-  }
-  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
-  if (chatModel.chats.size >= 8) {
-    barButtons.add {
-      IconButton({ showSearch = true }) {
-        Icon(Icons.Outlined.Search, stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
-      }
-    }
-  }
-  if (stopped) {
-    barButtons.add {
-      IconButton(onClick = {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(R.string.chat_is_stopped_indication),
-          generalGetString(R.string.you_can_start_chat_via_setting_or_by_restarting_the_app)
-        )
-      }) {
-        Icon(
-          Icons.Filled.Report,
-          generalGetString(R.string.chat_is_stopped_indication),
-          tint = Color.Red,
-        )
-      }
-    }
-  }
-  val scope = rememberCoroutineScope()
-  DefaultTopAppBar(
-    navigationButton = {
-      if (showSearch)
-        NavigationButtonBack(hideSearchOnBack)
-      else
-        NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
-    },
-    title = {
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        Text(
-          stringResource(R.string.your_chats),
-          color = MaterialTheme.colors.onBackground,
-          fontWeight = FontWeight.SemiBold,
-        )
-        if (chatModel.incognito.value) {
-          Icon(
-            Icons.Filled.TheaterComedy,
-            stringResource(R.string.incognito),
-            tint = Indigo,
-            modifier = Modifier.padding(10.dp).size(26.dp)
-          )
-        }
-      }
-    },
-    onTitleClick = null,
-    showSearch = showSearch,
-    onSearchValueChanged = onSearchValueChanged,
-    buttons = barButtons
-  )
-  Divider(Modifier.padding(top = AppBarHeight))
-}
-
-@Composable
-private fun ChatList(chatModel: ChatModel, search: String) {
-  val filter: (Chat) -> Boolean = { chat: Chat ->
-    chat.chatInfo.chatViewName.lowercase().contains(search.lowercase())
-  }
-  val chats by remember(search) { derivedStateOf { if (search.isEmpty()) chatModel.chats else chatModel.chats.filter(filter) } }
-  LazyColumn(
-    modifier = Modifier.fillMaxWidth()
-  ) {
-    items(chats) { chat ->
-      ChatListNavLinkView(chat, chatModel)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt

@@ -1,110 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.util.Log
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-
-class AlertManager {
-  var alertView = mutableStateOf<(@Composable () -> Unit)?>(null)
-  var presentAlert = mutableStateOf<Boolean>(false)
-
-  fun showAlert(alert: @Composable () -> Unit) {
-    Log.d(TAG, "AlertManager.showAlert")
-    alertView.value = alert
-    presentAlert.value = true
-  }
-
-  fun hideAlert() {
-    presentAlert.value = false
-    alertView.value = null
-  }
-
-  fun showAlertDialogButtons(
-    title: String,
-    text: String? = null,
-    buttons: @Composable () -> Unit,
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = this::hideAlert,
-        title = { Text(title) },
-        text = alertText,
-        buttons = buttons
-      )
-    }
-  }
-
-  fun showAlertDialog(
-    title: String,
-    text: String? = null,
-    confirmText: String = generalGetString(R.string.ok),
-    onConfirm: (() -> Unit)? = null,
-    dismissText: String = generalGetString(R.string.cancel_verb),
-    onDismiss: (() -> Unit)? = null,
-    onDismissRequest: (() -> Unit)? = null,
-    destructive: Boolean = false
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = { onDismissRequest?.invoke(); hideAlert() },
-        title = { Text(title) },
-        text = alertText,
-        confirmButton = {
-          TextButton(onClick = {
-            onConfirm?.invoke()
-            hideAlert()
-          }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
-        },
-        dismissButton = {
-          TextButton(onClick = {
-            onDismiss?.invoke()
-            hideAlert()
-          }) { Text(dismissText) }
-        }
-      )
-    }
-  }
-
-  fun showAlertMsg(
-    title: String, text: String? = null,
-    confirmText: String = generalGetString(R.string.ok), onConfirm: (() -> Unit)? = null
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = this::hideAlert,
-        title = { Text(title) },
-        text = alertText,
-        confirmButton = {
-          TextButton(onClick = {
-            onConfirm?.invoke()
-            hideAlert()
-          }) { Text(confirmText) }
-        }
-      )
-    }
-  }
-
-  fun showAlertMsg(
-    title: Int,
-    text: Int? = null,
-    confirmText: Int = R.string.ok,
-    onConfirm: (() -> Unit)? = null
-  ) = showAlertMsg(generalGetString(title), if (text != null) generalGetString(text) else null, generalGetString(confirmText), onConfirm)
-
-  @Composable
-  fun showInView() {
-    if (presentAlert.value) alertView.value?.invoke()
-  }
-
-  companion object {
-    val shared = AlertManager()
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/AnimationUtils.kt

@@ -1,5 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.animation.core.*
-
-fun <T> newChatSheetAnimSpec() = tween<T>(256, 0, LinearEasing)

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt

@@ -1,54 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.views.newchat.ActionButton
-
-sealed class AttachmentOption {
-  object TakePhoto: AttachmentOption()
-  object PickImage: AttachmentOption()
-  object PickFile: AttachmentOption()
-}
-
-@Composable
-fun ChooseAttachmentView(
-  attachmentOption: MutableState<AttachmentOption?>,
-  hide: () -> Unit
-) {
-  Box(
-    modifier = Modifier
-      .fillMaxWidth()
-      .wrapContentHeight()
-      .onFocusChanged { focusState ->
-        if (!focusState.hasFocus) hide()
-      }
-  ) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 8.dp, vertical = 30.dp),
-      horizontalArrangement = Arrangement.SpaceEvenly
-    ) {
-      ActionButton(null, stringResource(R.string.use_camera_button), icon = Icons.Outlined.PhotoCamera) {
-        attachmentOption.value = AttachmentOption.TakePhoto
-        hide()
-      }
-      ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Collections) {
-        attachmentOption.value = AttachmentOption.PickImage
-        hide()
-      }
-      ActionButton(null, stringResource(R.string.choose_file), icon = Icons.Outlined.InsertDriveFile) {
-        attachmentOption.value = AttachmentOption.PickFile
-        hide()
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt

@@ -1,57 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.ui.theme.*
-
-@Composable
-fun CloseSheetBar(close: () -> Unit) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .heightIn(min = AppBarHeight)
-      .padding(horizontal = AppBarHorizontalPadding),
-  ) {
-    Row(
-      Modifier
-        .width(TitleInsetWithIcon - AppBarHorizontalPadding)
-        .padding(top = 4.dp), // Like in DefaultAppBar
-      content = { NavigationButtonBack(close) }
-    )
-  }
-}
-
-@Composable
-fun AppBarTitle(title: String, withPadding: Boolean = true) {
-  val padding = if (withPadding)
-    PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING )
-  else
-    PaddingValues(bottom = DEFAULT_PADDING)
-  Text(
-    title,
-    Modifier
-      .fillMaxWidth()
-      .padding(padding),
-    overflow = TextOverflow.Ellipsis,
-    style = MaterialTheme.typography.h1
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewCloseSheetBar() {
-  SimpleXTheme {
-    CloseSheetBar(close = {})
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt

@@ -1,73 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.util.Log
-import chat.simplex.app.*
-import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.views.usersettings.Cryptor
-import kotlinx.serialization.*
-import java.io.File
-import java.security.SecureRandom
-
-object DatabaseUtils {
-  private val cryptor = Cryptor()
-
-  private val appPreferences: AppPreferences by lazy {
-    AppPreferences(SimplexApp.context)
-  }
-
-  private const val DATABASE_PASSWORD_ALIAS: String = "databasePassword"
-
-  private fun hasDatabase(rootDir: String): Boolean =
-    File(rootDir + File.separator + "files_chat.db").exists() && File(rootDir + File.separator + "files_agent.db").exists()
-
-  fun getDatabaseKey(): String? {
-    return cryptor.decryptData(
-      appPreferences.encryptedDBPassphrase.get()?.toByteArrayFromBase64() ?: return null,
-      appPreferences.initializationVectorDBPassphrase.get()?.toByteArrayFromBase64() ?: return null,
-      DATABASE_PASSWORD_ALIAS,
-    )
-  }
-
-  fun setDatabaseKey(key: String) {
-    val data = cryptor.encryptText(key, DATABASE_PASSWORD_ALIAS)
-    appPreferences.encryptedDBPassphrase.set(data.first.toBase64String())
-    appPreferences.initializationVectorDBPassphrase.set(data.second.toBase64String())
-  }
-
-  fun removeDatabaseKey() {
-    cryptor.deleteKey(DATABASE_PASSWORD_ALIAS)
-    appPreferences.encryptedDBPassphrase.set(null)
-    appPreferences.initializationVectorDBPassphrase.set(null)
-  }
-
-  fun useDatabaseKey(): String {
-    Log.d(TAG, "useDatabaseKey ${appPreferences.storeDBPassphrase.get()}")
-    var dbKey = ""
-    val useKeychain = appPreferences.storeDBPassphrase.get()
-    if (useKeychain) {
-      if (!hasDatabase(SimplexApp.context.dataDir.absolutePath)) {
-        dbKey = randomDatabasePassword()
-        setDatabaseKey(dbKey)
-        appPreferences.initialRandomDBPassphrase.set(true)
-      } else {
-        dbKey = getDatabaseKey() ?: ""
-      }
-    }
-    return dbKey
-  }
-
-  private fun randomDatabasePassword(): String {
-    val s = ByteArray(32)
-    SecureRandom().nextBytes(s)
-    return s.toBase64String().replace("\n", "")
-  }
-}
-
-@Serializable
-sealed class DBMigrationResult {
-  @Serializable @SerialName("ok") object OK: DBMigrationResult()
-  @Serializable @SerialName("errorNotADatabase") class ErrorNotADatabase(val dbFile: String): DBMigrationResult()
-  @Serializable @SerialName("error") class Error(val dbFile: String, val migrationError: String): DBMigrationResult()
-  @Serializable @SerialName("errorKeychain") object ErrorKeychain: DBMigrationResult()
-  @Serializable @SerialName("unknown") class Unknown(val json: String): DBMigrationResult()
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt

@@ -1,112 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.shape.ZeroCornerSize
-import androidx.compose.foundation.text.*
-import androidx.compose.material.*
-import androidx.compose.material.TextFieldDefaults.indicatorLine
-import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
-
-@OptIn(ExperimentalComposeUiApi::class)
-@Composable
-fun DefaultBasicTextField(
-  modifier: Modifier,
-  initialValue: String,
-  placeholder: (@Composable () -> Unit)? = null,
-  leadingIcon: (@Composable () -> Unit)? = null,
-  focus: Boolean = false,
-  color: Color = MaterialTheme.colors.onBackground,
-  textStyle: TextStyle = TextStyle.Default,
-  selectTextOnFocus: Boolean = false,
-  keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-  keyboardActions: KeyboardActions = KeyboardActions(),
-  onValueChange: (String) -> Unit,
-) {
-  val state = remember {
-    mutableStateOf(TextFieldValue(initialValue))
-  }
-  val focusRequester = remember { FocusRequester() }
-  val keyboard = LocalSoftwareKeyboardController.current
-
-  LaunchedEffect(Unit) {
-    if (!focus) return@LaunchedEffect
-    delay(300)
-    focusRequester.requestFocus()
-    keyboard?.show()
-  }
-  val enabled = true
-  val colors = TextFieldDefaults.textFieldColors(
-    backgroundColor = Color.Unspecified,
-    textColor = MaterialTheme.colors.onBackground,
-    focusedIndicatorColor = Color.Unspecified,
-    unfocusedIndicatorColor = Color.Unspecified,
-  )
-  val shape = MaterialTheme.shapes.small.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize)
-  val interactionSource = remember { MutableInteractionSource() }
-  BasicTextField(
-    value = state.value,
-    modifier = modifier
-      .background(colors.backgroundColor(enabled).value, shape)
-      .indicatorLine(enabled, false, interactionSource, colors)
-      .focusRequester(focusRequester)
-      .onFocusChanged { focusState ->
-        if (focusState.isFocused && selectTextOnFocus) {
-          val text = state.value.text
-          state.value = state.value.copy(
-            selection = TextRange(0, text.length)
-          )
-        }
-      }
-      .defaultMinSize(
-        minWidth = TextFieldDefaults.MinWidth,
-        minHeight = TextFieldDefaults.MinHeight
-      ),
-    onValueChange = {
-      state.value = it
-      onValueChange(it.text)
-    },
-    cursorBrush = SolidColor(colors.cursorColor(false).value),
-    visualTransformation = VisualTransformation.None,
-    keyboardOptions = keyboardOptions,
-    keyboardActions = KeyboardActions(onDone = {
-      keyboard?.hide()
-      keyboardActions.onDone?.invoke(this)
-    }),
-    singleLine = true,
-    textStyle = textStyle.copy(
-      color = color,
-      fontWeight = FontWeight.Normal,
-      fontSize = 16.sp
-    ),
-    interactionSource = interactionSource,
-    decorationBox = @Composable { innerTextField ->
-      TextFieldDefaults.TextFieldDecorationBox(
-        value = state.value.text,
-        innerTextField = innerTextField,
-        placeholder = placeholder,
-        singleLine = true,
-        enabled = enabled,
-        leadingIcon = leadingIcon,
-        interactionSource = interactionSource,
-        contentPadding = TextFieldDefaults.textFieldWithLabelPadding(start = 0.dp, end = 0.dp),
-        visualTransformation = VisualTransformation.None,
-        colors = colors
-      )
-    }
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt

@@ -1,38 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.graphics.Bitmap
-import android.net.Uri
-import androidx.compose.runtime.saveable.Saver
-import kotlinx.coroutines.flow.MutableStateFlow
-
-sealed class SharedContent {
-  data class Text(val text: String): SharedContent()
-  data class Image(val text: String, val uri: Uri): SharedContent()
-  data class File(val text: String, val uri: Uri): SharedContent()
-}
-
-enum class NewChatSheetState {
-  VISIBLE, HIDING, GONE;
-  fun isVisible(): Boolean {
-    return this == VISIBLE
-  }
-  fun isHiding(): Boolean {
-    return this == HIDING
-  }
-  fun isGone(): Boolean {
-    return this == GONE
-  }
-  companion object {
-    fun saver(): Saver<MutableStateFlow<NewChatSheetState>, *> = Saver(
-      save = { it.value.toString() },
-      restore = {
-        MutableStateFlow(valueOf(it))
-      }
-    )
-  }
-}
-
-sealed class UploadContent {
-  data class SimpleImage(val bitmap: Bitmap): UploadContent()
-  data class AnimatedImage(val uri: Uri): UploadContent()
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt

@@ -1,112 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.content.Context
-import android.os.Build.VERSION.SDK_INT
-import android.widget.Toast
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricManager.Authenticators.*
-import androidx.biometric.BiometricPrompt
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-
-sealed class LAResult {
-  object Success: LAResult()
-  class Error(val errString: CharSequence): LAResult()
-  object Failed: LAResult()
-  object Unavailable: LAResult()
-}
-
-fun authenticate(
-  promptTitle: String,
-  promptSubtitle: String,
-  activity: FragmentActivity,
-  completed: (LAResult) -> Unit
-) {
-  when {
-    SDK_INT in 28..29 ->
-      // KeyguardManager.isDeviceSecure()? https://developer.android.com/training/sign-in/biometric-auth#declare-supported-authentication-types
-      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-    SDK_INT > 29 ->
-      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
-    else ->
-      completed(LAResult.Unavailable)
-  }
-}
-
-private fun authenticateWithBiometricManager(
-  promptTitle: String,
-  promptSubtitle: String,
-  activity: FragmentActivity,
-  completed: (LAResult) -> Unit,
-  authenticators: Int
-) {
-  val biometricManager = BiometricManager.from(activity)
-  when (biometricManager.canAuthenticate(authenticators)) {
-    BiometricManager.BIOMETRIC_SUCCESS -> {
-      val executor = ContextCompat.getMainExecutor(activity)
-      val biometricPrompt = BiometricPrompt(
-        activity,
-        executor,
-        object: BiometricPrompt.AuthenticationCallback() {
-          override fun onAuthenticationError(
-            errorCode: Int,
-            errString: CharSequence
-          ) {
-            super.onAuthenticationError(errorCode, errString)
-            completed(LAResult.Error(errString))
-          }
-
-          override fun onAuthenticationSucceeded(
-            result: BiometricPrompt.AuthenticationResult
-          ) {
-            super.onAuthenticationSucceeded(result)
-            completed(LAResult.Success)
-          }
-
-          override fun onAuthenticationFailed() {
-            super.onAuthenticationFailed()
-            completed(LAResult.Failed)
-          }
-        }
-      )
-      val promptInfo = BiometricPrompt.PromptInfo.Builder()
-        .setTitle(promptTitle)
-        .setSubtitle(promptSubtitle)
-        .setAllowedAuthenticators(authenticators)
-        .setConfirmationRequired(false)
-        .build()
-      biometricPrompt.authenticate(promptInfo)
-    }
-    else -> {
-      completed(LAResult.Unavailable)
-    }
-  }
-}
-
-fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_simplex_lock_turned_on),
-  generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
-)
-
-fun laErrorToast(context: Context, errString: CharSequence) = Toast.makeText(
-  context,
-  if (errString.isNotEmpty()) String.format(generalGetString(R.string.auth_error_w_desc), errString) else generalGetString(R.string.auth_error),
-  Toast.LENGTH_SHORT
-).show()
-
-fun laFailedToast(context: Context) = Toast.makeText(
-  context,
-  generalGetString(R.string.auth_failed),
-  Toast.LENGTH_SHORT
-).show()
-
-fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_unavailable),
-  generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)
-)
-
-fun laUnavailableTurningOffAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_unavailable),
-  generalGetString(R.string.auth_device_authentication_is_disabled_turning_off)
-)

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt

@@ -1,183 +0,0 @@
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Check
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.ValueTitleDesc
-import chat.simplex.app.views.helpers.ValueTitle
-
-@Composable
-fun SectionView(title: String? = null, padding: PaddingValues = PaddingValues(), content: (@Composable ColumnScope.() -> Unit)) {
-  Column {
-    if (title != null) {
-      Text(
-        title, color = HighOrLowlight, style = MaterialTheme.typography.body2,
-        modifier = Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), fontSize = 12.sp
-      )
-    }
-    Surface(color = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
-      Column(Modifier.padding(padding).fillMaxWidth()) { content() }
-    }
-  }
-}
-
-@Composable
-fun <T> SectionViewSelectable(
-  title: String?,
-  currentValue: State<T>,
-  values: List<ValueTitleDesc<T>>,
-  onSelected: (T) -> Unit,
-) {
-  SectionView(title) {
-    LazyColumn {
-      items(values.size) { index ->
-        val item = values[index]
-        SectionItemViewSpaceBetween({ onSelected(item.value) }) {
-          Text(item.title)
-          if (currentValue.value == item.value) {
-            Icon(Icons.Outlined.Check, item.title, tint = MaterialTheme.colors.primary)
-          }
-        }
-        Spacer(Modifier.padding(horizontal = 4.dp))
-      }
-    }
-  }
-  SectionTextFooter(values.first { it.value == currentValue.value }.description)
-}
-
-@Composable
-fun SectionItemView(click: (() -> Unit)? = null, minHeight: Dp = 46.dp, disabled: Boolean = false, content: (@Composable RowScope.() -> Unit)) {
-  val modifier = Modifier
-    .fillMaxWidth()
-    .sizeIn(minHeight = minHeight)
-  Row(
-    if (click == null || disabled) modifier.padding(horizontal = DEFAULT_PADDING) else modifier.clickable(onClick = click).padding(horizontal = DEFAULT_PADDING),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    content()
-  }
-}
-
-@Composable
-fun SectionItemViewSpaceBetween(
-  click: (() -> Unit)? = null,
-  minHeight: Dp = 46.dp,
-  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
-  disabled: Boolean = false,
-  content: (@Composable RowScope.() -> Unit)
-) {
-  val modifier = Modifier
-    .fillMaxWidth()
-    .sizeIn(minHeight = minHeight)
-  Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    content()
-  }
-}
-
-@Composable
-fun <T> SectionItemWithValue(
-  title: String,
-  currentValue: State<T>,
-  values: List<ValueTitle<T>>,
-  label: String? = null,
-  icon: ImageVector? = null,
-  iconTint: Color = HighOrLowlight,
-  enabled: State<Boolean> = mutableStateOf(true),
-  onSelected: () -> Unit
-) {
-  SectionItemView(click = if (enabled.value) onSelected else null) {
-    if (icon != null) {
-      Icon(
-        icon,
-        title,
-        Modifier.padding(end = 8.dp),
-        tint = iconTint
-      )
-    }
-    Text(title, color = if (enabled.value) Color.Unspecified else HighOrLowlight)
-
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-
-    Row(
-      Modifier.padding(start = 10.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.End
-    ) {
-      Text(
-        values.first { it.value == currentValue.value }.title + (if (label != null) " $label" else ""),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        color = HighOrLowlight
-      )
-    }
-  }
-}
-
-@Composable
-fun SectionTextFooter(text: String) {
-  Text(
-    text,
-    Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
-    color = HighOrLowlight,
-    lineHeight = 18.sp,
-    fontSize = 14.sp
-  )
-}
-
-@Composable
-fun SectionCustomFooter(padding: PaddingValues = PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = 5.dp), content: (@Composable () -> Unit)) {
-  Row(
-    Modifier.padding(padding)
-  ) {
-    content()
-  }
-}
-
-@Composable
-fun SectionDivider() {
-  Divider(Modifier.padding(horizontal = 8.dp))
-}
-
-@Composable
-fun SectionSpacer() {
-  Spacer(Modifier.height(30.dp))
-}
-
-@Composable
-fun InfoRow(title: String, value: String) {
-  SectionItemViewSpaceBetween {
-    Text(title)
-    Text(value, color = HighOrLowlight)
-  }
-}
-
-@Composable
-fun InfoRowEllipsis(title: String, value: String, onClick: () -> Unit) {
-  SectionItemViewSpaceBetween(onClick) {
-    val configuration = LocalConfiguration.current
-    Text(title)
-    Text(
-      value,
-      Modifier
-        .padding(start = 10.dp)
-        .widthIn(max = (configuration.screenWidthDp / 2).dp),
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
-      color = HighOrLowlight
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt

@@ -1,48 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun SimpleButton(text: String, icon: ImageVector,
-                 color: Color = MaterialTheme.colors.primary,
-                 click: () -> Unit) {
-  SimpleButtonFrame(click) {
-    Icon(
-      icon, text, tint = color,
-      modifier = Modifier.padding(end = 8.dp)
-    )
-    Text(text, style = MaterialTheme.typography.caption, color = color)
-  }
-}
-
-@Composable
-fun SimpleButtonFrame(click: () -> Unit, disabled: Boolean = false, content: @Composable () -> Unit) {
-  Surface(shape = RoundedCornerShape(20.dp)) {
-    val modifier = if (disabled) Modifier else Modifier.clickable { click() }
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      modifier = modifier.padding(8.dp)
-    ) { content() }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewCloseSheetBar() {
-  SimpleXTheme {
-    SimpleButton(text = "Share", icon = Icons.Outlined.Share, click = {})
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt

@@ -1,58 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.ui.theme.HighOrLowlight
-
-@Composable
-fun TextEditor(modifier: Modifier, text: MutableState<String>) {
-  BasicTextField(
-    value = text.value,
-    onValueChange = { text.value = it },
-    textStyle = TextStyle(
-      fontFamily = FontFamily.Monospace, fontSize = 14.sp,
-      color = MaterialTheme.colors.onBackground
-    ),
-    keyboardOptions = KeyboardOptions.Default.copy(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    modifier = modifier,
-    cursorBrush = SolidColor(HighOrLowlight),
-    decorationBox = { innerTextField ->
-      Surface(
-        shape = RoundedCornerShape(10.dp),
-        border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-      ) {
-        Row(
-          Modifier.background(MaterialTheme.colors.background),
-          verticalAlignment = Alignment.Top
-        ) {
-          Box(
-            Modifier
-              .weight(1f)
-              .padding(vertical = 5.dp, horizontal = 7.dp)
-          ) {
-            innerTextField()
-          }
-        }
-      }
-    }
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt

@@ -1,148 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.TheaterComedy
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun AddContactView(chatModel: ChatModel, connReqInvitation: String, connIncognito: Boolean) {
-  val cxt = LocalContext.current
-  LaunchedEffect(connReqInvitation) {
-    if (connReqInvitation.isNotEmpty()) {
-      chatModel.connReqInv.value = connReqInvitation
-    }
-  }
-  DisposableEffect(Unit) {
-    onDispose { chatModel.connReqInv.value = null }
-  }
-  AddContactLayout(
-    connReq = connReqInvitation,
-    connIncognito = connIncognito,
-    share = { shareText(cxt, connReqInvitation) }
-  )
-}
-
-@Composable
-fun AddContactLayout(connReq: String, connIncognito: Boolean, share: () -> Unit) {
-  BoxWithConstraints {
-    val screenHeight = maxHeight
-    Column(
-      Modifier
-        .verticalScroll(rememberScrollState())
-        .padding(bottom = 16.dp),
-      verticalArrangement = Arrangement.SpaceBetween,
-    ) {
-      AppBarTitle(stringResource(R.string.add_contact), false)
-      Text(
-        stringResource(R.string.show_QR_code_for_your_contact_to_scan_from_the_app__multiline),
-      )
-      Row {
-        InfoAboutIncognito(
-          connIncognito,
-          true,
-          generalGetString(R.string.incognito_random_profile_description),
-          generalGetString(R.string.your_profile_will_be_sent)
-        )
-      }
-      if (connReq.isNotEmpty()) {
-        QRCode(
-          connReq, Modifier
-            .aspectRatio(1f)
-            .padding(vertical = 3.dp)
-        )
-      } else {
-          CircularProgressIndicator(
-            Modifier
-              .size(36.dp)
-              .padding(4.dp)
-              .align(Alignment.CenterHorizontally),
-            color = HighOrLowlight,
-            strokeWidth = 3.dp
-          )
-      }
-      Text(
-        annotatedStringResource(R.string.if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel),
-        lineHeight = 22.sp,
-        modifier = Modifier
-          .padding(bottom = if (screenHeight > 600.dp) 8.dp else 0.dp)
-      )
-      Row(
-        Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.Center
-      ) {
-        SimpleButton(stringResource(R.string.share_invitation_link), icon = Icons.Outlined.Share, click = share)
-      }
-    }
-  }
-}
-
-@Composable
-fun InfoAboutIncognito(chatModelIncognito: Boolean, supportedIncognito: Boolean = true, onText: String, offText: String) {
-  if (chatModelIncognito) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Icon(
-        if (supportedIncognito) Icons.Filled.TheaterComedy else Icons.Outlined.Info,
-        stringResource(R.string.incognito),
-        tint = if (supportedIncognito) Indigo else WarningOrange,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(onText, textAlign = TextAlign.Left, style = MaterialTheme.typography.body2)
-    }
-  } else {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Icon(
-        Icons.Outlined.Info,
-        stringResource(R.string.incognito),
-        tint = HighOrLowlight,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(offText, textAlign = TextAlign.Left, style = MaterialTheme.typography.body2)
-    }
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewAddContactView() {
-  SimpleXTheme {
-    AddContactLayout(
-      connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
-      connIncognito = false,
-      share = {}
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/QRCode.kt

@@ -1,38 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.graphics.Bitmap
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import boofcv.alg.fiducial.qrcode.QrCodeEncoder
-import boofcv.alg.fiducial.qrcode.QrCodeGeneratorImage
-import boofcv.android.ConvertBitmap
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun QRCode(connReq: String, modifier: Modifier = Modifier) {
-  Image(
-    bitmap = qrCodeBitmap(connReq, 1024).asImageBitmap(),
-    contentDescription = stringResource(R.string.image_descr_qr_code),
-    modifier = modifier
-  )
-}
-
-fun qrCodeBitmap(content: String, size: Int): Bitmap {
-  val qrCode = QrCodeEncoder().addAutomatic(content).fixate()
-  val renderer = QrCodeGeneratorImage(5)
-  renderer.render(qrCode)
-  return ConvertBitmap.grayToBitmap(renderer.gray, Bitmap.Config.RGB_565)
-}
-
-@Preview
-@Composable
-fun PreviewQRCode() {
-  SimpleXTheme {
-    QRCode(connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt

@@ -1,73 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import android.content.res.Configuration
-import androidx.annotation.StringRes
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.User
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun HowItWorks(user: User?, onboardingStage: MutableState<OnboardingStage?>? = null) {
-  Column(Modifier
-    .fillMaxWidth()
-    .padding(horizontal = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.Start
-  ) {
-    AppBarTitle(stringResource(R.string.how_simplex_works), false)
-    ReadableText(R.string.many_people_asked_how_can_it_deliver)
-    ReadableText(R.string.to_protect_privacy_simplex_has_ids_for_queues)
-    ReadableText(R.string.you_control_servers_to_receive_your_contacts_to_send)
-    ReadableText(R.string.only_client_devices_store_contacts_groups_e2e_encrypted_messages)
-    if (onboardingStage == null) {
-      val uriHandler = LocalUriHandler.current
-      Text(
-        annotatedStringResource(R.string.read_more_in_github_with_link),
-        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat#readme") },
-        lineHeight = 22.sp
-      )
-    } else {
-      ReadableText(R.string.read_more_in_github)
-    }
-
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-
-    if (onboardingStage != null) {
-      Box(Modifier.fillMaxWidth().padding(bottom = 16.dp), contentAlignment = Alignment.Center) {
-        OnboardingActionButton(user, onboardingStage, onclick = { ModalManager.shared.closeModal() })
-      }
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-    }
-  }
-}
-
-@Composable
-fun ReadableText(@StringRes stringResId: Int) {
-  Text(annotatedStringResource(stringResId), modifier = Modifier.padding(bottom = 12.dp), lineHeight = 22.sp)
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewHowItWorks() {
-  SimpleXTheme {
-    HowItWorks(user = null)
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt

@@ -1,203 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionCustomFooter
-import SectionDivider
-import SectionItemViewSpaceBetween
-import SectionSpacer
-import SectionView
-import android.content.ComponentName
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Circle
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import com.godaddy.android.colorpicker.*
-
-enum class AppIcon(val resId: Int) {
-  DEFAULT(R.mipmap.icon),
-  DARK_BLUE(R.mipmap.icon_dark_blue),
-}
-
-@Composable
-fun AppearanceView() {
-  val appIcon = remember { mutableStateOf(findEnabledIcon()) }
-
-  fun setAppIcon(newIcon: AppIcon) {
-    if (appIcon.value == newIcon) return
-    val newComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
-    val oldComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${appIcon.value.name.lowercase()}")
-    SimplexApp.context.packageManager.setComponentEnabledSetting(
-      newComponent,
-      COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP
-    )
-
-    SimplexApp.context.packageManager.setComponentEnabledSetting(
-      oldComponent,
-      PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP
-    )
-
-    appIcon.value = newIcon
-  }
-
-  AppearanceLayout(
-    appIcon,
-    changeIcon = ::setAppIcon,
-    showThemeSelector = {
-      ModalManager.shared.showModal(true) {
-        ThemeSelectorView()
-      }
-    },
-    editPrimaryColor = { primary ->
-      ModalManager.shared.showModalCloseable { close ->
-        ColorEditor(primary, close)
-      }
-    },
-  )
-}
-
-@Composable fun AppearanceLayout(
-  icon: MutableState<AppIcon>,
-  changeIcon: (AppIcon) -> Unit,
-  showThemeSelector: () -> Unit,
-  editPrimaryColor: (Color) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.appearance_settings))
-    SectionView(stringResource(R.string.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
-      LazyRow {
-        items(AppIcon.values().size, { index -> AppIcon.values()[index] }) { index ->
-          val item = AppIcon.values()[index]
-          val mipmap = ContextCompat.getDrawable(LocalContext.current, item.resId)!!
-          Image(
-            bitmap = mipmap.toBitmap().asImageBitmap(),
-            contentDescription = "",
-            contentScale = ContentScale.Fit,
-            modifier = Modifier
-              .shadow(if (item == icon.value) 1.dp else 0.dp, ambientColor = colors.secondary)
-              .size(70.dp)
-              .clickable { changeIcon(item) }
-              .padding(10.dp)
-          )
-
-          if (index + 1 != AppIcon.values().size) {
-            Spacer(Modifier.padding(horizontal = 4.dp))
-          }
-        }
-      }
-    }
-
-    SectionSpacer()
-    val currentTheme by CurrentColors.collectAsState()
-    SectionView(stringResource(R.string.settings_section_title_themes)) {
-      SectionItemViewSpaceBetween(showThemeSelector) {
-        Text(generalGetString(R.string.theme))
-      }
-      SectionDivider()
-      SectionItemViewSpaceBetween({ editPrimaryColor(currentTheme.first.primary) }) {
-        val title = generalGetString(R.string.color_primary)
-        Text(title)
-        Icon(Icons.Filled.Circle, title, tint = colors.primary)
-      }
-    }
-    if (currentTheme.first.primary != LightColorPalette.primary) {
-      SectionCustomFooter(PaddingValues(start = 7.dp, end = 7.dp, top = 5.dp)) {
-        TextButton(
-          onClick = {
-            ThemeManager.saveAndApplyPrimaryColor(LightColorPalette.primary)
-          },
-        ) {
-          Text(generalGetString(R.string.reset_color))
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun ColorEditor(
-  initialColor: Color,
-  close: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-  ) {
-    AppBarTitle(stringResource(R.string.color_primary))
-    var currentColor by remember { mutableStateOf(initialColor) }
-    ColorPicker(initialColor) {
-      currentColor = it
-    }
-
-    SectionSpacer()
-
-    TextButton(
-      onClick = {
-        ThemeManager.saveAndApplyPrimaryColor(currentColor)
-        close()
-      },
-      Modifier.align(Alignment.CenterHorizontally),
-      colors = ButtonDefaults.textButtonColors(contentColor = currentColor)
-    ) {
-      Text(generalGetString(R.string.save_color))
-    }
-  }
-}
-
-@Composable
-fun ColorPicker(initialColor: Color, onColorChanged: (Color) -> Unit) {
-  ClassicColorPicker(
-    color = initialColor,
-    modifier = Modifier
-      .fillMaxWidth()
-      .height(300.dp),
-    showAlphaBar = false,
-    onColorChanged = { color: HsvColor ->
-      onColorChanged(color.toColor())
-    }
-  )
-}
-
-private fun findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
-  SimplexApp.context.packageManager.getComponentEnabledSetting(
-    ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${icon.name.lowercase()}")
-  ).let { it == COMPONENT_ENABLED_STATE_DEFAULT || it == COMPONENT_ENABLED_STATE_ENABLED }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewAppearanceSettings() {
-  SimpleXTheme {
-    AppearanceLayout(
-      icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
-      changeIcon = {},
-      showThemeSelector = {},
-      editPrimaryColor = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt

@@ -1,33 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Videocam
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-
-@Composable
-fun ExperimentalFeaturesView(chatModel: ChatModel, enableCalls: MutableState<Boolean>) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start
-  ) {
-    Text(
-      stringResource(R.string.settings_experimental_features),
-      style = MaterialTheme.typography.h1,
-      modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
-    )
-    SectionView("") {
-      SettingsPreferenceItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), chatModel.controller.appPrefs.experimentalCalls, enableCalls)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt

@@ -1,234 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionItemWithValue
-import SectionView
-import SectionViewSelectable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun NetworkAndServersView(
-  chatModel: ChatModel,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-) {
-  // It's not a state, just a one-time value. Shouldn't be used in any state-related situations
-  val netCfg = remember { chatModel.controller.getNetCfg() }
-  val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(netCfg.useSocksProxy) }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  val onionHosts = remember { mutableStateOf(netCfg.onionHosts) }
-
-  NetworkAndServersLayout(
-    developerTools = developerTools,
-    networkUseSocksProxy = networkUseSocksProxy,
-    onionHosts = onionHosts,
-    showModal = showModal,
-    showSettingsModal = showSettingsModal,
-    toggleSocksProxy = { enable ->
-      if (enable) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.network_enable_socks),
-          text = generalGetString(R.string.network_enable_socks_info),
-          confirmText = generalGetString(R.string.confirm_verb),
-          onConfirm = {
-            withApi {
-              chatModel.controller.apiSetNetworkConfig(NetCfg.proxyDefaults)
-              chatModel.controller.setNetCfg(NetCfg.proxyDefaults)
-              networkUseSocksProxy.value = true
-              onionHosts.value = NetCfg.proxyDefaults.onionHosts
-            }
-          }
-        )
-      } else {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.network_disable_socks),
-          text = generalGetString(R.string.network_disable_socks_info),
-          confirmText = generalGetString(R.string.confirm_verb),
-          onConfirm = {
-            withApi {
-              chatModel.controller.apiSetNetworkConfig(NetCfg.defaults)
-              chatModel.controller.setNetCfg(NetCfg.defaults)
-              networkUseSocksProxy.value = false
-              onionHosts.value = NetCfg.defaults.onionHosts
-            }
-          }
-        )
-      }
-    },
-    useOnion = {
-      if (onionHosts.value == it) return@NetworkAndServersLayout
-      val prevValue = onionHosts.value
-      onionHosts.value = it
-      val startsWith = when (it) {
-        OnionHosts.NEVER -> generalGetString(R.string.network_use_onion_hosts_no_desc_in_alert)
-        OnionHosts.PREFER -> generalGetString(R.string.network_use_onion_hosts_prefer_desc_in_alert)
-        OnionHosts.REQUIRED -> generalGetString(R.string.network_use_onion_hosts_required_desc_in_alert)
-      }
-      updateOnionHostsDialog(startsWith, onDismiss = {
-        onionHosts.value = prevValue
-      }) {
-        withApi {
-          val newCfg = chatModel.controller.getNetCfg().withOnionHosts(it)
-          val res = chatModel.controller.apiSetNetworkConfig(newCfg)
-          if (res) {
-            chatModel.controller.setNetCfg(newCfg)
-            onionHosts.value = it
-          } else {
-            onionHosts.value = prevValue
-          }
-        }
-      }
-    }
-  )
-}
-
-@Composable fun NetworkAndServersLayout(
-  developerTools: Boolean,
-  networkUseSocksProxy: MutableState<Boolean>,
-  onionHosts: MutableState<OnionHosts>,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  toggleSocksProxy: (Boolean) -> Unit,
-  useOnion: (OnionHosts) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.spacedBy(8.dp)
-  ) {
-    AppBarTitle(stringResource(R.string.network_and_servers))
-    SectionView(generalGetString(R.string.settings_section_title_messages)) {
-      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showModal { SMPServersView(it) })
-      SectionDivider()
-      SectionItemView {
-        UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
-      }
-      SectionDivider()
-      UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
-      if (developerTools) {
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Cable, stringResource(R.string.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
-      }
-    }
-    Spacer(Modifier.height(8.dp))
-    SectionView(generalGetString(R.string.settings_section_title_calls)) {
-      SettingsActionItem(Icons.Outlined.ElectricalServices, stringResource(R.string.webrtc_ice_servers), showModal { RTCServersView(it) })
-    }
-  }
-}
-
-@Composable
-fun UseSocksProxySwitch(
-  networkUseSocksProxy: MutableState<Boolean>,
-  toggleSocksProxy: (Boolean) -> Unit
-) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    Row(
-      Modifier.weight(1f),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-      Icon(
-        Icons.Outlined.SettingsEthernet,
-        stringResource(R.string.network_socks_toggle),
-        tint = HighOrLowlight
-      )
-      Text(stringResource(R.string.network_socks_toggle))
-    }
-    Switch(
-      checked = networkUseSocksProxy.value,
-      onCheckedChange = toggleSocksProxy,
-      colors = SwitchDefaults.colors(
-        checkedThumbColor = MaterialTheme.colors.primary,
-        uncheckedThumbColor = HighOrLowlight
-      ),
-    )
-  }
-}
-
-@Composable
-private fun UseOnionHosts(
-  onionHosts: MutableState<OnionHosts>,
-  enabled: State<Boolean>,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  useOnion: (OnionHosts) -> Unit,
-) {
-  val values = remember {
-    OnionHosts.values().map {
-      when (it) {
-        OnionHosts.NEVER -> ValueTitleDesc(OnionHosts.NEVER, generalGetString(R.string.network_use_onion_hosts_no), generalGetString(R.string.network_use_onion_hosts_no_desc))
-        OnionHosts.PREFER -> ValueTitleDesc(OnionHosts.PREFER, generalGetString(R.string.network_use_onion_hosts_prefer), generalGetString(R.string.network_use_onion_hosts_prefer_desc))
-        OnionHosts.REQUIRED -> ValueTitleDesc(OnionHosts.REQUIRED, generalGetString(R.string.network_use_onion_hosts_required), generalGetString(R.string.network_use_onion_hosts_required_desc))
-      }
-    }
-  }
-  val onSelected = showModal {
-
-    Column(
-      Modifier.fillMaxWidth(),
-      horizontalAlignment = Alignment.Start,
-    ) {
-      AppBarTitle(stringResource(R.string.network_use_onion_hosts))
-      SectionViewSelectable(null, onionHosts, values, useOnion)
-    }
-  }
-
-  SectionItemWithValue(
-    generalGetString(R.string.network_use_onion_hosts),
-    onionHosts,
-    values,
-    icon = Icons.Outlined.Security,
-    enabled = enabled,
-    onSelected = onSelected
-  )
-}
-
-private fun updateOnionHostsDialog(
-  startsWith: String = "",
-  message: String = generalGetString(R.string.updating_settings_will_reconnect_client_to_all_servers),
-  onDismiss: () -> Unit,
-  onConfirm: () -> Unit
-) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.update_onion_hosts_settings_question),
-    text = startsWith + "\n\n" + message,
-    confirmText = generalGetString(R.string.update_network_settings_confirmation),
-    onDismiss = onDismiss,
-    onConfirm = onConfirm,
-    onDismissRequest = onDismiss
-  )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewNetworkAndServersLayout() {
-  SimpleXTheme {
-    NetworkAndServersLayout(
-      developerTools = true,
-      networkUseSocksProxy = remember { mutableStateOf(true) },
-      showModal = { {} },
-      showSettingsModal = { {} },
-      toggleSocksProxy = {},
-      onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
-      useOnion = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt

@@ -1,39 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionSpacer
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Image
-import androidx.compose.material.icons.outlined.TravelExplore
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun PrivacySettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start
-  ) {
-    AppBarTitle(stringResource(R.string.your_privacy))
-    SectionView(stringResource(R.string.settings_section_title_device)) {
-      ChatLockItem(chatModel.performLA, setPerformLA)
-    }
-    SectionSpacer()
-
-    SectionView(stringResource(R.string.settings_section_title_chats)) {
-      SettingsPreferenceItem(Icons.Outlined.Image, stringResource(R.string.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
-      SectionDivider()
-      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SMPServers.kt

@@ -1,258 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionItemViewSpaceBetween
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.OpenInNew
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun SMPServersView(chatModel: ChatModel) {
-  val userSMPServers = chatModel.userSMPServers.value
-  if (userSMPServers != null) {
-    var isUserSMPServers by remember { mutableStateOf(userSMPServers.isNotEmpty()) }
-    var editSMPServers by remember { mutableStateOf(!isUserSMPServers) }
-    val userSMPServersStr = remember { mutableStateOf(if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else "") }
-    fun saveSMPServers(smpServers: List<String>) {
-      withApi {
-        val r = chatModel.controller.setUserSMPServers(smpServers = smpServers)
-        if (r) {
-          chatModel.userSMPServers.value = smpServers
-          if (smpServers.isEmpty()) {
-            isUserSMPServers = false
-            editSMPServers = true
-          } else {
-            editSMPServers = false
-          }
-        }
-      }
-    }
-
-    SMPServersLayout(
-      isUserSMPServers = isUserSMPServers,
-      editSMPServers = editSMPServers,
-      userSMPServersStr = userSMPServersStr,
-      isUserSMPServersOnOff = { switch ->
-        if (switch) {
-          isUserSMPServers = true
-        } else {
-          val userSMPServers = chatModel.userSMPServers.value
-          if (userSMPServers != null) {
-            if (userSMPServers.isNotEmpty()) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(R.string.use_simplex_chat_servers__question),
-                text = generalGetString(R.string.saved_SMP_servers_will_be_removed),
-                confirmText = generalGetString(R.string.confirm_verb),
-                onConfirm = {
-                  saveSMPServers(listOf())
-                  isUserSMPServers = false
-                  userSMPServersStr.value = ""
-                }
-              )
-            } else {
-              isUserSMPServers = false
-              userSMPServersStr.value = ""
-            }
-          }
-        }
-      },
-      cancelEdit = {
-        val userSMPServers = chatModel.userSMPServers.value
-        if (userSMPServers != null) {
-          isUserSMPServers = userSMPServers.isNotEmpty()
-          editSMPServers = !isUserSMPServers
-          userSMPServersStr.value = if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else ""
-        }
-      },
-      saveSMPServers = { saveSMPServers(it) },
-      editOn = { editSMPServers = true },
-    )
-  }
-}
-
-@Composable
-fun SMPServersLayout(
-  isUserSMPServers: Boolean,
-  editSMPServers: Boolean,
-  userSMPServersStr: MutableState<String>,
-  isUserSMPServersOnOff: (Boolean) -> Unit,
-  cancelEdit: () -> Unit,
-  saveSMPServers: (List<String>) -> Unit,
-  editOn: () -> Unit,
-) {
-  Column {
-    AppBarTitle(stringResource(R.string.your_SMP_servers))
-    Column(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = DEFAULT_PADDING),
-      verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-      SectionItemViewSpaceBetween(padding = PaddingValues()) {
-        Text(stringResource(R.string.configure_SMP_servers), Modifier.padding(end = 24.dp))
-        Switch(
-          checked = isUserSMPServers,
-          onCheckedChange = isUserSMPServersOnOff,
-          colors = SwitchDefaults.colors(
-            checkedThumbColor = MaterialTheme.colors.primary,
-            uncheckedThumbColor = HighOrLowlight
-          ),
-        )
-      }
-
-      if (!isUserSMPServers) {
-        Text(stringResource(R.string.using_simplex_chat_servers), lineHeight = 22.sp)
-      } else {
-        Text(stringResource(R.string.enter_one_SMP_server_per_line))
-        if (editSMPServers) {
-          TextEditor(Modifier.height(160.dp), text = userSMPServersStr)
-
-          Row(
-            Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            Column(horizontalAlignment = Alignment.Start) {
-              Row {
-                Text(
-                  stringResource(R.string.cancel_verb),
-                  color = MaterialTheme.colors.primary,
-                  modifier = Modifier
-                    .clickable(onClick = cancelEdit)
-                )
-                Spacer(Modifier.padding(horizontal = 8.dp))
-                Text(
-                  stringResource(R.string.save_servers_button),
-                  color = MaterialTheme.colors.primary,
-                  modifier = Modifier.clickable(onClick = {
-                    val servers = userSMPServersStr.value.split("\n")
-                    saveSMPServers(servers)
-                  })
-                )
-              }
-            }
-            Column(horizontalAlignment = Alignment.End) {
-              howToButton()
-            }
-          }
-        } else {
-          Surface(
-            modifier = Modifier
-              .height(160.dp)
-              .fillMaxWidth(),
-            shape = RoundedCornerShape(10.dp),
-            border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-          ) {
-            SelectionContainer(
-              Modifier.verticalScroll(rememberScrollState())
-            ) {
-              Text(
-                userSMPServersStr.value,
-                Modifier
-                  .padding(vertical = 5.dp, horizontal = 7.dp),
-                style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 14.sp),
-              )
-            }
-          }
-          Row(
-            Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            Column(horizontalAlignment = Alignment.Start) {
-              Text(
-                stringResource(R.string.edit_verb),
-                color = MaterialTheme.colors.primary,
-                modifier = Modifier
-                  .clickable(onClick = editOn)
-              )
-            }
-            Column(horizontalAlignment = Alignment.End) {
-              howToButton()
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun howToButton() {
-  val uriHandler = LocalUriHandler.current
-  Row(
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { uriHandler.openUri("https://github.com/simplex-chat/simplexmq#using-smp-server-and-smp-agent") }
-  ) {
-    Text(stringResource(R.string.how_to), color = MaterialTheme.colors.primary)
-    Icon(
-      Icons.Outlined.OpenInNew, stringResource(R.string.how_to), tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(horizontal = 5.dp)
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutDefaultServers() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = false,
-      editSMPServers = true,
-      userSMPServersStr = remember { mutableStateOf("") },
-      isUserSMPServersOnOff = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutUserServersEditOn() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = true,
-      editSMPServers = true,
-      userSMPServersStr = remember { mutableStateOf("smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im") },
-      isUserSMPServersOnOff = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutUserServersEditOff() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = true,
-      editSMPServers = false,
-      userSMPServersStr = remember { mutableStateOf("smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im") },
-      isUserSMPServersOnOff = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt

@@ -1,370 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-import android.content.res.Configuration
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.platform.UriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.TerminalView
-import chat.simplex.app.views.database.DatabaseView
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.CreateLinkTab
-import chat.simplex.app.views.newchat.CreateLinkView
-import chat.simplex.app.views.onboarding.SimpleXInfo
-
-@Composable
-fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
-  val user = chatModel.currentUser.value
-  val stopped = chatModel.chatRunning.value == false
-
-  MaintainIncognitoState(chatModel)
-
-  if (user != null) {
-    SettingsLayout(
-      profile = user.profile,
-      stopped,
-      chatModel.chatDbEncrypted.value == true,
-      chatModel.incognito,
-      chatModel.controller.appPrefs.incognito,
-      developerTools = chatModel.controller.appPrefs.developerTools,
-      user.displayName,
-      setPerformLA = setPerformLA,
-      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
-      showSettingsModal = { modalView -> { ModalManager.shared.showModal(true) { modalView(chatModel) } } },
-      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } },
-//      showVideoChatPrototype = { ModalManager.shared.showCustomModal { close -> CallViewDebug(close) } },
-    )
-  }
-}
-
-val simplexTeamUri =
-  "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-
-// TODO pass close
-//fun showSectionedModal(chatModel: ChatModel, modalView: (@Composable (ChatModel) -> Unit)) {
-//  ModalManager.shared.showCustomModal { close ->
-//    ModalView(close = close, modifier = Modifier,
-//      background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight) {
-//      modalView(chatModel)
-//    }
-//  }
-//}
-
-@Composable
-fun SettingsLayout(
-  profile: LocalProfile,
-  stopped: Boolean,
-  encrypted: Boolean,
-  incognito: MutableState<Boolean>,
-  incognitoPref: Preference<Boolean>,
-  developerTools: Preference<Boolean>,
-  userDisplayName: String,
-  setPerformLA: (Boolean) -> Unit,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  showTerminal: () -> Unit,
-//  showVideoChatPrototype: () -> Unit
-) {
-  val uriHandler = LocalUriHandler.current
-  Surface(Modifier.fillMaxSize().verticalScroll(rememberScrollState())) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .background(if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight)
-        .padding(top = DEFAULT_PADDING)
-    ) {
-      Text(
-        stringResource(R.string.your_settings),
-        style = MaterialTheme.typography.h1,
-        modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
-        overflow = TextOverflow.Ellipsis,
-      )
-
-      Spacer(Modifier.height(30.dp))
-
-      SectionView(stringResource(R.string.settings_section_title_you)) {
-        SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, disabled = stopped) {
-          ProfilePreview(profile, stopped = stopped)
-        }
-        SectionDivider()
-        SettingsIncognitoActionItem(incognitoPref, incognito, stopped) { showModal { IncognitoView() }() }
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { CreateLinkView(it, CreateLinkTab.LONG_TERM) }, disabled = stopped)
-        SectionDivider()
-        DatabaseItem(encrypted, showSettingsModal { DatabaseView(it, showSettingsModal) }, stopped)
-      }
-      SectionSpacer()
-
-      SectionView(stringResource(R.string.settings_section_title_settings)) {
-        SettingsActionItem(Icons.Outlined.Bolt, stringResource(R.string.notifications), showSettingsModal { NotificationsSettingsView(it) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it, showModal) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showSettingsModal { AppearanceView() }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, disabled = stopped)
-      }
-      SectionSpacer()
-
-      SectionView(stringResource(R.string.settings_section_title_help)) {
-        SettingsActionItem(Icons.Outlined.HelpOutline, stringResource(R.string.how_to_use_simplex_chat), showModal { HelpView(userDisplayName) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.TextFormat, stringResource(R.string.markdown_in_messages), showModal { MarkdownHelpView() })
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUri("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
-      }
-      SectionSpacer()
-
-      SectionView(stringResource(R.string.settings_section_title_develop)) {
-        ChatConsoleItem(showTerminal)
-        SectionDivider()
-        SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools)
-        SectionDivider()
-        InstallTerminalAppItem(uriHandler)
-        SectionDivider()
-//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
-//        SectionDivider()
-        AppVersionItem()
-      }
-    }
-  }
-}
-
-@Composable
-fun SettingsIncognitoActionItem(
-  incognitoPref: Preference<Boolean>,
-  incognito: MutableState<Boolean>,
-  stopped: Boolean,
-  onClickInfo: () -> Unit,
-) {
-  SettingsPreferenceItemWithInfo(
-    if (incognito.value) Icons.Filled.TheaterComedy else Icons.Outlined.TheaterComedy,
-    if (incognito.value) Indigo else HighOrLowlight,
-    stringResource(R.string.incognito),
-    stopped,
-    onClickInfo,
-    incognitoPref,
-    incognito
-  )
-}
-
-@Composable
-fun MaintainIncognitoState(chatModel: ChatModel) {
-  // Cache previous value and once it changes in background, update it via API
-  var cachedIncognito by remember { mutableStateOf(chatModel.incognito.value) }
-  LaunchedEffect(chatModel.incognito.value) {
-    // Don't do anything if nothing changed
-    if (cachedIncognito == chatModel.incognito.value) return@LaunchedEffect
-    try {
-      chatModel.controller.apiSetIncognito(chatModel.incognito.value)
-    } catch (e: Exception) {
-      // Rollback the state
-      chatModel.controller.appPrefs.incognito.set(cachedIncognito)
-      // Crash the app
-      throw e
-    }
-    cachedIncognito = chatModel.incognito.value
-  }
-}
-
-@Composable private fun DatabaseItem(encrypted: Boolean, openDatabaseView: () -> Unit, stopped: Boolean) {
-  SectionItemView(openDatabaseView) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.SpaceBetween
-    ) {
-      Row {
-        Icon(
-          Icons.Outlined.FolderOpen,
-          contentDescription = stringResource(R.string.database_passphrase_and_export),
-          tint = if (encrypted) HighOrLowlight else WarningOrange,
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.database_passphrase_and_export))
-      }
-      if (stopped) {
-        Icon(
-          Icons.Filled.Report,
-          contentDescription = stringResource(R.string.chat_is_stopped),
-          tint = Color.Red,
-          modifier = Modifier.padding(end = 6.dp)
-        )
-      }
-    }
-  }
-}
-
-@Composable fun ChatLockItem(performLA: MutableState<Boolean>, setPerformLA: (Boolean) -> Unit) {
-  SectionItemView() {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(
-        Icons.Outlined.Lock,
-        contentDescription = stringResource(R.string.chat_lock),
-        tint = HighOrLowlight,
-      )
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      Text(
-        stringResource(R.string.chat_lock), Modifier
-          .padding(end = 24.dp)
-          .fillMaxWidth()
-          .weight(1F)
-      )
-      Switch(
-        checked = performLA.value,
-        onCheckedChange = { setPerformLA(it) },
-        colors = SwitchDefaults.colors(
-          checkedThumbColor = MaterialTheme.colors.primary,
-          uncheckedThumbColor = HighOrLowlight
-        )
-      )
-    }
-  }
-}
-
-@Composable private fun ChatConsoleItem(showTerminal: () -> Unit) {
-  SectionItemView(showTerminal) {
-    Icon(
-      painter = painterResource(id = R.drawable.ic_outline_terminal),
-      contentDescription = stringResource(R.string.chat_console),
-      tint = HighOrLowlight,
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(stringResource(R.string.chat_console))
-  }
-}
-
-@Composable private fun InstallTerminalAppItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
-    Icon(
-      painter = painterResource(id = R.drawable.ic_github),
-      contentDescription = "GitHub",
-      tint = HighOrLowlight,
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(generalGetString(R.string.install_simplex_chat_for_terminal), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable private fun AppVersionItem() {
-  SectionItemView() {
-    Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-  }
-}
-
-@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondary, stopped: Boolean = false) {
-  ProfileImage(size = size, image = profileOf.image, color = color)
-  Spacer(Modifier.padding(horizontal = 4.dp))
-  Column {
-    Text(
-      profileOf.displayName,
-      style = MaterialTheme.typography.caption,
-      fontWeight = FontWeight.Bold,
-      color = if (stopped) HighOrLowlight else Color.Unspecified,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis
-    )
-    Text(
-      profileOf.fullName,
-      color = if (stopped) HighOrLowlight else Color.Unspecified,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis
-    )
-  }
-}
-
-@Composable
-fun SettingsActionItem(icon: ImageVector, text: String, click: (() -> Unit)? = null, textColor: Color = Color.Unspecified, iconColor: Color = HighOrLowlight, disabled: Boolean = false) {
-  SectionItemView(click, disabled = disabled) {
-    Icon(icon, text, tint = if (disabled) HighOrLowlight else iconColor)
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(text, color = if (disabled) HighOrLowlight else textColor)
-  }
-}
-
-@Composable
-fun SettingsPreferenceItem(icon: ImageVector, text: String, pref: Preference<Boolean>, prefState: MutableState<Boolean>? = null) {
-  SectionItemView() {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(icon, text, tint = HighOrLowlight)
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      SharedPreferenceToggle(text, pref, prefState)
-    }
-  }
-}
-
-@Composable
-fun SettingsPreferenceItemWithInfo(
-  icon: ImageVector,
-  iconTint: Color,
-  text: String,
-  stopped: Boolean,
-  onClickInfo: () -> Unit,
-  pref: Preference<Boolean>,
-  prefState: MutableState<Boolean>? = null
-) {
-  SectionItemView(onClickInfo) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(icon, text, tint = if (stopped) HighOrLowlight else iconTint)
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      SharedPreferenceToggleWithIcon(text, Icons.Outlined.Info, stopped, onClickInfo, pref, prefState)
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSettingsLayout() {
-  SimpleXTheme {
-    SettingsLayout(
-      profile = LocalProfile.sampleData,
-      stopped = false,
-      encrypted = false,
-      incognito = remember { mutableStateOf(false) },
-      incognitoPref = Preference({ false }, {}),
-      developerTools = Preference({ false }, {}),
-      userDisplayName = "Alice",
-      setPerformLA = {},
-      showModal = { {} },
-      showSettingsModal = { {} },
-      showCustomModal = { {}},
-      showTerminal = {},
-//      showVideoChatPrototype = {}
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ThemeSelector.kt

@@ -1,44 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionViewSelectable
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.intl.Locale
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ThemeSelectorView() {
-  val darkTheme = isSystemInDarkTheme()
-  val allThemes by remember { mutableStateOf(ThemeManager.allThemes(darkTheme).map { ValueTitleDesc(it.second, it.third, "") }) }
-
-  ThemeSelectorLayout(
-    allThemes,
-    onSelectTheme = {
-      ThemeManager.applyTheme(it.name, darkTheme)
-    },
-  )
-}
-
-@Composable
-private fun ThemeSelectorLayout(
-  allThemes: List<ValueTitleDesc<DefaultTheme>>,
-  onSelectTheme: (DefaultTheme) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.settings_section_title_themes).lowercase().capitalize(Locale.current))
-    val currentTheme by CurrentColors.collectAsState()
-    val state = remember { derivedStateOf { currentTheme.second } }
-    SectionViewSelectable(null, state, allThemes, onSelectTheme)
-  }
-}
-

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt

@@ -1,142 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun UserAddressView(chatModel: ChatModel) {
-  val cxt = LocalContext.current
-  UserAddressLayout(
-    userAddress = chatModel.userAddress.value,
-    createAddress = {
-      withApi {
-        chatModel.userAddress.value = chatModel.controller.apiCreateUserAddress()
-      }
-    },
-    share = { userAddress: String -> shareText(cxt, userAddress) },
-    deleteAddress = {
-      AlertManager.shared.showAlertMsg(
-        title = generalGetString(R.string.delete_address__question),
-        text = generalGetString(R.string.all_your_contacts_will_remain_connected),
-        confirmText = generalGetString(R.string.delete_verb),
-        onConfirm = {
-          withApi {
-            chatModel.controller.apiDeleteUserAddress()
-            chatModel.userAddress.value = null
-          }
-        }
-      )
-    }
-  )
-}
-
-@Composable
-fun UserAddressLayout(
-  userAddress: String?,
-  createAddress: () -> Unit,
-  share: (String) -> Unit,
-  deleteAddress: () -> Unit
-) {
-  Column(
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.Top
-  ) {
-    AppBarTitle(stringResource(R.string.your_contact_address), false)
-    Text(
-      stringResource(R.string.you_can_share_your_address_anybody_will_be_able_to_connect),
-      Modifier.padding(bottom = 12.dp),
-      lineHeight = 22.sp
-    )
-    Column(
-      Modifier.fillMaxWidth(),
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceEvenly
-    ) {
-      if (userAddress == null) {
-        Text(
-          stringResource(R.string.if_you_later_delete_address_you_wont_lose_contacts),
-          Modifier.padding(bottom = 12.dp),
-          lineHeight = 22.sp
-        )
-        SimpleButton(stringResource(R.string.create_address), icon = Icons.Outlined.QrCode, click = createAddress)
-      } else {
-        Text(
-          stringResource(R.string.if_you_delete_address_you_wont_lose_contacts),
-          Modifier.padding(bottom = 12.dp),
-          lineHeight = 22.sp
-        )
-        QRCode(userAddress, Modifier.weight(1f, fill = false).aspectRatio(1f))
-        Row(
-          horizontalArrangement = Arrangement.spacedBy(10.dp),
-          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(vertical = 10.dp)
-        ) {
-          SimpleButton(
-            stringResource(R.string.share_link),
-            icon = Icons.Outlined.Share,
-            click = { share(userAddress) })
-          SimpleButton(
-            stringResource(R.string.delete_address),
-            icon = Icons.Outlined.Delete,
-            color = Color.Red,
-            click = deleteAddress
-          )
-        }
-      }
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserAddressLayoutNoAddress() {
-  SimpleXTheme {
-    UserAddressLayout(
-      userAddress = null,
-      createAddress = {},
-      share = { _ -> },
-      deleteAddress = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserAddressLayoutAddressCreated() {
-  SimpleXTheme {
-    UserAddressLayout(
-      userAddress = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
-      createAddress = {},
-      share = { _ -> },
-      deleteAddress = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt

@@ -1,299 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import android.graphics.Bitmap
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.isValidDisplayName
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.launch
-
-@Composable
-fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
-  val user = chatModel.currentUser.value
-  if (user != null) {
-    val editProfile = remember { mutableStateOf(false) }
-    var profile by remember { mutableStateOf(user.profile.toProfile()) }
-    UserProfileLayout(
-      editProfile = editProfile,
-      profile = profile,
-      close,
-      saveProfile = { displayName, fullName, image ->
-        withApi {
-          val p = Profile(displayName, fullName, image)
-          val newProfile = chatModel.controller.apiUpdateProfile(p)
-          if (newProfile != null) {
-            chatModel.currentUser.value?.profile?.profileId?.let {
-              chatModel.updateUserProfile(newProfile.toLocalProfile(it))
-            }
-            profile = newProfile
-          }
-          editProfile.value = false
-        }
-      }
-    )
-  }
-}
-
-@Composable
-fun UserProfileLayout(
-  editProfile: MutableState<Boolean>,
-  profile: Profile,
-  close: () -> Unit,
-  saveProfile: (String, String, String?) -> Unit,
-) {
-  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
-  val displayName = remember { mutableStateOf(profile.displayName) }
-  val fullName = remember { mutableStateOf(profile.fullName) }
-  val chosenImage = remember { mutableStateOf<Bitmap?>(null) }
-  val profileImage = remember { mutableStateOf(profile.image) }
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val keyboardState by getKeyboardState()
-  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    ModalBottomSheetLayout(
-      scrimColor = Color.Black.copy(alpha = 0.12F),
-      modifier = Modifier.navigationBarsWithImePadding(),
-      sheetContent = {
-        GetImageBottomSheet(
-          chosenImage,
-          onImageChange = { bitmap -> profileImage.value = resizeImageToStrSize(cropToSquare(bitmap), maxDataSize = 12500) },
-          hideBottomSheet = {
-            scope.launch { bottomSheetModalState.hide() }
-          })
-      },
-      sheetState = bottomSheetModalState,
-      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
-    ) {
-      ModalView(close = close) {
-        Column(
-          Modifier
-            .verticalScroll(scrollState)
-            .padding(horizontal = DEFAULT_PADDING),
-          horizontalAlignment = Alignment.Start
-        ) {
-          AppBarTitle(stringResource(R.string.your_chat_profile), false)
-          Text(
-            stringResource(R.string.your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it),
-            Modifier.padding(bottom = 24.dp),
-            color = MaterialTheme.colors.onBackground,
-            lineHeight = 22.sp
-          )
-          if (editProfile.value) {
-            Column(
-              Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.Start
-            ) {
-              Box(
-                Modifier
-                  .fillMaxWidth()
-                  .padding(bottom = 24.dp),
-                contentAlignment = Alignment.Center
-              ) {
-                Box(contentAlignment = Alignment.TopEnd) {
-                  Box(contentAlignment = Alignment.Center) {
-                    ProfileImage(192.dp, profileImage.value)
-                    EditImageButton { scope.launch { bottomSheetModalState.show() } }
-                  }
-                  if (profileImage.value != null) {
-                    DeleteImageButton { profileImage.value = null }
-                  }
-                }
-              }
-              Box {
-                if (!isValidDisplayName(displayName.value)) {
-                  Icon(Icons.Outlined.Info, tint = Color.Red, contentDescription = stringResource(R.string.display_name_cannot_contain_whitespace))
-                }
-                ProfileNameTextField(displayName)
-              }
-              ProfileNameTextField(fullName)
-              Row {
-                TextButton(stringResource(R.string.cancel_verb)) {
-                  displayName.value = profile.displayName
-                  fullName.value = profile.fullName
-                  profileImage.value = profile.image
-                  editProfile.value = false
-                }
-                Spacer(Modifier.padding(horizontal = 8.dp))
-                val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-                val saveModifier: Modifier
-                val saveColor: Color
-                if (enabled) {
-                  saveModifier = Modifier
-                    .clickable { saveProfile(displayName.value, fullName.value, profileImage.value) }
-                  saveColor = MaterialTheme.colors.primary
-                } else {
-                  saveModifier = Modifier
-                  saveColor = HighOrLowlight
-                }
-                Text(
-                  stringResource(R.string.save_and_notify_contacts),
-                  modifier = saveModifier,
-                  color = saveColor
-                )
-              }
-            }
-          } else {
-            Column(
-              modifier = Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.Start
-            ) {
-              Box(
-                Modifier
-                  .fillMaxWidth()
-                  .padding(bottom = 24.dp), contentAlignment = Alignment.Center
-              ) {
-                ProfileImage(192.dp, profile.image)
-                if (profile.image == null) {
-                  EditImageButton {
-                    editProfile.value = true
-                    scope.launch { bottomSheetModalState.show() }
-                  }
-                }
-              }
-              ProfileNameRow(stringResource(R.string.display_name__field), profile.displayName)
-              ProfileNameRow(stringResource(R.string.full_name__field), profile.fullName)
-              TextButton(stringResource(R.string.edit_verb)) { editProfile.value = true }
-            }
-          }
-          if (savedKeyboardState != keyboardState) {
-            LaunchedEffect(keyboardState) {
-              scope.launch {
-                savedKeyboardState = keyboardState
-                scrollState.animateScrollTo(scrollState.maxValue)
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun ProfileNameTextField(name: MutableState<String>) {
-  BasicTextField(
-    value = name.value,
-    onValueChange = { name.value = it },
-    modifier = Modifier
-      .padding(bottom = 24.dp)
-      .padding(start = 28.dp)
-      .fillMaxWidth(),
-    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-    keyboardOptions = KeyboardOptions(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    singleLine = true
-  )
-}
-
-@Composable
-fun ProfileNameRow(label: String, text: String) {
-  Row(Modifier.padding(bottom = 24.dp)) {
-    Text(
-      label,
-      color = MaterialTheme.colors.onBackground
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(
-      text,
-      fontWeight = FontWeight.Bold,
-      color = MaterialTheme.colors.onBackground
-    )
-  }
-}
-
-@Composable
-fun TextButton(text: String, click: () -> Unit) {
-  Text(
-    text,
-    color = MaterialTheme.colors.primary,
-    modifier = Modifier.clickable(onClick = click),
-  )
-}
-
-@Composable
-fun EditImageButton(click: () -> Unit) {
-  IconButton(
-    onClick = click,
-    modifier = Modifier.background(Color(1f, 1f, 1f, 0.2f), shape = CircleShape)
-  ) {
-    Icon(
-      Icons.Outlined.PhotoCamera,
-      contentDescription = stringResource(R.string.edit_image),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier.size(36.dp)
-    )
-  }
-}
-
-@Composable
-fun DeleteImageButton(click: () -> Unit) {
-  IconButton(onClick = click) {
-    Icon(
-      Icons.Outlined.Close,
-      contentDescription = stringResource(R.string.delete_image),
-      tint = MaterialTheme.colors.primary,
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserProfileLayoutEditOff() {
-  SimpleXTheme {
-    UserProfileLayout(
-      profile = Profile.sampleData,
-      close = {},
-      editProfile = remember { mutableStateOf(false) },
-      saveProfile = { _, _, _ -> }
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserProfileLayoutEditOn() {
-  SimpleXTheme {
-    UserProfileLayout(
-      profile = Profile.sampleData,
-      close = {},
-      editProfile = remember { mutableStateOf(true) },
-      saveProfile = { _, _, _ -> }
-    )
-  }
-}

apps/android/app/src/main/res/values-de/strings.xml

@@ -1,844 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-
-  <string name="thousand_abbreviation">k</string>
-
-  <!-- Connect via Link - MainActivity.kt -->
-  <string name="connect_via_contact_link">Über den Kontakt-Link verbinden?</string>
-  <string name="connect_via_invitation_link">Über den Einladungs-Link verbinden?</string>
-  <string name="profile_will_be_sent_to_contact_sending_link">Ihr Profil wird an den Kontakt gesendet von dem Sie diesen Link erhalten haben.</string>
-  <string name="connect_via_link_verb">Verbinden</string>
-
-  <!-- Server info - ChatModel.kt -->
-  <string name="server_connected">Verbunden</string>
-  <string name="server_error">Fehler</string>
-  <string name="server_connecting">verbinde</string>
-  <string name="connected_to_server_to_receive_messages_from_contact">Sie sind mit dem Server verbunden, der für den Empfang von Nachrichten mit diesem Kontakt genutzt wird.</string>
-  <string name="trying_to_connect_to_server_to_receive_messages_with_error">Beim Versuch die Verbindung mit dem Server aufzunehmen, der für den Empfang von Nachrichten mit diesem Kontakt genutzt wird, ist ein Fehler aufgetreten (Fehler: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
-  <string name="trying_to_connect_to_server_to_receive_messages">Versuche die Verbindung mit dem Server aufzunehmen, der für den Empfang von Nachrichten mit diesem Kontakt genutzt wird.</string>
-
-  <!-- Item Content - ChatModel.kt -->
-  <string name="deleted_description">Gelöscht</string>
-  <string name="sending_files_not_yet_supported">Das Senden von Dateien wird noch nicht unterstützt</string>
-  <string name="receiving_files_not_yet_supported">Der Empfang von Dateien wird noch nicht unterstützt</string>
-  <string name="sender_you_pronoun">Meine Daten</string>
-  <string name="unknown_message_format">Unbekanntes Nachrichtenformat</string>
-  <string name="invalid_message_format">Unzulässiges Nachrichtenformat</string>
-
-  <!-- PendingContactConnection - ChatModel.kt -->
-  <string name="connection_local_display_name">Verbindung <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
-  <string name="display_name_connection_established">Verbindung hergestellt</string>
-  <string name="display_name_invited_to_connect">Für eine Verbindung eingeladen</string>
-  <string name="display_name_connecting">verbinde …</string>
-  <string name="description_you_shared_one_time_link">Sie haben einen Einmal-Link geteilt</string>
-  <string name="description_you_shared_one_time_link_incognito">Sie haben Inkognito einen Einmal-Link geteilt</string>
-  <string name="description_via_contact_address_link">über einen Kontaktadressen Link</string>
-  <string name="description_via_contact_address_link_incognito">Inkognito über einen Kontaktadressen Link</string>
-  <string name="description_via_one_time_link">über einen Einmal-Link</string>
-  <string name="description_via_one_time_link_incognito">Inkognito über einen Einmal-Link</string>
-
-  <!-- SimpleXAPI.kt -->
-  <string name="error_saving_smp_servers">Fehler beim Speichern der SMP-Server</string>
-  <string name="ensure_smp_server_address_are_correct_format_and_unique">Stellen Sie sicher, dass die SMP-Server Adressen das richtige Format haben, zeilenweise angeordnet und nicht kopiert sind.</string>
-  <string name="error_setting_network_config">Fehler bei der Aktualisierung der Netzwerk-Konfiguration.</string>
-
-  <!-- API Error Responses - SimpleXAPI.kt -->
-  <string name="connection_timeout">Verbindungszeitüberschreitung</string>
-  <string name="connection_error">Verbindungsfehler</string>
-  <string name="network_error_desc">Bitte überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie es erneut.</string>
-  <string name="error_sending_message">Fehler beim Senden der Nachricht</string>
-  <string name="error_adding_members">Fehler beim Hinzufügen von Mitgliedern</string>
-  <string name="error_joining_group">Fehler beim Beitritt zur Gruppe</string>
-  <string name="cannot_receive_file">Datei kann nicht empfangen werden</string>
-  <string name="sender_cancelled_file_transfer">Der Absender hat die Dateiübertragung abgebrochen.</string>
-  <string name="error_receiving_file">Fehler beim Empfangen der Datei</string>
-  <string name="error_creating_address">Fehler beim Erstellen der Adresse</string>
-  <string name="contact_already_exists">Kontakt ist bereits vorhanden</string>
-  <string name="you_are_already_connected_to_vName_via_this_link">Sie sind bereits über diesen Link mit <xliff:g id="contactName" example="Alice">%1$s!</xliff:g> verbunden.</string>
-  <string name="invalid_connection_link">Ungültiger Verbindungslink</string>
-  <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Überprüfen Sie bitte, ob Sie den richtigen Link genutzt haben oder bitten Sie Ihren Kontakt darum, Ihnen nochmal einen Link zuzusenden.</string>
-  <string name="connection_error_auth">Verbindungsfehler (AUTH)</string>
-  <string name="connection_error_auth_desc">Entweder hat Ihr Kontakt die Verbindung gelöscht, oder dieser Link wurde bereits verwendet, es könnte sich um einen Fehler handeln - Bitte melden Sie es uns.\nBitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um sich neu verbinden zu können und stellen Sie sicher, dass Sie eine stabile Netzwerk-Verbindung haben.</string>
-  <string name="error_accepting_contact_request">Fehler beim Akzeptieren der Kontaktanfrage</string>
-  <string name="sender_may_have_deleted_the_connection_request">Der Absender hat möglicherweise die Verbindungsanfrage gelöscht.</string>
-  <string name="cannot_delete_contact">Der Kontakt kann nicht gelöscht werden!</string>
-  <string name="contact_cannot_be_deleted_as_they_are_in_groups">Der Kontakt mit <xliff:g id="contactName" example="Jane Doe">%1$s!</xliff:g> kann nicht gelöscht werden, da er Mitglied einer oder mehrerer dieser Gruppen ist <xliff:g id="groups" example="[team, chess club]">%2$s</xliff:g>.</string>
-  <string name="error_deleting_contact">Fehler beim Löschen des Kontakts</string>
-  <string name="error_deleting_group">Fehler beim Löschen der Gruppe</string>
-  <string name="error_deleting_contact_request">Fehler beim Löschen der Kontakt-Anfrage</string>
-  <string name="error_deleting_pending_contact_connection">Fehler beim Löschen der anstehenden Kontaktaufnahme</string>
-
-  <!-- background service notice - SimpleXAPI.kt -->
-  <string name="icon_descr_instant_notifications">Sofortige Benachrichtigungen</string>
-  <string name="service_notifications">Sofortige Benachrichtigungen!</string>
-  <string name="service_notifications_disabled">Sofortige Benachrichtigungen sind deaktiviert!</string>
-  <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Um Ihre Privatsphäre zu schützen kann statt der Push-Benachrichtigung der <b><xliff:g id="appName">SimpleX</xliff:g> Hintergrunddienst genutzt werden</b> – dieser benötigt ein paar Prozent Akkuleistung am Tag.</string>
-  <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Diese können über die Einstellungen deaktiviert werden</b> – Solange die App abläuft werden Benachrichtigungen weiterhin angezeigt.</string>
-  <string name="turn_off_battery_optimization">Um diese Funktion zu nutzen, ist es nötig, die Einstellung <b>Akkuoptimierung</b> für <xliff:g id="appName">SimpleX</xliff:g> im nächsten Dialog zu <b>deaktivieren</b>. Ansonsten werden die Benachrichtigungen deaktiviert.</string>
-  <string name="turning_off_service_and_periodic">Die Akkuoptimierung ist aktiv, der Hintergrunddienst und die regelmäßige Nachfrage nach neuen Nachrichten ist abgeschaltet. Sie können diese Funktion in den Einstellungen wieder aktivieren.</string>
-  <string name="periodic_notifications">Regelmäßige Benachrichtigungen</string>
-  <string name="periodic_notifications_disabled">Regelmäßige Benachrichtigungen sind deaktiviert!</string>
-  <string name="periodic_notifications_desc">Die App holt regelmäßig neue Nachrichten ab — dies benötigt ein paar Prozent Akkuleistung am Tag. Die App nutzt keine Push-Benachrichtigungen — es werden keine Daten von Ihrem Gerät an Server gesendet.</string>
-  <string name="enter_passphrase_notification_title">Passwort wird benötigt</string>
-  <string name="enter_passphrase_notification_desc">Geben Sie bitte das Datenbank-Passwort ein, um Benachrichtigungen zu erhalten.</string>
-  <string name="database_initialization_error_title">Die Datenbank kann nicht initialisiert werden</string>
-  <string name="database_initialization_error_desc">Die Datenbank arbeitet nicht richtig. Tippen Sie für weitere Informationen.</string>
-
-  <!-- SimpleX Chat foreground Service -->
-  <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> Hintergrunddienst</string>
-  <string name="simplex_service_notification_text">Empfange Nachrichten …</string>
-  <string name="hide_notification">Verberge</string>
-
-  <!-- Notification channels -->
-  <string name="ntf_channel_messages">SimpleX Chat Nachrichten</string>
-  <string name="ntf_channel_calls">SimpleX Chat Anrufe</string>
-  <string name="ntf_channel_calls_lockscreen">SimpleX Chat Anrufe (Sperrbildschirm)</string>
-
-  <!-- Notifications -->
-  <string name="settings_notifications_mode_title">Benachrichtigungsdienst</string>
-  <string name="settings_notification_preview_mode_title">Vorschau anzeigen</string>
-  <string name="settings_notification_preview_title">Benachrichtigungsvorschau</string>
-  <string name="notifications_mode_off">Wird ausgeführt, wenn die App geöffnet ist</string>
-  <string name="notifications_mode_periodic">Startet regelmäßig</string>
-  <string name="notifications_mode_service">Immer aktiv</string>
-  <string name="notifications_mode_off_desc">Die App kann Benachrichtigungen nur empfangen, wenn sie ausgeführt wird, es wird kein Hintergrunddienst gestartet.</string>
-  <string name="notifications_mode_periodic_desc">Überprüft alle 10 Minuten auf neue Nachrichten für bis zu einer Minute.</string>
-  <string name="notifications_mode_service_desc">Der Hintergrunddienst läuft immer – Benachrichtigungen werden angezeigt, sobald Nachrichten verfügbar sind.</string>
-  <string name="notification_preview_mode_message">Nachrichtentext</string>
-  <string name="notification_preview_mode_contact">Kontaktname</string>
-  <string name="notification_preview_mode_hidden">Verborgen</string>
-  <string name="notification_preview_mode_message_desc">Kontakt und Nachricht anzeigen</string>
-  <string name="notification_preview_mode_contact_desc">Nur Kontakt anzeigen</string>
-  <string name="notification_display_mode_hidden_desc">Kontakt und Nachricht verbergen</string>
-  <string name="notification_preview_somebody">Kontakt verbergen:</string>
-  <string name="notification_preview_new_message">neue Nachricht</string>
-  <string name="notification_new_contact_request">New contact request</string>
-  <string name="notification_contact_connected">Сonnected</string>
-
-  <!-- local authentication notice - SimpleXAPI.kt -->
-  <string name="la_notice_title_simplex_lock">SimpleX Sperre</string>
-  <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Um Ihre Informationen zu schützen, schalten Sie die SimpleX Sperre ein.\nSie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.</string>
-  <string name="la_notice_turn_on">Aktivieren</string>
-
-  <!-- LocalAuthentication.kt -->
-  <string name="auth_simplex_lock_turned_on">SimpleX Sperre aktiviert</string>
-  <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Sie müssen sich authentifizieren, wenn Sie die im Hintergrund befindliche App nach 30 Sekunden starten oder fortsetzen.</string>
-  <string name="auth_unlock">Entsperren</string>
-  <string name="auth_log_in_using_credential">Melden Sie sich mit Ihren Zugangsdaten an</string>
-  <string name="auth_enable_simplex_lock">SimpleX Sperre aktivieren</string>
-  <string name="auth_disable_simplex_lock">SimpleX Sperre deaktivieren</string>
-  <string name="auth_confirm_credential">Bestätigen Sie Ihre Zugangsdaten</string>
-  <string name="auth_error">Authentifizierungsfehler</string>
-  <string name="auth_error_w_desc">Authentifizierungsfehler: <xliff:g id="desc">%1$s</xliff:g></string>
-  <string name="auth_failed">Authentifizierung fehlgeschlagen</string>
-  <string name="auth_unavailable">Authentifizierung nicht verfügbar</string>
-  <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Geräteauthentifizierung ist nicht aktiviert. Sie können die SimpleX Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</string>
-  <string name="auth_device_authentication_is_disabled_turning_off">Geräteauthentifizierung ist deaktiviert. SimpleX Sperre ist abgeschaltet.</string>
-  <string name="auth_retry">Wiederholen</string>
-  <string name="auth_stop_chat">Chat beenden</string>
-  <string name="auth_open_chat_console">Chat-Konsole öffnen</string>
-
-  <!-- Chat Actions - ChatItemView.kt (and general) -->
-  <string name="reply_verb">Antwort</string>
-  <string name="share_verb">Teilen</string>
-  <string name="copy_verb">Kopieren</string>
-  <string name="save_verb">Speichern</string>
-  <string name="edit_verb">Bearbeiten</string>
-  <string name="delete_verb">Löschen</string>
-  <string name="delete_message__question">Die Nachricht löschen?</string>
-  <string name="delete_message_cannot_be_undone_warning">Nachricht wird gelöscht - dies kann nicht rückgängig gemacht werden!</string>
-  <string name="for_me_only">Nur für mich</string>
-  <string name="for_everybody">Für alle</string>
-
-  <!-- CIMetaView.kt -->
-  <string name="icon_descr_edited">bearbeitet</string>
-  <string name="icon_descr_sent_msg_status_sent">gesendet</string>
-  <string name="icon_descr_sent_msg_status_unauthorized_send">nicht autorisiertes Senden</string>
-  <string name="icon_descr_sent_msg_status_send_failed">Senden fehlgeschlagen</string>
-  <string name="icon_descr_received_msg_status_unread">ungelesen</string>
-
-  <!-- ChatListView.kt -->
-  <string name="personal_welcome">Willkommen <xliff:g>%1$s</xliff:g>!</string>
-  <string name="welcome">Willkommen!</string>
-  <string name="this_text_is_available_in_settings">Dieser Text ist in den Einstellungen verfügbar.</string>
-  <string name="your_chats">Meine Chats</string>
-  <string name="contact_connection_pending">verbinde …</string>
-  <string name="group_preview_you_are_invited">Sie sind zu der Gruppe eingeladen</string>
-  <string name="group_preview_join_as">beitreten als %s</string>
-  <string name="group_connection_pending">verbinde …</string>
-  <string name="tap_to_start_new_chat">Tippen Sie um einen neuen Chat zu starten</string>
-  <string name="chat_with_developers">Chatten Sie mit den Entwicklern</string>
-  <string name="you_have_no_chats">Sie haben keine Chats</string>
-
-  <!-- ShareListView.kt -->
-  <string name="share_message">Nachricht teilen…</string>
-  <string name="share_image">Bild teilen…</string>
-  <string name="share_file">Datei teilen…</string>
-
-  <!-- ComposeView.kt, helpers -->
-  <string name="attach">Anhängen</string>
-  <string name="icon_descr_context">Kontextsymbol</string>
-  <string name="icon_descr_cancel_image_preview">Bildervorschau abbrechen</string>
-  <string name="icon_descr_cancel_file_preview">Dateivorschau abbrechen</string>
-  <string name="images_limit_title">Zu viele Bilder!</string>
-  <string name="images_limit_desc">Es können nur 10 Bilder auf einmal gesendet werden</string>
-
-  <!-- Images - CIImageView.kt -->
-  <string name="image_descr">Bild</string>
-  <string name="icon_descr_waiting_for_image">Warten auf ein Bild</string>
-  <string name="icon_descr_asked_to_receive">Um Empfang des Bildes gebeten</string>
-  <string name="icon_descr_image_snd_complete">Bild gesendet</string>
-  <string name="waiting_for_image">Warten auf ein Bild</string>
-  <string name="image_will_be_received_when_contact_is_online">Das Bild wird empfangen, wenn Ihr Kontakt online ist, bitte warten oder schauen Sie später nochmal nach!</string>
-  <string name="image_saved">Bild wurde im Fotoalbum gespeichert</string>
-
-  <!-- Files - CIFileView.kt -->
-  <string name="icon_descr_file">Datei</string>
-  <string name="large_file">Große Datei!</string>
-  <string name="contact_sent_large_file">Ihr Kontakt hat eine Datei gesendet, die größer ist als die derzeit unterstützte maximale Größe (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
-  <string name="maximum_supported_file_size">Die derzeit maximal unterstützte Dateigröße beträgt <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-  <string name="waiting_for_file">Warte auf Datei</string>
-  <string name="file_will_be_received_when_contact_is_online">Die Datei wird empfangen, wenn Ihr Kontakt online ist, bitte warten oder schauen Sie später nochmal nach!</string>
-  <string name="file_saved">Datei gespeichert</string>
-  <string name="file_not_found">Datei nicht gefunden</string>
-  <string name="error_saving_file">Fehler beim Speichern der Datei</string>
-
-  <!-- Chat Info Settings - ChatInfoView.kt -->
-  <string name="notifications">Benachrichtigungen</string>
-
-  <!-- Chat Info Actions - ChatInfoView.kt -->
-  <string name="delete_contact_question">Kontakt löschen?</string>
-  <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Der Kontakt und alle Nachrichten werden gelöscht - dies kann nicht rückgängig gemacht werden!</string>
-  <string name="button_delete_contact">Kontakt löschen</string>
-  <string name="text_field_set_contact_placeholder">Kontaktname festlegen…</string>
-  <string name="icon_descr_server_status_connected">Verbunden</string>
-  <string name="icon_descr_server_status_disconnected">Getrennt</string>
-  <string name="icon_descr_server_status_error">Fehler</string>
-  <string name="icon_descr_server_status_pending">Ausstehend</string>
-
-  <!-- Message Actions - SendMsgView.kt -->
-  <string name="icon_descr_send_message">Nachricht senden</string>
-
-  <!-- General Actions / Responses -->
-  <string name="back">Zurück</string>
-  <string name="cancel_verb">Abbrechen</string>
-  <string name="confirm_verb">Bestätigen</string>
-  <string name="ok">OK</string>
-  <string name="no_details">keine Details</string>
-  <string name="add_contact">Kontakt hinzufügen</string>
-  <string name="copied">In die Zwischenablage kopiert</string>
-
-  <!-- NewChatSheet -->
-  <string name="add_contact_or_create_group">Neuen Chat starten</string>
-  <string name="share_one_time_link">Erstellen Sie einen einmaligen Einladungslink</string>
-  <string name="connect_via_link_or_qr">Per Link / QR-Code verbinden</string>
-  <string name="scan_QR_code">QR-Code scannen</string>
-  <string name="create_group">Geheime Gruppe erstellen</string>
-  <string name="to_share_with_your_contact">(zum Teilen mit Ihrem Kontakt)</string>
-  <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(Scannen oder Einfügen aus der Zwischenablage)</string>
-  <string name="only_stored_on_members_devices">(wird nur von Gruppenmitgliedern gespeichert)</string>
-
-  <!-- GetImageView -->
-  <string name="toast_permission_denied">Berechtigung verweigert!</string>
-  <string name="use_camera_button">Kamera\nverwenden</string>
-  <string name="from_gallery_button">Aus dem\nFotoalbum</string>
-  <string name="choose_file">Datei\nauswählen</string>
-
-  <!-- help - ChatHelpView.kt -->
-  <string name="thank_you_for_installing_simplex">Danke, dass Sie <xliff:g id="appNameFull">SimpleX Chat</xliff:g> installiert haben!</string>
-  <string name="you_can_connect_to_simplex_chat_founder">Sie können sich <font color="#0088ff">mit <xliff:g id="appNameFull">SimpleX Chat</xliff:g> Entwicklern verbinden, um Fragen zu stellen und Updates zu erhalten</font>.</string>
-  <string name="to_start_a_new_chat_help_header">Um einen neuen Chat zu starten</string>
-  <string name="chat_help_tap_button">Schaltfläche antippen</string>
-  <string name="above_then_preposition_continuation">über, dann:</string>
-  <string name="add_new_contact_to_create_one_time_QR_code"><b>Neuen Kontakt hinzufügen</b>: Um Ihren Einmal-QR-Code für Ihren Kontakt zu erstellen.</string>
-  <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>QR-Code scannen</b>: Um sich mit Ihrem Kontakt zu verbinden, der Ihnen seinen QR-Code zeigt.</string>
-  <string name="to_connect_via_link_title">Über Link verbinden</string>
-  <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Wenn Sie einen <xliff:g id="appName">SimpleX Chat</xliff:g> Einladungslink erhalten haben, können Sie ihn in Ihrem Browser öffnen:</string>
-  <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 Desktop: Angezeigten QR-Code aus der App scannen, über <b>QR-Code scannen</b>.</string>
-  <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 Handy: Tippen Sie auf <b>In mobiler App öffnen</b> und dann auf <b>Verbinden</b> in der App.</string>
-
-  <!-- Contact Request Alert Dialogue - ChatListNavLinkView.kt -->
-  <string name="accept_connection_request__question">Die Verbindungsanfrage akzeptieren?</string>
-  <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Wenn Sie ablehnen, wird der Absender NICHT benachrichtigt.</string>
-  <string name="accept_contact_button">Akzeptieren</string>
-  <string name="accept_contact_incognito_button">Inkognito akzeptieren</string>
-  <string name="reject_contact_button">Ablehnen</string>
-
-  <!-- Clear Chat - ChatListNavLinkView.kt -->
-  <string name="clear_chat_question">Chatinhalte löschen?</string>
-  <string name="clear_chat_warning">Alle Nachrichten werden gelöscht - dies kann nicht rückgängig gemacht werden! Die Nachrichten werden NUR bei Ihnen gelöscht.</string>
-  <string name="clear_verb">Löschen</string>
-  <string name="clear_chat_button">Chatinhalte löschen</string>
-  <string name="clear_chat_menu_action">Chatinhalte löschen</string>
-  <string name="delete_contact_menu_action">Kontakt löschen</string>
-  <string name="delete_group_menu_action">Gruppe löschen</string>
-  <string name="mark_read">Als gelesen markieren</string>
-  <string name="set_contact_name">Kontaktname festlegen</string>
-
-  <!-- Actions - ChatListNavLinkView.kt -->
-  <string name="mute_chat">Stummschalten</string>
-  <string name="unmute_chat">Stummschaltung aufheben</string>
-
-  <!-- Pending contact connection alert dialogues -->
-  <string name="you_invited_your_contact">Sie haben Ihren Kontakt eingeladen</string>
-  <string name="you_accepted_connection">Sie haben die Verbindung akzeptiert</string>
-  <string name="delete_pending_connection__question">Ausstehende Verbindung löschen?</string>
-  <string name="contact_you_shared_link_with_wont_be_able_to_connect">Der Kontakt, mit dem Sie diesen Link geteilt haben, kann sich NICHT verbinden!</string>
-  <string name="connection_you_accepted_will_be_cancelled">Die von Ihnen akzeptierte Verbindung wird abgebrochen!</string>
-
-  <!-- Contact Pending Alert Dialogue - ChatListNavLinkView.kt -->
-  <string name="alert_title_contact_connection_pending">Ihr Kontakt ist noch nicht verbunden!</string>
-  <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Ihr Kontakt muss online sein, damit die Verbindung hergestellt werden kann.\nSie können diese Verbindung abbrechen und den Kontakt entfernen (und es später nochmals mit einem neuen Link versuchen).</string>
-
-  <!-- Contact Request Information - ContactRequestView.kt -->
-  <string name="contact_wants_to_connect_with_you">möchte sich mit Ihnen verbinden!</string>
-
-  <!-- Image Placeholder - ChatInfoImage.kt -->
-  <string name="icon_descr_profile_image_placeholder">Platzhalter für Profilbild</string>
-  <string name="image_descr_profile_image">Profilbild</string>
-
-  <!-- Content Descriptions -->
-  <string name="icon_descr_close_button">Schließen Schaltfläche</string>
-  <string name="image_descr_link_preview">Vorschaubild verlinken</string>
-  <string name="icon_descr_cancel_link_preview">Link Vorschau abbrechen</string>
-  <string name="icon_descr_settings">Einstellungen</string>
-  <string name="image_descr_qr_code">QR Code</string>
-  <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> Adresse</string>
-  <string name="icon_descr_help">Hilfe</string>
-  <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> Team</string>
-  <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> Logo</string>
-  <string name="icon_descr_email">E-Mail</string>
-  <string name="icon_descr_more_button">Mehr</string>
-
-  <!-- Connection info - ContactConnectionInfoView.kt -->
-  <string name="show_QR_code">QR-Code anzeigen</string>
-
-  <!-- Add Contact - AddContactView.kt -->
-  <string name="invalid_QR_code">Ungültiger QR-Code</string>
-  <string name="this_QR_code_is_not_a_link">Dieser QR-Code beschreibt keinen Link!</string>
-  <string name="invalid_contact_link">Ungültiger Link!</string>
-  <string name="this_link_is_not_a_valid_connection_link">Dieser Link ist kein gültiger Verbindungslink!</string>
-  <string name="connection_request_sent">Verbindungsanfrage gesendet!</string>
-  <string name="you_will_be_connected_when_your_connection_request_is_accepted">Sie werden verbunden, sobald Ihre Verbindungsanfrage akzeptiert wird, bitte warten oder schauen Sie später nochmal nach!</string>
-  <string name="you_will_be_connected_when_your_contacts_device_is_online">Sie werden verbunden, wenn das Gerät Ihres Kontakts online ist, bitte warten oder schauen Sie später nochmal nach!</string>
-  <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Zeigen Sie Ihrem Kontakt den QR-Code aus der App zum Scannen.</string>
-  <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Wenn Sie sich nicht persönlich treffen können, können Sie <b>den QR-Code während eines Videoanrufs anzeigen</b> oder einen Einladungslink über einen anderen Kanal mit Ihrem Kontakt teilen.</string >
-  <string name="your_chat_profile_will_be_sent_to_your_contact">Ihr Chat-Profil wird\nan Ihren Kontakt gesendet.</string>
-  <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Wenn Sie sich nicht persönlich treffen können, können Sie <b>den QR-Code während eines Videoanrufs scannen</b> oder Ihr Kontakt kann einen Einladungslink über einen anderen Kanal mit Ihnen teilen.</string>
-  <string name="share_invitation_link">Einladungslink teilen</string>
-  <string name="paste_connection_link_below_to_connect">Fügen Sie den erhaltenen Link in das Feld unten ein, um sich mit Ihrem Kontakt zu verbinden.</string>
-  <string name="your_profile_will_be_sent">Ihr Chat-Profil wird an Ihren Kontakt gesendet.</string>
-
-  <!-- PasteToConnect.kt -->
-  <string name="connect_via_link">Über einen Link verbinden</string>
-  <string name="connect_button">Verbinden</string>
-  <string name="paste_button">Einfügen</string>
-  <string name="this_string_is_not_a_connection_link">Diese Zeichenfolge entspricht keinem gültigen Verbindungslink!</string>
-  <string name="you_can_also_connect_by_clicking_the_link">Sie können sich auch verbinden, indem Sie auf den Link klicken. Wenn er im Browser geöffnet wird, klicken Sie auf die Schaltfläche <b>In mobiler App öffnen</b>.</string>
-
-  <!-- CreateLinkView.kt -->
-  <string name="create_one_time_link">Link / QR-Code erstellen</string>
-  <string name="one_time_link">Einmaliger Einladungs-Link</string>
-  <string name="your_contact_address">Meine Kontaktadresse</string>
-
-  <!-- settings - SettingsView.kt -->
-  <string name="your_settings">Meine Einstellungen</string>
-  <string name="your_simplex_contact_address">Meine <xliff:g id="appName">SimpleX</xliff:g> Kontaktadresse</string>
-  <string name="database_passphrase_and_export">Datenbank-Passwort &amp; -Export</string>
-  <string name="about_simplex_chat">Über <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-  <string name="how_to_use_simplex_chat">Wie man SimpleX nutzt</string>
-  <string name="markdown_help">Markdown Hilfe</string>
-  <string name="markdown_in_messages">Markdown in Nachrichten</string>
-  <string name="chat_with_the_founder">Verbinden Sie sich mit den Entwicklern</string>
-  <string name="send_us_an_email">Senden Sie uns eine E-Mail</string>
-  <string name="chat_lock">SimpleX Sperre</string>
-  <string name="chat_console">Chat Konsole</string>
-  <string name="smp_servers">SMP-Server</string>
-  <string name="install_simplex_chat_for_terminal">Installieren Sie <xliff:g id="appNameFull">SimpleX Chat</xliff:g> als Terminalanwendung</string>
-  <string name="use_simplex_chat_servers__question">Verwenden Sie <xliff:g id="appNameFull">SimpleX Chat</xliff:g> Server?</string>
-  <string name="saved_SMP_servers_will_be_removed">Gespeicherte SMP-Server werden entfernt.</string>
-  <string name="your_SMP_servers">Ihre SMP-Server</string>
-  <string name="configure_SMP_servers">SMP-Server konfigurieren</string>
-  <string name="using_simplex_chat_servers">Verwendung von <xliff:g id="appNameFull">SimpleX Chat</xliff:g> Servern.</string>
-  <string name="enter_one_SMP_server_per_line">SMP-Server (einer pro Zeile)</string>
-  <string name="how_to">Anleitung</string>
-  <string name="saved_ICE_servers_will_be_removed">Gespeicherte WebRTC ICE-Server werden entfernt.</string>
-  <string name="your_ICE_servers">Ihre ICE-Server</string>
-  <string name="configure_ICE_servers">Konfigurieren Sie ICE-Server</string>
-  <string name="enter_one_ICE_server_per_line">ICE-Server (einer pro Zeile)</string>
-  <string name="error_saving_ICE_servers">Fehler beim Speichern der ICE-Server</string>
-  <string name="ensure_ICE_server_address_are_correct_format_and_unique">Stellen Sie sicher, dass die WebRTC ICE-Server Adressen das richtige Format haben, zeilenweise angeordnet und nicht kopiert sind.</string>
-  <string name="save_servers_button">Speichern</string>
-  <string name="network_and_servers">Netzwerk &amp; Server</string>
-  <string name="network_settings">Erweiterte Netzwerkeinstellungen</string>
-  <string name="network_settings_title">Netzwerkeinstellungen</string>
-  <string name="network_socks_toggle">SOCKS-Proxy verwenden (Port 9050)</string>
-  <string name="network_enable_socks">SOCKS-Proxy verwenden?</string>
-  <string name="network_enable_socks_info">Zugriff auf die Server über SOCKS-Proxy auf Port 9050? Der Proxy muss gestartet werden, bevor diese Option aktiviert wird.</string>
-  <string name="network_disable_socks">Direkte Internetverbindung verwenden?</string>
-  <string name="network_disable_socks_info">Wenn Sie dies bestätigen, können die Messaging-Server Ihre IP-Adresse und Ihren Provider sehen und mit welchen Servern Sie sich verbinden.</string>
-  <string name="update_onion_hosts_settings_question">Einstellung für .onion-Hosts aktualisieren?</string>
-  <string name="network_use_onion_hosts">Verwende .onion-Hosts</string>
-  <string name="network_use_onion_hosts_prefer">Wenn verfügbar</string>
-  <string name="network_use_onion_hosts_no">Nein</string>
-  <string name="network_use_onion_hosts_required">Erforderlich</string>
-  <string name="network_use_onion_hosts_prefer_desc">Onion-Hosts werden verwendet, wenn sie verfügbar sind.</string>
-  <string name="network_use_onion_hosts_no_desc">Onion-Hosts werden nicht verwendet.</string>
-  <string name="network_use_onion_hosts_required_desc">Für die Verbindung werden Onion-Hosts benötigt.</string>
-  <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion-Hosts werden verwendet, wenn sie verfügbar sind.</string>
-  <string name="network_use_onion_hosts_no_desc_in_alert">Onion-Hosts werden nicht verwendet.</string>
-  <string name="network_use_onion_hosts_required_desc_in_alert">Für die Verbindung werden Onion-Hosts benötigt.</string>
-  <string name="appearance_settings">Design</string>
-
-  <!-- Address Items - UserAddressView.kt -->
-  <string name="create_address">Adresse erstellen</string>
-  <string name="delete_address__question">Adresse löschen?</string>
-  <string name="all_your_contacts_will_remain_connected">Alle Ihre Kontakte bleiben verbunden.</string>
-  <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Sie können Ihre Adresse als Link oder als QR-Code teilen – Jeder kann sich mit Ihnen verbinden.</string>
-  <string name="if_you_delete_address_you_wont_lose_contacts">Wenn Sie diese Adresse löschen, werden Sie Ihre Kontakte nicht verlieren.</string>
-  <string name="if_you_later_delete_address_you_wont_lose_contacts">Wenn Sie diese Adresse später löschen, werden Sie Ihre mit dieser Adresse verbundenen Kontakte nicht verlieren.</string>
-  <string name="share_link">Link teilen</string>
-  <string name="delete_address">Adresse löschen</string>
-
-  <!-- User profile details - UserProfileView.kt -->
-  <string name="display_name__field">Angezeigter Name:</string>
-  <string name="full_name__field">"Vollständiger Name:</string>
-  <string name="your_chat_profile">Mein Chat-Profil</string>
-  <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.\n\n<xliff:g id="appName">SimpleX</xliff:g>-Server können Ihr Profil nicht sehen.</string>
-  <string name="edit_image">Bild bearbeiten</string>
-  <string name="delete_image">Bild löschen</string>
-  <string name="save_and_notify_contacts">Speichern (und Kontakte benachrichtigen)</string>
-
-  <!-- Welcome Prompts - WelcomeView.kt -->
-  <string name="you_control_your_chat">Sie haben volle Kontrolle über Ihren Chat!</string>
-  <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Die Messaging- und Anwendungsplattform zum Schutz Ihrer Privatsphäre und Sicherheit.</string>
-  <string name="we_do_not_store_contacts_or_messages_on_servers">Wir speichern auf den Servern keinen Ihrer Kontakte oder keine Ihrer Nachrichten (sofern einmal zugestellt).</string>
-  <string name="create_profile">Profil erstellen</string>
-  <string name="your_profile_is_stored_on_your_device">Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.</string>
-  <string name="profile_is_only_shared_with_your_contacts">Das Profil wird nur mit Ihren Kontakten geteilt.</string>
-  <string name="display_name_cannot_contain_whitespace">Der angezeigte Name darf keine Leerzeichen enthalten.</string>
-  <string name="display_name">Angezeigter Name</string>
-  <string name="full_name_optional__prompt">Vollständiger Name (optional)</string>
-  <string name="create_profile_button">Erstellen</string>
-  <string name="about_simplex">Über SimpleX</string>
-
-  <!-- markdown demo - MarkdownHelpView.kt -->
-  <string name="how_to_use_markdown">Wie Sie Markdowns anwenden</string>
-  <string name="you_can_use_markdown_to_format_messages__prompt">Sie können Markdowns verwenden, um Nachrichten zu formatieren:</string>
-  <string name="bold">fett</string>
-  <string name="italic">kursiv</string>
-  <string name="strikethrough">durchstreichen</string>
-  <string name="a_plus_b">a + b</string>
-  <string name="colored">farbig</string>
-  <string name="secret">geheim</string>
-
-  <!-- CICallStatus - in chat items -->
-  <string name="callstatus_calling">Anruf…</string>
-  <string name="callstatus_missed">Anruf verpasst</string>
-  <string name="callstatus_rejected">Anruf abgelehnt</string>
-  <string name="callstatus_accepted">Anruf angenommen</string>
-  <string name="callstatus_connecting">Anruf wird verbunden…</string>
-  <string name="callstatus_in_progress">Anruf läuft</string>
-  <string name="callstatus_ended">Anruf beendet <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-  <string name="callstatus_error">Fehler bei Anruf</string>
-
-  <!-- CallState -->
-  <string name="callstate_starting">Verbindung wird gestartet…</string>
-  <string name="callstate_waiting_for_answer">Warten auf Antwort…</string>
-  <string name="callstate_waiting_for_confirmation">Warten auf Bestätigung…</string>
-  <string name="callstate_received_answer">Antwort erhalten…</string>
-  <string name="callstate_received_confirmation">Bestätigung erhalten…</string>
-  <string name="callstate_connecting">Verbindung wird hergestellt…</string>
-  <string name="callstate_connected">verbunden</string>
-  <string name="callstate_ended">beendet</string>
-
-  <!-- SimpleXInfo -->
-  <string name="next_generation_of_private_messaging">Die nächste Generation von privatem Messaging</string>
-  <string name="privacy_redefined">Datenschutz neu definiert</string>
-  <string name="first_platform_without_user_ids">Die erste Plattform ohne Benutzerkennungen – Privat per Design</string>
-  <string name="immune_to_spam_and_abuse">Immun gegen Spam und Missbrauch</string>
-  <string name="people_can_connect_only_via_links_you_share">Verbindungen mit Kontakten sind nur über Links möglich, die Sie oder Ihre Kontakte untereinander teilen.</string>
-  <string name="decentralized">Dezentral</string>
-  <string name="opensource_protocol_and_code_anybody_can_run_servers">Open-Source-Protokoll und -Code – Jeder kann seine eigenen Server nutzen.</string>
-  <string name="create_your_profile">Erstellen Sie Ihr Profil</string>
-  <string name="make_private_connection">Stellen Sie eine private Verbindung her</string>
-  <string name="how_it_works">Wie es funktioniert</string>
-
-  <!-- How SimpleX Works -->
-  <string name="how_simplex_works">Wie <xliff:g id="appName">SimpleX</xliff:g> funktioniert</string>
-  <string name="many_people_asked_how_can_it_deliver">Viele Menschen haben gefragt: <i>Wenn <xliff:g id="appName">SimpleX</xliff:g> keine Benutzerkennungen hat, wie kann es dann Nachrichten zustellen?</i></string>
-  <string name="to_protect_privacy_simplex_has_ids_for_queues">Zum Schutz Ihrer Privatsphäre verwendet <xliff:g id="appName">SimpleX</xliff:g> an Stelle von Benutzer-IDs, die von allen anderen Plattformen verwendet werden, Kennungen für Nachrichtenwarteschlangen, die für jeden Ihrer Kontakte individuell sind.</string>
-  <string name="you_control_servers_to_receive_your_contacts_to_send">Sie legen fest, über welche Server Sie Ihre Nachrichten <b>empfangen</b> und an Ihre Kontakte <b>senden</b>.</string>
-  <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Nur die Endgeräte speichern Benutzerprofile, Kontakte, Gruppen und Nachrichten, die über eine <b>2-Schichten Ende-zu-Ende-Verschlüsselung</b> gesendet werden.</string>
-  <string name="read_more_in_github">Erfahren Sie mehr dazu in unserem GitHub-Repository.</string>
-  <string name="read_more_in_github_with_link">Erfahren Sie mehr dazu in unserem <font color="#0088ff">GitHub-Repository</font>.</string>
-
-  <!-- MakeConnection -->
-  <string name="paste_the_link_you_received">Fügen Sie den erhaltenen Link ein</string>
-
-  <!-- Call -->
-  <string name="incoming_video_call">Eingehender Videoanruf</string>
-  <string name="incoming_audio_call">Eingehender Audioanruf</string>
-  <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> möchte sich mit Ihnen verbinden per</string>
-  <string name="video_call_no_encryption">Videoanruf (nicht E2E verschlüsselt)</string>
-  <string name="encrypted_video_call">E2E-verschlüsseltem Videoanruf</string>
-  <string name="audio_call_no_encryption">Audioanruf (nicht E2E verschlüsselt)</string>
-  <string name="encrypted_audio_call">E2E-verschlüsseltem Audioanruf</string>
-  <string name="accept">Akzeptieren</string>
-  <string name="reject">Ablehnen</string>
-  <string name="ignore">Ignorieren</string>
-  <string name="call_already_ended">Anruf ist bereits beendet!</string>
-  <string name="icon_descr_video_call">Videoanruf</string>
-  <string name="icon_descr_audio_call">Audioanruf</string>
-
-  <!-- Call settings -->
-  <string name="settings_audio_video_calls">Audio- &amp; Videoanrufe</string>
-  <string name="your_calls">Ihre Anrufe</string>
-  <string name="connect_calls_via_relay">Über ein Relais verbinden</string>
-  <string name="call_on_lock_screen">Anrufe auf Sperrbildschirm:</string>
-  <string name="accept_call_on_lock_screen">Akzeptieren</string>
-  <string name="show_call_on_lock_screen">Anzeigen</string>
-  <string name="no_call_on_lock_screen">Deaktivieren</string>
-  <string name="your_ice_servers">Ihre ICE-Server</string>
-  <string name="webrtc_ice_servers">WebRTC ICE-Server</string>
-
-  <!-- Call Lock Screen -->
-  <string name="open_simplex_chat_to_accept_call">Öffnen Sie <xliff:g id="appNameFull">SimpleX Chat</xliff:g>, um den Anruf anzunehmen.</string>
-  <string name="allow_accepting_calls_from_lock_screen">Aktivieren Sie Anrufe vom Sperrbildschirm über die Einstellungen.</string>
-  <string name="open_verb">Öffnen</string>
-
-  <!-- Call overlay -->
-  <string name="status_e2e_encrypted">E2E-verschlüsselt</string>
-  <string name="status_no_e2e_encryption">Keine E2E-Verschlüsselung</string>
-  <string name="status_contact_has_e2e_encryption">Kontakt hat E2E-Verschlüsselung</string>
-  <string name="status_contact_has_no_e2e_encryption">Kontakt hat keine E2E-Verschlüsselung</string>
-  <string name="call_connection_peer_to_peer">Peer-to-Peer</string>
-  <string name="call_connection_via_relay">über Relais</string>
-  <string name="icon_descr_hang_up">Auflegen</string>
-  <string name="icon_descr_video_off">Video aus</string>
-  <string name="icon_descr_video_on">Video an</string>
-  <string name="icon_descr_audio_off">Audio aus</string>
-  <string name="icon_descr_audio_on">Audio an</string>
-  <string name="icon_descr_speaker_off">Lautsprecher aus</string>
-  <string name="icon_descr_speaker_on">Lautsprecher an</string>
-  <string name="icon_descr_flip_camera">Kamera umdrehen</string>
-
-  <!-- Call items -->
-  <string name="icon_descr_call_pending_sent">Anstehender Anruf</string>
-  <string name="icon_descr_call_missed">Verpasster Anruf</string>
-  <string name="icon_descr_call_rejected">Abgelehnter Anruf</string>
-  <string name="icon_descr_call_connecting">Anruf wird verbunden</string>
-  <string name="icon_descr_call_progress">Laufendes Gespräch</string>
-  <string name="icon_descr_call_ended">Anruf beendet</string>
-  <string name="answer_call">Anruf annehmen</string>
-
-  <!-- Message integrity -->
-  <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> übersprungene Nachricht(en)</string>
-  <string name="integrity_msg_bad_hash">Ungültiger Nachrichten-Hash</string>
-  <string name="integrity_msg_bad_id">Falsche Nachrichten-ID</string>
-  <string name="integrity_msg_duplicate">Doppelte Nachricht</string>
-  <string name="alert_title_skipped_messages">Übersprungene Nachrichten</string>
-  <string name="alert_text_skipped_messages_it_can_happen_when">Dies kann unter folgenden Umständen passieren:\n1. Die Nachrichten verfallen auf dem Server, wenn sie 30 Tage lang nicht empfangen wurden.\n2. Der Server, den Sie zum Empfangen der Nachrichten von diesem Kontakt verwenden, wurde aktualisiert und neu gestartet.\n3. Die Verbindung ist kompromittiert.\nBitte nehmen Sie über die Einstellungen Verbindung mit den Entwicklern auf, um Updates zu den Servern zu erhalten.\nWir werden Serverredundanzen hinzufügen, um verloren gegangene Nachrichten zu verhindern.</string>
-
-  <!-- Privacy settings -->
-  <string name="privacy_and_security">Datenschutz &amp; Sicherheit</string>
-  <string name="your_privacy">Meine Privatsphäre</string>
-  <string name="auto_accept_images">Bilder automatisch akzeptieren</string>
-  <string name="send_link_previews">Link-Vorschau senden</string>
-
-  <!-- Settings sections -->
-  <string name="settings_section_title_you">DU</string>
-  <string name="settings_section_title_settings">EINSTELLUNGEN</string>
-  <string name="settings_section_title_help">HILFE</string>
-  <string name="settings_section_title_develop">ENTWICKLUNG</string>
-  <string name="settings_section_title_device">GERÄT</string>
-  <string name="settings_section_title_chats">CHATS</string>
-  <string name="settings_developer_tools">Entwicklertools</string>
-  <string name="settings_experimental_features">Experimentelle Funktionen</string>
-  <string name="settings_section_title_socks">SOCKS-PROXY</string>
-  <string name="settings_section_title_icon">APP ICON</string>
-  <string name="settings_section_title_themes">DESIGN</string>
-  <string name="settings_section_title_messages">MESSAGES</string>
-  <string name="settings_section_title_calls">CALLS</string>
-  <string name="settings_section_title_incognito">Inkognito Modus</string>
-
-  <!-- DatabaseView.kt -->
-  <string name="your_chat_database">Meine Chat-Datenbank</string>
-  <string name="run_chat_section">CHAT STARTEN</string>
-  <string name="chat_is_running">Chat läuft</string>
-  <string name="chat_is_stopped">Chat ist beendet</string>
-  <string name="chat_database_section">CHAT-DATENBANK</string>
-  <string name="database_passphrase">Datenbank-Passwort</string>
-  <string name="export_database">Datenbank exportieren</string>
-  <string name="import_database">Datenbank importieren</string>
-  <string name="new_database_archive">Neues Datenbankarchiv</string>
-  <string name="old_database_archive">Altes Datenbankarchiv</string>
-  <string name="delete_database">Datenbank löschen</string>
-  <string name="error_starting_chat">Fehler beim Starten des Chats</string>
-  <string name="stop_chat_question">Chat beenden?</string>
-  <string name="stop_chat_to_export_import_or_delete_chat_database">Beenden Sie den Chat, um die Chat-Datenbank zu exportieren, zu importieren oder zu löschen. Sie können keine Nachrichten empfangen oder senden, solange der Chat angehalten ist.</string>
-  <string name="stop_chat_confirmation">Beenden</string>
-  <string name="set_password_to_export">Passwort zum Exportieren festlegen</string>
-  <string name="set_password_to_export_desc">Die Datenbank ist mit einem zufälligen Passwort verschlüsselt. Bitte ändern Sie es vor dem Exportieren.</string>
-  <string name="error_stopping_chat">Fehler beim Beenden des Chats</string>
-  <string name="error_exporting_chat_database">Fehler beim Exportieren der Chat-Datenbank</string>
-  <string name="import_database_question">Chat-Datenbank importieren?</string>
-  <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die Importierte ERSETZT.\nDiese Aktion kann nicht rückgängig gemacht werden - Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</string>
-  <string name="import_database_confirmation">Importieren</string>
-  <string name="error_deleting_database">Fehler beim Löschen der Chat-Datenbank</string>
-  <string name="error_importing_database">Fehler beim Importieren der Chat-Datenbank</string>
-  <string name="chat_database_imported">Chat-Datenbank importiert</string>
-  <string name="restart_the_app_to_use_imported_chat_database">Starten Sie die App neu, um die importierte Chat-Datenbank zu verwenden.</string>
-  <string name="delete_chat_profile_question">Chat-Profil löschen?</string>
-  <string name="delete_chat_profile_action_cannot_be_undone_warning">Diese Aktion kann nicht rückgängig gemacht werden - Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</string>
-  <string name="chat_database_deleted">Chat-Datenbank gelöscht</string>
-  <string name="restart_the_app_to_create_a_new_chat_profile">Starten Sie die App neu, um ein neues Chat-Profil zu erstellen.</string>
-  <string name="you_must_use_the_most_recent_version_of_database">Sie dürfen die neueste Version Ihrer Chat-Datenbank NUR auf einem Gerät verwenden, andernfalls erhalten Sie möglicherweise keine Nachrichten mehr von einigen Ihrer Kontakte.</string>
-  <string name="stop_chat_to_enable_database_actions">Chat beenden, um Datenbankaktionen zu erlauben.</string>
-  <string name="data_section">DATEN</string>
-  <string name="delete_files_and_media">Dateien \&amp; Medien löschen</string>
-  <string name="delete_files_and_media_question">Dateien und Medien löschen?</string>
-  <string name="delete_files_and_media_desc">Diese Aktion kann nicht rückgängig gemacht werden - alle empfangenen und gesendeten Dateien und Medien werden gelöscht. Bilder mit niedriger Auflösung bleiben erhalten.</string>
-  <string name="no_received_app_files">Keine empfangenen oder gesendeten Dateien</string>
-  <string name="total_files_count_and_size">%d Datei(en) mit einem Gesamtspeicherverbrauch von %s</string>
-  <string name="chat_item_ttl_none">nie</string>
-  <string name="chat_item_ttl_day">1 Tag</string>
-  <string name="chat_item_ttl_week">1 Woche</string>
-  <string name="chat_item_ttl_month">1 Monat</string>
-  <string name="chat_item_ttl_seconds">%s Sekunde(n)</string>
-  <string name="delete_messages_after">Löschen der Nachrichten nach</string>
-  <string name="enable_automatic_deletion_question">Automatisches Löschen von Nachrichten aktivieren?</string>
-  <string name="enable_automatic_deletion_message">Diese Aktion kann nicht rückgängig gemacht werden - Die gesendeten und empfangenen Nachrichten, welche älter als die Ausgewählten sind, werden gelöscht. Dies kann mehrere Minuten dauern.</string>
-  <string name="delete_messages">Nachrichten löschen</string>
-  <string name="error_changing_message_deletion">Fehler beim Ändern der Einstellung</string>
-
-  <!-- DatabaseEncryptionView.kt -->
-  <string name="save_passphrase_in_keychain">Passwort im Keystore sichern</string>
-  <string name="database_encrypted">Datenbank verschlüsselt!</string>
-  <string name="error_encrypting_database">Fehler beim Verschlüsseln der Datenbank</string>
-  <string name="remove_passphrase_from_keychain">Passwort aus dem Keystore entfernen?</string>
-  <string name="notifications_will_be_hidden">Benachrichtigungen werden nur solange zugestellt, bis die App angehalten wird!</string>
-  <string name="remove_passphrase">Entfernen</string>
-  <string name="encrypt_database">Verschlüsseln</string>
-  <string name="update_database">Aktualisieren</string>
-  <string name="current_passphrase">Aktuelles Passwort…</string>
-  <string name="new_passphrase">Neues Passwort…</string>
-  <string name="confirm_new_passphrase">Neues Passwort bestätigen…</string>
-  <string name="update_database_passphrase">Datenbank-Passwort aktualisieren</string>
-  <string name="enter_correct_current_passphrase">Bitte geben Sie das korrekte, aktuelle Passwort ein.</string>
-  <string name="database_is_not_encrypted">Ihre Chat-Datenbank ist nicht verschlüsselt. Bitte legen Sie ein Passwort fest, um sie zu schützen.</string>
-  <string name="keychain_is_storing_securely">Der Android Keystore wird verwendet, um das Passwort sicher zu speichern. Dies ermöglicht die ordentliche Funktion des Benachrichtigungsdienstes.</string>
-  <string name="encrypted_with_random_passphrase">Die Datenbank wird mit einem zufälligen Passwort verschlüsselt, Sie können es ändern.</string>
-  <string name="impossible_to_recover_passphrase"><b>Bitte beachten Sie</b>: Sie können das Passwort NICHT wiederherstellen oder ändern, wenn Sie es vergessen haben oder verlieren.</string>
-  <string name="keychain_allows_to_receive_ntfs">Der Android Keystore wird verwendet, um das Passwort sicher zu speichern, nachdem Sie die App neu gestartet oder das Passwort geändert haben – dies ermöglicht den Empfang von Benachrichtigungen.</string>
-  <string name="you_have_to_enter_passphrase_every_time">Sie müssen das Passwort jedes Mal eingeben, wenn die App startet. Es wird nicht auf dem Gerät gespeichert.</string>
-  <string name="encrypt_database_question">Datenbank verschlüsseln?</string>
-  <string name="change_database_passphrase_question">Datenbank-Passwort ändern?</string>
-  <string name="database_will_be_encrypted">Datenbank wird verschlüsselt.</string>
-  <string name="database_will_be_encrypted_and_passphrase_stored">Die Datenbank wird verschlüsselt, und das Passwort im Keystore gespeichert.</string>
-  <string name="database_encryption_will_be_updated">Das Passwort für die Datenbankverschlüsselung wird aktualisiert und im Keystore gespeichert.</string>
-  <string name="database_passphrase_will_be_updated">Das Passwort für die Datenbankverschlüsselung wird aktualisiert.</string>
-  <string name="store_passphrase_securely">Bitte bewahren Sie das Passwort sicher auf, Sie können es NICHT mehr ändern, wenn Sie es vergessen haben oder verlieren.</string>
-  <string name="store_passphrase_securely_without_recover">Bitte bewahren Sie das Passwort sicher auf, Sie können NICHT mehr auf den Chat zugreifen, wenn Sie es vergessen haben oder verlieren.</string>
-
-  <!-- DatabaseErrorView.kt -->
-  <string name="wrong_passphrase">Falsches Datenbank-Passwort</string>
-  <string name="encrypted_database">Verschlüsselte Datenbank</string>
-  <string name="database_error">Datenbankfehler</string>
-  <string name="keychain_error">Keystore Fehler</string>
-  <string name="passphrase_is_different">Das Datenbank-Passwort unterscheidet sich von dem im Keystore gespeicherten.</string>
-  <string name="file_with_path">Datei: %s</string>
-  <string name="database_passphrase_is_required">Das Datenbank-Passwort ist erforderlich, um den Chat zu öffnen.</string>
-  <string name="error_with_info">Fehler: %s</string>
-  <string name="cannot_access_keychain">Die App kann nicht auf den Keystore zugreifen, um das Datenbank-Passwort zu speichern.</string>
-  <string name="unknown_database_error_with_info">Unbekannter Datenbankfehler: %s</string>
-  <string name="wrong_passphrase_title">Falsches Passwort!</string>
-  <string name="enter_correct_passphrase">Geben Sie das korrekte Passwort ein.</string>
-  <string name="unknown_error">Unbekannter Fehler</string>
-  <string name="enter_passphrase">Passwort eingeben…</string>
-  <string name="save_passphrase_and_open_chat">Passwort speichern und Chat öffnen</string>
-  <string name="open_chat">Chat öffnen</string>
-  <string name="database_backup_can_be_restored">Der Versuch, das Passwort der Datenbank zu ändern, konnte nicht abgeschlossen werden.</string>
-  <string name="restore_database">Datenbanksicherung wiederherstellen</string>
-  <string name="restore_database_alert_title">Datenbanksicherung wiederherstellen?</string>
-  <string name="restore_database_alert_desc">Bitte geben Sie das vorherige Passwort ein, nachdem Sie die Datenbanksicherung wiederhergestellt haben. Diese Aktion kann nicht rückgängig gemacht werden.</string>
-  <string name="restore_database_alert_confirm">Wiederherstellen</string>
-  <string name="database_restore_error">Fehler bei der Wiederherstellung der Datenbank</string>
-
-  <!-- ChatModel.chatRunning interactions -->
-  <string name="chat_is_stopped_indication">Chat wurde beendet</string>
-  <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Sie können den Chat über die App-Einstellungen / Datenbank oder durch Neustart der App starten.</string>
-
-  <!-- ChatArchiveView.kt -->
-  <string name="chat_archive_header">Datenbank Archiv</string>
-  <string name="chat_archive_section">CHAT ARCHIV</string>
-  <string name="save_archive">Archiv speichern</string>
-  <string name="delete_archive">Archiv löschen</string>
-  <string name="archive_created_on_ts">Erstellt am <xliff:g id="archive_ts">%1$s</xliff:g></string>
-  <string name="delete_chat_archive_question">Chat Archiv löschen?</string>
-
-  <!-- Groups -->
-  <string name="group_invitation_item_description">Einladung zur Gruppe <xliff:g id="group_name">%1$s</xliff:g></string>
-  <string name="join_group_question">Der Gruppe beitreten?</string>
-  <string name="you_are_invited_to_group_join_to_connect_with_group_members">Sie sind zu einer Gruppe eingeladen worden. Treten Sie bei, um sich mit Gruppenmitgliedern zu verbinden.</string>
-  <string name="join_group_button">Beitreten</string>
-  <string name="join_group_incognito_button">Inkognito beitreten</string>
-  <string name="joining_group">Gruppe beitreten</string>
-  <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Sie sind dieser Gruppe beigetreten. Sie werden mit dem einladenden Gruppenmitglied verbunden.</string>
-  <string name="leave_group_button">Verlassen</string>
-  <string name="leave_group_question">Gruppe verlassen?</string>
-  <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Sie werden von dieser Gruppe keine Nachrichten mehr erhalten. Der Chatverlauf wird beibehalten.</string>
-  <string name="icon_descr_add_members">Mitglieder einladen</string>
-  <string name="icon_descr_group_inactive">Gruppe inaktiv</string>
-  <string name="alert_title_group_invitation_expired">Einladung abgelaufen!</string>
-  <string name="alert_message_group_invitation_expired">Die Gruppeneinladung ist nicht mehr gültig, sie wurde vom Absender entfernt.</string>
-  <string name="alert_title_no_group">Die Gruppe wurde nicht gefunden!</string>
-  <string name="alert_message_no_group">Diese Gruppe existiert nicht mehr.</string>
-  <string name="alert_title_cant_invite_contacts">Kontakte können nicht eingeladen werden!</string>
-  <string name="alert_title_cant_invite_contacts_descr">Sie verwenden ein Inkognito-Profil für diese Gruppe. Um zu verhindern, dass Sie Ihr Hauptprofil teilen, ist in diesem Fall das Einladen von Kontakten nicht erlaubt.</string>
-
-  <!-- CIGroupInvitationView.kt -->
-  <string name="you_sent_group_invitation">Sie haben eine Gruppeneinladung gesendet</string>
-  <string name="you_are_invited_to_group">Sie sind zur Gruppe eingeladen</string>
-  <string name="group_invitation_tap_to_join">Zum Beitreten tippen</string>
-  <string name="group_invitation_tap_to_join_incognito">Tippen, um Inkognito beizutreten</string>
-  <string name="you_joined_this_group">Sie sind dieser Gruppe beigetreten</string>
-  <string name="you_rejected_group_invitation">Sie haben die Gruppeneinladung abgelehnt</string>
-  <string name="group_invitation_expired">Die Gruppeneinladung ist abgelaufen</string>
-
-  <!-- Group event chat items -->
-  <string name="rcv_group_event_member_added">Sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> eingeladen.</string>
-  <string name="rcv_group_event_member_connected">verbunden</string>
-  <string name="rcv_group_event_member_left">verlassen</string>
-  <string name="rcv_group_event_member_deleted">entfernte <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g>.</string>
-  <string name="rcv_group_event_user_deleted">hat Sie entfernt</string>
-  <string name="rcv_group_event_group_deleted">Gruppe gelöscht</string>
-  <string name="rcv_group_event_updated_group_profile">aktualisiertes Gruppenprofil</string>
-  <string name="snd_group_event_member_deleted">Sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> entfernt.</string>
-  <string name="snd_group_event_user_left">Sie haben verlassen</string>
-  <string name="snd_group_event_group_profile_updated">Gruppenprofil aktualisiert</string>
-
-  <!-- GroupMemberRole -->
-  <string name="group_member_role_member">Mitglied</string>
-  <string name="group_member_role_admin">Admin</string>
-  <string name="group_member_role_owner">Eigentümer</string>
-
-  <!-- GroupMemberStatus -->
-  <string name="group_member_status_removed">entfernt</string>
-  <string name="group_member_status_left">verlassen</string>
-  <string name="group_member_status_group_deleted">Gruppe gelöscht</string>
-  <string name="group_member_status_invited">eingeladen</string>
-  <string name="group_member_status_introduced">Verbindung (erstellt)</string>
-  <string name="group_member_status_intro_invitation">Verbindung (eingeladen)</string>
-  <string name="group_member_status_accepted">Verbindung (akzeptiert)</string>
-  <string name="group_member_status_announced">Verbindung (angekündigt)</string>
-  <string name="group_member_status_connected">verbunden</string>
-  <string name="group_member_status_complete">vollständig</string>
-  <string name="group_member_status_creator">Ersteller</string>
-
-  <string name="group_member_status_connecting">verbinden</string>
-
-  <!-- AddGroupMembersView.kt -->
-  <string name="no_contacts_to_add">Keine Kontakte zum Hinzufügen</string>
-  <string name="new_member_role">Neue Mitgliedsrolle</string>
-  <string name="icon_descr_expand_role">Rollenauswahl erweitern</string>
-  <string name="invite_to_group_button">In Gruppe einladen</string>
-  <string name="icon_descr_contact_checked">Kontakt geprüft</string>
-  <string name="clear_contacts_selection_button">Löschen</string>
-  <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> Kontakt(e) ausgewählt</string>
-  <string name="no_contacts_selected">Keine Kontakte ausgewählt</string>
-  <string name="invite_prohibited">Kontakt kann nicht eingeladen werden!</string>
-  <string name="invite_prohibited_description">Sie versuchen, einen Kontakt, mit dem Sie ein Inkognito-Profil geteilt haben, in die Gruppe einzuladen, in der Sie Ihr Hauptprofil verwenden.</string>
-
-  <!-- GroupChatInfoView.kt -->
-  <string name="button_add_members">Mitglieder einladen</string>
-  <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> MITGLIEDER</string>
-  <string name="group_info_member_you">Sie: <xliff:g id="group_info_you">%1$s</xliff:g></string>
-  <string name="button_delete_group">Gruppe löschen</string>
-  <string name="delete_group_question">Gruppe löschen?</string>
-  <string name="delete_group_for_all_members_cannot_undo_warning">Die Gruppe wird für alle Mitglieder gelöscht - dies kann nicht rückgängig gemacht werden!</string>
-  <string name="delete_group_for_self_cannot_undo_warning">Die Gruppe wird für Sie gelöscht - dies kann nicht rückgängig gemacht werden!</string>
-  <string name="button_leave_group">Gruppe verlassen</string>
-  <string name="button_edit_group_profile">Gruppenprofil bearbeiten</string>
-
-  <!-- For Console chat info section -->
-  <string name="section_title_for_console">FÜR KONSOLE</string>
-  <string name="info_row_local_name">Lokaler Name</string>
-  <string name="info_row_database_id">Datenbank-ID</string>
-
-  <!-- GroupMemberInfoView.kt -->
-  <string name="button_remove_member">Mitglied entfernen</string>
-  <string name="button_send_direct_message">Direktnachricht senden</string>
-  <string name="member_will_be_removed_from_group_cannot_be_undone">Das Mitglied wird aus der Gruppe entfernt - dies kann nicht rückgängig gemacht werden!</string>
-  <string name="remove_member_confirmation">Entfernen</string>
-  <string name="member_info_section_title_member">MITGLIED</string>
-  <string name="role_in_group">Rolle</string>
-  <string name="change_role">Rolle ändern</string>
-  <string name="change_verb">Ändern</string>
-  <string name="change_member_role_question">Die Mitgliederrolle ändern?</string>
-  <string name="member_role_will_be_changed_with_notification">Die Mitgliederrolle wird auf \"%s\" geändert. Alle Mitglieder der Gruppe werden benachrichtigt.</string>
-  <string name="member_role_will_be_changed_with_invitation">Die Mitgliederrolle wird auf \"%s\" geändert. Das Mitglied wird eine neue Einladung erhalten.</string>
-  <string name="error_removing_member">Fehler beim Entfernen des Mitglieds</string>
-  <string name="error_changing_role">Fehler beim Ändern der Rolle</string>
-  <string name="member_role">Mitglieder %s Rolle: %s</string>
-  <string name="your_member_role">Meine Rolle: %s</string>
-  <string name="info_row_group">Gruppe</string>
-  <string name="info_row_connection">Verbindung</string>
-  <string name="conn_level_desc_direct">direkt</string>
-  <string name="conn_level_desc_indirect">indirekt (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
-
-  <!-- ConnectionStats -->
-  <string name="conn_stats_section_title_servers">SERVER</string>
-  <string name="receiving_via">Empfangen über</string>
-  <string name="sending_via">Senden über</string>
-  <string name="network_status">Netzwerkstatus</string>
-
-  <!-- AddGroupView.kt -->
-  <string name="create_secret_group_title">Geheime Gruppe erstellen</string>
-  <string name="group_is_decentralized">Die Gruppe ist vollständig dezentralisiert – sie ist nur für Mitglieder sichtbar.</string>
-  <string name="group_display_name_field">Anzeigename der Gruppe:</string>
-  <string name="group_full_name_field">Vollständiger Gruppenname:</string>
-  <string name="group_unsupported_incognito_main_profile_sent">Der Inkognito-Modus wird hier nicht unterstützt - Ihr Hauptprofil wird an die Gruppenmitglieder gesendet</string>
-  <string name="group_main_profile_sent">Ihr Chat-Profil wird an Gruppenmitglieder gesendet</string>
-
-
-  <!-- GroupProfileView.kt -->
-  <string name="group_profile_is_stored_on_members_devices">Das Gruppenprofil wird auf den Geräten der Mitglieder gespeichert, nicht auf den Servern.</string>
-  <string name="save_group_profile">Gruppenprofil speichern</string>
-  <string name="error_saving_group_profile">Fehler beim Speichern des Gruppenprofils</string>
-
-  <!-- AdvancedNetworkSettings.kt -->
-  <string name="network_options_reset_to_defaults">Auf Standardwerte zurücksetzen</string>
-  <string name="network_option_seconds_label">sek</string>
-  <string name="network_option_tcp_connection_timeout">Timeout der TCP-Verbindung</string>
-  <string name="network_option_protocol_timeout">Protokollzeitüberschreitung</string>
-  <string name="network_option_ping_interval">PING-Intervall</string>
-  <string name="network_option_enable_tcp_keep_alive">TCP-Keep-alive aktivieren</string>
-  <string name="network_options_revert">Zurückkehren</string>
-  <string name="network_options_save">Speichern</string>
-  <string name="update_network_settings_question">Netzwerkeinstellungen aktualisieren?</string>
-  <string name="updating_settings_will_reconnect_client_to_all_servers">Die Aktualisierung der Einstellungen wird den Client wieder mit allen Servern verbinden.</string>
-  <string name="update_network_settings_confirmation">Aktualisieren</string>
-
-  <!-- Incognito mode -->
-  <string name="incognito">Inkognito</string>
-  <string name="incognito_random_profile">Ihr Zufallsprofil</string>
-  <string name="incognito_random_profile_description">Ein zufälliges Profil wird an Ihren Kontakt gesendet.</string>
-  <string name="incognito_random_profile_from_contact_description">Ein zufälliges Profil wird an den Kontakt gesendet, von dem Sie diesen Link erhalten haben.</string>
-
-  <string name="incognito_info_protects">Der Inkognito-Modus schützt die Privatsphäre Ihres Hauptprofilnamens und -bildes – für jeden neuen Kontakt wird ein neues Zufallsprofil erstellt.</string>
-  <string name="incognito_info_allows">Es ermöglicht viele anonyme Verbindungen ohne gemeinsame Daten zwischen diesen in einem einzigen Chat-Profil zu haben.</string>
-  <string name="incognito_info_share">Wenn Sie ein Inkognito-Profil mit Jemandem teilen, wird dieses Profil für die Gruppen verwendet, zu denen sie Sie eingeladen haben.</string>
-  <string name="incognito_info_find">Um das für eine Inkognito-Verbindung verwendete Profil zu finden, tippen Sie oben im Chat auf den Kontakt- oder Gruppennamen.</string>
-
-  <!-- Default themes -->
-  <string name="theme_system">System</string>
-  <string name="theme_light">Hell</string>
-  <string name="theme_dark">Dunkel</string>
-
-  <!-- Appearance.kt -->
-  <string name="theme">Design</string>
-  <string name="save_color">Farbe speichern</string>
-  <string name="reset_color">Farben zurücksetzen</string>
-  <string name="color_primary">Akzent</string>
-</resources>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -1,843 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-
-    <string name="thousand_abbreviation">т</string>
-
-    <!-- Connect via Link - MainActivity.kt -->
-    <string name="connect_via_contact_link">Соединиться через ссылку-контакт?</string>
-    <string name="connect_via_invitation_link">Соединиться через ссылку-приглашение?</string>
-    <string name="profile_will_be_sent_to_contact_sending_link">Ваш профиль будет отправлен контакту, от которого вы получили эту ссылку.</string>
-    <string name="connect_via_link_verb">Соединиться</string>
-
-    <!-- Server info - ChatModel.kt -->
-    <string name="server_connected">соединено</string>
-    <string name="server_error">ошибка</string>
-    <string name="server_connecting">соединяется</string>
-    <string name="connected_to_server_to_receive_messages_from_contact">Установлено соединение с сервером, через который вы получаете сообщения от этого контакта.</string>
-    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта (ошибка: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
-    <string name="trying_to_connect_to_server_to_receive_messages">Устанавливается соединение с сервером, через который вы получаете сообщения от этого контакта.</string>
-
-    <!-- Item Content - ChatModel.kt -->
-    <string name="deleted_description">удалено</string>
-    <string name="sending_files_not_yet_supported">отправка файлов не поддерживается</string>
-    <string name="receiving_files_not_yet_supported">получение файлов не поддерживается</string>
-    <string name="sender_you_pronoun">вы</string>
-    <string name="unknown_message_format">неизвестный формат сообщения</string>
-    <string name="invalid_message_format">неверный формат сообщения</string>
-
-    <!-- PendingContactConnection - ChatModel.kt -->
-    <string name="connection_local_display_name">connection <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
-    <string name="display_name_connection_established">соединение установлено</string>
-    <string name="display_name_invited_to_connect">приглашение соединиться</string>
-    <string name="display_name_connecting">соединяется…</string>
-    <string name="description_you_shared_one_time_link">вы создали одноразовую ссылку</string>
-    <string name="description_you_shared_one_time_link_incognito">вы создали одноразовую ссылку инкогнито</string>
-    <string name="description_via_contact_address_link">через ссылку-контакт</string>
-    <string name="description_via_contact_address_link_incognito">инкогнито через ссылку-контакт</string>
-    <string name="description_via_one_time_link">через одноразовую ссылку</string>
-    <string name="description_via_one_time_link_incognito">инкогнито через одноразовую ссылку</string>
-
-    <!-- SimpleXAPI.kt -->
-    <string name="error_saving_smp_servers">Ошибка при сохранении SMP серверов</string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">Пожалуйста, проверьте, что адреса SMP серверов имеют правильный формат, каждый адрес на отдельной строке и не повторяется.</string>
-    <string name="error_setting_network_config">Ошибка при сохранении настроек сети</string>
-
-    <!-- API Error Responses - SimpleXAPI.kt -->
-    <string name="connection_timeout">Превышено время соединения</string>
-    <string name="connection_error">Ошибка соединения</string>
-    <string name="network_error_desc">Пожалуйста, проверьте ваше соединение с сетью и попробуйте еще раз.</string>
-    <string name="error_sending_message">Ошибка при отправке сообщения</string>
-    <string name="error_adding_members">Ошибка при добавлении членов группы</string>
-    <string name="error_joining_group">Ошибка при вступлении в группу</string>
-    <string name="cannot_receive_file">Невозможно получить файл</string>
-    <string name="sender_cancelled_file_transfer">Отправитель отменил передачу файла.</string>
-    <string name="error_receiving_file">Ошибка при получении файла</string>
-    <string name="error_creating_address">Ошибка при создании адреса</string>
-    <string name="contact_already_exists">Существующий контакт</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Вы уже соединены с <xliff:g id="contactName" example="Alice">%1$s!</xliff:g> через эту ссылку.</string>
-    <string name="invalid_connection_link">Ошибка в ссылке контакта</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Пожалуйста, проверьте, что вы использовали правильную ссылку, или попросите ваш контакт отправить вам новую.</string>
-    <string name="connection_error_auth">Ошибка соединения (AUTH)</string>
-    <string name="connection_error_auth_desc">Возможно, ваш контакт удалил ссылку, или она уже была использована. Если это не так, то это может быть ошибкой - пожалуйста, сообщите нам об этом.\nЧтобы установить соединение, попросите ваш контакт создать еще одну ссылку и проверьте ваше соединение с сетью.</string>
-    <string name="error_accepting_contact_request">Ошибка при принятии запроса на соединение</string>
-    <string name="sender_may_have_deleted_the_connection_request">Отправитель мог удалить запрос на соединение.</string>
-    <string name="cannot_delete_contact">Невозможно удалить контакт!</string>
-    <string name="contact_cannot_be_deleted_as_they_are_in_groups">Контакт <xliff:g id="contactName" example="Jane Doe">%1$s!</xliff:g> не может быть удален, так как является членом групп(ы) <xliff:g id="groups" example="[team, chess club]">%2$s</xliff:g>.</string>
-    <string name="error_deleting_contact">Ошибка удаления контакта</string>
-    <string name="error_deleting_group">Ошибка удаления группы</string>
-    <string name="error_deleting_contact_request">Ошибка удаления запроса</string>
-    <string name="error_deleting_pending_contact_connection">Ошибка удаления ожидаемого соединения</string>
-
-    <!-- background service notice - SimpleXAPI.kt -->
-    <string name="icon_descr_instant_notifications">Мгновенные уведомления</string>
-    <string name="service_notifications">Мгновенные уведомления!</string>
-    <string name="service_notifications_disabled">Мгновенные уведомления выключены!</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Чтобы защитить ваши личные данные, вместо уведомлений от сервера приложение запускает <b>фоновый сервис <xliff:g id="appName">SimpleX</xliff:g></b>, который потребляет несколько процентов батареи в день.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Он может быть выключен через Настройки</b> – вы продолжите получать уведомления о сообщениях пока приложение запущено.</string>
-    <string name="turn_off_battery_optimization">Для использования этой функции, пожалуйста, отключите оптимизацию батареи для <xliff:g id="appName">SimpleX</xliff:g> в следующем диалоге. Иначе уведомления будут выключены.</string>
-    <string name="turning_off_service_and_periodic">Оптимизация батареи включена, поэтому сервис уведомлений выключен. Вы можете снова включить его через Настройки.</string>
-    <string name="periodic_notifications">Периодические уведомления</string>
-    <string name="periodic_notifications_disabled">Периодические уведомления выключены!</string>
-    <string name="periodic_notifications_desc">Приложение периодически получает новые сообщения — это потребляет несколько процентов батареи в день. Приложение не использует push уведомления — данные не отправляются с вашего устройства на сервер.</string>
-    <string name="enter_passphrase_notification_title">Введите пароль</string>
-    <string name="enter_passphrase_notification_desc">Для получения уведомлений, пожалуйста, введите пароль от базы данных</string>
-    <string name="database_initialization_error_title">Ошибка базы данных</string>
-    <string name="database_initialization_error_desc">Ошибка при инициализации базы данных. Нажмите чтобы узнать больше</string>
-
-    <!-- SimpleX Chat foreground Service -->
-    <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> сервис</string>
-    <string name="simplex_service_notification_text">Приём сообщений…</string>
-    <string name="hide_notification">Скрыть</string>
-
-    <!-- Notification channels -->
-    <string name="ntf_channel_messages">SimpleX Chat сообщения</string>
-    <string name="ntf_channel_calls">SimpleX Chat звонки</string>
-    <string name="ntf_channel_calls_lockscreen">SimpleX Chat звонки (экран блокировки)</string>
-
-    <!-- Notifications -->
-    <string name="settings_notifications_mode_title">Сервис уведомлений</string>
-    <string name="settings_notification_preview_mode_title">Показывать уведомления</string>
-    <string name="settings_notification_preview_title">Показывать уведомления</string>
-    <string name="notifications_mode_off">Включен, когда приложение открыто</string>
-    <string name="notifications_mode_periodic">Запускается периодически</string>
-    <string name="notifications_mode_service">Всегда включен</string>
-    <string name="notifications_mode_off_desc">Приложение может получить сообщение только тогда, когда запущено, в фоне сервис запускаться не будет</string>
-    <string name="notifications_mode_periodic_desc">Проверять новые сообщения раз в 10 минут на протяжении до 1 минуты</string>
-    <string name="notifications_mode_service_desc">Фоновый сервис всегда включен. Уведомления будут показаны без задержки при наличии сообщений</string>
-    <string name="notification_preview_mode_message">Текст сообщения</string>
-    <string name="notification_preview_mode_contact">Имена контактов</string>
-    <string name="notification_preview_mode_hidden">Скрытое</string>
-    <string name="notification_preview_mode_message_desc">Показывать контакт и сообщение</string>
-    <string name="notification_preview_mode_contact_desc">Показывать только контакт</string>
-    <string name="notification_display_mode_hidden_desc">Скрывать контакт и сообщение</string>
-    <string name="notification_preview_somebody">Контакт скрыт:</string>
-    <string name="notification_preview_new_message">новое сообщение</string>
-    <string name="notification_new_contact_request">Новый запрос на соединение</string>
-    <string name="notification_contact_connected">Соединен(а)</string>
-
-    <!-- local authentication notice - SimpleXAPI.kt -->
-    <string name="la_notice_title_simplex_lock">Блокировка SimpleX</string>
-    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Чтобы защитить вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
-    <string name="la_notice_turn_on">Включить</string>
-
-    <!-- LocalAuthentication.kt -->
-    <string name="auth_simplex_lock_turned_on">Блокировка SimpleX включена</string>
-    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</string>
-    <string name="auth_unlock">Разблокировать</string>
-    <string name="auth_log_in_using_credential">Пройдите аутентификацию</string>
-    <string name="auth_enable_simplex_lock">Включить блокировку SimpleX</string>
-    <string name="auth_disable_simplex_lock">Отключить блокировку SimpleX</string>
-    <string name="auth_confirm_credential">Пройдите аутентификацию</string>
-    <string name="auth_error">Ошибка аутентификации</string>
-    <string name="auth_error_w_desc">Ошибка аутентификации: <xliff:g id="desc">%1$s</xliff:g></string>
-    <string name="auth_failed">Ошибка аутентификации</string>
-    <string name="auth_unavailable">Аутентификация недоступна</string>
-    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</string>
-    <string name="auth_device_authentication_is_disabled_turning_off">Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.</string>
-    <string name="auth_retry">Повторить</string>
-    <string name="auth_stop_chat">Остановить чат</string>
-    <string name="auth_open_chat_console">Открыть консоль</string>
-
-    <!-- Chat Actions - ChatItemView.kt (and general) -->
-    <string name="reply_verb">Ответить</string>
-    <string name="share_verb">Поделиться</string>
-    <string name="copy_verb">Копировать</string>
-    <string name="save_verb">Сохранить</string>
-    <string name="edit_verb">Редактировать</string>
-    <string name="delete_verb">Удалить</string>
-    <string name="delete_message__question">Удалить сообщение?</string>
-    <string name="delete_message_cannot_be_undone_warning">Сообщение будет удалено – это действие нельзя отменить!</string>
-    <string name="for_me_only">Только для меня</string>
-    <string name="for_everybody">Для всех</string>
-
-    <!-- CIMetaView.kt -->
-    <string name="icon_descr_edited">отредактировано</string>
-    <string name="icon_descr_sent_msg_status_sent">отправлено</string>
-    <string name="icon_descr_sent_msg_status_unauthorized_send">ошибка авторизации при отправке</string>
-    <string name="icon_descr_sent_msg_status_send_failed">ошибка при отправке</string>
-    <string name="icon_descr_received_msg_status_unread">не прочитано</string>
-
-    <!-- ChatListView.kt -->
-    <string name="personal_welcome">Здравствуйте <xliff:g>%1$s</xliff:g>!</string>
-    <string name="welcome">Здравствуйте!</string>
-    <string name="this_text_is_available_in_settings">Этот текст можно найти в Настройках</string>
-    <string name="your_chats">Ваши чаты</string>
-    <string name="contact_connection_pending">соединяется…</string>
-    <string name="group_preview_you_are_invited">вы приглашены в группу</string>
-    <string name="group_preview_join_as">вступить как %s</string>
-    <string name="group_connection_pending">соединяется…</string>
-    <string name="tap_to_start_new_chat">Нажмите, чтобы начать чат</string>
-    <string name="chat_with_developers">Соединиться с разработчиками</string>
-    <string name="you_have_no_chats">У вас нет чатов</string>
-
-    <!-- ShareListView.kt -->
-    <string name="share_message">Отправить сообщение…</string>
-    <string name="share_image">Отправить изображение…</string>
-    <string name="share_file">Отправить файл…</string>
-
-    <!-- ComposeView.kt, helpers -->
-    <string name="attach">Прикрепить</string>
-    <string name="icon_descr_context">Значок контекста</string>
-    <string name="icon_descr_cancel_image_preview">Удалить превью изображения</string>
-    <string name="icon_descr_cancel_file_preview">Удалить превью файла</string>
-    <string name="images_limit_title">Слишком много изображений!</string>
-    <string name="images_limit_desc">Только 10 изображений могут быть отправлены одномоментно</string>
-
-    <!-- Images - CIImageView.kt -->
-    <string name="image_descr">Изображение</string>
-    <string name="icon_descr_waiting_for_image">Ожидается прием изображения</string>
-    <string name="icon_descr_asked_to_receive">Предложено получить изображение</string>
-    <string name="icon_descr_image_snd_complete">Изображение отправлено</string>
-    <string name="waiting_for_image">Ожидается прием изображения</string>
-    <string name="image_will_be_received_when_contact_is_online">Изображение будет принято, когда ваш контакт будет в сети, подождите или проверьте позже!</string>
-    <string name="image_saved">Изображение сохранено в Галерею</string>
-
-    <!-- Files - CIFileView.kt -->
-    <string name="icon_descr_file">Файл</string>
-    <string name="large_file">Большой файл!</string>
-    <string name="contact_sent_large_file">Ваш контакт отправил файл, размер которого превышает поддерживаемый в настоящее время максимальный размер (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
-    <string name="maximum_supported_file_size">В настоящее время максимальный поддерживаемый размер файла составляет <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="waiting_for_file">Ожидается прием файла</string>
-    <string name="file_will_be_received_when_contact_is_online">Файл будет принят, когда ваш контакт будет в сети, подождите или проверьте позже!</string>
-    <string name="file_saved">Файл сохранен</string>
-    <string name="file_not_found">Файл не найден</string>
-    <string name="error_saving_file">Ошибка сохранения файла</string>
-
-    <!-- Chat Info Settings - ChatInfoView.kt -->
-    <string name="notifications">Уведомления</string>
-
-    <!-- Chat Info Actions - ChatInfoView.kt -->
-    <string name="delete_contact_question">Удалить контакт?</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Контакт и все сообщения будут удалены - это действие нельзя отменить!</string>
-    <string name="button_delete_contact">Удалить контакт</string>
-    <string name="text_field_set_contact_placeholder">Имя контакта…</string>
-    <string name="icon_descr_server_status_connected">Соединение с сервером установлено</string>
-    <string name="icon_descr_server_status_disconnected">Соединение с сервером не установлено</string>
-    <string name="icon_descr_server_status_error">Ошибка соединения с сервером</string>
-    <string name="icon_descr_server_status_pending">Ожидается соединение с сервером</string>
-
-    <!-- Message Actions - SendMsgView.kt -->
-    <string name="icon_descr_send_message">Отправить сообщение</string>
-
-    <!-- General Actions / Responses -->
-    <string name="back">Назад</string>
-    <string name="cancel_verb">Отменить</string>
-    <string name="confirm_verb">Подтвердить</string>
-    <string name="ok">OK</string>
-    <string name="no_details">нет описания</string>
-    <string name="add_contact">Одноразовая ссылка</string>
-    <string name="copied">Скопировано в буфер обмена</string>
-
-    <!-- NewChatSheet -->
-    <string name="add_contact_or_create_group">Начать новый разговор</string>
-    <string name="share_one_time_link">Создать ссылку-приглашение</string>
-    <string name="connect_via_link_or_qr">Соединиться через ссылку / QR код</string>
-    <string name="scan_QR_code">Сканировать\nQR код</string>
-    <string name="create_group">Создать секретную группу</string>
-    <string name="to_share_with_your_contact">(чтобы отправить вашему контакту)</string>
-    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(сканировать или вставить из буфера)</string>
-    <string name="only_stored_on_members_devices">(хранится только у членов группы)</string>
-
-    <!-- GetImageView -->
-    <string name="toast_permission_denied">Разрешение не получено!</string>
-    <string name="use_camera_button">Камера</string>
-    <string name="from_gallery_button">Галерея</string>
-    <string name="choose_file">Файлы</string>
-
-    <!-- help - ChatHelpView.kt -->
-    <string name="thank_you_for_installing_simplex">Спасибо, что установили <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
-    <string name="you_can_connect_to_simplex_chat_founder">Вы можете <font color="#0088ff">соединиться с разработчиками</font>, чтобы задать любые вопросы или получать уведомления о новых версиях.</string>
-    <string name="to_start_a_new_chat_help_header">Чтобы начать новый чат</string>
-    <string name="chat_help_tap_button">Нажмите кнопку</string>
-    <string name="above_then_preposition_continuation">сверху, затем:</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Добавить новый контакт</b>: чтобы создать одноразовый QR код/ссылку для вашего контакта.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Сканировать QR код</b>: чтобы соединиться с контактом, который показывает вам QR код.</string>
-    <string name="to_connect_via_link_title">Чтобы соединиться через ссылку</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Если вы получили ссылку с приглашением из <xliff:g id="appName">SimpleX Chat</xliff:g>, вы можете открыть ее в браузере:</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 на компьютере: сосканируйте показанный QR код из приложения через <b>Сканировать QR код</b>.</string>
-    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 на мобильном: намжите кнопку <b>Open in mobile app</b> на веб странице, затем нажмите <b>Соединиться</b> в приложении.</string>
-
-    <!-- Contact Request Alert Dialogue - CharListNavLinkView.kt -->
-    <string name="accept_connection_request__question">Принять запрос на соединение?</string>
-    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Отправителю НЕ будет послано уведомление, если вы отклоните запрос на соединение.</string>
-    <string name="accept_contact_button">Принять</string>
-    <string name="accept_contact_incognito_button">Принять инкогнито</string>
-    <string name="reject_contact_button">Отклонить</string>
-
-    <!-- Clear Chat - ChatListNavLinkView.kt -->
-    <string name="clear_chat_question">Очистить чат?</string>
-    <string name="clear_chat_warning">Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас.</string>
-    <string name="clear_verb">Очистить</string>
-    <string name="clear_chat_button">Очистить чат</string>
-    <string name="clear_chat_menu_action">Очистить</string>
-    <string name="delete_contact_menu_action">Удалить</string>
-    <string name="delete_group_menu_action">Удалить</string>
-    <string name="mark_read">Прочитано</string>
-    <string name="set_contact_name">Имя контакта</string>
-
-    <!-- Actions - ChatListNavLinkView.kt -->
-    <string name="mute_chat">Без звука</string>
-    <string name="unmute_chat">Уведомлять</string>
-
-    <!-- Pending contact connection alert dialogues -->
-    <string name="you_invited_your_contact">Вы пригласили ваш контакт</string>
-    <string name="you_accepted_connection">Вы приняли приглашение соединиться</string>
-    <string name="delete_pending_connection__question">Удалить ожидаемое соединение?</string>
-    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Контакт, которому вы отправили эту ссылку, не сможет соединиться!</string>
-    <string name="connection_you_accepted_will_be_cancelled">Подтвержденное соединение будет отменено!</string>
-
-    <!-- Connection Pending Alert Dialogue - ChatListNavLinkView.kt -->
-    <string name="alert_title_contact_connection_pending">Соединение еще не установлено!</string>
-    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Ваш контакт должен быть в сети чтобы установить соединение.\nВы можете отменить соединение и удалить контакт (и попробовать позже с другой ссылкой).</string>
-
-    <!-- Contact Request Information - ContactRequestView.kt -->
-    <string name="contact_wants_to_connect_with_you">хочет соединиться с вами!</string>
-
-    <!-- Image Placeholder - ChatInfoImage.kt -->
-    <string name="icon_descr_profile_image_placeholder">аватар не установлен</string>
-    <string name="image_descr_profile_image">аватар</string>
-
-    <!-- Content Descriptions -->
-    <string name="icon_descr_close_button">закрыть</string>
-    <string name="image_descr_link_preview">изображение превью ссылки</string>
-    <string name="icon_descr_cancel_link_preview">удалить превью ссылки</string>
-    <string name="icon_descr_settings">Настройки</string>
-    <string name="image_descr_qr_code">QR код</string>
-    <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> адрес</string>
-    <string name="icon_descr_help">Помощь</string>
-    <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> команда</string>
-    <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> логотип</string>
-    <string name="icon_descr_email">Email</string>
-    <string name="icon_descr_more_button">Больше</string>
-
-    <!-- Connection info - ContactConnectionInfoView.kt -->
-    <string name="show_QR_code">Показать QR код</string>
-
-    <!-- Add Contact - AddContactView.kt -->
-    <string name="invalid_QR_code">Неверный QR код</string>
-    <string name="this_QR_code_is_not_a_link">Этот QR код не является ссылкой!</string>
-    <string name="invalid_contact_link">Неверная ссылка!</string>
-    <string name="this_link_is_not_a_valid_connection_link">Эта ссылка не является ссылкой-приглашением!</string>
-    <string name="connection_request_sent">Запрос на соединение послан!</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Соединение будет установлено когда ваш запрос будет принят. Пожалуйста, подождите или проверьте позже!</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Соединение будет установлено когда ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
-    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Ваш контакт может сосканировать QR код в приложении.</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Если вы не можете встретиться лично, вы можете <b>показать QR код во время видеозвонка</b> или поделиться ссылкой.</string>
-    <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профиль будет отправлен\nвашему контакту</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Если вы не можете встретиться лично, вы можете <b>сосканировать QR код во время видеозвонка</b>, или ваш контакт может отправить вам ссылку.</string>
-    <string name="share_invitation_link">Поделиться ссылкой</string>
-    <string name="paste_connection_link_below_to_connect">Чтобы соединиться, вставьте в это поле ссылку, полученную от вашего контакта.</string>
-    <string name="your_profile_will_be_sent">Ваш профиль будет отправлен вашему контакту</string>
-
-    <!-- PasteToConnect.kt -->
-    <string name="connect_button">Соединиться</string>
-    <string name="paste_button">Вставить</string>
-
-    <!-- CreateLinkView.kt -->
-    <string name="create_one_time_link">Создать одноразовую ссылку</string>
-    <string name="one_time_link">Одноразовая ссылка</string>
-    <string name="your_contact_address">Ваш SimpleX адрес</string>
-
-    <!-- settings - SettingsView.kt -->
-    <string name="your_settings">Настройки</string>
-    <string name="your_simplex_contact_address">Ваш <xliff:g id="appName">SimpleX</xliff:g> адрес</string>
-    <string name="database_passphrase_and_export">Пароль и экспорт базы</string>
-    <string name="about_simplex_chat">Информация о <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="how_to_use_simplex_chat">Как использовать</string>
-    <string name="markdown_help">Форматирование сообщений</string>
-    <string name="markdown_in_messages">Форматирование сообщений</string>
-    <string name="chat_with_the_founder">Соединиться с разработчиками</string>
-    <string name="send_us_an_email">Отправить email</string>
-    <string name="chat_lock">Блокировка SimpleX</string>
-    <string name="chat_console">Консоль</string>
-    <string name="smp_servers">SMP серверы</string>
-    <string name="install_simplex_chat_for_terminal"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> для терминала</string>
-    <string name="use_simplex_chat_servers__question">Использовать серверы предосталенные <xliff:g id="appNameFull">SimpleX Chat</xliff:g>?</string>
-    <string name="saved_SMP_servers_will_be_removed">Сохраненные SMP серверы будут удалены.</string>
-    <string name="your_SMP_servers">Ваши SMP серверы</string>
-    <string name="configure_SMP_servers">Настройка SMP серверов</string>
-    <string name="using_simplex_chat_servers">Используются серверы предоставленные <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.</string>
-    <string name="enter_one_SMP_server_per_line">Введите SMP серверы, каждый сервер в отдельной строке:</string>
-    <string name="how_to">Инфо</string>
-    <string name="saved_ICE_servers_will_be_removed">Сохраненные WebRTC ICE серверы будут удалены.</string>
-    <string name="your_ICE_servers">Ваши ICE серверы</string>
-    <string name="configure_ICE_servers">Настройка ICE серверов</string>
-    <string name="enter_one_ICE_server_per_line">ICE серверы (один на строке)</string>
-    <string name="error_saving_ICE_servers">Ошибка при сохранении ICE серверов</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Пожалуйста, проверьте, что адреса WebRTC ICE серверов имеют правильный формат, каждый адрес на отдельной строке и не повторяется.</string>
-    <string name="save_servers_button">Сохранить</string>
-    <string name="network_and_servers">Сеть и серверы</string>
-    <string name="network_settings">Настройки сети</string>
-    <string name="network_settings_title">Настройки сети</string>
-    <string name="network_socks_toggle">Использовать SOCKS прокси (порт 9050)</string>
-    <string name="network_enable_socks">Использовать SOCKS прокси?</string>
-    <string name="network_enable_socks_info">Соединяться с серверами через SOCKS прокси через порт 9050? Прокси должен быть запущен до включения этой опции.</string>
-    <string name="network_disable_socks">Использовать прямое соединение с Интернет?</string>
-    <string name="network_disable_socks_info">Если вы подтвердите, серверы смогут видеть ваш IP адрес, а провайдер - с какими серверами вы соединяетесь.</string>
-    <string name="update_onion_hosts_settings_question">Обновить настройки .onion хостов?</string>
-    <string name="network_use_onion_hosts">Использовать .onion хосты</string>
-    <string name="network_use_onion_hosts_prefer">Когда возможно</string>
-    <string name="network_use_onion_hosts_no">Нет</string>
-    <string name="network_use_onion_hosts_required">Обязательно</string>
-    <string name="network_use_onion_hosts_prefer_desc">Onion хосты используются, если возможно.</string>
-    <string name="network_use_onion_hosts_no_desc">Onion хосты не используются.</string>
-    <string name="network_use_onion_hosts_required_desc">Подключаться только к onion хостам.</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion хосты используются, если возможно.</string>
-    <string name="network_use_onion_hosts_no_desc_in_alert">Onion хосты не используются.</string>
-    <string name="network_use_onion_hosts_required_desc_in_alert">Подключаться только к onion хостам.</string>
-    <string name="appearance_settings">Интерфейс</string>
-
-    <!-- Address Items - UserAddressView.kt -->
-    <string name="create_address">Создать адрес</string>
-    <string name="delete_address__question">Удалить адрес?</string>
-    <string name="all_your_contacts_will_remain_connected">Все контакты, которые соединились через этот адрес, сохранятся.</string>
-    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Вы можете использовать адрес как ссылку или как QR код - через него можно с вами соединиться.</string>
-    <string name="if_you_later_delete_address_you_wont_lose_contacts">Вы сможете удалить адрес, сохранив контакты, которые через него соединились.</string>
-    <string name="if_you_delete_address_you_wont_lose_contacts">Вы можете удалить адрес, сохранив контакты, которые через него соединились.</string>
-    <string name="share_link">Поделиться\nссылкой</string>
-    <string name="delete_address">Удалить\nадрес</string>
-
-    <!-- User profile details - UserProfileView.kt -->
-    <string name="display_name__field">Имя профиля:</string>
-    <string name="full_name__field">"Полное имя:</string>
-    <string name="your_chat_profile">Ваш профиль</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Ваш профиль хранится на вашем устройстве и отправляется только вашим контактам.\n\n<xliff:g id="appName">SimpleX</xliff:g> серверы не могут получить доступ к вашему профилю.</string>
-    <string name="edit_image">Поменять аватар</string>
-    <string name="delete_image">Удалить аватар</string>
-    <string name="save_and_notify_contacts">Сохранить (и послать обновление контактам)</string>
-
-    <!-- Welcome Prompts - WelcomeView.kt -->
-    <string name="you_control_your_chat">Вы котролируете ваш чат!</string>
-    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Платформа для сообщений и приложений, которая защищает вашу личную информацию и безопасность.</string>
-    <string name="we_do_not_store_contacts_or_messages_on_servers">Мы не храним ваши контакты и сообщения (после доставки) на серверах.</string>
-    <string name="create_profile">Создать профиль</string>
-    <string name="your_profile_is_stored_on_your_device">Ваш профиль, контакты и доставленные сообщения хранятся на вашем устройстве.</string>
-    <string name="profile_is_only_shared_with_your_contacts">Профиль отправляется только вашим контактам.</string>
-    <string name="display_name_cannot_contain_whitespace">Имя профиля не может содержать пробелы.</string>
-    <string name="display_name">Имя профиля</string>
-    <string name="full_name_optional__prompt">Полное имя (не обязательно)</string>
-    <string name="create_profile_button">Создать</string>
-    <string name="about_simplex">О SimpleX</string>
-
-    <!-- markdown demo - MarkdownHelpView.kt -->
-    <string name="how_to_use_markdown">Как форматировать</string>
-    <string name="you_can_use_markdown_to_format_messages__prompt">Вы можете форматировать сообщения:</string>
-    <string name="bold">жирный</string>
-    <string name="italic">курсив</string>
-    <string name="strikethrough">зачеркнуть</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="colored">цвет</string>
-    <string name="secret">секрет</string>
-    <string name="connect_via_link">Соединиться через ссылку</string>
-    <string name="this_string_is_not_a_connection_link">Эта строка не является ссылкой-приглашением!</string>
-    <string name="you_can_also_connect_by_clicking_the_link">Вы также можете соединиться, открыв ссылку там, где вы её получили. Если ссылка откроется в браузере, нажмите кнопку <b>Открыть в приложении</b>.</string>
-
-    <!-- CICallStatus -->
-    <string name="callstatus_calling">входящий звонок…</string>
-    <string name="callstatus_missed">пропущенный звонок</string>
-    <string name="callstatus_rejected">отклоненный звонок</string>
-    <string name="callstatus_accepted">принятый звонок</string>
-    <string name="callstatus_connecting">звонок соединяется…</string>
-    <string name="callstatus_in_progress">активный звонок</string>
-    <string name="callstatus_ended">звонок завершён <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-    <string name="callstatus_error">ошибка звонка</string>
-
-    <!-- CallState -->
-    <string name="callstate_starting">инициализация…</string>
-    <string name="callstate_waiting_for_answer">ожидается ответ…</string>
-    <string name="callstate_waiting_for_confirmation">ожидается подтверждение…</string>
-    <string name="callstate_received_answer">получен ответ…</string>
-    <string name="callstate_received_confirmation">получено подтверждение…</string>
-    <string name="callstate_connecting">соединяется…</string>
-    <string name="callstate_connected">соединено</string>
-    <string name="callstate_ended">завершен</string>
-
-    <!-- SimpleXInfo -->
-    <string name="next_generation_of_private_messaging">Новое поколение приватных сообщений</string>
-    <string name="privacy_redefined">Более конфиденциальный</string>
-    <string name="first_platform_without_user_ids">Первая в мире платформа без идентификаторов пользователей.</string>
-    <string name="immune_to_spam_and_abuse">Защищен от спама</string>
-    <string name="people_can_connect_only_via_links_you_share">С вами можно соединиться только через созданные вами ссылки.</string>
-    <string name="decentralized">Децентрализованный</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">Открытый протокол и код - кто угодно может запустить сервер.</string>
-    <string name="create_your_profile">Создать профиль</string>
-    <string name="make_private_connection">Добавьте контакт</string>
-    <string name="how_it_works">Как это работает</string>
-
-    <!-- How SimpleX Works -->
-    <string name="how_simplex_works">Как <xliff:g id="appName">SimpleX</xliff:g> работает</string>
-    <string name="many_people_asked_how_can_it_deliver">Много пользователей спросили: <i>как <xliff:g id="appName">SimpleX</xliff:g> доставляет сообщения без идентификаторов пользователей?</i></string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Чтобы защитить вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, <xliff:g id="appName">SimpleX</xliff:g> использует ID для очередей сообщений, разные для каждого контакта.</string>
-    <string name="you_control_servers_to_receive_your_contacts_to_send">Вы определяете через какие серверы вы <b>получаете сообщения</b>, ваши контакты - серверы, которые вы используете для отправки.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Только пользовательские устройства хранят контакты, группы и сообщения, которые отправляются <b>с двухуровневым end-to-end шифрованием</b>.</string>
-    <string name="read_more_in_github">Узнайте больше из нашего GitHub репозитория.</string>
-    <string name="read_more_in_github_with_link">Узнайте больше из нашего <font color="#0088ff">GitHub репозитория</font>.</string>
-
-    <!-- MakeConnection -->
-    <string name="paste_the_link_you_received">Вставить полученную ссылку</string>
-
-    <!-- Call -->
-    <string name="incoming_video_call">Входящий видеозвонок</string>
-    <string name="incoming_audio_call">Входящий аудиозвонок</string>
-    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> хочет связаться с вами через </string>
-    <string name="video_call_no_encryption">видеозвонок (не e2e зашифрованный)</string>
-    <string name="encrypted_video_call">e2e зашифрованный видеозвонок</string>
-    <string name="audio_call_no_encryption">аудиозвонок (не e2e зашифрованный)</string>
-    <string name="encrypted_audio_call">e2e зашифрованный аудиозвонок</string>
-    <string name="accept">Принять</string>
-    <string name="reject">Отклонить</string>
-    <string name="ignore">Закрыть</string>
-    <string name="call_already_ended">Звонок уже завершен!</string>
-    <string name="icon_descr_video_call">видеозвонок</string>
-    <string name="icon_descr_audio_call">аудиозвонок</string>
-
-    <!-- Call settings -->
-    <string name="settings_audio_video_calls">Аудио- и видеозвонки</string>
-    <string name="your_calls">Ваши звонки</string>
-    <string name="connect_calls_via_relay">Соединяться через сервер (relay)</string>
-    <string name="call_on_lock_screen">Звонки на экране блокировки:</string>
-    <string name="accept_call_on_lock_screen">Принимать</string>
-    <string name="show_call_on_lock_screen">Показывать</string>
-    <string name="no_call_on_lock_screen">Выключить</string>
-    <string name="your_ice_servers">Ваши ICE серверы</string>
-    <string name="webrtc_ice_servers">WebRTC ICE серверы</string>
-
-    <!-- Call Lock Screen -->
-    <string name="open_simplex_chat_to_accept_call">Откройте <xliff:g id="appNameFull">SimpleX Chat</xliff:g>\nчтобы принять звонок</string>
-    <string name="allow_accepting_calls_from_lock_screen">Вы можете разрешить принимать звонки на экране блокировки через Настройки.</string>
-    <string name="open_verb">Открыть</string>
-
-    <!-- Call overlay -->
-    <string name="status_e2e_encrypted">e2e зашифровано</string>
-    <string name="status_no_e2e_encryption">нет e2e шифрования</string>
-    <string name="status_contact_has_e2e_encryption">у контакта есть e2e шифрование</string>
-    <string name="status_contact_has_no_e2e_encryption">у контакта нет e2e шифрования</string>
-    <string name="call_connection_peer_to_peer">peer-to-peer</string>
-    <string name="call_connection_via_relay">через relay сервер</string>
-    <string name="icon_descr_hang_up">Закончить звонок</string>
-    <string name="icon_descr_video_off">Выключить видео</string>
-    <string name="icon_descr_video_on">Включить видео</string>
-    <string name="icon_descr_audio_off">Выключить звук</string>
-    <string name="icon_descr_audio_on">Включить звук</string>
-    <string name="icon_descr_speaker_off">Выключить спикер</string>
-    <string name="icon_descr_speaker_on">Включить спикер</string>
-    <string name="icon_descr_flip_camera">Перевернуть камеру</string>
-
-    <!-- Call items -->
-    <string name="icon_descr_call_pending_sent">Входящий звонок</string>
-    <string name="icon_descr_call_missed">Пропущенный звонок</string>
-    <string name="icon_descr_call_rejected">Отклоненный звонок</string>
-    <string name="icon_descr_call_connecting">Соединяющийся звонок</string>
-    <string name="icon_descr_call_progress">Текущий звонок</string>
-    <string name="icon_descr_call_ended">Звонок завершен</string>
-    <string name="answer_call">Принять звонок</string>
-
-    <!-- Message integrity -->
-    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> пропущенных сообщений</string>
-    <string name="integrity_msg_bad_hash">ошибка хэш сообщения</string>
-    <string name="integrity_msg_bad_id">ошибка ID сообщения</string>
-    <string name="integrity_msg_duplicate">повторное сообщение</string>
-    <string name="alert_title_skipped_messages">Пропущенные сообщения</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">Это может случится, когда:\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.\n2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.\n3. Соединение компроментировано.\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</string>
-
-    <!-- Privacy settings -->
-    <string name="privacy_and_security">Конфиденциальность</string>
-    <string name="your_privacy">Конфиденциальность</string>
-    <string name="auto_accept_images">Автоприем изображений</string>
-    <string name="send_link_previews">Отправлять картинки ссылок</string>
-
-    <!-- Settings sections -->
-    <string name="settings_section_title_you">ВЫ</string>
-    <string name="settings_section_title_settings">НАСТРОЙКИ</string>
-    <string name="settings_section_title_help">ПОМОЩЬ</string>
-    <string name="settings_section_title_develop">ДЛЯ РАЗРАБОТЧИКОВ</string>
-    <string name="settings_section_title_device">УСТРОЙСТВО</string>
-    <string name="settings_section_title_chats">ЧАТЫ</string>
-    <string name="settings_developer_tools">Инструменты разработчика</string>
-    <string name="settings_experimental_features">Экспериментальные функции</string>
-    <string name="settings_section_title_socks">SOCKS ПРОКСИ</string>
-    <string name="settings_section_title_icon">ИКОНКА</string>
-    <string name="settings_section_title_themes">ТЕМЫ</string>
-    <string name="settings_section_title_messages">СООБЩЕНИЯ</string>
-    <string name="settings_section_title_calls">ЗВОНКИ</string>
-    <string name="settings_section_title_incognito">Режим Инкогнито</string>
-
-    <!-- DatabaseView.kt -->
-    <string name="your_chat_database">База данных</string>
-    <string name="run_chat_section">ЗАПУСТИТЬ ЧАТ</string>
-    <string name="chat_is_running">Чат запущен</string>
-    <string name="chat_is_stopped">Чат остановлен</string>
-    <string name="chat_database_section">БАЗА ДАННЫХ</string>
-    <string name="database_passphrase">Пароль базы данных</string>
-    <string name="export_database">Экспорт архива чата</string>
-    <string name="import_database">Импорт архива чата</string>
-    <string name="new_database_archive">Новый архив чата</string>
-    <string name="old_database_archive">Старый архив чата</string>
-    <string name="delete_database">Удалить данные чата</string>
-    <string name="error_starting_chat">Ошибка при запуске чата</string>
-    <string name="stop_chat_question">Остановить чат?</string>
-    <string name="stop_chat_to_export_import_or_delete_chat_database">Остановите чат, чтобы экспортировать или импортировать архив чата или удалить базу данных. Вы не сможете получать и отправлять сообщения, пока чат остановлен.</string>
-    <string name="stop_chat_confirmation">Остановить</string>
-    <string name="set_password_to_export">Установите пароль</string>
-    <string name="set_password_to_export_desc">База данных зашифрована случайным паролем. Пожалуйста, поменяйте его перед экспортом.</string>
-    <string name="error_stopping_chat">Ошибка при остановке чата</string>
-    <string name="error_exporting_chat_database">Ошибка при экспорте архива чата</string>
-    <string name="import_database_question">Импортировать архив чата?</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Текущие данные вашего чата будет УДАЛЕНЫ и ЗАМЕНЕНЫ импортированными.\nЭто действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
-    <string name="import_database_confirmation">Импортировать</string>
-    <string name="error_deleting_database">Ошибка при удалении данных чата</string>
-    <string name="error_importing_database">Ошибка при импорте архива чата</string>
-    <string name="chat_database_imported">Архив чата импортирован</string>
-    <string name="restart_the_app_to_use_imported_chat_database">Перезапустите приложение, чтобы использовать импортированные данные чата.</string>
-    <string name="delete_chat_profile_question">Удалить профиль?</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Это действие нельзя отменить — ваш профиль, контакты, сообщения и файлы будут безвозвратно утеряны.</string>
-    <string name="chat_database_deleted">Данные чата удалены</string>
-    <string name="restart_the_app_to_create_a_new_chat_profile">Перезапустите приложение, чтобы создать новый профиль.</string>
-    <string name="you_must_use_the_most_recent_version_of_database">Используйте самую последнюю версию архива чата и ТОЛЬКО на одном устройстве, иначе вы можете перестать получать сообщения от некоторых контактов.</string>
-    <string name="stop_chat_to_enable_database_actions">Остановите чат, чтобы разблокировать операции с архивом чата.</string>
-    <string name="data_section">ДАННЫЕ</string>
-    <string name="delete_files_and_media">Удалить файлы и медиа</string>
-    <string name="delete_files_and_media_question">Удалить файлы и медиа?</string>
-    <string name="delete_files_and_media_desc">Это действие нельзя отменить — все полученные и отправленные файлы будут удалены. Изображения останутся в низком разрешении.</string>
-    <string name="no_received_app_files">Нет полученных или отправленных файлов</string>
-    <string name="total_files_count_and_size">%d файл(ов) общим размером %s</string>
-    <string name="chat_item_ttl_none">никогда</string>
-    <string name="chat_item_ttl_day">1 день</string>
-    <string name="chat_item_ttl_week">1 неделю</string>
-    <string name="chat_item_ttl_month">1 месяц</string>
-    <string name="chat_item_ttl_seconds">%s секунд</string>
-    <string name="delete_messages_after">Удалять сообщения через</string>
-    <string name="enable_automatic_deletion_question">Включить автоматическое удаление сообщений?</string>
-    <string name="enable_automatic_deletion_message">Это действие нельзя отменить — все сообщения, отправленные или полученные раньше чем выбрано, будут удалены. Это может занять несколько минут.</string>
-    <string name="delete_messages">Удалить сообщения</string>
-    <string name="error_changing_message_deletion">Ошибка при изменении настройки</string>
-
-    <!-- DatabaseEncryptionView.kt -->
-    <string name="save_passphrase_in_keychain">Сохранить пароль в Keystore</string>
-    <string name="database_encrypted">База данных зашифрована!</string>
-    <string name="error_encrypting_database">Ошибка при шифровании</string>
-    <string name="remove_passphrase_from_keychain">Удалить пароль из Keystore?</string>
-    <string name="notifications_will_be_hidden">Уведомления будут работать только до остановки приложения!</string>
-    <string name="remove_passphrase">Удалить</string>
-    <string name="encrypt_database">Зашифровать</string>
-    <string name="update_database">Поменять</string>
-    <string name="current_passphrase">Текущий пароль…</string>
-    <string name="new_passphrase">Новый пароль…</string>
-    <string name="confirm_new_passphrase">Подтвердите новый пароль…</string>
-    <string name="update_database_passphrase">Поменять пароль</string>
-    <string name="enter_correct_current_passphrase">Пожалуйста, введите правильный пароль.</string>
-    <string name="database_is_not_encrypted">База данных НЕ зашифрована. Установите пароль, чтобы защитить ваши данные.</string>
-    <string name="keychain_is_storing_securely">Android Keystore используется для безопасного хранения пароля - это позволяет стабильно получать уведомления в фоновом режиме.</string>
-    <string name="encrypted_with_random_passphrase">База данных зашифрована случайным паролем, вы можете его поменять.</string>
-    <string name="impossible_to_recover_passphrase"><b>Внимание</b>: вы не сможете восстановить или поменять пароль, если потеряете его.</string>
-    <string name="keychain_allows_to_receive_ntfs">Пароль базы данных будет безопасно сохранен в Android Keystore после запуска чата или изменения пароля - это позволит стабильно получать уведомления.</string>
-    <string name="you_have_to_enter_passphrase_every_time">Пароль не сохранен на устройстве — вы будете должны ввести его при каждом запуске чата.</string>
-    <string name="encrypt_database_question">Зашифровать базу данных?</string>
-    <string name="change_database_passphrase_question">Поменять пароль базы данных?</string>
-    <string name="database_will_be_encrypted">База данных будет зашифрована.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">База данных будет зашифрована и пароль сохранен в Keystore.</string>
-    <string name="database_encryption_will_be_updated">Пароль базы данных будет изменен и сохранен в Keystore.</string>
-    <string name="database_passphrase_will_be_updated">Пароль базы данных будет изменен.</string>
-    <string name="store_passphrase_securely">Пожалуйста, надежно сохраните пароль, вы НЕ сможете его поменять, если потеряете.</string>
-    <string name="store_passphrase_securely_without_recover">Пожалуйста, надежно сохраните пароль, вы НЕ сможете открыть чат, если потеряете его.</string>
-
-    <!-- DatabaseErrorView.kt -->
-    <string name="wrong_passphrase">Неправильный пароль базы данных</string>
-    <string name="encrypted_database">База данных зашифрована</string>
-    <string name="database_error">Ошибка базы данных</string>
-    <string name="keychain_error">Ошибка Keystore</string>
-    <string name="passphrase_is_different">Пароль базы данных отличается от сохраненного в Keystore.</string>
-    <string name="file_with_path">Файл: %s</string>
-    <string name="database_passphrase_is_required">Введите пароль базы данных, чтобы открыть чат.</string>
-    <string name="error_with_info">Ошибка: %s</string>
-    <string name="cannot_access_keychain">Невозможно сохранить пароль в Keystore</string>
-    <string name="unknown_database_error_with_info">Неизвестная ошибка базы данных: %s</string>
-    <string name="wrong_passphrase_title">Неправильный пароль!</string>
-    <string name="enter_correct_passphrase">Введите правильный пароль.</string>
-    <string name="unknown_error">Неизвестная ошибка</string>
-    <string name="enter_passphrase">Введите пароль…</string>
-    <string name="save_passphrase_and_open_chat">Сохранить пароль и открыть чат</string>
-    <string name="open_chat">Открыть чат</string>
-    <string name="database_backup_can_be_restored">Попытка поменять пароль базы данных не была завершена.</string>
-    <string name="restore_database">Восстановить резервную копию</string>
-    <string name="restore_database_alert_title">Восстановить резервную копию?</string>
-    <string name="restore_database_alert_desc">Введите предыдущий пароль после восстановления резервной копии. Это действие нельзя отменить.</string>
-    <string name="restore_database_alert_confirm">Восстановить</string>
-    <string name="database_restore_error">Ошибка при восстановлении базы данных</string>
-
-    <!-- ChatModel.chatRunning interactions -->
-    <string name="chat_is_stopped_indication">Чат остановлен</string>
-    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Вы можете запустить чат через Настройки приложения или перезапустив приложение.</string>
-
-    <!-- ChatArchiveView.kt -->
-    <string name="chat_archive_header">Архив чата</string>
-    <string name="chat_archive_section">АРХИВ ЧАТА</string>
-    <string name="save_archive">Сохранить архив</string>
-    <string name="delete_archive">Удалить архив</string>
-    <string name="archive_created_on_ts">Дата создания <xliff:g id="archive_ts">%1$s</xliff:g></string>
-    <string name="delete_chat_archive_question">Удалить архив чата?</string>
-
-    <!-- Groups -->
-    <string name="group_invitation_item_description">приглашение в группу <xliff:g id="group_name">%1$s</xliff:g></string>
-    <string name="join_group_question">Вступить в группу?</string>
-    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Вы приглашены в группу. Вступите, чтобы соединиться с членами группы.</string>
-    <string name="join_group_button">Вступить</string>
-    <string name="join_group_incognito_button">Вступить инкогнито</string>
-    <string name="joining_group">Вступление в группу</string>
-    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Вы вступили в эту группу. Устанавливается соединение с пригласившим членом группы.</string>
-    <string name="leave_group_button">Выйти</string>
-    <string name="leave_group_question">Выйти из группы</string>
-    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Вы перестанете получать сообщения от этой группы. История чата будет сохранена.</string>
-    <string name="icon_descr_add_members">Пригласить членов группы</string>
-    <string name="icon_descr_group_inactive">Группа неактивна</string>
-    <string name="alert_title_group_invitation_expired">Приглашение истекло!</string>
-    <string name="alert_message_group_invitation_expired">Приглашение в группу больше не действительно, оно было удалено отправителем.</string>
-    <string name="alert_title_no_group">Группа не найдена!</string>
-    <string name="alert_message_no_group">Эта группа больше не существует.</string>
-    <string name="alert_title_cant_invite_contacts">Нельзя пригласить контакты!</string>
-    <string name="alert_title_cant_invite_contacts_descr">Вы используете инкогнито профиль для этой группы - чтобы предотвратить раскрытие вашего основного профиля, приглашать контакты не разрешено</string>
-
-    <!-- CIGroupInvitationView.kt -->
-    <string name="you_sent_group_invitation">Вы отправили приглашение в группу</string>
-    <string name="you_are_invited_to_group">Вы приглашены в группу</string>
-    <string name="group_invitation_tap_to_join">Нажмите, чтобы вступить</string>
-    <string name="group_invitation_tap_to_join_incognito">Нажмите, чтобы вступить инкогнито</string>
-    <string name="you_joined_this_group">Вы вступили в эту группу</string>
-    <string name="you_rejected_group_invitation">Вы отклонили приглашение в группу</string>
-    <string name="group_invitation_expired">Приглашение в группу истекло</string>
-
-    <!-- Group event chat items -->
-    <string name="rcv_group_event_member_added">пригласил(а) <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_member_connected">соединен(а)</string>
-    <string name="rcv_group_event_member_left">покинул(а) группу</string>
-    <string name="rcv_group_event_member_deleted">удалил(а) <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_user_deleted">удалил(а) вас из группы</string>
-    <string name="rcv_group_event_group_deleted">удалил(а) группу</string>
-    <string name="rcv_group_event_updated_group_profile">обновил(а) профиль группы</string>
-    <string name="snd_group_event_member_deleted">вы удалили <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="snd_group_event_user_left">вы покинули группу</string>
-    <string name="snd_group_event_group_profile_updated">профиль группы обновлен</string>
-
-    <!-- GroupMemberRole -->
-    <string name="group_member_role_member">член группы</string>
-    <string name="group_member_role_admin">админ</string>
-    <string name="group_member_role_owner">владелец</string>
-
-    <!-- GroupMemberStatus -->
-    <string name="group_member_status_removed">удален(а)</string>
-    <string name="group_member_status_left">покинул(а)</string>
-    <string name="group_member_status_group_deleted">группа удалена</string>
-    <string name="group_member_status_invited">приглашен(а)</string>
-    <string name="group_member_status_introduced">соединяется (представлен(а))</string>
-    <string name="group_member_status_intro_invitation">соединяется (приглашение по представлению)</string>
-    <string name="group_member_status_accepted">соединяется (приглашение принято)</string>
-    <string name="group_member_status_announced">соединяется (объявлен(а))</string>
-    <string name="group_member_status_connected">соединен(а)</string>
-    <string name="group_member_status_complete">соединение завершено</string>
-    <string name="group_member_status_creator">создатель</string>
-
-    <string name="group_member_status_connecting">соединяется</string>
-
-    <!-- AddGroupMembersView.kt -->
-    <string name="no_contacts_to_add">Нет контактов для добавления</string>
-    <string name="new_member_role">Роль члена группы</string>
-    <string name="icon_descr_expand_role">Развернуть выбор роли</string>
-    <string name="invite_to_group_button">Пригласить в группу</string>
-    <string name="icon_descr_contact_checked">Контакт выбран</string>
-    <string name="clear_contacts_selection_button">Очистить</string>
-    <string name="num_contacts_selected">Выбрано контактов: <xliff:g id="num_contacts">%1$s</xliff:g></string>
-    <string name="no_contacts_selected">Контакты не выбраны</string>
-    <string name="invite_prohibited">Нельзя пригласить контакт!</string>
-    <string name="invite_prohibited_description">Вы пытаетесь пригласить инкогнито контакт в группу, где вы используете свой основной профиль</string>
-
-    <!-- GroupChatInfoView.kt -->
-    <string name="button_add_members">Пригласить членов группы</string>
-    <string name="group_info_section_title_num_members">ЧЛЕНОВ ГРУППЫ: <xliff:g id="num_members">%1$s</xliff:g></string>
-    <string name="group_info_member_you">вы: <xliff:g id="group_info_you">%1$s</xliff:g></string>
-    <string name="button_delete_group">Удалить группу</string>
-    <string name="delete_group_question">Удалить группу?</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">Группа будет удалена для всех членов - это действие нельзя отменить!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">Группа будет удалена для вас - это действие нельзя отменить!</string>
-    <string name="button_leave_group">Выйти из группы</string>
-    <string name="button_edit_group_profile">Редактировать профиль группы</string>
-
-    <!-- For Console chat info section -->
-    <string name="section_title_for_console">ДЛЯ КОНСОЛИ</string>
-    <string name="info_row_local_name">Локальное имя</string>
-    <string name="info_row_database_id">ID базы данных</string>
-
-    <!-- GroupMemberInfoView.kt -->
-    <string name="button_remove_member">Удалить члена группы</string>
-    <string name="button_send_direct_message">Отправить сообщение</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">Член группы будет удален - это действие нельзя отменить!</string>
-    <string name="remove_member_confirmation">Удалить</string>
-    <string name="member_info_section_title_member">ЧЛЕН ГРУППЫ</string>
-    <string name="role_in_group">Роль</string>
-    <string name="change_role">Поменять роль</string>
-    <string name="change_verb">Поменять</string>
-    <string name="change_member_role_question">Поменять роль в группе?</string>
-    <string name="member_role_will_be_changed_with_notification">Роль будет изменена на \"%s\". Все в группе получат сообщение.</string>
-    <string name="member_role_will_be_changed_with_invitation">Роль будет изменена на \"%s\". Будет отправлено новое приглашение.</string>
-    <string name="error_removing_member">Ошибка при удалении члена группы</string>
-    <string name="error_changing_role">Ошибка при изменении роли</string>
-    <string name="member_role">роль %s: %s</string>
-    <string name="your_member_role">ваша роль: %s</string>
-    <string name="info_row_group">Группа</string>
-    <string name="info_row_connection">Соединение</string>
-    <string name="conn_level_desc_direct">прямое</string>
-    <string name="conn_level_desc_indirect">непрямое (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
-
-    <!-- ConnectionStats -->
-    <string name="conn_stats_section_title_servers">СЕРВЕРЫ</string>
-    <string name="receiving_via">Получение через</string>
-    <string name="sending_via">Отправка через</string>
-    <string name="network_status">Состояние сети</string>
-
-    <!-- AddGroupView.kt -->
-    <string name="create_secret_group_title">Создать скрытую группу</string>
-    <string name="group_is_decentralized">Группа полностью децентрализована — она видна только членам.</string>
-    <string name="group_display_name_field">Имя группы:</string>
-    <string name="group_full_name_field">Полное имя:</string>
-    <string name="group_unsupported_incognito_main_profile_sent">Режим Инкогнито здесь не поддерживается - ваш основной профиль будет отправлен членам группы</string>
-    <string name="group_main_profile_sent">Ваш профиль чата будет отправлен членам группы</string>
-
-    <!-- GroupProfileView.kt -->
-    <string name="group_profile_is_stored_on_members_devices">Профиль группы хранится на устройствах членов, а не на серверах.</string>
-    <string name="save_group_profile">Сохранить профиль группы</string>
-    <string name="error_saving_group_profile">Ошибка при сохранении профиля группы</string>
-
-    <!-- AdvancedNetworkSettings.kt -->
-    <string name="network_options_reset_to_defaults">Сбросить настройки</string>
-    <string name="network_option_seconds_label">сек</string>
-    <string name="network_option_tcp_connection_timeout">Таймаут TCP соединения</string>
-    <string name="network_option_protocol_timeout">Таймаут протокола</string>
-    <string name="network_option_ping_interval">Интервал PING</string>
-    <string name="network_option_enable_tcp_keep_alive">Включить TCP keep-alive</string>
-    <string name="network_options_revert">Отменить изменения</string>
-    <string name="network_options_save">Сохранить</string>
-    <string name="update_network_settings_question">Обновить настройки сети?</string>
-    <string name="updating_settings_will_reconnect_client_to_all_servers">Обновление настроек приведет к переподключению клиента ко всем серверам.</string>
-    <string name="update_network_settings_confirmation">Обновить</string>
-
-    <!-- Incognito mode -->
-    <string name="incognito">Инкогнито</string>
-    <string name="incognito_random_profile">Случайный профиль</string>
-    <string name="incognito_random_profile_description">Вашему контакту будет отправлен случайный профиль</string>
-    <string name="incognito_random_profile_from_contact_description">Контакту, от которого вы получили эту ссылку, будет отправлен случайный профиль</string>
-
-    <string name="incognito_info_protects">Режим Инкогнито защищает конфиденциальность имени и изображения вашего основного профиля — для каждого нового контакта создается новый случайный профиль.</string>
-    <string name="incognito_info_allows">Это позволяет иметь много анонимных соединений без общих данных между ними в одном профиле пользователя.</string>
-    <string name="incognito_info_share">Когда вы соединены с контактом инкогнито, тот же самый инкогнито профиль будет использоваться для групп с этим контактом.</string>
-    <string name="incognito_info_find">Чтобы найти инкогнито профиль, используемый в разговоре, нажмите на имя контакта или группы в верхней части чата.</string>
-
-    <!-- Default themes -->
-    <string name="theme_system">Системная</string>
-    <string name="theme_light">Светлая</string>
-    <string name="theme_dark">Темная</string>
-
-    <!-- Appearance.kt -->
-    <string name="theme">Тема</string>
-    <string name="save_color">Сохранить цвет</string>
-    <string name="reset_color">Сбросить цвета</string>
-    <string name="color_primary">Акцент</string>
-</resources>

apps/ios/README.md

@@ -0,0 +1 @@
+# SimpleX Chat iOS app

apps/ios/Shared/AppDelegate.swift

@@ -50,7 +50,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                             try await apiVerifyToken(token: token, nonce: nonce, code: verification)
                             m.tokenStatus = .active
                         } catch {
-                            if let cr = error as? ChatResponse, case .chatCmdError(.errorAgent(.NTF(.AUTH))) = cr {
+                            if let cr = error as? ChatResponse, case .chatCmdError(_, .errorAgent(.NTF(.AUTH))) = cr {
                                 m.tokenStatus = .expired
                             }
                             logger.error("AppDelegate: didReceiveRemoteNotification: apiVerifyToken or apiIntervalNofication error: \(responseError(error))")
@@ -77,6 +77,10 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
     func applicationWillTerminate(_ application: UIApplication) {
         logger.debug("AppDelegate: applicationWillTerminate")
+        ChatModel.shared.filesToDelete.forEach {
+            removeFile($0)
+        }
+        ChatModel.shared.filesToDelete = []
         terminateChat()
     }
 
@@ -102,9 +106,11 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
     var window: UIWindow?
+    var windowScene: UIWindowScene?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = scene as? UIWindowScene else { return }
+        self.windowScene = windowScene
         window = windowScene.keyWindow
         window?.tintColor = UIColor(cgColor: getUIAccentColorDefault())
         window?.overrideUserInterfaceStyle = getUserInterfaceStyleDefault()

apps/ios/Shared/Assets.xcassets/decentralized-light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "decentralized_light.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "decentralized_light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "decentralized_light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/Assets.xcassets/icon-transparent.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "60.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

apps/ios/Shared/ContentView.swift

@@ -6,61 +6,173 @@
 //
 
 import SwiftUI
+import Intents
 import SimpleXChat
 
 struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
+    @Environment(\.colorScheme) var colorScheme
     @Binding var doAuthenticate: Bool
     @Binding var userAuthorized: Bool?
+    @Binding var canConnectCall: Bool
+    @Binding var lastSuccessfulUnlock: TimeInterval?
+    @Binding var showInitializationView: Bool
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
+    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
+    @AppStorage(DEFAULT_NOTIFICATION_ALERT_SHOWN) private var notificationAlertShown = false
+    @State private var showSettings = false
+    @State private var showWhatsNew = false
+    @State private var showChooseLAMode = false
+    @State private var showSetPasscode = false
 
     var body: some View {
         ZStack {
-            if prefPerformLA && userAuthorized != true {
-                Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
-            } else if let status = chatModel.chatDbStatus, status != .ok {
-                DatabaseErrorView(status: status)
-            } else if !chatModel.v3DBMigration.startChat {
-                MigrateToAppGroupView()
-            } else if let step = chatModel.onboardingStage  {
-                if case .onboardingComplete = step,
-                   chatModel.currentUser != nil {
-                    mainView()
-                } else {
-                    OnboardingView(onboarding: step)
+            contentView()
+            if chatModel.showCallView, let call = chatModel.activeCall {
+                callView(call)
+            }
+            if !showSettings, let la = chatModel.laRequest {
+                LocalAuthView(authRequest: la)
+            } else if showSetPasscode {
+                SetAppPasscodeView {
+                    prefPerformLA = true
+                    showSetPasscode = false
+                    privacyLocalAuthModeDefault.set(.passcode)
+                    alertManager.showAlert(laTurnedOnAlert())
+                } cancel: {
+                    prefPerformLA = false
+                    showSetPasscode = false
+                    alertManager.showAlert(laPasscodeNotSetAlert())
                 }
             }
         }
         .onAppear {
-            if doAuthenticate { runAuthenticate() }
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
         }
-        .onChange(of: doAuthenticate) { _ in if doAuthenticate { runAuthenticate() } }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
+        .sheet(isPresented: $showSettings) {
+            SettingsView(showSettings: $showSettings)
+        }
+        .confirmationDialog("SimpleX Lock mode", isPresented: $showChooseLAMode, titleVisibility: .visible) {
+            Button("System authentication") { initialEnableLA() }
+            Button("Passcode entry") { showSetPasscode = true }
+        }
+    }
+
+    @ViewBuilder private func contentView() -> some View {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if chatModel.chatDbStatus == nil && showInitializationView {
+            initializationView()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
+            DatabaseErrorView(status: status)
+        } else if !chatModel.v3DBMigration.startChat {
+            MigrateToAppGroupView()
+        } else if let step = chatModel.onboardingStage {
+            if case .onboardingComplete = step,
+               chatModel.currentUser != nil {
+                mainView()
+            } else {
+                OnboardingView(onboarding: step)
+            }
+        }
+    }
+
+    @ViewBuilder private func callView(_ call: Call) -> some View {
+        if CallController.useCallKit() {
+            ActiveCallView(call: call, canConnectCall: Binding.constant(true))
+                .onDisappear {
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
+                }
+        } else {
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
+            if prefPerformLA && userAuthorized != true {
+                Rectangle()
+                    .fill(colorScheme == .dark ? .black : .white)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                lockButton()
+            }
+        }
+    }
+
+    private func lockButton() -> some View {
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
+    }
+
+    private func initializationView() -> some View {
+        VStack {
+            ProgressView().scaleEffect(2)
+            Text("Opening database…")
+                .padding()
+        }
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
-            ChatListView()
+            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
-                NtfManager.shared.requestAuthorization(onDeny: {
-                    alertManager.showAlert(notificationAlert())
-                })
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
-                if (!prefLANoticeShown && prefShowLANotice) {
+                if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
                     alertManager.showAlert(laNoticeAlert())
+                } else if !chatModel.showCallView && CallController.shared.activeCallInvitation == nil {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                        if !showWhatsNew {
+                            showWhatsNew = shouldShowWhatsNew()
+                        }
+                    }
                 }
                 prefShowLANotice = true
             }
-            if chatModel.showCallView, let call = chatModel.activeCall {
-                ActiveCallView(call: call)
+            .sheet(isPresented: $showWhatsNew) {
+                WhatsNewView()
             }
             IncomingCallView()
         }
+        .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
+        .onContinueUserActivity("INStartAudioCallIntent", perform: processUserActivity)
+        .onContinueUserActivity("INStartVideoCallIntent", perform: processUserActivity)
+    }
+
+    private func processUserActivity(_ activity: NSUserActivity) {
+        let intent = activity.interaction?.intent
+        if let intent = intent as? INStartCallIntent {
+            callToRecentContact(intent.contacts, intent.callCapability == .videoCall ? .video : .audio)
+        } else if let intent = intent as? INStartAudioCallIntent {
+            callToRecentContact(intent.contacts, .audio)
+        } else if let intent = intent as? INStartVideoCallIntent {
+            callToRecentContact(intent.contacts, .video)
+        }
+    }
+
+    private func callToRecentContact(_ contacts: [INPerson]?, _ mediaType: CallMediaType) {
+        logger.debug("callToRecentContact")
+        if let contactId = contacts?.first?.personHandle?.value,
+           let chat = chatModel.getChat(contactId),
+           case let .direct(contact) = chat.chatInfo {
+            logger.debug("callToRecentContact: schedule call")
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                CallController.shared.startCall(contact, mediaType)
+            }
+        }
+    }
+
+    private func initAuthenticate() {
+        logger.debug("initAuthenticate")
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
+        }
     }
 
     private func runAuthenticate() {
@@ -68,6 +180,7 @@ struct ContentView: View {
             userAuthorized = true
         } else {
             dismissAllSheets(animated: false) {
+                chatModel.chatId = nil
                 justAuthenticate()
             }
         }
@@ -75,54 +188,76 @@ struct ContentView: View {
 
     private func justAuthenticate() {
         userAuthorized = false
-        authenticate(reason: NSLocalizedString("Unlock", comment: "authentication reason")) { laResult in
+        let laMode = privacyLocalAuthModeDefault.get()
+        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+            logger.debug("authenticate callback: \(String(describing: laResult))")
             switch (laResult) {
             case .success:
                 userAuthorized = true
+                canConnectCall = true
+                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
             case .failed:
-                break
+                if laMode == .passcode {
+                    AlertManager.shared.showAlert(laFailedAlert())
+                }
             case .unavailable:
                 userAuthorized = true
                 prefPerformLA = false
+                canConnectCall = true
                 AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
 
+    func requestNtfAuthorization() {
+        NtfManager.shared.requestAuthorization(
+            onDeny: {
+                if (!notificationAlertShown) {
+                    notificationAlertShown = true
+                    alertManager.showAlert(notificationAlert())
+                }
+            },
+            onAuthorized: { notificationAlertShown = false }
+        )
+    }
+
     func laNoticeAlert() -> Alert {
         Alert(
             title: Text("SimpleX Lock"),
             message: Text("To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled."),
-            primaryButton: .default(Text("Turn on")) {
-                authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
-                    switch laResult {
-                    case .success:
-                        prefPerformLA = true
-                        alertManager.showAlert(laTurnedOnAlert())
-                    case .failed:
-                        prefPerformLA = false
-                        alertManager.showAlert(laFailedAlert())
-                    case .unavailable:
-                        prefPerformLA = false
-                        alertManager.showAlert(laUnavailableInstructionAlert())
-                    }
-                }
-            },
+            primaryButton: .default(Text("Turn on")) { showChooseLAMode = true },
             secondaryButton: .cancel()
          )
     }
 
+    private func initialEnableLA () {
+        privacyLocalAuthModeDefault.set(.system)
+        authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
+            switch laResult {
+            case .success:
+                prefPerformLA = true
+                alertManager.showAlert(laTurnedOnAlert())
+            case .failed:
+                prefPerformLA = false
+                alertManager.showAlert(laFailedAlert())
+            case .unavailable:
+                prefPerformLA = false
+                alertManager.showAlert(laUnavailableInstructionAlert())
+            }
+        }
+    }
+
     func notificationAlert() -> Alert {
         Alert(
             title: Text("Notifications are disabled!"),
-             message: Text("The app can notify you when you receive messages or contact requests - please open settings to enable."),
-             primaryButton: .default(Text("Open Settings")) {
-                 DispatchQueue.main.async {
-                     UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
-                 }
-             },
-             secondaryButton: .cancel()
-         )
+            message: Text("The app can notify you when you receive messages or contact requests - please open settings to enable."),
+            primaryButton: .default(Text("Open Settings")) {
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
+                }
+            },
+            secondaryButton: .cancel()
+        )
     }
 }
 

apps/ios/Shared/DebugJSON.playground/Contents.swift

@@ -1,20 +1,11 @@
-import UIKit
+//import UIKit
+import SimpleXChat
 
-let s = """
-          {
-            "contactConnection" : {
-              "contactConnection" : {
-                "viaContactUri" : false,
-                "pccConnId" : 456,
-                "pccAgentConnId" : "cTdjbmR4ZzVzSmhEZHdzMQ==",
-                "pccConnStatus" : "new",
-                "updatedAt" : "2022-04-24T11:59:23.703162Z",
-                "createdAt" : "2022-04-24T11:59:23.703162Z"
-              }
-            }
-          }
+let s =
+"""
+{}
 """
 //let s = "\"2022-04-24T11:59:23.703162Z\""
 let json = getJSONDecoder()
 let d = s.data(using: .utf8)!
-print (try! json.decode(ChatInfo.self, from: d))
+print (try! json.decode(APIResponse.self, from: d))

apps/ios/Shared/MediaEncryption.playground/Contents.swift

@@ -0,0 +1,78 @@
+import UIKit
+import SimpleXChat
+
+hs_init(0, nil)
+
+let totalBytes = 20
+let ivTagBytes = 28
+var base: UnsafeMutableRawPointer = malloc(totalBytes)
+
+let assume = base.assumingMemoryBound(to: UInt8.self)
+assume[0] = 0 // key frame
+for i in 1..<totalBytes {
+    assume[i] = UInt8(i)
+}
+let unencrypted = NSData(bytesNoCopy: base, length: totalBytes)
+let aesKey = "PI-bV-FTgRqZM_lsDH9T21a0yRVMsvLFmvilJ9Ssk3g="
+
+if var key: [CChar] = aesKey.cString(using: .utf8),
+   let pointer: UnsafeMutableRawPointer = malloc(unencrypted.count + ivTagBytes) {
+    debugPrint("AesKey \(aesKey), cString \(key)")
+    memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
+    let source_ = Data(bytes: pointer, count: unencrypted.count)
+    //let raw: UInt8 = (unencrypted[0] as UInt8) | ((unencrypted[1] as UInt8) << 8) | ((unencrypted[2] as UInt8) << 16)
+    let isKeyFrame = unencrypted[0] & 1 == 0
+    debugPrint("Is key frame \(isKeyFrame)")
+    let clearTextBytesSize = isKeyFrame ? 10 : 3
+    for i in 0..<48 {
+        debugPrint("Before \(i)  \(unencrypted[i])")
+    }
+    if let res = chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + ivTagBytes - clearTextBytesSize)) {
+        printError("encrypt", res)
+    }
+    for i in 0..<48 {
+        debugPrint("After \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+    }
+    let res_ = Data(bytes: pointer, count: unencrypted.count + ivTagBytes)
+    print(source_ == res_)
+
+
+
+//    let encryptedBytes = [1,   1,   2,   3,   4,   5,   6,   7,   8,   9,
+//                     250, 245, 192, 217, 164, 251,  23,  40,  36, 214,
+//                      84,  55, 114, 237, 153, 113, 182, 123, 214, 189,
+//                      35, 196, 148, 164, 235, 195, 122, 157, 141, 235,
+//                       5,  92,  44,  35,  37, 244,  90, 254]
+//    var base1: UnsafeMutableRawPointer = malloc(totalBytes + ivTagBytes)
+//
+//    let assume1 = base1.assumingMemoryBound(to: UInt8.self)
+//    for i in 0..<(totalBytes + ivTagBytes) {
+//        assume1[i] = UInt8(encryptedBytes[i])
+//    }
+//    let encrypted = NSData(bytesNoCopy: base1, length: totalBytes + ivTagBytes)
+//    memcpy(pointer, (encrypted as NSData).bytes, encrypted.count)
+//    for i in 0..<48 {
+//        debugPrint("Before decrypt \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+//    }
+
+
+    if let res = chat_decrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + ivTagBytes - clearTextBytesSize)) {
+        printError("decrypt", res)
+    }
+
+
+    let decrypted_ = Data(bytes: pointer, count: unencrypted.count)
+    for i in 0..<48 {
+        debugPrint("After decrypt \(i)  \(pointer.assumingMemoryBound(to: UInt8.self)[i])")
+    }
+    print(source_ == decrypted_)
+}
+
+func printError(_ op: String, _ res: UnsafeMutablePointer<CChar>) {
+    let err = fromCString(res)
+    if err == "" {
+        print("\(op) ok")
+    } else {
+        print("\(op) error: \(err)")
+    }
+}

apps/ios/Shared/MediaEncryption.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' buildActiveScheme='true' importAppTypes='true'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

apps/ios/Shared/MediaEncryption.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Encryption.playground">
+   </FileRef>
+</Workspace>

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -0,0 +1,158 @@
+//
+//  AudioRecPlay.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 19/11/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import AVFoundation
+import SwiftUI
+import SimpleXChat
+
+class AudioRecorder {
+    var onTimer: ((TimeInterval) -> Void)?
+    var onFinishRecording: (() -> Void)?
+
+    var audioRecorder: AVAudioRecorder?
+    var recordingTimer: Timer?
+
+    init(onTimer: @escaping ((TimeInterval) -> Void), onFinishRecording: @escaping (() -> Void)) {
+        self.onTimer = onTimer
+        self.onFinishRecording = onFinishRecording
+    }
+
+    enum StartError {
+        case permission
+        case error(String)
+    }
+
+    func start(fileName: String) async -> StartError? {
+        let av = AVAudioSession.sharedInstance()
+        if !(await checkPermission()) { return .permission }
+        do {
+            try av.setCategory(AVAudioSession.Category.playAndRecord, options: .defaultToSpeaker)
+            try av.setActive(true)
+            let settings: [String : Any] = [
+                AVFormatIDKey: kAudioFormatMPEG4AAC,
+                AVSampleRateKey: 16000,
+                AVEncoderBitRateKey: 32000,
+                AVEncoderBitRateStrategyKey: AVAudioBitRateStrategy_VariableConstrained,
+                AVNumberOfChannelsKey: 1
+            ]
+            let url = getAppFilePath(fileName)
+            audioRecorder = try AVAudioRecorder(url: url, settings: settings)
+            audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
+
+            await MainActor.run {
+                recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
+                    guard let time = self.audioRecorder?.currentTime else { return }
+                    self.onTimer?(time)
+                    if time >= MAX_VOICE_MESSAGE_LENGTH {
+                        self.stop()
+                        self.onFinishRecording?()
+                    }
+                }
+            }
+            return nil
+        } catch let error {
+            logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
+            return .error(error.localizedDescription)
+        }
+    }
+
+    func stop() {
+        if let recorder = audioRecorder {
+            recorder.stop()
+        }
+        audioRecorder = nil
+        if let timer = recordingTimer {
+            timer.invalidate()
+        }
+        recordingTimer = nil
+    }
+
+    private func checkPermission() async -> Bool {
+        let av = AVAudioSession.sharedInstance()
+        switch av.recordPermission {
+        case .granted: return true
+        case .denied: return false
+        case .undetermined:
+            return await withCheckedContinuation { cont in
+                DispatchQueue.main.async {
+                    av.requestRecordPermission { allowed in
+                        cont.resume(returning: allowed)
+                    }
+                }
+            }
+        @unknown default: return false
+        }
+    }
+}
+
+class AudioPlayer: NSObject, AVAudioPlayerDelegate {
+    var onTimer: ((TimeInterval) -> Void)?
+    var onFinishPlayback: (() -> Void)?
+
+    var audioPlayer: AVAudioPlayer?
+    var playbackTimer: Timer?
+
+    init(onTimer: @escaping ((TimeInterval) -> Void), onFinishPlayback: @escaping (() -> Void)) {
+        self.onTimer = onTimer
+        self.onFinishPlayback = onFinishPlayback
+    }
+
+    func start(fileName: String, at: TimeInterval?) {
+        let url = getAppFilePath(fileName)
+        audioPlayer = try? AVAudioPlayer(contentsOf: url)
+        audioPlayer?.delegate = self
+        audioPlayer?.prepareToPlay()
+        if let at = at {
+            audioPlayer?.currentTime = at
+        }
+        audioPlayer?.play()
+
+        playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
+            if self.audioPlayer?.isPlaying ?? false {
+                guard let time = self.audioPlayer?.currentTime else { return }
+                self.onTimer?(time)
+            }
+        }
+    }
+
+    func pause() {
+        audioPlayer?.pause()
+    }
+
+    func play() {
+        audioPlayer?.play()
+    }
+
+    func seek(_ to: TimeInterval) {
+        if audioPlayer?.isPlaying == true {
+            audioPlayer?.pause()
+            audioPlayer?.currentTime = to
+            audioPlayer?.play()
+        } else {
+            audioPlayer?.currentTime = to
+        }
+        self.onTimer?(to)
+    }
+
+    func stop() {
+        if let player = audioPlayer {
+            player.stop()
+        }
+        audioPlayer = nil
+        if let timer = playbackTimer {
+            timer.invalidate()
+        }
+        playbackTimer = nil
+    }
+
+    func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
+        stop()
+        self.onFinishPlayback?()
+    }
+}

apps/ios/Shared/Model/ChatModel.swift

@@ -9,20 +9,23 @@
 import Foundation
 import Combine
 import SwiftUI
-import WebKit
 import SimpleXChat
 
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
     @Published var currentUser: User?
+    @Published var users: [UserInfo] = []
     @Published var chatInitialized = false
     @Published var chatRunning: Bool?
     @Published var chatDbChanged = false
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
+    @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
     @Published var chats: [Chat] = []
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
@@ -30,8 +33,7 @@ final class ChatModel: ObservableObject {
     @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
     @Published var terminalItems: [TerminalItem] = []
-    @Published var userAddress: String?
-    @Published var userSMPServers: [String]?
+    @Published var userAddress: UserContactLink?
     @Published var chatItemTTL: ChatItemTTL = .none
     @Published var appOpenUrl: URL?
     @Published var deviceToken: DeviceToken?
@@ -51,14 +53,44 @@ final class ChatModel: ObservableObject {
     @Published var showCallView = false
     // currently showing QR code
     @Published var connReqInv: String?
-    var callWebView: WKWebView?
+    // audio recording and playback
+    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
+    @Published var draft: ComposeState?
+    @Published var draftChatId: String?
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
+    var filesToDelete: Set<URL> = []
+
     static let shared = ChatModel()
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
+    func getUser(_ userId: Int64) -> User? {
+        currentUser?.userId == userId
+        ? currentUser
+        : users.first { $0.user.userId == userId }?.user
+    }
+
+    func getUserIndex(_ user: User) -> Int? {
+        users.firstIndex { $0.user.userId == user.userId }
+    }
+
+    func updateUser(_ user: User) {
+        if let i = getUserIndex(user) {
+            users[i].user = user
+        }
+        if currentUser?.userId == user.userId {
+            currentUser = user
+        }
+    }
+
+    func removeUser(_ user: User) {
+        if let i = getUserIndex(user), users[i].user.userId != currentUser?.userId {
+            users.remove(at: i)
+        }
+    }
+
     func hasChat(_ id: String) -> Bool {
         chats.first(where: { $0.id == id }) != nil
     }
@@ -98,7 +130,7 @@ final class ChatModel: ObservableObject {
     }
 
     func updateContact(_ contact: Contact) {
-        updateChat(.direct(contact: contact), addMissing: !contact.isIndirectContact)
+        updateChat(.direct(contact: contact), addMissing: contact.directOrUsed)
     }
 
     func updateGroup(_ groupInfo: GroupInfo) {
@@ -113,17 +145,20 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateNetworkStatus(_ id: ChatId, _ status: Chat.NetworkStatus) {
+    private func _updateChat(_ id: ChatId, _ update: @escaping (Chat) -> Void) {
         if let i = getChatIndex(id) {
-            chats[i].serverInfo.networkStatus = status
+            // we need to separately update the chat object, as it is ObservedObject,
+            // and chat in the list so the list view is updated...
+            // simply updating chats[i] replaces the object without updating the current object in the list
+            let chat = chats[i]
+            update(chat)
+            chats[i] = chat
         }
     }
 
     func replaceChat(_ id: String, _ chat: Chat) {
         if let i = getChatIndex(id) {
-            let serverInfo = chats[i].serverInfo
             chats[i] = chat
-            chats[i].serverInfo = serverInfo
         } else {
             // invalid state, correcting
             chats.insert(chat, at: 0)
@@ -149,7 +184,7 @@ final class ChatModel: ObservableObject {
                 addChat(Chat(c), at: i)
             }
         }
-        NtfManager.shared.setNtfBadgeCount(totalUnreadCount())
+        NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
     }
 
 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -162,7 +197,7 @@ final class ChatModel: ObservableObject {
             chats[i].chatItems = [cItem]
             if case .rcvNew = cItem.meta.itemStatus {
                 chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
-                NtfManager.shared.incNtfBadgeCount()
+                increaseUnreadCounter(user: currentUser!)
             }
             if i > 0 {
                 if chatId == nil {
@@ -203,35 +238,62 @@ final class ChatModel: ObservableObject {
     }
 
     private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-        if let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
-            let ci = reversedChatItems[i]
-            withAnimation(.default) {
-                self.reversedChatItems[i] = cItem
-                self.reversedChatItems[i].viewTimestamp = .now
-                if case .sndNew = cItem.meta.itemStatus {
-                    self.reversedChatItems[i].meta = ci.meta
-                }
+        if let i = getChatItemIndex(cItem) {
+            withAnimation {
+                _updateChatItem(at: i, with: cItem)
             }
             return false
         } else {
-            withAnimation { reversedChatItems.insert(cItem, at: 0) }
+            withAnimation(itemAnimation()) {
+                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
+            }
             return true
         }
+
+        func itemAnimation() -> Animation? {
+            switch cItem.chatDir {
+            case .directSnd, .groupSnd: return cItem.meta.isLive ? nil : .default
+            default: return .default
+            }
+        }
     }
-    
+
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+            withAnimation {
+                _updateChatItem(at: i, with: cItem)
+            }
+        }
+    }
+
+    private func _updateChatItem(at i: Int, with cItem: ChatItem) {
+        let ci = reversedChatItems[i]
+        reversedChatItems[i] = cItem
+        reversedChatItems[i].viewTimestamp = .now
+        // on some occasions the confirmation of message being accepted by the server (tick)
+        // arrives earlier than the response from API, and item remains without tick
+        if case .sndNew = cItem.meta.itemStatus {
+            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
+        }
+    }
+
+    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+        reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+    }
+
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        if cItem.isRcvNew {
+            decreaseUnreadCounter(cInfo)
+        }
         // update previews
         if let chat = getChat(cInfo.id) {
             if let pItem = chat.chatItems.last, pItem.id == cItem.id {
-                chat.chatItems = [cItem]
+                chat.chatItems = [ChatItem.deletedItemDummy()]
             }
         }
         // remove from current chat
         if chatId == cInfo.id {
-            if let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
-                if reversedChatItems[i].isRcvNew() == true {
-                    NtfManager.shared.decNtfBadgeCount()
-                }
+            if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
                     self.reversedChatItems.remove(at: i)
                 }
@@ -255,10 +317,44 @@ final class ChatModel: ObservableObject {
         return nil
     }
 
+    func updateCurrentUser(_ newProfile: Profile, _ preferences: FullPreferences? = nil) {
+        if let current = currentUser {
+            currentUser?.profile = toLocalProfile(current.profile.profileId, newProfile, "")
+            if let preferences = preferences {
+                currentUser?.fullPreferences = preferences
+            }
+            if let current = currentUser, let i = users.firstIndex(where: { $0.user.userId == current.userId }) {
+                users[i].user = current
+            }
+        }
+    }
+
+    func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
+        let cItem = ChatItem.liveDummy(chatInfo.chatType)
+        withAnimation {
+            reversedChatItems.insert(cItem, at: 0)
+        }
+        return cItem
+    }
+
+    func removeLiveDummy(animated: Bool = true) {
+        if hasLiveDummy {
+            if animated {
+                withAnimation { _ = reversedChatItems.removeFirst() }
+            } else {
+                _ = reversedChatItems.removeFirst()
+            }
+        }
+    }
+
+    private var hasLiveDummy: Bool {
+        reversedChatItems.first?.isLiveDummy == true
+    }
+
     func markChatItemsRead(_ cInfo: ChatInfo) {
         // update preview
-        if let chat = getChat(cInfo.id) {
-            NtfManager.shared.decNtfBadgeCount(by: chat.chatStats.unreadCount)
+        _updateChat(cInfo.id) { chat in
+            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
             chat.chatStats = ChatStats()
         }
         // update current chat
@@ -270,23 +366,20 @@ final class ChatModel: ObservableObject {
     private func markCurrentChatRead(fromIndex i: Int = 0) {
         var j = i
         while j < reversedChatItems.count {
-            if case .rcvNew = reversedChatItems[j].meta.itemStatus {
-                reversedChatItems[j].meta.itemStatus = .rcvRead
-                reversedChatItems[j].viewTimestamp = .now
-            }
+            markChatItemRead_(j)
             j += 1
         }
     }
 
     func markChatItemsRead(_ cInfo: ChatInfo, aboveItem: ChatItem? = nil) {
         if let cItem = aboveItem {
-            if chatId == cInfo.id, let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
+            if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
                 markCurrentChatRead(fromIndex: i)
-                if let chat = getChat(cInfo.id) {
+                _updateChat(cInfo.id) { chat in
                     var unreadBelow = 0
                     var j = i - 1
                     while j >= 0 {
-                        if case .rcvNew = reversedChatItems[j].meta.itemStatus {
+                        if case .rcvNew = self.reversedChatItems[j].meta.itemStatus {
                             unreadBelow += 1
                         }
                         j -= 1
@@ -294,8 +387,8 @@ final class ChatModel: ObservableObject {
                     // update preview
                     let markedCount = chat.chatStats.unreadCount - unreadBelow
                     if markedCount > 0 {
-                        NtfManager.shared.decNtfBadgeCount(by: markedCount)
                         chat.chatStats.unreadCount -= markedCount
+                        self.decreaseUnreadCounter(user: self.currentUser!, by: markedCount)
                     }
                 }
             }
@@ -304,10 +397,16 @@ final class ChatModel: ObservableObject {
         }
     }
 
+    func markChatUnread(_ cInfo: ChatInfo, unreadChat: Bool = true) {
+        _updateChat(cInfo.id) { chat in
+            chat.chatStats.unreadChat = unreadChat
+        }
+    }
+
     func clearChat(_ cInfo: ChatInfo) {
         // clear preview
         if let chat = getChat(cInfo.id) {
-            NtfManager.shared.decNtfBadgeCount(by: chat.chatStats.unreadCount)
+            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
             chat.chatItems = []
             chat.chatStats = ChatStats()
             chat.chatInfo = cInfo
@@ -320,22 +419,54 @@ final class ChatModel: ObservableObject {
 
     func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         // update preview
-        if let i = getChatIndex(cInfo.id) {
-            chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount - 1
-        }
+        decreaseUnreadCounter(cInfo)
         // update current chat
-        if chatId == cInfo.id, let j = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
-            reversedChatItems[j].meta.itemStatus = .rcvRead
-            reversedChatItems[j].viewTimestamp = .now
+        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+            markChatItemRead_(i)
         }
     }
 
-    func totalUnreadCount() -> Int {
-        chats.reduce(0, { count, chat in count + chat.chatStats.unreadCount })
+    private func markChatItemRead_(_ i: Int) {
+        let meta = reversedChatItems[i].meta
+        if case .rcvNew = meta.itemStatus {
+            reversedChatItems[i].meta.itemStatus = .rcvRead
+            reversedChatItems[i].viewTimestamp = .now
+            if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
+                reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+            }
+        }
+    }
+
+    func decreaseUnreadCounter(_ cInfo: ChatInfo) {
+        if let i = getChatIndex(cInfo.id) {
+            chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount - 1
+            decreaseUnreadCounter(user: currentUser!)
+        }
+    }
+
+    func increaseUnreadCounter(user: User) {
+        changeUnreadCounter(user: user, by: 1)
+        NtfManager.shared.incNtfBadgeCount()
+    }
+
+    func decreaseUnreadCounter(user: User, by: Int = 1) {
+        changeUnreadCounter(user: user, by: -by)
+        NtfManager.shared.decNtfBadgeCount(by: by)
+    }
+
+    private func changeUnreadCounter(user: User, by: Int) {
+        if let i = users.firstIndex(where: { $0.user.id == user.id }) {
+            users[i].unreadCount += by
+        }
+    }
+
+    func totalUnreadCountForAllUsers() -> Int {
+        chats.filter { $0.chatInfo.ntfsEnabled }.reduce(0, { count, chat in count + chat.chatStats.unreadCount }) +
+            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
     }
 
     func getPrevChatItem(_ ci: ChatItem) -> ChatItem? {
-        if let i = reversedChatItems.firstIndex(where: { $0.id == ci.id }), i < reversedChatItems.count - 1  {
+        if let i = getChatItemIndex(ci), i < reversedChatItems.count - 1  {
             return reversedChatItems[i + 1]
         } else {
             return nil
@@ -369,6 +500,11 @@ final class ChatModel: ObservableObject {
     }
 
     func upsertGroupMember(_ groupInfo: GroupInfo, _ member: GroupMember) -> Bool {
+        // user member was updated
+        if groupInfo.membership.groupMemberId == member.groupMemberId {
+            updateGroup(groupInfo)
+            return false
+        }
         // update current chat
         if chatId == groupInfo.id {
             if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
@@ -391,7 +527,7 @@ final class ChatModel: ObservableObject {
         var unreadBelow = 0
         while i < reversedChatItems.count - 1 && !itemsInView.contains(reversedChatItems[i].viewId) {
             totalBelow += 1
-            if reversedChatItems[i].isRcvNew() {
+            if reversedChatItems[i].isRcvNew {
                 unreadBelow += 1
             }
             i += 1
@@ -407,6 +543,21 @@ final class ChatModel: ObservableObject {
         while i < maxIx && inView(i) { i += 1 }
         return reversedChatItems[min(i - 1, maxIx)]
     }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        networkStatuses[contact.activeConn.agentConnId] = status
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
+    }
+
+    func addTerminalItem(_ item: TerminalItem) {
+        if terminalItems.count >= 500 {
+            terminalItems.remove(at: 0)
+        }
+        terminalItems.append(item)
+    }
 }
 
 struct UnreadChatItemCounts {
@@ -418,65 +569,88 @@ final class Chat: ObservableObject, Identifiable {
     @Published var chatInfo: ChatInfo
     @Published var chatItems: [ChatItem]
     @Published var chatStats: ChatStats
-    @Published var serverInfo = ServerInfo(networkStatus: .unknown)
     var created = Date.now
 
-    struct ServerInfo: Decodable {
-        var networkStatus: NetworkStatus
-    }
-
-    enum NetworkStatus: Decodable, Equatable {
-        case unknown
-        case connected
-        case disconnected
-        case error(String)
-
-        var statusString: LocalizedStringKey {
-            get {
-                switch self {
-                case .connected: return "connected"
-                case .error: return "error"
-                default: return "connecting"
-                }
-            }
-        }
-
-        var statusExplanation: LocalizedStringKey {
-            get {
-                switch self {
-                case .connected: return "You are connected to the server used to receive messages from this contact."
-                case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-                default: return "Trying to connect to the server used to receive messages from this contact."
-                }
-            }
-        }
-
-        var imageName: String {
-            get {
-                switch self {
-                case .unknown: return "circle.dotted"
-                case .connected: return "circle.fill"
-                case .disconnected: return "ellipsis.circle.fill"
-                case .error: return "exclamationmark.circle.fill"
-                }
-            }
-        }
-    }
-
     init(_ cData: ChatData) {
         self.chatInfo = cData.chatInfo
         self.chatItems = cData.chatItems
         self.chatStats = cData.chatStats
     }
 
-    init(chatInfo: ChatInfo, chatItems: [ChatItem] = [], chatStats: ChatStats = ChatStats(), serverInfo: ServerInfo = ServerInfo(networkStatus: .unknown)) {
+    init(chatInfo: ChatInfo, chatItems: [ChatItem] = [], chatStats: ChatStats = ChatStats()) {
         self.chatInfo = chatInfo
         self.chatItems = chatItems
         self.chatStats = chatStats
-        self.serverInfo = serverInfo
+    }
+
+    func copy(chatInfo: ChatInfo? = nil, chatItems: [ChatItem]? = nil, chatStats: ChatStats? = nil) -> Chat {
+        Chat(
+            chatInfo: chatInfo ?? self.chatInfo,
+            chatItems: chatItems ?? self.chatItems,
+            chatStats: chatStats ?? self.chatStats
+        )
+    }
+
+    var userCanSend: Bool {
+        switch chatInfo {
+        case .direct: return true
+        case let .group(groupInfo):
+            let m = groupInfo.membership
+            return m.memberActive && m.memberRole >= .member
+        default: return false
+        }
+    }
+
+    var userIsObserver: Bool {
+        switch chatInfo {
+        case let .group(groupInfo):
+            let m = groupInfo.membership
+            return m.memberActive && m.memberRole == .observer
+        default: return false
+        }
     }
 
     var id: ChatId { get { chatInfo.id } }
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }
+
+    public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
+}
+
+enum NetworkStatus: Decodable, Equatable {
+    case unknown
+    case connected
+    case disconnected
+    case error(String)
+
+    var statusString: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "connected"
+            case .error: return "error"
+            default: return "connecting"
+            }
+        }
+    }
+
+    var statusExplanation: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "You are connected to the server used to receive messages from this contact."
+            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+            default: return "Trying to connect to the server used to receive messages from this contact."
+            }
+        }
+    }
+
+    var imageName: String {
+        get {
+            switch self {
+            case .unknown: return "circle.dotted"
+            case .connected: return "circle.fill"
+            case .disconnected: return "ellipsis.circle.fill"
+            case .error: return "exclamationmark.circle.fill"
+            }
+        }
+    }
 }

apps/ios/Shared/Model/ImageUtils.swift

@@ -0,0 +1,291 @@
+//
+//  ImageUtils.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 24/12/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SimpleXChat
+import SwiftUI
+import AVKit
+
+func getLoadedFilePath(_ file: CIFile?) -> String? {
+    if let fileName = getLoadedFileName(file) {
+        return getAppFilePath(fileName).path
+    }
+    return nil
+}
+
+func getLoadedFileName(_ file: CIFile?) -> String? {
+    if let file = file,
+       file.loaded,
+       let fileName = file.filePath {
+        return fileName
+    }
+    return nil
+}
+
+func getLoadedImage(_ file: CIFile?) -> UIImage? {
+    let loadedFilePath = getLoadedFilePath(file)
+    if let loadedFilePath = loadedFilePath, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
+        do {
+            let data = try Data(contentsOf: filePath)
+            let img = UIImage(data: data)
+            try img?.setGifFromData(data, levelOfIntegrity: 1.0)
+            return img
+        } catch {
+            return UIImage(contentsOfFile: loadedFilePath)
+        }
+    }
+    return nil
+}
+
+func getLoadedVideo(_ file: CIFile?) -> URL? {
+    let loadedFilePath = getLoadedFilePath(file)
+    if loadedFilePath != nil, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
+        if FileManager.default.fileExists(atPath: filePath.path) {
+            return filePath
+        }
+    }
+    return nil
+}
+
+func saveAnimImage(_ image: UIImage) -> String? {
+    let fileName = generateNewFileName("IMG", "gif")
+    guard let imageData = image.imageData else { return nil }
+    return saveFile(imageData, fileName)
+}
+
+func saveImage(_ uiImage: UIImage) -> String? {
+    let hasAlpha = imageHasAlpha(uiImage)
+    let ext = hasAlpha ? "png" : "jpg"
+    if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
+        let fileName = generateNewFileName("IMG", ext)
+        return saveFile(imageDataResized, fileName)
+    }
+    return nil
+}
+
+func cropToSquare(_ image: UIImage) -> UIImage {
+    let size = image.size
+    let side = min(size.width, size.height)
+    let newSize = CGSize(width: side, height: side)
+    var origin = CGPoint.zero
+    if size.width > side {
+        origin.x -= (size.width - side) / 2
+    } else if size.height > side {
+        origin.y -= (size.height - side) / 2
+    }
+    return resizeImage(image, newBounds: CGRect(origin: .zero, size: newSize), drawIn: CGRect(origin: origin, size: size), hasAlpha: imageHasAlpha(image))
+}
+
+func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha: Bool) -> Data? {
+    var img = image
+    var data = hasAlpha ? img.pngData() : img.jpegData(compressionQuality: 0.85)
+    var dataSize = data?.count ?? 0
+    while dataSize != 0 && dataSize > maxDataSize {
+        let ratio = sqrt(Double(dataSize) / Double(maxDataSize))
+        let clippedRatio = min(ratio, 2.0)
+        img = reduceSize(img, ratio: clippedRatio, hasAlpha: hasAlpha)
+        data = hasAlpha ? img.pngData() : img.jpegData(compressionQuality: 0.85)
+        dataSize = data?.count ?? 0
+    }
+    logger.debug("resizeImageToDataSize final \(dataSize)")
+    return data
+}
+
+func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) -> String? {
+    var img = image
+    let hasAlpha = imageHasAlpha(image)
+    var str = compressImageStr(img, hasAlpha: hasAlpha)
+    var dataSize = str?.count ?? 0
+    while dataSize != 0 && dataSize > maxDataSize {
+        let ratio = sqrt(Double(dataSize) / Double(maxDataSize))
+        let clippedRatio = min(ratio, 2.0)
+        img = reduceSize(img, ratio: clippedRatio, hasAlpha: hasAlpha)
+        str = compressImageStr(img, hasAlpha: hasAlpha)
+        dataSize = str?.count ?? 0
+    }
+    logger.debug("resizeImageToStrSize final \(dataSize)")
+    return str
+}
+
+func compressImageStr(_ image: UIImage, _ compressionQuality: CGFloat = 0.85, hasAlpha: Bool) -> String? {
+    let ext = hasAlpha ? "png" : "jpg"
+    if let data = hasAlpha ? image.pngData() : image.jpegData(compressionQuality: compressionQuality) {
+        return "data:image/\(ext);base64,\(data.base64EncodedString())"
+    }
+    return nil
+}
+
+private func reduceSize(_ image: UIImage, ratio: CGFloat, hasAlpha: Bool) -> UIImage {
+    let newSize = CGSize(width: floor(image.size.width / ratio), height: floor(image.size.height / ratio))
+    let bounds = CGRect(origin: .zero, size: newSize)
+    return resizeImage(image, newBounds: bounds, drawIn: bounds, hasAlpha: hasAlpha)
+}
+
+private func resizeImage(_ image: UIImage, newBounds: CGRect, drawIn: CGRect, hasAlpha: Bool) -> UIImage {
+    let format = UIGraphicsImageRendererFormat()
+    format.scale = 1.0
+    format.opaque = !hasAlpha
+    return UIGraphicsImageRenderer(bounds: newBounds, format: format).image { _ in
+        image.draw(in: drawIn)
+    }
+}
+
+func imageHasAlpha(_ img: UIImage) -> Bool {
+    if let cgImage = img.cgImage {
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+        let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
+        if let context = CGContext(data: nil, width: cgImage.width, height: cgImage.height, bitsPerComponent: 8, bytesPerRow: cgImage.width * 4, space: colorSpace, bitmapInfo: bitmapInfo.rawValue) {
+            context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
+            if let data = context.data {
+                let data = data.assumingMemoryBound(to: UInt8.self)
+                let size = cgImage.width * cgImage.height * 4
+                var i = 0
+                while i < size {
+                    if data[i] < 255 { return true }
+                    i += 4
+                }
+            }
+        }
+    }
+    return false
+}
+
+func saveFileFromURL(_ url: URL) -> String? {
+    let savedFile: String?
+    if url.startAccessingSecurityScopedResource() {
+        do {
+            let fileData = try Data(contentsOf: url)
+            let fileName = uniqueCombine(url.lastPathComponent)
+            savedFile = saveFile(fileData, fileName)
+        } catch {
+            logger.error("FileUtils.saveFileFromURL error: \(error.localizedDescription)")
+            savedFile = nil
+        }
+    } else {
+        logger.error("FileUtils.saveFileFromURL startAccessingSecurityScopedResource returned false")
+        savedFile = nil
+    }
+    url.stopAccessingSecurityScopedResource()
+    return savedFile
+}
+
+func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
+    let savedFile: String?
+    do {
+        let fileName = uniqueCombine(url.lastPathComponent)
+        try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
+        ChatModel.shared.filesToDelete.remove(url)
+        savedFile = fileName
+    } catch {
+        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
+        savedFile = nil
+    }
+    return savedFile
+}
+
+func generateNewFileName(_ prefix: String, _ ext: String) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
+}
+
+private func uniqueCombine(_ fileName: String) -> String {
+    func tryCombine(_ fileName: String, _ n: Int) -> String {
+        let ns = fileName as NSString
+        let name = ns.deletingPathExtension
+        let ext = ns.pathExtension
+        let suffix = (n == 0) ? "" : "_\(n)"
+        let f = "\(name)\(suffix).\(ext)"
+        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+    }
+    return tryCombine(fileName, 0)
+}
+
+private var tsFormatter: DateFormatter?
+
+private func getTimestamp() -> String {
+    var df: DateFormatter
+    if let tsFormatter = tsFormatter {
+        df = tsFormatter
+    } else {
+        df = DateFormatter()
+        df.dateFormat = "yyyyMMdd_HHmmss"
+        df.locale = Locale(identifier: "US")
+        df.timeZone = TimeZone(secondsFromGMT: 0)
+        tsFormatter = df
+    }
+    return df.string(from: Date())
+}
+
+func dropImagePrefix(_ s: String) -> String {
+    dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
+}
+
+private func dropPrefix(_ s: String, _ prefix: String) -> String {
+    s.hasPrefix(prefix) ? String(s.dropFirst(prefix.count)) : s
+}
+
+extension AVAsset {
+    func generatePreview() -> (UIImage, Int)? {
+        let generator = AVAssetImageGenerator(asset: self)
+        generator.appliesPreferredTrackTransform = true
+        var actualTime = CMTimeMake(value: 0, timescale: 0)
+        if let image = try? generator.copyCGImage(at: CMTimeMakeWithSeconds(0.0, preferredTimescale: 1), actualTime: &actualTime) {
+            return (UIImage(cgImage: image), Int(duration.seconds))
+        }
+        return nil
+    }
+}
+
+extension UIImage {
+    func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
+        if let cgImage = cgImage {
+            let colorSpace = CGColorSpaceCreateDeviceRGB()
+            let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
+            if let context = CGContext(data: nil, width: cgImage.width, height: cgImage.height, bitsPerComponent: 8, bytesPerRow: cgImage.width * 4, space: colorSpace, bitmapInfo: bitmapInfo.rawValue) {
+                context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
+                if let data = context.data {
+                    var fromAlpha: CGFloat = 0
+                    var fromRed: CGFloat = 0
+                    var fromGreen: CGFloat = 0
+                    var fromBlue: CGFloat = 0
+                    var toAlpha: CGFloat = 0
+                    var toRed: CGFloat = 0
+                    var toGreen: CGFloat = 0
+                    var toBlue: CGFloat = 0
+                    from.getRed(&fromRed, green: &fromGreen, blue: &fromBlue, alpha: &fromAlpha)
+                    to.getRed(&toRed, green: &toGreen, blue: &toBlue, alpha: &toAlpha)
+                    let fAlpha = UInt8(UInt8(fromAlpha * 255))
+                    let fRed = UInt8(fromRed * 255)
+                    let fGreen = UInt8(fromGreen * 255)
+                    let fBlue = UInt8(fromBlue * 255)
+                    let tAlpha = UInt8(toAlpha * 255)
+                    let tRed = UInt8(toRed * 255)
+                    let tGreen = UInt8(toGreen * 255)
+                    let tBlue = UInt8(toBlue * 255)
+                    let data = data.assumingMemoryBound(to: UInt8.self)
+                    let size = cgImage.width * cgImage.height * 4
+                    var i = 0
+                    while i < size {
+                        if data[i] == fAlpha && data[i + 1] == fRed && data[i + 2] == fGreen && data[i + 3] == fBlue {
+                            data[i + 0] = tAlpha
+                            data[i + 1] = tRed
+                            data[i + 2] = tGreen
+                            data[i + 3] = tBlue
+                        }
+                        i += 4
+                    }
+                }
+                if let img = context.makeImage() {
+                    return UIImage(cgImage: img)
+                }
+            }
+        }
+        return self
+    }
+}

apps/ios/Shared/Model/NtfManager.swift

@@ -28,7 +28,6 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
     private var granted = false
     private var prevNtfTime: Dictionary<ChatId, Date> = [:]
 
-
     // Handle notification when app is in background
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 didReceive response: UNNotificationResponse,
@@ -38,6 +37,10 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         let chatModel = ChatModel.shared
         let action = response.actionIdentifier
         logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
+        if let userId = content.userInfo["userId"] as? Int64,
+           userId != chatModel.currentUser?.userId {
+            changeActiveUser(userId, viewPwd: nil)
+        }
         if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
            let chatId = content.userInfo["chatId"] as? String {
             if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
@@ -83,18 +86,29 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         if UIApplication.shared.applicationState == .active {
             switch content.categoryIdentifier {
             case ntfCategoryMessageReceived:
-                if model.chatId == nil {
-                    // in the chat list
-                    return recentInTheSameChat(content) ? [] : [.sound, .list]
+                let recent = recentInTheSameChat(content)
+                let userId = content.userInfo["userId"] as? Int64
+                if let userId = userId, let user = model.getUser(userId), !user.showNotifications {
+                    // ... inactive user with disabled notifications
+                    return []
+                } else if model.chatId == nil {
+                    // in the chat list...
+                    if model.currentUser?.userId == userId {
+                        // ... of the active user
+                        return recent ? [] : [.sound, .list]
+                    } else {
+                        // ... of inactive user
+                        return recent ? [.banner] : [.sound, .banner, .list]
+                    }
                 } else if model.chatId == content.targetContentIdentifier {
                     // in the current chat
-                    return recentInTheSameChat(content) ? [] : [.sound, .list]
+                    return recent ? [] : [.sound, .list]
                 } else {
                     // in another chat
-                    return recentInTheSameChat(content) ? [.banner, .list] : [.sound, .banner, .list]
+                    return recent ? [.banner, .list] : [.sound, .banner, .list]
                 }
-            // this notification is deliverd from the notifications server
-            // when the app is in foreground it does not need to be shown
+                // this notification is deliverd from the notifications server
+                // when the app is in foreground it does not need to be shown
             case ntfCategoryCheckMessage: return []
             case ntfCategoryCallInvitation: return []
             default: return [.sound, .banner, .list]
@@ -165,22 +179,23 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         ])
     }
 
-    func requestAuthorization(onDeny handler: (()-> Void)? = nil) {
+    func requestAuthorization(onDeny denied: (()-> Void)? = nil, onAuthorized authorized: (()-> Void)? = nil) {
         logger.debug("NtfManager.requestAuthorization")
         let center = UNUserNotificationCenter.current()
         center.getNotificationSettings { settings in
             switch settings.authorizationStatus {
             case .denied:
-                if let handler = handler { handler() }
-                return
+                denied?()
             case .authorized:
                 self.granted = true
+                authorized?()
             default:
                 center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
                     if let error = error {
                         logger.error("NtfManager.requestAuthorization error \(error.localizedDescription)")
                     } else {
                         self.granted = granted
+                        authorized?()
                     }
                 }
             }
@@ -188,20 +203,20 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         center.delegate = self
     }
 
-    func notifyContactRequest(_ contactRequest: UserContactRequest) {
+    func notifyContactRequest(_ user: User, _ contactRequest: UserContactRequest) {
         logger.debug("NtfManager.notifyContactRequest")
-        addNotification(createContactRequestNtf(contactRequest))
+        addNotification(createContactRequestNtf(user, contactRequest))
     }
 
-    func notifyContactConnected(_ contact: Contact) {
+    func notifyContactConnected(_ user: User, _ contact: Contact) {
         logger.debug("NtfManager.notifyContactConnected")
-        addNotification(createContactConnectedNtf(contact))
+        addNotification(createContactConnectedNtf(user, contact))
     }
 
-    func notifyMessageReceived(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func notifyMessageReceived(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
         if cInfo.ntfsEnabled {
-            addNotification(createMessageReceivedNtf(cInfo, cItem))
+            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
         }
     }
 
@@ -232,8 +247,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         }
     }
 
-    func removeNotifications(_ ids : [String]){
-        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: ids)
-        UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: ids)
+    func removeAllNotifications() async {
+        let nc = UNUserNotificationCenter.current()
+        let settings = await nc.notificationSettings()
+        if settings.authorizationStatus == .authorized {
+            nc.removeAllPendingNotificationRequests()
+            nc.removeAllDeliveredNotifications()
+        }
     }
 }