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,12 +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' && matrix.os != 'ubuntu-20.04'
-        timeout-minutes: 10
-        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
@@ -122,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

README.md

@@ -1,13 +1,28 @@
-<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)
 [![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)
-[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/SimpleXChat)
+
+| 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!
+
+[<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;
@@ -23,9 +38,119 @@
 - 🔐 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/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**: Security audit by [Trail of Bits](https://www.trailofbits.com/about), the [new website](https://simplex.chat) and v4.2 released! [See the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.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
 
@@ -37,15 +162,11 @@
   - [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)
-- [Join a user group](#join-a-user-group)
-- [Contribute](#contribute)
-- [Help us with donations](#help-us-with-donations)
 - [Disclaimers, Security contact, License](#disclaimers)
 
 ## Why privacy matters
@@ -76,36 +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:
 
-[Jan 03, 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).
+[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).
 
-[Dec 06, 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).
+[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).
 
-[Nov 08, 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).
+[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
+
+[Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
+
+[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
+
+[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
+
+[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
+
+[Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
 
-[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).
-
 [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/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">
-
 ## :zap: Quick installation of a terminal app
 
 ```sh
@@ -136,22 +257,25 @@ 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.
 
@@ -161,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.
@@ -196,72 +322,39 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ 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.
-- 🏗 File server to optimize for efficient and private sending of large files.
-- 🏗 SMP queue redundancy and rotation (manual is supported).
-- 🏗 Reduced battery and traffic usage in large groups.
-- 🏗 Preserve message drafts.
-- 🏗 Support older Android OS and 32-bit CPUs.
-- Ephemeral/disappearing/OTR conversations with the existing contacts.
-- Access password/pin (with optional alternative access password).
-- Video messages.
-- Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
+- ✅ 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.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
 - Supporting the same profile on multiple devices.
-- Desktop client.
 - 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.
-
-## Join a user group
-
-You can join a general English speaking group: [#SimpleX-Group](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FcIS0gu1h0Y8pZpQkDaSz7HZGSHcKpMB9%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAKzzWAJYrVt1zdgRp4pD3FBst6eK7233DJeNElENLJRA%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%228mazMhefXoM5HxWBfZnvwQ%3D%3D%22%7D).
-
-Groups in languages other than English, that we have app interface translated into: [\#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-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).
-
-You can join these groups either by opening these links in the app or by opening them in a desktop browser and scanning QR code.
-
-Join via the app to share what's going on and ask any questions!
-
-## Contribute
-
-We would love to have you join the development! You can contribute to SimpleX Chat with:
-
-- translate UI to your language - we are using [Weblate](https://hosted.weblate.org/projects/simplex-chat/) to translate the interface, please get in touch if you want to contribute!
-- translate website homepage - there is a lot of content we would like to share, it would help to bring the new users.
-- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
-- 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
-- please let us know, via GitHub issue or chat, if you want to create a donation in some other cryptocurrency - we will add the address to the list.
-
-Thank you,
-
-Evgeny
-
-SimpleX Chat founder
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- High capacity multi-node SMP relays.
 
 ## Disclaimers
 

apps/android/.gitignore

@@ -1,20 +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
-/.idea/kotlinc.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/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,139 +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.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
-  }
-}
-
-@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/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/ComposeVoiceView.kt

@@ -1,133 +0,0 @@
-import androidx.compose.animation.core.Animatable
-import androidx.compose.foundation.background
-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.Close
-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.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.durationText
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.item.SentColorLight
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-@Composable
-fun ComposeVoiceView(
-  filePath: String,
-  recordedDurationMs: Int,
-  finishedRecording: Boolean,
-  cancelEnabled: Boolean,
-  cancelVoice: () -> Unit
-) {
-  BoxWithConstraints(Modifier
-    .fillMaxWidth()
-  ) {
-    val audioPlaying = rememberSaveable { mutableStateOf(false) }
-    val progress = rememberSaveable { mutableStateOf(0) }
-    val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-    val progressBarWidth = remember { Animatable(0f) }
-    LaunchedEffect(recordedDurationMs, finishedRecording) {
-      snapshotFlow { progress.value }
-        .distinctUntilChanged()
-        .collect {
-          val startTime = when {
-            finishedRecording -> progress.value
-            else -> recordedDurationMs
-          }
-          val endTime = when {
-            finishedRecording -> duration.value
-            audioPlaying.value -> recordedDurationMs
-            else -> MAX_VOICE_MILLIS_FOR_SENDING
-          }
-          val to = ((startTime.toDouble() / endTime) * maxWidth.value).dp
-          progressBarWidth.animateTo(to.value, audioProgressBarAnimationSpec())
-        }
-    }
-    Spacer(
-      Modifier
-        .requiredWidth(progressBarWidth.value.dp)
-        .padding(top = 58.dp)
-        .height(3.dp)
-        .background(MaterialTheme.colors.primary)
-    )
-    Row(
-      Modifier
-        .height(60.dp)
-        .fillMaxWidth()
-        .padding(top = 8.dp)
-        .background(SentColorLight),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      IconButton(
-        onClick = {
-          if (!audioPlaying.value) {
-            AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
-          } else {
-            AudioPlayer.pause(audioPlaying, progress)
-          }
-        },
-        enabled = finishedRecording) {
-        Icon(
-          if (audioPlaying.value) Icons.Filled.Pause else Icons.Filled.PlayArrow,
-          stringResource(R.string.icon_descr_file),
-          Modifier
-            .padding(start = 4.dp, end = 2.dp)
-            .size(36.dp),
-          tint = if (finishedRecording) MaterialTheme.colors.primary else HighOrLowlight
-        )
-      }
-      val numberInText = remember(recordedDurationMs, progress.value) {
-        derivedStateOf {
-          when {
-            finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
-            finishedRecording -> progress.value / 1000
-            else -> recordedDurationMs / 1000
-          }
-        }
-      }
-      Text(
-        durationText(numberInText.value),
-        fontSize = 18.sp,
-        color = HighOrLowlight,
-      )
-      Spacer(Modifier.weight(1f))
-      if (cancelEnabled) {
-        IconButton(
-          onClick = {
-            AudioPlayer.stop(filePath)
-            cancelVoice()
-          },
-          modifier = Modifier.padding(0.dp)
-        ) {
-          Icon(
-            Icons.Outlined.Close,
-            contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
-            tint = MaterialTheme.colors.primary,
-            modifier = Modifier.padding(10.dp)
-          )
-        }
-      }
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewComposeAudioView() {
-  SimpleXTheme {
-    ComposeFileView(
-      "test.txt",
-      cancelFile = {},
-      cancelEnabled = true
-    )
-  }
-}

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

@@ -1,356 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.HighOrLowlight
-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
-
-// TODO refactor so that FramedItemView can show all CIContent items if they're deleted (see Swift code)
-
-@Composable
-fun ChatItemView(
-  cInfo: ChatInfo,
-  cItem: ChatItem,
-  composeState: MutableState<ComposeState>,
-  imageProvider: (() -> ImageGalleryProvider)? = null,
-  showMember: Boolean = false,
-  useLinkPreviews: Boolean,
-  linkMode: SimplexLinkMode,
-  deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long) -> Unit,
-  joinGroup: (Long) -> Unit,
-  acceptCall: (Contact) -> Unit,
-  scrollToItem: (Long) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
-) {
-  val context = LocalContext.current
-  val uriHandler = LocalUriHandler.current
-  val sent = cItem.chatDir.sent
-  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
-  val showMenu = remember { mutableStateOf(false) }
-  val revealed = remember { mutableStateOf(false) }
-  val fullDeleteAllowed = remember(cInfo) { cInfo.featureEnabled(ChatFeature.FullDelete) }
-  val saveFileLauncher = rememberSaveFileLauncher(cxt = context, ciFile = cItem.file)
-  val onLinkLongClick = { _: String -> showMenu.value = true }
-  val live = composeState.value.liveMessage != null
-
-  Box(
-    modifier = Modifier
-      .padding(bottom = 4.dp)
-      .fillMaxWidth(),
-    contentAlignment = alignment,
-  ) {
-    val onClick = {
-      when (cItem.meta.itemStatus) {
-        is CIStatus.SndErrorAuth -> {
-          showMsgDeliveryErrorAlert(generalGetString(R.string.message_delivery_error_desc))
-        }
-        is CIStatus.SndError -> {
-          showMsgDeliveryErrorAlert(generalGetString(R.string.unknown_error) + ": ${cItem.meta.itemStatus.agentError}")
-        }
-        else -> {}
-      }
-    }
-    Column(
-      Modifier
-        .clip(RoundedCornerShape(18.dp))
-        .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
-    ) {
-      @Composable
-      fun framedItemView() {
-        FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
-      }
-
-      fun deleteMessageQuestionText(): String {
-        return if (fullDeleteAllowed) {
-          generalGetString(R.string.delete_message_cannot_be_undone_warning)
-        } else {
-          generalGetString(R.string.delete_message_mark_deleted_warning)
-        }
-      }
-
-      @Composable
-      fun MsgContentItemDropdownMenu() {
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          if (!cItem.meta.itemDeleted && !live) {
-            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(context, cItem.text, filePath)
-              else -> shareText(context, cItem.content.text)
-            }
-            showMenu.value = false
-          })
-          ItemAction(stringResource(R.string.copy_verb), Icons.Outlined.ContentCopy, onClick = {
-            copyText(context, cItem.content.text)
-            showMenu.value = false
-          })
-          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
-            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)
-                  is MsgContent.MCVoice -> saveFileLauncher.launch(cItem.file?.fileName)
-                  else -> {}
-                }
-                showMenu.value = false
-              })
-            }
-          }
-          if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
-            ItemAction(stringResource(R.string.edit_verb), Icons.Filled.Edit, onClick = {
-              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-              showMenu.value = false
-            })
-          }
-          if (cItem.meta.itemDeleted && revealed.value) {
-            ItemAction(
-              stringResource(R.string.hide_verb),
-              Icons.Outlined.VisibilityOff,
-              onClick = {
-                revealed.value = false
-                showMenu.value = false
-              }
-            )
-          }
-          if (!(live && cItem.meta.isLive)) {
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-        }
-      }
-
-      @Composable
-      fun MarkedDeletedItemDropdownMenu() {
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          ItemAction(
-            stringResource(R.string.reveal_verb),
-            Icons.Outlined.Visibility,
-            onClick = {
-              revealed.value = true
-              showMenu.value = false
-            }
-          )
-          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-        }
-      }
-
-      @Composable
-      fun ContentItem() {
-        val mc = cItem.content.msgContent
-        if (cItem.meta.itemDeleted && !revealed.value) {
-          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          MarkedDeletedItemDropdownMenu()
-        } else if (cItem.quotedItem == null && !cItem.meta.itemDeleted && !cItem.meta.isLive) {
-          if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-            EmojiItemView(cItem, cInfo.timedMessagesTTL)
-            MsgContentItemDropdownMenu()
-          } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-            CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") })
-            MsgContentItemDropdownMenu()
-          } else {
-            framedItemView()
-            MsgContentItemDropdownMenu()
-          }
-        } else {
-          framedItemView()
-          MsgContentItemDropdownMenu()
-        }
-      }
-
-      @Composable fun DeletedItem() {
-        DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-        }
-      }
-
-      @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, cInfo.timedMessagesTTL, 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 -> CIEventView(cItem)
-        is CIContent.SndGroupEventContent -> CIEventView(cItem)
-        is CIContent.RcvConnEventContent -> CIEventView(cItem)
-        is CIContent.SndConnEventContent -> CIEventView(cItem)
-        is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-        is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-        is CIContent.RcvChatPreference -> {
-          val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
-          CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
-        }
-        is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, HighOrLowlight, icon = c.feature.icon,)
-        is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-        is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-        is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
-        is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
-        is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
-      }
-    }
-  }
-}
-
-@Composable
-fun DeleteItemAction(
-  cItem: ChatItem,
-  showMenu: MutableState<Boolean>,
-  questionText: String,
-  deleteMessage: (Long, CIDeleteMode) -> Unit
-) {
-  ItemAction(
-    stringResource(R.string.delete_verb),
-    Icons.Outlined.Delete,
-    onClick = {
-      showMenu.value = false
-      deleteMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
-    },
-    color = Color.Red
-  )
-}
-
-@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, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
-  AlertManager.shared.showAlertDialogButtons(
-    title = generalGetString(R.string.delete_message__question),
-    text = questionText,
-    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)) }
-        }
-      }
-    }
-  )
-}
-
-private fun showMsgDeliveryErrorAlert(description: String) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.message_delivery_error_title),
-    text = description,
-  )
-}
-
-@Preview
-@Composable
-fun PreviewChatItemView() {
-  SimpleXTheme {
-    ChatItemView(
-      ChatInfo.Direct.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      deleteMessage = { _, _ -> },
-      receiveFile = {},
-      joinGroup = {},
-      acceptCall = { _ -> },
-      scrollToItem = {},
-      acceptFeature = { _, _, _ -> }
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatItemViewDeletedContent() {
-  SimpleXTheme {
-    ChatItemView(
-      ChatInfo.Direct.sampleData,
-      ChatItem.getDeletedContentSampleData(),
-      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      deleteMessage = { _, _ -> },
-      receiveFile = {},
-      joinGroup = {},
-      acceptCall = { _ -> },
-      scrollToItem = {},
-      acceptFeature = { _, _, _ -> }
-    )
-  }
-}

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

@@ -1,153 +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.layout.onGloballyPositioned
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-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
-import kotlin.math.absoluteValue
-
-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
-        SideEffect {
-          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) }
-        var viewWidth by remember { mutableStateOf(0) }
-        var allowTranslate by remember { mutableStateOf(true) }
-        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
-            .onGloballyPositioned {
-              viewWidth = it.size.width
-            }
-            .graphicsLayer(
-              scaleX = scale,
-              scaleY = scale,
-              translationX = translationX,
-              translationY = translationY,
-            )
-            .pointerInput(Unit) {
-              detectTransformGestures(
-                { allowTranslate },
-                onGesture = { _, pan, gestureZoom, _ ->
-                  scale = (scale * gestureZoom).coerceIn(1f, 20f)
-                  allowTranslate = viewWidth * (scale - 1f) - ((translationX + pan.x * scale).absoluteValue * 2) > 0
-                  if (scale > 1 && allowTranslate) {
-                    translationX += pan.x * scale
-                    translationY += pan.y * scale
-                  } else if (allowTranslate) {
-                    translationX = 0f
-                    translationY = 0f
-                  }
-                }
-              )
-            }
-            .fillMaxSize(),
-        )
-      }
-    }
-  }
-}

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

@@ -1,58 +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.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.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.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (ci.chatDir.sent) SentColorLight else ReceivedColorLight,
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Text(
-        buildAnnotatedString {
-          // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
-          withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(generalGetString(R.string.marked_deleted_description)) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci, timedMessagesTTL)
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewMarkedDeletedItemView() {
-  SimpleXTheme {
-    DeletedItemView(
-      ChatItem.getSampleData(itemDeleted = true),
-      null
-    )
-  }
-}

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

@@ -1,167 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.util.Log
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.window.Dialog
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-
-class AlertManager {
-  var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
-
-  fun showAlert(alert: @Composable () -> Unit) {
-    Log.d(TAG, "AlertManager.showAlert")
-    alertViews.add(alert)
-  }
-
-  fun hideAlert() {
-    alertViews.removeLastOrNull()
-  }
-
-  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 showAlertDialogButtonsColumn(
-    title: String,
-    text: String? = null,
-    buttons: @Composable () -> Unit,
-  ) {
-    showAlert {
-      Dialog(onDismissRequest = this::hideAlert) {
-        Column(Modifier.background(MaterialTheme.colors.background)) {
-          Text(title, Modifier.padding(DEFAULT_PADDING), fontSize = 18.sp)
-          if (text != null) {
-            Text(text)
-          }
-          CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-            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 showAlertDialogStacked(
-    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,
-        buttons = {
-          Column(
-            Modifier.fillMaxWidth().padding(horizontal = 8.dp).padding(top = 16.dp, bottom = 2.dp),
-            horizontalAlignment = Alignment.End
-          ) {
-            TextButton(onClick = {
-              onDismiss?.invoke()
-              hideAlert()
-            }) { Text(dismissText) }
-            TextButton(onClick = {
-              onConfirm?.invoke()
-              hideAlert()
-            }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
-          }
-        },
-      )
-    }
-  }
-
-  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() {
-    remember { alertViews }.lastOrNull()?.invoke()
-  }
-
-  companion object {
-    val shared = AlertManager()
-  }
-}

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 Images(val text: String, val uris: List<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 uri: Uri): UploadContent()
-  data class AnimatedImage(val uri: Uri): UploadContent()
-}

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

@@ -1,100 +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 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/TextEditor.kt

@@ -1,65 +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.*
-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.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.ui.theme.HighOrLowlight
-
-@Composable
-fun TextEditor(
-  modifier: Modifier,
-  text: MutableState<String>,
-  border: Boolean = true,
-  fontSize: TextUnit = 14.sp,
-  background: Color = MaterialTheme.colors.background,
-  onChange: ((String) -> Unit)? = null
-) {
-  BasicTextField(
-    value = text.value,
-    onValueChange = { text.value = it; onChange?.invoke(it) },
-    textStyle = TextStyle(
-      fontFamily = FontFamily.Monospace, fontSize = fontSize,
-      color = MaterialTheme.colors.onBackground
-    ),
-    keyboardOptions = KeyboardOptions.Default.copy(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    modifier = modifier,
-    cursorBrush = SolidColor(HighOrLowlight),
-    decorationBox = { innerTextField ->
-      Surface(
-        shape = if (border) RoundedCornerShape(10.dp) else RectangleShape,
-        border = if (border) BorderStroke(1.dp, MaterialTheme.colors.secondary) else null
-      ) {
-        Row(
-          Modifier.background(background),
-          verticalAlignment = Alignment.Top
-        ) {
-          Box(
-            Modifier
-              .weight(1f)
-              .padding(vertical = 5.dp, horizontal = if (border) 7.dp else DEFAULT_PADDING)
-          ) {
-            innerTextField()
-          }
-        }
-      }
-    }
-  )
-}

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

@@ -1,140 +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(connReqInvitation: String, connIncognito: Boolean) {
-  val cxt = LocalContext.current
-  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(top = 16.dp, bottom = if (screenHeight > 600.dp) 16.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/onboarding/SetNotificationsMode.kt

@@ -1,68 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-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.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.font.FontWeight
-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.*
-import chat.simplex.app.views.usersettings.NotificationsMode
-import chat.simplex.app.views.usersettings.changeNotificationsMode
-
-@Composable
-fun SetNotificationsMode(m: ChatModel) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .verticalScroll(rememberScrollState())
-        .padding(20.dp)
-    ) {
-      AppBarTitle(stringResource(R.string.onboarding_notifications_mode_title), false)
-      val currentMode = rememberSaveable { mutableStateOf(NotificationsMode.default) }
-      Text(stringResource(R.string.onboarding_notifications_mode_subtitle))
-      Spacer(Modifier.padding(DEFAULT_PADDING_HALF))
-      NotificationButton(currentMode, NotificationsMode.OFF, R.string.onboarding_notifications_mode_off, R.string.onboarding_notifications_mode_off_desc)
-      NotificationButton(currentMode, NotificationsMode.PERIODIC, R.string.onboarding_notifications_mode_periodic, R.string.onboarding_notifications_mode_periodic_desc)
-      NotificationButton(currentMode, NotificationsMode.SERVICE, R.string.onboarding_notifications_mode_service, R.string.onboarding_notifications_mode_service_desc)
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      Box(Modifier.fillMaxWidth().padding(bottom = 16.dp), contentAlignment = Alignment.Center) {
-        OnboardingActionButton(R.string.use_chat, OnboardingStage.OnboardingComplete, m.onboardingStage) {
-          changeNotificationsMode(currentMode.value, m)
-        }
-      }
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-    }
-}
-
-@Composable
-private fun NotificationButton(currentMode: MutableState<NotificationsMode>, mode: NotificationsMode, @StringRes title: Int, @StringRes description: Int) {
-  TextButton(
-    onClick = { currentMode.value = mode },
-    border = BorderStroke(1.dp, color = if (currentMode.value == mode) MaterialTheme.colors.primary else HighOrLowlight.copy(alpha = 0.5f)),
-    shape = RoundedCornerShape(15.dp),
-  ) {
-    Column(Modifier.padding(bottom = 6.dp).padding(horizontal = 8.dp)) {
-      Text(
-        stringResource(title),
-        style = MaterialTheme.typography.h2,
-        fontWeight = FontWeight.Medium,
-        color = if (currentMode.value == mode) MaterialTheme.colors.primary else HighOrLowlight,
-        modifier = Modifier.padding(bottom = 4.dp)
-      )
-      Text(annotatedStringResource(description), color = MaterialTheme.colors.onBackground, lineHeight = 24.sp)
-    }
-  }
-  Spacer(Modifier.height(DEFAULT_PADDING))
-}

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

@@ -1,259 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-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.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-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.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
-  val currentVersion = remember { mutableStateOf(versionDescriptions.lastIndex) }
-
-  @Composable
-  fun featureDescription(icon: ImageVector, titleId: Int, descrId: Int, link: String?) {
-    @Composable
-    fun linkButton(link: String) {
-      val uriHandler = LocalUriHandler.current
-      Icon(
-        Icons.Outlined.OpenInNew, stringResource(titleId), tint = MaterialTheme.colors.primary,
-        modifier = Modifier
-          .clickable { uriHandler.openUri(link) }
-      )
-    }
-
-    Column(
-      horizontalAlignment = Alignment.Start
-    ) {
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        Icon(icon, stringResource(titleId), tint = HighOrLowlight)
-        Text(
-          generalGetString(titleId),
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          style = MaterialTheme.typography.h3,
-          fontWeight = FontWeight.Medium
-        )
-        if (link != null) {
-          linkButton(link)
-        }
-      }
-      Text(generalGetString(descrId))
-    }
-  }
-
-  @Composable
-  fun pagination() {
-    Row(
-      Modifier
-        .padding(bottom = 16.dp)
-    ) {
-      if (currentVersion.value > 0) {
-        val prev = currentVersion.value - 1
-        Surface(shape = RoundedCornerShape(20.dp)) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = prev }
-              .padding(8.dp)
-          ) {
-            Icon(Icons.Outlined.ArrowBackIosNew, "previous", tint = MaterialTheme.colors.primary)
-            Text(versionDescriptions[prev].version, color = MaterialTheme.colors.primary)
-          }
-        }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      if (currentVersion.value < versionDescriptions.lastIndex) {
-        val next = currentVersion.value + 1
-        Surface(shape = RoundedCornerShape(20.dp)) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = next }
-              .padding(8.dp)
-          ) {
-            Text(versionDescriptions[next].version, color = MaterialTheme.colors.primary)
-            Icon(Icons.Outlined.ArrowForwardIos, "next", tint = MaterialTheme.colors.primary)
-          }
-        }
-      }
-    }
-  }
-
-  val v = versionDescriptions[currentVersion.value]
-
-  ModalView(close = close) {
-    Column(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = DEFAULT_PADDING),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
-      Text(
-        String.format(generalGetString(R.string.new_in_version), v.version),
-        Modifier
-          .fillMaxWidth()
-          .padding(DEFAULT_PADDING),
-        textAlign = TextAlign.Center,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h1,
-        fontWeight = FontWeight.Normal,
-        color = HighOrLowlight
-      )
-
-      v.features.forEach { feature ->
-        featureDescription(feature.icon, feature.titleId, feature.descrId, feature.link)
-      }
-
-      if (!viaSettings) {
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(
-          Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
-        ) {
-          Text(
-            generalGetString(R.string.ok),
-            modifier = Modifier.clickable(onClick = close),
-            style = MaterialTheme.typography.h3,
-            color = MaterialTheme.colors.primary
-          )
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-      }
-
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-
-      pagination()
-    }
-  }
-}
-
-private data class FeatureDescription(
-  val icon: ImageVector,
-  val titleId: Int,
-  val descrId: Int,
-  val link: String? = null
-)
-
-private data class VersionDescription(
-  val version: String,
-  val features: List<FeatureDescription>
-)
-
-private val versionDescriptions: List<VersionDescription> = listOf(
-  VersionDescription(
-    version = "v4.2",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.VerifiedUser,
-        titleId = R.string.v4_2_security_assessment,
-        descrId = R.string.v4_2_security_assessment_desc,
-        link = "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html"
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Group,
-        titleId = R.string.v4_2_group_links,
-        descrId = R.string.v4_2_group_links_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Check,
-        titleId = R.string.v4_2_auto_accept_contact_requests,
-        descrId = R.string.v4_2_auto_accept_contact_requests_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.3",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Mic,
-        titleId = R.string.v4_3_voice_messages,
-        descrId = R.string.v4_3_voice_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.DeleteForever,
-        titleId = R.string.v4_3_irreversible_message_deletion,
-        descrId = R.string.v4_3_irreversible_message_deletion_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.WifiTethering,
-        titleId = R.string.v4_3_improved_server_configuration,
-        descrId = R.string.v4_3_improved_server_configuration_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.VisibilityOff,
-        titleId = R.string.v4_3_improved_privacy_and_security,
-        descrId = R.string.v4_3_improved_privacy_and_security_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.4",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Timer,
-        titleId = R.string.v4_4_disappearing_messages,
-        descrId = R.string.v4_4_disappearing_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Pending,
-        titleId = R.string.v4_4_live_messages,
-        descrId = R.string.v4_4_live_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.VerifiedUser,
-        titleId = R.string.v4_4_verify_connection_security,
-        descrId = R.string.v4_4_verify_connection_security_desc
-      )
-    )
-  )
-)
-private val lastVersion = versionDescriptions.last().version
-
-fun setLastVersionDefault(m: ChatModel) {
-  m.controller.appPrefs.whatsNewVersion.set(lastVersion)
-}
-
-fun shouldShowWhatsNew(m: ChatModel): Boolean {
-  val v = m.controller.appPrefs.whatsNewVersion.get()
-  setLastVersionDefault(m)
-  return v != lastVersion
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewWhatsNewView() {
-  SimpleXTheme {
-    WhatsNewView(
-      viaSettings = true,
-      close = {}
-    )
-  }
-}

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

@@ -1,167 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionCustomFooter
-import SectionDivider
-import SectionItemView
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.TheaterComedy
-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.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.*
-
-@Composable
-fun AcceptRequestsView(m: ChatModel, contactLink: UserContactLinkRec) {
-  var contactLink by remember { mutableStateOf(contactLink) }
-  AcceptRequestsLayout(
-    contactLink,
-    saveState = { new: MutableState<AutoAcceptState>, old: MutableState<AutoAcceptState> ->
-      withApi {
-        val link = m.controller.userAddressAutoAccept(new.value.autoAccept)
-        if (link != null) {
-          contactLink = link
-          m.userAddress.value = link
-          old.value = new.value
-        }
-      }
-    }
-  )
-}
-
-@Composable
-private fun AcceptRequestsLayout(
-  contactLink: UserContactLinkRec,
-  saveState: (new: MutableState<AutoAcceptState>, old: MutableState<AutoAcceptState>) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.contact_requests))
-    val autoAcceptState = remember { mutableStateOf(AutoAcceptState(contactLink)) }
-    val autoAcceptStateSaved = remember { mutableStateOf(autoAcceptState.value) }
-    SectionView(stringResource(R.string.accept_requests).uppercase()) {
-      SectionItemView {
-        PreferenceToggleWithIcon(stringResource(R.string.accept_automatically), Icons.Outlined.Check, checked = autoAcceptState.value.enable) {
-          autoAcceptState.value = if (!it)
-            AutoAcceptState()
-          else
-            AutoAcceptState(it, autoAcceptState.value.incognito, autoAcceptState.value.welcomeText)
-        }
-      }
-      if (autoAcceptState.value.enable) {
-        SectionDivider()
-        SectionItemView {
-          PreferenceToggleWithIcon(
-            stringResource(R.string.incognito),
-            if (autoAcceptState.value.incognito) Icons.Filled.TheaterComedy else Icons.Outlined.TheaterComedy,
-            if (autoAcceptState.value.incognito) Indigo else HighOrLowlight,
-            autoAcceptState.value.incognito,
-          ) {
-            autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, it, autoAcceptState.value.welcomeText)
-          }
-        }
-      }
-    }
-    val welcomeText = remember { mutableStateOf(autoAcceptState.value.welcomeText) }
-    SectionCustomFooter(PaddingValues(horizontal = DEFAULT_PADDING)) {
-      ButtonsFooter(
-        cancel = {
-          autoAcceptState.value = autoAcceptStateSaved.value
-          welcomeText.value = autoAcceptStateSaved.value.welcomeText
-        },
-        save = { saveState(autoAcceptState, autoAcceptStateSaved) },
-        disabled = autoAcceptState.value == autoAcceptStateSaved.value
-      )
-    }
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    if (autoAcceptState.value.enable) {
-      Text(
-        stringResource(R.string.section_title_welcome_message), color = HighOrLowlight, style = MaterialTheme.typography.body2,
-        modifier = Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), fontSize = 12.sp
-      )
-      TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
-      LaunchedEffect(welcomeText.value) {
-        if (welcomeText.value != autoAcceptState.value.welcomeText) {
-          autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, autoAcceptState.value.incognito, welcomeText.value)
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun ButtonsFooter(cancel: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    FooterButton(Icons.Outlined.Replay, stringResource(R.string.cancel_verb), cancel, disabled)
-    FooterButton(Icons.Outlined.Check, stringResource(R.string.save_verb), save, disabled)
-  }
-}
-
-private class AutoAcceptState {
-  var enable: Boolean = false
-    private set
-  var incognito: Boolean = false
-    private set
-  var welcomeText: String = ""
-    private set
-
-  constructor(enable: Boolean = false, incognito: Boolean = false, welcomeText: String = "") {
-    this.enable = enable
-    this.incognito = incognito
-    this.welcomeText = welcomeText
-  }
-
-  constructor(contactLink: UserContactLinkRec) {
-    contactLink.autoAccept?.let { aa ->
-      enable = true
-      incognito = aa.acceptIncognito
-      aa.autoReply?.let { msg ->
-        welcomeText = msg.text
-      } ?: run {
-        welcomeText = ""
-      }
-    }
-  }
-
-  val autoAccept: AutoAccept?
-    get() {
-      if (enable) {
-        var autoReply: MsgContent? = null
-        val s = welcomeText.trim()
-        if (s != "") {
-          autoReply = MsgContent.MCText(s)
-        }
-        return AutoAccept(incognito, autoReply)
-      }
-      return null
-    }
-
-  override fun equals(other: Any?): Boolean {
-    if (other !is AutoAcceptState) return false
-    return this.enable == other.enable && this.incognito == other.incognito && this.welcomeText == other.welcomeText
-  }
-
-  override fun hashCode(): Int {
-    var result = enable.hashCode()
-    result = 31 * result + incognito.hashCode()
-    result = 31 * result + welcomeText.hashCode()
-    return result
-  }
-}

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,238 +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) }
-
-  LaunchedEffect(Unit) {
-    chatModel.userSMPServersUnsaved.value = null
-  }
-
-  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), showSettingsModal { 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,88 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import android.view.WindowManager
-import androidx.compose.foundation.layout.*
-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.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.res.stringResource
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun PrivacySettingsView(
-  chatModel: ChatModel,
-  setPerformLA: (Boolean) -> Unit
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start
-  ) {
-    val simplexLinkMode = chatModel.controller.appPrefs.simplexLinkMode
-    AppBarTitle(stringResource(R.string.your_privacy))
-    SectionView(stringResource(R.string.settings_section_title_device)) {
-      ChatLockItem(chatModel.performLA, setPerformLA)
-      SectionDivider()
-      val context = LocalContext.current
-      SettingsPreferenceItem(Icons.Outlined.VisibilityOff, stringResource(R.string.protect_app_screen), chatModel.controller.appPrefs.privacyProtectScreen) { on ->
-        if (on) {
-          (context as? FragmentActivity)?.window?.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE
-          )
-        } else {
-          (context as? FragmentActivity)?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-      }
-    }
-    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.ImageAspectRatio, stringResource(R.string.transfer_images_faster), chatModel.controller.appPrefs.privacyTransferImagesInline)
-      SectionDivider()
-      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
-      SectionDivider()
-      SectionItemView { SimpleXLinkOptions(chatModel.simplexLinkMode, onSelected = {
-        simplexLinkMode.set(it)
-        chatModel.simplexLinkMode.value = it
-      }) }
-    }
-    if (chatModel.simplexLinkMode.value == SimplexLinkMode.BROWSER) {
-      SectionTextFooter(stringResource(R.string.simplex_link_mode_browser_warning))
-    }
-  }
-}
-
-@Composable
-private fun SimpleXLinkOptions(simplexLinkModeState: State<SimplexLinkMode>, onSelected: (SimplexLinkMode) -> Unit) {
-  val values = remember {
-    SimplexLinkMode.values().map {
-      when (it) {
-        SimplexLinkMode.DESCRIPTION -> it to generalGetString(R.string.simplex_link_mode_description)
-        SimplexLinkMode.FULL -> it to generalGetString(R.string.simplex_link_mode_full)
-        SimplexLinkMode.BROWSER -> it to generalGetString(R.string.simplex_link_mode_browser)
-      }
-    }
-  }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.simplex_link_mode),
-    values,
-    simplexLinkModeState,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}

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

@@ -1,319 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-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.runtime.saveable.rememberSaveable
-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.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.model.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.launch
-
-@Composable
-fun SMPServersView(m: ChatModel) {
-  var servers by remember {
-    mutableStateOf(m.userSMPServersUnsaved.value ?: m.userSMPServers.value ?: emptyList())
-  }
-  val testing = rememberSaveable { mutableStateOf(false) }
-  val serversUnchanged = remember { derivedStateOf { servers == m.userSMPServers.value || testing.value } }
-  val allServersDisabled = remember { derivedStateOf { servers.all { !it.enabled } } }
-  val saveDisabled = remember {
-    derivedStateOf {
-      servers.isEmpty() ||
-      servers == m.userSMPServers.value ||
-      testing.value ||
-      !servers.all { srv ->
-        val address = parseServerAddress(srv.server)
-        address != null && uniqueAddress(srv, address, servers)
-      } ||
-      allServersDisabled.value
-    }
-  }
-
-  fun showServer(server: ServerCfg) {
-    ModalManager.shared.showModalCloseable(true) { close ->
-      var old by remember { mutableStateOf(server) }
-      val index = servers.indexOf(old)
-      SMPServerView(
-        m,
-        old,
-        onUpdate = { updated ->
-          val newServers = ArrayList(servers)
-          newServers.removeAt(index)
-          newServers.add(index, updated)
-          old = updated
-          servers = newServers
-          m.userSMPServersUnsaved.value = servers
-        },
-        onDelete = {
-          val newServers = ArrayList(servers)
-          newServers.removeAt(index)
-          servers = newServers
-          m.userSMPServersUnsaved.value = servers
-          close()
-        })
-    }
-  }
-  val scope = rememberCoroutineScope()
-
-  SMPServersLayout(
-    testing = testing.value,
-    servers = servers,
-    serversUnchanged = serversUnchanged.value,
-    saveDisabled = saveDisabled.value,
-    allServersDisabled = allServersDisabled.value,
-    addServer = {
-      AlertManager.shared.showAlertDialogButtonsColumn(
-        title = generalGetString(R.string.smp_servers_add),
-        buttons = {
-          Column {
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              servers = servers + ServerCfg.empty
-              // No saving until something will be changed on the next screen to prevent blank servers on the list
-              showServer(servers.last())
-            }) {
-              Text(stringResource(R.string.smp_servers_enter_manually))
-            }
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              ModalManager.shared.showModalCloseable { close ->
-                ScanSMPServer {
-                  close()
-                  servers = servers + it
-                  m.userSMPServersUnsaved.value = servers
-                }
-              }
-            }
-            ) {
-              Text(stringResource(R.string.smp_servers_scan_qr))
-            }
-            val hasAllPresets = hasAllPresets(servers, m)
-            if (!hasAllPresets) {
-              SectionItemView({
-                AlertManager.shared.hideAlert()
-                servers = (servers + addAllPresets(servers, m)).sortedByDescending { it.preset }
-              }) {
-                Text(stringResource(R.string.smp_servers_preset_add), color = MaterialTheme.colors.onBackground)
-              }
-            }
-          }
-        }
-      )
-    },
-    testServers = {
-      scope.launch {
-        testServers(testing, servers, m) {
-          servers = it
-          m.userSMPServersUnsaved.value = servers
-        }
-      }
-    },
-    resetServers = {
-      servers = m.userSMPServers.value ?: emptyList()
-      m.userSMPServersUnsaved.value = null
-    },
-    saveSMPServers = {
-      saveSMPServers(servers, m)
-    },
-    showServer = ::showServer,
-  )
-
-  if (testing.value) {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(horizontal = 2.dp)
-          .size(30.dp),
-        color = HighOrLowlight,
-        strokeWidth = 2.5.dp
-      )
-    }
-  }
-}
-
-@Composable
-private fun SMPServersLayout(
-  testing: Boolean,
-  servers: List<ServerCfg>,
-  serversUnchanged: Boolean,
-  saveDisabled: Boolean,
-  allServersDisabled: Boolean,
-  addServer: () -> Unit,
-  testServers: () -> Unit,
-  resetServers: () -> Unit,
-  saveSMPServers: () -> Unit,
-  showServer: (ServerCfg) -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.your_SMP_servers))
-
-    SectionView(stringResource(R.string.smp_servers).uppercase()) {
-      for (srv in servers) {
-        SectionItemView({ showServer(srv) }, disabled = testing) {
-          SmpServerView(srv, servers, testing)
-        }
-        SectionDivider()
-      }
-      SettingsActionItem(
-        Icons.Outlined.Add,
-        stringResource(R.string.smp_servers_add),
-        addServer,
-        disabled = testing,
-        textColor = if (testing) HighOrLowlight else MaterialTheme.colors.primary,
-        iconColor = if (testing) HighOrLowlight else MaterialTheme.colors.primary
-      )
-    }
-    SectionSpacer()
-    SectionView {
-      SectionItemView(resetServers, disabled = serversUnchanged) {
-        Text(stringResource(R.string.reset_verb), color = if (!serversUnchanged) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-      SectionDivider()
-      val testServersDisabled = testing || allServersDisabled
-      SectionItemView(testServers, disabled = testServersDisabled) {
-        Text(stringResource(R.string.smp_servers_test_servers), color = if (!testServersDisabled) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-      SectionDivider()
-      SectionItemView(saveSMPServers, disabled = saveDisabled) {
-        Text(stringResource(R.string.smp_servers_save), color = if (!saveDisabled) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-    }
-    SectionSpacer()
-    SectionView {
-      HowToButton()
-    }
-  }
-}
-
-@Composable
-private fun SmpServerView(srv: ServerCfg, servers: List<ServerCfg>, disabled: Boolean) {
-  val address = parseServerAddress(srv.server)
-  when {
-    address == null || !address.valid || !uniqueAddress(srv, address, servers) -> InvalidServer()
-    !srv.enabled -> Icon(Icons.Outlined.DoNotDisturb, null, tint = HighOrLowlight)
-    else -> ShowTestStatus(srv)
-  }
-  Spacer(Modifier.padding(horizontal = 4.dp))
-  val text = address?.hostnames?.firstOrNull() ?: srv.server
-  if (srv.enabled) {
-    Text(text, color = if (disabled) HighOrLowlight else MaterialTheme.colors.onBackground, maxLines = 1)
-  } else {
-    Text(text, maxLines = 1, color = HighOrLowlight)
-  }
-}
-
-@Composable
-private fun HowToButton() {
-  val uriHandler = LocalUriHandler.current
-  SettingsActionItem(
-    Icons.Outlined.OpenInNew,
-    stringResource(R.string.how_to_use_your_servers),
-    { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md") },
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary
-  )
-}
-
-@Composable
-fun InvalidServer() {
-  Icon(Icons.Outlined.ErrorOutline, null, tint = MaterialTheme.colors.error)
-}
-
-private fun uniqueAddress(s: ServerCfg, address: ServerAddress, servers: List<ServerCfg>): Boolean = servers.all { srv ->
-  address.hostnames.all { host ->
-    srv.id == s.id || !srv.server.contains(host)
-  }
-}
-
-private fun hasAllPresets(servers: List<ServerCfg>, m: ChatModel): Boolean =
-  m.presetSMPServers.value?.all { hasPreset(it, servers) } ?: true
-
-private fun addAllPresets(servers: List<ServerCfg>, m: ChatModel): List<ServerCfg> {
-  val toAdd = ArrayList<ServerCfg>()
-  for (srv in m.presetSMPServers.value ?: emptyList()) {
-    if (!hasPreset(srv, servers)) {
-      toAdd.add(ServerCfg(srv, preset = true, tested = null, enabled = true))
-    }
-  }
-  return toAdd
-}
-
-private fun hasPreset(srv: String, servers: List<ServerCfg>): Boolean =
-  servers.any { it.server == srv }
-
-private suspend fun testServers(testing: MutableState<Boolean>, servers: List<ServerCfg>, m: ChatModel, onUpdated: (List<ServerCfg>) -> Unit) {
-  val resetStatus = resetTestStatus(servers)
-  onUpdated(resetStatus)
-  testing.value = true
-  val fs = runServersTest(resetStatus, m) { onUpdated(it) }
-  testing.value = false
-  if (fs.isNotEmpty()) {
-    val msg = fs.map { it.key + ": " + it.value.localizedDescription }.joinToString("\n")
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.smp_servers_test_failed),
-      text = generalGetString(R.string.smp_servers_test_some_failed) + "\n" + msg
-    )
-  }
-}
-
-private fun resetTestStatus(servers: List<ServerCfg>): List<ServerCfg> {
-  val copy = ArrayList(servers)
-  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
-      copy.removeAt(index)
-      copy.add(index, server.copy(tested = null))
-    }
-  }
-  return copy
-}
-
-private suspend fun runServersTest(servers: List<ServerCfg>, m: ChatModel, onUpdated: (List<ServerCfg>) -> Unit): Map<String, SMPTestFailure> {
-  val fs: MutableMap<String, SMPTestFailure> = mutableMapOf()
-  val updatedServers = ArrayList<ServerCfg>(servers)
-  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
-      val (updatedServer, f) = testServerConnection(server, m)
-      updatedServers.removeAt(index)
-      updatedServers.add(index, updatedServer)
-      // toList() is important. Otherwise, Compose will not redraw the screen after first update
-      onUpdated(updatedServers.toList())
-      if (f != null) {
-        fs[serverHostname(updatedServer.server)] = f
-      }
-    }
-  }
-  return fs
-}
-
-private fun saveSMPServers(servers: List<ServerCfg>, m: ChatModel) {
-  withApi {
-    if (m.controller.setUserSMPServers(servers)) {
-      m.userSMPServers.value = servers
-      m.userSMPServersUnsaved.value = null
-    }
-  }
-}
-

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

@@ -1,497 +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
-import chat.simplex.app.views.onboarding.WhatsNewView
-
-@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: SharedPreference<Boolean>,
-  developerTools: SharedPreference<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()
-        ChatPreferencesItem(showCustomModal)
-      }
-      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.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, 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()
-        DatabaseItem(encrypted, showSettingsModal { DatabaseView(it, showSettingsModal) }, 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.Add, stringResource(R.string.whats_new), showCustomModal { _, close -> WhatsNewView(viaSettings = true, close) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
-        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_support)) {
-        ContributeItem(uriHandler)
-        SectionDivider()
-        RateAppItem(uriHandler)
-        SectionDivider()
-        StarOnGithubItem(uriHandler)
-      }
-      SectionSpacer()
-
-      SectionView(stringResource(R.string.settings_section_title_develop)) {
-        val devTools = remember { mutableStateOf(developerTools.get()) }
-        SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools, devTools)
-        SectionDivider()
-        if (devTools.value) {
-          ChatConsoleItem(showTerminal)
-          SectionDivider()
-          InstallTerminalAppItem(uriHandler)
-          SectionDivider()
-        }
-//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
-//        SectionDivider()
-        AppVersionItem()
-      }
-    }
-  }
-}
-
-@Composable
-fun SettingsIncognitoActionItem(
-  incognitoPref: SharedPreference<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 ChatPreferencesItem(showCustomModal: ((@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit))) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.chat_preferences),
-    click = {
-      withApi {
-        showCustomModal { m, close ->
-          PreferencesView(m, m.currentUser.value ?: return@showCustomModal, close)
-        }()
-      }
-    }
-  )
-}
-
-@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 ContributeItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat#contribute") }) {
-    Icon(
-      Icons.Outlined.Keyboard,
-      contentDescription = "GitHub",
-      tint = HighOrLowlight,
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(generalGetString(R.string.contribute), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable private fun RateAppItem(uriHandler: UriHandler) {
-  SectionItemView({
-    runCatching { uriHandler.openUri("market://details?id=chat.simplex.app") }
-      .onFailure { uriHandler.openUri("https://play.google.com/store/apps/details?id=chat.simplex.app") }
-  }
-  ) {
-    Icon(
-      Icons.Outlined.StarOutline,
-      contentDescription = "Google Play",
-      tint = HighOrLowlight,
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(generalGetString(R.string.rate_the_app), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable private fun StarOnGithubItem(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.star_on_github), color = MaterialTheme.colors.primary)
-  }
-}
-
-@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: SharedPreference<Boolean>,
-  prefState: MutableState<Boolean>? = null,
-  onChange: ((Boolean) -> Unit)? = null,
-) {
-  SectionItemView {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(icon, text, tint = HighOrLowlight)
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      SharedPreferenceToggle(text, pref, prefState, onChange)
-    }
-  }
-}
-
-@Composable
-fun SettingsPreferenceItemWithInfo(
-  icon: ImageVector,
-  iconTint: Color,
-  text: String,
-  stopped: Boolean,
-  onClickInfo: () -> Unit,
-  pref: SharedPreference<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)
-    }
-  }
-}
-
-@Composable
-fun PreferenceToggle(
-  text: String,
-  checked: Boolean,
-  onChange: (Boolean) -> Unit = {},
-) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    Text(text)
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    Switch(
-      checked = checked,
-      onCheckedChange = onChange,
-      colors = SwitchDefaults.colors(
-        checkedThumbColor = MaterialTheme.colors.primary,
-        uncheckedThumbColor = HighOrLowlight
-      )
-    )
-  }
-}
-
-@Composable
-fun PreferenceToggleWithIcon(
-  text: String,
-  icon: ImageVector? = null,
-  iconColor: Color? = HighOrLowlight,
-  checked: Boolean,
-  onChange: (Boolean) -> Unit = {},
-) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    if (icon != null) {
-      Icon(
-        icon,
-        null,
-        tint = iconColor ?: HighOrLowlight
-      )
-      Spacer(Modifier.padding(horizontal = 4.dp))
-    }
-    Text(text)
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    Switch(
-      checked = checked,
-      onCheckedChange = {
-        onChange(it)
-      },
-      colors = SwitchDefaults.colors(
-        checkedThumbColor = MaterialTheme.colors.primary,
-        uncheckedThumbColor = HighOrLowlight
-      )
-    )
-  }
-}
-
-@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 = SharedPreference({ false }, {}),
-      developerTools = SharedPreference({ 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,152 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-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.runtime.remember
-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.model.UserContactLinkRec
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun UserAddressView(chatModel: ChatModel) {
-  val cxt = LocalContext.current
-  UserAddressLayout(
-    userAddress = remember { chatModel.userAddress }.value,
-    createAddress = {
-      withApi {
-        val connReqContact = chatModel.controller.apiCreateUserAddress()
-        if (connReqContact != null) {
-          chatModel.userAddress.value = UserContactLinkRec(connReqContact)
-        }
-      }
-    },
-    share = { userAddress: String -> shareText(cxt, userAddress) },
-    acceptRequests = {
-      chatModel.userAddress.value?.let { address ->
-        ModalManager.shared.showModal(settings = true) { AcceptRequestsView(chatModel, address) }
-      }
-    },
-    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: UserContactLinkRec?,
-  createAddress: () -> Unit,
-  share: (String) -> Unit,
-  acceptRequests: () -> Unit,
-  deleteAddress: () -> Unit
-) {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()),
-    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().padding(bottom = DEFAULT_PADDING_HALF),
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceEvenly
-    ) {
-      if (userAddress == null) {
-        SimpleButton(stringResource(R.string.create_address), icon = Icons.Outlined.QrCode, click = createAddress)
-      } else {
-        QRCode(userAddress.connReqContact, Modifier.aspectRatio(1f))
-        Row(
-          horizontalArrangement = Arrangement.spacedBy(10.dp),
-          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(vertical = 16.dp)
-        ) {
-          SimpleButton(
-            stringResource(R.string.share_link),
-            icon = Icons.Outlined.Share,
-            click = { share(userAddress.connReqContact) })
-          SimpleButtonIconEnded(
-            stringResource(R.string.contact_requests),
-            icon = Icons.Outlined.ChevronRight,
-            click = acceptRequests
-          )
-        }
-        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 = { _ -> },
-      acceptRequests = {},
-      deleteAddress = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserAddressLayoutAddressCreated() {
-  SimpleXTheme {
-    UserAddressLayout(
-      userAddress = UserContactLinkRec("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"),
-      createAddress = {},
-      share = { _ -> },
-      acceptRequests = {},
-      deleteAddress = {},
-    )
-  }
-}

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

@@ -1,301 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import android.graphics.Bitmap
-import android.net.Uri
-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.runtime.saveable.rememberSaveable
-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 = rememberSaveable { 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 = rememberSaveable { mutableStateOf<Uri?>(null) }
-  val profileImage = rememberSaveable { 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/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()
     }
 

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,65 +6,129 @@
 //
 
 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().privacySensitive(protectScreen)
-                } 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: {
-                        if (!notificationAlertShown) {
-                            notificationAlertShown = true
-                            alertManager.showAlert(notificationAlert())
-                        }
-                    },
-                    onAuthorized: { notificationAlertShown = false }
-                )
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
                 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) {
-                        showWhatsNew = shouldShowWhatsNew()
+                        if !showWhatsNew {
+                            showWhatsNew = shouldShowWhatsNew()
+                        }
                     }
                 }
                 prefShowLANotice = true
@@ -72,11 +136,43 @@ struct ContentView: View {
             .sheet(isPresented: $showWhatsNew) {
                 WhatsNewView()
             }
-            if chatModel.showCallView, let call = chatModel.activeCall {
-                ActiveCallView(call: call)
-            }
             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() {
@@ -92,43 +188,65 @@ 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!"),

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

@@ -1,20 +1,11 @@
 //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))
+let json = getJSONDecoder()
+let d = s.data(using: .utf8)!
+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

@@ -36,11 +36,13 @@ class AudioRecorder {
             try av.setActive(true)
             let settings: [String : Any] = [
                 AVFormatIDKey: kAudioFormatMPEG4AAC,
-                AVSampleRateKey: 12000,
-                AVEncoderBitRateKey: 12000,
+                AVSampleRateKey: 16000,
+                AVEncoderBitRateKey: 32000,
+                AVEncoderBitRateStrategyKey: AVAudioBitRateStrategy_VariableConstrained,
                 AVNumberOfChannelsKey: 1
             ]
-            audioRecorder = try AVAudioRecorder(url: getAppFilePath(fileName), settings: settings)
+            let url = getAppFilePath(fileName)
+            audioRecorder = try AVAudioRecorder(url: url, settings: settings)
             audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
 
             await MainActor.run {
@@ -101,10 +103,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         self.onFinishPlayback = onFinishPlayback
     }
 
-    func start(fileName: String) {
-        audioPlayer = try? AVAudioPlayer(contentsOf: getAppFilePath(fileName))
+    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
@@ -123,6 +129,17 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         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()

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] = []
@@ -31,8 +34,6 @@ final class ChatModel: ObservableObject {
     // items in the terminal view
     @Published var terminalItems: [TerminalItem] = []
     @Published var userAddress: UserContactLink?
-    @Published var userSMPServers: [ServerCfg]?
-    @Published var presetSMPServers: [String]?
     @Published var chatItemTTL: ChatItemTTL = .none
     @Published var appOpenUrl: URL?
     @Published var deviceToken: DeviceToken?
@@ -53,15 +54,43 @@ final class ChatModel: ObservableObject {
     // currently showing QR code
     @Published var connReqInv: String?
     // audio recording and playback
-    @Published var stopPreviousRecPlay: Bool = false // value is not taken into account, only the fact it switches
-    var callWebView: WKWebView?
+    @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
     }
@@ -127,17 +156,9 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateNetworkStatus(_ id: ChatId, _ status: Chat.NetworkStatus) {
-        if let i = getChatIndex(id) {
-            chats[i].serverInfo.networkStatus = status
-        }
-    }
-
     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)
@@ -163,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) {
@@ -176,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 {
@@ -217,16 +238,9 @@ 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]
+        if let i = getChatItemIndex(cItem) {
             withAnimation {
-                self.reversedChatItems[i] = cItem
-                self.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 {
-                    self.reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
-                }
+                _updateChatItem(at: i, with: cItem)
             }
             return false
         } else {
@@ -243,7 +257,30 @@ final class ChatModel: ObservableObject {
             }
         }
     }
-    
+
+    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)
@@ -256,10 +293,7 @@ final class ChatModel: ObservableObject {
         }
         // remove from current chat
         if chatId == cInfo.id {
-            if let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
-                if reversedChatItems[i].isRcvNew {
-                    NtfManager.shared.decNtfBadgeCount()
-                }
+            if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
                     self.reversedChatItems.remove(at: i)
                 }
@@ -283,6 +317,18 @@ 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 {
@@ -308,7 +354,7 @@ final class ChatModel: ObservableObject {
     func markChatItemsRead(_ cInfo: ChatInfo) {
         // update preview
         _updateChat(cInfo.id) { chat in
-            NtfManager.shared.decNtfBadgeCount(by: chat.chatStats.unreadCount)
+            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
             chat.chatStats = ChatStats()
         }
         // update current chat
@@ -327,7 +373,7 @@ final class ChatModel: ObservableObject {
 
     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)
                 _updateChat(cInfo.id) { chat in
                     var unreadBelow = 0
@@ -341,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)
                     }
                 }
             }
@@ -350,7 +396,7 @@ final class ChatModel: ObservableObject {
             markChatItemsRead(cInfo)
         }
     }
-   
+
     func markChatUnread(_ cInfo: ChatInfo, unreadChat: Bool = true) {
         _updateChat(cInfo.id) { chat in
             chat.chatStats.unreadChat = unreadChat
@@ -360,7 +406,7 @@ final class ChatModel: ObservableObject {
     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
@@ -375,7 +421,7 @@ final class ChatModel: ObservableObject {
         // update preview
         decreaseUnreadCounter(cInfo)
         // update current chat
-        if chatId == cInfo.id, let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
+        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
             markChatItemRead_(i)
         }
     }
@@ -394,15 +440,33 @@ final class ChatModel: ObservableObject {
     func decreaseUnreadCounter(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount - 1
+            decreaseUnreadCounter(user: currentUser!)
         }
     }
 
-    func totalUnreadCount() -> Int {
-        chats.reduce(0, { count, chat in count + chat.chatStats.unreadCount })
+    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
@@ -479,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 {
@@ -490,62 +569,45 @@ 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 } }
@@ -554,3 +616,41 @@ final class Chat: ObservableObject, Identifiable {
 
     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

@@ -9,6 +9,7 @@
 import Foundation
 import SimpleXChat
 import SwiftUI
+import AVKit
 
 func getLoadedFilePath(_ file: CIFile?) -> String? {
     if let fileName = getLoadedFileName(file) {
@@ -42,6 +43,17 @@ func getLoadedImage(_ file: CIFile?) -> UIImage? {
     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 }
@@ -133,7 +145,7 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
             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
+                let size = cgImage.width * cgImage.height * 4
                 var i = 0
                 while i < size {
                     if data[i] < 255 { return true }
@@ -164,9 +176,22 @@ func saveFileFromURL(_ url: URL) -> String? {
     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 {
-    let fileName = uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
-    return fileName
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }
 
 private func uniqueCombine(_ fileName: String) -> String {
@@ -191,6 +216,7 @@ private func getTimestamp() -> String {
         df = DateFormatter()
         df.dateFormat = "yyyyMMdd_HHmmss"
         df.locale = Locale(identifier: "US")
+        df.timeZone = TimeZone(secondsFromGMT: 0)
         tsFormatter = df
     }
     return df.string(from: Date())
@@ -203,3 +229,63 @@ func dropImagePrefix(_ s: String) -> String {
 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]
@@ -189,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))
         }
     }
 
@@ -233,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()
+        }
     }
 }

apps/ios/Shared/Model/SuspendChat.swift

@@ -81,3 +81,24 @@ func activateChat(appState: AppState = .active) {
         if ChatModel.ok { apiActivateChat() }
     }
 }
+
+func initChatAndMigrate(refreshInvitations: Bool = true) {
+    let m = ChatModel.shared
+    if (!m.chatInitialized) {
+        do {
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
+        } catch let error {
+            fatalError("Failed to start or load chats: \(responseError(error))")
+        }
+    }
+}
+
+func startChatAndActivate() {
+    if ChatModel.shared.chatRunning == true {
+        ChatReceiver.shared.start()
+    }
+    if .active != appStateGroupDefault.get()  {
+        activateChat()
+    }
+}

apps/ios/Shared/SimpleXApp.swift

@@ -21,6 +21,9 @@ struct SimpleXApp: App {
     @State private var userAuthorized: Bool?
     @State private var doAuthenticate = false
     @State private var enteredBackground: TimeInterval? = nil
+    @State private var canConnectCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+    @State private var showInitializationView = false
 
     init() {
         hs_init(0, nil)
@@ -34,44 +37,52 @@ struct SimpleXApp: App {
 
     var body: some Scene {
         return WindowGroup {
-            ContentView(doAuthenticate: $doAuthenticate, userAuthorized: $userAuthorized)
+            ContentView(
+                doAuthenticate: $doAuthenticate,
+                userAuthorized: $userAuthorized,
+                canConnectCall: $canConnectCall,
+                lastSuccessfulUnlock: $lastSuccessfulUnlock,
+                showInitializationView: $showInitializationView
+            )
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
                 }
                 .onAppear() {
-                    if (!chatModel.chatInitialized) {
-                        do {
-                            chatModel.v3DBMigration = v3DBMigrationDefault.get()
-                            try initializeChat(start: chatModel.v3DBMigration.startChat)
-                        } catch let error {
-                            fatalError("Failed to start or load chats: \(responseError(error))")
-                        }
+                    showInitializationView = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                        initChatAndMigrate()
                     }
                 }
                 .onChange(of: scenePhase) { phase in
-                    logger.debug("scenePhase \(String(describing: scenePhase))")
+                    logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                     switch (phase) {
                     case .background:
-                        suspendChat()
-                        BGManager.shared.schedule()
+                        if CallController.useCallKit() && chatModel.activeCall != nil {
+                            CallController.shared.shouldSuspendChat = true
+                        } else {
+                            suspendChat()
+                            BGManager.shared.schedule()
+                        }
                         if userAuthorized == true {
                             enteredBackground = ProcessInfo.processInfo.systemUptime
                         }
                         doAuthenticate = false
-                        NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCount())
+                        canConnectCall = false
+                        NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                     case .active:
-                        if chatModel.chatRunning == true {
-                            ChatReceiver.shared.start()
-                        }
+                        CallController.shared.shouldSuspendChat = false
                         let appState = appStateGroupDefault.get()
-                        activateChat()
+                        startChatAndActivate()
                         if appState.inactive && chatModel.chatRunning == true {
                             updateChats()
-                            updateCallInvitations()
+                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                updateCallInvitations()
+                            }
                         }
                         doAuthenticate = authenticationExpired()
+                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                     default:
                         break
                     }
@@ -105,12 +116,21 @@ struct SimpleXApp: App {
 
     private func authenticationExpired() -> Bool {
         if let enteredBackground = enteredBackground {
-            return ProcessInfo.processInfo.systemUptime - enteredBackground >= 30
+            let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
         } else {
             return true
         }
     }
 
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
+        } else {
+            return false
+        }
+    }
+
     private func updateChats() {
         do {
             let chats = try apiGetChats()

apps/ios/Shared/Views/Call/ActiveCallView.swift

@@ -13,37 +13,73 @@ import SimpleXChat
 struct ActiveCallView: View {
     @EnvironmentObject var m: ChatModel
     @ObservedObject var call: Call
-    @State private var rtcWebView: WKWebView? = nil
-    @State private var webViewMsg: WVAPIMessage? = nil
+    @Environment(\.scenePhase) var scenePhase
+    @State private var client: WebRTCClient? = nil
+    @State private var activeCall: WebRTCClient.Call? = nil
+    @State private var localRendererAspectRatio: CGFloat? = nil
+    @Binding var canConnectCall: Bool
 
     var body: some View {
         ZStack(alignment: .bottom) {
-            WebRTCView(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg)
-                .onAppear() { sendCommandToWebView() }
-                .onChange(of: m.callCommand) { _ in sendCommandToWebView() }
-                .onChange(of: rtcWebView) { _ in sendCommandToWebView() }
-                .onChange(of: webViewMsg) { _ in processWebViewMessage() }
-                .background(.black)
-            if let call = m.activeCall, let webView = rtcWebView  {
-                ActiveCallOverlay(call: call, webView: webView)
+            if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
+                GeometryReader { g in
+                    let width = g.size.width * 0.3
+                    ZStack(alignment: .topTrailing) {
+                        CallViewRemote(client: client, activeCall: $activeCall)
+                        CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio)
+                            .cornerRadius(10)
+                            .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
+                            .padding([.top, .trailing], 17)
+                    }
+                }
+            }
+            if let call = m.activeCall, let client = client {
+                ActiveCallOverlay(call: call, client: client)
             }
         }
+        .onAppear {
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
+            createWebRTCClient()
+            dismissAllSheets()
+        }
+        .onChange(of: canConnectCall) { _ in
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
+            createWebRTCClient()
+        }
+        .onDisappear {
+            logger.debug("ActiveCallView: disappear")
+            client?.endCall()
+        }
+        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
+        .background(.black)
         .preferredColorScheme(.dark)
     }
 
-    private func sendCommandToWebView() {
-        if m.activeCall != nil,
-           let wv = rtcWebView,
-           let cmd = m.callCommand {
-            m.callCommand = nil
-            sendCallCommand(wv, cmd)
+    private func createWebRTCClient() {
+        if client == nil && canConnectCall {
+            client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            sendCommandToClient()
         }
     }
 
-    private func processWebViewMessage() {
-        if let msg = webViewMsg,
-           let call = m.activeCall,
-           let webView = rtcWebView {
+    private func sendCommandToClient() {
+        if call == m.activeCall,
+           m.activeCall != nil,
+           let client = client,
+           let cmd = m.callCommand {
+            m.callCommand = nil
+            logger.debug("sendCallCommand: \(cmd.cmdType)")
+            Task {
+                await client.sendCallCommand(command: cmd)
+            }
+        }
+    }
+
+    @MainActor
+    private func processRtcMessage(msg: WVAPIMessage) {
+        if call == m.activeCall,
+            let call = m.activeCall,
+            let client = client {
             logger.debug("ActiveCallView: response \(msg.resp.respType)")
             switch msg.resp {
             case let .capabilities(capabilities):
@@ -54,7 +90,7 @@ struct ActiveCallView: View {
                     } catch {
                         logger.error("apiSendCallInvitation \(responseError(error))")
                     }
-                    DispatchQueue.main.async {
+                    await MainActor.run {
                         call.callState = .invitationSent
                         call.localCapabilities = capabilities
                     }
@@ -67,7 +103,7 @@ struct ActiveCallView: View {
                     } catch {
                         logger.error("apiSendCallOffer \(responseError(error))")
                     }
-                    DispatchQueue.main.async {
+                    await MainActor.run {
                         call.callState = .offerSent
                         call.localCapabilities = capabilities
                     }
@@ -79,7 +115,7 @@ struct ActiveCallView: View {
                     } catch {
                         logger.error("apiSendCallAnswer \(responseError(error))")
                     }
-                    DispatchQueue.main.async {
+                    await MainActor.run {
                         call.callState = .negotiated
                     }
                 }
@@ -94,17 +130,14 @@ struct ActiveCallView: View {
             case let .connection(state):
                 if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
                    case .connected = callStatus {
-//                    if case .outgoing = call.direction {
-//                        CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
-//                    }
+                    call.direction == .outgoing
+                        ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
+                        : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                     call.callState = .connected
-                    // CallKit doesn't work well with WKWebView
-                    // This is a hack to enable microphone in WKWebView after CallKit takes over it
-                    if CallController.useCallKit {
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-                            m.callCommand = .camera(camera: call.localCamera)
-                        }
-                    }
+                }
+                if state.connectionState == "closed" {
+                    closeCallView(client)
+                    m.activeCall = nil
                 }
                 Task {
                     do {
@@ -117,7 +150,7 @@ struct ActiveCallView: View {
                 call.callState = .connected
                 call.connectionInfo = connectionInfo
             case .ended:
-                closeCallView(webView)
+                closeCallView(client)
                 call.callState = .ended
                 if let uuid = call.callkitUUID {
                     CallController.shared.endCall(callUUID: uuid)
@@ -126,17 +159,8 @@ struct ActiveCallView: View {
                 switch msg.command {
                 case .answer:
                     call.callState = .negotiated
-                case let .camera(camera):
-                    call.localCamera = camera
-                    Task {
-                        // This disables microphone if it was disabled before flipping the camera
-                        await webView.setMicrophoneCaptureState(call.audioEnabled ? .active : .muted)
-                        // This compensates for the bug on some devices when remote video does not appear
-                        // await webView.setCameraCaptureState(.muted)
-                        // await webView.setCameraCaptureState(call.videoEnabled ? .active : .muted)
-                    }
                 case .end:
-                    closeCallView(webView)
+                    closeCallView(client)
                     m.activeCall = nil
                 default: ()
                 }
@@ -148,11 +172,9 @@ struct ActiveCallView: View {
         }
     }
 
-    private func closeCallView(_ webView: WKWebView) {
-        m.showCallView = false
-        Task {
-            await webView.setMicrophoneCaptureState(.muted)
-            await webView.setCameraCaptureState(.muted)
+    private func closeCallView(_ client: WebRTCClient) {
+        if m.activeCall != nil {
+            m.showCallView = false
         }
     }
 }
@@ -160,7 +182,7 @@ struct ActiveCallView: View {
 struct ActiveCallOverlay: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var call: Call
-    var webView: WKWebView
+    var client: WebRTCClient
 
     var body: some View {
         VStack {
@@ -210,6 +232,8 @@ struct ActiveCallOverlay: View {
                     toggleAudioButton()
                         .frame(maxWidth: .infinity, alignment: .leading)
                     endCallButton()
+                    toggleSpeakerButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                 }
                 .padding(.bottom, 60)
                 .padding(.horizontal, 48)
@@ -228,8 +252,9 @@ struct ActiveCallOverlay: View {
                 Text(call.callState.text)
                 HStack {
                     Text(call.encryptionStatus)
-                    if let connInfo = call.connectionInfo?.text {
-                        Text("(") + Text(connInfo) + Text(")")
+                    if let connInfo = call.connectionInfo {
+//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
+                        Text("(") + Text(connInfo.text) + Text(")")
                     }
                 }
             }
@@ -240,7 +265,7 @@ struct ActiveCallOverlay: View {
 
     private func endCallButton() -> some View {
         let cc = CallController.shared
-        return callButton("phone.down.fill", size: 60) {
+        return callButton("phone.down.fill", width: 60, height: 60) {
             if let uuid = call.callkitUUID {
                 cc.endCall(callUUID: uuid)
             } else {
@@ -253,7 +278,7 @@ struct ActiveCallOverlay: View {
     private func toggleAudioButton() -> some View {
         controlButton(call, call.audioEnabled ? "mic.fill" : "mic.slash") {
             Task {
-                await webView.setMicrophoneCaptureState(call.audioEnabled ? .muted : .active)
+                client.setAudioEnabled(!call.audioEnabled)
                 DispatchQueue.main.async {
                     call.audioEnabled = !call.audioEnabled
                 }
@@ -261,10 +286,21 @@ struct ActiveCallOverlay: View {
         }
     }
 
+    private func toggleSpeakerButton() -> some View {
+        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
+            Task {
+                client.setSpeakerEnabledAndConfigureSession(!call.speakerEnabled)
+                DispatchQueue.main.async {
+                    call.speakerEnabled = !call.speakerEnabled
+                }
+            }
+        }
+    }
+
     private func toggleVideoButton() -> some View {
         controlButton(call, call.videoEnabled ? "video.fill" : "video.slash") {
             Task {
-                await webView.setCameraCaptureState(call.videoEnabled ? .muted : .active)
+                client.setVideoEnabled(!call.videoEnabled)
                 DispatchQueue.main.async {
                     call.videoEnabled = !call.videoEnabled
                 }
@@ -273,40 +309,31 @@ struct ActiveCallOverlay: View {
     }
 
     @ViewBuilder private func flipCameraButton() -> some View {
-        let cmd = WCallCommand.camera(camera: call.localCamera == .user ? .environment : .user)
         controlButton(call, "arrow.triangle.2.circlepath") {
-            if call.audioEnabled {
-                chatModel.callCommand = cmd
-            } else {
                 Task {
-                    // Microphone has to be enabled before flipping the camera to avoid prompt for user permission when getUserMedia is called in webview
-                    await webView.setMicrophoneCaptureState(.active)
-                    DispatchQueue.main.async {
-                        chatModel.callCommand = cmd
-                    }
+                    client.flipCamera()
                 }
-            }
         }
     }
 
     @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, _ perform: @escaping () -> Void) -> some View {
         if call.hasMedia {
-            callButton(imageName, size: 40, perform)
+            callButton(imageName, width: 50, height: 38, perform)
                 .foregroundColor(.white)
                 .opacity(0.85)
         } else {
-            Color.clear.frame(width: 40, height: 40)
+            Color.clear.frame(width: 50, height: 38)
         }
     }
 
-    private func callButton(_ imageName: String, size: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    private func callButton(_ imageName: String, width: CGFloat, height: CGFloat, _ perform: @escaping () -> Void) -> some View {
         Button {
             perform()
         } label: {
             Image(systemName: imageName)
                 .resizable()
                 .scaledToFit()
-                .frame(maxWidth: size, maxHeight: size)
+                .frame(maxWidth: width, maxHeight: height)
         }
     }
 }
@@ -314,9 +341,9 @@ struct ActiveCallOverlay: View {
 struct ActiveCallOverlay_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), webView: WKWebView())
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), webView: WKWebView())
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
         }
     }

apps/ios/Shared/Views/Call/CallController.swift

@@ -7,192 +7,317 @@
 //
 
 import Foundation
-//import CallKit
+import CallKit
+import StoreKit
+import PushKit
 import AVFoundation
 import SimpleXChat
+import WebRTC
 
-//class CallController: NSObject, CXProviderDelegate, ObservableObject {
-class CallController: NSObject, ObservableObject {
-    static let useCallKit = false
+class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, ObservableObject {
     static let shared = CallController()
-//    private let provider = CXProvider(configuration: CallController.configuration)
-//    private let controller = CXCallController()
+    static let isInChina = SKStorefront().countryCode == "CHN"
+    static func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }
+
+    private let provider = CXProvider(configuration: {
+        let configuration = CXProviderConfiguration()
+        configuration.supportsVideo = true
+        configuration.supportedHandleTypes = [.generic]
+        configuration.includesCallsInRecents = UserDefaults.standard.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
+        configuration.maximumCallGroups = 1
+        configuration.maximumCallsPerCallGroup = 1
+        configuration.iconTemplateImageData = UIImage(named: "icon-transparent")?.pngData()
+        return configuration
+    }())
+    private let controller = CXCallController()
     private let callManager = CallManager()
     @Published var activeCallInvitation: RcvCallInvitation?
+    var shouldSuspendChat: Bool = false
+    var fulfillOnConnect: CXAnswerCallAction? = nil
 
-// PKPushRegistry will be used from notification service extension
-//    let registry = PKPushRegistry(queue: nil)
-
-//    static let configuration: CXProviderConfiguration = {
-//        let configuration = CXProviderConfiguration()
-//        configuration.supportsVideo = true
-//        configuration.supportedHandleTypes = [.generic]
-//        configuration.includesCallsInRecents = true // TODO disable or add option
-//        configuration.maximumCallsPerCallGroup = 1
-//        return configuration
-//    }()
+    // PKPushRegistry is used from notification service extension
+    private let registry = PKPushRegistry(queue: nil)
 
     override init() {
         super.init()
-//        self.provider.setDelegate(self, queue: nil)
-//        self.registry.delegate = self
-//        self.registry.desiredPushTypes = [.voIP]
+        provider.setDelegate(self, queue: nil)
+        registry.delegate = self
+        registry.desiredPushTypes = [.voIP]
     }
 
-//    func providerDidReset(_ provider: CXProvider) {
-//    }
+    func providerDidReset(_ provider: CXProvider) {
+        logger.debug("CallController.providerDidReset")
+    }
 
-//    func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
-//        logger.debug("CallController.provider CXStartCallAction")
-//        if callManager.startOutgoingCall(callUUID: action.callUUID) {
-//            action.fulfill()
-//            provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
-//        } else {
-//            action.fail()
-//        }
-//    }
+    func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
+        logger.debug("CallController.provider CXStartCallAction")
+        if callManager.startOutgoingCall(callUUID: action.callUUID) {
+            action.fulfill()
+            provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
+        } else {
+            action.fail()
+        }
+    }
 
-//    func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
-//        logger.debug("CallController.provider CXAnswerCallAction")
-//        if callManager.answerIncomingCall(callUUID: action.callUUID) {
-//            action.fulfill()
-//        } else {
-//            action.fail()
-//        }
-//    }
+    func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
+        logger.debug("CallController.provider CXAnswerCallAction")
+        if callManager.answerIncomingCall(callUUID: action.callUUID) {
+            // WebRTC call should be in connected state to fulfill.
+            // Otherwise no audio and mic working on lockscreen
+            fulfillOnConnect = action
+        } else {
+            action.fail()
+        }
+    }
 
-//    func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
-//        logger.debug("CallController.provider CXEndCallAction")
-//        callManager.endCall(callUUID: action.callUUID) { ok in
-//            if ok {
-//                action.fulfill()
-//            } else {
-//                action.fail()
-//            }
-//        }
-//    }
+    func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
+        logger.debug("CallController.provider CXEndCallAction")
+        // Should be nil here if connection was in connected state
+        fulfillOnConnect?.fail()
+        fulfillOnConnect = nil
+        callManager.endCall(callUUID: action.callUUID) { ok in
+            if ok {
+                action.fulfill()
+            } else {
+                action.fail()
+            }
+            self.suspendOnEndCall()
+        }
+    }
 
-//    func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
-//        print("timed out", #function)
-//        action.fulfill()
-//    }
+    func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
+        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID) {
+            action.fulfill()
+        } else {
+            action.fail()
+        }
+    }
 
-//    func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
-//        print("received", #function)
-////        do {
-////            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
-////            logger.debug("audioSession category set")
-////            try audioSession.setActive(true)
-////            logger.debug("audioSession activated")
-////        } catch {
-////            print(error)
-////            logger.error("failed activating audio session")
-////        }
-//    }
+    func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
+        logger.debug("timed out: \(String(describing: action))")
+        action.fulfill()
+    }
 
-//    func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
-//        print("received", #function)
-//    }
+    func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
+        logger.debug("CallController: activating audioSession and audio in WebRTCClient")
+        RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
+        RTCAudioSession.sharedInstance().isAudioEnabled = true
+        do {
+            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
+            logger.debug("audioSession category set")
+            try audioSession.setActive(true)
+            logger.debug("audioSession activated")
+        } catch {
+            print(error)
+            logger.error("failed activating audio session")
+        }
+    }
 
-//    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-//
-//    }
+    func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
+        logger.debug("CallController: deactivating audioSession and audio in WebRTCClient")
+        RTCAudioSession.sharedInstance().audioSessionDidDeactivate(audioSession)
+        RTCAudioSession.sharedInstance().isAudioEnabled = false
+        do {
+            try audioSession.setActive(false)
+            logger.debug("audioSession deactivated")
+        } catch {
+            print(error)
+            logger.error("failed deactivating audio session")
+        }
+        suspendOnEndCall()
+    }
 
-// This will be needed when we have notification service extension
-//    func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-//        if type == .voIP {
-//           // Extract the call information from the push notification payload
-//            if let displayName = payload.dictionaryPayload["displayName"] as? String,
-//               let contactId = payload.dictionaryPayload["contactId"] as? String,
-//               let uuidStr = payload.dictionaryPayload["uuid"] as? String,
-//               let uuid = UUID(uuidString: uuidStr) {
-//                let callUpdate = CXCallUpdate()
-//                callUpdate.remoteHandle = CXHandle(type: .phoneNumber, value: displayName)
-//                provider.reportNewIncomingCall(with: uuid, update: callUpdate, completion: { error in
-//                    if error != nil {
-//                        let m = ChatModel.shared
-//                        m.callInvitations.removeValue(forKey: contactId)
-//                    }
-//                    // Tell PushKit that the notification is handled.
-//                    completion()
-//                })
-//            }
-//        }
-//    }
+    func suspendOnEndCall() {
+        if shouldSuspendChat {
+            // The delay allows to accept the second call before suspending a chat
+            // see `.onChange(of: scenePhase)` in SimpleXApp
+            DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
+                if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
+                    self?.shouldSuspendChat = false
+                    suspendChat()
+                    BGManager.shared.schedule()
+                }
+            }
+        }
+    }
+
+    @objc(pushRegistry:didUpdatePushCredentials:forType:)
+    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
+    }
+
+    func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
+        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
+        if type != .voIP {
+            completion()
+            return
+        }
+        logger.debug("CallController: initializing chat")
+        if (!ChatModel.shared.chatInitialized) {
+            initChatAndMigrate(refreshInvitations: false)
+        }
+        startChatAndActivate()
+        shouldSuspendChat = true
+        // There are no invitations in the model, as it was processed by NSE
+        _ = try? justRefreshCallInvitations()
+        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
+        // Extract the call information from the push notification payload
+        let m = ChatModel.shared
+        if let contactId = payload.dictionaryPayload["contactId"] as? String,
+           let invitation = m.callInvitations[contactId] {
+            let update = cxCallUpdate(invitation: invitation)
+            if let uuid = invitation.callkitUUID {
+                logger.debug("CallController: report pushkit call via CallKit")
+                let update = cxCallUpdate(invitation: invitation)
+                provider.reportNewIncomingCall(with: uuid, update: update) { error in
+                    if error != nil {
+                        m.callInvitations.removeValue(forKey: contactId)
+                    }
+                    // Tell PushKit that the notification is handled.
+                    completion()
+                }
+            } else {
+                reportExpiredCall(update: update, completion)
+            }
+        } else {
+            reportExpiredCall(payload: payload, completion)
+        }
+    }
+
+    // This function fulfils the requirement to always report a call when PushKit notification is received,
+    // even when there is no more active calls by the time PushKit payload is processed.
+    // See the note in the bottom of this article:
+    // https://developer.apple.com/documentation/pushkit/pkpushregistrydelegate/2875784-pushregistry
+    private func reportExpiredCall(update: CXCallUpdate, _ completion: @escaping () -> Void) {
+        logger.debug("CallController: report expired pushkit call via CallKit")
+        let uuid = UUID()
+        provider.reportNewIncomingCall(with: uuid, update: update) { error in
+            if error == nil {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    self.provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
+                }
+            }
+            completion()
+        }
+    }
+
+    private func reportExpiredCall(payload: PKPushPayload, _ completion: @escaping () -> Void) {
+        let update = CXCallUpdate()
+        let displayName = payload.dictionaryPayload["displayName"] as? String
+        let media = payload.dictionaryPayload["media"] as? String
+        update.localizedCallerName = displayName ?? NSLocalizedString("Unknown caller", comment: "callkit banner")
+        update.hasVideo = media == CallMediaType.video.rawValue
+        reportExpiredCall(update: update, completion)
+    }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall")
-//        if CallController.useCallKit, let uuid = invitation.callkitUUID {
-//            let update = CXCallUpdate()
-//            update.remoteHandle = CXHandle(type: .generic, value: invitation.contact.displayName)
-//            update.hasVideo = invitation.peerMedia == .video
-//            provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
-//        } else {
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
+            if invitation.callTs.timeIntervalSinceNow >= -180 {
+                let update = cxCallUpdate(invitation: invitation)
+                provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
+            }
+        } else {
             NtfManager.shared.notifyCallInvitation(invitation)
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 activeCallInvitation = invitation
             }
-//        }
+        }
     }
 
-//    func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
-//        if CallController.useCallKit, let uuid = call.callkitUUID {
-//            provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
-//        }
-//    }
+    private func cxCallUpdate(invitation: RcvCallInvitation) -> CXCallUpdate {
+        let update = CXCallUpdate()
+        update.remoteHandle = CXHandle(type: .generic, value: invitation.contact.id)
+        update.hasVideo = invitation.callType.media == .video
+        update.localizedCallerName = invitation.contact.displayName
+        return update
+    }
+
+    func reportIncomingCall(call: Call, connectedAt dateConnected: Date?) {
+        logger.debug("CallController: reporting incoming call connected")
+        if CallController.useCallKit() {
+            // Fulfilling this action only after connect, otherwise there are no audio and mic on lockscreen
+            fulfillOnConnect?.fulfill()
+            fulfillOnConnect = nil
+        }
+    }
+
+    func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
+        logger.debug("CallController: reporting outgoing call connected")
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
+            provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
+        }
+    }
 
     func reportCallRemoteEnded(invitation: RcvCallInvitation) {
-//        if CallController.useCallKit, let uuid = invitation.callkitUUID {
-//            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
-//        } else if invitation.contact.id == activeCallInvitation?.contact.id {
+        logger.debug("CallController: reporting remote ended")
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
+            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
+        } else if invitation.contact.id == activeCallInvitation?.contact.id {
             activeCallInvitation = nil
-//        }
+        }
     }
 
-//    func reportCallRemoteEnded(call: Call) {
-//        if CallController.useCallKit, let uuid = call.callkitUUID {
-//            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
-//        }
-//    }
+    func reportCallRemoteEnded(call: Call) {
+        logger.debug("CallController: reporting remote ended")
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
+            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
+        }
+    }
 
     func startCall(_ contact: Contact, _ media: CallMediaType) {
         logger.debug("CallController.startCall")
         let uuid = callManager.newOutgoingCall(contact, media)
-//        if CallController.useCallKit {
-//            let handle = CXHandle(type: .generic, value: contact.displayName)
-//            let action = CXStartCallAction(call: uuid, handle: handle)
-//            action.isVideo = media == .video
-//            requestTransaction(with: action)
-//        } else if callManager.startOutgoingCall(callUUID: uuid) {
-        if callManager.startOutgoingCall(callUUID: uuid) {
-            logger.debug("CallController.startCall: call started")
-        } else {
-            logger.error("CallController.startCall: no active call")
+        if CallController.useCallKit() {
+            let handle = CXHandle(type: .generic, value: contact.id)
+            let action = CXStartCallAction(call: uuid, handle: handle)
+            action.isVideo = media == .video
+            requestTransaction(with: action) {
+                let update = CXCallUpdate()
+                update.remoteHandle = CXHandle(type: .generic, value: contact.id)
+                update.hasVideo = media == .video
+                update.localizedCallerName = contact.displayName
+                self.provider.reportCall(with: uuid, updated: update)
+            }
+        } else if callManager.startOutgoingCall(callUUID: uuid) {
+            if callManager.startOutgoingCall(callUUID: uuid) {
+                logger.debug("CallController.startCall: call started")
+            } else {
+                logger.error("CallController.startCall: no active call")
+            }
         }
     }
 
     func answerCall(invitation: RcvCallInvitation) {
-        callManager.answerIncomingCall(invitation: invitation)
+        logger.debug("CallController: answering a call")
+        if CallController.useCallKit(), let callUUID = invitation.callkitUUID {
+            requestTransaction(with: CXAnswerCallAction(call: callUUID))
+        } else {
+            callManager.answerIncomingCall(invitation: invitation)
+        }
         if invitation.contact.id == self.activeCallInvitation?.contact.id {
             self.activeCallInvitation = nil
         }
     }
 
     func endCall(callUUID: UUID) {
-//        if CallController.useCallKit {
-//            requestTransaction(with: CXEndCallAction(call: callUUID))
-//        } else {
+        logger.debug("CallController: ending the call with UUID \(callUUID.uuidString)")
+        if CallController.useCallKit() {
+            requestTransaction(with: CXEndCallAction(call: callUUID))
+        } else {
             callManager.endCall(callUUID: callUUID) { ok in
                 if ok {
                     logger.debug("CallController.endCall: call ended")
                 } else {
-                    logger.error("CallController.endCall: no actove call pr call invitation to end")
+                    logger.error("CallController.endCall: no active call pr call invitation to end")
                 }
             }
-//        }
+        }
     }
 
     func endCall(invitation: RcvCallInvitation) {
+        logger.debug("CallController: ending the call with invitation")
         callManager.endCall(invitation: invitation) {
             if invitation.contact.id == self.activeCallInvitation?.contact.id {
                 DispatchQueue.main.async {
@@ -203,6 +328,7 @@ class CallController: NSObject, ObservableObject {
     }
 
     func endCall(call: Call, completed: @escaping () -> Void) {
+        logger.debug("CallController: ending the call with call instance")
         callManager.endCall(call: call, completed: completed)
     }
 
@@ -213,15 +339,24 @@ class CallController: NSObject, ObservableObject {
         }
     }
 
-//    private func requestTransaction(with action: CXAction) {
-//        let t = CXTransaction()
-//        t.addAction(action)
-//        controller.request(t) { error in
-//            if let error = error {
-//                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
-//            } else {
-//                logger.debug("CallController.requestTransaction requested transaction successfully")
-//            }
-//        }
-//    }
+    func showInRecents(_ show: Bool) {
+        let conf = provider.configuration
+        conf.includesCallsInRecents = show
+        provider.configuration = conf
+    }
+
+    func hasActiveCalls() -> Bool {
+        controller.callObserver.calls.count > 0
+    }
+
+    private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
+        controller.request(CXTransaction(action: action)) { error in
+            if let error = error {
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
+            } else {
+                logger.debug("CallController.requestTransaction requested transaction successfully")
+                onSuccess()
+            }
+        }
+    }
 }

apps/ios/Shared/Views/Call/CallManager.swift

@@ -12,7 +12,9 @@ import SimpleXChat
 class CallManager {
     func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
         let uuid = UUID()
-        ChatModel.shared.activeCall = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
+        let call = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
+        call.speakerEnabled = media == .video
+        ChatModel.shared.activeCall = call
         return uuid
     }
 
@@ -20,7 +22,7 @@ class CallManager {
         let m = ChatModel.shared
         if let call = m.activeCall, call.callkitUUID == callUUID {
             m.showCallView = true
-            m.callCommand = .capabilities(media: call.localMedia, useWorker: true)
+            m.callCommand = .capabilities(media: call.localMedia)
             return true
         }
         return false
@@ -37,7 +39,7 @@ class CallManager {
     func answerIncomingCall(invitation: RcvCallInvitation) {
         let m = ChatModel.shared
         m.callInvitations.removeValue(forKey: invitation.contact.id)
-        m.activeCall = Call(
+        let call = Call(
             direction: .incoming,
             contact: invitation.contact,
             callkitUUID: invitation.callkitUUID,
@@ -45,18 +47,32 @@ class CallManager {
             localMedia: invitation.callType.media,
             sharedKey: invitation.sharedKey
         )
-        m.showCallView = true
+        call.speakerEnabled = invitation.callType.media == .video
         let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
         let iceServers = getIceServers()
         logger.debug("answerIncomingCall useRelay: \(useRelay)")
         logger.debug("answerIncomingCall iceServers: \(String(describing: iceServers))")
-        m.callCommand = .start(
-            media: invitation.callType.media,
-            aesKey: invitation.sharedKey,
-            useWorker: true,
-            iceServers: iceServers,
-            relay: useRelay
-        )
+        // When in active call user wants to accept another call, this can only work after delay (to hide and show activeCallView)
+        DispatchQueue.main.asyncAfter(deadline: .now() + (m.activeCall == nil ? 0 : 1)) {
+            m.activeCall = call
+            m.showCallView = true
+
+            m.callCommand = .start(
+                media: invitation.callType.media,
+                aesKey: invitation.sharedKey,
+                iceServers: iceServers,
+                relay: useRelay
+            )
+        }
+    }
+
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
+            let m = ChatModel.shared
+            m.callCommand = .media(media: media, enable: enable)
+            return true
+        }
+        return false
     }
 
     func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
@@ -79,17 +95,15 @@ class CallManager {
         } else {
             logger.debug("CallManager.endCall: ending call...")
             m.callCommand = .end
+            m.activeCall = nil
             m.showCallView = false
+            completed()
             Task {
                 do {
                     try await apiEndCall(call.contact)
                 } catch {
                     logger.error("CallController.provider apiEndCall error: \(responseError(error))")
                 }
-                DispatchQueue.main.async {
-                    m.activeCall = nil
-                    completed()
-                }
             }
         }
     }

apps/ios/Shared/Views/Call/CallViewRenderers.swift

@@ -0,0 +1,75 @@
+//
+// Created by Avently on 09.02.2023.
+// Copyright (c) 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import WebRTC
+import SimpleXChat
+
+struct CallViewRemote: UIViewRepresentable {
+    var client: WebRTCClient
+    var activeCall: Binding<WebRTCClient.Call?>
+
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>) {
+        self.client = client
+        self.activeCall = activeCall
+    }
+
+    func makeUIView(context: Context) -> UIView {
+        let view = UIView()
+        if let call = activeCall.wrappedValue {
+            let remoteRenderer = RTCMTLVideoView(frame: view.frame)
+            remoteRenderer.videoContentMode = .scaleAspectFill
+            client.addRemoteRenderer(call, remoteRenderer)
+            addSubviewAndResize(remoteRenderer, into: view)
+        }
+        return view
+    }
+
+    func updateUIView(_ view: UIView, context: Context) {
+        logger.debug("CallView.updateUIView remote")
+    }
+}
+
+struct CallViewLocal: UIViewRepresentable {
+    var client: WebRTCClient
+    var activeCall: Binding<WebRTCClient.Call?>
+    var localRendererAspectRatio: Binding<CGFloat?>
+
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>) {
+        self.client = client
+        self.activeCall = activeCall
+        self.localRendererAspectRatio = localRendererAspectRatio
+    }
+
+    func makeUIView(context: Context) -> UIView {
+        let view = UIView()
+        if let call = activeCall.wrappedValue {
+            let localRenderer = RTCEAGLVideoView(frame: .zero)
+            client.addLocalRenderer(call, localRenderer)
+            client.startCaptureLocalVideo(call)
+            addSubviewAndResize(localRenderer, into: view)
+        }
+        return view
+    }
+
+    func updateUIView(_ view: UIView, context: Context) {
+        logger.debug("CallView.updateUIView local")
+    }
+}
+
+private func addSubviewAndResize(_ view: UIView, into containerView: UIView) {
+    containerView.addSubview(view)
+    view.translatesAutoresizingMaskIntoConstraints = false
+    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|",
+        options: [],
+        metrics: nil,
+        views: ["view": view]))
+
+    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|",
+        options: [],
+        metrics: nil,
+        views: ["view": view]))
+    containerView.layoutIfNeeded()
+}

apps/ios/Shared/Views/Call/IncomingCallView.swift

@@ -29,6 +29,10 @@ struct IncomingCallView: View {
     private func incomingCall(_ invitation: RcvCallInvitation) -> some View {
         VStack(alignment: .leading, spacing: 6) {
             HStack {
+                if m.users.count > 1 {
+                    ProfileImage(imageStr: invitation.user.image, color: .white)
+                        .frame(width: 24, height: 24)
+                }
                 Image(systemName: invitation.callType.media == .video ? "video.fill" : "phone.fill").foregroundColor(.green)
                 Text(invitation.callTypeText)
             }
@@ -61,6 +65,7 @@ struct IncomingCallView: View {
         .padding(.vertical, 12)
         .frame(maxWidth: .infinity)
         .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .onAppear { dismissAllSheets() }
     }
 
     private func callButton(_ text: LocalizedStringKey, _ image: String, _ color: Color, action: @escaping () -> Void) -> some View {
@@ -82,6 +87,8 @@ struct IncomingCallView: View {
 struct IncomingCallView_Previews: PreviewProvider {
     static var previews: some View {
         CallController.shared.activeCallInvitation = RcvCallInvitation.sampleData
-        return IncomingCallView()
+        let m = ChatModel()
+        m.users = [UserInfo.sampleData, UserInfo.sampleData]
+        return IncomingCallView().environmentObject(m)
     }
 }

apps/ios/Shared/Views/Call/WebRTC.swift

@@ -9,6 +9,7 @@
 import Foundation
 import SwiftUI
 import SimpleXChat
+import WebRTC
 
 class Call: ObservableObject, Equatable {
     static func == (lhs: Call, rhs: Call) -> Bool {
@@ -24,8 +25,8 @@ class Call: ObservableObject, Equatable {
     @Published var peerMedia: CallMediaType?
     @Published var sharedKey: String?
     @Published var audioEnabled = true
+    @Published var speakerEnabled = false
     @Published var videoEnabled: Bool
-    @Published var localCamera = VideoCamera.user
     @Published var connectionInfo: ConnectionInfo?
 
     init(
@@ -103,21 +104,18 @@ struct WVAPIMessage: Equatable, Decodable, Encodable {
 }
 
 enum WCallCommand: Equatable, Encodable, Decodable {
-    case capabilities(media: CallMediaType, useWorker: Bool? = nil)
-    case start(media: CallMediaType, aesKey: String? = nil, useWorker: Bool? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
-    case offer(offer: String, iceCandidates: String, media: CallMediaType, aesKey: String? = nil, useWorker: Bool? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
+    case capabilities(media: CallMediaType)
+    case start(media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
+    case offer(offer: String, iceCandidates: String, media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
     case answer(answer: String, iceCandidates: String)
     case ice(iceCandidates: String)
     case media(media: CallMediaType, enable: Bool)
-    case camera(camera: VideoCamera)
     case end
 
     enum CodingKeys: String, CodingKey {
         case type
         case media
-        case camera
         case aesKey
-        case useWorker
         case offer
         case answer
         case iceCandidates
@@ -135,7 +133,6 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             case .answer: return "answer"
             case .ice: return "ice"
             case .media: return "media"
-            case .camera: return "camera"
             case .end: return "end"
             }
         }
@@ -144,24 +141,21 @@ enum WCallCommand: Equatable, Encodable, Decodable {
     func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         switch self {
-        case let .capabilities(media, useWorker):
+        case let .capabilities(media):
             try container.encode("capabilities", forKey: .type)
             try container.encode(media, forKey: .media)
-            try container.encode(useWorker, forKey: .useWorker)
-        case let .start(media, aesKey, useWorker, iceServers, relay):
+        case let .start(media, aesKey, iceServers, relay):
             try container.encode("start", forKey: .type)
             try container.encode(media, forKey: .media)
             try container.encode(aesKey, forKey: .aesKey)
-            try container.encode(useWorker, forKey: .useWorker)
             try container.encode(iceServers, forKey: .iceServers)
             try container.encode(relay, forKey: .relay)
-        case let .offer(offer, iceCandidates, media, aesKey, useWorker, iceServers, relay):
+        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
             try container.encode("offer", forKey: .type)
             try container.encode(offer, forKey: .offer)
             try container.encode(iceCandidates, forKey: .iceCandidates)
             try container.encode(media, forKey: .media)
             try container.encode(aesKey, forKey: .aesKey)
-            try container.encode(useWorker, forKey: .useWorker)
             try container.encode(iceServers, forKey: .iceServers)
             try container.encode(relay, forKey: .relay)
         case let .answer(answer, iceCandidates):
@@ -175,9 +169,6 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             try container.encode("media", forKey: .type)
             try container.encode(media, forKey: .media)
             try container.encode(enable, forKey: .enable)
-        case let .camera(camera):
-            try container.encode("camera", forKey: .type)
-            try container.encode(camera, forKey: .camera)
         case .end:
             try container.encode("end", forKey: .type)
         }
@@ -189,24 +180,21 @@ enum WCallCommand: Equatable, Encodable, Decodable {
         switch type {
         case "capabilities":
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
-            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
-            self = .capabilities(media: media, useWorker: useWorker)
+            self = .capabilities(media: media)
         case "start":
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let aesKey = try? container.decode(String.self, forKey: CodingKeys.aesKey)
-            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
             let iceServers = try container.decode(([RTCIceServer]?).self, forKey: .iceServers)
             let relay = try container.decode((Bool?).self, forKey: .relay)
-            self = .start(media: media, aesKey: aesKey, useWorker: useWorker, iceServers: iceServers, relay: relay)
+            self = .start(media: media, aesKey: aesKey, iceServers: iceServers, relay: relay)
         case "offer":
             let offer = try container.decode(String.self, forKey: CodingKeys.offer)
             let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let aesKey = try? container.decode(String.self, forKey: CodingKeys.aesKey)
-            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
             let iceServers = try container.decode(([RTCIceServer]?).self, forKey: .iceServers)
             let relay = try container.decode((Bool?).self, forKey: .relay)
-            self = .offer(offer: offer, iceCandidates: iceCandidates, media: media, aesKey: aesKey, useWorker: useWorker, iceServers: iceServers, relay: relay)
+            self = .offer(offer: offer, iceCandidates: iceCandidates, media: media, aesKey: aesKey, iceServers: iceServers, relay: relay)
         case "answer":
             let answer = try container.decode(String.self, forKey: CodingKeys.answer)
             let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
@@ -218,9 +206,6 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let enable = try container.decode(Bool.self, forKey: CodingKeys.enable)
             self = .media(media: media, enable: enable)
-        case "camera":
-            let camera = try container.decode(VideoCamera.self, forKey: CodingKeys.camera)
-            self = .camera(camera: camera)
         case "end":
             self = .end
         default:
@@ -362,22 +347,40 @@ struct ConnectionInfo: Codable, Equatable {
     var remoteCandidate: RTCIceCandidate?
 
     var text: LocalizedStringKey {
-        get {
-            if localCandidate?.candidateType == .host && remoteCandidate?.candidateType == .host {
-                return "peer-to-peer"
-            } else if localCandidate?.candidateType == .relay && remoteCandidate?.candidateType == .relay {
-                return "via relay"
-            } else {
-                let unknown = NSLocalizedString("unknown", comment: "connection info")
-                return "\(localCandidate?.candidateType?.rawValue ?? unknown) / \(remoteCandidate?.candidateType?.rawValue ?? unknown)"
-            }
+        let local = localCandidate?.candidateType
+        let remote = remoteCandidate?.candidateType
+        if local == .host && remote == .host {
+            return "peer-to-peer"
+        } else if local == .relay && remote == .relay {
+            return "via relay"
+        } else {
+            let unknown = NSLocalizedString("unknown", comment: "connection info")
+            return "\(local?.rawValue ?? unknown) / \(remote?.rawValue ?? unknown)"
         }
     }
+
+    var protocolText: String {
+        let unknown = NSLocalizedString("unknown", comment: "connection info")
+        let local = localCandidate?.protocol?.uppercased() ?? unknown
+        let localRelay = localCandidate?.relayProtocol?.uppercased() ?? unknown
+        let remote = remoteCandidate?.protocol?.uppercased() ?? unknown
+        let localText = localRelay == local || localCandidate?.relayProtocol == nil
+                        ? local
+                        : "\(local) (\(localRelay))"
+        return local == remote
+                ? localText
+                : "\(localText) / \(remote)"
+    }
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
 struct RTCIceCandidate: Codable, Equatable {
     var candidateType: RTCIceCandidateType?
+    var `protocol`: String?
+    var relayProtocol: String?
+    var sdpMid: String?
+    var sdpMLineIndex: Int?
+    var candidate: String
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate/type
@@ -396,18 +399,20 @@ struct RTCIceServer: Codable, Equatable {
 }
 
 // the servers are expected in this format:
-// stun:stun.simplex.im:443
-// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443
+// stun:stun.simplex.im:443?transport=tcp
+// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
 func parseRTCIceServer(_ str: String) -> RTCIceServer? {
     var s = replaceScheme(str, "stun:")
     s = replaceScheme(s, "turn:")
+    s = replaceScheme(s, "turns:")
     if let u: URL = URL(string: s),
        let scheme = u.scheme,
        let host = u.host,
        let port = u.port,
-       u.path == "" && (scheme == "stun" || scheme == "turn")  {
+       u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")  {
+        let query = u.query == nil || u.query == "" ? "" : "?" + (u.query ?? "")
         return RTCIceServer(
-            urls: ["\(scheme):\(host):\(port)"],
+            urls: ["\(scheme):\(host):\(port)\(query)"],
             username: u.user,
             credential: u.password
         )
@@ -439,3 +444,10 @@ func getIceServers() -> [RTCIceServer]? {
     }
     return nil
 }
+
+func getWebRTCIceServers() -> [WebRTC.RTCIceServer]? {
+    if let servers = UserDefaults.standard.stringArray(forKey: DEFAULT_WEBRTC_ICE_SERVERS) {
+        return parseRTCIceServers(servers)?.toWebRTCIceServers()
+    }
+    return nil
+}

apps/ios/Shared/Views/Call/WebRTCClient.swift

@@ -0,0 +1,736 @@
+//
+// Created by Avently on 09.02.2023.
+// Copyright (c) 2023 SimpleX Chat. All rights reserved.
+//
+
+import WebRTC
+import LZString
+import SwiftUI
+import SimpleXChat
+
+final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDelegate, RTCFrameDecryptorDelegate {
+    private static let factory: RTCPeerConnectionFactory = {
+        RTCInitializeSSL()
+        let videoEncoderFactory = RTCDefaultVideoEncoderFactory()
+        let videoDecoderFactory = RTCDefaultVideoDecoderFactory()
+        videoEncoderFactory.preferredCodec = RTCVideoCodecInfo(name: kRTCVp8CodecName)
+        return RTCPeerConnectionFactory(encoderFactory: videoEncoderFactory, decoderFactory: videoDecoderFactory)
+    }()
+    private static let ivTagBytes: Int = 28
+    private static let enableEncryption: Bool = true
+
+    struct Call {
+        var connection: RTCPeerConnection
+        var iceCandidates: [RTCIceCandidate]
+        var localMedia: CallMediaType
+        var localCamera: RTCVideoCapturer?
+        var localVideoSource: RTCVideoSource?
+        var localStream: RTCVideoTrack?
+        var remoteStream: RTCVideoTrack?
+        var device: AVCaptureDevice.Position = .front
+        var aesKey: String?
+        var frameEncryptor: RTCFrameEncryptor?
+        var frameDecryptor: RTCFrameDecryptor?
+    }
+
+    private let rtcAudioSession =  RTCAudioSession.sharedInstance()
+    private let audioQueue = DispatchQueue(label: "audio")
+    private var sendCallResponse: (WVAPIMessage) async -> Void
+    private var activeCall: Binding<Call?>
+    private var localRendererAspectRatio: Binding<CGFloat?>
+
+    @available(*, unavailable)
+    override init() {
+        fatalError("Unimplemented")
+    }
+
+    required init(_ activeCall: Binding<Call?>, _ sendCallResponse: @escaping (WVAPIMessage) async -> Void, _ localRendererAspectRatio: Binding<CGFloat?>) {
+        self.sendCallResponse = sendCallResponse
+        self.activeCall = activeCall
+        self.localRendererAspectRatio = localRendererAspectRatio
+        rtcAudioSession.useManualAudio = CallController.useCallKit()
+        rtcAudioSession.isAudioEnabled = !CallController.useCallKit()
+        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)}")
+        super.init()
+    }
+
+    let defaultIceServers: [WebRTC.RTCIceServer] = [
+        WebRTC.RTCIceServer(urlStrings: ["stun:stun.simplex.im:443"]),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
+    ]
+
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+        let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
+        connection.delegate = self
+        createAudioSender(connection)
+        var localStream: RTCVideoTrack? = nil
+        var remoteStream: RTCVideoTrack? = nil
+        var localCamera: RTCVideoCapturer? = nil
+        var localVideoSource: RTCVideoSource? = nil
+        if mediaType == .video {
+            (localStream, remoteStream, localCamera, localVideoSource) = createVideoSender(connection)
+        }
+        var frameEncryptor: RTCFrameEncryptor? = nil
+        var frameDecryptor: RTCFrameDecryptor? = nil
+        if aesKey != nil {
+            let encryptor = RTCFrameEncryptor.init(sizeChange: Int32(WebRTCClient.ivTagBytes))
+            encryptor.delegate = self
+            frameEncryptor = encryptor
+            connection.senders.forEach { $0.setRtcFrameEncryptor(encryptor) }
+
+            let decryptor = RTCFrameDecryptor.init(sizeChange: -Int32(WebRTCClient.ivTagBytes))
+            decryptor.delegate = self
+            frameDecryptor = decryptor
+            // Has no video receiver in outgoing call if applied here, see [peerConnection(_ connection: RTCPeerConnection, didChange newState]
+            // connection.receivers.forEach { $0.setRtcFrameDecryptor(decryptor) }
+        }
+        return Call(
+            connection: connection,
+            iceCandidates: remoteIceCandidates,
+            localMedia: mediaType,
+            localCamera: localCamera,
+            localVideoSource: localVideoSource,
+            localStream: localStream,
+            remoteStream: remoteStream,
+            aesKey: aesKey,
+            frameEncryptor: frameEncryptor,
+            frameDecryptor: frameDecryptor
+        )
+    }
+
+    func createPeerConnection(_ iceServers: [WebRTC.RTCIceServer], _ relay: Bool?) -> RTCPeerConnection {
+        let constraints = RTCMediaConstraints(mandatoryConstraints: nil,
+            optionalConstraints: ["DtlsSrtpKeyAgreement": kRTCMediaConstraintsValueTrue])
+
+        guard let connection = WebRTCClient.factory.peerConnection(
+            with: getCallConfig(iceServers, relay),
+            constraints: constraints, delegate: nil
+        )
+        else {
+            fatalError("Unable to create RTCPeerConnection")
+        }
+        return connection
+    }
+
+    func getCallConfig(_ iceServers: [WebRTC.RTCIceServer], _ relay: Bool?) -> RTCConfiguration {
+        let config = RTCConfiguration()
+        config.iceServers = iceServers
+        config.sdpSemantics = .unifiedPlan
+        config.continualGatheringPolicy = .gatherContinually
+        config.iceTransportPolicy = relay == true ? .relay : .all
+        // Allows to wait 30 sec before `failing` connection if the answer from remote side is not received in time
+        config.iceInactiveTimeout = 30_000
+        return config
+    }
+
+    func addIceCandidates(_ connection: RTCPeerConnection, _ remoteIceCandidates: [RTCIceCandidate]) {
+        remoteIceCandidates.forEach { candidate in
+            connection.add(candidate.toWebRTCCandidate()) { error in
+                if let error = error {
+                    logger.error("Adding candidate error \(error)")
+                }
+            }
+        }
+    }
+
+    func sendCallCommand(command: WCallCommand) async {
+        var resp: WCallResponse? = nil
+        let pc = activeCall.wrappedValue?.connection
+        switch command {
+        case .capabilities:
+            resp = .capabilities(capabilities: CallCapabilities(encryption: WebRTCClient.enableEncryption))
+        case let .start(media: media, aesKey, iceServers, relay):
+            logger.debug("starting incoming call - create webrtc session")
+            if activeCall.wrappedValue != nil { endCall() }
+            let encryption = WebRTCClient.enableEncryption
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
+            activeCall.wrappedValue = call
+            call.connection.offer { answer in
+                Task {
+                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
+                    if gotCandidates {
+                        await self.sendCallResponse(.init(
+                            corrId: nil,
+                            resp: .offer(
+                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
+                                capabilities: CallCapabilities(encryption: encryption)
+                            ),
+                            command: command)
+                        )
+                    } else {
+                        self.endCall()
+                    }
+                }
+
+            }
+        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
+            if activeCall.wrappedValue != nil {
+                resp = .error(message: "accept: call already started")
+            } else if !WebRTCClient.enableEncryption && aesKey != nil {
+                resp = .error(message: "accept: encryption is not supported")
+            } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
+                      let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                activeCall.wrappedValue = call
+                let pc = call.connection
+                if let type = offer.type, let sdp = offer.sdp {
+                    if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
+                        pc.answer { answer in
+                            self.addIceCandidates(pc, remoteIceCandidates)
+//                            Task {
+//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
+                            Task {
+                                await self.sendCallResponse(.init(
+                                    corrId: nil,
+                                    resp: .answer(
+                                        answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
+                                    ),
+                                    command: command)
+                                )
+                            }
+//                            }
+                        }
+                    } else {
+                        resp = .error(message: "accept: remote description is not set")
+                    }
+                }
+            }
+        case let .answer(answer, iceCandidates):
+            if pc == nil {
+                resp = .error(message: "answer: call not started")
+            } else if pc?.localDescription == nil {
+                resp = .error(message: "answer: local description is not set")
+            } else if pc?.remoteDescription != nil {
+                resp = .error(message: "answer: remote description already set")
+            } else if let answer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: answer)),
+                      let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)),
+                      let type = answer.type, let sdp = answer.sdp,
+                      let pc = pc {
+                if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
+                    addIceCandidates(pc, remoteIceCandidates)
+                    resp = .ok
+                } else {
+                    resp = .error(message: "answer: remote description is not set")
+                }
+            }
+        case let .ice(iceCandidates):
+            if let pc = pc,
+               let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
+                addIceCandidates(pc, remoteIceCandidates)
+                resp = .ok
+            } else {
+                resp = .error(message: "ice: call not started")
+            }
+        case let .media(media, enable):
+            if activeCall.wrappedValue == nil {
+                resp = .error(message: "media: call not started")
+            } else if activeCall.wrappedValue?.localMedia == .audio && media == .video {
+                resp = .error(message: "media: no video")
+            } else {
+                enableMedia(media, enable)
+                resp = .ok
+            }
+        case .end:
+            await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
+            endCall()
+        }
+        if let resp = resp {
+            await sendCallResponse(.init(corrId: nil, resp: resp, command: command))
+        }
+    }
+
+    func enableMedia(_ media: CallMediaType, _ enable: Bool) {
+        logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
+        media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
+    }
+
+    func addLocalRenderer(_ activeCall: Call, _ renderer: RTCEAGLVideoView) {
+        activeCall.localStream?.add(renderer)
+        // To get width and height of a frame, see videoView(videoView:, didChangeVideoSize)
+        renderer.delegate = self
+    }
+
+    func videoView(_ videoView: RTCVideoRenderer, didChangeVideoSize size: CGSize) {
+        guard size.height > 0 else { return }
+        localRendererAspectRatio.wrappedValue = size.width / size.height
+    }
+
+    func frameDecryptor(_ decryptor: RTCFrameDecryptor, mediaType: RTCRtpMediaType, withFrame encrypted: Data) -> Data? {
+        guard encrypted.count > 0 else { return nil }
+        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
+           let pointer: UnsafeMutableRawPointer = malloc(encrypted.count) {
+            memcpy(pointer, (encrypted as NSData).bytes, encrypted.count)
+            let isKeyFrame = encrypted[0] & 1 == 0
+            let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
+            logCrypto("decrypt", chat_decrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(encrypted.count - clearTextBytesSize)))
+            return Data(bytes: pointer, count: encrypted.count - WebRTCClient.ivTagBytes)
+        } else {
+            return nil
+        }
+    }
+
+    func frameEncryptor(_ encryptor: RTCFrameEncryptor, mediaType: RTCRtpMediaType, withFrame unencrypted: Data) -> Data? {
+        guard unencrypted.count > 0 else { return nil }
+        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
+           let pointer: UnsafeMutableRawPointer = malloc(unencrypted.count + WebRTCClient.ivTagBytes) {
+            memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
+            let isKeyFrame = unencrypted[0] & 1 == 0
+            let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
+            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
+        } else {
+            return nil
+        }
+    }
+
+    private func logCrypto(_ op: String, _ r: UnsafeMutablePointer<CChar>?) {
+        if let r = r {
+            let err = fromCString(r)
+            if err != "" {
+                logger.error("\(op) error: \(err)")
+//            } else {
+//                logger.debug("\(op) ok")
+            }
+        }
+    }
+
+    func addRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
+        activeCall.remoteStream?.add(renderer)
+    }
+
+    func startCaptureLocalVideo(_ activeCall: Call) {
+#if targetEnvironment(simulator)
+        guard
+            let capturer = activeCall.localCamera as? RTCFileVideoCapturer
+        else {
+            logger.error("Unable to work with a file capturer")
+            return
+        }
+        capturer.stopCapture()
+        // Drag video file named `video.mp4` to `sounds` directory in the project from any other path in filesystem
+        capturer.startCapturing(fromFileNamed: "sounds/video.mp4")
+#else
+        guard
+            let capturer = activeCall.localCamera as? RTCCameraVideoCapturer,
+            let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == activeCall.device })
+        else {
+            logger.error("Unable to find a camera")
+            return
+        }
+
+        let supported = RTCCameraVideoCapturer.supportedFormats(for: camera)
+        let height: (AVCaptureDevice.Format) -> Int32 = { (format: AVCaptureDevice.Format) in CMVideoFormatDescriptionGetDimensions(format.formatDescription).height }
+        let format = supported.first(where: { height($0) == 1280 })
+                    ?? supported.first(where: { height($0) >= 480 && height($0) < 1280 })
+                    ?? supported.first(where: { height($0) > 1280 })
+        guard
+            let format = format,
+            let fps = format.videoSupportedFrameRateRanges.max(by: { $0.maxFrameRate < $1.maxFrameRate })
+        else {
+            logger.error("Unable to find any format for camera or to choose FPS")
+            return
+        }
+
+        logger.debug("Format for camera is \(format.description)")
+
+        capturer.stopCapture()
+        capturer.startCapture(with: camera,
+            format: format,
+            fps: Int(min(24, fps.maxFrameRate)))
+#endif
+    }
+
+    private func createAudioSender(_ connection: RTCPeerConnection) {
+        let streamId = "stream"
+        let audioTrack = createAudioTrack()
+        connection.add(audioTrack, streamIds: [streamId])
+    }
+
+    private func createVideoSender(_ connection: RTCPeerConnection) -> (RTCVideoTrack?, RTCVideoTrack?, RTCVideoCapturer?, RTCVideoSource?) {
+        let streamId = "stream"
+        let (localVideoTrack, localCamera, localVideoSource) = createVideoTrack()
+        connection.add(localVideoTrack, streamIds: [streamId])
+        return (localVideoTrack, connection.transceivers.first { $0.mediaType == .video }?.receiver.track as? RTCVideoTrack, localCamera, localVideoSource)
+    }
+
+    private func createAudioTrack() -> RTCAudioTrack {
+        let audioConstrains = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil)
+        let audioSource = WebRTCClient.factory.audioSource(with: audioConstrains)
+        let audioTrack = WebRTCClient.factory.audioTrack(with: audioSource, trackId: "audio0")
+        return audioTrack
+    }
+
+    private func createVideoTrack() -> (RTCVideoTrack, RTCVideoCapturer, RTCVideoSource) {
+        let localVideoSource = WebRTCClient.factory.videoSource()
+
+        #if targetEnvironment(simulator)
+        let localCamera = RTCFileVideoCapturer(delegate: localVideoSource)
+        #else
+        let localCamera = RTCCameraVideoCapturer(delegate: localVideoSource)
+        #endif
+
+        let localVideoTrack = WebRTCClient.factory.videoTrack(with: localVideoSource, trackId: "video0")
+        return (localVideoTrack, localCamera, localVideoSource)
+    }
+
+    func endCall() {
+        guard let call = activeCall.wrappedValue else { return }
+        logger.debug("WebRTCClient: ending the call")
+        activeCall.wrappedValue = nil
+        call.connection.close()
+        call.connection.delegate = nil
+        call.frameEncryptor?.delegate = nil
+        call.frameDecryptor?.delegate = nil
+        audioSessionToDefaults()
+    }
+
+    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
+        let startedAt = DispatchTime.now()
+        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
+            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
+        }
+        return success()
+    }
+}
+
+
+extension WebRTC.RTCPeerConnection {
+    func mediaConstraints() -> RTCMediaConstraints {
+        RTCMediaConstraints(
+            mandatoryConstraints: [kRTCMediaConstraintsOfferToReceiveAudio: kRTCMediaConstraintsValueTrue,
+                                   kRTCMediaConstraintsOfferToReceiveVideo: kRTCMediaConstraintsValueTrue],
+            optionalConstraints: nil)
+    }
+
+    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
+        offer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
+            }
+            self.setLocalDescription(sdp, completionHandler: { (error) in
+                completion(sdp)
+            })
+        }
+    }
+
+    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
+        answer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
+            }
+            self.setLocalDescription(sdp, completionHandler: { (error) in
+                completion(sdp)
+            })
+        }
+    }
+}
+
+extension WebRTCClient: RTCPeerConnectionDelegate {
+    func peerConnection(_ connection: RTCPeerConnection, didChange stateChanged: RTCSignalingState) {
+        logger.debug("Connection new signaling state: \(stateChanged.rawValue)")
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didAdd stream: RTCMediaStream) {
+        logger.debug("Connection did add stream")
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didRemove stream: RTCMediaStream) {
+        logger.debug("Connection did remove stream")
+    }
+
+    func peerConnectionShouldNegotiate(_ connection: RTCPeerConnection) {
+        logger.debug("Connection should negotiate")
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didChange newState: RTCIceConnectionState) {
+        debugPrint("Connection new connection state: \(newState.toString() ?? "" + newState.rawValue.description) \(connection.receivers)")
+
+        guard let call = activeCall.wrappedValue,
+              let connectionStateString = newState.toString(),
+              let iceConnectionStateString = connection.iceConnectionState.toString(),
+              let iceGatheringStateString = connection.iceGatheringState.toString(),
+              let signalingStateString = connection.signalingState.toString()
+        else {
+            return
+        }
+        Task {
+            await sendCallResponse(.init(
+                corrId: nil,
+                resp: .connection(state: ConnectionState(
+                    connectionState: connectionStateString,
+                    iceConnectionState: iceConnectionStateString,
+                    iceGatheringState: iceGatheringStateString,
+                    signalingState: signalingStateString)
+                ),
+                command: nil)
+            )
+
+            switch newState {
+            case .checking:
+                if let frameDecryptor = activeCall.wrappedValue?.frameDecryptor {
+                    connection.receivers.forEach { $0.setRtcFrameDecryptor(frameDecryptor) }
+                }
+                let enableSpeaker: Bool
+                switch call.localMedia {
+                case .video: enableSpeaker = true
+                default: enableSpeaker = false
+                }
+                setSpeakerEnabledAndConfigureSession(enableSpeaker)
+            case .disconnected, .failed: endCall()
+            default: do {}
+            }
+        }
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didChange newState: RTCIceGatheringState) {
+        logger.debug("connection new gathering state: \(newState.toString() ?? "" + newState.rawValue.description)")
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
+//        logger.debug("Connection generated candidate \(candidate.debugDescription)")
+        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
+        logger.debug("Connection did remove candidates")
+    }
+
+    func peerConnection(_ connection: RTCPeerConnection, didOpen dataChannel: RTCDataChannel) {}
+
+    func peerConnection(_ connection: RTCPeerConnection,
+                        didChangeLocalCandidate local: WebRTC.RTCIceCandidate,
+                        remoteCandidate remote: WebRTC.RTCIceCandidate,
+                        lastReceivedMs lastDataReceivedMs: Int32,
+                        changeReason reason: String) {
+//        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
+        sendConnectedEvent(connection, local: local, remote: remote)
+    }
+
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
+        connection.statistics { (stats: RTCStatisticsReport) in
+            stats.statistics.values.forEach { stat in
+//                logger.debug("Stat \(stat.debugDescription)")
+                if stat.type == "candidate-pair", stat.values["state"] as? String == "succeeded",
+                   let localId = stat.values["localCandidateId"] as? String,
+                   let remoteId = stat.values["remoteCandidateId"] as? String,
+                   let localStats = stats.statistics[localId],
+                   let remoteStats = stats.statistics[remoteId],
+                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
+                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
+                {
+                    Task {
+                        await self.sendCallResponse(.init(
+                            corrId: nil,
+                            resp: .connected(connectionInfo: ConnectionInfo(
+                                localCandidate: local.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    localStats.values["protocol"] as? String,
+                                    localStats.values["relayProtocol"] as? String
+                                ),
+                                remoteCandidate: remote.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    remoteStats.values["protocol"] as? String,
+                                    remoteStats.values["relayProtocol"] as? String
+                                ))),
+                            command: nil)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+extension WebRTCClient {
+    func setAudioEnabled(_ enabled: Bool) {
+        setTrackEnabled(RTCAudioTrack.self, enabled)
+    }
+
+    func setSpeakerEnabledAndConfigureSession( _ enabled: Bool) {
+        logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled)")
+        audioQueue.async { [weak self] in
+            guard let self = self else { return }
+            self.rtcAudioSession.lockForConfiguration()
+            defer {
+                self.rtcAudioSession.unlockForConfiguration()
+            }
+            do {
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
+                try self.rtcAudioSession.setActive(true)
+                logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
+            } catch let error {
+                logger.debug("Error configuring AVAudioSession: \(error)")
+            }
+        }
+    }
+
+    func audioSessionToDefaults() {
+        logger.debug("WebRTCClient: audioSession to defaults")
+        audioQueue.async { [weak self] in
+            guard let self = self else { return }
+            self.rtcAudioSession.lockForConfiguration()
+            defer {
+                self.rtcAudioSession.unlockForConfiguration()
+            }
+            do {
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.ambient.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.default.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(.none)
+                try self.rtcAudioSession.setActive(false)
+                logger.debug("WebRTCClient: audioSession to defaults success")
+            } catch let error {
+                logger.debug("Error configuring AVAudioSession with defaults: \(error)")
+            }
+        }
+    }
+
+    func setVideoEnabled(_ enabled: Bool) {
+        setTrackEnabled(RTCVideoTrack.self, enabled)
+    }
+
+    func flipCamera() {
+        switch activeCall.wrappedValue?.device {
+        case .front: activeCall.wrappedValue?.device = .back
+        case .back: activeCall.wrappedValue?.device = .front
+        default: ()
+        }
+        if let call = activeCall.wrappedValue {
+            startCaptureLocalVideo(call)
+        }
+    }
+
+    private func setTrackEnabled<T: RTCMediaStreamTrack>(_ type: T.Type, _ enabled: Bool) {
+        activeCall.wrappedValue?.connection.transceivers
+        .compactMap { $0.sender.track as? T }
+        .forEach { $0.isEnabled = enabled }
+    }
+}
+
+struct CustomRTCSessionDescription: Codable {
+    public var type: RTCSdpType?
+    public var sdp: String?
+}
+
+enum RTCSdpType: String, Codable {
+    case answer
+    case offer
+    case pranswer
+    case rollback
+}
+
+extension RTCIceCandidate {
+    func toWebRTCCandidate() -> WebRTC.RTCIceCandidate {
+        WebRTC.RTCIceCandidate(
+            sdp: candidate,
+            sdpMLineIndex: Int32(sdpMLineIndex ?? 0),
+            sdpMid: sdpMid
+        )
+    }
+}
+
+extension WebRTC.RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
+        RTCIceCandidate(
+            candidateType: candidateType,
+            protocol: `protocol`,
+            relayProtocol: relayProtocol,
+            sdpMid: sdpMid,
+            sdpMLineIndex: Int(sdpMLineIndex),
+            candidate: sdp
+        )
+    }
+}
+
+
+extension [RTCIceServer] {
+    func toWebRTCIceServers() -> [WebRTC.RTCIceServer] {
+        self.map {
+            WebRTC.RTCIceServer(
+                urlStrings: $0.urls,
+                username: $0.username,
+                credential: $0.credential
+            ) }
+    }
+}
+
+extension RTCSdpType {
+    func toWebRTCSdpType() -> WebRTC.RTCSdpType {
+        switch self {
+        case .answer: return WebRTC.RTCSdpType.answer
+        case .offer: return WebRTC.RTCSdpType.offer
+        case .pranswer: return WebRTC.RTCSdpType.prAnswer
+        case .rollback: return WebRTC.RTCSdpType.rollback
+        }
+    }
+}
+
+extension WebRTC.RTCSdpType {
+    func toSdpType() -> RTCSdpType {
+        switch self {
+        case .answer: return RTCSdpType.answer
+        case .offer: return RTCSdpType.offer
+        case .prAnswer: return RTCSdpType.pranswer
+        case .rollback: return RTCSdpType.rollback
+        default: return RTCSdpType.answer // should never be here
+        }
+    }
+}
+
+extension RTCPeerConnectionState {
+    func toString() -> String? {
+        switch self {
+        case .new: return "new"
+        case .connecting: return "connecting"
+        case .connected: return "connected"
+        case .failed: return"failed"
+        case .disconnected: return "disconnected"
+        case .closed: return "closed"
+        default: return nil // unknown
+        }
+    }
+}
+
+extension RTCIceConnectionState {
+    func toString() -> String? {
+        switch self {
+        case .new: return "new"
+        case .checking: return "checking"
+        case .connected: return "connected"
+        case .completed: return "completed"
+        case .failed: return "failed"
+        case .disconnected: return "disconnected"
+        case .closed: return "closed"
+        default: return nil // unknown or unused on the other side
+        }
+    }
+}
+
+extension RTCIceGatheringState {
+    func toString() -> String? {
+        switch self {
+        case .new: return "new"
+        case .gathering: return "gathering"
+        case .complete: return "complete"
+        default: return nil // unknown
+        }
+    }
+}
+
+extension RTCSignalingState {
+    func toString() -> String? {
+        switch self {
+        case .stable: return "stable"
+        case .haveLocalOffer: return "have-local-offer"
+        case .haveLocalPrAnswer: return "have-local-pranswer"
+        case .haveRemoteOffer: return "have-remote-offer"
+        case .haveRemotePrAnswer: return "have-remote-pranswer"
+        case .closed: return "closed"
+        default: return nil // unknown
+        }
+    }
+}

apps/ios/Shared/Views/Call/WebRTCView.swift

@@ -1,183 +0,0 @@
-//
-//  WebRTCView.swift
-//  SimpleX (iOS)
-//
-//  Created by Ian Davies on 29/04/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import WebKit
-import SimpleXChat
-
-class WebRTCCoordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUIDelegate {
-    var rtcWebView: Binding<WKWebView?>
-    var webViewMsg: Binding<WVAPIMessage?>
-
-    internal init(rtcWebView: Binding<WKWebView?>, webViewMsg: Binding<WVAPIMessage?>) {
-        self.rtcWebView = rtcWebView
-        self.webViewMsg = webViewMsg
-    }
-
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        webView.allowsBackForwardNavigationGestures = false
-        self.rtcWebView.wrappedValue = webView
-        ChatModel.shared.callWebView = webView
-    }
-
-    func webView(_ webView: WKWebView, decideMediaCapturePermissionsFor origin : WKSecurityOrigin, initiatedBy frame: WKFrameInfo, type: WKMediaCaptureType) async -> WKPermissionDecision {
-        print("webView", #function)
-        return .grant
-    }
-
-    // receive message from WKWebView
-    func userContentController(
-        _ userContentController: WKUserContentController,
-        didReceive message: WKScriptMessage
-    ) {
-        logger.debug("WebRTCCoordinator.userContentController")
-        switch message.name {
-        case "webrtc":
-            if let msgStr = message.body as? String,
-               let msg: WVAPIMessage = decodeJSON(msgStr) {
-                // this is the binding that communicates messages from webview to swift view
-                webViewMsg.wrappedValue = msg
-                if case .invalid = msg.resp {
-                    logger.error("WebRTCCoordinator.userContentController: invalid message \(String(describing: message.body))")
-                }
-            } else {
-                logger.error("WebRTCCoordinator.userContentController: message parsing error \(String(describing: message.body))")
-            }
-        case "logger":
-            if let msgStr = message.body as? String {
-                logger.error("WebRTCCoordinator console.log: \(msgStr)")
-            } else {
-                logger.error("WebRTCCoordinator console.log: \(String(describing: message.body))")
-            }
-        default:
-            logger.error("WebRTCCoordinator.userContentController: invalid message.name \(message.name)")
-        }
-    }
-}
-
-struct WebRTCView: UIViewRepresentable {
-    @State private var coordinator: WebRTCCoordinator?
-    @Binding var rtcWebView: WKWebView?
-    @Binding var webViewMsg: WVAPIMessage?
-
-    func makeCoordinator() -> WebRTCCoordinator {
-        WebRTCCoordinator(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg)
-    }
-
-    func makeUIView(context: Context) -> WKWebView {
-        let wkCoordinator = makeCoordinator()
-        DispatchQueue.main.async { coordinator = wkCoordinator }
-
-        let wkController = WKUserContentController()
-
-        let cfg = WKWebViewConfiguration()
-        cfg.userContentController = wkController
-        cfg.mediaTypesRequiringUserActionForPlayback = []
-        cfg.allowsInlineMediaPlayback = true
-
-        let addScript = { (handler: String, source: String) in
-            let script = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
-            wkController.addUserScript(script)
-            wkController.add(wkCoordinator, name: handler)
-        }
-
-        addScript("webrtc", "sendMessageToNative = (msg) => webkit.messageHandlers.webrtc.postMessage(JSON.stringify(msg))")
-        addScript("logger", "console.log = (arg) => webkit.messageHandlers.logger.postMessage(JSON.stringify(arg))")
-
-        let wkWebView = WKWebView(frame: .zero, configuration: cfg)
-        wkWebView.navigationDelegate = wkCoordinator
-        guard let path: String = Bundle.main.path(forResource: "call", ofType: "html", inDirectory: "www") else {
-            logger.error("WebRTCView.makeUIView call.html not found")
-            return wkWebView
-        }
-        let localHTMLUrl = URL(fileURLWithPath: path, isDirectory: false)
-        wkWebView.loadFileURL(localHTMLUrl, allowingReadAccessTo: localHTMLUrl)
-        return wkWebView
-    }
-
-    func updateUIView(_ webView: WKWebView, context: Context) {
-        logger.debug("WebRTCView.updateUIView")
-    }
-}
-
-func sendCallCommand(_ webView: WKWebView, _ command: WCallCommand) {
-    logger.debug("sendCallCommand: \(command.cmdType)")
-    let apiCmd = encodeJSON(WVAPICall(command: command))
-    let js = "processCommand(\(apiCmd))"
-    webView.evaluateJavaScript(js)
-}
-
-//struct CallViewDebug: View {
-//    @State private var commandStr = ""
-//    @State private var rtcWebView: WKWebView? = nil
-//    @State private var webViewMsg: WVAPIMessage? = nil
-//    @FocusState private var keyboardVisible: Bool
-//
-//    var body: some View {
-//        VStack(spacing: 30) {
-//            WebRTCView(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg).frame(maxHeight: 260)
-//                .onChange(of: webViewMsg) { _ in
-//                    if let resp = webViewMsg {
-//                        commandStr = encodeJSON(resp)
-//                    }
-//                }
-//            TextEditor(text: $commandStr)
-//                .focused($keyboardVisible)
-//                .disableAutocorrection(true)
-//                .textInputAutocapitalization(.never)
-//                .padding(.horizontal, 5)
-//                .padding(.top, 2)
-//                .frame(height: 112)
-//                .overlay(
-//                    RoundedRectangle(cornerRadius: 10)
-//                        .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-//                )
-//            HStack(spacing: 20) {
-//                Button("Copy") {
-//                    UIPasteboard.general.string = commandStr
-//                }
-//                Button("Paste") {
-//                    commandStr = UIPasteboard.general.string ?? ""
-//                }
-//                Button("Clear") {
-//                    commandStr = ""
-//                }
-//                Button("Send") {
-//                    if let wv = rtcWebView,
-//                       let command: WCallCommand = decodeJSON(commandStr) {
-//                        sendCallCommand(wv, command)
-//                    }
-//                }
-//            }
-//            HStack(spacing: 20) {
-//                Button("Capabilities") {
-//                    if let wv = rtcWebView {
-//                        sendCallCommand(wv, .capabilities(useWorker: true))
-//                    }
-//                }
-//                Button("Start") {
-//                    if let wv = rtcWebView {
-//                        sendCallCommand(wv, .start(media: .video))
-//                    }
-//                }
-//                Button("Accept") {
-//
-//                }
-//                Button("Answer") {
-//
-//                }
-//                Button("ICE") {
-//
-//                }
-//                Button("End") {
-//
-//                }
-//            }
-//        }
-//    }
-//}

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

@@ -36,9 +36,8 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
     }
 }
 
-@ViewBuilder func smpServers(_ title: LocalizedStringKey, _ servers: [String]?) -> some View {
-    if let servers = servers,
-       servers.count > 0 {
+@ViewBuilder func smpServers(_ title: LocalizedStringKey, _ servers: [String]) -> some View {
+    if servers.count > 0 {
         HStack {
             Text(title).frame(width: 120, alignment: .leading)
             Button(serverHost(servers[0])) {
@@ -76,6 +75,7 @@ struct ChatInfoView: View {
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
+        case abortSwitchAddressAlert
         case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
 
         var id: String {
@@ -84,6 +84,7 @@ struct ChatInfoView: View {
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
+            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case let .error(title, _): return "error \(title)"
             }
         }
@@ -116,17 +117,39 @@ struct ChatInfoView: View {
                     contactPreferencesButton()
                 }
 
+                if let contactLink = contact.contactLink {
+                    Section {
+                        QRCode(uri: contactLink)
+                        Button {
+                            showShareSheet(items: [contactLink])
+                        } label: {
+                            Label("Share address", systemImage: "square.and.arrow.up")
+                        }
+                    } header: {
+                        Text("Address")
+                    } footer: {
+                        Text("You can share this address with your contacts to let them connect with **\(contact.displayName)**.")
+                    }
+                }
+
                 Section("Servers") {
                     networkStatusRow()
                         .onTapGesture {
                             alert = .networkStatusAlert
                         }
-                    Button("Change receiving address") {
-                        alert = .switchAddressAlert
-                    }
                     if let connStats = connectionStats {
-                        smpServers("Receiving via", connStats.rcvServers)
-                        smpServers("Sending via", connStats.sndServers)
+                        Button("Change receiving address") {
+                            alert = .switchAddressAlert
+                        }
+                        .disabled(connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil })
+                        if connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil } {
+                            Button("Abort changing address") {
+                                alert = .abortSwitchAddressAlert
+                            }
+                            .disabled(connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch })
+                        }
+                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                     }
                 }
 
@@ -151,6 +174,7 @@ struct ChatInfoView: View {
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
+            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
@@ -263,14 +287,14 @@ struct ChatInfoView: View {
                 .foregroundColor(.accentColor)
                 .font(.system(size: 14))
             Spacer()
-            Text(chat.serverInfo.networkStatus.statusString)
+            Text(chatModel.contactNetworkStatus(contact).statusString)
                 .foregroundColor(.secondary)
             serverImage()
         }
     }
 
     private func serverImage() -> some View {
-        let status = chat.serverInfo.networkStatus
+        let status = chatModel.contactNetworkStatus(contact)
         return Image(systemName: status.imageName)
             .foregroundColor(status == .connected ? .green : .secondary)
             .font(.system(size: 12))
@@ -337,14 +361,15 @@ struct ChatInfoView: View {
     private func networkStatusAlert() -> Alert {
         Alert(
             title: Text("Network status"),
-            message: Text(chat.serverInfo.networkStatus.statusExplanation)
+            message: Text(chatModel.contactNetworkStatus(contact).statusExplanation)
         )
     }
 
     private func switchContactAddress() {
         Task {
             do {
-                try await apiSwitchContact(contactId: contact.apiId)
+                let stats = try apiSwitchContact(contactId: contact.apiId)
+                connectionStats = stats
             } catch let error {
                 logger.error("switchContactAddress apiSwitchContact error: \(responseError(error))")
                 let a = getErrorAlert(error, "Error changing address")
@@ -354,13 +379,37 @@ struct ChatInfoView: View {
             }
         }
     }
+
+    private func abortSwitchContactAddress() {
+        Task {
+            do {
+                let stats = try apiAbortSwitchContact(contact.apiId)
+                connectionStats = stats
+            } catch let error {
+                logger.error("abortSwitchContactAddress apiAbortSwitchContact error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error aborting address change")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
 }
 
 func switchAddressAlert(_ switchAddress: @escaping () -> Void) -> Alert {
     Alert(
         title: Text("Change receiving address?"),
-        message: Text("This feature is experimental! It will only work if the other client has version 4.2 installed. You should see the message in the conversation once the address change is completed – please check that you can still receive messages from this contact (or group member)."),
-        primaryButton: .destructive(Text("Change"), action: switchAddress),
+        message: Text("Receiving address will be changed to a different server. Address change will complete after sender comes online."),
+        primaryButton: .default(Text("Change"), action: switchAddress),
+        secondaryButton: .cancel()
+    )
+}
+
+func abortSwitchAddressAlert(_ abortSwitchAddress: @escaping () -> Void) -> Alert {
+    Alert(
+        title: Text("Abort changing address?"),
+        message: Text("Address change will be aborted. Old receiving address will be used."),
+        primaryButton: .destructive(Text("Abort"), action: abortSwitchAddress),
         secondaryButton: .cancel()
     )
 }