Merge branch 'master' into av/android-lint

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/nl/

* Translated using Weblate (Arabic)

Currently translated at 62.7% (831 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Arabic)

Currently translated at 62.7% (831 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Arabic)

Currently translated at 71.9% (953 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/es/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/nl/

* Translated using Weblate (Korean)

Currently translated at 71.2% (943 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ko/

* Translated using Weblate (German)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (German)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/de/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/es/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/cs/

* Translated using Weblate (Arabic)

Currently translated at 77.3% (1024 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Arabic)

Currently translated at 82.1% (1088 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Hebrew)

Currently translated at 100.0% (1324 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/he/

* Translated using Weblate (Hebrew)

Currently translated at 43.4% (528 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/he/

* Translated using Weblate (Turkish)

Currently translated at 53.4% (708 of 1324 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (German)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/fr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Arabic)

Currently translated at 86.7% (1150 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Turkish)

Currently translated at 1.3% (17 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/tr/

* Translated using Weblate (Turkish)

Currently translated at 53.4% (708 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Arabic)

Currently translated at 87.2% (1156 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Thai)

Currently translated at 94.7% (1152 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/th/

* Translated using Weblate (Thai)

Currently translated at 95.7% (1269 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/th/

* Translated using Weblate (German)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Japanese)

Currently translated at 99.6% (1321 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ja/

* Translated using Weblate (Czech)

Currently translated at 100.0% (1325 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/cs/

* Translated using Weblate (Arabic)

Currently translated at 99.8% (1323 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Arabic)

Currently translated at 3.7% (46 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/ar/

* Translated using Weblate (Thai)

Currently translated at 94.7% (1152 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/th/

* Translated using Weblate (Thai)

Currently translated at 95.7% (1269 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/th/

* Translated using Weblate (Bulgarian)

Currently translated at 43.9% (582 of 1325 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1326 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Bulgarian)

Currently translated at 45.7% (607 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 46.9% (623 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 47.5% (631 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 53.2% (706 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 59.3% (787 of 1326 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Polish)

Currently translated at 100.0% (1328 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/pl/

* Translated using Weblate (Bulgarian)

Currently translated at 76.3% (1014 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Turkish)

Currently translated at 5.3% (65 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/tr/

* Translated using Weblate (Turkish)

Currently translated at 7.4% (90 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/tr/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1328 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1328 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Turkish)

Currently translated at 58.2% (773 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Turkish)

Currently translated at 58.2% (774 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Turkish)

Currently translated at 7.5% (92 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/tr/

* Translated using Weblate (Turkish)

Currently translated at 63.9% (849 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1328 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Finnish)

Currently translated at 94.2% (1252 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/fi/

* Translated using Weblate (Finnish)

Currently translated at 19.9% (242 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/fi/

* Translated using Weblate (Turkish)

Currently translated at 68.5% (910 of 1328 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Polish)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/pl/

* Translated using Weblate (German)

Currently translated at 99.5% (1350 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Turkish)

Currently translated at 70.2% (953 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (German)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (Bulgarian)

Currently translated at 85.9% (1165 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 90.2% (1224 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Arabic)

Currently translated at 99.7% (1353 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Thai)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/th/

* Translated using Weblate (Thai)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/th/

* Translated using Weblate (Bulgarian)

Currently translated at 1.0% (13 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/bg/

* Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/bg/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (Turkish)

Currently translated at 70.3% (954 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1356 of 1356 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (1216 of 1216 strings)

Translation: SimpleX Chat/SimpleX Chat iOS
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/nl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1358 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/

* Translated using Weblate (Arabic)

Currently translated at 99.7% (1355 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/

* Translated using Weblate (Polish)

Currently translated at 100.0% (1358 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/pl/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1358 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/

* Translated using Weblate (German)

Currently translated at 100.0% (1358 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/de/

* Translated using Weblate (French)

Currently translated at 100.0% (1358 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/fr/

* Translated using Weblate (Turkish)

Currently translated at 77.2% (1049 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/tr/

* Translated using Weblate (Dutch)

Currently translated at 99.9% (1357 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/

* Translated using Weblate (Lithuanian)

Currently translated at 45.4% (617 of 1358 strings)

Translation: SimpleX Chat/SimpleX Chat Android
Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/lt/

* export localizations

* update text

* fix German translations

* revert change in French

* remove "read" receipts translations in Japanese

* remove "read" receipts from Japanese

* revert French translations

* import/export localizations

---------

Co-authored-by: John m <jvanmanen@gmail.com>
Co-authored-by: Mosaab Emam <mosaab.emam123@gmail.com>
Co-authored-by: jonnysemon <jonnysemon@users.noreply.hosted.weblate.org>
Co-authored-by: khalidbelk <khalid.belkassmi-el-hafi@epitech.eu>
Co-authored-by: No name <CertainBot@users.noreply.hosted.weblate.org>
Co-authored-by: fxxk3rrth4ng <baech00@kakao.com>
Co-authored-by: mlanp <github@lang.xyz>
Co-authored-by: zenobit <zen@osowoso.xyz>
Co-authored-by: ItaiShek <itaishek@gmail.com>
Co-authored-by: p1ns <dnzkckali@gmail.com>
Co-authored-by: random r <epsilin@yopmail.com>
Co-authored-by: Titapa (PunPun) Chaiyakiturajai <titapapunne@gmail.com>
Co-authored-by: Pixelcode <pixelcode@dismail.de>
Co-authored-by: Ophiushi <41908476+ishi-sama@users.noreply.github.com>
Co-authored-by: Y. Sakamoto <ysakamoto@tutanota.com>
Co-authored-by: elgratea <weblate@fastmail.com>
Co-authored-by: B.O.S.S <BxOxSxS@protonmail.com>
Co-authored-by: Dennis <snap-roofing0h@icloud.com>
Co-authored-by: petri <pkajander@gmail.com>
Co-authored-by: 0xMarius <tech@marmakas.lt>

.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

@@ -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,27 +52,39 @@ jobs:
           - os: ubuntu-20.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
           - os: ubuntu-22.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-22_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
           - os: macos-latest
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
+            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
           - os: windows-latest
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
     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,6 +103,10 @@ jobs:
           echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
           echo "    flags: +openssl"                                        >> cabal.project.local
 
+      - name: Install AppImage dependencies
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        run: sudo apt install -y desktop-file-utils
+
       - name: Install pkg-config for Mac
         if: matrix.os == 'macos-latest'
         run: brew install pkg-config
@@ -103,29 +119,92 @@ jobs:
           echo "package direct-sqlcipher" >> cabal.project.local
           echo "    flags: +openssl"      >> cabal.project.local
 
-      - name: Unix build
-        id: unix_build
+      - name: Unix build CLI
+        id: unix_cli_build
         if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           cabal build --enable-tests
           echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
 
+      - name: Unix upload CLI binary to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.unix_cli_build.outputs.bin_path }}
+          asset_name: ${{ matrix.asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Setup Java
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Linux build desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-linux.sh
+          cd apps/multiplatform
+          ./gradlew packageDeb
+          echo "::set-output name=package_path::$(echo $PWD/release/main/deb/simplex_*_amd64.deb)"
+      
+      - name: Linux make AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        shell: bash
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+          echo "::set-output name=appimage_path::$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)"
+
+      - name: Mac build desktop
+        id: mac_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-mac.sh
+          cd apps/multiplatform
+          ./gradlew packageDmg
+          echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)"
+
+      - name: Linux upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Linux upload AppImage to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          asset_name: simplex-desktop-x86_64.AppImage
+          tag: ${{ github.ref }}
+
+      - name: Mac upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.mac_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_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
 
-      - name: Unix upload binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
       # 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

@@ -49,10 +49,11 @@ logs/
 # for website
 website/node_modules/
 website/src/blog/
+website/src/docs/
 website/translations.json
-website/src/_data/supported_languages.json
 website/src/img/images/
 website/src/images/
+website/src/js/lottie.min.js
 # Generated files
 website/package/generated*
 

README.md

@@ -48,11 +48,34 @@
 
 ## Join user groups
 
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-2](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FQP8zaGjjmlXV-ix_Er4JgJ0lNPYGS1KX%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEApAgBkRZ3x12ayZ7sHrjHQWNMvqzZpWUgM_fFCUdLXwo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xWpPXEZZsQp_F7vwAcAYDw%3D%3D%22%7D)
+**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-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).
+[\#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.
 
@@ -85,8 +108,10 @@ Join our translators to help SimpleX grow!
 |🇪🇸 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/)||
 
@@ -96,6 +121,7 @@ Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https:/
 
 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.
@@ -181,6 +207,12 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent updates:
 
+[July 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+
+[May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
+
+[Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
+
 [Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
 
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
@@ -227,13 +259,15 @@ 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 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 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.
@@ -258,6 +292,8 @@ You can:
 
 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.
@@ -295,26 +331,30 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ 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.
-- 🏗 SMP queue redundancy and rotation (manual is supported).
-- 🏗 Reduced battery and traffic usage in large groups.
+- ✅ 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.
+- ✅ Message delivery confirmation (with sender opt-out per contact).
+- 🏗 Desktop client.
+- SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
-- Ephemeral/disappearing/OTR conversations with the existing contacts.
-- Access password/pin (with optional alternative access password).
 - Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
-- Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
-- Privately share your location.
+- 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.
-- Hosting server for large groups, communities and public channels.
 - Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.
 

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/build.gradle

@@ -1,234 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization'
-}
-
-android {
-    compileSdk 32
-
-    defaultConfig {
-        applicationId "chat.simplex.app"
-        minSdk 26
-        targetSdk 32
-        versionCode 115
-        versionName "5.0-beta.1"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-        externalNativeBuild {
-            cmake {
-                cppFlags ''
-            }
-        }
-        manifestPlaceholders.app_name = "@string/app_name"
-        manifestPlaceholders.provider_authorities = "chat.simplex.app.provider"
-        manifestPlaceholders.extract_native_libs = compression_level != "0"
-    }
-
-    buildTypes {
-        debug {
-            applicationIdSuffix "$application_id_suffix"
-            debuggable new Boolean("$enable_debuggable")
-            manifestPlaceholders.app_name = "$app_name"
-            // Provider can't be the same for different apps on the same device
-            manifestPlaceholders.provider_authorities = "chat.simplex.app${application_id_suffix}.provider"
-        }
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.insets.ExperimentalAnimatedInsets"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi"
-        freeCompilerArgs += "-opt-in=kotlinx.serialization.InternalSerializationApi"
-        freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    }
-    externalNativeBuild {
-        cmake {
-            path file('src/main/cpp/CMakeLists.txt')
-        }
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-        jniLibs.useLegacyPackaging = compression_level != "0"
-    }
-    def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-    def isBundle = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("bundle") }) != null
-//    if (isRelease) {
-        // Comma separated list of languages that will be included in the apk
-    android.defaultConfig.resConfigs(
-        "en",
-        "cs",
-        "de",
-        "es",
-        "fr",
-        "it",
-        "nl",
-        "pl",
-        "ru",
-        "zh-rCN"
-    )
-//    }
-    if (isBundle) {
-        defaultConfig.ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
-    } else {
-        splits {
-            abi {
-                enable true
-                reset()
-                if (isRelease) {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                } else {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                    universalApk false
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation 'androidx.fragment:fragment:1.4.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.compose.ui:ui-util:$compose_version"
-    implementation "androidx.navigation:navigation-compose:2.4.1"
-    implementation "com.google.accompanist:accompanist-insets:0.23.0"
-    implementation 'androidx.webkit:webkit:1.4.0'
-    implementation "com.godaddy.android.colorpicker:compose-color-picker:0.4.2"
-
-    def work_version = "2.7.1"
-    implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation "androidx.work:work-multiprocess:$work_version"
-
-    def camerax_version = "1.1.0-beta01"
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-view:${camerax_version}"
-
-    //Barcode
-    implementation 'org.boofcv:boofcv-android:0.40.1'
-    implementation 'org.boofcv:boofcv-core:0.40.1'
-
-    //Camera Permission
-    implementation "com.google.accompanist:accompanist-permissions:0.23.0"
-    implementation "com.google.accompanist:accompanist-pager:0.25.1"
-
-    // Link Previews
-    implementation 'org.jsoup:jsoup:1.13.1'
-
-    // Biometric authentication
-    implementation 'androidx.biometric:biometric:1.2.0-alpha04'
-
-    // GIFs support
-    implementation "io.coil-kt:coil-compose:2.1.0"
-    implementation "io.coil-kt:coil-gif:2.1.0"
-
-    // Video support
-    implementation "com.google.android.exoplayer:exoplayer:2.17.1"
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-}
-
-// Don't do anything if no compression is needed
-if (compression_level != "0") {
-    tasks.whenTaskAdded { task ->
-        if (task.name == 'packageDebug') {
-            task.finalizedBy compressApk
-        } else if (task.name == 'packageRelease') {
-            task.finalizedBy compressApk
-        }
-    }
-}
-
-tasks.register("compressApk") {
-    doLast {
-        def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-        def buildType
-        if (isRelease) {
-            buildType = "release"
-        } else {
-            buildType = "debug"
-        }
-        def javaHome = System.properties['java.home'] ?: org.gradle.internal.jvm.Jvm.current().getJavaHome()
-        def sdkDir = android.getSdkDirectory().getAbsolutePath()
-        def keyAlias = ""
-        def keyPassword = ""
-        def storeFile = ""
-        def storePassword = ""
-        if (project.properties['android.injected.signing.key.alias'] != null) {
-            keyAlias = project.properties['android.injected.signing.key.alias']
-            keyPassword = project.properties['android.injected.signing.key.password']
-            storeFile = project.properties['android.injected.signing.store.file']
-            storePassword = project.properties['android.injected.signing.store.password']
-        } else if (android.signingConfigs.hasProperty(buildType)) {
-            def gradleConfig = android.signingConfigs[buildType]
-            keyAlias = gradleConfig.keyAlias
-            keyPassword = gradleConfig.keyPassword
-            storeFile = gradleConfig.storeFile
-            storePassword = gradleConfig.storePassword
-        } else {
-            // There is no signing config for current build type, can't sign the apk
-            println("No signing configs for this build type: $buildType")
-            return
-        }
-
-        def outputDir = tasks["package${buildType.capitalize()}"].outputs.files.last()
-
-        exec {
-            workingDir '../../../scripts/android'
-            setEnvironment(['JAVA_HOME': "$javaHome"])
-            commandLine './compress-and-sign-apk.sh',  \
-                     "$compression_level",  \
-                     "$outputDir",  \
-                     "$sdkDir",  \
-                     "$storeFile",  \
-                     "$storePassword",  \
-                     "$keyAlias",  \
-                     "$keyPassword"
-        }
-
-        if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') {
-            new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk"))
-            new File(outputDir, "app-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk"))
-            new File(outputDir, "app-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk"))
-        }
-
-        // View all gradle properties set
-        // project.properties.each { k, v -> println "$k -> $v" }
-    }
-}

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

@@ -1,659 +0,0 @@
-package chat.simplex.app
-
-import SectionItemView
-import android.app.Application
-import android.content.Intent
-import android.net.Uri
-import android.os.*
-import android.os.SystemClock.elapsedRealtime
-import android.util.Log
-import android.view.WindowManager
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.animation.core.*
-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.outlined.Lock
-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.graphicsLayer
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.*
-import chat.simplex.app.MainActivity.Companion.enteredBackground
-import chat.simplex.app.model.*
-import chat.simplex.app.model.NtfManager.Companion.getUserIdFromIntent
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.SplashView
-import chat.simplex.app.views.call.ActiveCallView
-import chat.simplex.app.views.call.IncomingCallAlertView
-import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chatlist.*
-import chat.simplex.app.views.database.DatabaseErrorView
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.localauth.SetAppPasscodeView
-import chat.simplex.app.views.newchat.*
-import chat.simplex.app.views.onboarding.*
-import chat.simplex.app.views.usersettings.LAMode
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-class MainActivity: FragmentActivity() {
-  companion object {
-    /**
-     * We don't want these values to be bound to Activity lifecycle since activities are changed often, for example, when a user
-     * clicks on new message in notification. In this case savedInstanceState will be null (this prevents restoring the values)
-     * See [SimplexService.onTaskRemoved] for another part of the logic which nullifies the values when app closed by the user
-     * */
-    val userAuthorized = mutableStateOf<Boolean?>(null)
-    val enteredBackground = mutableStateOf<Long?>(null)
-    // Remember result and show it after orientation change
-    private val laFailed = mutableStateOf(false)
-
-    fun clearAuthState() {
-      userAuthorized.value = null
-      enteredBackground.value = null
-    }
-  }
-  private val vm by viewModels<SimplexViewModel>()
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    // testJson()
-    val m = vm.chatModel
-    applyAppLocale(m.controller.appPrefs.appLanguage)
-    // When call ended and orientation changes, it re-process old intent, it's unneeded.
-    // Only needed to be processed on first creation of activity
-    if (savedInstanceState == null) {
-      processNotificationIntent(intent, m)
-      processIntent(intent, m)
-      processExternalIntent(intent, m)
-    }
-    if (m.controller.appPrefs.privacyProtectScreen.get()) {
-      Log.d(TAG, "onCreate: set FLAG_SECURE")
-      window.setFlags(
-        WindowManager.LayoutParams.FLAG_SECURE,
-        WindowManager.LayoutParams.FLAG_SECURE
-      )
-    }
-    setContent {
-      SimpleXTheme {
-        Surface(
-          Modifier
-            .background(MaterialTheme.colors.background)
-            .fillMaxSize()
-        ) {
-          MainPage(
-            m,
-            userAuthorized,
-            laFailed,
-            ::runAuthenticate,
-            ::setPerformLA,
-            showLANotice = { showLANotice(m.controller.appPrefs.laNoticeShown, this) }
-          )
-        }
-      }
-    }
-    SimplexApp.context.schedulePeriodicServiceRestartWorker()
-    SimplexApp.context.schedulePeriodicWakeUp()
-  }
-
-  override fun onNewIntent(intent: Intent?) {
-    super.onNewIntent(intent)
-    processIntent(intent, vm.chatModel)
-    processExternalIntent(intent, vm.chatModel)
-  }
-
-  override fun onResume() {
-    super.onResume()
-    val enteredBackgroundVal = enteredBackground.value
-    val delay = vm.chatModel.controller.appPrefs.laLockDelay.get()
-    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= delay * 1000) {
-      runAuthenticate()
-    }
-  }
-
-  override fun onPause() {
-    super.onPause()
-    /**
-    * When new activity is created after a click on notification, the old one receives onPause before
-    * recreation but receives onStop after recreation. So using both (onPause and onStop) to prevent
-    * unwanted multiple auth dialogs from [runAuthenticate]
-    * */
-    enteredBackground.value = elapsedRealtime()
-  }
-
-  override fun onStop() {
-    super.onStop()
-    VideoPlayer.stopAll()
-    enteredBackground.value = elapsedRealtime()
-  }
-
-  override fun onBackPressed() {
-    if (
-      onBackPressedDispatcher.hasEnabledCallbacks() // Has something to do in a backstack
-      || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R // Android 11 or above
-      || isTaskRoot // there are still other tasks after we reach the main (home) activity
-    ) {
-      // https://medium.com/mobile-app-development-publication/the-risk-of-android-strandhogg-security-issue-and-how-it-can-be-mitigated-80d2ddb4af06
-      super.onBackPressed()
-    }
-
-    if (!onBackPressedDispatcher.hasEnabledCallbacks() && vm.chatModel.controller.appPrefs.performLA.get()) {
-      // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
-      clearAuthState()
-      laFailed.value = true
-    }
-    if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
-      // Drop shared content
-      SimplexApp.context.chatModel.sharedContent.value = null
-    }
-  }
-
-  private fun runAuthenticate() {
-    val m = vm.chatModel
-    if (!m.controller.appPrefs.performLA.get()) {
-      userAuthorized.value = true
-    } else {
-      userAuthorized.value = false
-      ModalManager.shared.closeModals()
-      // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
-      CoroutineScope(Dispatchers.Default).launch {
-        delay(50)
-        withContext(Dispatchers.Main) {
-          authenticate(
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_unlock)
-            else
-              generalGetString(R.string.la_enter_app_passcode),
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_log_in_using_credential)
-            else
-              generalGetString(R.string.auth_unlock),
-            this@MainActivity,
-            completed = { laResult ->
-              when (laResult) {
-                LAResult.Success ->
-                  userAuthorized.value = true
-                is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-                is LAResult.Error -> {
-                  laFailed.value = true
-                  if (m.controller.appPrefs.laMode.get() == LAMode.PASSCODE) {
-                    laFailedAlert()
-                  }
-                }
-                is LAResult.Unavailable -> {
-                  userAuthorized.value = true
-                  m.performLA.value = false
-                  m.controller.appPrefs.performLA.set(false)
-                  laUnavailableTurningOffAlert()
-                }
-              }
-            }
-          )
-        }
-      }
-    }
-  }
-
-  private fun showLANotice(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    if (!laNoticeShown.get()) {
-      laNoticeShown.set(true)
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.la_notice_title_simplex_lock),
-        text = generalGetString(R.string.la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled),
-        confirmText = generalGetString(R.string.la_notice_turn_on),
-        onConfirm = {
-          withBGApi { // to remove this call, change ordering of onConfirm call in AlertManager
-            showChooseLAMode(laNoticeShown, activity)
-          }
-        }
-      )
-    }
-  }
-
-  private fun showChooseLAMode(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    laNoticeShown.set(true)
-    AlertManager.shared.showAlertDialogStacked(
-      title = generalGetString(R.string.la_lock_mode),
-      text = null,
-      confirmText = generalGetString(R.string.la_lock_mode_passcode),
-      dismissText = generalGetString(R.string.la_lock_mode_system),
-      onConfirm = {
-        AlertManager.shared.hideAlert()
-        setPasscode()
-      },
-      onDismiss = {
-        AlertManager.shared.hideAlert()
-        initialEnableLA(activity)
-      }
-    )
-  }
-
-  private fun initialEnableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    val appPrefs = m.controller.appPrefs
-    m.controller.appPrefs.laMode.set(LAMode.SYSTEM)
-    authenticate(
-      generalGetString(R.string.auth_enable_simplex_lock),
-      generalGetString(R.string.auth_confirm_credential),
-      activity,
-      completed = { laResult ->
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            appPrefs.performLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            m.showAdvertiseLAUnavailableAlert.value = true
-          }
-        }
-      }
-    )
-  }
-
-  private fun setPasscode() {
-    val chatModel = vm.chatModel
-    val appPrefs = chatModel.controller.appPrefs
-    ModalManager.shared.showCustomModal { close ->
-      Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-        SetAppPasscodeView(
-          submit = {
-            chatModel.performLA.value = true
-            appPrefs.performLA.set(true)
-            appPrefs.laMode.set(LAMode.PASSCODE)
-            laTurnedOnAlert()
-          },
-          cancel = {
-            chatModel.performLA.value = false
-            appPrefs.performLA.set(false)
-            laPasscodeNotSetAlert()
-          },
-          close)
-      }
-    }
-  }
-
-  private fun setPerformLA(on: Boolean, activity: FragmentActivity) {
-    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
-    if (on) {
-      enableLA(activity)
-    } else {
-      disableLA(activity)
-    }
-  }
-
-  private fun enableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_enable_simplex_lock)
-      else
-        generalGetString(R.string.new_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        "",
-      activity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableInstructionAlert()
-          }
-        }
-      }
-    )
-  }
-
-  private fun disableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_disable_simplex_lock)
-      else
-        generalGetString(R.string.la_enter_app_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        generalGetString(R.string.auth_disable_simplex_lock),
-      activity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            ksAppPassword.remove()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableTurningOffAlert()
-          }
-        }
-      }
-    )
-  }
-}
-
-class SimplexViewModel(application: Application): AndroidViewModel(application) {
-  val app = getApplication<SimplexApp>()
-  val chatModel = app.chatModel
-}
-
-@Composable
-fun MainPage(
-  chatModel: ChatModel,
-  userAuthorized: MutableState<Boolean?>,
-  laFailed: MutableState<Boolean>,
-  runAuthenticate: () -> Unit,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit,
-  showLANotice: () -> Unit
-) {
-  var showChatDatabaseError by rememberSaveable {
-    mutableStateOf(chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null)
-  }
-  LaunchedEffect(chatModel.chatDbStatus.value) {
-    showChatDatabaseError = chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null
-  }
-
-  var showAdvertiseLAAlert by remember { mutableStateOf(false) }
-  LaunchedEffect(showAdvertiseLAAlert) {
-    if (
-      !chatModel.controller.appPrefs.laNoticeShown.get()
-      && showAdvertiseLAAlert
-      && chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete
-      && chatModel.chats.isNotEmpty()
-      && chatModel.activeCallInvitation.value == null
-    ) {
-      showLANotice()
-    }
-  }
-  LaunchedEffect(chatModel.showAdvertiseLAUnavailableAlert.value) {
-    if (chatModel.showAdvertiseLAUnavailableAlert.value) {
-      laUnavailableInstructionAlert()
-    }
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value) {
-      ModalManager.shared.closeModals()
-      chatModel.clearOverlays.value = false
-    }
-  }
-
-  @Composable
-  fun authView() {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      SimpleButton(
-        stringResource(R.string.auth_unlock),
-        icon = Icons.Outlined.Lock,
-        click = {
-          laFailed.value = false
-          runAuthenticate()
-        }
-      )
-    }
-  }
-
-  Box {
-    val onboarding = chatModel.onboardingStage.value
-    val userCreated = chatModel.userCreated.value
-    when {
-      showChatDatabaseError -> {
-        chatModel.chatDbStatus.value?.let {
-          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
-        }
-      }
-      onboarding == null || userCreated == null -> SplashView()
-      userAuthorized.value != true -> {
-        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-          authView()
-        } else {
-          SplashView()
-        }
-      }
-      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
-        Box {
-          if (chatModel.showCallView.value) ActiveCallView(chatModel)
-          else {
-            showAdvertiseLAAlert = true
-            BoxWithConstraints {
-              var currentChatId by rememberSaveable { mutableStateOf(chatModel.chatId.value) }
-              val offset = remember { Animatable(if (chatModel.chatId.value == null) 0f else maxWidth.value) }
-              Box(
-                Modifier
-                  .graphicsLayer {
-                    translationX = -offset.value.dp.toPx()
-                  }
-              ) {
-                  val stopped = chatModel.chatRunning.value == false
-                  if (chatModel.sharedContent.value == null)
-                    ChatListView(chatModel, setPerformLA, stopped)
-                  else
-                    ShareListView(chatModel, stopped)
-              }
-              val scope = rememberCoroutineScope()
-              val onComposed: () -> Unit = {
-                scope.launch {
-                  offset.animateTo(
-                    if (chatModel.chatId.value == null) 0f else maxWidth.value,
-                    chatListAnimationSpec()
-                  )
-                  if (offset.value == 0f) {
-                    currentChatId = null
-                  }
-                }
-              }
-              LaunchedEffect(Unit) {
-                launch {
-                  snapshotFlow { chatModel.chatId.value }
-                    .distinctUntilChanged()
-                    .collect {
-                      if (it != null) currentChatId = it
-                      else onComposed()
-                    }
-                }
-              }
-              Box (Modifier.graphicsLayer { translationX = maxWidth.toPx() - offset.value.dp.toPx() }) Box2@ {
-                currentChatId?.let {
-                  ChatView(it, chatModel, onComposed)
-                }
-              }
-            }
-          }
-        }
-      }
-      onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
-      onboarding == OnboardingStage.Step3_SetNotificationsMode -> SetNotificationsMode(chatModel)
-    }
-    ModalManager.shared.showInView()
-    val invitation = chatModel.activeCallInvitation.value
-    if (invitation != null) IncomingCallAlertView(invitation, chatModel)
-    AlertManager.shared.showInView()
-  }
-
-  DisposableEffectOnRotate {
-    // When using lock delay = 0 and screen rotates, the app will be locked which is not useful.
-    // Let's prolong the unlocked period to 3 sec for screen rotation to take place
-    if (chatModel.controller.appPrefs.laLockDelay.get() == 0) {
-      enteredBackground.value = elapsedRealtime() + 3000
-    }
-  }
-}
-
-fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
-  val userId = getUserIdFromIntent(intent)
-  when (intent?.action) {
-    NtfManager.OpenChatAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
-      if (chatId != null) {
-        withBGApi {
-          awaitChatStartedIfNeeded(chatModel)
-          if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
-            chatModel.controller.changeActiveUser(userId, null)
-          }
-          val cInfo = chatModel.getChat(chatId)?.chatInfo
-          chatModel.clearOverlays.value = true
-          if (cInfo != null) openChat(cInfo, chatModel)
-        }
-      }
-    }
-    NtfManager.ShowChatsAction -> {
-      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
-      withBGApi {
-        awaitChatStartedIfNeeded(chatModel)
-        if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
-          chatModel.controller.changeActiveUser(userId, null)
-        }
-        chatModel.chatId.value = null
-        chatModel.clearOverlays.value = true
-      }
-    }
-    NtfManager.AcceptCallAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      if (chatId == null || chatId == "") return
-      Log.d(TAG, "processNotificationIntent: AcceptCallAction $chatId")
-      chatModel.clearOverlays.value = true
-      val invitation = chatModel.callInvitations[chatId]
-      if (invitation == null) {
-        AlertManager.shared.showAlertMsg(generalGetString(R.string.call_already_ended))
-      } else {
-        chatModel.callManager.acceptIncomingCall(invitation = invitation)
-      }
-    }
-  }
-}
-
-fun processIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    "android.intent.action.VIEW" -> {
-      val uri = intent.data
-      if (uri != null) connectIfOpenedViaUri(uri, chatModel)
-    }
-  }
-}
-
-fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    Intent.ACTION_SEND -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      when {
-        "text/plain" == intent.type -> intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-          chatModel.sharedContent.value = SharedContent.Text(it)
-        }
-        intent.type?.startsWith("image/") == true -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-          chatModel.sharedContent.value = SharedContent.Images(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(it))
-        } // All other mime types
-        else -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-          chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
-        }
-      }
-    }
-    Intent.ACTION_SEND_MULTIPLE -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      when {
-        intent.type?.startsWith("image/") == true -> (intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>)?.let {
-          chatModel.sharedContent.value = SharedContent.Images(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
-        } // All other mime types
-        else -> {}
-      }
-    }
-  }
-}
-
-fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
-  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
-  if (chatModel.currentUser.value == null) {
-    chatModel.appOpenUrl.value = uri
-  } else {
-    withUriAction(uri) { linkType ->
-      val title = when (linkType) {
-        ConnectionLinkType.CONTACT -> generalGetString(R.string.connect_via_contact_link)
-        ConnectionLinkType.INVITATION -> generalGetString(R.string.connect_via_invitation_link)
-        ConnectionLinkType.GROUP -> generalGetString(R.string.connect_via_group_link)
-      }
-      AlertManager.shared.showAlertMsg(
-        title = title,
-        text = if (linkType == ConnectionLinkType.GROUP)
-          generalGetString(R.string.you_will_join_group)
-        else
-          generalGetString(R.string.profile_will_be_sent_to_contact_sending_link),
-        confirmText = generalGetString(R.string.connect_via_link_verb),
-        onConfirm = {
-          withApi {
-            Log.d(TAG, "connectIfOpenedViaUri: connecting")
-            connectViaUri(chatModel, linkType, uri)
-          }
-        }
-      )
-    }
-  }
-}
-
-suspend fun awaitChatStartedIfNeeded(chatModel: ChatModel, timeout: Long = 30_000) {
-  // Still decrypting database
-  if (chatModel.chatRunning.value == null) {
-    val step = 50L
-    for (i in 0..(timeout / step)) {
-      if (chatModel.chatRunning.value == true || chatModel.onboardingStage.value == OnboardingStage.Step1_SimpleXInfo) {
-        break
-      }
-      delay(step)
-    }
-  }
-}
-
-//fun testJson() {
-//  val str: String = """
-//  """.trimIndent()
-//
-//  println(json.decodeFromString<APIResponse>(str))
-//}

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

@@ -1,241 +0,0 @@
-package chat.simplex.app
-
-import android.app.Application
-import android.net.LocalServerSocket
-import android.util.Log
-import androidx.lifecycle.*
-import androidx.work.*
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.OnboardingStage
-import chat.simplex.app.views.usersettings.NotificationsMode
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import java.io.*
-import java.util.*
-import java.util.concurrent.Semaphore
-import java.util.concurrent.TimeUnit
-import kotlin.concurrent.thread
-
-const val TAG = "SIMPLEX"
-
-// ghc's rts
-external fun initHS()
-// android-support
-external fun pipeStdOutToSocket(socketName: String) : Int
-
-// SimpleX API
-typealias ChatCtrl = Long
-external fun chatMigrateInit(dbPath: String, dbKey: String, confirm: String): Array<Any>
-external fun chatSendCmd(ctrl: ChatCtrl, msg: String): String
-external fun chatRecvMsg(ctrl: ChatCtrl): String
-external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
-external fun chatParseMarkdown(str: String): String
-external fun chatParseServer(str: String): String
-external fun chatPasswordHash(pwd: String, salt: String): String
-
-class SimplexApp: Application(), LifecycleEventObserver {
-  lateinit var chatController: ChatController
-
-  var isAppOnForeground: Boolean = false
-
-  val defaultLocale: Locale = Locale.getDefault()
-
-  fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
-    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
-    val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
-    val confirm = confirmMigrations ?: if (appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
-    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePathPrefix, dbKey, confirm.value)
-    val res: DBMigrationResult = kotlin.runCatching {
-      json.decodeFromString<DBMigrationResult>(migrated[0] as String)
-    }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
-    val ctrl = if (res is DBMigrationResult.OK) {
-      migrated[1] as Long
-    } else null
-    if (::chatController.isInitialized) {
-      chatController.ctrl = ctrl
-    } else {
-      chatController = ChatController(ctrl, ntfManager, applicationContext, appPreferences)
-    }
-    chatModel.chatDbEncrypted.value = dbKey != ""
-    chatModel.chatDbStatus.value = res
-    if (res != DBMigrationResult.OK) {
-      Log.d(TAG, "Unable to migrate successfully: $res")
-    } else if (startChat) {
-      // If we migrated successfully means previous re-encryption process on database level finished successfully too
-      if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
-      withApi {
-        val user = chatController.apiGetActiveUser()
-        if (user == null) {
-          chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-        } else {
-          chatController.startChat(user)
-          chatController.showBackgroundServiceNoticeIfNeeded()
-          if (appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name)
-            SimplexService.start(applicationContext)
-        }
-      }
-    }
-  }
-
-  val chatModel: ChatModel
-    get() = chatController.chatModel
-
-  private val ntfManager: NtfManager by lazy {
-    NtfManager(applicationContext, appPreferences)
-  }
-
-  private val appPreferences: AppPreferences by lazy {
-    AppPreferences(applicationContext)
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    context = this
-    initChatController()
-    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-    context.getDir("temp", MODE_PRIVATE).deleteRecursively()
-  }
-
-  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-    Log.d(TAG, "onStateChanged: $event")
-    withApi {
-      when (event) {
-        Lifecycle.Event.ON_START -> {
-          isAppOnForeground = true
-          if (chatModel.chatRunning.value == true) {
-            kotlin.runCatching {
-              val currentUserId = chatModel.currentUser.value?.userId
-              val chats = ArrayList(chatController.apiGetChats())
-              /** Active user can be changed in background while [ChatController.apiGetChats] is executing */
-              if (chatModel.currentUser.value?.userId == currentUserId) {
-                val currentChatId = chatModel.chatId.value
-                val oldStats = if (currentChatId != null) chatModel.getChat(currentChatId)?.chatStats else null
-                if (oldStats != null) {
-                  val indexOfCurrentChat = chats.indexOfFirst { it.id == currentChatId }
-                  /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
-                  if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
-                }
-                chatModel.updateChats(chats)
-              }
-            }.onFailure { Log.e(TAG, it.stackTraceToString()) }
-          }
-        }
-        Lifecycle.Event.ON_RESUME -> {
-          isAppOnForeground = true
-          if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
-            chatController.showBackgroundServiceNoticeIfNeeded()
-          }
-          /**
-           * We're starting service here instead of in [Lifecycle.Event.ON_START] because
-           * after calling [ChatController.showBackgroundServiceNoticeIfNeeded] notification mode in prefs can be changed.
-           * It can happen when app was started and a user enables battery optimization while app in background
-           * */
-          if (chatModel.chatRunning.value != false &&
-            chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete &&
-            appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name
-          ) {
-            SimplexService.start(applicationContext)
-          }
-        }
-        else -> isAppOnForeground = false
-      }
-    }
-  }
-
-  fun allowToStartServiceAfterAppExit() = with(chatModel.controller) {
-    appPrefs.notificationsMode.get() == NotificationsMode.SERVICE.name &&
-        (!NotificationsMode.SERVICE.requiresIgnoringBattery || isIgnoringBatteryOptimizations(chatModel.controller.appContext))
-  }
-
-  private fun allowToStartPeriodically() = with(chatModel.controller) {
-    appPrefs.notificationsMode.get() == NotificationsMode.PERIODIC.name &&
-        (!NotificationsMode.PERIODIC.requiresIgnoringBattery || isIgnoringBatteryOptimizations(chatModel.controller.appContext))
-  }
-
-  /*
-  * It takes 1-10 milliseconds to process this function. Better to do it in a background thread
-  * */
-  fun schedulePeriodicServiceRestartWorker() = CoroutineScope(Dispatchers.Default).launch {
-    if (!allowToStartServiceAfterAppExit()) {
-      return@launch
-    }
-    val workerVersion = chatController.appPrefs.autoRestartWorkerVersion.get()
-    val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
-      Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
-      ExistingPeriodicWorkPolicy.KEEP
-    } else {
-      Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
-      chatController.appPrefs.autoRestartWorkerVersion.set(SimplexService.SERVICE_START_WORKER_VERSION)
-      ExistingPeriodicWorkPolicy.REPLACE
-    }
-    val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
-      .addTag(SimplexService.TAG)
-      .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
-      .build()
-    Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
-    WorkManager.getInstance(context)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
-  }
-
-  fun schedulePeriodicWakeUp() = CoroutineScope(Dispatchers.Default).launch {
-    if (!allowToStartPeriodically()) {
-      return@launch
-    }
-    MessagesFetcherWorker.scheduleWork()
-  }
-
-  companion object {
-    lateinit var context: SimplexApp private set
-
-    init {
-      val socketName = BuildConfig.APPLICATION_ID + ".local.socket.address.listen.native.cmd2"
-      val s = Semaphore(0)
-      thread(name="stdout/stderr pipe") {
-        Log.d(TAG, "starting server")
-        var server: LocalServerSocket? = null
-        for (i in 0..100) {
-          try {
-            server = LocalServerSocket(socketName + i)
-            break
-          } catch (e: IOException) {
-            Log.e(TAG, e.stackTraceToString())
-          }
-        }
-        if (server == null) {
-          throw Error("Unable to setup local server socket. Contact developers")
-        }
-        Log.d(TAG, "started server")
-        s.release()
-        val receiver = server.accept()
-        Log.d(TAG, "started receiver")
-        val logbuffer = FifoQueue<String>(500)
-        if (receiver != null) {
-          val inStream = receiver.inputStream
-          val inStreamReader = InputStreamReader(inStream)
-          val input = BufferedReader(inStreamReader)
-          Log.d(TAG, "starting receiver loop")
-          while (true) {
-            val line = input.readLine() ?: break
-            Log.w("$TAG (stdout/stderr)", line)
-            logbuffer.add(line)
-          }
-          Log.w(TAG, "exited receiver loop")
-        }
-      }
-
-      System.loadLibrary("app-lib")
-
-      s.acquire()
-      pipeStdOutToSocket(socketName)
-
-      initHS()
-    }
-  }
-}
-
-class FifoQueue<E>(private var capacity: Int) : LinkedList<E>() {
-  override fun add(element: E): Boolean {
-    if(size > capacity) removeFirst()
-    return super.add(element)
-  }
-}

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

@@ -1,329 +0,0 @@
-package chat.simplex.app
-
-import android.app.*
-import android.content.*
-import android.content.pm.PackageManager
-import android.os.*
-import android.provider.Settings
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.work.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-// based on:
-// https://robertohuertas.com/2019/06/29/android_foreground_services/
-// https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
-
-class SimplexService: Service() {
-  private var wakeLock: PowerManager.WakeLock? = null
-  private var isStartingService = false
-  private var notificationManager: NotificationManager? = null
-  private var serviceNotification: Notification? = null
-
-  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-    Log.d(TAG, "onStartCommand startId: $startId")
-    if (intent != null) {
-      val action = intent.action
-      Log.d(TAG, "intent action $action")
-      when (action) {
-        Action.START.name -> startService()
-        else -> Log.e(TAG, "No action in the intent")
-      }
-    } else {
-      Log.d(TAG, "null intent. Probably restarted by the system.")
-    }
-    return START_STICKY // to restart if killed
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    Log.d(TAG, "Simplex service created")
-    val title = getString(R.string.simplex_service_notification_title)
-    val text = getString(R.string.simplex_service_notification_text)
-    notificationManager = createNotificationChannel()
-    serviceNotification = createNotification(title, text)
-    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
-    /**
-     * The reason [stopAfterStart] exists is because when the service is not called [startForeground] yet, and
-     * we call [stopSelf] on the same service, [ForegroundServiceDidNotStartInTimeException] will be thrown.
-     * To prevent that, we can call [stopSelf] only when the service made [startForeground] call
-     * */
-    if (stopAfterStart) {
-      stopForeground(true)
-      stopSelf()
-    } else {
-      isServiceStarted = true
-    }
-  }
-
-  override fun onDestroy() {
-    Log.d(TAG, "Simplex service destroyed")
-    try {
-      wakeLock?.let {
-        while (it.isHeld) it.release() // release all, in case acquired more than once
-      }
-      wakeLock = null
-    } catch (e: Exception) {
-      Log.d(TAG, "Exception while releasing wakelock: ${e.message}")
-    }
-    isServiceStarted = false
-    stopAfterStart = false
-    saveServiceState(this, ServiceState.STOPPED)
-
-    // If notification service is enabled and battery optimization is disabled, restart the service
-    if (SimplexApp.context.allowToStartServiceAfterAppExit())
-      sendBroadcast(Intent(this, AutoRestartReceiver::class.java))
-    super.onDestroy()
-  }
-
-  private fun startService() {
-    Log.d(TAG, "SimplexService startService")
-    if (wakeLock != null || isStartingService) return
-    val self = this
-    isStartingService = true
-    withApi {
-      val chatController = (application as SimplexApp).chatController
-      try {
-        Log.w(TAG, "Starting foreground service")
-        val chatDbStatus = chatController.chatModel.chatDbStatus.value
-        if (chatDbStatus != DBMigrationResult.OK) {
-          Log.w(chat.simplex.app.TAG, "SimplexService: problem with the database: $chatDbStatus")
-          showPassphraseNotification(chatDbStatus)
-          safeStopService(self)
-          return@withApi
-        }
-        saveServiceState(self, ServiceState.STARTED)
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-          newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG).apply {
-            acquire()
-          }
-        }
-      } finally {
-        isStartingService = false
-      }
-    }
-  }
-
-  private fun createNotificationChannel(): NotificationManager? {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      val channel = NotificationChannel(NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW).let {
-        it.setShowBadge(false) // no long-press badge
-        it
-      }
-      notificationManager.createNotificationChannel(channel)
-      return notificationManager
-    }
-    return null
-  }
-
-  private fun createNotification(title: String, text: String): Notification {
-    val pendingIntent: PendingIntent = Intent(this, MainActivity::class.java).let { notificationIntent ->
-      PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
-    }
-
-    val builder =  NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-      .setSmallIcon(R.drawable.ntf_service_icon)
-      .setColor(0x88FFFF)
-      .setContentTitle(title)
-      .setContentText(text)
-      .setContentIntent(pendingIntent)
-      .setSilent(true)
-      .setShowWhen(false) // no date/time
-
-    // Shows a button which opens notification channel settings
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-      val setupIntent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-      setupIntent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-      setupIntent.putExtra(Settings.EXTRA_CHANNEL_ID, NOTIFICATION_CHANNEL_ID)
-      val setup = PendingIntent.getActivity(this, 0, setupIntent, flags)
-      builder.addAction(0, getString(R.string.hide_notification), setup)
-    }
-
-    return builder.build()
-  }
-
-  override fun onBind(intent: Intent): IBinder? {
-    return null // no binding
-  }
-
-  // re-schedules the task when "Clear recent apps" is pressed
-  override fun onTaskRemoved(rootIntent: Intent) {
-    // Just to make sure that after restart of the app the user will need to re-authenticate
-    MainActivity.clearAuthState()
-
-    // If notification service isn't enabled or battery optimization isn't disabled, we shouldn't restart the service
-    if (!SimplexApp.context.allowToStartServiceAfterAppExit()) {
-      return
-    }
-
-    val restartServiceIntent = Intent(applicationContext, SimplexService::class.java).also {
-      it.setPackage(packageName)
-    };
-    val restartServicePendingIntent: PendingIntent = PendingIntent.getService(this, 1, restartServiceIntent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE);
-    applicationContext.getSystemService(Context.ALARM_SERVICE);
-    val alarmService: AlarmManager = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager;
-    alarmService.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + 1000, restartServicePendingIntent);
-  }
-
-  // restart on reboot
-  class StartReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-      Log.d(TAG, "StartReceiver: onReceive called")
-      scheduleStart(context)
-    }
-    companion object {
-      fun toggleReceiver(enable: Boolean) {
-        Log.d(TAG, "StartReceiver: toggleReceiver enabled: $enable")
-        val component = ComponentName(BuildConfig.APPLICATION_ID, StartReceiver::class.java.name)
-        SimplexApp.context.packageManager.setComponentEnabledSetting(
-          component,
-          if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-          PackageManager.DONT_KILL_APP
-        )
-      }
-    }
-  }
-
-  // restart on destruction
-  class AutoRestartReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-      Log.d(TAG, "AutoRestartReceiver: onReceive called")
-      scheduleStart(context)
-    }
-  }
-
-  class ServiceStartWorker(private val context: Context, params: WorkerParameters): CoroutineWorker(context, params) {
-    override suspend fun doWork(): Result {
-      val id = this.id
-      if (context.applicationContext !is Application) {
-        Log.d(TAG, "ServiceStartWorker: Failed, no application found (work ID: $id)")
-        return Result.failure()
-      }
-      if (getServiceState(context) == ServiceState.STARTED) {
-        Log.d(TAG, "ServiceStartWorker: Starting foreground service (work ID: $id)")
-        start(context)
-      }
-      return Result.success()
-    }
-  }
-
-  enum class Action {
-    START,
-  }
-
-  enum class ServiceState {
-    STARTED,
-    STOPPED,
-  }
-
-  companion object {
-    const val TAG = "SIMPLEX_SERVICE"
-    const val NOTIFICATION_CHANNEL_ID = "chat.simplex.app.SIMPLEX_SERVICE_NOTIFICATION"
-    const val NOTIFICATION_CHANNEL_NAME = "SimpleX Chat service"
-    const val SIMPLEX_SERVICE_ID = 6789
-    const val SERVICE_START_WORKER_VERSION = BuildConfig.VERSION_CODE
-    const val SERVICE_START_WORKER_INTERVAL_MINUTES = 3 * 60L
-    const val SERVICE_START_WORKER_WORK_NAME_PERIODIC = "SimplexAutoRestartWorkerPeriodic" // Do not change!
-
-    private const val PASSPHRASE_NOTIFICATION_ID = 1535
-
-    private const val WAKE_LOCK_TAG = "SimplexService::lock"
-    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_SERVICE_PREFS"
-    private const val SHARED_PREFS_SERVICE_STATE = "SIMPLEX_SERVICE_STATE"
-    private const val WORK_NAME_ONCE = "ServiceStartWorkerOnce"
-
-    private var isServiceStarted = false
-    private var stopAfterStart = false
-
-    fun scheduleStart(context: Context) {
-      Log.d(TAG, "Enqueuing work to start subscriber service")
-      val workManager = WorkManager.getInstance(context)
-      val startServiceRequest = OneTimeWorkRequest.Builder(ServiceStartWorker::class.java).build()
-      workManager.enqueueUniqueWork(WORK_NAME_ONCE, ExistingWorkPolicy.KEEP, startServiceRequest) // Unique avoids races!
-    }
-
-    suspend fun start(context: Context) = serviceAction(context, Action.START)
-
-    /**
-     * If there is a need to stop the service, use this function only. It makes sure that the service will be stopped without an
-     * exception related to foreground services lifecycle
-     * */
-    fun safeStopService(context: Context) {
-      if (isServiceStarted) {
-        context.stopService(Intent(context, SimplexService::class.java))
-      } else {
-        stopAfterStart = true
-      }
-    }
-
-    private suspend fun serviceAction(context: Context, action: Action) {
-      Log.d(TAG, "SimplexService serviceAction: ${action.name}")
-      withContext(Dispatchers.IO) {
-        Intent(context, SimplexService::class.java).also {
-          it.action = action.name
-          ContextCompat.startForegroundService(context, it)
-        }
-      }
-    }
-
-    fun restart(context: Context) {
-      Intent(context, SimplexService::class.java).also { intent ->
-        context.stopService(intent) // Service will auto-restart
-      }
-    }
-
-    fun saveServiceState(context: Context, state: ServiceState) {
-      getPreferences(context).edit()
-        .putString(SHARED_PREFS_SERVICE_STATE, state.name)
-        .apply()
-    }
-
-    fun getServiceState(context: Context): ServiceState {
-      val value = getPreferences(context)
-        .getString(SHARED_PREFS_SERVICE_STATE, ServiceState.STOPPED.name)
-      return ServiceState.valueOf(value!!)
-    }
-
-    fun showPassphraseNotification(chatDbStatus: DBMigrationResult?) {
-      val pendingIntent: PendingIntent = Intent(SimplexApp.context, MainActivity::class.java).let { notificationIntent ->
-        PendingIntent.getActivity(SimplexApp.context, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
-      }
-
-      val title = when(chatDbStatus) {
-        is DBMigrationResult.ErrorNotADatabase -> generalGetString(R.string.enter_passphrase_notification_title)
-        is DBMigrationResult.OK -> return
-        else -> generalGetString(R.string.database_initialization_error_title)
-      }
-
-      val description = when(chatDbStatus) {
-        is DBMigrationResult.ErrorNotADatabase -> generalGetString(R.string.enter_passphrase_notification_desc)
-        is DBMigrationResult.OK -> return
-        else -> generalGetString(R.string.database_initialization_error_desc)
-      }
-
-      val builder =  NotificationCompat.Builder(SimplexApp.context, NOTIFICATION_CHANNEL_ID)
-        .setSmallIcon(R.drawable.ntf_service_icon)
-        .setColor(0x88FFFF)
-        .setContentTitle(title)
-        .setContentText(description)
-        .setContentIntent(pendingIntent)
-        .setSilent(true)
-        .setShowWhen(false)
-
-      val notificationManager = SimplexApp.context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      notificationManager.notify(PASSPHRASE_NOTIFICATION_ID, builder.build())
-    }
-
-    fun cancelPassphraseNotification() {
-      val notificationManager = SimplexApp.context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      notificationManager.cancel(PASSPHRASE_NOTIFICATION_ID)
-    }
-
-    private fun getPreferences(context: Context): SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
-  }
-}

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

@@ -1,79 +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 DEFAULT_BOTTOM_PADDING = 48.dp
-val DEFAULT_BOTTOM_BUTTON_PADDING = 20.dp
-
-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.Red,
-  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,
-  error = Color.Red,
-//  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,194 +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.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
-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.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.style.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.OnboardingStage
-import chat.simplex.app.views.onboarding.ReadableText
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch
-
-fun isValidDisplayName(name: String) : Boolean {
-  return (name.firstOrNull { it.isWhitespace() }) == null && !name.startsWith("@") && !name.startsWith("#")
-}
-
-@Composable
-fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
-  val displayName = rememberSaveable { mutableStateOf("") }
-  val fullName = rememberSaveable { mutableStateOf("") }
-  val focusRequester = remember { FocusRequester() }
-
-  Surface(Modifier.background(MaterialTheme.colors.onBackground)) {
-    Column(
-      modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-    ) {
-      /*CloseSheetBar(close = {
-        if (chatModel.users.isEmpty()) {
-          chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-        } else {
-          close()
-        }
-      })*/
-      Column(Modifier.padding(horizontal = DEFAULT_PADDING * 1f)) {
-        AppBarTitleCentered(stringResource(R.string.create_profile))
-        ReadableText(R.string.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues())
-        ReadableText(R.string.profile_is_only_shared_with_your_contacts, TextAlign.Center)
-        Spacer(Modifier.height(DEFAULT_PADDING * 1.5f))
-        Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-          Text(
-            stringResource(R.string.display_name),
-            fontSize = 16.sp
-          )
-          if (!isValidDisplayName(displayName.value)) {
-            Text(
-              stringResource(R.string.no_spaces),
-              fontSize = 16.sp,
-              color = Color.Red
-            )
-          }
-        }
-        ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-        Spacer(Modifier.height(DEFAULT_PADDING))
-        Text(
-          stringResource(R.string.full_name_optional__prompt),
-          fontSize = 16.sp,
-          modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-        )
-        ProfileNameField(fullName, "", ::isValidDisplayName)
-      }
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      Row {
-        if (chatModel.users.isEmpty()) {
-          SimpleButtonDecorated(
-            text = stringResource(R.string.about_simplex),
-            icon = Icons.Outlined.ArrowBackIosNew,
-            textDecoration = TextDecoration.None,
-            fontWeight = FontWeight.Bold
-          ) { 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, close) }.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, fontWeight = FontWeight.Medium)
-            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, close: () -> Unit) {
-  withApi {
-    val user = chatModel.controller.apiCreateActiveUser(
-      Profile(displayName, fullName, null)
-    ) ?: return@withApi
-    chatModel.currentUser.value = user
-    if (chatModel.users.isEmpty()) {
-      chatModel.controller.startChat(user)
-      chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
-      SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
-    } else {
-      val users = chatModel.controller.listUsers()
-      chatModel.users.clear()
-      chatModel.users.addAll(users)
-      chatModel.controller.getUserChatData()
-      close()
-    }
-  }
-}
-
-@Composable
-fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isValid: (String) -> Boolean = { true }, focusRequester: FocusRequester? = null) {
-  var valid by rememberSaveable { mutableStateOf(true) }
-  var focused by rememberSaveable { mutableStateOf(false) }
-  val strokeColor by remember {
-    derivedStateOf {
-      if (valid) {
-        if (focused) {
-          HighOrLowlight.copy(alpha = 0.6f)
-        } else {
-          HighOrLowlight.copy(alpha = 0.3f)
-        }
-      } else Color.Red
-    }
-  }
-  val modifier = Modifier
-    .fillMaxWidth()
-    .height(55.dp)
-    .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(50))
-    .padding(horizontal = 8.dp)
-    .navigationBarsWithImePadding()
-    .onFocusChanged { focused = it.isFocused }
-  TextField(
-    value = name.value,
-    onValueChange = { name.value = it },
-    modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-    textStyle = TextStyle(fontSize = 18.sp, color = colors.onBackground),
-    keyboardOptions = KeyboardOptions(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    singleLine = true,
-    isError = !valid,
-    placeholder = { Text(placeholder, fontSize = 18.sp, color = HighOrLowlight.copy(alpha = 0.3f)) },
-    shape = RoundedCornerShape(50),
-    colors = TextFieldDefaults.textFieldColors(
-      backgroundColor = Color.Unspecified,
-      textColor = MaterialTheme.colors.onBackground,
-      focusedIndicatorColor = Color.Unspecified,
-      unfocusedIndicatorColor = Color.Unspecified,
-      cursorColor = HighOrLowlight,
-      errorIndicatorColor = Color.Unspecified
-    )
-    )
-  LaunchedEffect(Unit) {
-    snapshotFlow { name.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}

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

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

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/ScanCodeView.kt

@@ -1,53 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCodeScanner
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanCodeLayout(verifyCode, close)
-}
-
-@Composable
-private fun ScanCodeLayout(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.scan_code), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = DEFAULT_PADDING)
-    ) {
-      QRCodeScanner { text ->
-        verifyCode(text) {
-          if (it) {
-            close()
-          } else {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.incorrect_code)
-            )
-          }
-        }
-      }
-    }
-    Text(stringResource(R.string.scan_code_from_contacts_app))
-  }
-}

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

@@ -1,466 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import android.util.Log
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.chatlist.cantInviteIncognitoAlert
-import chat.simplex.app.views.chatlist.setGroupMembers
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*
-
-@Composable
-fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit, close: () -> Unit) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null && chat.chatInfo is ChatInfo.Group) {
-    val groupInfo = chat.chatInfo.groupInfo
-    GroupChatInfoLayout(
-      chat,
-      groupInfo,
-      members = chatModel.groupMembers
-        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
-        .sortedBy { it.displayName.lowercase() },
-      developerTools,
-      groupLink,
-      addMembers = {
-        withApi {
-          setGroupMembers(groupInfo, chatModel)
-          ModalManager.shared.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, false, chatModel, close)
-          }
-        }
-      },
-      showMemberInfo = { member ->
-        withApi {
-          val stats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
-          val (_, code) = if (member.memberActive) {
-            try {
-              chatModel.controller.apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId)
-            } catch (e: Exception) {
-              Log.e(TAG, e.stackTraceToString())
-              member to null
-            }
-          } else {
-            member to null
-          }
-          ModalManager.shared.showModalCloseable(true) { closeCurrent ->
-            remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-              GroupMemberInfoView(groupInfo, mem, stats, code, chatModel, closeCurrent) {
-                closeCurrent()
-                close()
-              }
-            }
-          }
-        }
-      },
-      editGroupProfile = {
-        ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
-      },
-      addOrEditWelcomeMessage = {
-        ModalManager.shared.showCustomModal { close -> GroupWelcomeView(chatModel, groupInfo, close) }
-      },
-      openPreferences = {
-        ModalManager.shared.showCustomModal { close ->
-          GroupPreferencesView(
-            chatModel,
-            chat.id,
-            close
-          )
-        }
-      },
-      deleteGroup = { deleteGroupDialog(chat.chatInfo, groupInfo, chatModel, close) },
-      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
-      leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) },
-      manageGroupLink = {
-          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, groupLinkMemberRole, onGroupLinkUpdated) }
-      }
-    )
-  }
-}
-
-fun deleteGroupDialog(chatInfo: ChatInfo, groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  val alertTextKey =
-    if (groupInfo.membership.memberCurrent) R.string.delete_group_for_all_members_cannot_undo_warning
-    else R.string.delete_group_for_self_cannot_undo_warning
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.delete_group_question),
-    text = generalGetString(alertTextKey),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
-        if (r) {
-          chatModel.removeChat(chatInfo.id)
-          chatModel.chatId.value = null
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    }
-  )
-}
-
-fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.leave_group_question),
-    text = generalGetString(R.string.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
-    confirmText = generalGetString(R.string.leave_group_button),
-    onConfirm = {
-      withApi {
-        chatModel.controller.leaveGroup(groupInfo.groupId)
-        close?.invoke()
-      }
-    }
-  )
-}
-
-@Composable
-fun GroupChatInfoLayout(
-  chat: Chat,
-  groupInfo: GroupInfo,
-  members: List<GroupMember>,
-  developerTools: Boolean,
-  groupLink: String?,
-  addMembers: () -> Unit,
-  showMemberInfo: (GroupMember) -> Unit,
-  editGroupProfile: () -> Unit,
-  addOrEditWelcomeMessage: () -> Unit,
-  openPreferences: () -> Unit,
-  deleteGroup: () -> Unit,
-  clearChat: () -> Unit,
-  leaveGroup: () -> Unit,
-  manageGroupLink: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupChatInfoHeader(chat.chatInfo)
-    }
-    SectionSpacer()
-
-    SectionView {
-      if (groupInfo.canEdit) {
-        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
-        SectionDivider()
-        SectionItemView(addOrEditWelcomeMessage) { AddOrEditWelcomeMessage(groupInfo.groupProfile.description) }
-        SectionDivider()
-      }
-      GroupPreferencesButton(openPreferences)
-    }
-    SectionTextFooter(stringResource(R.string.only_group_owners_can_change_prefs))
-    SectionSpacer()
-
-    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
-      if (groupInfo.canAddMembers) {
-        SectionItemView(manageGroupLink) {
-          if (groupLink == null) {
-            CreateGroupLinkButton()
-          } else {
-            GroupLinkButton()
-          }
-        }
-        SectionDivider()
-        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
-        SectionItemView(onAddMembersClick) {
-          val tint = if (chat.chatInfo.incognito) HighOrLowlight else MaterialTheme.colors.primary
-          AddMembersButton(tint)
-        }
-        SectionDivider()
-      }
-      SectionItemView(minHeight = 50.dp) {
-        MemberRow(groupInfo.membership, user = true)
-      }
-      if (members.isNotEmpty()) {
-        SectionDivider()
-      }
-      MembersList(members, showMemberInfo)
-    }
-    SectionSpacer()
-    SectionView {
-      ClearChatButton(clearChat)
-      if (groupInfo.canDelete) {
-        SectionDivider()
-        SectionItemView(deleteGroup) { DeleteGroupButton() }
-      }
-      if (groupInfo.membership.memberCurrent) {
-        SectionDivider()
-        SectionItemView(leaveGroup) { LeaveGroupButton() }
-      }
-    }
-    SectionSpacer()
-
-    if (developerTools) {
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
-        SectionDivider()
-        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
-      }
-      SectionSpacer()
-    }
-  }
-}
-
-@Composable
-private fun GroupChatInfoHeader(cInfo: ChatInfo) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-      color = MaterialTheme.colors.onBackground,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis
-    )
-    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-      Text(
-        cInfo.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-private fun GroupPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.group_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Add,
-      stringResource(R.string.button_add_members),
-      tint = tint
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_add_members), color = tint)
-  }
-}
-
-@Composable
-private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
-  Column {
-    members.forEachIndexed { index, member ->
-      SectionItemView({ showMemberInfo(member) }, minHeight = 50.dp) {
-        MemberRow(member)
-      }
-      if (index < members.lastIndex) {
-        SectionDivider()
-      }
-    }
-  }
-}
-
-@Composable
-private fun MemberRow(member: GroupMember, user: Boolean = false) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      Modifier.weight(1f).padding(end = DEFAULT_PADDING),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      ProfileImage(size = 46.dp, member.image)
-      Column {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (member.verified) {
-            MemberVerifiedShield()
-          }
-          Text(
-            member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-            color = if (member.memberIncognito) Indigo else Color.Unspecified
-          )
-        }
-        val s = member.memberStatus.shortText
-        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
-        Text(
-          statusDescr,
-          color = HighOrLowlight,
-          fontSize = 12.sp,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis
-        )
-      }
-    }
-    val role = member.memberRole
-    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
-      Text(role.text, color = HighOrLowlight)
-    }
-  }
-}
-
-@Composable
-private fun MemberVerifiedShield() {
-  Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 3.dp).size(16.dp), tint = HighOrLowlight)
-}
-
-@Composable
-private fun GroupLinkButton() {
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Link,
-      stringResource(R.string.group_link),
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.group_link))
-  }
-}
-
-@Composable
-private fun CreateGroupLinkButton() {
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.AddLink,
-      stringResource(R.string.create_group_link),
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.create_group_link))
-  }
-}
-
-@Composable
-fun EditGroupProfileButton() {
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Edit,
-      stringResource(R.string.button_edit_group_profile),
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_edit_group_profile))
-  }
-}
-
-@Composable
-private fun AddOrEditWelcomeMessage(welcomeMessage: String?) {
-  val text = if (welcomeMessage == null) {
-    stringResource(R.string.button_add_welcome_message)
-  } else {
-    stringResource(R.string.button_welcome_message)
-  }
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.MapsUgc,
-      text,
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(text)
-  }
-}
-
-@Composable
-private fun LeaveGroupButton() {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Logout,
-      stringResource(R.string.button_leave_group),
-      tint = Color.Red
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_leave_group), color = Color.Red)
-  }
-}
-
-@Composable
-private fun DeleteGroupButton() {
-  Row(
-    Modifier.fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.Delete,
-      stringResource(R.string.button_delete_group),
-      tint = Color.Red
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_delete_group), color = Color.Red)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewGroupChatInfoLayout() {
-  SimpleXTheme {
-    GroupChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf()
-      ),
-      groupInfo = GroupInfo.sampleData,
-      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
-      developerTools = false,
-      groupLink = null,
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, addOrEditWelcomeMessage = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
-    )
-  }
-}

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

@@ -1,360 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-import kotlinx.datetime.Clock
-
-@Composable
-fun GroupMemberInfoView(
-  groupInfo: GroupInfo,
-  member: GroupMember,
-  connStats: ConnectionStats?,
-  connectionCode: String?,
-  chatModel: ChatModel,
-  close: () -> Unit,
-  closeAll: () -> Unit, // Close all open windows up to ChatView
-) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null) {
-    val newRole = remember { mutableStateOf(member.memberRole) }
-    GroupMemberInfoLayout(
-      groupInfo,
-      member,
-      connStats,
-      newRole,
-      developerTools,
-      connectionCode,
-      getContactChat = { chatModel.getContactChat(it) },
-      openDirectChat = {
-        withApi {
-          val c = chatModel.controller.apiGetChat(ChatType.Direct, it)
-          if (c != null) {
-            if (chatModel.getContactChat(it) == null) {
-              chatModel.addChat(c)
-            }
-            chatModel.chatItems.clear()
-            chatModel.chatItems.addAll(c.chatItems)
-            chatModel.chatId.value = c.id
-            closeAll()
-          }
-        }
-      },
-      removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) },
-      onRoleSelected = {
-        if (it == newRole.value) return@GroupMemberInfoLayout
-        val prevValue = newRole.value
-        newRole.value = it
-        updateMemberRoleDialog(it, member, onDismiss = {
-          newRole.value = prevValue
-        }) {
-          withApi {
-            kotlin.runCatching {
-              val mem = chatModel.controller.apiMemberRole(groupInfo.groupId, member.groupMemberId, it)
-              chatModel.upsertGroupMember(groupInfo, mem)
-            }.onFailure {
-              newRole.value = prevValue
-            }
-          }
-        }
-      },
-      switchMemberAddress = {
-        switchMemberAddress(chatModel, groupInfo, member)
-      },
-      verifyClicked = {
-        ModalManager.shared.showModalCloseable { close ->
-          remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-            VerifyCodeView(
-              mem.displayName,
-              connectionCode,
-              mem.verified,
-              verify = { code ->
-                chatModel.controller.apiVerifyGroupMember(mem.groupId, mem.groupMemberId, code)?.let { r ->
-                  val (verified, existingCode) = r
-                  chatModel.upsertGroupMember(
-                    groupInfo,
-                    mem.copy(
-                      activeConn = mem.activeConn?.copy(
-                        connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
-                      )
-                    )
-                  )
-                  r
-                }
-              },
-              close,
-            )
-          }
-        }
-      }
-    )
-  }
-}
-
-fun removeMemberDialog(groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.button_remove_member),
-    text = generalGetString(R.string.member_will_be_removed_from_group_cannot_be_undone),
-    confirmText = generalGetString(R.string.remove_member_confirmation),
-    onConfirm = {
-      withApi {
-        val removedMember = chatModel.controller.apiRemoveMember(member.groupId, member.groupMemberId)
-        if (removedMember != null) {
-          chatModel.upsertGroupMember(groupInfo, removedMember)
-        }
-        close?.invoke()
-      }
-    }
-  )
-}
-
-@Composable
-fun GroupMemberInfoLayout(
-  groupInfo: GroupInfo,
-  member: GroupMember,
-  connStats: ConnectionStats?,
-  newRole: MutableState<GroupMemberRole>,
-  developerTools: Boolean,
-  connectionCode: String?,
-  getContactChat: (Long) -> Chat?,
-  openDirectChat: (Long) -> Unit,
-  removeMember: () -> Unit,
-  onRoleSelected: (GroupMemberRole) -> Unit,
-  switchMemberAddress: () -> Unit,
-  verifyClicked: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupMemberInfoHeader(member)
-    }
-    SectionSpacer()
-
-    if (member.memberActive) {
-      val contactId = member.memberContactId
-      if (contactId != null) {
-        SectionView {
-          val chat = getContactChat(contactId)
-          if ((chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) || groupInfo.fullGroupPreferences.directMessages.on) {
-            OpenChatButton(onClick = { openDirectChat(contactId) })
-            if (connectionCode != null) {
-              SectionDivider()
-            }
-          }
-          if (connectionCode != null) {
-            VerifyCodeButton(member.verified, verifyClicked)
-          }
-        }
-        SectionSpacer()
-      }
-    }
-
-    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
-      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
-      SectionDivider()
-      val roles = remember { member.canChangeRoleTo(groupInfo) }
-      if (roles != null) {
-        SectionItemView {
-          RoleSelectionRow(roles, newRole, onRoleSelected)
-        }
-      } else {
-        InfoRow(stringResource(R.string.role_in_group), member.memberRole.text)
-      }
-      val conn = member.activeConn
-      if (conn != null) {
-        SectionDivider()
-        val connLevelDesc =
-          if (conn.connLevel == 0) stringResource(R.string.conn_level_desc_direct)
-          else String.format(generalGetString(R.string.conn_level_desc_indirect), conn.connLevel)
-        InfoRow(stringResource(R.string.info_row_connection), connLevelDesc)
-      }
-    }
-    SectionSpacer()
-    if (connStats != null) {
-      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchMemberAddress)
-      SectionDivider()
-        val rcvServers = connStats.rcvServers
-        val sndServers = connStats.sndServers
-        if ((rcvServers != null && rcvServers.isNotEmpty()) || (sndServers != null && sndServers.isNotEmpty())) {
-          if (rcvServers != null && rcvServers.isNotEmpty()) {
-            SimplexServers(stringResource(R.string.receiving_via), rcvServers)
-            if (sndServers != null && sndServers.isNotEmpty()) {
-              SectionDivider()
-              SimplexServers(stringResource(R.string.sending_via), sndServers)
-            }
-          } else if (sndServers != null && sndServers.isNotEmpty()) {
-            SimplexServers(stringResource(R.string.sending_via), sndServers)
-          }
-        }
-      }
-      SectionSpacer()
-    }
-
-    if (member.canBeRemoved(groupInfo)) {
-      SectionView {
-        RemoveMemberButton(removeMember)
-      }
-      SectionSpacer()
-    }
-
-    if (developerTools) {
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), member.localDisplayName)
-        SectionDivider()
-        InfoRow(stringResource(R.string.info_row_database_id), member.groupMemberId.toString())
-      }
-      SectionSpacer()
-    }
-  }
-}
-
-@Composable
-fun GroupMemberInfoHeader(member: GroupMember) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ProfileImage(size = 192.dp, member.image, color = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      if (member.verified) {
-        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = HighOrLowlight)
-      }
-      Text(
-        member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-    if (member.fullName != "" && member.fullName != member.displayName) {
-      Text(
-        member.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-fun RemoveMemberButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Delete,
-    stringResource(R.string.button_remove_member),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-@Composable
-fun OpenChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Message,
-    stringResource(R.string.button_send_direct_message),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-private fun RoleSelectionRow(
-  roles: List<GroupMemberRole>,
-  selectedRole: MutableState<GroupMemberRole>,
-  onSelected: (GroupMemberRole) -> Unit
-) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    val values = remember { roles.map { it to it.text } }
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.change_role),
-      values,
-      selectedRole,
-      icon = null,
-      enabled = remember { mutableStateOf(true) },
-      onSelected = onSelected
-    )
-  }
-}
-
-private fun updateMemberRoleDialog(
-  newRole: GroupMemberRole,
-  member: GroupMember,
-  onDismiss: () -> Unit,
-  onConfirm: () -> Unit
-) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.change_member_role_question),
-    text = if (member.memberCurrent)
-      String.format(generalGetString(R.string.member_role_will_be_changed_with_notification), newRole.text)
-    else
-      String.format(generalGetString(R.string.member_role_will_be_changed_with_invitation), newRole.text),
-    confirmText = generalGetString(R.string.change_verb),
-    onDismiss = onDismiss,
-    onConfirm = onConfirm,
-    onDismissRequest = onDismiss
-  )
-}
-
-private fun switchMemberAddress(m: ChatModel, groupInfo: GroupInfo, member: GroupMember) = withApi {
-  m.controller.apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
-}
-
-@Preview
-@Composable
-fun PreviewGroupMemberInfoLayout() {
-  SimpleXTheme {
-    GroupMemberInfoLayout(
-      groupInfo = GroupInfo.sampleData,
-      member = GroupMember.sampleData,
-      connStats = null,
-      newRole = remember { mutableStateOf(GroupMemberRole.Member) },
-      developerTools = false,
-      connectionCode = "123",
-      getContactChat = { Chat.sampleData },
-      openDirectChat = {},
-      removeMember = {},
-      onRoleSelected = {},
-      switchMemberAddress = {},
-      verifyClicked = {},
-    )
-  }
-}

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

@@ -1,94 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionItemView
-import SectionSpacer
-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.runtime.*
-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.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
-  var groupInfo by remember { mutableStateOf(groupInfo) }
-  val welcomeText = remember { mutableStateOf(groupInfo.groupProfile.description ?: "") }
-
-  fun save(afterSave: () -> Unit = {}) {
-    withApi {
-      var welcome: String? = welcomeText.value.trim('\n', ' ')
-      if (welcome?.length == 0) {
-        welcome = null
-      }
-      val groupProfileUpdated = groupInfo.groupProfile.copy(description = welcome)
-      val res = m.controller.apiUpdateGroup(groupInfo.groupId, groupProfileUpdated)
-      if (res != null) {
-        groupInfo = res
-        m.updateGroup(res)
-        welcomeText.value = welcome ?: ""
-      }
-      afterSave()
-    }
-  }
-
-  ModalView(
-    close = {
-      if (welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)) close()
-      else showUnsavedChangesAlert({ save(close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    GroupWelcomeLayout(
-      welcomeText,
-      groupInfo,
-      save = ::save
-    )
-  }
-}
-
-@Composable
-private fun GroupWelcomeLayout(
-  welcomeText: MutableState<String>,
-  groupInfo: GroupInfo,
-  save: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.group_welcome_title))
-    val welcomeText = remember { welcomeText }
-    TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
-    SectionSpacer()
-    SaveButton(
-      save = save,
-      disabled = welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
-    )
-  }
-}
-
-@Composable
-private fun SaveButton(save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_update_group_profile), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_welcome_message_question),
-    confirmText = generalGetString(R.string.save_and_update_group_profile),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}

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

@@ -1,218 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.graphics.Bitmap
-import android.os.Build.VERSION.SDK_INT
-import androidx.annotation.StringRes
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-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.asImageBitmap
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.layoutId
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.core.content.FileProvider
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-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 java.io.File
-
-@Composable
-fun CIImageView(
-  image: String,
-  file: CIFile?,
-  imageProvider: () -> ImageGalleryProvider,
-  showMenu: MutableState<Boolean>,
-  receiveFile: (Long) -> Unit
-) {
-  @Composable
-  fun progressIndicator() {
-    CircularProgressIndicator(
-      Modifier.size(16.dp),
-      color = Color.White,
-      strokeWidth = 2.dp
-    )
-  }
-
-  @Composable
-  fun fileIcon(icon: ImageVector, @StringRes stringId: Int) {
-    Icon(
-      icon,
-      stringResource(stringId),
-      Modifier.fillMaxSize(),
-      tint = Color.White
-    )
-  }
-
-  @Composable
-  fun loadingIndicator() {
-    if (file != null) {
-      Box(
-        Modifier
-          .padding(8.dp)
-          .size(20.dp),
-        contentAlignment = Alignment.Center
-      ) {
-        when (file.fileStatus) {
-          is CIFileStatus.SndStored ->
-            when (file.fileProtocol) {
-              FileProtocol.XFTP -> progressIndicator()
-              FileProtocol.SMP -> {}
-            }
-          is CIFileStatus.SndTransfer -> progressIndicator()
-          is CIFileStatus.SndComplete -> fileIcon(Icons.Filled.Check, R.string.icon_descr_image_snd_complete)
-          is CIFileStatus.SndCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
-          is CIFileStatus.SndError -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
-          is CIFileStatus.RcvInvitation -> fileIcon(Icons.Outlined.ArrowDownward, R.string.icon_descr_asked_to_receive)
-          is CIFileStatus.RcvAccepted -> fileIcon(Icons.Outlined.MoreHoriz, R.string.icon_descr_waiting_for_image)
-          is CIFileStatus.RcvTransfer -> progressIndicator()
-          is CIFileStatus.RcvCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
-          is CIFileStatus.RcvError -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
-          else -> {}
-        }
-      }
-    }
-  }
-
-  @Composable
-  fun imageViewFullWidth(): Dp {
-    val approximatePadding = 100.dp
-    return with(LocalDensity.current) { minOf(1000.dp, LocalView.current.width.toDp() - approximatePadding) }
-  }
-
-  @Composable
-  fun imageView(imageBitmap: Bitmap, onClick: () -> Unit) {
-    Image(
-      imageBitmap.asImageBitmap(),
-      contentDescription = stringResource(R.string.image_descr),
-      // .width(1000.dp) is a hack for image to increase IntrinsicSize of FramedItemView
-      // if text is short and take all available width if text is long
-      modifier = Modifier
-        .width(if (imageBitmap.width * 0.97 <= imageBitmap.height) imageViewFullWidth() * 0.75f else 1000.dp)
-        .combinedClickable(
-          onLongClick = { showMenu.value = true },
-          onClick = onClick
-        ),
-      contentScale = ContentScale.FillWidth,
-    )
-  }
-
-  @Composable
-  fun imageView(painter: Painter, onClick: () -> Unit) {
-    Image(
-      painter,
-      contentDescription = stringResource(R.string.image_descr),
-      // .width(1000.dp) is a hack for image to increase IntrinsicSize of FramedItemView
-      // if text is short and take all available width if text is long
-      modifier = Modifier
-        .width(if (painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else 1000.dp)
-        .combinedClickable(
-          onLongClick = { showMenu.value = true },
-          onClick = onClick
-        ),
-      contentScale = ContentScale.FillWidth,
-    )
-  }
-
-  fun fileSizeValid(): Boolean {
-    if (file != null) {
-      return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-  }
-
-  fun imageAndFilePath(file: CIFile?): Pair<Bitmap?, String?> {
-    val imageBitmap: Bitmap? = getLoadedImage(SimplexApp.context, file)
-    val filePath = getLoadedFilePath(SimplexApp.context, file)
-    return imageBitmap to filePath
-  }
-
-  Box(
-    Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID),
-    contentAlignment = Alignment.TopEnd
-  ) {
-    val context = LocalContext.current
-    val (imageBitmap, filePath) = remember(file) { imageAndFilePath(file) }
-    if (imageBitmap != null && filePath != null) {
-      val uri = remember(filePath) { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))  }
-      val imagePainter = rememberAsyncImagePainter(
-        ImageRequest.Builder(context).data(data = uri).size(coil.size.Size.ORIGINAL).build(),
-        placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
-        imageLoader = imageLoader
-      )
-      val view = LocalView.current
-      imageView(imagePainter, onClick = {
-        hideKeyboard(view)
-        if (getLoadedFilePath(context, file) != null) {
-          ModalManager.shared.showCustomModal(animated = false) { close ->
-            ImageFullScreenView(imageProvider, close)
-          }
-        }
-      })
-    } else {
-      imageView(base64ToBitmap(image), onClick = {
-        if (file != null) {
-          when (file.fileStatus) {
-            CIFileStatus.RcvInvitation ->
-              if (fileSizeValid()) {
-                receiveFile(file.fileId)
-              } else {
-                AlertManager.shared.showAlertMsg(
-                  generalGetString(R.string.large_file),
-                  String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
-                )
-              }
-            CIFileStatus.RcvAccepted ->
-              when (file.fileProtocol) {
-                FileProtocol.XFTP ->
-                  AlertManager.shared.showAlertMsg(
-                    generalGetString(R.string.waiting_for_image),
-                    generalGetString(R.string.image_will_be_received_when_contact_completes_uploading)
-                  )
-                FileProtocol.SMP ->
-                  AlertManager.shared.showAlertMsg(
-                    generalGetString(R.string.waiting_for_image),
-                    generalGetString(R.string.image_will_be_received_when_contact_is_online)
-                  )
-              }
-            CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
-            CIFileStatus.RcvComplete -> {} // ?
-            CIFileStatus.RcvCancelled -> {} // TODO
-            else -> {}
-          }
-        }
-      })
-    }
-    loadingIndicator()
-  }
-}
-
-private val imageLoader = ImageLoader.Builder(SimplexApp.context)
-  .components {
-    if (SDK_INT >= 28) {
-      add(ImageDecoderDecoder.Factory())
-    } else {
-      add(GifDecoder.Factory())
-    }
-  }
-  .build()

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

@@ -1,46 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.Share
-import androidx.compose.runtime.Composable
-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.text.font.FontStyle
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun CIInvalidJSONView(json: String) {
-  Row(Modifier
-    .clickable { ModalManager.shared.showModal(true) { InvalidJSONView(json) } }
-    .padding(horizontal = 10.dp, vertical = 6.dp)
-  ) {
-    Text(stringResource(R.string.invalid_data), color = Color.Red, fontStyle = FontStyle.Italic)
-  }
-}
-
-@Composable
-fun InvalidJSONView(json: String) {
-  Column {
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    SectionView {
-      val context = LocalContext.current
-      SettingsActionItem(Icons.Outlined.Share, generalGetString(R.string.share_verb), click = {
-        shareText(context, json)
-      })
-    }
-    Column(Modifier.padding(DEFAULT_PADDING).fillMaxWidth().verticalScroll(rememberScrollState())) {
-      Text(json)
-    }
-  }
-}

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

@@ -1,24 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.runtime.Composable
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun CIRcvDecryptionError(msgDecryptError: MsgDecryptError, msgCount: UInt, ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean) {
-  CIMsgError(ci, timedMessagesTTL, showMember) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.decryption_error),
-      text = when (msgDecryptError) {
-        MsgDecryptError.RatchetHeader -> String.format(generalGetString(R.string.alert_text_decryption_error_header), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-        MsgDecryptError.TooManySkipped -> String.format(generalGetString(R.string.alert_text_decryption_error_too_many_skipped), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-      }
-    )
-  }
-}

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

@@ -1,438 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.Manifest
-import android.os.Build
-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.*
-import chat.simplex.app.views.chat.ComposeContextItem
-import chat.simplex.app.views.chat.ComposeState
-import chat.simplex.app.views.helpers.*
-import com.google.accompanist.permissions.rememberPermissionState
-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,
-  cancelFile: (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)
-        }
-      }
-
-      fun moderateMessageQuestionText(): String {
-        return if (fullDeleteAllowed) {
-          generalGetString(R.string.moderate_message_will_be_deleted_warning)
-        } else {
-          generalGetString(R.string.moderate_message_will_be_marked_warning)
-        }
-      }
-
-      @Composable
-      fun MsgContentItemDropdownMenu() {
-        DefaultDropdownMenu(showMenu) {
-          if (cItem.meta.itemDeleted == null && !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.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
-            val filePath = getLoadedFilePath(context, cItem.file)
-            if (filePath != null) {
-              val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
-              ItemAction(stringResource(R.string.save_verb), Icons.Outlined.SaveAlt, onClick = {
-                when (cItem.content.msgContent) {
-                  is MsgContent.MCImage -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
-                      saveImage(context, cItem.file)
-                    } else {
-                      writePermissionState.launchPermissionRequest()
-                    }
-                  }
-                  is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> 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 != null && revealed.value) {
-            ItemAction(
-              stringResource(R.string.hide_verb),
-              Icons.Outlined.VisibilityOff,
-              onClick = {
-                revealed.value = false
-                showMenu.value = false
-              }
-            )
-          }
-          if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null) {
-            CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
-          }
-          if (!(live && cItem.meta.isLive)) {
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-          val groupInfo = cItem.memberToModerate(cInfo)?.first
-          if (groupInfo != null) {
-            ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
-          }
-        }
-      }
-
-      @Composable
-      fun MarkedDeletedItemDropdownMenu() {
-        DefaultDropdownMenu(showMenu) {
-          if (!cItem.isDeletedContent) {
-            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 != null && !revealed.value) {
-          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          MarkedDeletedItemDropdownMenu()
-        } else if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !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)
-        DefaultDropdownMenu(showMenu) {
-          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(c.msgError, cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, 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.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
-      }
-    }
-  }
-}
-
-@Composable
-fun CancelFileItemAction(
-  fileId: Long,
-  showMenu: MutableState<Boolean>,
-  cancelFile: (Long) -> Unit,
-  cancelAction: CancelAction
-) {
-  ItemAction(
-    stringResource(cancelAction.uiActionId),
-    Icons.Outlined.Close,
-    onClick = {
-      showMenu.value = false
-      cancelFileAlertDialog(fileId, cancelFile = cancelFile, cancelAction = cancelAction)
-    },
-    color = Color.Red
-  )
-}
-
-@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 ModerateItemAction(
-  cItem: ChatItem,
-  questionText: String,
-  showMenu: MutableState<Boolean>,
-  deleteMessage: (Long, CIDeleteMode) -> Unit
-) {
-  ItemAction(
-    stringResource(R.string.moderate_verb),
-    Icons.Outlined.Flag,
-    onClick = {
-      showMenu.value = false
-      moderateMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
-    },
-    color = Color.Red
-  )
-}
-
-@Composable
-fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = Color.Unspecified) {
-  val finalColor = if (color == Color.Unspecified) {
-    if (isInDarkTheme()) MenuTextColorDark else Color.Black
-  } else color
-  DropdownMenuItem(onClick, contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Text(
-        text,
-        modifier = Modifier
-          .fillMaxWidth()
-          .weight(1F)
-          .padding(end = 15.dp),
-        color = finalColor
-      )
-      Icon(icon, text, tint = finalColor)
-    }
-  }
-}
-
-fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit, cancelAction: CancelAction) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(cancelAction.alert.titleId),
-    text = generalGetString(cancelAction.alert.messageId),
-    confirmText = generalGetString(cancelAction.alert.confirmId),
-    destructive = true,
-    onConfirm = {
-      cancelFile(fileId)
-    }
-  )
-}
-
-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.Center,
-      ) {
-        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)) }
-        }
-      }
-    }
-  )
-}
-
-fun moderateMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_member_message__question),
-    text = questionText,
-    confirmText = generalGetString(R.string.delete_verb),
-    destructive = true,
-    onConfirm = {
-      deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
-    }
-  )
-}
-
-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 = {},
-      cancelFile = {},
-      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 = {},
-      cancelFile = {},
-      joinGroup = {},
-      acceptCall = { _ -> },
-      scrollToItem = {},
-      acceptFeature = { _, _, _ -> }
-    )
-  }
-}

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

@@ -1,104 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.PersonAdd
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.annotatedStringResource
-import chat.simplex.app.views.helpers.openUriCatching
-import chat.simplex.app.views.usersettings.MarkdownHelpView
-import chat.simplex.app.views.usersettings.simplexTeamUri
-
-val bold = SpanStyle(fontWeight = FontWeight.Bold)
-
-@Composable
-fun ChatHelpView(addContact: (() -> Unit)? = null) {
-  Column(
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.spacedBy(10.dp)
-  ) {
-    val uriHandler = LocalUriHandler.current
-
-    Text(stringResource(R.string.thank_you_for_installing_simplex), lineHeight = 22.sp)
-    Text(
-      annotatedStringResource(R.string.you_can_connect_to_simplex_chat_founder),
-      modifier = Modifier.clickable(onClick = {
-        uriHandler.openUriCatching(simplexTeamUri)
-      }),
-      lineHeight = 22.sp
-    )
-
-    Column(
-      Modifier.padding(top = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(
-        stringResource(R.string.to_start_a_new_chat_help_header),
-        style = MaterialTheme.typography.h2,
-        lineHeight = 22.sp
-      )
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        Text(stringResource(R.string.chat_help_tap_button))
-        Icon(
-          Icons.Outlined.PersonAdd,
-          stringResource(R.string.add_contact),
-          modifier = if (addContact != null) Modifier.clickable(onClick = addContact) else Modifier,
-        )
-        Text(stringResource(R.string.above_then_preposition_continuation))
-      }
-      Text(annotatedStringResource(R.string.add_new_contact_to_create_one_time_QR_code), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.scan_QR_code_to_connect_to_contact_who_shows_QR_code), lineHeight = 22.sp)
-    }
-
-    Column(
-      Modifier.padding(top = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(stringResource(R.string.to_connect_via_link_title), style = MaterialTheme.typography.h2)
-      Text(stringResource(R.string.if_you_received_simplex_invitation_link_you_can_open_in_browser), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.desktop_scan_QR_code_from_app_via_scan_QR_code), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.mobile_tap_open_in_mobile_app_then_tap_connect_in_app), lineHeight = 22.sp)
-    }
-
-    Column(
-      Modifier.padding(vertical = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(stringResource(R.string.markdown_in_messages), style = MaterialTheme.typography.h2)
-      MarkdownHelpView()
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatHelpLayout() {
-  SimpleXTheme {
-    ChatHelpView {}
-  }
-}

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

@@ -1,311 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.unit.*
-import androidx.fragment.app.FragmentActivity
-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.helpers.*
-import chat.simplex.app.views.newchat.NewChatSheet
-import chat.simplex.app.views.onboarding.WhatsNewView
-import chat.simplex.app.views.onboarding.shouldShowWhatsNew
-import chat.simplex.app.views.usersettings.SettingsView
-import chat.simplex.app.views.usersettings.simplexTeamUri
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-
-@Composable
-fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity) -> Unit, stopped: Boolean) {
-  val newChatSheetState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
-  val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
-  val showNewChatSheet = {
-    newChatSheetState.value = AnimatedViewState.VISIBLE
-  }
-  val hideNewChatSheet: (animated: Boolean) -> Unit = { animated ->
-    if (animated) newChatSheetState.value = AnimatedViewState.HIDING
-    else newChatSheetState.value = AnimatedViewState.GONE
-  }
-  LaunchedEffect(Unit) {
-    if (shouldShowWhatsNew(chatModel)) {
-      delay(1000L)
-      ModalManager.shared.showCustomModal { close -> WhatsNewView(close = close) }
-    }
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
-  }
-  LaunchedEffect(chatModel.appOpenUrl.value) {
-    val url = chatModel.appOpenUrl.value
-    if (url != null) {
-      chatModel.appOpenUrl.value = null
-      connectIfOpenedViaUri(url, chatModel)
-    }
-  }
-  var searchInList by rememberSaveable { mutableStateOf("") }
-  val scaffoldState = rememberScaffoldState()
-  val scope = rememberCoroutineScope()
-  val switchingUsers = rememberSaveable { mutableStateOf(false) }
-  Scaffold(
-    topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } },
-    scaffoldState = scaffoldState,
-    drawerContent = { SettingsView(chatModel, setPerformLA) },
-    floatingActionButton = {
-      if (searchInList.isEmpty()) {
-        FloatingActionButton(
-          onClick = {
-            if (!stopped) {
-              if (newChatSheetState.value.isVisible()) hideNewChatSheet(true) else showNewChatSheet()
-            }
-          },
-          elevation = FloatingActionButtonDefaults.elevation(
-            defaultElevation = 0.dp,
-            pressedElevation = 0.dp,
-            hoveredElevation = 0.dp,
-            focusedElevation = 0.dp,
-          ),
-          backgroundColor = if (!stopped) MaterialTheme.colors.primary else HighOrLowlight,
-          contentColor = Color.White
-        ) {
-          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) Icons.Default.Edit else Icons.Default.Close, stringResource(R.string.add_contact_or_create_group))
-        }
-      }
-    }
-  ) {
-    Box(Modifier.padding(it)) {
-      Column(
-        modifier = Modifier
-          .fillMaxSize()
-          .background(MaterialTheme.colors.background)
-      ) {
-        if (chatModel.chats.isNotEmpty()) {
-          ChatList(chatModel, search = searchInList)
-        } else if (!switchingUsers.value) {
-          Box(Modifier.fillMaxSize()) {
-            if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
-              OnboardingButtons(showNewChatSheet)
-            }
-            Text(stringResource(R.string.you_have_no_chats), Modifier.align(Alignment.Center), color = HighOrLowlight)
-          }
-        }
-      }
-    }
-  }
-  if (searchInList.isEmpty()) {
-    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
-  }
-  UserPicker(chatModel, userPickerState, switchingUsers) {
-    scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-  }
-  if (switchingUsers.value) {
-    Box(
-      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
-      contentAlignment = Alignment.Center
-    ) {
-      ProgressIndicator()
-    }
-  }
-}
-
-@Composable
-private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
-  Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.Bottom) {
-    val uriHandler = LocalUriHandler.current
-    ConnectButton(generalGetString(R.string.chat_with_developers)) {
-      uriHandler.openUriCatching(simplexTeamUri)
-    }
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    ConnectButton(generalGetString(R.string.tap_to_start_new_chat), openNewChatSheet)
-    val color = MaterialTheme.colors.primary
-    Canvas(modifier = Modifier.width(40.dp).height(10.dp), onDraw = {
-      val trianglePath = Path().apply {
-        moveTo(0.dp.toPx(), 0f)
-        lineTo(16.dp.toPx(), 0.dp.toPx())
-        lineTo(8.dp.toPx(), 10.dp.toPx())
-        lineTo(0.dp.toPx(), 0.dp.toPx())
-      }
-      drawPath(
-        color = color,
-        path = trianglePath
-      )
-    })
-    Spacer(Modifier.height(62.dp))
-  }
-}
-
-@Composable
-private fun ConnectButton(text: String, onClick: () -> Unit) {
-  Button(
-    onClick,
-    shape = RoundedCornerShape(21.dp),
-    colors = ButtonDefaults.textButtonColors(
-      backgroundColor = MaterialTheme.colors.primary
-    ),
-    elevation = null,
-    contentPadding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF),
-    modifier = Modifier.height(42.dp)
-  ) {
-    Text(text, color = Color.White)
-  }
-}
-
-@Composable
-private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, userPickerState: MutableStateFlow<AnimatedViewState>, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
-  var showSearch by rememberSaveable { mutableStateOf(false) }
-  val hideSearchOnBack = { onSearchValueChanged(""); showSearch = false }
-  if (showSearch) {
-    BackHandler(onBack = hideSearchOnBack)
-  }
-  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
-  if (chatModel.chats.size >= 8) {
-    barButtons.add {
-      IconButton({ showSearch = true }) {
-        Icon(Icons.Outlined.Search, stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
-      }
-    }
-  }
-  if (stopped) {
-    barButtons.add {
-      IconButton(onClick = {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(R.string.chat_is_stopped_indication),
-          generalGetString(R.string.you_can_start_chat_via_setting_or_by_restarting_the_app)
-        )
-      }) {
-        Icon(
-          Icons.Filled.Report,
-          generalGetString(R.string.chat_is_stopped_indication),
-          tint = Color.Red,
-        )
-      }
-    }
-  }
-  val scope = rememberCoroutineScope()
-  DefaultTopAppBar(
-    navigationButton = {
-      if (showSearch) {
-        NavigationButtonBack(hideSearchOnBack)
-      } else if (chatModel.users.isEmpty()) {
-        NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
-      } else {
-        val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
-        val allRead = users
-          .filter { u -> !u.user.activeUser && !u.user.hidden }
-          .all { u -> u.unreadCount == 0 }
-        UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
-          if (users.size == 1) {
-            scope.launch { drawerState.open() }
-          } else {
-            userPickerState.value = AnimatedViewState.VISIBLE
-          }
-        }
-      }
-    },
-    title = {
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        Text(
-          stringResource(R.string.your_chats),
-          color = MaterialTheme.colors.onBackground,
-          fontWeight = FontWeight.SemiBold,
-        )
-        if (chatModel.incognito.value) {
-          Icon(
-            Icons.Filled.TheaterComedy,
-            stringResource(R.string.incognito),
-            tint = Indigo,
-            modifier = Modifier.padding(10.dp).size(26.dp)
-          )
-        }
-      }
-    },
-    onTitleClick = null,
-    showSearch = showSearch,
-    onSearchValueChanged = onSearchValueChanged,
-    buttons = barButtons
-  )
-  Divider(Modifier.padding(top = AppBarHeight))
-}
-
-@Composable
-fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
-  IconButton(onClick = onButtonClicked) {
-    Box {
-      ProfileImage(
-        image = image,
-        size = 37.dp
-      )
-      if (!allRead) {
-        unreadBadge()
-      }
-    }
-  }
-}
-
-@Composable
-private fun BoxScope.unreadBadge(text: String? = "") {
-  Text(
-    text ?: "",
-    color = MaterialTheme.colors.onPrimary,
-    fontSize = 6.sp,
-    modifier = Modifier
-      .background(MaterialTheme.colors.primary, shape = CircleShape)
-      .badgeLayout()
-      .padding(horizontal = 3.dp)
-      .padding(vertical = 1.dp)
-      .align(Alignment.TopEnd)
-  )
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier
-      .padding(horizontal = 2.dp)
-      .size(30.dp),
-    color = HighOrLowlight,
-    strokeWidth = 2.5.dp
-  )
-}
-
-private var lazyListState = 0 to 0
-
-@Composable
-private fun ChatList(chatModel: ChatModel, search: String) {
-  val filter: (Chat) -> Boolean = { chat: Chat ->
-    chat.chatInfo.chatViewName.lowercase().contains(search.lowercase())
-  }
-  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
-  DisposableEffect(Unit) {
-    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
-  }
-  val chats by remember(search) { derivedStateOf { if (search.isEmpty()) chatModel.chats else chatModel.chats.filter(filter) } }
-  LazyColumn(
-    modifier = Modifier.fillMaxWidth(),
-    listState
-  ) {
-    items(chats) { chat ->
-      ChatListNavLinkView(chat, chatModel)
-    }
-  }
-}

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

@@ -1,142 +0,0 @@
-package chat.simplex.app.views.database
-
-import SectionDivider
-import SectionTextFooter
-import SectionView
-import android.content.Context
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-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.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*
-import kotlinx.datetime.*
-import java.io.BufferedOutputStream
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-
-@Composable
-fun ChatArchiveView(m: ChatModel, title: String, archiveName: String, archiveTime: Instant) {
-  val context = LocalContext.current
-  val archivePath = "${getFilesDirectory(context)}/$archiveName"
-  val saveArchiveLauncher = rememberSaveArchiveLauncher(cxt = context, archivePath)
-  ChatArchiveLayout(
-    title,
-    archiveTime,
-    saveArchive = { saveArchiveLauncher.launch(archivePath.substringAfterLast("/")) },
-    deleteArchiveAlert = { deleteArchiveAlert(m, archivePath) }
-  )
-}
-
-@Composable
-fun ChatArchiveLayout(
-  title: String,
-  archiveTime: Instant,
-  saveArchive: () -> Unit,
-  deleteArchiveAlert: () -> Unit
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(title)
-    SectionView(stringResource(R.string.chat_archive_section)) {
-      SettingsActionItem(
-        Icons.Outlined.IosShare,
-        stringResource(R.string.save_archive),
-        saveArchive,
-        textColor = MaterialTheme.colors.primary,
-        iconColor = MaterialTheme.colors.primary,
-      )
-      SectionDivider()
-      SettingsActionItem(
-        Icons.Outlined.Delete,
-        stringResource(R.string.delete_archive),
-        deleteArchiveAlert,
-        textColor = Color.Red,
-        iconColor = Color.Red,
-      )
-    }
-    val archiveTs = SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US).format(Date.from(archiveTime.toJavaInstant()))
-    SectionTextFooter(
-      String.format(generalGetString(R.string.archive_created_on_ts), archiveTs)
-    )
-  }
-}
-
-@Composable
-private fun rememberSaveArchiveLauncher(cxt: Context, chatArchivePath: String): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(
-    contract = ActivityResultContracts.CreateDocument(),
-    onResult = { destination ->
-      try {
-        destination?.let {
-          val contentResolver = cxt.contentResolver
-          contentResolver.openOutputStream(destination)?.let { stream ->
-            val outputStream = BufferedOutputStream(stream)
-            File(chatArchivePath).inputStream().use { it.copyTo(outputStream) }
-            outputStream.close()
-            Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
-          }
-        }
-      } catch (e: Error) {
-        Toast.makeText(cxt, generalGetString(R.string.error_saving_file), Toast.LENGTH_SHORT).show()
-        Log.e(TAG, "rememberSaveArchiveLauncher error saving archive $e")
-      }
-    }
-  )
-
-private fun deleteArchiveAlert(m: ChatModel, archivePath: String) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_chat_archive_question),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      val fileDeleted = File(archivePath).delete()
-      if (fileDeleted) {
-        m.controller.appPrefs.chatArchiveName.set(null)
-        m.controller.appPrefs.chatArchiveTime.set(null)
-        ModalManager.shared.closeModal()
-      } else {
-        Log.e(TAG, "deleteArchiveAlert delete() error")
-      }
-    }
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatArchiveLayout() {
-  SimpleXTheme {
-    ChatArchiveLayout(
-      "New database archive",
-      archiveTime = Clock.System.now(),
-      saveArchive = {},
-      deleteArchiveAlert = {}
-    )
-  }
-}

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

@@ -1,80 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatInfo
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme.colors.secondary) {
-  val icon =
-    if (chatInfo is ChatInfo.Group) Icons.Filled.SupervisedUserCircle
-                                    else Icons.Filled.AccountCircle
-  ProfileImage(size, chatInfo.image, icon, iconColor)
-}
-
-@Composable
-fun IncognitoImage(size: Dp, iconColor: Color = MaterialTheme.colors.secondary) {
-  Box(Modifier.size(size)) {
-    Icon(
-      Icons.Filled.TheaterComedy, stringResource(R.string.incognito),
-      modifier = Modifier.size(size).padding(size / 12),
-      iconColor
-    )
-  }
-}
-
-@Composable
-fun ProfileImage(
-  size: Dp,
-  image: String? = null,
-  icon: ImageVector = Icons.Filled.AccountCircle,
-  color: Color = MaterialTheme.colors.secondary
-) {
-  Box(Modifier.size(size)) {
-    if (image == null) {
-      Icon(
-        icon,
-        contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-        tint = color,
-        modifier = Modifier.fillMaxSize()
-      )
-    } else {
-      val imageBitmap = base64ToBitmap(image).asImageBitmap()
-      Image(
-        imageBitmap,
-        stringResource(R.string.image_descr_profile_image),
-        contentScale = ContentScale.Crop,
-        modifier = Modifier.size(size).padding(size / 12).clip(CircleShape)
-      )
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatInfoImage() {
-  SimpleXTheme {
-    ChatInfoImage(
-      chatInfo = ChatInfo.Direct.sampleData,
-      size = 55.dp
-    )
-  }
-}

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 PickMedia: 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.PickMedia
-        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,83 +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.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-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.ui.theme.*
-
-@Composable
-fun CloseSheetBar(close: (() -> Unit)?, endButtons: @Composable RowScope.() -> Unit = {}) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .heightIn(min = AppBarHeight)
-      .padding(horizontal = AppBarHorizontalPadding),
-  ) {
-    Row(
-      Modifier
-        .padding(top = 4.dp), // Like in DefaultAppBar
-      content = {
-        Row(
-          Modifier.fillMaxWidth().height(TextFieldDefaults.MinHeight),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically
-        ) {
-          NavigationButtonBack(onButtonClicked = close)
-          Row {
-            endButtons()
-          }
-        }
-      }
-    )
-  }
-}
-
-@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
-  )
-}
-
-@Composable
-fun ColumnScope.AppBarTitleCentered(title: String, withPadding: Boolean = true) {
-  Text(
-    title,
-    Modifier
-      .padding(bottom = if (withPadding) DEFAULT_PADDING * 1.5f else 0.dp)
-      .align(Alignment.CenterHorizontally),
-    overflow = TextOverflow.Ellipsis,
-    style = MaterialTheme.typography.h1,
-    color = MaterialTheme.colors.primary
-  )
-}
-
-@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/LocalAuthentication.kt

@@ -1,140 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.os.Build.VERSION.SDK_INT
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricManager.Authenticators.*
-import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.ui.Modifier
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.localauth.LocalAuthView
-import chat.simplex.app.views.usersettings.LAMode
-
-sealed class LAResult {
-  object Success: LAResult()
-  class Error(val errString: CharSequence): LAResult()
-  class Failed(val errString: CharSequence? = null): LAResult()
-  class Unavailable(val errString: CharSequence? = null): LAResult()
-}
-
-data class LocalAuthRequest (
-  val title: String?,
-  val reason: String,
-  val password: String,
-  val completed: (LAResult) -> Unit
-) {
-  companion object {
-    val sample = LocalAuthRequest(generalGetString(R.string.la_enter_app_passcode), generalGetString(R.string.la_authenticate), "") { }
-  }
-}
-
-fun authenticate(
-  promptTitle: String,
-  promptSubtitle: String,
-  activity: FragmentActivity,
-  usingLAMode: LAMode = SimplexApp.context.chatModel.controller.appPrefs.laMode.get(),
-  completed: (LAResult) -> Unit
-) {
-  when (usingLAMode) {
-    LAMode.SYSTEM -> 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())
-    }
-    LAMode.PASSCODE -> {
-      val password = ksAppPassword.get() ?: return completed(LAResult.Unavailable(generalGetString(R.string.la_no_app_password)))
-      ModalManager.shared.showCustomModal(animated = false) { close ->
-        Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-          LocalAuthView(SimplexApp.context.chatModel, LocalAuthRequest(promptTitle, promptSubtitle, password) {
-            close()
-            completed(it)
-          })
-        }
-      }
-    }
-  }
-}
-
-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 laPasscodeNotSetAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.lock_not_enabled),
-  generalGetString(R.string.you_can_turn_on_lock)
-)
-
-fun laFailedAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.la_auth_failed),
-    text = generalGetString(R.string.la_could_not_be_verified)
-  )
-}
-
-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/Share.kt

@@ -1,107 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.Manifest
-import android.content.*
-import android.net.Uri
-import android.provider.MediaStore
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import chat.simplex.app.*
-import chat.simplex.app.model.CIFile
-import java.io.BufferedOutputStream
-import java.io.File
-
-fun shareText(cxt: Context, text: String) {
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
-    putExtra(Intent.EXTRA_TEXT, text)
-    type = "text/plain"
-  }
-  val shareIntent = Intent.createChooser(sendIntent, null)
-  cxt.startActivity(shareIntent)
-}
-
-fun shareFile(cxt: Context, text: String, filePath: String) {
-  val uri = FileProvider.getUriForFile(SimplexApp.context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
-  val ext = filePath.substringAfterLast(".")
-  val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext) ?: return
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
-    /*if (text.isNotEmpty()) {
-      putExtra(Intent.EXTRA_TEXT, text)
-    }*/
-    putExtra(Intent.EXTRA_STREAM, uri)
-    type = mimeType
-  }
-  val shareIntent = Intent.createChooser(sendIntent, null)
-  cxt.startActivity(shareIntent)
-}
-
-fun copyText(cxt: Context, text: String) {
-  val clipboard = ContextCompat.getSystemService(cxt, ClipboardManager::class.java)
-  clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
-}
-
-@Composable
-fun rememberSaveFileLauncher(cxt: Context, ciFile: CIFile?): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(
-    contract = ActivityResultContracts.CreateDocument(),
-    onResult = { destination ->
-      destination?.let {
-        val filePath = getLoadedFilePath(cxt, ciFile)
-        if (filePath != null) {
-          val contentResolver = cxt.contentResolver
-          contentResolver.openOutputStream(destination)?.let { stream ->
-            val outputStream = BufferedOutputStream(stream)
-            File(filePath).inputStream().use { it.copyTo(outputStream) }
-            outputStream.close()
-            Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
-          }
-        } else {
-          Toast.makeText(cxt, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-        }
-      }
-    }
-  )
-
-fun imageMimeType(fileName: String): String {
-  val lowercaseName = fileName.lowercase()
-  return when {
-    lowercaseName.endsWith(".png") -> "image/png"
-    lowercaseName.endsWith(".gif") -> "image/gif"
-    lowercaseName.endsWith(".webp") -> "image/webp"
-    lowercaseName.endsWith(".avif") -> "image/avif"
-    lowercaseName.endsWith(".svg") -> "image/svg+xml"
-    else -> "image/jpeg"
-  }
-}
-
-/** Before calling, make sure the user allows to write to external storage [Manifest.permission.WRITE_EXTERNAL_STORAGE] */
-fun saveImage(cxt: Context, ciFile: CIFile?) {
-  val filePath = getLoadedFilePath(cxt, ciFile)
-  val fileName = ciFile?.fileName
-  if (filePath != null && fileName != null) {
-    val values = ContentValues()
-    values.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
-    values.put(MediaStore.Images.Media.MIME_TYPE, imageMimeType(fileName))
-    values.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
-    values.put(MediaStore.MediaColumns.TITLE, fileName)
-    val uri = cxt.contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values)
-    uri?.let {
-      cxt.contentResolver.openOutputStream(uri)?.let { stream ->
-        val outputStream = BufferedOutputStream(stream)
-        File(filePath).inputStream().use { it.copyTo(outputStream) }
-        outputStream.close()
-        Toast.makeText(cxt, generalGetString(R.string.image_saved), Toast.LENGTH_SHORT).show()
-      }
-    }
-  } else {
-    Toast.makeText(cxt, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-  }
-}

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/helpers/Util.kt

@@ -1,659 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.app.Activity
-import android.app.Application
-//import android.app.LocaleManager
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.res.Configuration
-import android.content.res.Resources
-import android.graphics.*
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.media.MediaMetadataRetriever
-import android.net.Uri
-import android.os.*
-import android.provider.OpenableColumns
-import android.text.Spanned
-import android.text.SpannedString
-import android.text.style.*
-import android.util.Base64
-import android.util.Log
-import android.view.View
-import android.view.ViewTreeObserver
-import android.view.inputmethod.InputMethodManager
-import androidx.annotation.StringRes
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.*
-import androidx.compose.ui.text.style.BaselineShift
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.*
-import androidx.core.content.FileProvider
-import androidx.core.text.HtmlCompat
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import org.apache.commons.io.IOUtils
-import java.io.*
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.math.*
-
-fun withApi(action: suspend CoroutineScope.() -> Unit): Job = withScope(GlobalScope, action)
-
-fun withScope(scope: CoroutineScope, action: suspend CoroutineScope.() -> Unit): Job =
-  scope.launch { withContext(Dispatchers.Main, action) }
-
-fun withBGApi(action: suspend CoroutineScope.() -> Unit): Job =
-  CoroutineScope(Dispatchers.Default).launch(block = action)
-
-enum class KeyboardState {
-  Opened, Closed
-}
-
-@Composable
-fun getKeyboardState(): State<KeyboardState> {
-  val keyboardState = remember { mutableStateOf(KeyboardState.Closed) }
-  val view = LocalView.current
-  DisposableEffect(view) {
-    val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
-      val rect = Rect()
-      view.getWindowVisibleDisplayFrame(rect)
-      val screenHeight = view.rootView.height
-      val keypadHeight = screenHeight - rect.bottom
-      keyboardState.value = if (keypadHeight > screenHeight * 0.15) {
-        KeyboardState.Opened
-      } else {
-        KeyboardState.Closed
-      }
-    }
-    view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
-
-    onDispose {
-      view.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalListener)
-    }
-  }
-
-  return keyboardState
-}
-
-fun hideKeyboard(view: View) =
-  (SimplexApp.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(view.windowToken, 0)
-
-// Resource to annotated string from
-// https://stackoverflow.com/questions/68549248/android-jetpack-compose-how-to-show-styled-text-from-string-resources
-fun generalGetString(id: Int): String {
-  // prefer stringResource in Composable items to retain preview abilities
-  return SimplexApp.context.getString(id)
-}
-
-@Composable
-@ReadOnlyComposable
-private fun resources(): Resources {
-  LocalConfiguration.current
-  return LocalContext.current.resources
-}
-
-fun Spanned.toHtmlWithoutParagraphs(): String {
-  return HtmlCompat.toHtml(this, HtmlCompat.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE)
-    .substringAfter("<p dir=\"ltr\">").substringBeforeLast("</p>")
-}
-
-fun Resources.getText(@StringRes id: Int, vararg args: Any): CharSequence {
-  val escapedArgs = args.map {
-    if (it is Spanned) it.toHtmlWithoutParagraphs() else it
-  }.toTypedArray()
-  val resource = SpannedString(getText(id))
-  val htmlResource = resource.toHtmlWithoutParagraphs()
-  val formattedHtml = String.format(htmlResource, *escapedArgs)
-  return HtmlCompat.fromHtml(formattedHtml, HtmlCompat.FROM_HTML_MODE_LEGACY)
-}
-
-@Composable
-fun annotatedStringResource(@StringRes id: Int): AnnotatedString {
-  val resources = resources()
-  val density = LocalDensity.current
-  return remember(id) {
-    val text = resources.getText(id)
-    spannableStringToAnnotatedString(text, density)
-  }
-}
-
-private fun spannableStringToAnnotatedString(
-  text: CharSequence,
-  density: Density,
-): AnnotatedString {
-  return if (text is Spanned) {
-    with(density) {
-      buildAnnotatedString {
-        append((text.toString()))
-        text.getSpans(0, text.length, Any::class.java).forEach {
-          val start = text.getSpanStart(it)
-          val end = text.getSpanEnd(it)
-          when (it) {
-            is StyleSpan -> when (it.style) {
-              Typeface.NORMAL -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Normal,
-                  fontStyle = FontStyle.Normal,
-                ),
-                start,
-                end
-              )
-              Typeface.BOLD -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Bold,
-                  fontStyle = FontStyle.Normal
-                ),
-                start,
-                end
-              )
-              Typeface.ITALIC -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Normal,
-                  fontStyle = FontStyle.Italic
-                ),
-                start,
-                end
-              )
-              Typeface.BOLD_ITALIC -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Bold,
-                  fontStyle = FontStyle.Italic
-                ),
-                start,
-                end
-              )
-            }
-            is TypefaceSpan -> addStyle(
-              SpanStyle(
-                fontFamily = when (it.family) {
-                  FontFamily.SansSerif.name -> FontFamily.SansSerif
-                  FontFamily.Serif.name -> FontFamily.Serif
-                  FontFamily.Monospace.name -> FontFamily.Monospace
-                  FontFamily.Cursive.name -> FontFamily.Cursive
-                  else -> FontFamily.Default
-                }
-              ),
-              start,
-              end
-            )
-            is AbsoluteSizeSpan -> addStyle(
-              SpanStyle(fontSize = if (it.dip) it.size.dp.toSp() else it.size.toSp()),
-              start,
-              end
-            )
-            is RelativeSizeSpan -> addStyle(
-              SpanStyle(fontSize = it.sizeChange.em),
-              start,
-              end
-            )
-            is StrikethroughSpan -> addStyle(
-              SpanStyle(textDecoration = TextDecoration.LineThrough),
-              start,
-              end
-            )
-            is UnderlineSpan -> addStyle(
-              SpanStyle(textDecoration = TextDecoration.Underline),
-              start,
-              end
-            )
-            is SuperscriptSpan -> addStyle(
-              SpanStyle(baselineShift = BaselineShift.Superscript),
-              start,
-              end
-            )
-            is SubscriptSpan -> addStyle(
-              SpanStyle(baselineShift = BaselineShift.Subscript),
-              start,
-              end
-            )
-            is ForegroundColorSpan -> addStyle(
-              SpanStyle(color = Color(it.foregroundColor)),
-              start,
-              end
-            )
-            else -> addStyle(SpanStyle(color = Color.White), start, end)
-          }
-        }
-      }
-    }
-  } else {
-    AnnotatedString(text.toString())
-  }
-}
-
-// maximum image file size to be auto-accepted
-const val MAX_IMAGE_SIZE: Long = 236700
-const val MAX_IMAGE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE
-
-const val MAX_VOICE_SIZE_FOR_SENDING: Long = 94680 // 6 chunks * 15780 bytes per chunk
-const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 43_000
-
-const val MAX_FILE_SIZE_SMP: Long = 8000000
-
-const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824
-
-fun getFilesDirectory(context: Context): String {
-  return context.filesDir.toString()
-}
-
-fun getTempFilesDirectory(context: Context): String {
-  return "${getFilesDirectory(context)}/temp_files"
-}
-
-fun getAppFilesDirectory(context: Context): String {
-  return "${getFilesDirectory(context)}/app_files"
-}
-
-fun getAppFilePath(context: Context, fileName: String): String {
-  return "${getAppFilesDirectory(context)}/$fileName"
-}
-
-fun getAppFileUri(fileName: String): Uri {
-  return Uri.parse("${getAppFilesDirectory(SimplexApp.context)}/$fileName")
-}
-
-
-fun getLoadedFilePath(context: Context, file: CIFile?): String? {
-  return if (file?.filePath != null && file.loaded) {
-    val filePath = getAppFilePath(context, file.filePath)
-    if (File(filePath).exists()) filePath else null
-  } else {
-    null
-  }
-}
-
-// https://developer.android.com/training/data-storage/shared/documents-files#bitmap
-fun getLoadedImage(context: Context, file: CIFile?): Bitmap? {
-  val filePath = getLoadedFilePath(context, file)
-  return if (filePath != null) {
-    try {
-      val uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
-      val parcelFileDescriptor = context.contentResolver.openFileDescriptor(uri, "r")
-      val fileDescriptor = parcelFileDescriptor?.fileDescriptor
-      val image = decodeSampledBitmapFromFileDescriptor(fileDescriptor, 1000, 1000)
-      parcelFileDescriptor?.close()
-      image
-    } catch (e: Exception) {
-      null
-    }
-  } else {
-    null
-  }
-}
-
-// https://developer.android.com/topic/performance/graphics/load-bitmap#load-bitmap
-private fun decodeSampledBitmapFromFileDescriptor(fileDescriptor: FileDescriptor?, reqWidth: Int, reqHeight: Int): Bitmap {
-  // First decode with inJustDecodeBounds=true to check dimensions
-  return BitmapFactory.Options().run {
-    inJustDecodeBounds = true
-    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
-    // Calculate inSampleSize
-    inSampleSize = calculateInSampleSize(this, reqWidth, reqHeight)
-    // Decode bitmap with inSampleSize set
-    inJustDecodeBounds = false
-
-    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
-  }
-}
-
-private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
-  // Raw height and width of image
-  val (height: Int, width: Int) = options.run { outHeight to outWidth }
-  var inSampleSize = 1
-
-  if (height > reqHeight || width > reqWidth) {
-    val halfHeight: Int = height / 2
-    val halfWidth: Int = width / 2
-    // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-    // height and width larger than the requested height and width.
-    while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
-      inSampleSize *= 2
-    }
-  }
-
-  return inSampleSize
-}
-
-fun getFileName(context: Context, uri: Uri): String? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    cursor.getString(nameIndex)
-  }
-}
-
-fun getAppFilePath(context: Context, uri: Uri): String? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    getAppFilePath(context, cursor.getString(nameIndex))
-  }
-}
-
-fun getFileSize(context: Context, uri: Uri): Long? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
-    cursor.moveToFirst()
-    cursor.getLong(sizeIndex)
-  }
-}
-
-fun getBitmapFromUri(uri: Uri, withAlertOnException: Boolean = true): Bitmap? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeBitmap(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      null
-    }
-  } else {
-    BitmapFactory.decodeFile(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
-fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeDrawable(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
-      null
-    }
-  } else {
-    Drawable.createFromPath(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
-fun saveImage(context: Context, uri: Uri): String? {
-  val bitmap = getBitmapFromUri(uri) ?: return null
-  return saveImage(context, bitmap)
-}
-
-fun saveImage(context: Context, image: Bitmap): String? {
-  return try {
-    val ext = if (image.hasAlpha()) "png" else "jpg"
-    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
-    val fileToSave = generateNewFileName(context, "IMG", ext)
-    val file = File(getAppFilePath(context, fileToSave))
-    val output = FileOutputStream(file)
-    dataResized.writeTo(output)
-    output.flush()
-    output.close()
-    fileToSave
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveImage error: ${e.message}")
-    null
-  }
-}
-
-fun saveAnimImage(context: Context, uri: Uri): String? {
-  return try {
-    val filename = getFileName(context, uri)?.lowercase()
-    var ext = when {
-      // remove everything but extension
-      filename?.contains(".") == true -> filename.replaceBeforeLast('.', "").replace(".", "")
-      else -> "gif"
-    }
-    // Just in case the image has a strange extension
-    if (ext.length < 3 || ext.length > 4) ext = "gif"
-    val fileToSave = generateNewFileName(context, "IMG", ext)
-    val file = File(getAppFilePath(context, fileToSave))
-    val output = FileOutputStream(file)
-    context.contentResolver.openInputStream(uri)!!.use { input ->
-      output.use { output ->
-        input.copyTo(output)
-      }
-    }
-    fileToSave
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveAnimImage error: ${e.message}")
-    null
-  }
-}
-
-fun saveTempImageUncompressed(image: Bitmap, asPng: Boolean): File? {
-  return try {
-    val ext = if (asPng) "png" else "jpg"
-    val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
-    return File(tmpDir.absolutePath + File.separator + generateNewFileName(SimplexApp.context, "IMG", ext)).apply {
-      outputStream().use { out ->
-        image.compress(if (asPng) Bitmap.CompressFormat.PNG else Bitmap.CompressFormat.JPEG, 85, out)
-        out.flush()
-      }
-      deleteOnExit()
-      SimplexApp.context.chatModel.filesToDelete.add(this)
-    }
-  } catch (e: Exception) {
-    Log.e(TAG, "Util.kt saveTempImageUncompressed error: ${e.message}")
-    null
-  }
-}
-
-fun saveFileFromUri(context: Context, uri: Uri): String? {
-  return try {
-    val inputStream = context.contentResolver.openInputStream(uri)
-    val fileToSave = getFileName(context, uri)
-    if (inputStream != null && fileToSave != null) {
-      val destFileName = uniqueCombine(context, fileToSave)
-      val destFile = File(getAppFilePath(context, destFileName))
-      IOUtils.copy(inputStream, FileOutputStream(destFile))
-      destFileName
-    } else {
-      Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri null inputStream")
-      null
-    }
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri error: ${e.message}")
-    null
-  }
-}
-
-fun generateNewFileName(context: Context, prefix: String, ext: String): String {
-  val sdf = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
-  sdf.timeZone = TimeZone.getTimeZone("GMT")
-  val timestamp = sdf.format(Date())
-  return uniqueCombine(context, "${prefix}_$timestamp.$ext")
-}
-
-fun uniqueCombine(context: Context, fileName: String): String {
-  val orig = File(fileName)
-  val name = orig.nameWithoutExtension
-  val ext = orig.extension
-  fun tryCombine(n: Int): String {
-    val suffix = if (n == 0) "" else "_$n"
-    val f = "$name$suffix.$ext"
-    return if (File(getAppFilePath(context, f)).exists()) tryCombine(n + 1) else f
-  }
-  return tryCombine(0)
-}
-
-fun formatBytes(bytes: Long): String {
-  if (bytes == 0.toLong()) {
-    return "0 bytes"
-  }
-  val bytesDouble = bytes.toDouble()
-  val k = 1024.toDouble()
-  val units = arrayOf("bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
-  val i = floor(log2(bytesDouble) / log2(k))
-  val size = bytesDouble / k.pow(i)
-  val unit = units[i.toInt()]
-
-  return if (i <= 1) {
-    String.format("%.0f %s", size, unit)
-  } else {
-    String.format("%.2f %s", size, unit)
-  }
-}
-
-fun removeFile(context: Context, fileName: String): Boolean {
-  val file = File(getAppFilePath(context, fileName))
-  val fileDeleted = file.delete()
-  if (!fileDeleted) {
-    Log.e(chat.simplex.app.TAG, "Util.kt removeFile error")
-  }
-  return fileDeleted
-}
-
-fun deleteAppFiles(context: Context) {
-  val dir = File(getAppFilesDirectory(context))
-  try {
-    dir.list()?.forEach {
-      removeFile(context, it)
-    }
-  } catch (e: java.lang.Exception) {
-    Log.e(TAG, "Util deleteAppFiles error: ${e.stackTraceToString()}")
-  }
-}
-
-fun directoryFileCountAndSize(dir: String): Pair<Int, Long> { // count, size in bytes
-  var fileCount = 0
-  var bytes = 0L
-  try {
-    File(dir).listFiles()?.forEach {
-      fileCount++
-      bytes += it.length()
-    }
-  } catch (e: java.lang.Exception) {
-    Log.e(TAG, "Util directoryFileCountAndSize error: ${e.stackTraceToString()}")
-  }
-  return fileCount to bytes
-}
-
-fun getMaxFileSize(fileProtocol: FileProtocol): Long {
-  return when (fileProtocol) {
-    FileProtocol.XFTP -> MAX_FILE_SIZE_XFTP
-    FileProtocol.SMP -> MAX_FILE_SIZE_SMP
-  }
-}
-
-fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true): VideoPlayer.PreviewAndDuration {
-  val mmr = MediaMetadataRetriever()
-  mmr.setDataSource(SimplexApp.context, uri)
-  val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
-  val image = when {
-    timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
-    random -> mmr.frameAtTime
-    else -> mmr.getFrameAtIndex(0)
-  }
-  mmr.release()
-  return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0)
-}
-
-fun Color.darker(factor: Float = 0.1f): Color =
-  Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)
-
-fun ByteArray.toBase64String() = Base64.encodeToString(this, Base64.DEFAULT)
-
-fun String.toByteArrayFromBase64() = Base64.decode(this, Base64.DEFAULT)
-
-val LongRange.Companion.saver
-  get() = Saver<MutableState<LongRange>, Pair<Long, Long>>(
-    save = { it.value.first to it.value.last },
-    restore = { mutableStateOf(it.first..it.second) }
-    )
-
-/* Make sure that T class has @Serializable annotation */
-inline fun <reified T> serializableSaver(): Saver<T, *> = Saver(
-    save = { json.encodeToString(it) },
-    restore = { json.decodeFromString(it) }
-  )
-
-fun saveAppLocale(pref: SharedPreference<String?>, activity: Activity, languageCode: String? = null) {
-//  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//    val localeManager = SimplexApp.context.getSystemService(LocaleManager::class.java)
-//    localeManager.applicationLocales = LocaleList(Locale.forLanguageTag(languageCode ?: return))
-//  } else {
-    pref.set(languageCode)
-    if (languageCode == null) {
-      activity.applyLocale(SimplexApp.context.defaultLocale)
-    }
-    activity.recreate()
-//  }
-}
-
-fun Activity.applyAppLocale(pref: SharedPreference<String?>) {
-//  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-    val lang = pref.get()
-    if (lang == null || lang == Locale.getDefault().language) return
-    applyLocale(Locale.forLanguageTag(lang))
-//  }
-}
-
-private fun Activity.applyLocale(locale: Locale) {
-  Locale.setDefault(locale)
-  val appConf = Configuration(SimplexApp.context.resources.configuration).apply { setLocale(locale) }
-  val activityConf = Configuration(resources.configuration).apply { setLocale(locale) }
-  @Suppress("DEPRECATION")
-  SimplexApp.context.resources.updateConfiguration(appConf, resources.displayMetrics)
-  @Suppress("DEPRECATION")
-  resources.updateConfiguration(activityConf, resources.displayMetrics)
-}
-
-fun UriHandler.openUriCatching(uri: String) {
-  try {
-    openUri(uri)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, e.stackTraceToString())
-  }
-}
-
-fun IntSize.Companion.Saver(): Saver<IntSize, *> = Saver(
-  save = { it.width to it.height },
-  restore = { IntSize(it.first, it.second) }
-)
-
-@Composable
-fun DisposableEffectOnGone(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenGone: () -> Unit) {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    always()
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val orientation = activity.resources.configuration.orientation
-    onDispose {
-      whenDispose()
-      if (orientation == activity.resources.configuration.orientation) {
-        whenGone()
-      }
-    }
-  }
-}
-
-@Composable
-fun DisposableEffectOnRotate(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenRotate: () -> Unit) {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    always()
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val orientation = activity.resources.configuration.orientation
-    onDispose {
-      whenDispose()
-      if (orientation != activity.resources.configuration.orientation) {
-        whenRotate()
-      }
-    }
-  }
-}

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

@@ -1,22 +0,0 @@
-package chat.simplex.app.views.localauth
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun LocalAuthView(m: ChatModel, authRequest: LocalAuthRequest) {
-  val passcode = rememberSaveable { mutableStateOf("") }
-  PasscodeView(passcode, authRequest.title ?: stringResource(R.string.la_enter_app_passcode), authRequest.reason, stringResource(R.string.submit_passcode),
-    submit = {
-      val r: LAResult = if (passcode.value == authRequest.password) LAResult.Success else LAResult.Error(generalGetString(R.string.incorrect_passcode))
-      authRequest.completed(r)
-    },
-    cancel = {
-      authRequest.completed(LAResult.Error(generalGetString(R.string.authentication_cancelled)))
-    })
-}

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

@@ -1,142 +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, centered: Boolean = false) {
-  if (chatModelIncognito) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = if (centered) Arrangement.Center else Arrangement.Start
-    ) {
-      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 = if (centered) TextAlign.Center else TextAlign.Left, style = MaterialTheme.typography.body2)
-    }
-  } else {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = if (centered) Arrangement.Center else Arrangement.Start
-    ) {
-      Icon(
-        Icons.Outlined.Info,
-        stringResource(R.string.incognito),
-        tint = HighOrLowlight,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(offText, textAlign = if (centered) TextAlign.Center else 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/ContactConnectionInfoView.kt

@@ -1,157 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import SectionDivider
-import SectionView
-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.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.LocalAliasEditor
-import chat.simplex.app.views.chatlist.deleteContactConnectionAlert
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun ContactConnectionInfoView(
-  chatModel: ChatModel,
-  connReqInvitation: String?,
-  contactConnection: PendingContactConnection,
-  focusAlias: Boolean,
-  close: () -> Unit
-) {
-  LaunchedEffect(connReqInvitation) {
-    chatModel.connReqInv.value = connReqInvitation
-  }
-  /** When [AddContactView] is open, we don't need to drop [chatModel.connReqInv].
-   * Otherwise, it will be called here AFTER [AddContactView] is launched and will clear the value too soon.
-   * It will be dropped automatically when connection established or when user goes away from this screen.
-   **/
-  DisposableEffect(Unit) {
-    onDispose {
-      if (!ModalManager.shared.hasModalsOpen()) {
-        chatModel.connReqInv.value = null
-      }
-    }
-  }
-  ContactConnectionInfoLayout(
-    connReq = connReqInvitation,
-    contactConnection,
-    focusAlias,
-    deleteConnection = { deleteContactConnectionAlert(contactConnection, chatModel, close) },
-    onLocalAliasChanged = { setContactAlias(contactConnection, it, chatModel) },
-    showQr = {
-      ModalManager.shared.showModal {
-        Column(
-          Modifier
-            .fillMaxHeight()
-            .padding(horizontal = DEFAULT_PADDING),
-          verticalArrangement = Arrangement.SpaceBetween
-        ) {
-          AddContactView(connReqInvitation ?: return@showModal, contactConnection.incognito)
-        }
-      }
-    }
-  )
-}
-
-@Composable
-private fun ContactConnectionInfoLayout(
-  connReq: String?,
-  contactConnection: PendingContactConnection,
-  focusAlias: Boolean,
-  deleteConnection: () -> Unit,
-  onLocalAliasChanged: (String) -> Unit,
-  showQr: () -> Unit,
-) {
-  Column(
-    Modifier
-      .verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(
-      stringResource(
-        if (contactConnection.initiated) R.string.you_invited_your_contact
-        else R.string.you_accepted_connection
-      )
-    )
-    if (contactConnection.groupLinkId == null) {
-      Row(Modifier.padding(bottom = DEFAULT_PADDING)) {
-        LocalAliasEditor(contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
-      }
-    }
-    Text(
-      stringResource(
-        if (contactConnection.viaContactUri)
-          if (contactConnection.groupLinkId != null) R.string.you_will_be_connected_when_group_host_device_is_online
-          else R.string.you_will_be_connected_when_your_connection_request_is_accepted
-        else R.string.you_will_be_connected_when_your_contacts_device_is_online
-      ),
-      Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING)
-    )
-    SectionView {
-      if (!connReq.isNullOrEmpty() && contactConnection.initiated) {
-        ShowQrButton(contactConnection.incognito, showQr)
-        SectionDivider()
-      }
-      DeleteButton(deleteConnection)
-    }
-  }
-}
-
-@Composable
-fun ShowQrButton(incognito: Boolean, onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.QrCode,
-    stringResource(R.string.show_QR_code),
-    click = onClick,
-    textColor = if (incognito) Indigo else MaterialTheme.colors.primary,
-    iconColor = if (incognito) Indigo else MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun DeleteButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Delete,
-    stringResource(R.string.delete_verb),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-private fun setContactAlias(contactConnection: PendingContactConnection, localAlias: String, chatModel: ChatModel) = withApi {
-  chatModel.controller.apiSetConnectionAlias(contactConnection.pccConnId, localAlias)?.let {
-    chatModel.updateContactConnection(it)
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-private fun PreviewContactConnectionInfoView() {
-  SimpleXTheme {
-    ContactConnectionInfoLayout(
-      connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
-      PendingContactConnection.getSampleData(),
-      focusAlias = false,
-      deleteConnection = {},
-      onLocalAliasChanged = {},
-      showQr = {},
-    )
-  }
-}

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

@@ -1,137 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.content.ClipboardManager
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-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.*
-import androidx.compose.ui.Modifier
-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.core.content.ContextCompat.getSystemService
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun PasteToConnectView(chatModel: ChatModel, close: () -> Unit) {
-  val connectionLink = remember { mutableStateOf("") }
-  val context = LocalContext.current
-  val clipboard = getSystemService(context, ClipboardManager::class.java)
-  PasteToConnectLayout(
-    chatModel.incognito.value,
-    connectionLink = connectionLink,
-    pasteFromClipboard = {
-      connectionLink.value = clipboard?.primaryClip?.getItemAt(0)?.coerceToText(context) as? String ?: return@PasteToConnectLayout
-    },
-    connectViaLink = { connReqUri ->
-      try {
-        val uri = Uri.parse(connReqUri)
-        withUriAction(uri) { linkType ->
-          val action = suspend {
-            Log.d(TAG, "connectViaUri: connecting")
-            if (connectViaUri(chatModel, linkType, uri)) {
-              close()
-            }
-          }
-          if (linkType == ConnectionLinkType.GROUP) {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.connect_via_group_link),
-              text = generalGetString(R.string.you_will_join_group),
-              confirmText = generalGetString(R.string.connect_via_link_verb),
-              onConfirm = { withApi { action() } }
-            )
-          } else action()
-        }
-      } catch (e: RuntimeException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.invalid_connection_link),
-          text = generalGetString(R.string.this_string_is_not_a_connection_link)
-        )
-      }
-    },
-  )
-}
-
-@Composable
-fun PasteToConnectLayout(
-  chatModelIncognito: Boolean,
-  connectionLink: MutableState<String>,
-  pasteFromClipboard: () -> Unit,
-  connectViaLink: (String) -> Unit,
-) {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-    verticalArrangement = Arrangement.SpaceBetween,
-  ) {
-    AppBarTitle(stringResource(R.string.connect_via_link), false)
-    Text(stringResource(R.string.paste_connection_link_below_to_connect))
-
-    InfoAboutIncognito(
-      chatModelIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_from_contact_description),
-      generalGetString(R.string.profile_will_be_sent_to_contact_sending_link)
-    )
-
-    Box(Modifier.padding(top = 16.dp, bottom = 6.dp)) {
-      TextEditor(Modifier.height(180.dp), text = connectionLink)
-    }
-
-    Row(
-      Modifier.fillMaxWidth().padding(bottom = 6.dp),
-      horizontalArrangement = Arrangement.Start,
-    ) {
-      if (connectionLink.value == "") {
-        SimpleButton(text = stringResource(R.string.paste_button), icon = Icons.Outlined.ContentPaste) {
-          pasteFromClipboard()
-        }
-      } else {
-        SimpleButton(text = stringResource(R.string.clear_verb), icon = Icons.Outlined.Clear) {
-          connectionLink.value = ""
-        }
-      }
-      Spacer(Modifier.weight(1f).fillMaxWidth())
-      SimpleButton(text = stringResource(R.string.connect_button), icon = Icons.Outlined.Link) {
-        connectViaLink(connectionLink.value)
-      }
-    }
-
-    Text(annotatedStringResource(R.string.you_can_also_connect_by_clicking_the_link))
-  }
-}
-
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewPasteToConnectTextbox() {
-  SimpleXTheme {
-    PasteToConnectLayout(
-      chatModelIncognito = false,
-      connectionLink = remember { mutableStateOf("") },
-      pasteFromClipboard = {},
-      connectViaLink = { link ->
-        try {
-          println(link)
-  //        withApi { chatModel.controller.apiConnect(link) }
-        } catch (e: Exception) {
-          e.printStackTrace()
-        }
-      },
-    )
-  }
-}

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

@@ -1,161 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.Manifest
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-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 androidx.core.net.toUri
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.json
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import com.google.accompanist.permissions.rememberPermissionState
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Composable
-fun ScanToConnectView(chatModel: ChatModel, close: () -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ConnectContactLayout(
-    chatModelIncognito = chatModel.incognito.value,
-    qrCodeScanner = {
-      QRCodeScanner { connReqUri ->
-        try {
-          val uri = Uri.parse(connReqUri)
-          withUriAction(uri) { linkType ->
-            val action = suspend {
-              Log.d(TAG, "connectViaUri: connecting")
-              if (connectViaUri(chatModel, linkType, uri)) {
-                close()
-              }
-            }
-            if (linkType == ConnectionLinkType.GROUP) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(R.string.connect_via_group_link),
-                text = generalGetString(R.string.you_will_join_group),
-                confirmText = generalGetString(R.string.connect_via_link_verb),
-                onConfirm = { withApi { action() } }
-              )
-            } else action()
-          }
-        } catch (e: RuntimeException) {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.invalid_QR_code),
-            text = generalGetString(R.string.this_QR_code_is_not_a_link)
-          )
-        }
-      }
-    },
-  )
-}
-
-enum class ConnectionLinkType {
-  CONTACT, INVITATION, GROUP
-}
-
-@Serializable
-sealed class CReqClientData {
-  @Serializable @SerialName("group") data class Group(val groupLinkId: String): CReqClientData()
-}
-
-fun withUriAction(uri: Uri, run: suspend (ConnectionLinkType) -> Unit) {
-  val action = uri.path?.drop(1)?.replace("/", "")
-  val data = uri.toString().replaceFirst("#/", "/").toUri().getQueryParameter("data")
-  val type = when {
-    data != null -> {
-      val parsed = runCatching {
-        json.decodeFromString(CReqClientData.serializer(), data)
-      }
-      when {
-        parsed.getOrNull() is CReqClientData.Group -> ConnectionLinkType.GROUP
-        else -> null
-      }
-    }
-    action == "contact" -> ConnectionLinkType.CONTACT
-    action == "invitation" -> ConnectionLinkType.INVITATION
-    else -> null
-  }
-  if (type != null) {
-    withApi { run(type) }
-  } else {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.invalid_contact_link),
-      text = generalGetString(R.string.this_link_is_not_a_valid_connection_link)
-    )
-  }
-}
-
-suspend fun connectViaUri(chatModel: ChatModel, action: ConnectionLinkType, uri: Uri): Boolean {
-  val r = chatModel.controller.apiConnect(uri.toString())
-  if (r) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.connection_request_sent),
-      text =
-      when (action) {
-        ConnectionLinkType.CONTACT -> generalGetString(R.string.you_will_be_connected_when_your_connection_request_is_accepted)
-        ConnectionLinkType.INVITATION -> generalGetString(R.string.you_will_be_connected_when_your_contacts_device_is_online)
-        ConnectionLinkType.GROUP -> generalGetString(R.string.you_will_be_connected_when_group_host_device_is_online)
-      }
-    )
-  }
-  return r
-}
-
-@Composable
-fun ConnectContactLayout(chatModelIncognito: Boolean, qrCodeScanner: @Composable () -> Unit) {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-    verticalArrangement = Arrangement.spacedBy(12.dp)
-  ) {
-    AppBarTitle(stringResource(R.string.scan_QR_code), false)
-    InfoAboutIncognito(
-      chatModelIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_description),
-      generalGetString(R.string.your_profile_will_be_sent)
-    )
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = 12.dp)
-    ) { qrCodeScanner() }
-    Text(
-      annotatedStringResource(R.string.if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link),
-      lineHeight = 22.sp
-    )
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewConnectContactLayout() {
-  SimpleXTheme {
-    ConnectContactLayout(
-      chatModelIncognito = false,
-      qrCodeScanner = { Surface {} },
-    )
-  }
-}

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

@@ -1,79 +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.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.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.openUriCatching("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, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp)) {
-  Text(annotatedStringResource(stringResId), modifier = Modifier.padding(padding), textAlign = textAlign, lineHeight = 22.sp)
-}
-
-@Composable
-fun ReadableText(text: String, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp)) {
-  Text(text, modifier = Modifier.padding(padding), textAlign = textAlign, 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,76 +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.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-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 = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-  ) {
-    //CloseSheetBar(null)
-    AppBarTitleCentered(stringResource(R.string.onboarding_notifications_mode_title))
-    val currentMode = rememberSaveable { mutableStateOf(NotificationsMode.default) }
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING * 1f)) {
-      Text(stringResource(R.string.onboarding_notifications_mode_subtitle), Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
-      Spacer(Modifier.height(DEFAULT_PADDING * 2f))
-      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, false) {
-          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(35.dp),
-  ) {
-    Column(Modifier.padding(14.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 = 14.dp).align(Alignment.CenterHorizontally),
-        textAlign = TextAlign.Center
-      )
-      Text(annotatedStringResource(description),
-        Modifier.align(Alignment.CenterHorizontally),
-        color = MaterialTheme.colors.onBackground,
-        lineHeight = 24.sp,
-        textAlign = TextAlign.Center
-      )
-    }
-  }
-  Spacer(Modifier.height(14.dp))
-}

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

@@ -1,362 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import android.content.res.Configuration
-import androidx.compose.foundation.*
-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.openUriCatching(link) }
-      )
-    }
-
-    Column(
-      horizontalAlignment = Alignment.Start,
-      modifier = Modifier.padding(bottom = 12.dp)
-    ) {
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.padding(bottom = 4.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
-        .fillMaxSize()
-        .padding(horizontal = DEFAULT_PADDING)
-        .verticalScroll(rememberScrollState()),
-      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
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_4_french_interface,
-        descrId = R.string.v4_4_french_interface_descr
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.5",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.ManageAccounts,
-        titleId = R.string.v4_5_multiple_chat_profiles,
-        descrId = R.string.v4_5_multiple_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.EditNote,
-        titleId = R.string.v4_5_message_draft,
-        descrId = R.string.v4_5_message_draft_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.SafetyDivider,
-        titleId = R.string.v4_5_transport_isolation,
-        descrId = R.string.v4_5_transport_isolation_descr,
-        link = "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation"
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Task,
-        titleId = R.string.v4_5_private_filenames,
-        descrId = R.string.v4_5_private_filenames_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Battery2Bar,
-        titleId = R.string.v4_5_reduced_battery_usage,
-        descrId = R.string.v4_5_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_5_italian_interface,
-        descrId = R.string.v4_5_italian_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.6",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Lock,
-        titleId = R.string.v4_6_hidden_chat_profiles,
-        descrId = R.string.v4_6_hidden_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Flag,
-        titleId = R.string.v4_6_group_moderation,
-        descrId = R.string.v4_6_group_moderation_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.MapsUgc,
-        titleId = R.string.v4_6_group_welcome_message,
-        descrId = R.string.v4_6_group_welcome_message_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Call,
-        titleId = R.string.v4_6_audio_video_calls,
-        descrId = R.string.v4_6_audio_video_calls_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Battery3Bar,
-        titleId = R.string.v4_6_reduced_battery_usage,
-        descrId = R.string.v4_6_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_6_chinese_spanish_interface,
-        descrId = R.string.v4_6_chinese_spanish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v5.0",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.UploadFile,
-        titleId = R.string.v5_0_large_files_support,
-        descrId = R.string.v5_0_large_files_support_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Lock,
-        titleId = R.string.v5_0_app_passcode,
-        descrId = R.string.v5_0_app_passcode_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v5_0_polish_interface,
-        descrId = R.string.v5_0_polish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
-      )
-    )
-  )
-)
-
-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,289 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionCustomFooter
-import SectionDivider
-import SectionItemView
-import SectionItemViewSpaceBetween
-import SectionItemWithValue
-import SectionSpacer
-import SectionView
-import android.app.Activity
-import android.content.ComponentName
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
-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.runtime.saveable.rememberSaveable
-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.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.model.ChatModel
-import chat.simplex.app.model.SharedPreference
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import com.godaddy.android.colorpicker.*
-import kotlinx.coroutines.delay
-import java.util.*
-
-enum class AppIcon(val resId: Int) {
-  DEFAULT(R.mipmap.icon),
-  DARK_BLUE(R.mipmap.icon_dark_blue),
-}
-
-@Composable
-fun AppearanceView(m: ChatModel) {
-  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,
-    m.controller.appPrefs.appLanguage,
-    changeIcon = ::setAppIcon,
-    editPrimaryColor = { primary ->
-      ModalManager.shared.showModalCloseable { close ->
-        ColorEditor(primary, close)
-      }
-    },
-  )
-}
-
-@Composable fun AppearanceLayout(
-  icon: MutableState<AppIcon>,
-  languagePref: SharedPreference<String?>,
-  changeIcon: (AppIcon) -> Unit,
-  editPrimaryColor: (Color) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.appearance_settings))
-    SectionView(stringResource(R.string.settings_section_title_language), padding = PaddingValues()) {
-      val context = LocalContext.current
-//      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//        SectionItemWithValue(
-//          generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-//          remember { mutableStateOf("system") },
-//          listOf(ValueTitleDesc("system", generalGetString(R.string.change_verb), "")),
-//          onSelected = { openSystemLangPicker(context as? Activity ?: return@SectionItemWithValue) }
-//        )
-//      } else {
-        val state = rememberSaveable { mutableStateOf(languagePref.get() ?: "system") }
-        SectionItemView {
-          LangSelector(state) {
-            state.value = it
-            withApi {
-              delay(200)
-              val activity = context as? Activity
-              if (activity != null) {
-                if (it == "system") {
-                  saveAppLocale(languagePref, activity)
-                } else {
-                  saveAppLocale(languagePref, activity, it)
-                }
-              }
-            }
-          }
-        }
-//      }
-    }
-    SectionSpacer()
-
-    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 {
-        val darkTheme = isSystemInDarkTheme()
-        val state = remember { derivedStateOf { currentTheme.second } }
-        ThemeSelector(state) {
-          ThemeManager.applyTheme(it.name, darkTheme)
-        }
-      }
-      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())
-    }
-  )
-}
-
-@Composable
-private fun LangSelector(state: State<String>, onSelected: (String) -> Unit) {
-  // Should be the same as in app/build.gradle's `android.defaultConfig.resConfigs`
-  val supportedLanguages = mapOf(
-    "system" to generalGetString(R.string.language_system),
-    "en" to "English",
-    "cs" to "Čeština",
-    "de" to "Deutsch",
-    "es" to "Español",
-    "fr" to "Français",
-    "it" to "Italiano",
-    "nl" to "Nederlands",
-    "pl" to "Polski",
-    "ru" to "Русский",
-    "zh-CN" to "简体中文"
-  )
-  val values by remember { mutableStateOf(supportedLanguages.map { it.key to it.value }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun ThemeSelector(state: State<DefaultTheme>, onSelected: (DefaultTheme) -> Unit) {
-  val darkTheme = isSystemInDarkTheme()
-  val values by remember { mutableStateOf(ThemeManager.allThemes(darkTheme).map { it.second to it.third }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.theme),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-//private fun openSystemLangPicker(activity: Activity) {
-//  activity.startActivity(Intent(Settings.ACTION_APP_LOCALE_SETTINGS, Uri.parse("package:" + SimplexApp.context.packageName)))
-//}
-
-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) },
-      languagePref = SharedPreference({ null }, {}),
-      changeIcon = {},
-      editPrimaryColor = {},
-    )
-  }
-}

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

@@ -1,58 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-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.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.TerminalView
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun DeveloperView(
-  m: ChatModel,
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  withAuth: (block: () -> Unit) -> Unit
-) {
-  Column(Modifier.fillMaxWidth()) {
-    val uriHandler = LocalUriHandler.current
-    AppBarTitle(stringResource(R.string.settings_developer_tools))
-    val developerTools = m.controller.appPrefs.developerTools
-    val devTools = remember { mutableStateOf(developerTools.get()) }
-    SectionView() {
-      InstallTerminalAppItem(uriHandler)
-      SectionDivider()
-      ChatConsoleItem { withAuth(showCustomModal { it, close -> TerminalView(it, close) }) }
-      SectionDivider()
-      SettingsPreferenceItem(Icons.Outlined.DriveFolderUpload, stringResource(R.string.confirm_database_upgrades), m.controller.appPrefs.confirmDBUpgrades)
-      SectionDivider()
-      SettingsPreferenceItem(Icons.Outlined.Code, stringResource(R.string.show_developer_options), developerTools, devTools)
-    }
-    SectionTextFooter(
-      generalGetString(if (devTools.value) R.string.show_dev_options else R.string.hide_dev_options) + " " +
-        generalGetString(R.string.developer_options)
-    )
-    SectionSpacer()
-
-//    val xftpSendEnabled = m.controller.appPrefs.xftpSendEnabled
-//    val xftpEnabled = remember { mutableStateOf(xftpSendEnabled.get()) }
-//    SectionView(generalGetString(R.string.settings_section_title_experimenta)) {
-//      SettingsPreferenceItem(Icons.Outlined.UploadFile, stringResource(R.string.settings_send_files_via_xftp), xftpSendEnabled, xftpEnabled) {
-//        withApi { m.controller.apiSetXFTPConfig(m.controller.getXFTPCfg()) }
-//      }
-//    }
-//    if (xftpEnabled.value) {
-//      SectionTextFooter(generalGetString(R.string.xftp_requires_v461))
-//    }
-  }
-}

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

@@ -1,37 +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.UploadFile
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.helpers.withApi
-
-@Composable
-fun ExperimentalFeaturesView(chatModel: ChatModel) {
-  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.UploadFile, stringResource(R.string.settings_send_files_via_xftp), chatModel.controller.appPrefs.xftpSendEnabled) {
-        withApi {
-          chatModel.controller.apiSetXFTPConfig(chatModel.controller.getXFTPCfg())
-        }
-      }
-    }
-  }
-}

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

@@ -1,36 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-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.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun IncognitoView() {
-  IncognitoLayout()
-}
-
-@Composable
-fun IncognitoLayout() {
-  Column {
-    AppBarTitle(stringResource(R.string.settings_section_title_incognito))
-    Column(
-      Modifier
-        .verticalScroll(rememberScrollState())
-        .padding(horizontal = DEFAULT_PADDING),
-      verticalArrangement = Arrangement.spacedBy(20.dp)
-    ) {
-      Text(generalGetString(R.string.incognito_info_protects))
-      Text(generalGetString(R.string.incognito_info_allows))
-      Text(generalGetString(R.string.incognito_info_share))
-      Text(generalGetString(R.string.incognito_info_find))
-    }
-  }
-}

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

@@ -1,214 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemViewSpaceBetween
-import SectionView
-import SectionViewSelectable
-import android.os.Build
-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.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.*
-import kotlin.collections.ArrayList
-
-enum class NotificationsMode(private val requiresIgnoringBatterySinceSdk: Int) {
-  OFF(Int.MAX_VALUE), PERIODIC(Build.VERSION_CODES.M), SERVICE(Build.VERSION_CODES.S), /*INSTANT(Int.MAX_VALUE) - for Firebase notifications */;
-
-  val requiresIgnoringBattery
-    get() = requiresIgnoringBatterySinceSdk <= Build.VERSION.SDK_INT
-
-  companion object {
-    val default: NotificationsMode = SERVICE
-  }
-}
-
-enum class NotificationPreviewMode {
-  MESSAGE, CONTACT, HIDDEN;
-
-  companion object {
-    val default: NotificationPreviewMode = MESSAGE
-  }
-}
-
-@Composable
-fun NotificationsSettingsView(
-  chatModel: ChatModel,
-) {
-  val onNotificationPreviewModeSelected = { mode: NotificationPreviewMode ->
-    chatModel.controller.appPrefs.notificationPreviewMode.set(mode.name)
-    chatModel.notificationPreviewMode.value = mode
-  }
-
-  NotificationsSettingsLayout(
-    notificationsMode = chatModel.notificationsMode,
-    notificationPreviewMode = chatModel.notificationPreviewMode,
-    showPage = { page ->
-      ModalManager.shared.showModalCloseable(true) {
-          when (page) {
-            CurrentPage.NOTIFICATIONS_MODE -> NotificationsModeView(chatModel.notificationsMode) { changeNotificationsMode(it, chatModel) }
-            CurrentPage.NOTIFICATION_PREVIEW_MODE -> NotificationPreviewView(chatModel.notificationPreviewMode, onNotificationPreviewModeSelected)
-          }
-      }
-    },
-  )
-}
-
-enum class CurrentPage {
-  NOTIFICATIONS_MODE, NOTIFICATION_PREVIEW_MODE
-}
-
-@Composable
-fun NotificationsSettingsLayout(
-  notificationsMode: State<NotificationsMode>,
-  notificationPreviewMode: State<NotificationPreviewMode>,
-  showPage: (CurrentPage) -> Unit,
-) {
-  val modes = remember { notificationModes() }
-  val previewModes = remember { notificationPreviewModes() }
-
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.notifications))
-    SectionView(null) {
-      SectionItemViewSpaceBetween({ showPage(CurrentPage.NOTIFICATIONS_MODE) }) {
-        Text(stringResource(R.string.settings_notifications_mode_title))
-        Spacer(Modifier.padding(horizontal = 10.dp))
-        Text(
-          modes.first { it.value == notificationsMode.value }.title,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          color = HighOrLowlight
-        )
-      }
-      SectionDivider()
-      SectionItemViewSpaceBetween({ showPage(CurrentPage.NOTIFICATION_PREVIEW_MODE) }) {
-        Text(stringResource(R.string.settings_notification_preview_mode_title))
-        Spacer(Modifier.padding(horizontal = 10.dp))
-        Text(
-          previewModes.first { it.value == notificationPreviewMode.value }.title,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          color = HighOrLowlight
-        )
-      }
-    }
-  }
-}
-
-@Composable
-fun NotificationsModeView(
-  notificationsMode: State<NotificationsMode>,
-  onNotificationsModeSelected: (NotificationsMode) -> Unit,
-) {
-  val modes = remember { notificationModes() }
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.settings_notifications_mode_title).lowercase().capitalize(Locale.current))
-    SectionViewSelectable(null, notificationsMode, modes, onNotificationsModeSelected)
-  }
-}
-
-@Composable
-fun NotificationPreviewView(
-  notificationPreviewMode: State<NotificationPreviewMode>,
-  onNotificationPreviewModeSelected: (NotificationPreviewMode) -> Unit,
-) {
-  val previewModes = remember { notificationPreviewModes() }
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.settings_notification_preview_title))
-    SectionViewSelectable(null, notificationPreviewMode, previewModes, onNotificationPreviewModeSelected)
-  }
-}
-
-// mode, name, description
-private fun notificationModes(): List<ValueTitleDesc<NotificationsMode>> {
-  val res = ArrayList<ValueTitleDesc<NotificationsMode>>()
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.OFF,
-      generalGetString(R.string.notifications_mode_off),
-      generalGetString(R.string.notifications_mode_off_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.PERIODIC,
-      generalGetString(R.string.notifications_mode_periodic),
-      generalGetString(R.string.notifications_mode_periodic_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.SERVICE,
-      generalGetString(R.string.notifications_mode_service),
-      generalGetString(R.string.notifications_mode_service_desc),
-    )
-  )
-  return res
-}
-
-// preview mode, name, description
-fun notificationPreviewModes(): List<ValueTitleDesc<NotificationPreviewMode>> {
-  val res = ArrayList<ValueTitleDesc<NotificationPreviewMode>>()
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.MESSAGE,
-      generalGetString(R.string.notification_preview_mode_message),
-      generalGetString(R.string.notification_preview_mode_message_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.CONTACT,
-      generalGetString(R.string.notification_preview_mode_contact),
-      generalGetString(R.string.notification_preview_mode_contact_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.HIDDEN,
-      generalGetString(R.string.notification_preview_mode_hidden),
-      generalGetString(R.string.notification_display_mode_hidden_desc),
-    )
-  )
-  return res
-}
-
-fun changeNotificationsMode(mode: NotificationsMode, chatModel: ChatModel) {
-  chatModel.controller.appPrefs.notificationsMode.set(mode.name)
-  if (mode.requiresIgnoringBattery && !chatModel.controller.isIgnoringBatteryOptimizations(chatModel.controller.appContext)) {
-    chatModel.controller.appPrefs.backgroundServiceNoticeShown.set(false)
-  }
-  chatModel.notificationsMode.value = mode
-  SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
-  CoroutineScope(Dispatchers.Default).launch {
-    if (mode == NotificationsMode.SERVICE)
-      SimplexService.start(SimplexApp.context)
-    else
-      SimplexService.safeStopService(SimplexApp.context)
-  }
-
-  if (mode != NotificationsMode.PERIODIC) {
-    MessagesFetcherWorker.cancelAll()
-  }
-  chatModel.controller.showBackgroundServiceNoticeIfNeeded()
-}

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

@@ -1,339 +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.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Lock
-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.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimplexGreen
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.localauth.SetAppPasscodeView
-
-enum class LAMode {
-  SYSTEM,
-  PASSCODE;
-
-  val text: String
-    get() = when (this) {
-      SYSTEM -> generalGetString(R.string.la_mode_system)
-      PASSCODE -> generalGetString(R.string.la_mode_passcode)
-    }
-}
-
-@Composable
-fun PrivacySettingsView(
-  chatModel: ChatModel,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  setPerformLA: (Boolean, FragmentActivity) -> 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, showSettingsModal, 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.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
-  )
-}
-
-private val laDelays = listOf(10, 30, 60, 180, 0)
-
-@Composable
-fun SimplexLockView(
-  chatModel: ChatModel,
-  currentLAMode: SharedPreference<LAMode>,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit
-) {
-  val performLA = remember { chatModel.performLA }
-  val laMode = remember { chatModel.controller.appPrefs.laMode.state }
-  val laLockDelay = remember { chatModel.controller.appPrefs.laLockDelay }
-  val showChangePasscode = remember { derivedStateOf { performLA.value && currentLAMode.state.value == LAMode.PASSCODE } }
-  val activity = LocalContext.current as FragmentActivity
-
-  fun resetLAEnabled(onOff: Boolean) {
-    chatModel.controller.appPrefs.performLA.set(onOff)
-    chatModel.performLA.value = onOff
-  }
-
-  fun disableUnavailableLA() {
-    resetLAEnabled(false)
-    currentLAMode.set(LAMode.SYSTEM)
-    laUnavailableInstructionAlert()
-  }
-
-  fun toggleLAMode(toLAMode: LAMode) {
-    authenticate(
-      if (toLAMode == LAMode.SYSTEM) {
-        generalGetString(R.string.la_enter_app_passcode)
-      } else {
-        generalGetString(R.string.chat_lock)
-      },
-      generalGetString(R.string.change_lock_mode), activity
-    ) { laResult ->
-      when (laResult) {
-        is LAResult.Error -> {
-          laFailedAlert()
-        }
-        is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-        LAResult.Success -> {
-          when (toLAMode) {
-            LAMode.SYSTEM -> {
-              authenticate(generalGetString(R.string.auth_enable_simplex_lock), promptSubtitle = "", activity, toLAMode) { laResult ->
-                when (laResult) {
-                  LAResult.Success -> {
-                    currentLAMode.set(toLAMode)
-                    ksAppPassword.remove()
-                    laTurnedOnAlert()
-                  }
-                  is LAResult.Unavailable, is LAResult.Error -> {
-                    laFailedAlert()
-                  }
-                  is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-                }
-              }
-            }
-            LAMode.PASSCODE -> {
-              ModalManager.shared.showCustomModal { close ->
-                Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-                  SetAppPasscodeView(
-                    submit = {
-                      laLockDelay.set(30)
-                      currentLAMode.set(toLAMode)
-                      passcodeAlert(generalGetString(R.string.passcode_set))
-                    },
-                    cancel = {},
-                    close
-                  )
-                }
-              }
-            }
-          }
-        }
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  fun changeLAPassword() {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.la_change_app_passcode), activity) { laResult ->
-      when (laResult) {
-        LAResult.Success -> {
-          ModalManager.shared.showCustomModal { close ->
-            Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-              SetAppPasscodeView(
-                submit = {
-                  passcodeAlert(generalGetString(R.string.passcode_changed))
-                }, cancel = {
-                  passcodeAlert(generalGetString(R.string.passcode_not_changed))
-                }, close
-              )
-            }
-          }
-        }
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> {}
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start
-  ) {
-    AppBarTitle(stringResource(R.string.chat_lock))
-    SectionView {
-      EnableLock(performLA) { performLAToggle ->
-        performLA.value = performLAToggle
-        chatModel.controller.appPrefs.laNoticeShown.set(true)
-        if (performLAToggle) {
-          when (currentLAMode.state.value) {
-            LAMode.SYSTEM -> {
-              setPerformLA(true, activity)
-            }
-            LAMode.PASSCODE -> {
-              ModalManager.shared.showCustomModal { close ->
-                Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-                  SetAppPasscodeView(
-                    submit = {
-                      laLockDelay.set(30)
-                      chatModel.controller.appPrefs.performLA.set(true)
-                      passcodeAlert(generalGetString(R.string.passcode_set))
-                    },
-                    cancel = {
-                      resetLAEnabled(false)
-                    }, close
-                  )
-                }
-              }
-            }
-          }
-        } else {
-          setPerformLA(false, activity)
-        }
-      }
-      SectionDivider()
-      SectionItemView {
-        LockModeSelector(laMode) { newLAMode ->
-          if (laMode.value == newLAMode) return@LockModeSelector
-          if (chatModel.controller.appPrefs.performLA.get()) {
-            toggleLAMode(newLAMode)
-          } else {
-            currentLAMode.set(newLAMode)
-          }
-        }
-      }
-
-      if (performLA.value) {
-        SectionDivider()
-        SectionItemView {
-          LockDelaySelector(remember { laLockDelay.state }) { laLockDelay.set(it) }
-        }
-        if (showChangePasscode.value && laMode.value == LAMode.PASSCODE) {
-          SectionDivider()
-          SectionItemView({ changeLAPassword() }) {
-            Text(generalGetString(R.string.la_change_app_passcode))
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun EnableLock(performLA: MutableState<Boolean>, onCheckedChange: (Boolean) -> Unit) {
-  SectionItemView {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Text(
-        stringResource(R.string.enable_lock), Modifier
-          .padding(end = 24.dp)
-          .fillMaxWidth()
-          .weight(1F)
-      )
-      Switch(
-        checked = performLA.value,
-        onCheckedChange = onCheckedChange,
-        colors = SwitchDefaults.colors(
-          checkedThumbColor = MaterialTheme.colors.primary,
-          uncheckedThumbColor = HighOrLowlight
-        )
-      )
-    }
-  }
-}
-
-@Composable
-private fun LockModeSelector(state: State<LAMode>, onSelected: (LAMode) -> Unit) {
-  val values by remember { mutableStateOf(LAMode.values().map { it to it.text }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.lock_mode),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun LockDelaySelector(state: State<Int>, onSelected: (Int) -> Unit) {
-  val delays = remember { if (laDelays.contains(state.value)) laDelays else listOf(state.value) + laDelays }
-  val values by remember { mutableStateOf(delays.map { it to laDelayText(it) }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.lock_after),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-private fun laDelayText(t: Int): String {
-  val m = t / 60
-  val s = t % 60
-  return if (t == 0) {
-    generalGetString(R.string.la_immediately)
-  } else if (m == 0 || s != 0) {
-    // there are no options where both minutes and seconds are needed
-    generalGetString(R.string.la_seconds).format(s)
-  } else {
-    generalGetString(R.string.la_minutes).format(m)
-  }
-}
-
-private fun passcodeAlert(title: String) {
-  AlertManager.shared.showAlertMsg(
-    title = title,
-    text = generalGetString(R.string.la_please_remember_to_store_password)
-  )
-}

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

@@ -1,54 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-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.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.model.ServerCfg
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCodeScanner
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun ScanProtocolServer(onNext: (ServerCfg) -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanProtocolServerLayout(onNext)
-}
-
-@Composable
-private fun ScanProtocolServerLayout(onNext: (ServerCfg) -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.smp_servers_scan_qr), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = 12.dp)
-    ) {
-      QRCodeScanner { text ->
-        val res = parseServerAddress(text)
-        if (res != null) {
-          onNext(ServerCfg(text, false, null, true))
-        } else {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.smp_servers_invalid_address),
-            text = generalGetString(R.string.smp_servers_check_address)
-          )
-        }
-      }
-    }
-  }
-}

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

@@ -1,550 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionView
-import android.content.Context
-import android.content.res.Configuration
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
-import androidx.fragment.app.FragmentActivity
-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, FragmentActivity) -> Unit) {
-  val user = chatModel.currentUser.value
-  val stopped = chatModel.chatRunning.value == false
-
-  MaintainIncognitoState(chatModel)
-
-  if (user != null) {
-    val requireAuth = remember { chatModel.controller.appPrefs.performLA.state }
-    val context = LocalContext.current
-    SettingsLayout(
-      profile = user.profile,
-      stopped,
-      chatModel.chatDbEncrypted.value == true,
-      chatModel.incognito,
-      chatModel.controller.appPrefs.incognito,
-      user.displayName,
-      setPerformLA = setPerformLA,
-      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
-      showSettingsModal = { modalView -> { ModalManager.shared.showModal(true) { modalView(chatModel) } } },
-      showSettingsModalWithSearch = { modalView ->
-        ModalManager.shared.showCustomModal { close ->
-          val search = rememberSaveable { mutableStateOf("") }
-          ModalView(
-            { close() },
-            if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight,
-            endButtons = {
-              SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), alwaysVisible = true) { search.value = it }
-            },
-            content = { modalView(chatModel, search) })
-        }
-      },
-      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showVersion = {
-        withApi {
-          val info = chatModel.controller.apiGetVersion()
-          if (info != null) {
-            ModalManager.shared.showModal { VersionInfoView(info) }
-          }
-        }
-      },
-      withAuth = { block ->
-        if (!requireAuth.value) {
-          block()
-        } else {
-          ModalManager.shared.showModalCloseable { close ->
-            val onFinishAuth = { success: Boolean ->
-              if (success) {
-                close()
-                block()
-              }
-            }
-            LaunchedEffect(Unit) {
-              runAuth(context, onFinishAuth)
-            }
-            Box(
-              Modifier.fillMaxSize(),
-              contentAlignment = Alignment.Center
-            ) {
-              SimpleButton(
-                stringResource(R.string.auth_unlock),
-                icon = Icons.Outlined.Lock,
-                click = {
-                  runAuth(context, onFinishAuth)
-                }
-              )
-            }
-          }
-        }
-      },
-    )
-  }
-}
-
-val simplexTeamUri =
-  "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-
-@Composable
-fun SettingsLayout(
-  profile: LocalProfile,
-  stopped: Boolean,
-  encrypted: Boolean,
-  incognito: MutableState<Boolean>,
-  incognitoPref: SharedPreference<Boolean>,
-  userDisplayName: String,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showSettingsModalWithSearch: (@Composable (ChatModel, MutableState<String>) -> Unit) -> Unit,
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  showVersion: () -> Unit,
-  withAuth: (block: () -> Unit) -> 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()
-        val profileHidden = rememberSaveable { mutableStateOf(false) }
-        SettingsActionItem(Icons.Outlined.ManageAccounts, stringResource(R.string.your_chat_profiles), { withAuth { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = 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, stopped = stopped)
-      }
-      SectionSpacer()
-
-      SectionView(stringResource(R.string.settings_section_title_settings)) {
-        SettingsActionItem(Icons.Outlined.Bolt, stringResource(R.string.notifications), showSettingsModal { NotificationsSettingsView(it) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal, showCustomModal) }, 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, showSettingsModal, setPerformLA) }, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showSettingsModal { AppearanceView(it) }, 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.openUriCatching(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
-        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUriCatching("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)) {
-        SettingsActionItem(Icons.Outlined.Code, stringResource(R.string.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) })
-        SectionDivider()
-//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it) })
-//        SectionDivider()
-        AppVersionItem(showVersion)
-      }
-    }
-  }
-}
-
-@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)), stopped: Boolean) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.chat_preferences),
-    click = if (stopped) null else ({
-      withApi {
-        showCustomModal { m, close ->
-          PreferencesView(m, m.currentUser.value ?: return@showCustomModal, close)
-        }()
-      }
-    }),
-    disabled = stopped
-  )
-}
-
-@Composable
-fun ChatLockItem(
-  chatModel: ChatModel,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  setPerformLA: (Boolean, FragmentActivity) -> Unit
-) {
-  val performLA = remember { chatModel.performLA }
-  val currentLAMode = remember { chatModel.controller.appPrefs.laMode }
-  SectionItemView(showSettingsModal { SimplexLockView(chatModel, currentLAMode, setPerformLA) }) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(
-        if (performLA.value) Icons.Filled.Lock else Icons.Outlined.Lock,
-        contentDescription = stringResource(R.string.chat_lock),
-        tint = if (performLA.value) SimplexGreen else HighOrLowlight,
-      )
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      Text(
-        stringResource(R.string.chat_lock), Modifier
-          .padding(end = 24.dp)
-          .fillMaxWidth()
-          .weight(1F)
-      )
-      Text(if (performLA.value) remember { currentLAMode.state }.value.text else generalGetString(androidx.compose.ui.R.string.off), color = HighOrLowlight)
-    }
-  }
-}
-
-@Composable private fun ContributeItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUriCatching("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.openUriCatching("market://details?id=chat.simplex.app") }
-      .onFailure { uriHandler.openUriCatching("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.openUriCatching("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 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 fun InstallTerminalAppItem(uriHandler: UriHandler) {
-  SectionItemView({ uriHandler.openUriCatching("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(showVersion: () -> Unit) {
-  SectionItemView(showVersion) { AppVersionText() }
-}
-
-@Composable fun AppVersionText() {
-  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(if (stopped) null else 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
-      )
-    )
-  }
-}
-
-private fun runAuth(context: Context, onFinish: (success: Boolean) -> Unit) {
-  authenticate(
-    generalGetString(R.string.auth_open_chat_console),
-    generalGetString(R.string.auth_log_in_using_credential),
-    context as FragmentActivity,
-    completed = { laResult ->
-      onFinish(laResult == LAResult.Success || laResult is LAResult.Unavailable)
-    }
-  )
-}
-
-@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 }, {}),
-      userDisplayName = "Alice",
-      setPerformLA = { _, _ -> },
-      showModal = { {} },
-      showSettingsModal = { {} },
-      showSettingsModalWithSearch = { },
-      showCustomModal = { {} },
-      showVersion = {},
-      withAuth = {},
-    )
-  }
-}

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/VersionInfoView.kt

@@ -1,29 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.R
-import chat.simplex.app.model.CoreVersionInfo
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.AppBarTitle
-
-@Composable
-fun VersionInfoView(info: CoreVersionInfo) {
-  Column(
-    Modifier.padding(horizontal = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.Start
-  ) {
-    AppBarTitle(stringResource(R.string.app_version_title), false)
-    Text(String.format(stringResource(R.string.app_version_name), BuildConfig.VERSION_NAME))
-    Text(String.format(stringResource(R.string.app_version_code), BuildConfig.VERSION_CODE))
-    Text(String.format(stringResource(R.string.core_version), info.version))
-    val simplexmqCommit = if (info.simplexmqCommit.length >= 7) info.simplexmqCommit.substring(startIndex = 0, endIndex = 7) else info.simplexmqCommit
-    Text(String.format(stringResource(R.string.core_simplexmq_version), info.simplexmqVersion, simplexmqCommit))
-  }
-}

apps/android/app/src/main/res/drawable/ic_github.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Android drawable generated by fa5ad-free project:
-    https://github.com/diwanoczko/fa5ad-free
-
-    Resource generated base on Font Awesome 5 Free icons set:
-    https://fontawesome.com/
-
-    All brand icons are trademarks of their respective owners.
-    Please do not use brand logos for any purpose except to represent the
-    company, product, or service to which they refer.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23.25dp"
-    android:height="24dp"
-    android:viewportWidth="496"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"
-    />
-</vector>

apps/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="108dp"
-  android:height="108dp"
-  android:viewportWidth="108"
-  android:viewportHeight="108">
-  <path
-    android:fillColor="#3DDC84"
-    android:pathData="M0,0h108v108h-108z" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M9,0L9,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,0L19,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M29,0L29,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M39,0L39,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M49,0L49,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M59,0L59,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M69,0L69,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M79,0L79,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M89,0L89,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M99,0L99,108"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,9L108,9"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,19L108,19"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,29L108,29"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,39L108,39"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,49L108,49"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,59L108,59"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,69L108,69"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,79L108,79"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,89L108,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M0,99L108,99"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,29L89,29"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,39L89,39"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,49L89,49"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,59L89,59"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,69L89,69"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M19,79L89,79"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M29,19L29,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M39,19L39,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M49,19L49,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M59,19L59,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M69,19L69,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-  <path
-    android:fillColor="#00000000"
-    android:pathData="M79,19L79,89"
-    android:strokeWidth="0.8"
-    android:strokeColor="#33FFFFFF" />
-</vector>

apps/android/app/src/main/res/drawable/ic_outline_terminal.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.11,4 20,4zM20,18H4V8h16V18zM18,17h-6v-2h6V17zM7.5,17l-1.41,-1.41L8.67,13l-2.59,-2.59L7.5,9l4,4L7.5,17z"/>
-</vector>

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="accept_contact_button">اقبل</string>
-    <string name="about_simplex_chat">عن <xliff:g id="appNameFull"> ٍSimpleX </xliff:g></string>
-    <string name="a_plus_b">a + b</string>
-    <string name="accept">اقبل</string>
-    <string name="chat_item_ttl_week">اسبوع 1</string>
-    <string name="chat_item_ttl_month">شهر 1</string>
-    <string name="color_primary">لون تمييزي</string>
-    <string name="chat_item_ttl_day">يوم 1</string>
-    <string name="accept_feature">اقبل</string>
-    <string name="about_simplex">عن SimpleX</string>
-    <string name="above_then_preposition_continuation">أعلاه ، ثم:</string>
-    <string name="accept_call_on_lock_screen">اقبل</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">لا يمكن التراجع عن هذا الإجراء - سيتم فقد ملف التعريف وجهات الاتصال والرسائل والملفات الخاصة بك بشكل نهائي.</string>
-    <string name="alert_message_no_group">هذه المجموعة لم تعد موجودة.</string>
-    <string name="this_QR_code_is_not_a_link">رمز QR هذا ليس رابطًا!</string>
-    <string name="next_generation_of_private_messaging">الجيل القادم من الرسائل الخاصة</string>
-    <string name="delete_files_and_media_desc">لا يمكن التراجع عن هذا الإجراء - سيتم حذف جميع الملفات والوسائط المستلمة والمرسلة. ستبقى الصور منخفضة الدقة.</string>
-    <string name="enable_automatic_deletion_message">لا يمكن التراجع عن هذا الإجراء - سيتم حذف الرسائل المرسلة والمستلمة قبل التحديد. قد تأخذ عدة دقائق.</string>
-    <string name="messages_section_description">ينطبق هذا الإعداد على الرسائل الموجودة في ملف تعريف الدردشة الحالي الخاص بك</string>
-    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">منصة الرسائل والتطبيقات تحمي خصوصيتك وأمنك.</string>
-    <string name="profile_is_only_shared_with_your_contacts">يتم مشاركة ملف التعريف مع جهات الاتصال الخاصة بك فقط.</string>
-    <string name="member_role_will_be_changed_with_notification">سيتم تغيير الدور إلى \"%s\". سيتم إبلاغ كل فرد في المجموعة.</string>
-    <string name="member_role_will_be_changed_with_invitation">سيتم تغيير الدور إلى \"%s\". سيتلقى العضو دعوة جديدة.</string>
-    <string name="smp_servers_per_user">خوادم الاتصالات الجديدة لملف تعريف الدردشة الحالي الخاص بك</string>
-    <string name="switch_receiving_address_desc">هذه الميزة تجريبية! ستعمل فقط إذا كان لدى العميل الآخر الإصدار 4.2 مثبتًا. يجب أن ترى الرسالة في المحادثة بمجرد اكتمال تغيير العنوان - يرجى التحقق من أنه لا يزال بإمكانك تلقي الرسائل من جهة الاتصال هذه (أو عضو المجموعة).</string>
-    <string name="this_link_is_not_a_valid_connection_link">هذا الارتباط ليس ارتباط اتصال صالح!</string>
-    <string name="allow_verb">يسمح</string>
-    <string name="smp_servers_preset_add">أضف خوادم محددة مسبقًا</string>
-    <string name="smp_servers_add_to_another_device">أضف إلى جهاز آخر</string>
-    <string name="users_delete_all_chats_deleted">سيتم حذف جميع الدردشات والرسائل - لا يمكن التراجع عن هذا!</string>
-    <string name="network_enable_socks_info">الوصول إلى الخوادم عبر بروكسي SOCKS على المنفذ 9050؟ يجب بدء تشغيل الوكيل قبل تمكين هذا الخيار.</string>
-    <string name="accept_requests">قبول طلبات</string>
-    <string name="smp_servers_add">إضافة خادم …</string>
-    <string name="network_settings">إعدادات الشبكة المتقدمة</string>
-    <string name="all_group_members_will_remain_connected">سيبقى جميع أعضاء المجموعة على اتصال.</string>
-    <string name="allow_disappearing_messages_only_if">السماح باختفاء الرسائل فقط إذا سمحت جهة الاتصال الخاصة بك بذلك.</string>
-    <string name="allow_irreversible_message_deletion_only_if">السماح بحذف الرسائل بشكل لا رجوع فيه فقط إذا سمحت لك جهة الاتصال بذلك.</string>
-    <string name="group_member_role_admin">مسؤل</string>
-    <string name="users_add">إضافة ملف التعريف</string>
-    <string name="allow_direct_messages">السماح بإرسال رسائل مباشرة إلى الأعضاء.</string>
-    <string name="accept_contact_incognito_button">قبول التخفي</string>
-    <string name="button_add_welcome_message">أضف رسالة ترحيب</string>
-    <string name="v4_3_improved_server_configuration_desc">أضف الخوادم عن طريق مسح رموز QR.</string>
-    <string name="v4_2_group_links_desc">يمكن للمسؤولين إنشاء روابط للانضمام إلى المجموعات.</string>
-    <string name="accept_connection_request__question">قبول طلب الاتصال؟</string>
-    <string name="clear_chat_warning">سيتم حذف جميع الرسائل - لا يمكن التراجع عن هذا! سيتم حذف الرسائل فقط من أجلك.</string>
-    <string name="callstatus_accepted">مكالمة مقبولة</string>
-</resources>

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

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

@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="chat_item_ttl_month">1 mėnuo</string>
-    <string name="chat_item_ttl_week">1 savaitė</string>
-    <string name="about_simplex_chat">Apie <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="chat_item_ttl_day">1 diena</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="about_simplex">Apie SimpleX</string>
-    <string name="smp_servers_add">Pridėti serverį…</string>
-    <string name="v4_3_improved_server_configuration_desc">Pridėti serverius skenuojant QR kodus.</string>
-    <string name="appearance_settings">Išvaizda</string>
-    <string name="app_version_title">Programėlės versija</string>
-    <string name="app_version_name">Programėlės versija: v%s</string>
-    <string name="app_version_code">Programėlės darinys: %s</string>
-    <string name="accept_automatically">Automatiškai</string>
-    <string name="callstatus_calling">skambinama…</string>
-    <string name="callstatus_error">skambučio klaida</string>
-    <string name="call_already_ended">Skambutis jau baigtas!</string>
-    <string name="answer_call">Atsiliepti</string>
-    <string name="icon_descr_call_ended">Skambutis baigtas</string>
-    <string name="settings_section_title_calls">SKAMBUČIAI</string>
-    <string name="allow_your_contacts_irreversibly_delete">Leisti jūsų adresatams negrįžtamai ištrinti išsiųstas žinutes.</string>
-    <string name="back">Atgal</string>
-    <string name="settings_section_title_icon">PROGRAMĖLĖS PIKTOGRAMA</string>
-    <string name="incognito_random_profile_from_contact_description">Adresatui, iš kurio gavote šią nuorodą, bus išsiųstas atsitiktinis profilis</string>
-    <string name="chat_preferences_always">visada</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Leisti jūsų adresatams siųsti balso žinutes.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Leisti negrįžtamą žinučių ištrynimą tik tuo atveju, jei jūsų adresatas jums tai leidžia.</string>
-    <string name="allow_voice_messages_only_if">Leisti balso žinutes tik tuo atveju, jei jūsų adresatas jas leidžia.</string>
-    <string name="allow_verb">Leisti</string>
-    <string name="allow_voice_messages_question">Leisti balso žinutes\?</string>
-    <string name="bold">pusjuodis</string>
-    <string name="callstatus_ended">skambutis baigtas <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-    <string name="icon_descr_audio_call">garso skambutis</string>
-    <string name="settings_audio_video_calls">Garso ir vaizdo skambučiai</string>
-    <string name="integrity_msg_bad_hash">bloga žinutės maiša</string>
-    <string name="integrity_msg_bad_id">blogas žinutės ID</string>
-    <string name="incognito_random_profile_description">Jūsų adresatui bus išsiųstas atsitiktinis profilis</string>
-    <string name="allow_disappearing_messages_only_if">Leisti išnykstančias žinutes tik tuo atveju, jei jūsų adresatas jas leidžia.</string>
-    <string name="clear_chat_warning">Visos žinutės bus ištrintos – to neįmanoma bus atšaukti! Žinutės bus ištrintos TIK jums.</string>
-    <string name="allow_to_delete_messages">Leisti negrįžtamai ištrinti išsiųstas žinutes.</string>
-    <string name="allow_to_send_disappearing">Leisti siųsti išnykstančias žinutes.</string>
-    <string name="allow_to_send_voice">Leisti siųsti balso žinutes.</string>
-    <string name="allow_direct_messages">Leisti siųsti tiesiogines žinutes nariams.</string>
-    <string name="v4_6_audio_video_calls">Garso ir vaizdo skambučiai</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Leisti jūsų adresatams siųsti išnykstančias žinutes.</string>
-    <string name="auth_unavailable">Tapatybės nustatymas neprieinamas</string>
-    <string name="impossible_to_recover_passphrase"><b>Turėkite omenyje</b>: jeigu prarasite slaptafrazę, NEBEGALĖSITE jos atkurti ar pakeisti.</string>
-    <string name="cancel_verb">Atsisakyti</string>
-    <string name="callstate_connecting">jungiamasi…</string>
-    <string name="connect_via_link_verb">Prisijungti</string>
-    <string name="server_connected">prisijungta</string>
-    <string name="server_connecting">jungiamasi</string>
-    <string name="display_name_connection_established">ryšys užmegztas</string>
-    <string name="display_name_connecting">jungiasi…</string>
-    <string name="connection_error">Ryšio klaida</string>
-    <string name="smp_server_test_connect">Prisijungti</string>
-    <string name="notification_contact_connected">Prisijungė</string>
-    <string name="connect_button">Prisijungti</string>
-    <string name="group_member_status_connected">prisijungė</string>
-    <string name="contact_connection_pending">jungiasi…</string>
-    <string name="group_connection_pending">jungiasi…</string>
-    <string name="icon_descr_server_status_connected">Prisijungta</string>
-    <string name="confirm_verb">Patvirtinti</string>
-    <string name="configure_ICE_servers">Konfigūruoti ICE serverius</string>
-    <string name="callstate_connected">prisijungta</string>
-    <string name="rcv_group_event_member_connected">prisijungė</string>
-    <string name="info_row_connection">Ryšys</string>
-    <string name="confirm_database_upgrades">Patvirtinti duomenų bazių naujinimus</string>
-    <string name="group_member_status_connecting">jungiasi</string>
-    <string name="network_session_mode_entity">Ryšys</string>
-    <string name="database_passphrase_will_be_updated">Duomenų bazės šifravimo slaptafrazė bus atnaujinta.</string>
-    <string name="core_version">Branduolio versija: v%s</string>
-    <string name="delete_address__question">Ištrinti adresą\?</string>
-    <string name="save_preferences_question">Įrašyti nuostatas\?</string>
-    <string name="create_profile">Sukurti profilį</string>
-    <string name="callstatus_rejected">atmestas skambutis</string>
-    <string name="callstate_ended">užbaigtas</string>
-    <string name="onboarding_notifications_mode_title">Privatūs pranešimai</string>
-    <string name="ignore">Nepaisyti</string>
-    <string name="icon_descr_flip_camera">Apversti kamerą</string>
-    <string name="icon_descr_call_rejected">Atmestas skambutis</string>
-    <string name="privacy_and_security">Privatumas ir saugumas</string>
-    <string name="settings_section_title_device">ĮRENGINYS</string>
-    <string name="settings_section_title_help">PAGALBA</string>
-    <string name="encrypt_database">Šifruoti</string>
-    <string name="remove_passphrase">Šalinti</string>
-    <string name="button_delete_group">Ištrinti grupę</string>
-    <string name="v4_2_group_links">Grupių nuorodos</string>
-    <string name="server_error">klaida</string>
-    <string name="simplex_link_mode_description">Aprašas</string>
-    <string name="error_saving_smp_servers">Klaida įrašant SMP serverius</string>
-    <string name="error_setting_network_config">Klaida atnaujinant tinklo konfigūraciją</string>
-    <string name="failed_to_create_user_title">Klaida kuriant profilį!</string>
-    <string name="failed_to_parse_chat_title">Nepavyko įkelti pokalbio</string>
-    <string name="failed_to_parse_chats_title">Nepavyko įkelti pokalbių</string>
-    <string name="failed_to_active_user_title">Klaida perjungiant profilį!</string>
-    <string name="error_sending_message">Klaida siunčiant žinutę</string>
-    <string name="error_creating_address">Klaida kuriant adresą</string>
-    <string name="error_joining_group">Klaida prisijungiant prie grupės</string>
-    <string name="error_receiving_file">Klaida gaunant failą</string>
-    <string name="error_changing_address">Klaida keičiant adresą</string>
-    <string name="error_deleting_contact">Klaida ištrinant adresatą</string>
-    <string name="error_deleting_group">Klaida ištrinant grupę</string>
-    <string name="smp_server_test_disconnect">Atsijungti</string>
-    <string name="error_deleting_user">Klaida ištrinant naudotojo profilį</string>
-    <string name="notification_display_mode_hidden_desc">Slėpti adresatą ir žinutę</string>
-    <string name="copy_verb">Kopijuoti</string>
-    <string name="reply_verb">Atsakyti</string>
-    <string name="delete_message__question">Ištrinti žinutę\?</string>
-    <string name="icon_descr_file">Failas</string>
-    <string name="maximum_supported_file_size">Šiuo metu didžiausias palaikomas failo dydis yra <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="file_not_found">Failas nerastas</string>
-    <string name="file_saved">Failas įrašytas</string>
-    <string name="icon_descr_server_status_disconnected">Atsijungta</string>
-    <string name="icon_descr_server_status_error">Klaida</string>
-    <string name="ask_your_contact_to_enable_voice">Paprašykite adresato, kad įjungtų balso žinučių siuntimą.</string>
-    <string name="reset_verb">Atstatyti</string>
-    <string name="delete_group_menu_action">Ištrinti</string>
-    <string name="image_descr_qr_code">QR kodas</string>
-    <string name="icon_descr_help">pagalba</string>
-    <string name="icon_descr_email">El. paštas</string>
-    <string name="create_one_time_link">Sukurti vienkartinio pakvietimo nuorodą</string>
-    <string name="scan_code">Skenuoti kodą</string>
-    <string name="database_passphrase_and_export">Duomenų bazės slaptafrazė ir eksportavimas</string>
-    <string name="smp_servers_delete_server">Ištrinti serverį</string>
-    <string name="error_saving_ICE_servers">Klaida įrašant ICE serverius</string>
-    <string name="save_servers_button">Įrašyti</string>
-    <string name="files_and_media_section">Failai ir medija</string>
-    <string name="delete_files_and_media_all">Ištrinti visus failus</string>
-    <string name="delete_files_and_media_question">Ištrinti failus ir mediją\?</string>
-    <string name="delete_archive">Ištrinti archyvą</string>
-    <string name="delete_chat_archive_question">Ištrinti pokalbio archyvą\?</string>
-    <string name="snd_group_event_group_profile_updated">grupės profilis atnaujintas</string>
-    <string name="info_row_group">Grupė</string>
-    <string name="users_delete_question">Ištrinti pokalbio profilį\?</string>
-    <string name="network_options_revert">Sugrąžinti</string>
-    <string name="network_options_save">Įrašyti</string>
-    <string name="feature_enabled">įjungta</string>
-    <string name="delete_after">Ištrinti po</string>
-    <string name="error_updating_user_privacy">Klaida atnaujinant naudotojo privatumą</string>
-    <string name="simplex_service_notification_text">Gaunamos žinutės…</string>
-    <string name="hide_notification">Slėpti</string>
-    <string name="save_verb">Įrašyti</string>
-    <string name="delete_verb">Ištrinti</string>
-    <string name="edit_verb">Taisyti</string>
-    <string name="hide_verb">Slėpti</string>
-    <string name="reveal_verb">Atskleisti</string>
-    <string name="for_me_only">Ištrinti man</string>
-    <string name="for_everybody">Visiems</string>
-    <string name="icon_descr_edited">taisyta</string>
-    <string name="observer_cant_send_message_desc">Susisiekite su grupės administratoriumi.</string>
-    <string name="button_delete_contact">Ištrinti adresatą</string>
-    <string name="delete_contact_question">Ištrinti adresatą\?</string>
-    <string name="create_group">Sukurti slaptą grupę</string>
-    <string name="from_gallery_button">Iš galerijos</string>
-    <string name="toast_permission_denied">Leidimas atmestas!</string>
-    <string name="reject_contact_button">Atmesti</string>
-    <string name="incorrect_code">Neteisingas saugumo kodas!</string>
-    <string name="smp_servers_save">Įrašyti serverius</string>
-    <string name="smp_save_servers_question">Įrašyti serverius\?</string>
-    <string name="create_address">Sukurti adresą</string>
-    <string name="delete_address">Ištrinti adresą</string>
-    <string name="error_saving_user_password">Klaida įrašant naudotojo slaptažodį</string>
-    <string name="create_profile_button">Sukurti</string>
-    <string name="how_it_works">Kaip tai veikia</string>
-    <string name="incoming_audio_call">Gaunamas garso skambutis</string>
-    <string name="incoming_video_call">Gaunamas vaizdo skambutis</string>
-    <string name="reject">Atmesti</string>
-    <string name="no_call_on_lock_screen">Išjungti</string>
-    <string name="settings_experimental_features">Eksperimentinės ypatybės</string>
-    <string name="database_passphrase">Duomenų bazės slaptafrazė</string>
-    <string name="delete_database">Ištrinti duomenų bazę</string>
-    <string name="export_database">Eksportuoti duomenų bazę</string>
-    <string name="import_database">Importuoti duomenų bazę</string>
-    <string name="set_password_to_export_desc">Duomenų bazė yra šifruota naudojant atsitiktinę slaptafrazę. Prieš eksportuodami duomenų bazę, pakeiskite slaptafrazę.</string>
-    <string name="error_exporting_chat_database">Klaida eksportuojant pokalbio duomenų bazę</string>
-    <string name="error_stopping_chat">Klaida sustabdant pokalbį</string>
-    <string name="import_database_question">Importuoti pokalbio duomenų bazę\?</string>
-    <string name="current_passphrase">Dabartinė slaptafrazė…</string>
-    <string name="encrypted_with_random_passphrase">Duomenų bazė yra šifruota naudojant atsitiktinę slaptafrazę, kurią galite pakeisti.</string>
-    <string name="encrypt_database_question">Šifruoti duomenų bazę\?</string>
-    <string name="error_with_info">Klaida: %s</string>
-    <string name="button_edit_group_profile">Taisyti grupės profilį</string>
-    <string name="group_link">Grupės nuoroda</string>
-    <string name="button_create_group_link">Sukurti nuorodą</string>
-    <string name="info_row_database_id">Duomenų bazės ID</string>
-    <string name="error_changing_role">Klaida keičiant vaidmenį</string>
-    <string name="conn_level_desc_direct">tiesioginis</string>
-    <string name="conn_level_desc_indirect">netiesioginis (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
-    <string name="create_secret_group_title">Sukurti slaptą grupę</string>
-    <string name="error_saving_group_profile">Klaida įrašant grupės profilį</string>
-    <string name="dont_show_again">Daugiau neberodyti</string>
-    <string name="theme_dark">Tamsus</string>
-    <string name="reset_color">Atstatyti spalvas</string>
-    <string name="save_color">Įrašyti spalvą</string>
-    <string name="group_preferences">Grupės nuostatos</string>
-    <string name="full_deletion">Ištrinti visiems</string>
-    <string name="direct_messages">Tiesioginės žinutės</string>
-    <string name="v4_4_disappearing_messages">Išnykstančios žinutės</string>
-    <string name="timed_messages">Išnykstančios žinutės</string>
-    <string name="v4_4_french_interface">Sąsaja prancūzų kalba</string>
-    <string name="v4_3_improved_privacy_and_security">Patobulintas privatumas ir saugumas</string>
-    <string name="num_contacts_selected">Pažymėta adresatų: %d</string>
-    <string name="delete_chat_profile_question">Ištrinti pokalbio profilį\?</string>
-    <string name="error_importing_database">Klaida importuojant pokalbio duomenų bazę</string>
-    <string name="delete_messages_after">Ištrinti žinutes po</string>
-    <string name="database_will_be_encrypted">Duomenų bazė bus šifruota.</string>
-    <string name="alert_title_no_group">Grupė nerasta!</string>
-    <string name="error_deleting_link_for_group">Klaida ištrinant grupės nuorodą</string>
-    <string name="error_updating_link_for_group">Klaida atnaujinant grupės nuorodą</string>
-    <string name="database_upgrade">Duomenų bazės naujinimas</string>
-    <string name="incompatible_database_version">Nesuderinama duomenų bazės versija</string>
-    <string name="group_member_status_group_deleted">grupė ištrinta</string>
-    <string name="save_and_update_group_profile">Įrašyti ir atnaujinti grupės profilį</string>
-    <string name="delete_messages">Ištrinti žinutes</string>
-    <string name="error_changing_message_deletion">Klaida keičiant nustatymą</string>
-    <string name="error_encrypting_database">Klaida šifruojant duomenų bazę</string>
-    <string name="encrypted_database">Šifruota duomenų bazė</string>
-    <string name="restore_database_alert_confirm">Atkurti</string>
-    <string name="create_group_link">Sukurti grupės nuorodą</string>
-    <string name="delete_link">Ištrinti nuorodą</string>
-    <string name="delete_link_question">Ištrinti nuorodą\?</string>
-    <string name="error_creating_link_for_group">Klaida kuriant grupės nuorodą</string>
-    <string name="how_simplex_works">Kaip <xliff:g id="appName">SimpleX</xliff:g> veikia</string>
-    <string name="database_encrypted">Duomenų bazė šifruota!</string>
-    <string name="group_member_status_creator">kūrėjas</string>
-    <string name="delete_group_question">Ištrinti grupę\?</string>
-    <string name="user_hide">Slėpti</string>
-    <string name="error_saving_file">Klaida įrašant failą</string>
-    <string name="hide_dev_options">Slėpti:</string>
-    <string name="database_error">Duomenų bazės klaida</string>
-    <string name="file_with_path">Failas: %s</string>
-    <string name="profile_password">Profilio slaptažodis</string>
-    <string name="remove_member_confirmation">Šalinti</string>
-    <string name="v4_3_improved_server_configuration">Patobulinta serverio konfigūracija</string>
-    <string name="delete_chat_profile">Ištrinti pokalbio profilį</string>
-    <string name="delete_profile">Ištrinti profilį</string>
-    <string name="share_one_time_link">Sukurti vienkartinio pakvietimo nuorodą</string>
-    <string name="delete_contact_menu_action">Ištrinti</string>
-    <string name="save_and_notify_contact">Įrašyti ir pranešti adresatui</string>
-    <string name="enable_automatic_deletion_question">Įjungti automatinį žinučių ištrynimą\?</string>
-    <string name="error_deleting_database">Klaida ištrinant pokalbio duomenų bazę</string>
-    <string name="error_starting_chat">Klaida pradedant pokalbį</string>
-    <string name="hide_profile">Slėpti profilį</string>
-    <string name="import_database_confirmation">Importuoti</string>
-    <string name="save_and_notify_contacts">Įrašyti ir pranešti adresatams</string>
-    <string name="callstate_starting">pradedama…</string>
-    <string name="use_chat">Naudoti pokalbį</string>
-    <string name="icon_descr_speaker_off">Išjungti garsiakalbį</string>
-    <string name="icon_descr_speaker_on">Įjungti garsiakalbį</string>
-    <string name="alert_title_skipped_messages">Praleistos žinutės</string>
-    <string name="settings_section_title_settings">NUSTATYMAI</string>
-    <string name="theme_system">Sistemos</string>
-    <string name="unknown_message_format">nežinomas žinutės formatas</string>
-    <string name="simplex_link_contact">SimpleX adresato adresas</string>
-    <string name="simplex_link_group">SimpleX grupės nuoroda</string>
-    <string name="simplex_link_invitation">SimpleX vienkartinis pakvietimas</string>
-    <string name="simplex_link_mode">SimpleX nuorodos</string>
-    <string name="settings_notification_preview_mode_title">Rodyti peržiūrą</string>
-    <string name="auth_unlock">Atrakinti</string>
-    <string name="share_verb">Bendrinti</string>
-    <string name="tap_to_start_new_chat">Bakstelėkite, norėdami pradėti naują pokalbį</string>
-    <string name="share_file">Bendrinti failą…</string>
-    <string name="icon_descr_settings">Nustatymai</string>
-    <string name="show_QR_code">Rodyti QR kodą</string>
-    <string name="share_invitation_link">Bendrinti pakvietimo nuorodą</string>
-    <string name="smp_servers">SMP serveriai</string>
-    <string name="use_simplex_chat_servers__question">Naudoti <xliff:g id="appNameFull">SimpleX Chat</xliff:g> serverius\?</string>
-    <string name="network_disable_socks">Naudoti tiesioginį interneto ryšį\?</string>
-    <string name="update_network_settings_confirmation">Atnaujinti</string>
-    <string name="update_network_settings_question">Atnaujinti tinklo nustatymus\?</string>
-    <string name="ntf_channel_messages">SimpleX Chat žinutės</string>
-    <string name="ntf_channel_calls">SimpleX Chat skambučiai</string>
-    <string name="notification_preview_mode_message_desc">Rodyti adresatą ir žinutę</string>
-    <string name="notification_preview_mode_contact_desc">Rodyti tik adresatą</string>
-    <string name="auth_stop_chat">Stabdyti pokalbį</string>
-    <string name="share_message">Bendrinti žinutę…</string>
-    <string name="use_camera_button">Naudoti kamerą</string>
-    <string name="thank_you_for_installing_simplex">Dėkojame, kad įdiegėte <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
-    <string name="smp_servers_use_server">Naudoti serverį</string>
-    <string name="network_socks_toggle">Naudoti SOCKS įgaliotąjį serverį (prievadas 9050)</string>
-    <string name="network_enable_socks">Naudoti SOCKS įgaliotąjį serverį\?</string>
-    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
-    <string name="share_link">Bendrinti nuorodą</string>
-    <string name="tap_to_activate_profile">Bakstelėkite, norėdami aktyvuoti profilį.</string>
-    <string name="language_system">Sistemos</string>
-    <string name="v4_6_audio_video_calls_descr">Bluetooth palaikymas ir kiti patobulinimai.</string>
-    <string name="group_invitation_tap_to_join">Bakstelėkite, norėdami prisijungti</string>
-    <string name="show_call_on_lock_screen">Rodyti</string>
-    <string name="stop_chat_confirmation">Stabdyti</string>
-    <string name="upgrade_and_open_chat">Naujinti ir atverti pokalbį</string>
-    <string name="switch_verb">Perjungti</string>
-    <string name="icon_descr_received_msg_status_unread">neskaityta</string>
-    <string name="show_dev_options">Rodyti:</string>
-    <string name="stop_chat_question">Stabdyti pokalbį\?</string>
-    <string name="update_database">Atnaujinti</string>
-    <string name="unknown_error">Nežinoma klaida</string>
-    <string name="add_contact_or_create_group">Pradėti naują pokalbį</string>
-    <string name="callstate_waiting_for_answer">laukiama, kol bus atsiliepta…</string>
-    <string name="callstate_waiting_for_confirmation">laukiama patvirtinimo…</string>
-    <string name="icon_descr_video_off">Išjungti vaizdą</string>
-    <string name="icon_descr_video_on">Įjungti vaizdą</string>
-    <string name="your_privacy">Jūsų privatumas</string>
-    <string name="settings_section_title_you">JŪS</string>
-    <string name="wrong_passphrase_title">Neteisinga slaptafrazė!</string>
-    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="sender_you_pronoun">jūs</string>
-    <string name="description_via_group_link">per grupės nuorodą</string>
-    <string name="description_via_contact_address_link">per adresato adreso nuorodą</string>
-    <string name="description_via_one_time_link">per vienkartinę nuorodą</string>
-    <string name="simplex_link_connection">per <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
-    <string name="simplex_link_mode_browser">Per naršyklę</string>
-    <string name="waiting_for_file">Laukiama failo</string>
-    <string name="voice_message_with_duration">Balso žinutė (<xliff:g id="duration">%1$s</xliff:g>)</string>
-    <string name="voice_message_send_text">Balso žinutė…</string>
-    <string name="view_security_code">Rodyti saugumo kodą</string>
-    <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> adresas</string>
-    <string name="your_SMP_servers">Jūsų SMP serveriai</string>
-    <string name="your_ICE_servers">Jūsų ICE serveriai</string>
-    <string name="users_add">Pridėti profilį</string>
-    <string name="users_delete_all_chats_deleted">Visi pokalbiai ir žinutės bus ištrinti – to neįmanoma bus atšaukti!</string>
-    <string name="welcome">Sveiki!</string>
-    <string name="attach">Pridėti</string>
-    <string name="observer_cant_send_message_title">Jūs negalite siųsti žinučių!</string>
-    <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> logotipas</string>
-    <string name="your_settings">Jūsų nustatymai</string>
-    <string name="smp_servers_your_server">Jūsų serveris</string>
-    <string name="smp_servers_your_server_address">Jūsų serverio adresas</string>
-    <string name="smp_servers_add_to_another_device">Pridėti į kitą įrenginį</string>
-    <string name="using_simplex_chat_servers">Naudojami <xliff:g id="appNameFull">SimpleX Chat</xliff:g> serveriai.</string>
-    <string name="network_settings">Išplėstiniai tinklo nustatymai</string>
-    <string name="your_current_profile">Jūsų dabartinis profilis</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Jūsų profilis yra saugomas jūsų įrenginyje ir bendrinamas tik su jūsų adresatais.
-\n
-\n<xliff:g id="appName">SimpleX</xliff:g> serveriai negali matyti jūsų profilio.</string>
-    <string name="icon_descr_video_call">vaizdo skambutis</string>
-    <string name="your_calls">Jūsų skambučiai</string>
-    <string name="webrtc_ice_servers">WebRTC ICE serveriai</string>
-    <string name="your_ice_servers">Jūsų ICE serveriai</string>
-    <string name="snd_group_event_user_left">jūs išėjote</string>
-    <string name="group_member_role_admin">administratorius</string>
-    <string name="incognito_random_profile">Jūsų atsitiktinis profilis</string>
-    <string name="chat_preferences_you_allow">Jūs leidžiate</string>
-    <string name="your_preferences">Jūsų nuostatos</string>
-    <string name="v4_3_voice_messages">Balso žinutės</string>
-    <string name="voice_messages">Balso žinutės</string>
-    <string name="chat_preferences_yes">taip</string>
-    <string name="you_joined_this_group">Jūs prisijungėte prie šios grupės</string>
-    <string name="database_downgrade_warning">Įspėjimas: galite prarasti tam tikrus duomenis!</string>
-    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Jūs nustosite gauti žinutes iš šios grupės. Pokalbio istorija bus išsaugota.</string>
-    <string name="group_info_member_you">jūs: <xliff:g id="group_info_you">%1$s</xliff:g></string>
-    <string name="personal_welcome">Sveiki, <xliff:g>%1$s</xliff:g>!</string>
-    <string name="your_chats">Jūsų pokalbiai</string>
-    <string name="wrong_passphrase">Neteisinga duomenų bazės slaptafrazė</string>
-    <string name="icon_descr_video_snd_complete">Vaizdo įrašas išsiųstas</string>
-    <string name="voice_message">Balso žinutė</string>
-    <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> komanda</string>
-    <string name="whats_new">Kas naujo</string>
-</resources>

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>

apps/android/build.gradle

@@ -1,50 +0,0 @@
-buildscript {
-    Properties localProperties = new Properties()
-    if (rootProject.file('local.properties').canRead()) {
-        localProperties.load(rootProject.file("local.properties").newDataInputStream())
-    }
-
-    ext {
-        compose_version = localProperties['compose_version'] ?: '1.2.0-beta02'
-        kotlin_version = localProperties['kotlin_version'] ?: '1.6.21'
-        gradle_plugin_version = localProperties['gradle_plugin_version'] ?: '7.2.0'
-        abi_filter = localProperties['abi_filter'] ?: 'arm64-v8a'
-
-        // Name that will be shown for debug build. By default it is from strings
-        app_name = localProperties['app_name'] ?: "@string/app_name"
-        // Whether the app is debuggable or not. Specify `false` if you want good performance in debug builds
-        enable_debuggable = localProperties['debuggable'] ?: true
-        // Ending part of package name.
-        // Provide, for example, `application_id_suffix=.debug` in local.properties
-        // to allow debug & release versions to coexist
-        application_id_suffix = localProperties['application_id_suffix'] ?: ''
-
-        // Compression level for debug AND release apk. 0 = disable compression. Max is 9
-        compression_level = localProperties['compression_level'] ?: '0'
-
-        // NOTE: If you need a different version of something, provide it in `local.properties`
-        // like so: compose_version=123, or gradle_plugin_version=1.2.3, etc
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$gradle_plugin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.3.2"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id 'com.android.application' version "$gradle_plugin_version" apply false
-    id 'com.android.library' version "$gradle_plugin_version" apply false
-    id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
-    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

apps/android/settings.gradle

@@ -1,16 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-rootProject.name = "SimpleX"
-include ':app'

apps/ios/Shared/AppDelegate.swift

@@ -14,9 +14,28 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
+        if #available(iOS 17.0, *) { trackKeyboard() }
         return true
     }
 
+    @available(iOS 17.0, *)
+    private func trackKeyboard() {
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillShow(_ notification: Notification) {
+        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
+        }
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillHide(_ notification: Notification) {
+        ChatModel.shared.keyboardHeight = 0
+    }
+
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
@@ -42,7 +61,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
            m.notificationMode != .off {
             if let verification = ntfData["verification"] as? String,
                let nonce = ntfData["nonce"] as? String {
-                if let token = ChatModel.shared.deviceToken {
+                if let token = m.deviceToken {
                     logger.debug("AppDelegate: didReceiveRemoteNotification: verification, confirming \(verification)")
                     Task {
                         do {
@@ -62,7 +81,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 }
             } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if appStateGroupDefault.get().inactive {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)
@@ -76,7 +95,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     }
 
     func applicationWillTerminate(_ application: UIApplication) {
-        logger.debug("AppDelegate: applicationWillTerminate")
+        logger.debug("DEBUGGING: AppDelegate: applicationWillTerminate")
         ChatModel.shared.filesToDelete.forEach {
             removeFile($0)
         }

apps/ios/Shared/ContentView.swift

@@ -18,6 +18,7 @@ struct ContentView: View {
     @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
@@ -27,6 +28,17 @@ struct ContentView: View {
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
     @State private var showSetPasscode = false
+    @State private var chatListActionSheet: ChatListActionSheet? = nil
+
+    private enum ChatListActionSheet: Identifiable {
+        case connectViaUrl(action: ConnReqType, link: String)
+
+        var id: String {
+            switch self {
+            case .connectViaUrl: return "connectViaUrl \(link)"
+            }
+        }
+    }
 
     var body: some View {
         ZStack {
@@ -69,6 +81,8 @@ struct ContentView: View {
     @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 {
@@ -77,6 +91,11 @@ struct ContentView: View {
             if case .onboardingComplete = step,
                chatModel.currentUser != nil {
                 mainView()
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
+                    }
+                }
             } else {
                 OnboardingView(onboarding: step)
             }
@@ -104,6 +123,14 @@ struct ContentView: 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(showSettings: $showSettings).privacySensitive(protectScreen)
@@ -121,10 +148,15 @@ struct ContentView: View {
                     }
                 }
                 prefShowLANotice = true
+                connectViaUrl()
             }
+            .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
             .sheet(isPresented: $showWhatsNew) {
                 WhatsNewView()
             }
+            if chatModel.setDeliveryReceipts {
+                SetDeliveryReceiptsView()
+            }
             IncomingCallView()
         }
         .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
@@ -165,10 +197,13 @@ struct ContentView: View {
     }
 
     private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
         if !prefPerformLA {
             userAuthorized = true
         } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
             dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
                 chatModel.chatId = nil
                 justAuthenticate()
             }
@@ -178,8 +213,8 @@ struct ContentView: View {
     private func justAuthenticate() {
         userAuthorized = false
         let laMode = privacyLocalAuthModeDefault.get()
-        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason")) { laResult in
-            logger.debug("authenticate callback: \(String(describing: laResult))")
+        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
             switch (laResult) {
             case .success:
                 userAuthorized = true
@@ -248,36 +283,38 @@ struct ContentView: View {
             secondaryButton: .cancel()
         )
     }
-}
 
-func connectViaUrl() {
-    let m = ChatModel.shared
-    if let url = m.appOpenUrl {
-        m.appOpenUrl = nil
-        AlertManager.shared.showAlert(connectViaUrlAlert(url))
+    func connectViaUrl() {
+        let m = ChatModel.shared
+        if let url = m.appOpenUrl {
+            m.appOpenUrl = nil
+            var path = url.path
+            logger.debug("ContentView.connectViaUrl path: \(path)")
+            if (path == "/contact" || path == "/invitation") {
+                path.removeFirst()
+                let action: ConnReqType = path == "contact" ? .contact : .invitation
+                let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
+                chatListActionSheet = .connectViaUrl(action: action, link: link)
+            } else {
+                AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
+            }
+        }
     }
-}
 
-func connectViaUrlAlert(_ url: URL) -> Alert {
-    var path = url.path
-    logger.debug("ChatListView.connectViaUrlAlert path: \(path)")
-    if (path == "/contact" || path == "/invitation") {
-        path.removeFirst()
-        let action: ConnReqType = path == "contact" ? .contact : .invitation
-        let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
         let title: LocalizedStringKey
-        if case .contact = action { title = "Connect via contact link?" }
-        else { title = "Connect via one-time link?" }
-        return Alert(
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
             title: Text(title),
-            message: Text("Your profile will be sent to the contact that you received this link from"),
-            primaryButton: .default(Text("Connect")) {
-                connectViaLink(link)
-            },
-            secondaryButton: .cancel()
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
         )
-    } else {
-        return Alert(title: Text("Error: URL is invalid"))
     }
 }
 

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/Model/AudioRecPlay.swift

@@ -36,8 +36,9 @@ 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
             ]
             let url = getAppFilePath(fileName)
@@ -102,11 +103,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         self.onFinishPlayback = onFinishPlayback
     }
 
-    func start(fileName: String) {
+    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
@@ -125,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/BGManager.swift

@@ -34,6 +34,10 @@ class BGManager {
     }
 
     func schedule() {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.schedule: disabled")
+            return
+        }
         logger.debug("BGManager.schedule")
         let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
         request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
@@ -45,6 +49,10 @@ class BGManager {
     }
 
     private func handleRefresh(_ task: BGAppRefreshTask) {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.handleRefresh: disabled")
+            return
+        }
         logger.debug("BGManager.handleRefresh")
         schedule()
         if appStateGroupDefault.get().inactive {

apps/ios/Shared/Model/ChatModel.swift

@@ -13,6 +13,7 @@ import SimpleXChat
 
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
+    @Published var setDeliveryReceipts = false
     @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
     @Published var currentUser: User?
     @Published var users: [UserInfo] = []
@@ -41,10 +42,9 @@ final class ChatModel: ObservableObject {
     @Published var tokenRegistered = false
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
-    @Published var notificationPreview: NotificationPreviewMode? = ntfPreviewModeGroupDefault.get()
-    @Published var incognito: Bool = incognitoGroupDefault.get()
+    @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
     // pending notification actions
-    @Published var ntfContactRequest: ChatId?
+    @Published var ntfContactRequest: NTFContactRequest?
     @Published var ntfCallInvitationAction: (ChatId, NtfCallAction)?
     // current WebRTC call
     @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
@@ -57,6 +57,8 @@ final class ChatModel: ObservableObject {
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
+    // tracks keyboard height via subscription in AppDelegate
+    @Published var keyboardHeight: CGFloat = 0
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -66,6 +68,14 @@ final class ChatModel: ObservableObject {
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
+    }
+
+    var ntfEnablePeriodic: Bool {
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+    }
+
     func getUser(_ userId: Int64) -> User? {
         currentUser?.userId == userId
         ? currentUser
@@ -133,6 +143,14 @@ final class ChatModel: ObservableObject {
         updateChat(.direct(contact: contact), addMissing: contact.directOrUsed)
     }
 
+    func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
+        var updatedConn = contact.activeConn
+        updatedConn.connectionStats = connectionStats
+        var updatedContact = contact
+        updatedContact.activeConn = updatedConn
+        updateContact(updatedContact)
+    }
+
     func updateGroup(_ groupInfo: GroupInfo) {
         updateChat(.group(groupInfo: groupInfo))
     }
@@ -238,16 +256,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 {
@@ -264,7 +275,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)
@@ -277,7 +311,7 @@ final class ChatModel: ObservableObject {
         }
         // remove from current chat
         if chatId == cInfo.id {
-            if let i = reversedChatItems.firstIndex(where: { $0.id == cItem.id }) {
+            if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
                     self.reversedChatItems.remove(at: i)
                 }
@@ -357,7 +391,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
@@ -405,7 +439,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)
         }
     }
@@ -450,7 +484,7 @@ final class ChatModel: ObservableObject {
     }
 
     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
@@ -505,6 +539,16 @@ final class ChatModel: ObservableObject {
         }
     }
 
+    func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
+        if let conn = member.activeConn {
+            var updatedConn = conn
+            updatedConn.connectionStats = connectionStats
+            var updatedMember = member
+            updatedMember.activeConn = updatedConn
+            _ = upsertGroupMember(groupInfo, updatedMember)
+        }
+    }
+
     func unreadChatItemCounts(itemsInView: Set<String>) -> UnreadChatItemCounts {
         var i = 0
         var totalBelow = 0
@@ -544,6 +588,11 @@ final class ChatModel: ObservableObject {
     }
 }
 
+struct NTFContactRequest {
+    var incognito: Bool
+    var chatId: String
+}
+
 struct UnreadChatItemCounts {
     var totalBelow: Int
     var unreadBelow: Int
@@ -567,6 +616,14 @@ final class Chat: ObservableObject, Identifiable {
         self.chatStats = chatStats
     }
 
+    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

apps/ios/Shared/Model/NtfManager.swift

@@ -12,6 +12,7 @@ import UIKit
 import SimpleXChat
 
 let ntfActionAcceptContact = "NTF_ACT_ACCEPT_CONTACT"
+let ntfActionAcceptContactIncognito = "NTF_ACT_ACCEPT_CONTACT_INCOGNITO"
 let ntfActionAcceptCall = "NTF_ACT_ACCEPT_CALL"
 let ntfActionRejectCall = "NTF_ACT_REJECT_CALL"
 
@@ -41,12 +42,13 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
            userId != chatModel.currentUser?.userId {
             changeActiveUser(userId, viewPwd: nil)
         }
-        if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
-            let chatId = content.userInfo["chatId"] as? String {
+        if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
+           let chatId = content.userInfo["chatId"] as? String {
+            let incognito = action == ntfActionAcceptContactIncognito
             if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                Task { await acceptContactRequest(contactRequest) }
+                Task { await acceptContactRequest(incognito: incognito, contactRequest: contactRequest) }
             } else {
-                chatModel.ntfContactRequest = chatId
+                chatModel.ntfContactRequest = NTFContactRequest(incognito: incognito, chatId: chatId)
             }
         } else if let (chatId, ntfAction) = ntfCallAction(content, action) {
             if let invitation = chatModel.callInvitations.removeValue(forKey: chatId) {
@@ -107,8 +109,8 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                     // in another chat
                     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]
@@ -134,11 +136,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         UNUserNotificationCenter.current().setNotificationCategories([
             UNNotificationCategory(
                 identifier: ntfCategoryContactRequest,
-                actions: [UNNotificationAction(
-                    identifier: ntfActionAcceptContact,
-                    title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
-                    options: .foreground
-                )],
+                actions: [
+                    UNNotificationAction(
+                        identifier: ntfActionAcceptContact,
+                        title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
+                        options: .foreground
+                    ), UNNotificationAction(
+                        identifier: ntfActionAcceptContactIncognito,
+                        title: NSLocalizedString("Accept incognito", comment: "accept contact request via notification"),
+                        options: .foreground
+                    )
+                ],
                 intentIdentifiers: [],
                 hiddenPreviewsBodyPlaceholder: NSLocalizedString("New contact request", comment: "notification")
             ),
@@ -247,8 +255,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/SimpleXAPI.swift

@@ -86,6 +86,7 @@ private func withBGTask<T>(bgDelay: Double? = nil, f: @escaping () -> T) -> T {
 
 func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil) -> ChatResponse {
     logger.debug("chatSendCmd \(cmd.cmdType)")
+    let start = Date.now
     let resp = bgTask
                 ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd) }
                 : sendSimpleXCmd(cmd)
@@ -94,7 +95,7 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
         logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
     }
     DispatchQueue.main.async {
-        ChatModel.shared.addTerminalItem(.cmd(.now, cmd.obfuscated))
+        ChatModel.shared.addTerminalItem(.cmd(start, cmd.obfuscated))
         ChatModel.shared.addTerminalItem(.resp(.now, resp))
     }
     return resp
@@ -125,8 +126,8 @@ func apiGetActiveUser() throws -> User? {
     }
 }
 
-func apiCreateActiveUser(_ p: Profile) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p))
+func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false) throws -> User {
+    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp))
     if case let .activeUser(user) = r { return user }
     throw r
 }
@@ -158,6 +159,24 @@ func apiSetActiveUserAsync(_ userId: Int64, viewPwd: String?) async throws -> Us
     throw r
 }
 
+func apiSetAllContactReceipts(enable: Bool) async throws {
+    let r = await chatSendCmd(.setAllContactReceipts(enable: enable))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiSetUserContactReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
+    let r = await chatSendCmd(.apiSetUserContactReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiSetUserGroupReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
+    let r = await chatSendCmd(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
     try await setUserPrivacy_(.apiHideUser(userId: userId, viewPwd: viewPwd))
 }
@@ -233,18 +252,14 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
-func apiSetIncognito(incognito: Bool) throws {
-    let r = chatSendCmdSync(.setIncognito(incognito: incognito))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
     try await sendCommandOkResp(.apiExportArchive(config: config))
 }
 
-func apiImportArchive(config: ArchiveConfig) async throws {
-    try await sendCommandOkResp(.apiImportArchive(config: config))
+func apiImportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
+    let r = await chatSendCmd(.apiImportArchive(config: config))
+    if case let .archiveImported(archiveErrors) = r { return archiveErrors }
+    throw r
 }
 
 func apiDeleteStorage() async throws {
@@ -295,9 +310,15 @@ func loadChat(chat: Chat, search: String = "") {
     }
 }
 
-func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false) async -> ChatItem? {
+func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -> ChatItemInfo {
+    let r = await chatSendCmd(.apiGetChatItemInfo(type: type, id: id, itemId: itemId))
+    if case let .chatItemInfo(_, _, chatItemInfo) = r { return chatItemInfo }
+    throw r
+}
+
+func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
     let chatModel = ChatModel.shared
-    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live)
+    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
     let r: ChatResponse
     if type == .direct {
         var cItem: ChatItem!
@@ -308,7 +329,9 @@ func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int6
             chatModel.messageDelivery[cItem.id] = endTask
             return cItem
         }
-        if !networkErrorAlert(r) {
+        if let networkErrorAlert = networkErrorAlert(r) {
+            AlertManager.shared.showAlert(networkErrorAlert)
+        } else {
             sendMessageErrorAlert(r)
         }
         endTask()
@@ -337,6 +360,12 @@ func apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent
     throw r
 }
 
+func apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction) async throws -> ChatItem {
+    let r = await chatSendCmd(.apiChatItemReaction(type: type, id: id, itemId: itemId, add: add, reaction: reaction), bgDelay: msgDelay)
+    if case let .chatItemReaction(_, _, reaction) = r { return reaction.chatReaction.chatItem }
+    throw r
+}
+
 func apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode) async throws -> (ChatItem, ChatItem?) {
     let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemId: itemId, mode: mode), bgDelay: msgDelay)
     if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
@@ -447,6 +476,10 @@ func setNetworkConfig(_ cfg: NetCfg) throws {
     throw r
 }
 
+func reconnectAllServers() async throws {
+    try await sendCommandOkResp(.reconnectAllServers)
+}
+
 func apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings) async throws {
     try await sendCommandOkResp(.apiSetChatSettings(type: type, id: id, chatSettings: chatSettings))
 }
@@ -457,18 +490,46 @@ func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profi
     throw r
 }
 
-func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (ConnectionStats?) {
+func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
     let r = chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
-    if case let .groupMemberInfo(_, _, _, connStats_) = r { return (connStats_) }
+    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
     throw r
 }
 
-func apiSwitchContact(contactId: Int64) async throws {
-    try await sendCommandOkResp(.apiSwitchContact(contactId: contactId))
+func apiSwitchContact(contactId: Int64) throws -> ConnectionStats {
+    let r = chatSendCmdSync(.apiSwitchContact(contactId: contactId))
+    if case let .contactSwitchStarted(_, _, connectionStats) = r { return connectionStats }
+    throw r
 }
 
-func apiSwitchGroupMember(_ groupId: Int64, _ groupMemberId: Int64) async throws {
-    try await sendCommandOkResp(.apiSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
+func apiSwitchGroupMember(_ groupId: Int64, _ groupMemberId: Int64) throws -> ConnectionStats {
+    let r = chatSendCmdSync(.apiSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
+    if case let .groupMemberSwitchStarted(_, _, _, connectionStats) = r { return connectionStats }
+    throw r
+}
+
+func apiAbortSwitchContact(_ contactId: Int64) throws -> ConnectionStats {
+    let r = chatSendCmdSync(.apiAbortSwitchContact(contactId: contactId))
+    if case let .contactSwitchAborted(_, _, connectionStats) = r { return connectionStats }
+    throw r
+}
+
+func apiAbortSwitchGroupMember(_ groupId: Int64, _ groupMemberId: Int64) throws -> ConnectionStats {
+    let r = chatSendCmdSync(.apiAbortSwitchGroupMember(groupId: groupId, groupMemberId: groupMemberId))
+    if case let .groupMemberSwitchAborted(_, _, _, connectionStats) = r { return connectionStats }
+    throw r
+}
+
+func apiSyncContactRatchet(_ contactId: Int64, _ force: Bool) throws -> ConnectionStats {
+    let r = chatSendCmdSync(.apiSyncContactRatchet(contactId: contactId, force: force))
+    if case let .contactRatchetSyncStarted(_, _, connectionStats) = r { return connectionStats }
+    throw r
+}
+
+func apiSyncGroupMemberRatchet(_ groupId: Int64, _ groupMemberId: Int64, _ force: Bool) throws -> (GroupMember, ConnectionStats) {
+    let r = chatSendCmdSync(.apiSyncGroupMemberRatchet(groupId: groupId, groupMemberId: groupMemberId, force: force))
+    if case let .groupMemberRatchetSyncStarted(_, _, member, connectionStats) = r { return (member, connectionStats) }
+    throw r
 }
 
 func apiGetContactCode(_ contactId: Int64) async throws -> (Contact, String) {
@@ -497,66 +558,83 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
     return nil
 }
 
-func apiAddContact() async -> String? {
+func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiAddContact: no current user")
         return nil
     }
-    let r = await chatSendCmd(.apiAddContact(userId: userId), bgTask: false)
-    if case let .invitation(_, connReqInvitation) = r { return connReqInvitation }
-    connectionErrorAlert(r)
+    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
+    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
+    AlertManager.shared.showAlert(connectionErrorAlert(r))
     return nil
 }
 
-func apiConnect(connReq: String) async -> ConnReqType? {
+func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
+    let r = await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
+    if case let .connectionIncognitoUpdated(_, toConnection) = r { return toConnection }
+    throw r
+}
+
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+    if let alert = alert {
+        AlertManager.shared.showAlert(alert)
+        return nil
+    } else {
+        return connReqType
+    }
+}
+
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
-        return nil
+        return (nil, nil)
     }
-    let r = await chatSendCmd(.apiConnect(userId: userId, connReq: connReq))
-    let am = AlertManager.shared
+    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
     switch r {
-    case .sentConfirmation: return .invitation
-    case .sentInvitation: return .contact
+    case .sentConfirmation: return (.invitation, nil)
+    case .sentInvitation: return (.contact, nil)
     case let .contactAlreadyExists(_, contact):
         let m = ChatModel.shared
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
-        am.showAlertMsg(
+        let alert = mkAlert(
             title: "Contact already exists",
             message: "You are already connected to \(contact.displayName)."
         )
-        return nil
+        return (nil, alert)
     case .chatCmdError(_, .error(.invalidConnReq)):
-        am.showAlertMsg(
+        let alert = mkAlert(
             title: "Invalid connection link",
             message: "Please check that you used the correct link or ask your contact to send you another one."
         )
-        return nil
+        return (nil, alert)
     case .chatCmdError(_, .errorAgent(.SMP(.AUTH))):
-        am.showAlertMsg(
+        let alert = mkAlert(
             title: "Connection error (AUTH)",
             message: "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection."
         )
-        return nil
+        return (nil, alert)
     case let .chatCmdError(_, .errorAgent(.INTERNAL(internalErr))):
         if internalErr == "SEUniqueID" {
-            am.showAlertMsg(
+            let alert = mkAlert(
                 title: "Already connected?",
                 message: "It seems like you are already connected via this link. If it is not the case, there was an error (\(responseError(r)))."
             )
-            return nil
+            return (nil, alert)
         }
     default: ()
     }
-    connectionErrorAlert(r)
-    return nil
+    let alert = connectionErrorAlert(r)
+    return (nil, alert)
 }
 
-private func connectionErrorAlert(_ r: ChatResponse) {
-    if !networkErrorAlert(r) {
-        AlertManager.shared.showAlertMsg(
+private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
+    if let networkErrorAlert = networkErrorAlert(r) {
+        return networkErrorAlert
+    } else {
+        return mkAlert(
             title: "Connection error",
             message: "Error: \(String(describing: r))"
         )
@@ -618,6 +696,16 @@ func apiUpdateProfile(profile: Profile) async throws -> Profile? {
     }
 }
 
+func apiSetProfileAddress(on: Bool) async throws -> User? {
+    let userId = try currentUserId("apiSetProfileAddress")
+    let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
+    switch r {
+    case .userProfileNoChange: return nil
+    case let .userProfileUpdated(user, _, _): return user
+    default: throw r
+    }
+}
+
 func apiSetContactPrefs(contactId: Int64, preferences: Preferences) async throws -> Contact? {
     let r = await chatSendCmd(.apiSetContactPrefs(contactId: contactId, preferences: preferences))
     if case let .contactPrefsUpdated(_, _, toContact) = r { return toContact }
@@ -643,10 +731,10 @@ func apiCreateUserAddress() async throws -> String {
     throw r
 }
 
-func apiDeleteUserAddress() async throws {
+func apiDeleteUserAddress() async throws -> User? {
     let userId = try currentUserId("apiDeleteUserAddress")
     let r = await chatSendCmd(.apiDeleteMyAddress(userId: userId))
-    if case .userContactLinkDeleted = r { return }
+    if case let .userContactLinkDeleted(user) = r { return user }
     throw r
 }
 
@@ -678,8 +766,8 @@ func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContac
     }
 }
 
-func apiAcceptContactRequest(contactReqId: Int64) async -> Contact? {
-    let r = await chatSendCmd(.apiAcceptContact(contactReqId: contactReqId))
+func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Contact? {
+    let r = await chatSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
     let am = AlertManager.shared
 
     if case let .acceptingContactRequest(_, contact) = r { return contact }
@@ -688,7 +776,9 @@ func apiAcceptContactRequest(contactReqId: Int64) async -> Contact? {
             title: "Connection error (AUTH)",
             message: "Sender may have deleted the connection request."
         )
-    } else if !networkErrorAlert(r) {
+    } else if let networkErrorAlert = networkErrorAlert(r) {
+        am.showAlert(networkErrorAlert)
+    } else {
         logger.error("apiAcceptContactRequest error: \(String(describing: r))")
         am.showAlertMsg(
             title: "Error accepting contact request",
@@ -712,27 +802,35 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func receiveFile(user: User, fileId: Int64) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId) {
+func receiveFile(user: User, fileId: Int64, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId, auto: auto) {
         DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
     }
 }
 
-func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {
+func apiReceiveFile(fileId: Int64, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
     let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
     let am = AlertManager.shared
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     if case .rcvFileAcceptedSndCancelled = r {
-        am.showAlertMsg(
-            title: "Cannot receive file",
-            message: "Sender cancelled file transfer."
-        )
-    } else if !networkErrorAlert(r) {
-        logger.error("apiReceiveFile error: \(String(describing: r))")
-        switch r {
-        case .chatCmdError(_, .error(.fileAlreadyReceiving)):
+        logger.debug("apiReceiveFile error: sender cancelled file transfer")
+        if !auto {
+            am.showAlertMsg(
+                title: "Cannot receive file",
+                message: "Sender cancelled file transfer."
+            )
+        }
+    } else if let networkErrorAlert = networkErrorAlert(r) {
+        logger.error("apiReceiveFile network error: \(String(describing: r))")
+        am.showAlert(networkErrorAlert)
+    } else {
+        switch chatError(r) {
+        case .fileCancelled:
+            logger.debug("apiReceiveFile ignoring fileCancelled error")
+        case .fileAlreadyReceiving:
             logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
         default:
+            logger.error("apiReceiveFile error: \(String(describing: r))")
             am.showAlertMsg(
                 title: "Error receiving file",
                 message: "Error: \(String(describing: r))"
@@ -760,28 +858,25 @@ func apiCancelFile(fileId: Int64) async -> AChatItem? {
     }
 }
 
-func networkErrorAlert(_ r: ChatResponse) -> Bool {
-    let am = AlertManager.shared
+func networkErrorAlert(_ r: ChatResponse) -> Alert? {
     switch r {
     case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
-        am.showAlertMsg(
+        return mkAlert(
             title: "Connection timeout",
             message: "Please check your network connection with \(serverHostname(addr)) and try again."
         )
-        return true
     case let .chatCmdError(_, .errorAgent(.BROKER(addr, .NETWORK))):
-        am.showAlertMsg(
+        return mkAlert(
             title: "Connection error",
             message: "Please check your network connection with \(serverHostname(addr)) and try again."
         )
-        return true
     default:
-        return false
+        return nil
     }
 }
 
-func acceptContactRequest(_ contactRequest: UserContactRequest) async {
-    if let contact = await apiAcceptContactRequest(contactReqId: contactRequest.apiId) {
+func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
+    if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
         let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
         DispatchQueue.main.async { ChatModel.shared.replaceChat(contactRequest.id, chat) }
     }
@@ -845,7 +940,9 @@ func markChatRead(_ chat: Chat, aboveItem: ChatItem? = nil) async {
             let itemRange = (minItemId, aboveItem?.id ?? chat.chatItems.last?.id ?? minItemId)
             let cInfo = chat.chatInfo
             try await apiChatRead(type: cInfo.chatType, id: cInfo.apiId, itemRange: itemRange)
-            await MainActor.run { ChatModel.shared.markChatItemsRead(cInfo, aboveItem: aboveItem) }
+            await MainActor.run {
+                withAnimation { ChatModel.shared.markChatItemsRead(cInfo, aboveItem: aboveItem) }
+            }
         }
         if chat.chatStats.unreadChat {
             await markChatUnread(chat, unreadChat: false)
@@ -859,7 +956,9 @@ func markChatUnread(_ chat: Chat, unreadChat: Bool = true) async {
     do {
         let cInfo = chat.chatInfo
         try await apiChatUnread(type: cInfo.chatType, id: cInfo.apiId, unreadChat: unreadChat)
-        await MainActor.run { ChatModel.shared.markChatUnread(cInfo, unreadChat: unreadChat) }
+        await MainActor.run {
+            withAnimation { ChatModel.shared.markChatUnread(cInfo, unreadChat: unreadChat) }
+        }
     } catch {
         logger.error("markChatUnread apiChatUnread error: \(responseError(error))")
     }
@@ -943,12 +1042,6 @@ func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
     return []
 }
 
-func apiListMembersSync(_ groupId: Int64) -> [GroupMember] {
-    let r = chatSendCmdSync(.apiListMembers(groupId: groupId))
-    if case let .groupMembers(_, group) = r { return group.members }
-    return []
-}
-
 func filterMembersToAdd(_ ms: [GroupMember]) -> [Contact] {
     let memberContactIds = ms.compactMap{ m in m.memberCurrent ? m.memberContactId : nil }
     return ChatModel.shared.chats
@@ -1017,10 +1110,11 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
     try setXFTPConfig(getXFTPCfg())
-    try apiSetIncognito(incognito: incognitoGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
+        onboardingStageDefault.set(.step1_SimpleXInfo)
+        privacyDeliveryReceiptsSet.set(true)
         m.onboardingStage = .step1_SimpleXInfo
     } else if start {
         try startChat(refreshInvitations: refreshInvitations)
@@ -1046,9 +1140,13 @@ func startChat(refreshInvitations: Bool = true) throws {
             registerToken(token: token)
         }
         withAnimation {
-            m.onboardingStage = m.onboardingStage == .step2_CreateProfile && m.users.count == 1
-                                ? .step3_SetNotificationsMode
-                                : .onboardingComplete
+            let savedOnboardingStage = onboardingStageDefault.get()
+            m.onboardingStage = [.step1_SimpleXInfo, .step2_CreateProfile].contains(savedOnboardingStage) && m.users.count == 1
+                                ? .step3_CreateSimpleXAddress
+                                : savedOnboardingStage
+            if m.onboardingStage == .onboardingComplete && !privacyDeliveryReceiptsSet.get() {
+                m.setDeliveryReceipts = true
+            }
         }
     }
     ChatReceiver.shared.start()
@@ -1228,15 +1326,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
             } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                 m.increaseUnreadCounter(user: user)
             }
-            if let file = cItem.file,
-               let mc = cItem.content.msgContent,
-               file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV {
-                let acceptImages = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
-                if (mc.isImage && acceptImages)
-                    || (mc.isVoice && ((file.fileSize > MAX_VOICE_MESSAGE_SIZE_INLINE_SEND && acceptImages) || cInfo.chatType == .group)) {
-                    Task {
-                        await receiveFile(user: user, fileId: file.fileId) // TODO check inlineFileMode != IFMSent
-                    }
+            if let file = cItem.autoReceiveFile() {
+                Task {
+                    await receiveFile(user: user, fileId: file.fileId, auto: true)
                 }
             }
             if cItem.showNotification {
@@ -1245,8 +1337,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
         case let .chatItemStatusUpdated(user, aChatItem):
             let cInfo = aChatItem.chatInfo
             let cItem = aChatItem.chatItem
-            if !cItem.isDeletedContent && (!active(user) || m.upsertChatItem(cInfo, cItem)) {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+            if !cItem.isDeletedContent {
+                let added = active(user) ? m.upsertChatItem(cInfo, cItem) : true
+                if added && cItem.showNotification {
+                    NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+                }
             }
             if let endTask = m.messageDelivery[cItem.id] {
                 switch cItem.meta.itemStatus {
@@ -1258,6 +1353,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
             }
         case let .chatItemUpdated(user, aChatItem):
             chatItemSimpleUpdate(user, aChatItem)
+        case let .chatItemReaction(user, _, r):
+            if active(user) {
+                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
+            }
         case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
             if !active(user) {
                 if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
@@ -1312,10 +1411,13 @@ func processReceivedMsg(_ res: ChatResponse) async {
             if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
-        case let .connectedToGroupMember(user, groupInfo, member):
+        case let .connectedToGroupMember(user, groupInfo, member, memberContact):
             if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
+            if let contact = memberContact {
+                m.setContactNetworkStatus(contact, .connected)
+            }
         case let .groupUpdated(user, toGroup):
             if active(user) {
                 m.updateGroup(toGroup)
@@ -1324,6 +1426,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
             if active(user) {
                 m.updateGroup(groupInfo)
             }
+        case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
+            chatItemSimpleUpdate(user, aChatItem)
         case let .rcvFileStart(user, aChatItem):
             chatItemSimpleUpdate(user, aChatItem)
         case let .rcvFileComplete(user, aChatItem):
@@ -1391,6 +1495,14 @@ func processReceivedMsg(_ res: ChatResponse) async {
             }
         case .chatSuspended:
             chatSuspended()
+        case let .contactSwitch(_, contact, switchProgress):
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+        case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+        case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+        case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
         default:
             logger.debug("unsupported event: \(res.responseType)")
         }

apps/ios/Shared/Model/SuspendChat.swift

@@ -76,9 +76,11 @@ private func _chatSuspended() {
 }
 
 func activateChat(appState: AppState = .active) {
+    logger.debug("DEBUGGING: activateChat")
     suspendLockQueue.sync {
         appStateGroupDefault.set(appState)
         if ChatModel.ok { apiActivateChat() }
+        logger.debug("DEBUGGING: activateChat: after apiActivateChat")
     }
 }
 
@@ -95,10 +97,14 @@ func initChatAndMigrate(refreshInvitations: Bool = true) {
 }
 
 func startChatAndActivate() {
+    logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()
+        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
     }
     if .active != appStateGroupDefault.get()  {
+        logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
         activateChat()
+        logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
     }
 }

apps/ios/Shared/SimpleXApp.swift

@@ -23,6 +23,7 @@ struct SimpleXApp: App {
     @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)
@@ -36,14 +37,23 @@ struct SimpleXApp: App {
 
     var body: some Scene {
         return WindowGroup {
-            ContentView(doAuthenticate: $doAuthenticate, userAuthorized: $userAuthorized, canConnectCall: $canConnectCall, lastSuccessfulUnlock: $lastSuccessfulUnlock)
+            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() {
-                    initChatAndMigrate()
+                    showInitializationView = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                        initChatAndMigrate()
+                    }
                 }
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
@@ -129,10 +139,10 @@ struct SimpleXApp: App {
                let chat = chatModel.getChat(id) {
                 loadChat(chat: chat)
             }
-            if let chatId = chatModel.ntfContactRequest {
+            if let ncr = chatModel.ntfContactRequest {
                 chatModel.ntfContactRequest = nil
-                if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                    Task { await acceptContactRequest(contactRequest) }
+                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
+                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                 }
             }
         } catch let error {

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

@@ -13,6 +13,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         RTCInitializeSSL()
         let videoEncoderFactory = RTCDefaultVideoEncoderFactory()
         let videoDecoderFactory = RTCDefaultVideoDecoderFactory()
+        videoEncoderFactory.preferredCodec = RTCVideoCodecInfo(name: kRTCVp8CodecName)
         return RTCPeerConnectionFactory(encoderFactory: videoEncoderFactory, decoderFactory: videoDecoderFactory)
     }()
     private static let ivTagBytes: Int = 28
@@ -301,6 +302,17 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }
 
     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 })
@@ -328,6 +340,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         capturer.startCapture(with: camera,
             format: format,
             fps: Int(min(24, fps.maxFrameRate)))
+#endif
     }
 
     private func createAudioSender(_ connection: RTCPeerConnection) {

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])) {
@@ -58,6 +57,37 @@ private func serverHost(_ s: String) -> String {
     }
 }
 
+enum SendReceipts: Identifiable, Hashable {
+    case yes
+    case no
+    case userDefault(Bool)
+
+    var id: Self { self }
+
+    var text: LocalizedStringKey {
+        switch self {
+        case .yes: return "yes"
+        case .no: return "no"
+        case let .userDefault(on): return on ? "default (yes)" : "default (no)"
+        }
+    }
+
+    func bool() -> Bool? {
+        switch self {
+        case .yes: return true
+        case .no: return false
+        case .userDefault: return nil
+        }
+    }
+
+    static func fromBool(_ enable: Bool?, userDefault def: Bool) -> SendReceipts {
+        if let enable = enable {
+            return enable ? .yes : .no
+        }
+        return .userDefault(def)
+    }
+}
+
 struct ChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -69,6 +99,8 @@ struct ChatInfoView: View {
     @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
+    @State private var sendReceipts = SendReceipts.userDefault(true)
+    @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum ChatInfoViewAlert: Identifiable {
@@ -76,6 +108,8 @@ struct ChatInfoView: View {
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
+        case abortSwitchAddressAlert
+        case syncConnectionForceAlert
         case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
 
         var id: String {
@@ -84,6 +118,8 @@ struct ChatInfoView: View {
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
+            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
+            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case let .error(title, _): return "error \(title)"
             }
         }
@@ -107,13 +143,41 @@ struct ChatInfoView: View {
 
                 if let customUserProfile = customUserProfile {
                     Section("Incognito") {
-                        infoRow("Your random profile", customUserProfile.chatViewName)
+                        HStack {
+                            Text("Your random profile")
+                            Spacer()
+                            Text(customUserProfile.chatViewName)
+                                .foregroundStyle(.indigo)
+                        }
                     }
                 }
 
                 Section {
                     if let code = connectionCode { verifyCodeButton(code) }
                     contactPreferencesButton()
+                    sendReceiptsOption()
+                    if let connStats = connectionStats,
+                       connStats.ratchetSyncAllowed {
+                        synchronizeConnectionButton()
+                    }
+//                    } else if developerTools {
+//                        synchronizeConnectionButtonForce()
+//                    }
+                }
+
+                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") {
@@ -121,12 +185,25 @@ struct ChatInfoView: View {
                         .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 }
+                            || connStats.ratchetSyncSendProhibited
+                        )
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                            Button("Abort changing address") {
+                                alert = .abortSwitchAddressAlert
+                            }
+                            .disabled(
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                || connStats.ratchetSyncSendProhibited
+                            )
+                        }
+                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                     }
                 }
 
@@ -145,12 +222,20 @@ struct ChatInfoView: View {
             .navigationBarHidden(true)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .onAppear {
+            if let currentUser = chatModel.currentUser {
+                sendReceiptsUserDefault = currentUser.sendRcptsContacts
+            }
+            sendReceipts = SendReceipts.fromBool(contact.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
+        }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
             case .deleteContactAlert: return deleteContactAlert()
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
+            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
+            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
@@ -163,20 +248,30 @@ struct ChatInfoView: View {
                 .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
-            HStack {
-                if contact.verified {
-                    Image(systemName: "checkmark.shield")
+            if contact.verified {
+                (
+                    Text(Image(systemName: "checkmark.shield"))
                         .foregroundColor(.secondary)
-                }
+                        .font(.title2)
+                    + Text(" ")
+                    + Text(contact.profile.displayName)
+                        .font(.largeTitle)
+                )
+                .multilineTextAlignment(.center)
+                .lineLimit(2)
+                .padding(.bottom, 2)
+            } else {
                 Text(contact.profile.displayName)
                     .font(.largeTitle)
-                    .lineLimit(1)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(2)
                     .padding(.bottom, 2)
             }
             if cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName {
                 Text(cInfo.fullName)
                     .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(4)
             }
         }
         .frame(maxWidth: .infinity, alignment: .center)
@@ -256,6 +351,44 @@ struct ChatInfoView: View {
         }
     }
 
+    private func sendReceiptsOption() -> some View {
+        Picker(selection: $sendReceipts) {
+            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
+                Text(opt.text)
+            }
+        } label: {
+            Label("Send receipts", systemImage: "checkmark.message")
+        }
+        .frame(height: 36)
+        .onChange(of: sendReceipts) { _ in
+            setSendReceipts()
+        }
+    }
+
+    private func setSendReceipts() {
+        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+        chatSettings.sendRcpts = sendReceipts.bool()
+        updateChatSettings(chat, chatSettings: chatSettings)
+    }
+
+    private func synchronizeConnectionButton() -> some View {
+        Button {
+            syncContactConnection(force: false)
+        } label: {
+            Label("Fix connection", systemImage: "exclamationmark.arrow.triangle.2.circlepath")
+                .foregroundColor(.orange)
+        }
+    }
+
+    private func synchronizeConnectionButtonForce() -> some View {
+        Button {
+            alert = .syncConnectionForceAlert
+        } label: {
+            Label("Renegotiate encryption", systemImage: "exclamationmark.triangle")
+                .foregroundColor(.red)
+        }
+    }
+
     private func networkStatusRow() -> some View {
         HStack {
             Text("Network status")
@@ -344,7 +477,12 @@ struct ChatInfoView: View {
     private func switchContactAddress() {
         Task {
             do {
-                try await apiSwitchContact(contactId: contact.apiId)
+                let stats = try apiSwitchContact(contactId: contact.apiId)
+                connectionStats = stats
+                await MainActor.run {
+                    chatModel.updateContactConnectionStats(contact, stats)
+                    dismiss()
+                }
             } catch let error {
                 logger.error("switchContactAddress apiSwitchContact error: \(responseError(error))")
                 let a = getErrorAlert(error, "Error changing address")
@@ -354,13 +492,68 @@ struct ChatInfoView: View {
             }
         }
     }
+
+    private func abortSwitchContactAddress() {
+        Task {
+            do {
+                let stats = try apiAbortSwitchContact(contact.apiId)
+                connectionStats = stats
+                await MainActor.run {
+                    chatModel.updateContactConnectionStats(contact, 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)
+                }
+            }
+        }
+    }
+
+    private func syncContactConnection(force: Bool) {
+        Task {
+            do {
+                let stats = try apiSyncContactRatchet(contact.apiId, force)
+                connectionStats = stats
+                await MainActor.run {
+                    chatModel.updateContactConnectionStats(contact, stats)
+                    dismiss()
+                }
+            } catch let error {
+                logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error synchronizing connection")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
 }
 
 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()
+    )
+}
+
+func syncConnectionForceAlert(_ syncConnectionForce: @escaping () -> Void) -> Alert {
+    Alert(
+        title: Text("Renegotiate encryption?"),
+        message: Text("The encryption is working and the new encryption agreement is not required. It may result in connection errors!"),
+        primaryButton: .destructive(Text("Renegotiate"), action: syncConnectionForce),
         secondaryButton: .cancel()
     )
 }

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

@@ -62,6 +62,7 @@ struct CIFileView: View {
             case .rcvComplete: return true
             case .rcvCancelled: return false
             case .rcvError: return false
+            case .invalid: return false
             }
         }
         return false
@@ -149,6 +150,7 @@ struct CIFileView: View {
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
+            case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
             }
         } else {
             fileIcon("doc.fill")
@@ -195,7 +197,7 @@ struct CIFileView_Previews: PreviewProvider {
     static var previews: some View {
         let sentFile: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
             content: .sndMsgContent(msgContent: .file("")),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)

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

@@ -99,6 +99,7 @@ struct CIImageView: View {
             case .rcvTransfer: progressView()
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
             default: EmptyView()
             }
         }

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

@@ -13,17 +13,47 @@ struct CIMetaView: View {
     @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
+    var paleMetaColor = Color(UIColor.tertiaryLabel)
 
     var body: some View {
         if chatItem.isDeletedContent {
             chatItem.timestampText.font(.caption).foregroundColor(metaColor)
         } else {
-            ciMetaText(chatItem.meta, chatTTL: chat.chatInfo.timedMessagesTTL, color: metaColor)
+            let meta = chatItem.meta
+            let ttl = chat.chatInfo.timedMessagesTTL
+            switch meta.itemStatus {
+            case let .sndSent(sndProgress):
+                switch sndProgress {
+                case .complete: ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .sent)
+                }
+            case let .sndRcvd(_, sndProgress):
+                switch sndProgress {
+                case .complete:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
+                    }
+                case .partial:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd2)
+                    }
+                }
+            default:
+                ciMetaText(meta, chatTTL: ttl, color: metaColor)
+            }
         }
     }
 }
 
-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false) -> Text {
+enum SentCheckmark {
+    case sent
+    case rcvd1
+    case rcvd2
+}
+
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
     if meta.itemEdited {
         r = r + statusIconText("pencil", color)
@@ -32,12 +62,21 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparen
         r = r + statusIconText("timer", color).font(.caption2)
         let ttl = meta.itemTimed?.ttl
         if ttl != chatTTL {
-            r = r + Text(TimedMessagesPreference.shortTtlText(ttl)).foregroundColor(color)
+            r = r + Text(shortTimeText(ttl)).foregroundColor(color)
         }
         r = r + Text(" ")
     }
     if let (icon, statusColor) = meta.statusIcon(color) {
-        r = r + statusIconText(icon, transparent ? .clear : statusColor) + Text(" ")
+        let t = Text(Image(systemName: icon)).font(.caption2)
+        let gap = Text("  ").kerning(-1.25)
+        let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
+        switch sent {
+        case nil: r = r + t1
+        case .sent: r = r + t1 + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd2: r = r + gap + t1
+        }
+        r = r + Text(" ")
     } else if !meta.disappearing {
         r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
@@ -51,8 +90,12 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, itemEdited: true))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
             CIMetaView(chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))

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

@@ -12,25 +12,215 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
 
 struct CIRcvDecryptionError: View {
+    @EnvironmentObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
     var showMember = false
+    @State private var alert: CIRcvDecryptionErrorAlert?
+
+    enum CIRcvDecryptionErrorAlert: Identifiable {
+        case syncAllowedAlert(_ syncConnection: () -> Void)
+        case syncNotSupportedContactAlert
+        case syncNotSupportedMemberAlert
+        case decryptionErrorAlert
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)
+
+        var id: String {
+            switch self {
+            case .syncAllowedAlert: return "syncAllowedAlert"
+            case .syncNotSupportedContactAlert: return "syncNotSupportedContactAlert"
+            case .syncNotSupportedMemberAlert: return "syncNotSupportedMemberAlert"
+            case .decryptionErrorAlert: return "decryptionErrorAlert"
+            case let .error(title, _): return "error \(title)"
+            }
+        }
+    }
 
     var body: some View {
-        CIMsgError(chatItem: chatItem, showMember: showMember) {
-            var message: Text
-            let why = Text(decryptErrorReason)
-            let permanent = Text("This error is permanent for this connection, please re-connect.")
-            switch msgDecryptError {
-            case .ratchetHeader:
-                message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why + Text("\n") + permanent
-            case .tooManySkipped:
-                message = Text("\(msgCount) messages skipped.") + Text("\n") + why + Text("\n") + permanent
+        viewBody()
+            .onAppear {
+                // for direct chat ConnectionStats are populated on opening chat, see ChatView onAppear
+                if case let .group(groupInfo) = chat.chatInfo,
+                   case let .groupRcv(groupMember) = chatItem.chatDir {
+                    do {
+                        let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
+                        if let s = stats {
+                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
+                        }
+                    } catch let error {
+                        logger.error("apiGroupMemberInfo error: \(responseError(error))")
+                    }
+                }
             }
-            AlertManager.shared.showAlert(Alert(title: Text("Decryption error"), message: message))
+            .alert(item: $alert) { alertItem in
+                switch(alertItem) {
+                case let .syncAllowedAlert(syncConnection): return syncAllowedAlert(syncConnection)
+                case .syncNotSupportedContactAlert: return Alert(title: Text("Fix not supported by contact"), message: message())
+                case .syncNotSupportedMemberAlert: return Alert(title: Text("Fix not supported by group member"), message: message())
+                case .decryptionErrorAlert: return Alert(title: Text("Decryption error"), message: message())
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                }
+            }
+    }
+
+    @ViewBuilder private func viewBody() -> some View {
+        if case let .direct(contact) = chat.chatInfo,
+           let contactStats = contact.activeConn.connectionStats {
+            if contactStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncContactConnection(contact) }
+                }
+            } else if !contactStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedContactAlert
+                }
+            } else {
+                basicDecryptionErrorItem()
+            }
+        } else if case let .group(groupInfo) = chat.chatInfo,
+                  case let .groupRcv(groupMember) = chatItem.chatDir,
+                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
+                  let memberStats = modelMember.activeConn?.connectionStats {
+            if memberStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
+                }
+            } else if !memberStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedMemberAlert
+                }
+            } else {
+                basicDecryptionErrorItem()
+            }
+        } else {
+            basicDecryptionErrorItem()
         }
     }
+
+    private func basicDecryptionErrorItem() -> some View {
+        decryptionErrorItem { alert = .decryptionErrorAlert }
+    }
+
+    private func decryptionErrorItemFixButton(syncSupported: Bool, _ onClick: @escaping (() -> Void)) -> some View {
+        ZStack(alignment: .bottomTrailing) {
+            VStack(alignment: .leading, spacing: 2) {
+                HStack {
+                    if showMember, let member = chatItem.memberDisplayName {
+                        Text(member).fontWeight(.medium) + Text(": ")
+                    }
+                    Text(chatItem.content.text)
+                        .foregroundColor(.red)
+                        .italic()
+                }
+                (
+                    Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .font(.callout)
+                    + Text(" ")
+                    + Text("Fix connection")
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .font(.callout)
+                    + Text("   ")
+                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+                )
+            }
+            .padding(.horizontal, 12)
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .onTapGesture(perform: { onClick() })
+        .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
+        .textSelection(.disabled)
+    }
+
+    private func decryptionErrorItem(_ onClick: @escaping (() -> Void)) -> some View {
+        func text() -> Text {
+            Text(chatItem.content.text)
+                .foregroundColor(.red)
+                .italic()
+            + Text("   ")
+            + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+        }
+        return ZStack(alignment: .bottomTrailing) {
+            HStack {
+                if showMember, let member = chatItem.memberDisplayName {
+                    Text(member).fontWeight(.medium) + Text(": ") + text()
+                } else {
+                    text()
+                }
+            }
+            .padding(.horizontal, 12)
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .onTapGesture(perform: { onClick() })
+        .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
+        .textSelection(.disabled)
+    }
+
+    private func message() -> Text {
+        var message: Text
+        let why = Text(decryptErrorReason)
+        switch msgDecryptError {
+        case .ratchetHeader:
+            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+        case .tooManySkipped:
+            message = Text("\(msgCount) messages skipped.") + Text("\n") + why
+        case .ratchetEarlier:
+            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+        case .other:
+            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+        }
+        return message
+    }
+
+    private func syncMemberConnection(_ groupInfo: GroupInfo, _ member: GroupMember) {
+        Task {
+            do {
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
+                await MainActor.run {
+                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                }
+            } catch let error {
+                logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error synchronizing connection")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
+
+    private func syncContactConnection(_ contact: Contact) {
+        Task {
+            do {
+                let stats = try apiSyncContactRatchet(contact.apiId, false)
+                await MainActor.run {
+                    ChatModel.shared.updateContactConnectionStats(contact, stats)
+                }
+            } catch let error {
+                logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error synchronizing connection")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
+
+    private func syncAllowedAlert(_ syncConnection: @escaping () -> Void) -> Alert {
+        Alert(
+            title: Text("Fix connection?"),
+            message: message(),
+            primaryButton: .default(Text("Fix"), action: syncConnection),
+            secondaryButton: .cancel()
+        )
+    }
 }
 
 //struct CIRcvDecryptionError_Previews: PreviewProvider {

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

@@ -212,6 +212,7 @@ struct CIVideoView: View {
                 }
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
             default: EmptyView()
             }
         }
@@ -246,12 +247,11 @@ struct CIVideoView: View {
         .padding([.trailing, .top], 11)
     }
 
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
         Task {
             if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId)
+                await receiveFile(user, file.fileId, false)
             }
-            // TODO image accepted alert?
         }
     }
 

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

@@ -13,14 +13,20 @@ struct CIVoiceView: View {
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval?
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
+    @Binding var allowMenu: Bool
+    @State private var seek: (TimeInterval) -> Void = { _ in }
 
     var body: some View {
         Group {
             if chatItem.chatDir.sent {
                 VStack (alignment: .trailing, spacing: 6) {
                     HStack {
+                        if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
+                            playbackSlider()
+                        }
                         playerTime()
                         player()
                     }
@@ -32,13 +38,16 @@ struct CIVoiceView: View {
                     HStack {
                         player()
                         playerTime()
+                        if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
+                            playbackSlider()
+                        }
                     }
                     .frame(alignment: .leading)
                     metaView().padding(.leading, -6)
                 }
             }
         }
-        .padding([.top, .horizontal], 4)
+        .padding(.top, 4)
         .padding(.bottom, 8)
     }
 
@@ -48,8 +57,11 @@ struct CIVoiceView: View {
             recordingFile: recordingFile,
             recordingTime: TimeInterval(duration),
             showBackground: true,
+            seek: $seek,
+            audioPlayer: $audioPlayer,
             playbackState: $playbackState,
-            playbackTime: $playbackTime
+            playbackTime: $playbackTime,
+            allowMenu: $allowMenu
         )
     }
 
@@ -61,6 +73,22 @@ struct CIVoiceView: View {
         )
         .foregroundColor(.secondary)
     }
+    
+    private func playbackSlider() -> some View {
+            ComposeVoiceView.SliderBar(
+                length: TimeInterval(duration),
+                progress: $playbackTime,
+                seek: {
+                    let time = max(0.0001, $0)
+                    seek(time)
+                    playbackTime = time
+                })
+            .onChange(of: .playing == playbackState || (playbackTime ?? 0) > 0) { show in
+                if !show {
+                    allowMenu = true
+                }
+            }
+    }
 
     private func metaView() -> some View {
         CIMetaView(chatItem: chatItem)
@@ -95,10 +123,11 @@ struct VoiceMessagePlayer: View {
     var recordingTime: TimeInterval
     var showBackground: Bool
 
-    @State private var audioPlayer: AudioPlayer?
+    @Binding var seek: (TimeInterval) -> Void
+    @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-    @State private var startingPlayback: Bool = false
+    @Binding var allowMenu: Bool
 
     var body: some View {
         ZStack {
@@ -109,29 +138,36 @@ struct VoiceMessagePlayer: View {
                 case .sndComplete: playbackButton()
                 case .sndCancelled: playbackButton()
                 case .sndError: playbackButton()
-                case .rcvInvitation: loadingIcon()
+                case .rcvInvitation: downloadButton(recordingFile)
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
                 case .rcvComplete: playbackButton()
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
+                case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 }
             } else {
                 playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
             }
         }
-        .onDisappear {
-            audioPlayer?.stop()
+        .onAppear {
+            seek = { to in audioPlayer?.seek(to) }
+            audioPlayer?.onTimer = { playbackTime = $0 }
+            audioPlayer?.onFinishPlayback = {
+                playbackState = .noPlayback
+                playbackTime = TimeInterval(0)
+            }
         }
-        .onChange(of: chatModel.stopPreviousRecPlay) { _ in
-            if !startingPlayback {
+        .onChange(of: chatModel.stopPreviousRecPlay) { it in
+            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                 audioPlayer?.stop()
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
-            } else {
-                startingPlayback = false
             }
         }
+        .onChange(of: playbackState) { state in
+            allowMenu = state == .paused || state == .noPlayback
+        }
     }
 
     @ViewBuilder private func playbackButton() -> some View {
@@ -179,6 +215,18 @@ struct VoiceMessagePlayer: View {
         }
     }
 
+    private func downloadButton(_ recordingFile: CIFile) -> some View {
+        Button {
+            Task {
+                if let user = ChatModel.shared.currentUser {
+                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                }
+            }
+        } label: {
+            playPauseIcon("play.fill")
+        }
+    }
+
     private struct ProgressCircle: View {
         var length: TimeInterval
         @Binding var progress: TimeInterval?
@@ -204,7 +252,6 @@ struct VoiceMessagePlayer: View {
     }
 
     private func startPlayback(_ recordingFileName: String) {
-        startingPlayback = true
         chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
         audioPlayer = AudioPlayer(
             onTimer: { playbackTime = $0 },
@@ -213,8 +260,7 @@ struct VoiceMessagePlayer: View {
                 playbackTime = TimeInterval(0)
             }
         )
-        audioPlayer?.start(fileName: recordingFileName)
-        playbackTime = TimeInterval(0)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }
@@ -223,7 +269,7 @@ struct CIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)
@@ -240,13 +286,15 @@ struct CIVoiceView_Previews: PreviewProvider {
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
-                playbackState: .playing,
-                playbackTime: TimeInterval(20)
+                audioPlayer: .constant(nil),
+                playbackState: .constant(.playing),
+                playbackTime: .constant(TimeInterval(20)),
+                allowMenu: Binding.constant(true)
             )
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
         }
         .previewLayout(.fixed(width: 360, height: 360))
         .environmentObject(Chat.sampleData)

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

@@ -32,7 +32,7 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
             EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
         }
         .previewLayout(.fixed(width: 360, height: 70))

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

@@ -15,9 +15,15 @@ struct FramedCIVoiceView: View {
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval?
-
+    
+    @Binding var allowMenu: Bool
+    
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
+    
+    @State private var seek: (TimeInterval) -> Void = { _ in }
+    
     var body: some View {
         HStack {
             VoiceMessagePlayer(
@@ -25,8 +31,11 @@ struct FramedCIVoiceView: View {
                 recordingFile: recordingFile,
                 recordingTime: TimeInterval(duration),
                 showBackground: false,
+                seek: $seek,
+                audioPlayer: $audioPlayer,
                 playbackState: $playbackState,
-                playbackTime: $playbackTime
+                playbackTime: $playbackTime,
+                allowMenu: $allowMenu
             )
             VoiceMessagePlayerTime(
                 recordingTime: TimeInterval(duration),
@@ -35,26 +44,45 @@ struct FramedCIVoiceView: View {
             )
             .foregroundColor(.secondary)
             .frame(width: 50, alignment: .leading)
+            if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
+                playbackSlider()
+            }
         }
         .padding(.top, 6)
         .padding(.leading, 6)
         .padding(.trailing, 12)
         .padding(.bottom, chatItem.content.text.isEmpty ? 10 : 0)
     }
+    
+    private func playbackSlider() -> some View {
+        ComposeVoiceView.SliderBar(
+            length: TimeInterval(duration),
+            progress: $playbackTime,
+            seek: {
+                let time = max(0.0001, $0)
+                seek(time)
+                playbackTime = time
+            })
+        .onChange(of: .playing == playbackState || (playbackTime ?? 0) > 0) { show in
+            if !show {
+                allowMenu = true
+            }
+        }
+    }
 }
 
 struct FramedCIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "Hello there", duration: 30)),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         let voiceMessageWithQuote: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
             quotedItem: CIQuote.getSample(1, .now, "Hi", chatDir: .directRcv),
             file: CIFile.getSample(fileStatus: .sndComplete)

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

@@ -19,7 +19,7 @@ struct MarkedDeletedItemView: View {
             if showMember, let member = chatItem.memberDisplayName {
                 Text(member).font(.caption).fontWeight(.medium) + Text(": ").font(.caption)
             }
-            if case let .moderated(byGroupMember) = chatItem.meta.itemDeleted {
+            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
                 markedDeletedText("moderated by \(byGroupMember.chatViewName)")
             } else {
                 markedDeletedText("marked deleted")
@@ -46,7 +46,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -87,7 +87,7 @@ struct MsgContentView: View {
 func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
     let s = text
     var res: Text
-    if let ft = formattedText, ft.count > 0 {
+    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
         res = formatText(ft[0], preview)
         var i = 1
         while i < ft.count {

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

@@ -0,0 +1,417 @@
+//
+//  ChatItemInfoView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 09.05.2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct ChatItemInfoView: View {
+    @Environment(\.colorScheme) var colorScheme
+    var ci: ChatItem
+    @Binding var chatItemInfo: ChatItemInfo?
+    @State private var selection: CIInfoTab = .history
+    @State private var alert: CIInfoViewAlert? = nil
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+
+    enum CIInfoTab {
+        case history
+        case quote
+        case delivery
+    }
+
+    enum CIInfoViewAlert: Identifiable {
+        case alert(title: String, text: String)
+
+        var id: String {
+            switch self {
+            case let .alert(title, text): return "alert \(title) \(text)"
+            }
+        }
+    }
+    
+    var body: some View {
+        NavigationView {
+            itemInfoView()
+                .toolbar {
+                    ToolbarItem(placement: .navigationBarTrailing) {
+                        Button { showShareSheet(items: [itemInfoShareText()]) } label: {
+                            Image(systemName: "square.and.arrow.up")
+                        }
+                    }
+                }
+                .alert(item: $alert) { a in
+                    switch(a) {
+                    case let .alert(title, text): return Alert(title: Text(title), message: Text(text))
+                    }
+                }
+        }
+    }
+
+    private var title: String {
+        ci.chatDir.sent
+        ? NSLocalizedString("Sent message", comment: "message info title")
+        : NSLocalizedString("Received message", comment: "message info title")
+    }
+
+    private var numTabs: Int {
+        var numTabs = 1
+        if chatItemInfo?.memberDeliveryStatuses != nil {
+            numTabs += 1
+        }
+        if ci.quotedItem != nil {
+            numTabs += 1
+        }
+        return numTabs
+    }
+
+    @ViewBuilder private func itemInfoView() -> some View {
+        if numTabs > 1 {
+            TabView(selection: $selection) {
+                if let mdss = chatItemInfo?.memberDeliveryStatuses {
+                    deliveryTab(mdss)
+                        .tabItem {
+                            Label("Delivery", systemImage: "checkmark.message")
+                        }
+                        .tag(CIInfoTab.delivery)
+                }
+                historyTab()
+                    .tabItem {
+                        Label("History", systemImage: "clock")
+                    }
+                    .tag(CIInfoTab.history)
+                if let qi = ci.quotedItem {
+                    quoteTab(qi)
+                        .tabItem {
+                            Label("In reply to", systemImage: "arrowshape.turn.up.left")
+                        }
+                        .tag(CIInfoTab.quote)
+                }
+            }
+            .onAppear {
+                if chatItemInfo?.memberDeliveryStatuses != nil {
+                    selection = .delivery
+                }
+            }
+        } else {
+            historyTab()
+        }
+    }
+
+    @ViewBuilder private func details() -> some View {
+        let meta = ci.meta
+        VStack(alignment: .leading, spacing: 16) {
+            Text(title)
+                .font(.largeTitle)
+                .bold()
+                .padding(.bottom)
+
+            infoRow("Sent at", localTimestamp(meta.itemTs))
+            if !ci.chatDir.sent {
+                infoRow("Received at", localTimestamp(meta.createdAt))
+            }
+            switch (meta.itemDeleted) {
+            case let .deleted(deletedTs):
+                if let deletedTs = deletedTs {
+                    infoRow("Deleted at", localTimestamp(deletedTs))
+                }
+            case let .moderated(deletedTs, _):
+                if let deletedTs = deletedTs {
+                    infoRow("Moderated at", localTimestamp(deletedTs))
+                }
+            default: EmptyView()
+            }
+            if let deleteAt = meta.itemTimed?.deleteAt {
+                infoRow("Disappears at", localTimestamp(deleteAt))
+            }
+            if developerTools {
+                infoRow("Database ID", "\(meta.itemId)")
+                infoRow("Record updated at", localTimestamp(meta.updatedAt))
+            }
+        }
+    }
+
+    @ViewBuilder private func historyTab() -> some View {
+        GeometryReader { g in
+            let maxWidth = (g.size.width - 32) * 0.84
+            ScrollView {
+                VStack(alignment: .leading, spacing: 16) {
+                    details()
+                    Divider().padding(.vertical)
+                    if let chatItemInfo = chatItemInfo,
+                       !chatItemInfo.itemVersions.isEmpty {
+                        Text("History")
+                            .font(.title2)
+                            .padding(.bottom, 4)
+                        LazyVStack(alignment: .leading, spacing: 16)  {
+                            ForEach(Array(chatItemInfo.itemVersions.enumerated()), id: \.element.chatItemVersionId) { index, itemVersion in
+                                itemVersionView(itemVersion, maxWidth, current: index == 0 && ci.meta.itemDeleted == nil)
+                            }
+                        }
+                    }
+                    else {
+                        Text("No history")
+                            .foregroundColor(.secondary)
+                            .frame(maxWidth: .infinity)
+                    }
+                }
+                .padding()
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+    }
+
+    @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
+        VStack(alignment: .leading, spacing: 4) {
+            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
+                .allowsHitTesting(false)
+                .padding(.horizontal, 12)
+                .padding(.vertical, 6)
+                .background(chatItemFrameColor(ci, colorScheme))
+                .cornerRadius(18)
+                .contextMenu {
+                    if itemVersion.msgContent.text != "" {
+                        Button {
+                            showShareSheet(items: [itemVersion.msgContent.text])
+                        } label: {
+                            Label("Share", systemImage: "square.and.arrow.up")
+                        }
+                        Button {
+                            UIPasteboard.general.string = itemVersion.msgContent.text
+                        } label: {
+                            Label("Copy", systemImage: "doc.on.doc")
+                        }
+                    }
+                }
+            let ts = localTimestamp(itemVersion.itemVersionTs)
+            (current ? Text("\(ts) (current)") : Text(ts))
+                .foregroundStyle(.secondary)
+                .font(.caption)
+                .padding(.horizontal, 12)
+        }
+        .frame(maxWidth: maxWidth, alignment: .leading)
+    }
+
+    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
+        if text != "" {
+            messageText(text, formattedText, sender)
+        } else {
+            Text("no text")
+                .italic()
+                .foregroundColor(.secondary)
+        }
+    }
+
+    @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
+        GeometryReader { g in
+            let maxWidth = (g.size.width - 32) * 0.84
+            ScrollView {
+                VStack(alignment: .leading, spacing: 16) {
+                    details()
+                    Divider().padding(.vertical)
+                    Text("In reply to")
+                        .font(.title2)
+                        .padding(.bottom, 4)
+                    quotedMsgView(qi, maxWidth)
+                }
+                .padding()
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+    }
+
+    @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
+        VStack(alignment: .leading, spacing: 4) {
+            textBubble(qi.text, qi.formattedText, qi.getSender(nil))
+                .allowsHitTesting(false)
+                .padding(.horizontal, 12)
+                .padding(.vertical, 6)
+                .background(quotedMsgFrameColor(qi, colorScheme))
+                .cornerRadius(18)
+                .contextMenu {
+                    if qi.text != "" {
+                        Button {
+                            showShareSheet(items: [qi.text])
+                        } label: {
+                            Label("Share", systemImage: "square.and.arrow.up")
+                        }
+                        Button {
+                            UIPasteboard.general.string = qi.text
+                        } label: {
+                            Label("Copy", systemImage: "doc.on.doc")
+                        }
+                    }
+                }
+            Text(localTimestamp(qi.sentAt))
+                .foregroundStyle(.secondary)
+                .font(.caption)
+                .padding(.horizontal, 12)
+        }
+        .frame(maxWidth: maxWidth, alignment: .leading)
+    }
+
+    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
+        (qi.chatDir?.sent ?? false)
+        ? (colorScheme == .light ? sentColorLight : sentColorDark)
+        : Color(uiColor: .tertiarySystemGroupedBackground)
+    }
+
+    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 16) {
+                details()
+                Divider().padding(.vertical)
+                Text("Delivery")
+                    .font(.title2)
+                    .padding(.bottom, 4)
+                memberDeliveryStatusesView(memberDeliveryStatuses)
+            }
+            .padding()
+        }
+        .frame(maxHeight: .infinity, alignment: .top)
+    }
+
+    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        VStack(alignment: .leading, spacing: 12) {
+            let mss = membersStatuses(memberDeliveryStatuses)
+            if !mss.isEmpty {
+                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                }
+            } else {
+                Text("No delivery information")
+                    .foregroundColor(.secondary)
+            }
+        }
+    }
+
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
+        memberDeliveryStatuses.compactMap({ mds in
+            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
+                return (mem, mds.memberDeliveryStatus)
+            } else {
+                return nil
+            }
+        })
+    }
+
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+        HStack{
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
+                .padding(.trailing, 2)
+            Text(member.chatViewName)
+                .lineLimit(1)
+            Spacer()
+            let v = Group {
+                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                    switch status {
+                    case .sndRcvd:
+                        ZStack(alignment: .trailing) {
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                                .padding(.trailing, 6)
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                        }
+                    default:
+                        Image(systemName: icon)
+                            .foregroundColor(statusColor)
+                    }
+                } else {
+                    Image(systemName: "ellipsis")
+                        .foregroundColor(Color.secondary)
+                }
+            }
+
+            if let (title, text) = status.statusInfo {
+                v.onTapGesture {
+                    alert = .alert(title: title, text: text)
+                }
+            } else {
+                v
+            }
+        }
+    }
+
+    private func itemInfoShareText() -> String {
+        let meta = ci.meta
+        var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
+        shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
+        if !ci.chatDir.sent {
+            shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
+        }
+        switch (ci.meta.itemDeleted) {
+        case let .deleted(deletedTs):
+            if let deletedTs = deletedTs {
+                shareText += [String.localizedStringWithFormat(NSLocalizedString("Deleted at: %@", comment: "copied message info"), localTimestamp(deletedTs))]
+            }
+        case let .moderated(deletedTs, _):
+            if let deletedTs = deletedTs {
+                shareText += [String.localizedStringWithFormat(NSLocalizedString("Moderated at: %@", comment: "copied message info"), localTimestamp(deletedTs))]
+            }
+        default: ()
+        }
+        if let deleteAt = meta.itemTimed?.deleteAt {
+            shareText += [String.localizedStringWithFormat(NSLocalizedString("Disappears at: %@", comment: "copied message info"), localTimestamp(deleteAt))]
+        }
+        if developerTools {
+            shareText += [
+                String.localizedStringWithFormat(NSLocalizedString("Database ID: %d", comment: "copied message info"), meta.itemId),
+                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt))
+            ]
+        }
+        if let qi = ci.quotedItem {
+            shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]
+            let t = qi.text
+            shareText += [""]
+            if let sender = qi.getSender(nil) {
+                shareText += [String.localizedStringWithFormat(
+                    NSLocalizedString("%@ at %@:", comment: "copied message info, <sender> at <time>"),
+                    sender,
+                    localTimestamp(qi.sentAt)
+                )]
+            } else {
+                shareText += [String.localizedStringWithFormat(
+                    NSLocalizedString("%@:", comment: "copied message info"),
+                    localTimestamp(qi.sentAt)
+                )]
+            }
+            shareText += [t != "" ? t : NSLocalizedString("no text", comment: "copied message info in history")]
+        }
+        if let chatItemInfo = chatItemInfo,
+           !chatItemInfo.itemVersions.isEmpty {
+            shareText += ["", NSLocalizedString("## History", comment: "copied message info")]
+            for (index, itemVersion) in chatItemInfo.itemVersions.enumerated() {
+                let t = itemVersion.msgContent.text
+                shareText += [
+                    "",
+                    String.localizedStringWithFormat(
+                        index == 0 && ci.meta.itemDeleted == nil
+                        ? NSLocalizedString("%@ (current):", comment: "copied message info")
+                        : NSLocalizedString("%@:", comment: "copied message info"),
+                        localTimestamp(itemVersion.itemVersionTs)
+                    ),
+                    t != "" ? t : NSLocalizedString("no text", comment: "copied message info in history")
+                ]
+            }
+        }
+        return shareText.joined(separator: "\n")
+    }
+}
+
+func localTimestamp(_ date: Date) -> String {
+    let localDateFormatter = DateFormatter()
+    localDateFormatter.dateStyle = .medium
+    localDateFormatter.timeStyle = .medium
+    return localDateFormatter.string(from: date)
+}
+
+struct ChatItemInfoView_Previews: PreviewProvider {
+    static var previews: some View {
+        ChatItemInfoView(ci: ChatItem.getSample(1, .directSnd, .now, "hello"), chatItemInfo: Binding.constant(nil))
+    }
+}

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

@@ -16,6 +16,22 @@ struct ChatItemView: View {
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
     @Binding var revealed: Bool
+    @Binding var allowMenu: Bool
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
+    init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
+        self.chatInfo = chatInfo
+        self.chatItem = chatItem
+        self.showMember = showMember
+        self.maxWidth = maxWidth
+        _scrollProxy = .init(initialValue: scrollProxy)
+        _revealed = revealed
+        _allowMenu = allowMenu
+        _audioPlayer = audioPlayer
+        _playbackState = playbackState
+        _playbackTime = playbackTime
+    }
 
     var body: some View {
         let ci = chatItem
@@ -25,7 +41,7 @@ struct ChatItemView: View {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                 EmojiItemView(chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration)
+                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
                 ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
@@ -37,7 +53,7 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
@@ -109,9 +125,9 @@ struct ChatItemView_Previews: PreviewProvider {
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent, itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
@@ -126,7 +142,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
-                    meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted),
+                    meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: 1, toMsgId: 2)),
                     quotedItem: nil,
                     file: nil
@@ -148,7 +164,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
-                    meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted),
+                    meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupInvitation(groupInvitation: CIGroupInvitation.getSample(status: .pending), memberRole: .admin),
                     quotedItem: nil,
                     file: nil
@@ -159,7 +175,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
-                    meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted),
+                    meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupEvent(rcvGroupEvent: .memberAdded(groupMemberId: 1, profile: Profile.sampleData)),
                     quotedItem: nil,
                     file: nil
@@ -170,7 +186,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
-                    meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted),
+                    meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: ciFeatureContent,
                     quotedItem: nil,
                     file: nil

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

@@ -22,7 +22,7 @@ struct ChatView: View {
     @State private var showAddMembersSheet: Bool = false
     @State private var composeState = ComposeState()
     @State private var deletingItem: ChatItem? = nil
-    @FocusState private var keyboardVisible: Bool
+    @State private var keyboardVisible = false
     @State private var showDeleteMessage = false
     @State private var connectionStats: ConnectionStats?
     @State private var customUserProfile: Profile?
@@ -39,6 +39,16 @@ struct ChatView: View {
     @State private var selectedMember: GroupMember? = nil
 
     var body: some View {
+        if #available(iOS 16.0, *) {
+            viewBody
+            .scrollDismissesKeyboard(.immediately)
+            .keyboardPadding()
+        } else {
+            viewBody
+        }
+    }
+
+    private var viewBody: some View {
         let cInfo = chat.chatInfo
         return VStack(spacing: 0) {
             if searchMode {
@@ -65,17 +75,14 @@ struct ChatView: View {
         .navigationTitle(cInfo.chatViewName)
         .navigationBarTitleDisplayMode(.inline)
         .onAppear {
-            if chatModel.draftChatId == cInfo.id, let draft = chatModel.draft {
-                composeState = draft
-            }
-            if chat.chatStats.unreadChat {
-                Task {
-                    await markChatUnread(chat, unreadChat: false)
-                }
-            }
+            initChatView()
         }
-        .onChange(of: chatModel.chatId) { _ in
-            if chatModel.chatId == nil { dismiss() }
+        .onChange(of: chatModel.chatId) { cId in
+            if cId != nil {
+                initChatView()
+            } else {
+                dismiss()
+            }
         }
         .onDisappear {
             VideoPlayerView.players.removeAll()
@@ -185,6 +192,32 @@ struct ChatView: View {
         }
     }
 
+    private func initChatView() {
+        let cInfo = chat.chatInfo
+        if case let .direct(contact) = cInfo {
+            Task {
+                do {
+                    let (stats, _) = try await apiContactInfo(chat.chatInfo.apiId)
+                    await MainActor.run {
+                        if let s = stats {
+                            chatModel.updateContactConnectionStats(contact, s)
+                        }
+                    }
+                } catch let error {
+                    logger.error("apiContactInfo error: \(responseError(error))")
+                }
+            }
+        }
+        if chatModel.draftChatId == cInfo.id, let draft = chatModel.draft {
+            composeState = draft
+        }
+        if chat.chatStats.unreadChat {
+            Task {
+                await markChatUnread(chat, unreadChat: false)
+            }
+        }
+    }
+
     private func searchToolbar() -> some View {
         HStack {
             HStack {
@@ -193,7 +226,7 @@ struct ChatView: View {
                     .focused($searchFocussed)
                     .foregroundColor(.primary)
                     .frame(maxWidth: .infinity)
-                
+
                 Button {
                     searchText = ""
                 } label: {
@@ -204,7 +237,7 @@ struct ChatView: View {
             .foregroundColor(.secondary)
             .background(Color(.secondarySystemBackground))
             .cornerRadius(10.0)
-            
+
             Button ("Cancel") {
                 searchText = ""
                 searchMode = false
@@ -219,17 +252,25 @@ struct ChatView: View {
         .padding(.vertical, 8)
     }
     
+    private func voiceWithoutFrame(_ ci: ChatItem) -> Bool {
+        ci.content.msgContent?.isVoice == true && ci.content.text.count == 0 && ci.quotedItem == nil
+    }
+
     private func chatItemsList() -> some View {
         let cInfo = chat.chatInfo
         return GeometryReader { g in
             ScrollViewReader { proxy in
                 ScrollView {
-                    let maxWidth =
-                    cInfo.chatType == .group
-                    ? (g.size.width - 28) * 0.84 - 42
-                    : (g.size.width - 32) * 0.84
                     LazyVStack(spacing: 5)  {
                         ForEach(chatModel.reversedChatItems, id: \.viewId) { ci in
+                            let voiceNoFrame = voiceWithoutFrame(ci)
+                            let maxWidth = cInfo.chatType == .group
+                                            ? voiceNoFrame
+                                                ? (g.size.width - 28) - 42
+                                                : (g.size.width - 28) * 0.84 - 42
+                                            : voiceNoFrame
+                                                ? (g.size.width - 32)
+                                                : (g.size.width - 32) * 0.84
                             chatItemView(ci, maxWidth)
                                 .scaleEffect(x: 1, y: -1, anchor: .center)
                                 .onAppear {
@@ -435,6 +476,7 @@ struct ChatView: View {
     
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var chat: Chat
+        @Environment(\.colorScheme) var colorScheme
         var ci: ChatItem
         var showMember: Bool = false
         var maxWidth: CGFloat
@@ -445,16 +487,30 @@ struct ChatView: View {
         @Binding var showDeleteMessage: Bool
         
         @State private var revealed = false
+        @State private var showChatItemInfoSheet: Bool = false
+        @State private var chatItemInfo: ChatItemInfo?
         
+        @State private var allowMenu: Bool = true
+        
+        @State private var audioPlayer: AudioPlayer?
+        @State private var playbackState: VoiceMessagePlaybackState = .noPlayback
+        @State private var playbackTime: TimeInterval?
+
         var body: some View {
             let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
             let uiMenu: Binding<UIMenu> = Binding(
                 get: { UIMenu(title: "", children: menu(live: composeState.liveMessage != nil)) },
                 set: { _ in }
             )
-
-            ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed)
-                .uiKitContextMenu(menu: uiMenu)
+            
+            VStack(alignment: alignment.horizontal, spacing: 3) {
+                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+                    .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
+                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
+                    chatItemReactions()
+                        .padding(.bottom, 4)
+                }
+            }
                 .confirmationDialog("Delete message?", isPresented: $showDeleteMessage, titleVisibility: .visible) {
                     Button("Delete for me", role: .destructive) {
                         deleteMessage(.cidmInternal)
@@ -467,11 +523,69 @@ struct ChatView: View {
                 }
                 .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
                 .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
+                .onDisappear {
+                    if ci.content.msgContent?.isVoice == true {
+                        allowMenu = true
+                        audioPlayer?.stop()
+                        playbackState = .noPlayback
+                        playbackTime = TimeInterval(0)
+                    }
+                }
+                .sheet(isPresented: $showChatItemInfoSheet, onDismiss: {
+                    chatItemInfo = nil
+                }) {
+                    ChatItemInfoView(ci: ci, chatItemInfo: $chatItemInfo)
+                }
         }
-        
-        private func menu(live: Bool) -> [UIAction] {
-            var menu: [UIAction] = []
+
+        private func chatItemReactions() -> some View {
+            HStack(spacing: 4) {
+                ForEach(ci.reactions, id: \.reaction) { r in
+                    let v = HStack(spacing: 4) {
+                        switch r.reaction {
+                        case let .emoji(emoji): Text(emoji.rawValue).font(.caption)
+                        case .unknown: EmptyView()
+                        }
+                        if r.totalReacted > 1 {
+                            Text("\(r.totalReacted)")
+                                .font(.caption)
+                                .fontWeight(r.userReacted ? .bold : .light)
+                                .foregroundColor(r.userReacted ? .accentColor : .secondary)
+                        }
+                    }
+                    .padding(.horizontal, 6)
+                    .padding(.vertical, 4)
+
+                    if chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted) {
+                        v.onTapGesture {
+                            setReaction(add: !r.userReacted, reaction: r.reaction)
+                        }
+                    } else {
+                        v
+                    }
+                }
+            }
+        }
+
+        private func menu(live: Bool) -> [UIMenuElement] {
+            var menu: [UIMenuElement] = []
             if let mc = ci.content.msgContent, ci.meta.itemDeleted == nil || revealed {
+                let rs = allReactions()
+                if chat.chatInfo.featureEnabled(.reactions) && ci.allowAddReaction,
+                   rs.count > 0 {
+                    var rm: UIMenu
+                    if #available(iOS 16, *) {
+                        var children: [UIMenuElement] = Array(rs.prefix(topReactionsCount(rs)))
+                        if let sm = reactionUIMenu(rs) {
+                            children.append(sm)
+                        }
+                        rm = UIMenu(title: "", options: .displayInline, children: children)
+                        rm.preferredElementSize = .small
+                    } else {
+                        rm = reactionUIMenuPreiOS16(rs)
+                    }
+                    menu.append(rm)
+                }
                 if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
                     menu.append(replyUIAction())
                 }
@@ -491,6 +605,7 @@ struct ChatView: View {
                 if ci.meta.editable && !mc.isVoice && !live {
                     menu.append(editAction())
                 }
+                menu.append(viewInfoUIAction())
                 if revealed {
                     menu.append(hideUIAction())
                 }
@@ -509,8 +624,10 @@ struct ChatView: View {
                 if !ci.isDeletedContent {
                     menu.append(revealUIAction())
                 }
+                menu.append(viewInfoUIAction())
                 menu.append(deleteUIAction())
             } else if ci.isDeletedContent {
+                menu.append(viewInfoUIAction())
                 menu.append(deleteUIAction())
             }
             return menu
@@ -530,7 +647,59 @@ struct ChatView: View {
                 }
             }
         }
-        
+
+        private func reactionUIMenuPreiOS16(_ rs: [UIAction]) -> UIMenu {
+            UIMenu(
+                title: NSLocalizedString("React…", comment: "chat item menu"),
+                image: UIImage(systemName: "face.smiling"),
+                children: rs
+            )
+        }
+
+        @available(iOS 16.0, *)
+        private func reactionUIMenu(_ rs: [UIAction]) -> UIMenu? {
+            var children = rs
+            children.removeFirst(min(rs.count, topReactionsCount(rs)))
+            if children.count == 0 { return nil }
+            return UIMenu(
+                title: "",
+                image: UIImage(systemName: "ellipsis"),
+                children: children
+            )
+        }
+
+        private func allReactions() -> [UIAction] {
+            MsgReaction.values.compactMap { r in
+                ci.reactions.contains(where: { $0.userReacted && $0.reaction == r })
+                ? nil
+                : UIAction(title: r.text) { _ in setReaction(add: true, reaction: r) }
+            }
+        }
+
+        private func topReactionsCount(_ rs: [UIAction]) -> Int {
+            rs.count > 4 ? 3 : 4
+        }
+
+        private func setReaction(add: Bool, reaction: MsgReaction) {
+            Task {
+                do {
+                    let cInfo = chat.chatInfo
+                    let chatItem = try await apiChatItemReaction(
+                        type: cInfo.chatType,
+                        id: cInfo.apiId,
+                        itemId: ci.id,
+                        add: add,
+                        reaction: reaction
+                    )
+                    await MainActor.run {
+                        ChatModel.shared.updateChatItem(chat.chatInfo, chatItem)
+                    }
+                } catch let error {
+                    logger.error("apiChatItemReaction error: \(responseError(error))")
+                }
+            }
+        }
+
         private func shareUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Share", comment: "chat item action"),
@@ -589,6 +758,32 @@ struct ChatView: View {
             }
         }
 
+        private func viewInfoUIAction() -> UIAction {
+            UIAction(
+                title: NSLocalizedString("Info", comment: "chat item action"),
+                image: UIImage(systemName: "info.circle")
+            ) { _ in
+                Task {
+                    do {
+                        let cInfo = chat.chatInfo
+                        let ciInfo = try await apiGetChatItemInfo(type: cInfo.chatType, id: cInfo.apiId, itemId: ci.id)
+                        await MainActor.run {
+                            chatItemInfo = ciInfo
+                        }
+                        if case let .group(gInfo) = chat.chatInfo {
+                            let groupMembers = await apiListMembers(gInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                            }
+                        }
+                    } catch let error {
+                        logger.error("apiGetChatItemInfo error: \(responseError(error))")
+                    }
+                    await MainActor.run { showChatItemInfoSheet = true }
+                }
+            }
+        }
+
         private func cancelFileUIAction(_ fileId: Int64, _ cancelAction: CancelAction) -> UIAction {
             return UIAction(
                 title: cancelAction.uiAction,
@@ -669,7 +864,7 @@ struct ChatView: View {
             chat.chatInfo.featureEnabled(.fullDelete) ? "Delete for everyone" : "Mark deleted for everyone"
         }
     }
-    
+
     private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
         switch (prevItem?.chatDir) {
         case .groupSnd: return true
@@ -742,9 +937,20 @@ struct ChatView: View {
 }
 
 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
+    var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+    chatSettings.enableNtfs = enableNtfs
+    updateChatSettings(chat, chatSettings: chatSettings)
+}
+
+func toggleChatFavorite(_ chat: Chat, favorite: Bool) {
+    var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+    chatSettings.favorite = favorite
+    updateChatSettings(chat, chatSettings: chatSettings)
+}
+
+func updateChatSettings(_ chat: Chat, chatSettings: ChatSettings) {
     Task {
         do {
-            let chatSettings = ChatSettings(enableNtfs: enableNtfs)
             try await apiSetChatSettings(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, chatSettings: chatSettings)
             await MainActor.run {
                 switch chat.chatInfo {

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

@@ -154,7 +154,7 @@ struct ComposeState {
     }
 
     var attachmentDisabled: Bool {
-        if editing || liveMessage != nil { return true }
+        if editing || liveMessage != nil || inProgress { return true }
         switch preview {
         case .noPreview: return false
         case .linkPreview: return false
@@ -234,15 +234,13 @@ struct ComposeView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var chat: Chat
     @Binding var composeState: ComposeState
-    @FocusState.Binding var keyboardVisible: Bool
+    @Binding var keyboardVisible: Bool
 
     @State var linkUrl: URL? = nil
     @State var prevLinkUrl: URL? = nil
     @State var pendingLinkUrl: URL? = nil
     @State var cancelledLinks: Set<String> = []
 
-    @AppStorage(GROUP_DEFAULT_XFTP_SEND_ENABLED, store: groupDefaults) private var xftpSendEnabled = false
-
     @State private var showChooseSource = false
     @State private var showMediaPicker = false
     @State private var showTakePhoto = false
@@ -266,7 +264,7 @@ struct ComposeView: View {
             default: previewView()
             }
             HStack (alignment: .bottom) {
-                Button {
+                let b = Button {
                     showChooseSource = true
                 } label: {
                     Image(systemName: "paperclip")
@@ -276,11 +274,22 @@ struct ComposeView: View {
                 .frame(width: 25, height: 25)
                 .padding(.bottom, 12)
                 .padding(.leading, 12)
+                if case let .group(g) = chat.chatInfo,
+                   !g.fullGroupPreferences.files.on {
+                    b.disabled(true).onTapGesture {
+                        AlertManager.shared.showAlertMsg(
+                            title: "Files and media prohibited!",
+                            message: "Only group owners can enable files and media."
+                        )
+                    }
+                } else {
+                    b
+                }
                 ZStack(alignment: .leading) {
                     SendMessageView(
                         composeState: $composeState,
-                        sendMessage: {
-                            sendMessage()
+                        sendMessage: { ttl in
+                            sendMessage(ttl: ttl)
                             resetLinkPreview()
                         },
                         sendLiveMessage: sendLiveMessage,
@@ -298,6 +307,7 @@ struct ComposeView: View {
                         },
                         finishVoiceMessageRecording: finishVoiceMessageRecording,
                         allowVoiceMessagesToContact: allowVoiceMessagesToContact,
+                        timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                         onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
                         keyboardVisible: $keyboardVisible
                     )
@@ -427,8 +437,10 @@ struct ComposeView: View {
                 && (!composeState.message.isEmpty || composeState.liveMessage?.sentMsg != nil) {
                 cancelCurrentVoiceRecording()
                 clearCurrentDraft()
-                sendMessage()
+                sendMessage(ttl: nil)
                 resetLinkPreview()
+            } else if (composeState.inProgress) {
+                clearCurrentDraft()
             } else if !composeState.empty  {
                 saveCurrentDraft()
             } else {
@@ -462,8 +474,7 @@ struct ComposeView: View {
     }
 
     private var maxFileSize: Int64 {
-        let fileProtocol: FileProtocol = xftpSendEnabled ? .xftp : .smp
-        return getMaxFileSize(fileProtocol)
+        getMaxFileSize(.xftp)
     }
 
     private func sendLiveMessage() async {
@@ -471,7 +482,7 @@ struct ComposeView: View {
         let lm = composeState.liveMessage
         if (composeState.sendEnabled || composeState.quoting)
             && (lm == nil || lm?.sentMsg == nil),
-           let ci = await sendMessageAsync(typedMsg, live: true) {
+           let ci = await sendMessageAsync(typedMsg, live: true, ttl: nil) {
             await MainActor.run {
                 composeState = composeState.copy(liveMessage: LiveMessage(chatItem: ci, typedMsg: typedMsg, sentMsg: typedMsg))
             }
@@ -487,7 +498,7 @@ struct ComposeView: View {
         let typedMsg = composeState.message
         if let liveMessage = composeState.liveMessage {
             if let sentMsg = liveMessageToSend(liveMessage, typedMsg),
-               let ci = await sendMessageAsync(sentMsg, live: true) {
+               let ci = await sendMessageAsync(sentMsg, live: true, ttl: nil) {
                 await MainActor.run {
                     composeState = composeState.copy(liveMessage: LiveMessage(chatItem: ci, typedMsg: typedMsg, sentMsg: sentMsg))
                 }
@@ -525,7 +536,11 @@ struct ComposeView: View {
         case .noPreview:
             EmptyView()
         case let .linkPreview(linkPreview: preview):
-            ComposeLinkView(linkPreview: preview, cancelPreview: cancelLinkPreview)
+            ComposeLinkView(
+                linkPreview: preview,
+                cancelPreview: cancelLinkPreview,
+                cancelEnabled: !composeState.inProgress
+            )
         case let .mediaPreviews(mediaPreviews: media):
             ComposeImageView(
                 images: media.map { (img, _) in img },
@@ -533,7 +548,7 @@ struct ComposeView: View {
                     composeState = composeState.copy(preview: .noPreview)
                     chosenMedia = []
                 },
-                cancelEnabled: !composeState.editing)
+                cancelEnabled: !composeState.editing && !composeState.inProgress)
         case let .voicePreview(recordingFileName, _):
             ComposeVoiceView(
                 recordingFileName: recordingFileName,
@@ -543,7 +558,7 @@ struct ComposeView: View {
                     cancelVoiceMessageRecording($0)
                     clearState()
                 },
-                cancelEnabled: !composeState.editing,
+                cancelEnabled: !composeState.editing && !composeState.inProgress,
                 stopPlayback: $stopPlayback
             )
         case let .filePreview(fileName, _):
@@ -552,7 +567,7 @@ struct ComposeView: View {
                 cancelFile: {
                     composeState = composeState.copy(preview: .noPreview)
                 },
-                cancelEnabled: !composeState.editing)
+                cancelEnabled: !composeState.editing && !composeState.inProgress)
         }
     }
 
@@ -575,15 +590,15 @@ struct ComposeView: View {
         }
     }
 
-    private func sendMessage() {
+    private func sendMessage(ttl: Int?) {
         logger.debug("ChatView sendMessage")
         Task {
             logger.debug("ChatView sendMessage: in Task")
-            _ = await sendMessageAsync(nil, live: false)
+            _ = await sendMessageAsync(nil, live: false, ttl: ttl)
         }
     }
 
-    private func sendMessageAsync(_ text: String?, live: Bool) async -> ChatItem? {
+    private func sendMessageAsync(_ text: String?, live: Bool, ttl: Int?) async -> ChatItem? {
         var sent: ChatItem?
         let msgText = text ?? composeState.message
         let liveMessage = composeState.liveMessage
@@ -603,36 +618,36 @@ struct ComposeView: View {
 
             switch (composeState.preview) {
             case .noPreview:
-                sent = await send(.text(msgText), quoted: quoted, live: live)
+                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
             case .linkPreview:
-                sent = await send(checkLinkPreview(), quoted: quoted, live: live)
+                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
             case let .mediaPreviews(mediaPreviews: media):
                 let last = media.count - 1
                 if last >= 0 {
                     for i in 0..<last {
                         if case (_, .video(_, _, _)) = media[i] {
-                            sent = await sendVideo(media[i])
+                            sent = await sendVideo(media[i], ttl: ttl)
                         } else {
-                            sent = await sendImage(media[i])
+                            sent = await sendImage(media[i], ttl: ttl)
                         }
                         _ = try? await Task.sleep(nanoseconds: 100_000000)
                     }
                     if case (_, .video(_, _, _)) = media[last] {
-                        sent = await sendVideo(media[last], text: msgText, quoted: quoted, live: live)
+                        sent = await sendVideo(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
                     } else {
-                        sent = await sendImage(media[last], text: msgText, quoted: quoted, live: live)
+                        sent = await sendImage(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
                     }
                 }
                 if sent == nil {
-                    sent = await send(.text(msgText), quoted: quoted, live: live)
+                    sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
                 }
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
                 chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
             case let .filePreview(_, file):
                 if let savedFile = saveFileFromURL(file) {
-                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live)
+                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                 }
             }
         }
@@ -650,17 +665,21 @@ struct ComposeView: View {
             if let oldMsgContent = ei.content.msgContent {
                 do {
                     let mc = updateMsgContent(oldMsgContent)
-                    let chatItem = try await apiUpdateChatItem(
-                        type: chat.chatInfo.chatType,
-                        id: chat.chatInfo.apiId,
-                        itemId: ei.id,
-                        msg: mc,
-                        live: live
-                    )
-                    await MainActor.run {
-                        _ = self.chatModel.upsertChatItem(self.chat.chatInfo, chatItem)
+                    if mc != oldMsgContent || (ei.meta.itemLive ?? false) {
+                        let chatItem = try await apiUpdateChatItem(
+                            type: chat.chatInfo.chatType,
+                            id: chat.chatInfo.apiId,
+                            itemId: ei.id,
+                            msg: mc,
+                            live: live
+                        )
+                        await MainActor.run {
+                            _ = self.chatModel.upsertChatItem(self.chat.chatInfo, chatItem)
+                        }
+                        return chatItem
+                    } else {
+                        return nil
                     }
-                    return chatItem
                 } catch {
                     logger.error("ChatView.sendMessage error: \(error.localizedDescription)")
                     AlertManager.shared.showAlertMsg(title: "Error updating message", message: "Error: \(responseError(error))")
@@ -688,30 +707,31 @@ struct ComposeView: View {
             }
         }
 
-        func sendImage(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false) async -> ChatItem? {
+        func sendImage(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             let (image, data) = imageData
             if let data = data, let savedFile = saveAnyImage(data) {
-                return await send(.image(text: text, image: image), quoted: quoted, file: savedFile, live: live)
+                return await send(.image(text: text, image: image), quoted: quoted, file: savedFile, live: live, ttl: ttl)
             }
             return nil
         }
 
-        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false) async -> ChatItem? {
+        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             let (image, data) = imageData
             if case let .video(_, url, duration) = data, let savedFile = saveFileFromURLWithoutLoad(url) {
-                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live)
+                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
             }
             return nil
         }
 
-        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false) async -> ChatItem? {
+        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             if let chatItem = await apiSendMessage(
                 type: chat.chatInfo.chatType,
                 id: chat.chatInfo.apiId,
                 file: file,
                 quotedItemId: quoted,
                 msg: mc,
-                live: live
+                live: live,
+                ttl: ttl
             ) {
                 await MainActor.run {
                     chatModel.removeLiveDummy(animated: false)
@@ -719,6 +739,9 @@ struct ComposeView: View {
                 }
                 return chatItem
             }
+            if let file = file {
+                removeFile(file)
+            }
             return nil
         }
 
@@ -924,19 +947,18 @@ struct ComposeView_Previews: PreviewProvider {
     static var previews: some View {
         let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
         @State var composeState = ComposeState(message: "hello")
-        @FocusState var keyboardVisible: Bool
 
         return Group {
             ComposeView(
                 chat: chat,
                 composeState: $composeState,
-                keyboardVisible: $keyboardVisible
+                keyboardVisible: Binding.constant(true)
             )
             .environmentObject(ChatModel())
             ComposeView(
                 chat: chat,
                 composeState: $composeState,
-                keyboardVisible: $keyboardVisible
+                keyboardVisible: Binding.constant(true)
             )
             .environmentObject(ChatModel())
         }

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

@@ -38,7 +38,7 @@ struct ComposeVoiceView: View {
     @State private var playbackTime: TimeInterval?
     @State private var startingPlayback: Bool = false
 
-    private static let previewHeight: CGFloat = 50
+    private static let previewHeight: CGFloat = 55
 
     var body: some View {
         ZStack {
@@ -66,6 +66,7 @@ struct ComposeVoiceView: View {
                 }
             }
             .padding(.trailing, 12)
+            .padding(.top, 4)
 
             ProgressBar(length: MAX_VOICE_MESSAGE_LENGTH, progress: $recordingTime)
         }
@@ -105,9 +106,12 @@ struct ComposeVoiceView: View {
                 }
             }
             .padding(.trailing, 12)
+            .padding(.top, 4)
 
             if let recordingLength = recordingTime {
-                ProgressBar(length: recordingLength, progress: $playbackTime)
+                GeometryReader { _ in
+                    SliderBar(length: recordingLength, progress: $playbackTime, seek: { audioPlayer?.seek($0) })
+                }
             }
         }
         .onChange(of: stopPlayback) { _ in
@@ -145,6 +149,18 @@ struct ComposeVoiceView: View {
         }
     }
 
+    struct SliderBar: View {
+        var length: TimeInterval
+        @Binding var progress: TimeInterval?
+        var seek: (TimeInterval) -> Void
+
+        var body: some View {
+            Slider(value: Binding(get: { progress ?? TimeInterval(0) }, set: { seek($0) }), in: 0 ... length)
+                .frame(maxWidth: .infinity)
+                .frame(height: 4)
+        }
+    }
+
     private struct ProgressBar: View {
         var length: TimeInterval
         @Binding var progress: TimeInterval?
@@ -154,10 +170,10 @@ struct ComposeVoiceView: View {
                 ZStack {
                     Rectangle()
                         .fill(Color.accentColor)
-                        .frame(width: min(CGFloat((progress ?? TimeInterval(0)) / length) * geometry.size.width, geometry.size.width), height: 3)
+                        .frame(width: min(CGFloat((progress ?? TimeInterval(0)) / length) * geometry.size.width, geometry.size.width), height: 4)
                         .animation(.linear, value: progress)
                 }
-                .frame(height: ComposeVoiceView.previewHeight - 1, alignment: .bottom) // minus 1 is for the bottom padding
+                .frame(height: 4)
             }
         }
     }
@@ -172,8 +188,7 @@ struct ComposeVoiceView: View {
                 playbackTime = recordingTime // animate progress bar to the end
             }
         )
-        audioPlayer?.start(fileName: recordingFileName)
-        playbackTime = TimeInterval(0)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -13,9 +13,10 @@ import PhotosUI
 
 struct NativeTextEditor: UIViewRepresentable {
     @Binding var text: String
+    @Binding var disableEditing: Bool
     let height: CGFloat
     let font: UIFont
-    @FocusState.Binding var focused: Bool
+    @Binding var focused: Bool
     let alignment: TextAlignment
     let onImagesAdded: ([UploadContent]) -> Void
     
@@ -26,7 +27,11 @@ struct NativeTextEditor: UIViewRepresentable {
         field.textAlignment = alignment == .leading ? .left : .right
         field.autocapitalizationType = .sentences
         field.setOnTextChangedListener { newText, images in
-            text = newText
+            if !disableEditing {
+                text = newText
+            } else {
+                field.text = text
+            }
             if !images.isEmpty {
                 onImagesAdded(images)
             }
@@ -99,31 +104,33 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
     }
 
     func textViewDidChange(_ textView: UITextView) {
-        var images: [UploadContent] = []
-        var rangeDiff = 0
-        let newAttributedText = NSMutableAttributedString(attributedString: textView.attributedText)
-        textView.attributedText.enumerateAttribute(
-            NSAttributedString.Key.attachment,
-            in: NSRange(location: 0, length: textView.attributedText.length),
-            options: [],
-            using: { value, range, _ in
-                if let attachment = (value as? NSTextAttachment)?.fileWrapper?.regularFileContents {
-                    do {
-                        images.append(.animatedImage(image: try UIImage(gifData: attachment)))
-                    } catch {
-                        if let img = (value as? NSTextAttachment)?.image {
-                            images.append(.simpleImage(image: img))
+        if textView.markedTextRange == nil {
+            var images: [UploadContent] = []
+            var rangeDiff = 0
+            let newAttributedText = NSMutableAttributedString(attributedString: textView.attributedText)
+            textView.attributedText.enumerateAttribute(
+                NSAttributedString.Key.attachment,
+                in: NSRange(location: 0, length: textView.attributedText.length),
+                options: [],
+                using: { value, range, _ in
+                    if let attachment = (value as? NSTextAttachment)?.fileWrapper?.regularFileContents {
+                        do {
+                            images.append(.animatedImage(image: try UIImage(gifData: attachment)))
+                        } catch {
+                            if let img = (value as? NSTextAttachment)?.image {
+                                images.append(.simpleImage(image: img))
+                            }
                         }
+                        newAttributedText.replaceCharacters(in: NSMakeRange(range.location - rangeDiff, range.length), with: "")
+                        rangeDiff += range.length
                     }
-                    newAttributedText.replaceCharacters(in: NSMakeRange(range.location - rangeDiff, range.length), with: "")
-                    rangeDiff += range.length
                 }
+            )
+            if textView.attributedText != newAttributedText {
+                textView.attributedText = newAttributedText
             }
-        )
-        if textView.attributedText != newAttributedText {
-            textView.attributedText = newAttributedText
+            onTextChanged(textView.text, images)
         }
-        onTextChanged(textView.text, images)
     }
     
     func textViewDidBeginEditing(_ textView: UITextView) {
@@ -137,12 +144,12 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
 struct NativeTextEditor_Previews: PreviewProvider{
     static var previews: some View {
-        @FocusState var keyboardVisible: Bool
         return NativeTextEditor(
             text: Binding.constant("Hello, world!"),
+            disableEditing: Binding.constant(false),
             height: 100,
             font: UIFont.preferredFont(forTextStyle: .body),
-            focused: $keyboardVisible,
+            focused: Binding.constant(false),
             alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )