deploy: 5d8e11c3a2

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @epoberezkin @jr-simplex

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: simplex-chat
-open_collective: simplex-chat

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,68 +0,0 @@
-name: Bug
-description: File a bug report/issue
-title: "[Bug]: "
-labels: ["type:bug", "type: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

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

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,40 +0,0 @@
-name: Feature
-description: Suggest your feature
-title: "[Feature]: "
-labels: ["type:enhancement", "type: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

@@ -1,16 +0,0 @@
-name: Question
-description: Ask your question
-title: "[Q]: "
-labels: ["type:question", "type: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/changelog_conf.json

@@ -1,4 +0,0 @@
-{
-  "template": "Commits:\n${{UNCATEGORIZED}}",
-  "pr_template": "- ${{TITLE}}"
-}

.github/workflows/build.yml

@@ -1,155 +0,0 @@
-name: build
-
-on:
-  push:
-    branches:
-      - master
-      - stable
-      - users
-    tags:
-      - "v*"
-  pull_request:
-
-jobs:
-  prepare-release:
-    if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone project
-        uses: actions/checkout@v2
-
-      - name: Build changelog
-        id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v1
-        with:
-          configuration: .github/changelog_conf.json
-          failOnError: true
-          ignorePreReleases: true
-          commitMode: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create release
-        uses: softprops/action-gh-release@v1
-        with:
-          body: ${{ steps.build_changelog.outputs.changelog }}
-          prerelease: true
-          files: |
-            LICENSE
-          fail_on_unmatched_files: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  build:
-    name: build-${{ matrix.os }}
-    if: always()
-    needs: prepare-release
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-20_04-x86-64
-          - os: ubuntu-22.04
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-ubuntu-22_04-x86-64
-          - os: macos-latest
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-macos-x86-64
-          - os: windows-latest
-            cache_path: C:/cabal
-            asset_name: simplex-chat-windows-x86-64
-    steps:
-      - name: Clone project
-        uses: actions/checkout@v2
-
-      - name: Setup Haskell
-        uses: haskell/actions/setup@v1
-        with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
-
-      # / Unix
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-latest'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                      >> cabal.project.local
-          echo "package direct-sqlcipher"                                   >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                        >> cabal.project.local
-
-      - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest'
-        run: brew install pkg-config
-
-      - name: Unix prepare cabal.project.local for Ubuntu
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
-        shell: bash
-        run: |
-          echo "ignore-project: False"    >> cabal.project.local
-          echo "package direct-sqlcipher" >> cabal.project.local
-          echo "    flags: +openssl"      >> cabal.project.local
-
-      - name: Unix build
-        id: unix_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 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
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
-
-      - name: Windows build
-        id: windows_build
-        if: matrix.os == 'windows-latest'
-        shell: cmd
-        run: |
-          cabal build --enable-tests
-          cabal list-bin simplex-chat > tmp_bin_path
-          set /p bin_path= < tmp_bin_path
-          echo ::set-output name=bin_path::%bin_path%
-
-      - name: Windows 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.windows_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
-      # Windows /

.github/workflows/cla.yml

@@ -1,36 +0,0 @@
-name: "CLA Assistant"
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened, closed, synchronize]
-
-jobs:
-  CLAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
-        # Beta Release
-        uses: cla-assistant/github-action@v2.1.3-beta
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: 'signatures/v1.1/cla.json'
-          path-to-document: 'https://github.com/simplex-chat/cla/blob/master/CLA.md'
-          # branch should not be protected
-          remote-organization-name: simplex-chat
-          remote-repository-name: cla
-          branch: 'master'
-          # allowlist: user1,bot*
-
-         #below are the optional inputs - If the optional inputs are not given, then default values will be taken
-          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-          #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
-          #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-          #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/web.yml

@@ -1,38 +0,0 @@
-name: Build Eleventy
-
-on:
-  push:
-    branches:
-      - master
-      - stable
-    paths:
-      - website/**
-      - images/**
-      - blog/**
-      - .github/workflows/web.yml
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies & build
-        run: |
-          ./website/web.sh
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          publish_dir: ./website/_site
-          github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,78 +0,0 @@
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-.DS_Store
-
-# Haskell
-dist
-dist-*
-cabal-dev
-*.o
-*.hi
-*.hie
-*.chi
-*.chs.h
-*.dyn_o
-*.dyn_hi
-.hpc
-.hsenv
-.cabal-sandbox/
-cabal.sandbox.config
-*.prof
-*.aux
-*.hp
-*.eventlog
-.stack-work/
-cabal.project.local
-cabal.project.local~
-.HTF/
-.ghc.environment.*
-stack.yaml.lock
-
-# Chat database
-*.db
-*.db.bak
-
-# Temporary test files
-tests/tmp
-tests/tmp*
-logs/
-
-*.devcontainer
-# for website
-website/node_modules/
-website/src/blog/
-website/translations.json
-website/src/_data/supported_languages.json
-website/src/img/images/
-website/src/images/
-# Generated files
-website/package/generated*
-
-# Ignore build tool output, e.g. code coverage
-website/.nyc_output/
-website/coverage/
-
-# Ignore API documentation
-website/api-docs/
-
-# Ignore folders from source code editors
-website/.vscode
-website/.idea
-
-# Ignore eleventy output when doing manual tests
-website/_site/
-
-website/package-lock.json
-
-# Ignore test files
-website/.cache
-website/test/stubs-layout-cache/_includes/*.js
-apps/android/app/release

.well-known/README.md

@@ -12,4 +12,6 @@ File `assetlinks.json` includes certificate hashes for:
 
 ## iOS
 
-`apple-app-site-association` currently does not work, as it needs to be served with `Content-type: application/json; charset=utf-8` and GitHub pages do not support adding this header to files without JSON extension.
+`apple-app-site-association` needs to be served with `Content-type: application/json; charset=utf-8` and GitHub pages do not support adding this header to files without JSON extension.
+
+To workaround this (thanks to [StackOverflow - Serve json data from github pages](https://stackoverflow.com/questions/39199042/serve-json-data-from-github-pages)) we're creating directory named `apple-app-site-association` with `index.json` file that contains all the necessary configs.

.well-known/README/index.html

@@ -0,0 +1,12 @@
+<h1 id="well-known" tabindex="-1">.well-known</h1>
+<p>This website files allow opening SimpleX Chat links (1-time invitations, contact addresses and groups) directly in the app.</p>
+<h2 id="android" tabindex="-1">Android</h2>
+<p>File <code>assetlinks.json</code> includes certificate hashes for:</p>
+<ul>
+<li>Play Store (5E:3E:DC:C2:00:FB:A8:D5:F4:88:F3:CA:4C:32:5B:05:78:C5:6A:9C:03:A1:CC:B5:92:9C:D7:5C:7E:57:E2:4D)</li>
+<li>APK in GitHub releases (3C:52:C4:FD:3C:AD:1C:07:C9:B0:0A:70:80:E3:58:FA:B9:FE:FC:B8:AF:5A:EC:14:77:65:F1:6D:0F:21:AD:85)</li>
+<li>F-Droid (AE:C1:95:DC:FD:46:14:BD:3A:91:EC:26:D1:D5:14:C8:75:71:C5:CC:8D:CF:48:08:3F:92:83:14:3C:A2:B9:A6)</li>
+</ul>
+<h2 id="ios" tabindex="-1">iOS</h2>
+<p><code>apple-app-site-association</code> needs to be served with <code>Content-type: application/json; charset=utf-8</code> and GitHub pages do not support adding this header to files without JSON extension.</p>
+<p>To workaround this (thanks to <a href="https://stackoverflow.com/questions/39199042/serve-json-data-from-github-pages">StackOverflow - Serve json data from github pages</a>) we're creating directory named <code>apple-app-site-association</code> with <code>index.json</code> file that contains all the necessary configs.</p>

.well-known/apple-app-site-association/index.json

@@ -3,7 +3,7 @@
     "details": [
       {
         "appIDs": [
-          "5NN7GUYB6.chat.simplex.app"
+          "5NN7GUYB6T.chat.simplex.app"
         ],
         "components": [
           {

.well-known/nostr.json

@@ -0,0 +1,18 @@
+{
+  "names": {
+    "_": "c998a5739f04f7fff202c54962aa5782b34ecb10d6f915bdfdd7582963bf9171"
+  },
+  "relays": {
+    "c998a5739f04f7fff202c54962aa5782b34ecb10d6f915bdfdd7582963bf9171": [
+      "wss://nostr.orangepill.dev",
+      "wss://eden.nostr.land",
+      "wss://relay.damus.io",
+      "wss://relay.snort.social",
+      "wss://relay.current.fyi",
+      "wss://nos.lol",
+      "wss://relay.nostr.bg",
+      "wss://nostr-verified.wellorder.net",
+      "wss://nostr.milou.lol"
+    ]
+  }
+}

.well-known/org.flathub.VerifiedApps.txt

@@ -0,0 +1 @@
+ae8b5b2e-76c9-4a31-a044-bcbda1cdf264

Dockerfile

@@ -1,32 +0,0 @@
-FROM ubuntu:focal AS build
-
-# Install curl and simplex-chat-related dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev libssl-dev
-
-# Install ghcup
-RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
-    chmod +x /usr/bin/ghcup
-
-# Install ghc
-RUN ghcup install ghc 8.10.7
-# Install cabal
-RUN ghcup install cabal
-# Set both as default
-RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal
-
-COPY . /project
-WORKDIR /project
-
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
-
-# Adjust build
-RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
-
-# Compile simplex-chat
-RUN cabal update
-RUN cabal install
-
-FROM scratch AS export-stage
-COPY --from=build /root/.cabal/bin/simplex-chat /

LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

PRIVACY.md

@@ -1,96 +0,0 @@
-# SimpleX Chat Terms & Privacy Policy
-
-SimpleX Chat is the first communication platform that has no user profile IDs of any kind, not even random numbers. Not only it has no access to your messages (thanks to open-source double-ratchet end-to-end encryption protocol and additional encryption layers), it also has no access to your profile and contacts - we cannot observe your connections graph.
-
-If you believe that some of the clauses in this document are not aligned with our mission or principles, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
-
-## Privacy Policy
-
-SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
-
-SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-### Information you provide
-
-We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
-
-Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
-
-Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
-
-Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.
-
-User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
-
-### Information we may share
-
-We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.
-
-We use Third party to provide email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according their privacy policies and terms of service.
-
-The cases when SimpleX Chat may need to share the data we temporarily store on the servers:
-
-- To meet any applicable law, regulation, legal process or enforceable governmental request.
-- To enforce applicable Terms, including investigation of potential violations.
-- To detect, prevent, or otherwise address fraud, security, or technical issues.
-- To protect against harm to the rights, property, or safety of SimpleX Chat, our users, or the public as required or permitted by law.
-
-At the time of updating this document, we have never provided or have been requested the access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process.
-
-### Updates
-
-We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
-
-Please also read our Terms of Service.
-
-If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
-
-## Terms of Service
-
-You accept to our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
-
-**Minimal age**. You must be at least 13 years old to use our Services. The minimum age to use our Services without parental approval may be higher in your country.
-
-**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
-
-**Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.
-
-**Operating our services**. For the purpose of operating our Services, you agree that your end-to-end encrypted messages are transferred via our servers in the United Kingdom, the United States and other countries where we have or use facilities and service providers or partners.
-
-**Software**. You agree to downloading and installing updates to our Services when they are available; they would only be automatic if you configure your devices in this way.
-
-**Traffic and device costs**. You are solely responsible for the traffic and device costs on which you use our Services, and any associated taxes.
-
-**Legal and acceptable usage**. You agree to use our Services only for legal and acceptable purposes. You will not use (or assist others in using) our Services in ways that: 1) violate or infringe the rights of SimpleX Chat, our users, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal or impermissible communications, e.g. spam.
-
-**Damage to SimpleX Chat**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Services in unauthorized manners, or in ways that harm SimpleX Chat, our Services, or systems. For example, you must not 1) access our Services or systems without authorization, other than by using the apps; 2) disrupt the integrity or performance of our Services; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Services.
-
-**Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.
-
-**Storing the messages on the device**. Currently the messages are stored in the database on your device without encryption. It means that if you make a backup of the app and store it unecrypted, the backup provider may be able to access the messages.
-
-**No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
-
-**Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
-
-**Your Rights**. You own the mesasges and information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices.
-
-**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 licence](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
-
-**SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
-
-**Disclaimers**. YOU USE OUR SERVICES AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR SERVICES ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR SERVICES WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR SERVICES WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR SERVICES. WE ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF OUR USERS OR OTHER THIRD PARTIES. YOU RELEASE US, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.
-
-**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR AGGREGATE LIABILITY RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN OUR TERMS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-**Availability**. Our Services may be interrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Services, including certain features and the support for certain devices and platforms, at any time.
-
-**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Terms, us, or our Services in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern our Terms, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat and you, without regard to conflict of law provisions.
-
-**Changes to the terms**. SimpleX Chat may update the Terms from time to time. Your continued use of our Services confirms your acceptance of our updated Terms and supersedes any prior Terms. You will comply with all applicable export control and trade sanctions laws. Our Terms cover the entire agreement between you and SimpleX Chat regarding our Services. If you do not agree with our Terms, you should stop using our Services.
-
-**Enforcing the terms**. If we fail to enforce any of our Terms, that does not mean we waive the right to enforce them. If any provision of the Terms is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Terms and shall not affect the enforceability of the remaining provisions. Our Services are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject us to any regulations in another country. We reserve the right to limit our Services in any country. If you have specific questions about these Terms, please contact us at chat@simplex.chat.
-
-**Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.
-
-Updated November 8, 2022

README.md

@@ -1,375 +0,0 @@
-[![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
-[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
-[![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
-[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
-[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
-
-| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
-
-<img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
-
-# SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design!
-
-[<img src="./images/trail-of-bits.jpg" height="100">](http://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html) &nbsp;&nbsp;&nbsp; [<img src="./images/privacy-guides.jpg" height="80">](https://www.privacyguides.org/en/real-time-communication/#simplex-chat) &nbsp;&nbsp;&nbsp; [<img src="./images/kuketz-blog.jpg" height="80">](https://www.kuketz-blog.de/simplex-eindruecke-vom-messenger-ohne-identifier/)
-
-## Welcome to SimpleX Chat!
-
-1. 📲 [Install the app](#install-the-app).
-2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
-3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
-4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
-
-[Learn more about SimpleX Chat](#contents).
-
-## Install the app
-
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
-&nbsp;
-[![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/f_droid.svg" alt="F-Droid" height="41">](https://app.simplex.chat)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)
-
-- 🖲 Protects your messages and metadata - who you talk to and when.
-- 🔐 Double ratchet end-to-end encryption, with additional encryption layer.
-- 📱 Mobile apps for Android ([Google Play](https://play.google.com/store/apps/details?id=chat.simplex.app), [APK](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084).
-- 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
-- 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
-
-## Connect to the team via the app
-
-- to ask any questions
-- to suggest any improvements
-- to share anything relevant
-
-## Join user groups
-
-**Please note**: The groups below are created for the users to be able to ask questions, make suggestions and ask questions about SimpleX Chat only.
-
-You also can:
-- criticize the app, and make comparisons with other messengers.
-- share new messengers you think could be interesting for privacy, as long as you don't spam.
-- share some privacy related publications, infrequently.
-- having preliminary approved with the admin in direct message, share the link to a group you created.
-
-You must:
-- be polite to other users
-- avoid spam (too frequent messages, even if they are relevant)
-- avoid any personal attacks or hostility.
-- avoid sharing any content that is not relevant to the above (that includes, but is not limited to, discussing politics or any aspects of society other than privacy, security, technology and communications, sharing any content that may be found offensive by other users, etc.).
-
-Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
-
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-3](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fp-j-D_PrY2UMDchFHEUtbSES0nmzCnvD%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA3gBfMjB_GDEmKQwjNdqGbnX91yfuZ7nRJgQijsx5Khc%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%2262MvNZ_Ec2mmlS8V0QNtLQ%3D%3D%22%7D)
-
-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).
-
-You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
-
-## Make a private connection
-
-You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
-
-The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
-
-<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app1.png" alt="Make a private connection" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app2.png" alt="Conversation" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app3.png" alt="Video call" height="360">
-
-After you connect, you can [verify connection security code](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md#connection-security-verification).
-
-## User guide (NEW)
-
-Read about the app features and settings in the new [User guide](./docs/guide/README.md).
-
-## Help translating SimpleX Chat
-
-Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps, website and documents are translated to many other languages.
-
-Join our translators to help SimpleX grow!
-
-|locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
-|:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
-|🇬🇧 en|English   | |✓|✓|✓|✓|
-|ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
-|🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
-|🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
-|🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
-|🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
-|🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇳🇱 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/)|||
-|🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
-|🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
-
-Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
-
-## Contribute
-
-We would love to have you join the development! You can help us with:
-
-- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
-- contributing to SimpleX Chat knowledge-base.
-- developing features - please connect to us via chat so we can help you get started.
-
-## Help us with donations
-
-Huge thank you to everybody who donated to SimpleX Chat!
-
-We are prioritizing users privacy and security - it would be impossible without your support.
-
-Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
-
-Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.
-
-It is possible to donate via:
-
-- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
-- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
-- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
-
-Thank you,
-
-Evgeny
-
-SimpleX Chat founder
-
-## Contents
-
-- [Why privacy matters](#why-privacy-matters)
-- [SimpleX approach to privacy and security](#simplex-approach-to-privacy-and-security)
-  - [Complete privacy](#complete-privacy-of-your-identity-profile-contacts-and-metadata)
-  - [Protection against spam and abuse](#the-best-protection-against-spam-and-abuse)
-  - [Ownership and security of your data](#complete-ownership-control-and-security-of-your-data)
-  - [Users own SimpleX network](#users-own-simplex-network)
-- [Frequently asked questions](#frequently-asked-questions)
-- [News and updates](#news-and-updates)
-- [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
-- [SimpleX Platform design](#simplex-platform-design)
-- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
-- [For developers](#for-developers)
-- [Roadmap](#roadmap)
-- [Disclaimers, Security contact, License](#disclaimers)
-
-## Why privacy matters
-
-Everyone should care about privacy and security of their communications - innocuous conversations can put you in danger even if there is nothing to hide.
-
-One of the most shocking stories is the experience of [Mohamedou Ould Salahi](https://en.wikipedia.org/wiki/Mohamedou_Ould_Slahi) that he wrote about in his memoir and that is shown in The Mauritanian movie. He was put into Guantanamo camp, without trial, and was tortured there for 15 years after a phone call to his relative in Afghanistan, under suspicion of being involved in 9/11 attacks, even though he lived in Germany for the 10 years prior to the attacks.
-
-It is not enough to use an end-to-end encrypted messenger, we all should use the messengers that protect the privacy of our personal networks - who we are connected with.
-
-## SimpleX approach to privacy and security
-
-### Complete privacy of your identity, profile, contacts and metadata
-
-**Unlike any other existing messaging platform, SimpleX has no identifiers assigned to the users** - not even random numbers. This protects the privacy of who are you communicating with, hiding it from SimpleX platform servers and from any observers. [Read more](./docs/SIMPLEX.md#full-privacy-of-your-identity-profile-contacts-and-metadata).
-
-### The best protection against spam and abuse
-
-As you have no identifier on SimpleX platform, you cannot be contacted unless you share a one-time invitation link or an optional temporary user address. [Read more](./docs/SIMPLEX.md#the-best-protection-against-spam-and-abuse).
-
-### Complete ownership, control and security of your data
-
-SimpleX stores all user data on client devices, the messages are only held temporarily on SimpleX relay servers until they are received. [Read more](./docs/SIMPLEX.md#complete-ownership-control-and-security-of-your-data).
-
-### Users own SimpleX network
-
-You can use SimpleX with your own servers and still communicate with people using the servers that are pre-configured in the apps or any other SimpleX servers. [Read more](./docs/SIMPLEX.md#users-own-simplex-network).
-
-## Frequently asked questions
-
-1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release announcement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.
-
-2. _Why should I not just use Signal?_ Signal is a centralized platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.
-
-3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identities?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.
-
-## News and updates
-
-Recent updates:
-
-[Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
-
-[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
-
-[Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
-
-[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
-
-[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
-
-[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
-
-[Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
-
-[All updates](./blog)
-
-## :zap: Quick installation of a terminal app
-
-```sh
-curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/stable/install.sh | bash
-```
-
-Once the chat client is installed, simply run `simplex-chat` from your terminal.
-
-![simplex-chat](./images/connection.gif)
-
-Read more about [installing and using the terminal app](./docs/CLI.md).
-
-## SimpleX Platform design
-
-SimpleX is a client-server network with a unique network topology that uses redundant, disposable message relay nodes to asynchronously pass messages via unidirectional (simplex) message queues, providing recipient and sender anonymity.
-
-Unlike P2P networks, all messages are passed through one or several server nodes, that do not even need to have persistence. In fact, the current [SMP server implementation](https://github.com/simplex-chat/simplexmq#smp-server) uses in-memory message storage, persisting only the queue records. SimpleX provides better metadata protection than P2P designs, as no global participant identifiers are used to deliver messages, and avoids [the problems of P2P networks](./docs/SIMPLEX.md#comparison-with-p2p-messaging-protocols).
-
-Unlike federated networks, the server nodes **do not have records of the users**, **do not communicate with each other** and **do not store messages** after they are delivered to the recipients. There is no way to discover the full list of servers participating in SimpleX network. This design avoids the problem of metadata visibility that all federated networks have and better protects from the network-wide attacks.
-
-Only the client devices have information about users, their contacts and groups.
-
-See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md) for more information on platform objectives and technical design.
-
-See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).
-
-## Privacy: technical details and limitations
-
-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.
-
-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.
-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.
-6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
-7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
-8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
-9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
-10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
-11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
-
-We plan to add soon:
-
-1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`.
-3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-
-## For developers
-
-You can:
-
-- use SimpleX Chat library to integrate chat functionality into your mobile apps.
-- create chat bots and services in Haskell - see [simple](./apps/simplex-bot/) and more [advanced chat bot example](./apps/simplex-bot-advanced/).
-- create chat bots and services in any language running SimpleX Chat terminal CLI as a local WebSocket server. See [TypeScript SimpleX Chat client](./packages/simplex-chat-client/) and [JavaScript chat bot example](./packages/simplex-chat-client/typescript/examples/squaring-bot.js).
-- run [simplex-chat terminal CLI](./docs/CLI.md) to execute individual chat commands, e.g. to send messages as part of shell script execution.
-
-If you are considering developing with SimpleX platform please get in touch for any advice and support.
-
-## Roadmap
-
-- ✅ Easy to deploy SimpleX server with in-memory message storage, without any dependencies.
-- ✅ Terminal (console) client with groups and files support.
-- ✅ One-click SimpleX server deployment on Linode.
-- ✅ End-to-end encryption using double-ratchet protocol with additional encryption layer.
-- ✅ Mobile apps v1 for Android and iOS.
-- ✅ Private instant notifications for Android using background service.
-- ✅ Haskell chat bot templates.
-- ✅ v2.0 - supporting images and files in mobile apps.
-- ✅ Manual chat history deletion.
-- ✅ End-to-end encrypted WebRTC audio and video calls via the mobile apps.
-- ✅ Privacy preserving instant notifications for iOS using Apple Push Notification service.
-- ✅ Chat database export and import.
-- ✅ Chat groups in mobile apps.
-- ✅ Connecting to messaging servers via Tor.
-- ✅ Dual server addresses to access messaging servers as v3 hidden services.
-- ✅ Chat server and TypeScript client SDK to develop chat interfaces, integrations and chat bots (ready for announcement).
-- ✅ Incognito mode to share a new random name with each contact.
-- ✅ Chat database encryption.
-- ✅ Automatic chat history deletion.
-- ✅ Links to join groups and improve groups stability.
-- ✅ Voice messages (with recipient opt-out per contact).
-- ✅ Basic authentication for SMP servers (to authorize creating new queues).
-- ✅ View deleted messages, full message deletion by sender (with recipient opt-in per contact).
-- ✅ Block screenshots and view in recent apps.
-- ✅ Advanced server configuration.
-- ✅ Disappearing messages (with recipient opt-in per-contact).
-- ✅ "Live" messages.
-- ✅ Contact verification via a separate out-of-band channel.
-- ✅ Multiple user profiles in the same chat database.
-- ✅ Optionally avoid re-using the same TCP session for multiple connections.
-- ✅ Preserve message drafts.
-- ✅ File server to optimize for efficient and private sending of large files.
-- ✅ Improved audio & video calls.
-- ✅ Support older Android OS and 32-bit CPUs.
-- ✅ Hidden chat profiles.
-- ✅ Sending and receiving large files via [XFTP protocol](./blog/20230301-simplex-file-transfer-protocol.md).
-- ✅ Video messages.
-- ✅ App access passcode.
-- 🏗 Improved Android app UI design.
-- 🏗 SMP queue redundancy and rotation (manual is supported).
-- 🏗 Reduced battery and traffic usage in large groups.
-- Include optional message into connection request sent via contact address.
-- Ephemeral/disappearing/OTR conversations with the existing contacts.
-- 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.
-- Feeds/broadcasts.
-- 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.
-
-## Disclaimers
-
-[SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed, and had many breaking changes and improvements in v1.0.0.
-
-The security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-SimpleX Chat is still a relatively early stage platform (the mobile apps were released in March 2022), so you may discover some bugs and missing features. We would really appreciate if you let us know anything that needs to be fixed or improved.
-
-The default servers configured in the app are provided on the best effort basis. We are currently not guaranteeing any SLAs, although historically our servers had over 99.9% uptime each.
-
-We have never provided or have been requested access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will be following due legal process.
-
-We do not log IP addresses of the users and we do not perform any traffic correlation on our servers. If transport level security is critical you must use Tor or some other similar network to access messaging servers. We will be improving the client applications to reduce the opportunities for traffic correlation.
-
-Please read more in [Terms & privacy policy](./PRIVACY.md).
-
-## Security contact
-
-To report a security vulnerability, please send us email to chat@simplex.chat. We will coordinate the fix and disclosure. Please do NOT report security vulnerabilities via GitHub issues.
-
-Please treat any findings of possible traffic correlation attacks allowing to correlate two different conversations to the same user, other than covered in [the threat model](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md#threat-model), as security vulnerabilities, and follow this disclosure process.
-
-## License
-
-[AGPL v3](./LICENSE)
-
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
-&nbsp;
-[![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/f_droid.svg" alt="F-Droid" height="41">](https://app.simplex.chat)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)

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/codeStyles/Project.xml

@@ -1,151 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ComposeCustomCodeStyleSettings>
-      <option name="USE_CUSTOM_FORMATTING_FOR_MODIFIERS" value="false" />
-    </ComposeCustomCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="SPACE_BEFORE_EXTEND_COLON" value="false" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="3" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="0" />
-      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="RIGHT_MARGIN" value="140" />
-      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="0" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="0" />
-      <option name="METHOD_PARAMETERS_WRAP" value="0" />
-      <option name="EXTENDS_LIST_WRAP" value="0" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="0" />
-      <option name="ASSIGNMENT_WRAP" value="0" />
-      <option name="METHOD_ANNOTATION_WRAP" value="0" />
-      <option name="CLASS_ANNOTATION_WRAP" value="0" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

apps/android/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

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/README.md

@@ -1,25 +0,0 @@
-# Android App Development
-
-This readme is currently a stub and as such is in development.
-
-Ultimately, this readme will act as a guide to contributing to the develop of the SimpleX android app.
-
-
-## Gotchas
-
-#### SHA Signature for verification for app links/deep links
-
-In order for the SimpleX app to be automatically adopted for opening links from https://simplex.chat the SHA certificate fingerprint for the App installed on the phone must be in the hosted [assetlinks.json](https://simplex.chat/.well-known/assetlinks.json) file on simplex.chat.
-
-The accepted fingerprints are in the `sha256_cert_fingerprints` list.
-
-To find your SHA certificate fingerprint perform the following steps.
-
-1. Build and install your development version of the app as usual
-2. From the terminal in Android studio run `adb shell pm get-app-links chat.simplex.app`
-3. Copy the signature listed in `signatures` in the result
-4. Add your signature to [assetlinks.json](https://github.com/simplex-chat/website/blob/master/.well-known/assetlinks.json) in the [website repo](https://github.com/simplex-chat/website) and make a PR. On approval, wait a few minutes for the changes to propagate to the public website and then you should be able to verify SimpleX.
-
-More information is available [here](https://developer.android.com/training/app-links/verify-site-associations#manual-verification). If there is no response when running the `pm get-app-links` command, the intents in `AndroidManifest.xml` are likely misspecified. A verification attempt can be triggered using `adb shell pm verify-app-links --re-verify chat.simplex.app`. 
-
-Note that this is not an issue for the app store build of the app as this is signed with our app store credentials and thus there is a stable signature over users. Developers do not have general access to these credentials for development and testing.

apps/android/app/.gitignore

@@ -1 +0,0 @@
-/build

apps/android/app/build.gradle

@@ -1,235 +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 117
-        versionName "5.0"
-
-        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 'com.charleskorn.kaml:kaml:0.43.0'
-    //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/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

apps/android/app/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt

@@ -1,22 +0,0 @@
-package chat.simplex.app
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("chat.simplex.app", appContext.packageName)
-  }
-}

apps/android/app/src/main/AndroidManifest.xml

@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="chat.simplex.app">
-
-  <uses-feature android:name="android.hardware.camera" />
-
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.VIDEO_CAPTURE" />
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  <uses-permission android:name="android.permission.VIBRATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-      tools:ignore="ScopedStorage" />
-  <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-
-  <application
-      android:name="SimplexApp"
-      android:allowBackup="true"
-      android:fullBackupOnly="true"
-      android:backupAgent="BackupAgent"
-      android:icon="@mipmap/icon"
-      android:label="${app_name}"
-      android:extractNativeLibs="${extract_native_libs}"
-      android:supportsRtl="true"
-      android:theme="@style/Theme.SimpleX">
-    <!--      android:localeConfig="@xml/locales_config"-->
-
-    <!-- Main activity -->
-    <activity
-        android:name=".MainActivity"
-        android:launchMode="singleTask"
-        android:exported="true"
-        android:label="${app_name}"
-        android:windowSoftInputMode="adjustResize"
-        android:theme="@style/Theme.SimpleX">
-      <intent-filter>
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-
-      <!-- open simplex:/ connection URI -->
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="simplex" />
-      </intent-filter>
-      <intent-filter android:autoVerify="true">
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="http" />
-        <data android:scheme="https" />
-        <data android:host="simplex.chat" />
-        <data android:pathPrefix="/invitation" />
-        <data android:pathPrefix="/contact" />
-      </intent-filter>
-      <!-- Receive files from other apps -->
-      <intent-filter>
-        <action android:name="android.intent.action.SEND" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="*/*" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.SEND_MULTIPLE" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="image/*" />
-      </intent-filter>
-    </activity>
-
-    <activity-alias
-        android:name=".MainActivity_default"
-        android:exported="true"
-        android:icon="@mipmap/icon"
-        android:enabled="true"
-        android:targetActivity=".MainActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity-alias>
-
-    <activity-alias
-        android:name=".MainActivity_dark_blue"
-        android:exported="true"
-        android:icon="@mipmap/icon_dark_blue"
-        android:enabled="false"
-        android:targetActivity=".MainActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity-alias>
-
-
-    <activity android:name=".views.call.IncomingCallActivity"
-        android:showOnLockScreen="true"
-        android:exported="false"
-        android:launchMode="singleTask"/>
-
-    <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${provider_authorities}"
-        android:exported="false"
-        android:grantUriPermissions="true">
-      <meta-data
-          android:name="android.support.FILE_PROVIDER_PATHS"
-          android:resource="@xml/file_paths" />
-    </provider>
-
-    <!-- NtfManager action processing (buttons in notifications) -->
-    <receiver
-        android:name=".model.NtfManager$NtfActionReceiver"
-        android:enabled="true"
-        android:exported="false" />
-
-    <!-- SimplexService foreground service -->
-    <service
-        android:name=".SimplexService"
-        android:enabled="true"
-        android:exported="false"
-        android:stopWithTask="false"></service>
-
-    <!-- SimplexService restart on reboot -->
-    <receiver
-        android:name=".SimplexService$StartReceiver"
-        android:enabled="true"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-      </intent-filter>
-    </receiver>
-
-    <!-- SimplexService restart on destruction -->
-    <receiver
-        android:name=".SimplexService$AutoRestartReceiver"
-        android:enabled="true"
-        android:exported="false" />
-  </application>
-</manifest>

apps/android/app/src/main/assets/www/README.md

@@ -1,3 +0,0 @@
-# WebView for WebRTC calls in SimpleX Chat
-
-Do NOT edit call.js here, it is compiled abd copied here from call.ts in packages/simplex-chat-webrtc

apps/android/app/src/main/assets/www/call.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-    <link href="./style.css" rel="stylesheet" />
-    <script src="./lz-string.min.js"></script>
-  </head>
-  <body>
-    <video
-      id="remote-video-stream"
-      autoplay
-      playsinline
-      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
-    ></video>
-    <video
-      id="local-video-stream"
-      muted
-      autoplay
-      playsinline
-      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
-    ></video>
-  </body>
-  <footer>
-    <script src="./call.js"></script>
-  </footer>
-</html>

apps/android/app/src/main/assets/www/call.js

@@ -1,672 +0,0 @@
-"use strict";
-// Inspired by
-// https://github.com/webrtc/samples/blob/gh-pages/src/content/insertable-streams/endtoend-encryption
-var CallMediaType;
-(function (CallMediaType) {
-    CallMediaType["Audio"] = "audio";
-    CallMediaType["Video"] = "video";
-})(CallMediaType || (CallMediaType = {}));
-var VideoCamera;
-(function (VideoCamera) {
-    VideoCamera["User"] = "user";
-    VideoCamera["Environment"] = "environment";
-})(VideoCamera || (VideoCamera = {}));
-// for debugging
-// var sendMessageToNative = ({resp}: WVApiMessage) => console.log(JSON.stringify({command: resp}))
-var sendMessageToNative = (msg) => console.log(JSON.stringify(msg));
-// Global object with cryptrographic/encoding functions
-const callCrypto = callCryptoFunction();
-var TransformOperation;
-(function (TransformOperation) {
-    TransformOperation["Encrypt"] = "encrypt";
-    TransformOperation["Decrypt"] = "decrypt";
-})(TransformOperation || (TransformOperation = {}));
-let activeCall;
-let answerTimeout = 30000;
-const processCommand = (function () {
-    const defaultIceServers = [
-        { urls: ["stun:stun.simplex.im:443"] },
-        { urls: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
-        { urls: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
-    ];
-    function getCallConfig(encodedInsertableStreams, iceServers, relay) {
-        return {
-            peerConnectionConfig: {
-                iceServers: iceServers !== null && iceServers !== void 0 ? iceServers : defaultIceServers,
-                iceCandidatePoolSize: 10,
-                encodedInsertableStreams,
-                iceTransportPolicy: relay ? "relay" : "all",
-            },
-            iceCandidates: {
-                delay: 3000,
-                extrasInterval: 2000,
-                extrasTimeout: 8000,
-            },
-        };
-    }
-    function getIceCandidates(conn, config) {
-        return new Promise((resolve, _) => {
-            let candidates = [];
-            let resolved = false;
-            let extrasInterval;
-            let extrasTimeout;
-            const delay = setTimeout(() => {
-                if (!resolved) {
-                    resolveIceCandidates();
-                    extrasInterval = setInterval(() => {
-                        sendIceCandidates();
-                    }, config.iceCandidates.extrasInterval);
-                    extrasTimeout = setTimeout(() => {
-                        clearInterval(extrasInterval);
-                        sendIceCandidates();
-                    }, config.iceCandidates.extrasTimeout);
-                }
-            }, config.iceCandidates.delay);
-            conn.onicecandidate = ({ candidate: c }) => c && candidates.push(c);
-            conn.onicegatheringstatechange = () => {
-                if (conn.iceGatheringState == "complete") {
-                    if (resolved) {
-                        if (extrasInterval)
-                            clearInterval(extrasInterval);
-                        if (extrasTimeout)
-                            clearTimeout(extrasTimeout);
-                        sendIceCandidates();
-                    }
-                    else {
-                        resolveIceCandidates();
-                    }
-                }
-            };
-            function resolveIceCandidates() {
-                if (delay)
-                    clearTimeout(delay);
-                resolved = true;
-                const iceCandidates = serialize(candidates);
-                candidates = [];
-                resolve(iceCandidates);
-            }
-            function sendIceCandidates() {
-                if (candidates.length === 0)
-                    return;
-                const iceCandidates = serialize(candidates);
-                candidates = [];
-                sendMessageToNative({ resp: { type: "ice", iceCandidates } });
-            }
-        });
-    }
-    async function initializeCall(config, mediaType, aesKey, useWorker) {
-        const pc = new RTCPeerConnection(config.peerConnectionConfig);
-        const remoteStream = new MediaStream();
-        const localCamera = VideoCamera.User;
-        const localStream = await getLocalMediaStream(mediaType, localCamera);
-        const iceCandidates = getIceCandidates(pc, config);
-        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey, useWorker };
-        await setupMediaStreams(call);
-        let connectionTimeout = setTimeout(connectionHandler, answerTimeout);
-        pc.addEventListener("connectionstatechange", connectionStateChange);
-        return call;
-        async function connectionStateChange() {
-            // "failed" means the second party did not answer in time (15 sec timeout in Chrome WebView)
-            // See https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/p2p/base/p2p_constants.cc;l=70)
-            if (pc.connectionState !== "failed")
-                connectionHandler();
-        }
-        async function connectionHandler() {
-            sendMessageToNative({
-                resp: {
-                    type: "connection",
-                    state: {
-                        connectionState: pc.connectionState,
-                        iceConnectionState: pc.iceConnectionState,
-                        iceGatheringState: pc.iceGatheringState,
-                        signalingState: pc.signalingState,
-                    },
-                },
-            });
-            if (pc.connectionState == "disconnected" || pc.connectionState == "failed") {
-                clearConnectionTimeout();
-                pc.removeEventListener("connectionstatechange", connectionStateChange);
-                if (activeCall) {
-                    setTimeout(() => sendMessageToNative({ resp: { type: "ended" } }), 0);
-                }
-                endCall();
-            }
-            else if (pc.connectionState == "connected") {
-                clearConnectionTimeout();
-                const stats = (await pc.getStats());
-                for (const stat of stats.values()) {
-                    const { type, state } = stat;
-                    if (type === "candidate-pair" && state === "succeeded") {
-                        const iceCandidatePair = stat;
-                        const resp = {
-                            type: "connected",
-                            connectionInfo: {
-                                iceCandidatePair,
-                                localCandidate: stats.get(iceCandidatePair.localCandidateId),
-                                remoteCandidate: stats.get(iceCandidatePair.remoteCandidateId),
-                            },
-                        };
-                        setTimeout(() => sendMessageToNative({ resp }), 500);
-                        break;
-                    }
-                }
-            }
-        }
-        function clearConnectionTimeout() {
-            if (connectionTimeout) {
-                clearTimeout(connectionTimeout);
-                connectionTimeout = undefined;
-            }
-        }
-    }
-    function serialize(x) {
-        return LZString.compressToBase64(JSON.stringify(x));
-    }
-    function parse(s) {
-        return JSON.parse(LZString.decompressFromBase64(s));
-    }
-    async function processCommand(body) {
-        const { corrId, command } = body;
-        const pc = activeCall === null || activeCall === void 0 ? void 0 : activeCall.connection;
-        let resp;
-        try {
-            switch (command.type) {
-                case "capabilities":
-                    console.log("starting outgoing call - capabilities");
-                    if (activeCall)
-                        endCall();
-                    // This request for local media stream is made to prompt for camera/mic permissions on call start
-                    if (command.media)
-                        await getLocalMediaStream(command.media, VideoCamera.User);
-                    const encryption = supportsInsertableStreams(command.useWorker);
-                    resp = { type: "capabilities", capabilities: { encryption } };
-                    break;
-                case "start": {
-                    console.log("starting incoming call - create webrtc session");
-                    if (activeCall)
-                        endCall();
-                    const { media, useWorker, iceServers, relay } = command;
-                    const encryption = supportsInsertableStreams(useWorker);
-                    const aesKey = encryption ? command.aesKey : undefined;
-                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey, useWorker);
-                    const pc = activeCall.connection;
-                    const offer = await pc.createOffer();
-                    await pc.setLocalDescription(offer);
-                    // for debugging, returning the command for callee to use
-                    // resp = {
-                    //   type: "offer",
-                    //   offer: serialize(offer),
-                    //   iceCandidates: await activeCall.iceCandidates,
-                    //   capabilities: {encryption},
-                    //   media,
-                    //   iceServers,
-                    //   relay,
-                    //   aesKey,
-                    //   useWorker,
-                    // }
-                    resp = {
-                        type: "offer",
-                        offer: serialize(offer),
-                        iceCandidates: await activeCall.iceCandidates,
-                        capabilities: { encryption },
-                    };
-                    break;
-                }
-                case "offer":
-                    if (activeCall) {
-                        resp = { type: "error", message: "accept: call already started" };
-                    }
-                    else if (!supportsInsertableStreams(command.useWorker) && command.aesKey) {
-                        resp = { type: "error", message: "accept: encryption is not supported" };
-                    }
-                    else {
-                        const offer = parse(command.offer);
-                        const remoteIceCandidates = parse(command.iceCandidates);
-                        const { media, aesKey, useWorker, iceServers, relay } = command;
-                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey, useWorker);
-                        const pc = activeCall.connection;
-                        await pc.setRemoteDescription(new RTCSessionDescription(offer));
-                        const answer = await pc.createAnswer();
-                        await pc.setLocalDescription(answer);
-                        addIceCandidates(pc, remoteIceCandidates);
-                        // same as command for caller to use
-                        resp = {
-                            type: "answer",
-                            answer: serialize(answer),
-                            iceCandidates: await activeCall.iceCandidates,
-                        };
-                    }
-                    break;
-                case "answer":
-                    if (!pc) {
-                        resp = { type: "error", message: "answer: call not started" };
-                    }
-                    else if (!pc.localDescription) {
-                        resp = { type: "error", message: "answer: local description is not set" };
-                    }
-                    else if (pc.currentRemoteDescription) {
-                        resp = { type: "error", message: "answer: remote description already set" };
-                    }
-                    else {
-                        const answer = parse(command.answer);
-                        const remoteIceCandidates = parse(command.iceCandidates);
-                        await pc.setRemoteDescription(new RTCSessionDescription(answer));
-                        addIceCandidates(pc, remoteIceCandidates);
-                        resp = { type: "ok" };
-                    }
-                    break;
-                case "ice":
-                    if (pc) {
-                        const remoteIceCandidates = parse(command.iceCandidates);
-                        addIceCandidates(pc, remoteIceCandidates);
-                        resp = { type: "ok" };
-                    }
-                    else {
-                        resp = { type: "error", message: "ice: call not started" };
-                    }
-                    break;
-                case "media":
-                    if (!activeCall) {
-                        resp = { type: "error", message: "media: call not started" };
-                    }
-                    else if (activeCall.localMedia == CallMediaType.Audio && command.media == CallMediaType.Video) {
-                        resp = { type: "error", message: "media: no video" };
-                    }
-                    else {
-                        enableMedia(activeCall.localStream, command.media, command.enable);
-                        resp = { type: "ok" };
-                    }
-                    break;
-                case "camera":
-                    if (!activeCall || !pc) {
-                        resp = { type: "error", message: "camera: call not started" };
-                    }
-                    else {
-                        await replaceMedia(activeCall, command.camera);
-                        resp = { type: "ok" };
-                    }
-                    break;
-                case "end":
-                    endCall();
-                    resp = { type: "ok" };
-                    break;
-                default:
-                    resp = { type: "error", message: "unknown command" };
-                    break;
-            }
-        }
-        catch (e) {
-            resp = { type: "error", message: `${command.type}: ${e.message}` };
-        }
-        const apiResp = { corrId, resp, command };
-        sendMessageToNative(apiResp);
-        return apiResp;
-    }
-    function endCall() {
-        var _a;
-        try {
-            (_a = activeCall === null || activeCall === void 0 ? void 0 : activeCall.connection) === null || _a === void 0 ? void 0 : _a.close();
-        }
-        catch (e) {
-            console.log(e);
-        }
-        activeCall = undefined;
-        resetVideoElements();
-    }
-    function addIceCandidates(conn, iceCandidates) {
-        for (const c of iceCandidates) {
-            conn.addIceCandidate(new RTCIceCandidate(c));
-        }
-    }
-    async function setupMediaStreams(call) {
-        const videos = getVideoElements();
-        if (!videos)
-            throw Error("no video elements");
-        await setupEncryptionWorker(call);
-        setupLocalStream(call);
-        setupRemoteStream(call);
-        setupCodecPreferences(call);
-        // setupVideoElement(videos.local)
-        // setupVideoElement(videos.remote)
-        videos.local.srcObject = call.localStream;
-        videos.remote.srcObject = call.remoteStream;
-    }
-    async function setupEncryptionWorker(call) {
-        if (call.aesKey) {
-            if (!call.key)
-                call.key = await callCrypto.decodeAesKey(call.aesKey);
-            if (call.useWorker && !call.worker) {
-                const workerCode = `const callCrypto = (${callCryptoFunction.toString()})(); (${workerFunction.toString()})()`;
-                call.worker = new Worker(URL.createObjectURL(new Blob([workerCode], { type: "text/javascript" })));
-                call.worker.onerror = ({ error, filename, lineno, message }) => console.log(JSON.stringify({ error, filename, lineno, message }));
-                call.worker.onmessage = ({ data }) => console.log(JSON.stringify({ message: data }));
-            }
-        }
-    }
-    function setupLocalStream(call) {
-        const videos = getVideoElements();
-        if (!videos)
-            throw Error("no video elements");
-        const pc = call.connection;
-        let { localStream } = call;
-        for (const track of localStream.getTracks()) {
-            pc.addTrack(track, localStream);
-        }
-        if (call.aesKey && call.key) {
-            console.log("set up encryption for sending");
-            for (const sender of pc.getSenders()) {
-                setupPeerTransform(TransformOperation.Encrypt, sender, call.worker, call.aesKey, call.key);
-            }
-        }
-    }
-    function setupRemoteStream(call) {
-        // Pull tracks from remote stream as they arrive add them to remoteStream video
-        const pc = call.connection;
-        pc.ontrack = (event) => {
-            try {
-                if (call.aesKey && call.key) {
-                    console.log("set up decryption for receiving");
-                    setupPeerTransform(TransformOperation.Decrypt, event.receiver, call.worker, call.aesKey, call.key);
-                }
-                for (const stream of event.streams) {
-                    for (const track of stream.getTracks()) {
-                        call.remoteStream.addTrack(track);
-                    }
-                }
-                console.log(`ontrack success`);
-            }
-            catch (e) {
-                console.log(`ontrack error: ${e.message}`);
-            }
-        };
-    }
-    function setupCodecPreferences(call) {
-        // We assume VP8 encoding in the decode/encode stages to get the initial
-        // bytes to pass as plaintext so we enforce that here.
-        // VP8 is supported by all supports of webrtc.
-        // Use of VP8 by default may also reduce depacketisation issues.
-        // We do not encrypt the first couple of bytes of the payload so that the
-        // video elements can work by determining video keyframes and the opus mode
-        // being used. This appears to be necessary for any video feed at all.
-        // For VP8 this is the content described in
-        //   https://tools.ietf.org/html/rfc6386#section-9.1
-        // which is 10 bytes for key frames and 3 bytes for delta frames.
-        // For opus (where encodedFrame.type is not set) this is the TOC byte from
-        //   https://tools.ietf.org/html/rfc6716#section-3.1
-        var _a;
-        const capabilities = RTCRtpSender.getCapabilities("video");
-        if (capabilities) {
-            const { codecs } = capabilities;
-            const selectedCodecIndex = codecs.findIndex((c) => c.mimeType === "video/VP8");
-            const selectedCodec = codecs[selectedCodecIndex];
-            codecs.splice(selectedCodecIndex, 1);
-            codecs.unshift(selectedCodec);
-            for (const t of call.connection.getTransceivers()) {
-                if (((_a = t.sender.track) === null || _a === void 0 ? void 0 : _a.kind) === "video") {
-                    t.setCodecPreferences(codecs);
-                }
-            }
-        }
-    }
-    async function replaceMedia(call, camera) {
-        const videos = getVideoElements();
-        if (!videos)
-            throw Error("no video elements");
-        const pc = call.connection;
-        for (const t of call.localStream.getTracks())
-            t.stop();
-        call.localCamera = camera;
-        const localStream = await getLocalMediaStream(call.localMedia, camera);
-        replaceTracks(pc, localStream.getVideoTracks());
-        replaceTracks(pc, localStream.getAudioTracks());
-        call.localStream = localStream;
-        videos.local.srcObject = localStream;
-    }
-    function replaceTracks(pc, tracks) {
-        if (!tracks.length)
-            return;
-        const sender = pc.getSenders().find((s) => { var _a; return ((_a = s.track) === null || _a === void 0 ? void 0 : _a.kind) === tracks[0].kind; });
-        if (sender)
-            for (const t of tracks)
-                sender.replaceTrack(t);
-    }
-    function setupPeerTransform(operation, peer, worker, aesKey, key) {
-        if (worker && "RTCRtpScriptTransform" in window) {
-            console.log(`${operation} with worker & RTCRtpScriptTransform`);
-            peer.transform = new RTCRtpScriptTransform(worker, { operation, aesKey });
-        }
-        else if ("createEncodedStreams" in peer) {
-            const { readable, writable } = peer.createEncodedStreams();
-            if (worker) {
-                console.log(`${operation} with worker`);
-                worker.postMessage({ operation, readable, writable, aesKey }, [readable, writable]);
-            }
-            else {
-                console.log(`${operation} without worker`);
-                const transform = callCrypto.transformFrame[operation](key);
-                readable.pipeThrough(new TransformStream({ transform })).pipeTo(writable);
-            }
-        }
-        else {
-            console.log(`no ${operation}`);
-        }
-    }
-    function getLocalMediaStream(mediaType, facingMode) {
-        const constraints = callMediaConstraints(mediaType, facingMode);
-        return navigator.mediaDevices.getUserMedia(constraints);
-    }
-    function callMediaConstraints(mediaType, facingMode) {
-        switch (mediaType) {
-            case CallMediaType.Audio:
-                return { audio: true, video: false };
-            case CallMediaType.Video:
-                return {
-                    audio: true,
-                    video: {
-                        frameRate: 24,
-                        width: {
-                            min: 480,
-                            ideal: 720,
-                            max: 1280,
-                        },
-                        aspectRatio: 1.33,
-                        facingMode,
-                    },
-                };
-        }
-    }
-    function supportsInsertableStreams(useWorker) {
-        return (("createEncodedStreams" in RTCRtpSender.prototype && "createEncodedStreams" in RTCRtpReceiver.prototype) ||
-            (!!useWorker && "RTCRtpScriptTransform" in window));
-    }
-    function resetVideoElements() {
-        const videos = getVideoElements();
-        if (!videos)
-            return;
-        videos.local.srcObject = null;
-        videos.remote.srcObject = null;
-    }
-    function getVideoElements() {
-        const local = document.getElementById("local-video-stream");
-        const remote = document.getElementById("remote-video-stream");
-        if (!(local && remote && local instanceof HTMLMediaElement && remote instanceof HTMLMediaElement))
-            return;
-        return { local, remote };
-    }
-    // function setupVideoElement(video: HTMLElement) {
-    //   // TODO use display: none
-    //   video.style.opacity = "0"
-    //   video.onplaying = () => {
-    //     video.style.opacity = "1"
-    //   }
-    // }
-    function enableMedia(s, media, enable) {
-        const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
-        for (const t of tracks)
-            t.enabled = enable;
-    }
-    return processCommand;
-})();
-// Cryptography function - it is loaded both in the main window and in worker context (if the worker is used)
-function callCryptoFunction() {
-    const initialPlainTextRequired = {
-        key: 10,
-        delta: 3,
-        empty: 1,
-    };
-    const IV_LENGTH = 12;
-    function encryptFrame(key) {
-        return async (frame, controller) => {
-            const data = new Uint8Array(frame.data);
-            const n = initialPlainTextRequired[frame.type] || 1;
-            const iv = randomIV();
-            const initial = data.subarray(0, n);
-            const plaintext = data.subarray(n, data.byteLength);
-            try {
-                const ciphertext = plaintext.length
-                    ? new Uint8Array(await crypto.subtle.encrypt({ name: "AES-GCM", iv: iv.buffer }, key, plaintext))
-                    : new Uint8Array(0);
-                frame.data = concatN(initial, ciphertext, iv).buffer;
-                controller.enqueue(frame);
-            }
-            catch (e) {
-                console.log(`encryption error ${e}`);
-                throw e;
-            }
-        };
-    }
-    function decryptFrame(key) {
-        return async (frame, controller) => {
-            const data = new Uint8Array(frame.data);
-            const n = initialPlainTextRequired[frame.type] || 1;
-            const initial = data.subarray(0, n);
-            const ciphertext = data.subarray(n, data.byteLength - IV_LENGTH);
-            const iv = data.subarray(data.byteLength - IV_LENGTH, data.byteLength);
-            try {
-                const plaintext = ciphertext.length
-                    ? new Uint8Array(await crypto.subtle.decrypt({ name: "AES-GCM", iv }, key, ciphertext))
-                    : new Uint8Array(0);
-                frame.data = concatN(initial, plaintext).buffer;
-                controller.enqueue(frame);
-            }
-            catch (e) {
-                console.log(`decryption error ${e}`);
-                throw e;
-            }
-        };
-    }
-    function decodeAesKey(aesKey) {
-        const keyData = callCrypto.decodeBase64url(callCrypto.encodeAscii(aesKey));
-        return crypto.subtle.importKey("raw", keyData, { name: "AES-GCM", length: 256 }, true, ["encrypt", "decrypt"]);
-    }
-    function concatN(...bs) {
-        const a = new Uint8Array(bs.reduce((size, b) => size + b.byteLength, 0));
-        bs.reduce((offset, b) => {
-            a.set(b, offset);
-            return offset + b.byteLength;
-        }, 0);
-        return a;
-    }
-    function randomIV() {
-        return crypto.getRandomValues(new Uint8Array(IV_LENGTH));
-    }
-    const base64urlChars = new Uint8Array("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".split("").map((c) => c.charCodeAt(0)));
-    const base64urlLookup = new Array(256);
-    base64urlChars.forEach((c, i) => (base64urlLookup[c] = i));
-    const char_equal = "=".charCodeAt(0);
-    function encodeAscii(s) {
-        const a = new Uint8Array(s.length);
-        let i = s.length;
-        while (i--)
-            a[i] = s.charCodeAt(i);
-        return a;
-    }
-    function decodeAscii(a) {
-        let s = "";
-        for (let i = 0; i < a.length; i++)
-            s += String.fromCharCode(a[i]);
-        return s;
-    }
-    function encodeBase64url(a) {
-        const len = a.length;
-        const b64len = Math.ceil(len / 3) * 4;
-        const b64 = new Uint8Array(b64len);
-        let j = 0;
-        for (let i = 0; i < len; i += 3) {
-            b64[j++] = base64urlChars[a[i] >> 2];
-            b64[j++] = base64urlChars[((a[i] & 3) << 4) | (a[i + 1] >> 4)];
-            b64[j++] = base64urlChars[((a[i + 1] & 15) << 2) | (a[i + 2] >> 6)];
-            b64[j++] = base64urlChars[a[i + 2] & 63];
-        }
-        if (len % 3)
-            b64[b64len - 1] = char_equal;
-        if (len % 3 === 1)
-            b64[b64len - 2] = char_equal;
-        return b64;
-    }
-    function decodeBase64url(b64) {
-        let len = b64.length;
-        if (len % 4)
-            return;
-        let bLen = (len * 3) / 4;
-        if (b64[len - 1] === char_equal) {
-            len--;
-            bLen--;
-            if (b64[len - 1] === char_equal) {
-                len--;
-                bLen--;
-            }
-        }
-        const bytes = new Uint8Array(bLen);
-        let i = 0;
-        let pos = 0;
-        while (i < len) {
-            const enc1 = base64urlLookup[b64[i++]];
-            const enc2 = i < len ? base64urlLookup[b64[i++]] : 0;
-            const enc3 = i < len ? base64urlLookup[b64[i++]] : 0;
-            const enc4 = i < len ? base64urlLookup[b64[i++]] : 0;
-            if (enc1 === undefined || enc2 === undefined || enc3 === undefined || enc4 === undefined)
-                return;
-            bytes[pos++] = (enc1 << 2) | (enc2 >> 4);
-            bytes[pos++] = ((enc2 & 15) << 4) | (enc3 >> 2);
-            bytes[pos++] = ((enc3 & 3) << 6) | (enc4 & 63);
-        }
-        return bytes;
-    }
-    return {
-        transformFrame: { encrypt: encryptFrame, decrypt: decryptFrame },
-        decodeAesKey,
-        encodeAscii,
-        decodeAscii,
-        encodeBase64url,
-        decodeBase64url,
-    };
-}
-// If the worker is used for decryption, this function code (as string) is used to load the worker via Blob
-// We have to use worker optionally, as it crashes in Android web view, regardless of how it is loaded
-function workerFunction() {
-    // encryption with createEncodedStreams support
-    self.addEventListener("message", async ({ data }) => {
-        await setupTransform(data);
-    });
-    // encryption using RTCRtpScriptTransform.
-    if ("RTCTransformEvent" in self) {
-        self.addEventListener("rtctransform", async ({ transformer }) => {
-            try {
-                const { operation, aesKey } = transformer.options;
-                const { readable, writable } = transformer;
-                await setupTransform({ operation, aesKey, readable, writable });
-                self.postMessage({ result: "setupTransform success" });
-            }
-            catch (e) {
-                self.postMessage({ message: `setupTransform error: ${e.message}` });
-            }
-        });
-    }
-    async function setupTransform({ operation, aesKey, readable, writable }) {
-        const key = await callCrypto.decodeAesKey(aesKey);
-        const transform = callCrypto.transformFrame[operation](key);
-        readable.pipeThrough(new TransformStream({ transform })).pipeTo(writable);
-    }
-}
-//# sourceMappingURL=call.js.map

apps/android/app/src/main/cpp/CMakeLists.txt

@@ -1,67 +0,0 @@
-# For more information about using CMake with Android Studio, read the
-# documentation: https://d.android.com/studio/projects/add-native-code.html
-
-# Sets the minimum version of CMake required to build the native library.
-
-cmake_minimum_required(VERSION 3.10.2)
-
-# Declares and names the project.
-
-project("app")
-
-# Creates and names a library, sets it as either STATIC
-# or SHARED, and provides the relative paths to its source code.
-# You can define multiple libraries, and CMake builds them for you.
-# Gradle automatically packages shared libraries with your APK.
-
-add_library( # Sets the name of the library.
-    app-lib
-
-    # Sets the library as a shared library.
-    SHARED
-
-    # Provides a relative path to your source file(s).
-    simplex-api.c)
-
-# Searches for a specified prebuilt library and stores the path as a
-# variable. Because CMake includes system libraries in the search path by
-# default, you only need to specify the name of the public NDK library
-# you want to add. CMake verifies that the library exists before
-# completing its build.
-
-find_library( # Sets the name of the path variable.
-    log-lib
-
-    # Specifies the name of the NDK library that
-    # you want CMake to locate.
-    log)
-
-find_library( # Sets the name of the path variable.
-    c-lib
-
-    # Specifies the name of the NDK library that
-    # you want CMake to locate.
-    c
-    NAMES libc.so
-    REQUIRED)
-
-add_library( simplex SHARED IMPORTED )
-set_target_properties( simplex PROPERTIES IMPORTED_LOCATION
-    ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libsimplex.so)
-
-add_library( support SHARED IMPORTED )
-set_target_properties( support PROPERTIES IMPORTED_LOCATION
-    ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libsupport.so)
-
-# Specifies libraries CMake should link to your target library. You
-# can link multiple libraries, such as libraries you define in this
-# build script, prebuilt third-party libraries, or system libraries.
-
-target_link_libraries( # Specifies the target library.
-    app-lib
-
-    simplex support
-
-    # Links the target library to the log library
-    # included in the NDK.
-    ${log-lib})

apps/android/app/src/main/cpp/simplex-api.c

@@ -1,111 +0,0 @@
-#include <jni.h>
-
-// from the RTS
-void hs_init(int * argc, char **argv[]);
-
-// from android-support
-void setLineBuffering(void);
-int pipe_std_to_socket(const char * name);
-
-extern void __svfscanf(void){};
-extern void __vfwscanf(void){};
-extern void __memset_chk_fail(void){};
-extern void __strcpy_chk_generic(void){};
-extern void __strcat_chk_generic(void){};
-extern void __libc_globals(void){};
-extern void __rel_iplt_start(void){};
-
-// Android 9 only, not 13
-extern void reallocarray(void){};
-
-JNIEXPORT jint JNICALL
-Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
-    const char *name = (*env)->GetStringUTFChars(env, socket_name, JNI_FALSE);
-    int ret = pipe_std_to_socket(name);
-    (*env)->ReleaseStringUTFChars(env, socket_name, name);
-    return ret;
-}
-
-JNIEXPORT void JNICALL
-Java_chat_simplex_app_SimplexAppKt_initHS(__unused JNIEnv *env, __unused jclass clazz) {
-    hs_init(NULL, NULL);
-    setLineBuffering();
-}
-
-// from simplex-chat
-typedef long* chat_ctrl;
-
-extern char *chat_migrate_init(const char *path, const char *key, const char *confirm, chat_ctrl *ctrl);
-extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctrl); // deprecated
-extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
-extern char *chat_parse_markdown(const char *str);
-extern char *chat_parse_server(const char *str);
-extern char *chat_password_hash(const char *pwd, const char *salt);
-
-JNIEXPORT jobjectArray JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey, jstring confirm) {
-    const char *_dbPath = (*env)->GetStringUTFChars(env, dbPath, JNI_FALSE);
-    const char *_dbKey = (*env)->GetStringUTFChars(env, dbKey, JNI_FALSE);
-    const char *_confirm = (*env)->GetStringUTFChars(env, confirm, JNI_FALSE);
-    jlong _ctrl = (jlong) 0;
-    jstring res = (*env)->NewStringUTF(env, chat_migrate_init(_dbPath, _dbKey, _confirm, &_ctrl));
-    (*env)->ReleaseStringUTFChars(env, dbPath, _dbPath);
-    (*env)->ReleaseStringUTFChars(env, dbKey, _dbKey);
-    (*env)->ReleaseStringUTFChars(env, dbKey, _confirm);
-
-    // Creating array of Object's (boxed values can be passed, eg. Long instead of long)
-    jobjectArray ret = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/Object"), NULL);
-    // Java's String
-    (*env)->SetObjectArrayElement(env, ret, 0, res);
-    // Java's Long
-    (*env)->SetObjectArrayElement(env, ret, 1,
-        (*env)->NewObject(env, (*env)->FindClass(env, "java/lang/Long"),
-        (*env)->GetMethodID(env, (*env)->FindClass(env, "java/lang/Long"), "<init>", "(J)V"),
-        _ctrl));
-    return ret;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatSendCmd(JNIEnv *env, __unused jclass clazz, jlong controller, jstring msg) {
-    const char *_msg = (*env)->GetStringUTFChars(env, msg, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_send_cmd((void*)controller, _msg));
-    (*env)->ReleaseStringUTFChars(env, msg, _msg);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
-    return (*env)->NewStringUTF(env, chat_recv_msg((void*)controller));
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatRecvMsgWait(JNIEnv *env, __unused jclass clazz, jlong controller, jint wait) {
-    return (*env)->NewStringUTF(env, chat_recv_msg_wait((void*)controller, wait));
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatParseMarkdown(JNIEnv *env, __unused jclass clazz, jstring str) {
-    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_parse_markdown(_str));
-    (*env)->ReleaseStringUTFChars(env, str, _str);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatParseServer(JNIEnv *env, __unused jclass clazz, jstring str) {
-    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_parse_server(_str));
-    (*env)->ReleaseStringUTFChars(env, str, _str);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatPasswordHash(JNIEnv *env, __unused jclass clazz, jstring pwd, jstring salt) {
-    const char *_pwd = (*env)->GetStringUTFChars(env, pwd, JNI_FALSE);
-    const char *_salt = (*env)->GetStringUTFChars(env, salt, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_password_hash(_pwd, _salt));
-    (*env)->ReleaseStringUTFChars(env, pwd, _pwd);
-    (*env)->ReleaseStringUTFChars(env, salt, _salt);
-    return res;
-}

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

@@ -1,18 +0,0 @@
-package chat.simplex.app
-
-import android.app.backup.BackupAgentHelper
-import android.app.backup.FullBackupDataOutput
-import android.content.Context
-import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.model.AppPreferences.Companion.SHARED_PREFS_PRIVACY_FULL_BACKUP
-
-class BackupAgent: BackupAgentHelper() {
-  override fun onFullBackup(data: FullBackupDataOutput?) {
-    if (applicationContext
-        .getSharedPreferences(AppPreferences.SHARED_PREFS_ID, Context.MODE_PRIVATE)
-        .getBoolean(SHARED_PREFS_PRIVACY_FULL_BACKUP, true)
-    ) {
-      super.onFullBackup(data)
-    }
-  }
-}

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

@@ -1,666 +0,0 @@
-package chat.simplex.app
-
-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.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.graphicsLayer
-import androidx.compose.ui.res.painterResource
-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.*
-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 {
-        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().background(MaterialTheme.colors.background),
-      contentAlignment = Alignment.Center
-    ) {
-      SimpleButton(
-        stringResource(R.string.auth_unlock),
-        icon = painterResource(R.drawable.ic_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 {
-        intent.type == "text/plain" -> {
-          val text = intent.getStringExtra(Intent.EXTRA_TEXT)
-          if (text != null) {
-            chatModel.sharedContent.value = SharedContent.Text(text)
-          }
-        }
-        isMediaIntent(intent) -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(uri))
-          } // All other mime types
-        }
-        else -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uri)
-          }
-        }
-      }
-    }
-    Intent.ACTION_SEND_MULTIPLE -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      Log.e(TAG, "ACTION_SEND_MULTIPLE ${intent.type}")
-      when {
-        isMediaIntent(intent) -> {
-          val uris = intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>
-          if (uris != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uris)
-          } // All other mime types
-        }
-        else -> {}
-      }
-    }
-  }
-}
-
-fun isMediaIntent(intent: Intent): Boolean =
-  intent.type?.startsWith("image/") == true || intent.type?.startsWith("video/") == true
-
-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.showAlertDialog(
-        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,260 +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.ui.theme.DefaultTheme
-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()
-    runMigrations()
-  }
-
-  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()
-  }
-
-  private fun runMigrations() {
-    val lastMigration = chatModel.controller.appPrefs.lastMigratedVersionCode
-    if (lastMigration.get() < BuildConfig.VERSION_CODE) {
-      while (true) {
-        if (lastMigration.get() < 117) {
-          if (chatModel.controller.appPrefs.currentTheme.get() == DefaultTheme.DARK.name) {
-            chatModel.controller.appPrefs.currentTheme.set(DefaultTheme.SIMPLEX.name)
-          }
-          lastMigration.set(117)
-        } else {
-          lastMigration.set(BuildConfig.VERSION_CODE)
-          break
-        }
-      }
-    }
-  }
-
-  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/model/NtfManager.kt

@@ -1,315 +0,0 @@
-package chat.simplex.app.model
-
-import android.app.*
-import android.content.*
-import android.graphics.BitmapFactory
-import android.hardware.display.DisplayManager
-import android.media.AudioAttributes
-import android.net.Uri
-import android.util.Log
-import android.view.Display
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import chat.simplex.app.*
-import chat.simplex.app.views.call.*
-import chat.simplex.app.views.chatlist.acceptContactRequest
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.NotificationPreviewMode
-import kotlinx.datetime.Clock
-
-class NtfManager(val context: Context, private val appPreferences: AppPreferences) {
-  companion object {
-    const val MessageChannel: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-    const val MessageGroup: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-    const val OpenChatAction: String = "chat.simplex.app.OPEN_CHAT"
-    const val ShowChatsAction: String = "chat.simplex.app.SHOW_CHATS"
-
-    // DO NOT change notification channel settings / names
-    const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_1"
-    const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
-    const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
-    const val CallNotificationId: Int = -1
-
-    private const val UserIdKey: String = "userId"
-    private const val ChatIdKey: String = "chatId"
-
-    fun getUserIdFromIntent(intent: Intent?): Long? {
-      val userId = intent?.getLongExtra(UserIdKey, -1L)
-      return if (userId == -1L || userId == null) null else userId
-    }
-  }
-
-  private val manager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-  private var prevNtfTime = mutableMapOf<String, Long>()
-  private val msgNtfTimeoutMs = 30000L
-
-  init {
-    if (manager.areNotificationsEnabled()) createNtfChannelsMaybeShowAlert()
-  }
-
-  enum class NotificationAction {
-    ACCEPT_CONTACT_REQUEST
-  }
-
-  private fun callNotificationChannel(channelId: String, channelName: String): NotificationChannel {
-    val callChannel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH)
-    val attrs = AudioAttributes.Builder()
-      .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-      .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-      .build()
-    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
-    Log.d(TAG,"callNotificationChannel sound: $soundUri")
-    callChannel.setSound(soundUri, attrs)
-    callChannel.enableVibration(true)
-    // the numbers below are explained here: https://developer.android.com/reference/android/os/Vibrator
-    // (wait, vibration duration, wait till off, wait till on again = ringtone mp3 duration - vibration duration - ~50ms lost somewhere)
-    callChannel.vibrationPattern = longArrayOf(250, 250, 0, 2600)
-    return callChannel
-  }
-
-  fun cancelNotificationsForChat(chatId: String) {
-    prevNtfTime.remove(chatId)
-    manager.cancel(chatId.hashCode())
-    val msgNtfs = manager.activeNotifications.filter {
-      ntf -> ntf.notification.channelId == MessageChannel
-    }
-    if (msgNtfs.count() == 1) {
-      // Have a group notification with no children so cancel it
-      manager.cancel(0)
-    }
-  }
-
-  fun notifyContactRequestReceived(user: User, cInfo: ChatInfo.ContactRequest) {
-    displayNotification(
-      user = user,
-      chatId = cInfo.id,
-      displayName = cInfo.displayName,
-      msgText = generalGetString(R.string.notification_new_contact_request),
-      image = cInfo.image,
-      listOf(NotificationAction.ACCEPT_CONTACT_REQUEST)
-    )
-  }
-
-  fun notifyContactConnected(user: User, contact: Contact) {
-    displayNotification(
-      user = user,
-      chatId = contact.id,
-      displayName = contact.displayName,
-      msgText = generalGetString(R.string.notification_contact_connected)
-    )
-  }
-
-  fun notifyMessageReceived(user: User, cInfo: ChatInfo, cItem: ChatItem) {
-    if (!cInfo.ntfsEnabled) return
-    displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
-  }
-
-  fun displayNotification(user: User, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
-    if (!user.showNotifications) return
-    Log.d(TAG, "notifyMessageReceived $chatId")
-    val now = Clock.System.now().toEpochMilliseconds()
-    val recentNotification = (now - prevNtfTime.getOrDefault(chatId, 0) < msgNtfTimeoutMs)
-    prevNtfTime[chatId] = now
-
-    val previewMode = appPreferences.notificationPreviewMode.get()
-    val title = if (previewMode == NotificationPreviewMode.HIDDEN.name) generalGetString(R.string.notification_preview_somebody) else displayName
-    val content = if (previewMode != NotificationPreviewMode.MESSAGE.name) generalGetString(R.string.notification_preview_new_message) else msgText
-    val largeIcon = when {
-      actions.isEmpty() -> null
-      image == null || previewMode == NotificationPreviewMode.HIDDEN.name -> BitmapFactory.decodeResource(context.resources, R.drawable.icon)
-      else -> base64ToBitmap(image)
-    }
-    val builder = NotificationCompat.Builder(context, MessageChannel)
-      .setContentTitle(title)
-      .setContentText(content)
-      .setPriority(NotificationCompat.PRIORITY_HIGH)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(largeIcon)
-      .setColor(0x88FFFF)
-      .setAutoCancel(true)
-      .setVibrate(if (actions.isEmpty()) null else longArrayOf(0, 250, 250, 250))
-      .setContentIntent(chatPendingIntent(OpenChatAction, user.userId, chatId))
-      .setSilent(if (actions.isEmpty()) recentNotification else false)
-
-    for (action in actions) {
-      val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-      val actionIntent = Intent(SimplexApp.context, NtfActionReceiver::class.java)
-      actionIntent.action = action.name
-      actionIntent.putExtra(UserIdKey, user.userId)
-      actionIntent.putExtra(ChatIdKey, chatId)
-      val actionPendingIntent: PendingIntent = PendingIntent.getBroadcast(SimplexApp.context, 0, actionIntent, flags)
-      val actionButton = when (action) {
-        NotificationAction.ACCEPT_CONTACT_REQUEST -> generalGetString(R.string.accept)
-      }
-      builder.addAction(0, actionButton, actionPendingIntent)
-    }
-
-    val summary = NotificationCompat.Builder(context, MessageChannel)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setColor(0x88FFFF)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setGroupSummary(true)
-      .setContentIntent(chatPendingIntent(ShowChatsAction, null))
-      .build()
-
-    with(NotificationManagerCompat.from(context)) {
-      // using cInfo.id only shows one notification per chat and updates it when the message arrives
-      notify(chatId.hashCode(), builder.build())
-      notify(0, summary)
-    }
-  }
-
-  fun notifyCallInvitation(invitation: RcvCallInvitation) {
-    val keyguardManager = getKeyguardManager(context)
-    Log.d(TAG,
-      "notifyCallInvitation pre-requests: " +
-          "keyguard locked ${keyguardManager.isKeyguardLocked}, " +
-          "callOnLockScreen ${appPreferences.callOnLockScreen.get()}, " +
-          "onForeground ${SimplexApp.context.isAppOnForeground}"
-    )
-    if (SimplexApp.context.isAppOnForeground) return
-    val contactId = invitation.contact.id
-    Log.d(TAG, "notifyCallInvitation $contactId")
-    val image = invitation.contact.image
-    val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-    val screenOff = displayManager.displays.all { it.state != Display.STATE_ON }
-    var ntfBuilder =
-      if ((keyguardManager.isKeyguardLocked || screenOff) && appPreferences.callOnLockScreen.get() != CallOnLockScreen.DISABLE) {
-        val fullScreenIntent = Intent(context, IncomingCallActivity::class.java)
-        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-        NotificationCompat.Builder(context, CallChannel)
-          .setFullScreenIntent(fullScreenPendingIntent, true)
-          .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-      } else {
-        val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
-        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, Intent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-        NotificationCompat.Builder(context, CallChannel)
-          .setContentIntent(chatPendingIntent(OpenChatAction, invitation.user.userId, invitation.contact.id))
-          .addAction(R.drawable.ntf_icon, generalGetString(R.string.accept), chatPendingIntent(AcceptCallAction, invitation.user.userId, contactId))
-          .addAction(R.drawable.ntf_icon, generalGetString(R.string.reject), chatPendingIntent(RejectCallAction, invitation.user.userId, contactId, true))
-          .setFullScreenIntent(fullScreenPendingIntent, true)
-          .setSound(soundUri)
-      }
-    val text = generalGetString(
-      if (invitation.callType.media == CallMediaType.Video) {
-        if (invitation.sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
-      } else {
-        if (invitation.sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
-      }
-    )
-    val previewMode = appPreferences.notificationPreviewMode.get()
-    val title = if (previewMode == NotificationPreviewMode.HIDDEN.name)
-      generalGetString(R.string.notification_preview_somebody)
-    else
-      invitation.contact.displayName
-    val largeIcon = if (image == null || previewMode == NotificationPreviewMode.HIDDEN.name)
-      BitmapFactory.decodeResource(context.resources, R.drawable.icon)
-    else
-      base64ToBitmap(image)
-
-    ntfBuilder = ntfBuilder
-      .setContentTitle(title)
-      .setContentText(text)
-      .setPriority(NotificationCompat.PRIORITY_HIGH)
-      .setCategory(NotificationCompat.CATEGORY_CALL)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(largeIcon)
-      .setColor(0x88FFFF)
-      .setAutoCancel(true)
-    val notification = ntfBuilder.build()
-    // This makes notification sound and vibration repeat endlessly
-    notification.flags = notification.flags or NotificationCompat.FLAG_INSISTENT
-    with(NotificationManagerCompat.from(context)) {
-      notify(CallNotificationId, notification)
-    }
-  }
-
-  fun cancelCallNotification() {
-    manager.cancel(CallNotificationId)
-  }
-
-  fun hasNotificationsForChat(chatId: String): Boolean = manager.activeNotifications.any { it.id == chatId.hashCode() }
-
-  private fun hideSecrets(cItem: ChatItem) : String {
-    val md = cItem.formattedText
-    return if (md != null) {
-      var res = ""
-      for (ft in md) {
-        res += if (ft.format is Format.Secret) "..." else ft.text
-      }
-      res
-    } else {
-      cItem.text
-    }
-  }
-
-  private fun chatPendingIntent(intentAction: String, userId: Long?, chatId: String? = null, broadcast: Boolean = false): PendingIntent {
-    Log.d(TAG, "chatPendingIntent for $intentAction")
-    val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
-    var intent = Intent(context, if (!broadcast) MainActivity::class.java else NtfActionReceiver::class.java)
-      .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-      .setAction(intentAction)
-      .putExtra(UserIdKey, userId)
-    if (chatId != null) intent = intent.putExtra(ChatIdKey, chatId)
-    return if (!broadcast) {
-      TaskStackBuilder.create(context).run {
-        addNextIntentWithParentStack(intent)
-        getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)
-      }
-    } else {
-      PendingIntent.getBroadcast(SimplexApp.context, uniqueInt, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-    }
-  }
-
-  /**
-   * This function creates notifications channels. On Android 13+ calling it for the first time will trigger system alert,
-   * The alert asks a user to allow or disallow to show notifications for the app. That's why it should be called only when the user
-   * already saw such alert or when you want to trigger showing the alert.
-   * On the first app launch the channels will be created after user profile is created. Subsequent calls will create new channels and delete
-   * old ones if needed
-   * */
-  fun createNtfChannelsMaybeShowAlert() {
-    manager.createNotificationChannel(NotificationChannel(MessageChannel, generalGetString(R.string.ntf_channel_messages), NotificationManager.IMPORTANCE_HIGH))
-    manager.createNotificationChannel(callNotificationChannel(CallChannel, generalGetString(R.string.ntf_channel_calls)))
-    // Remove old channels since they can't be edited
-    manager.deleteNotificationChannel("chat.simplex.app.CALL_NOTIFICATION")
-    manager.deleteNotificationChannel("chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION")
-  }
-
-  /**
-   * Processes every action specified by [NotificationCompat.Builder.addAction] that comes with [NotificationAction]
-   * and [ChatInfo.id] as [ChatIdKey] in extra
-   * */
-  class NtfActionReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-      val userId = getUserIdFromIntent(intent)
-      val chatId = intent?.getStringExtra(ChatIdKey) ?: return
-      val m = SimplexApp.context.chatModel
-      when (intent.action) {
-        NotificationAction.ACCEPT_CONTACT_REQUEST.name -> {
-          val isCurrentUser = m.currentUser.value?.userId == userId
-          val cInfo: ChatInfo.ContactRequest? = if (isCurrentUser) {
-            (m.getChat(chatId)?.chatInfo as? ChatInfo.ContactRequest) ?: return
-          } else {
-            null
-          }
-          val apiId = chatId.replace("<@", "").toLongOrNull() ?: return
-          acceptContactRequest(apiId, cInfo, isCurrentUser, m)
-          m.controller.ntfManager.cancelNotificationsForChat(chatId)
-        }
-        RejectCallAction -> {
-          val invitation = m.callInvitations[chatId]
-          if (invitation != null) {
-            m.callManager.endCall(invitation = invitation)
-          }
-        }
-        else -> {
-          Log.e(TAG, "Unknown action. Make sure you provide action from NotificationAction enum")
-        }
-      }
-    }
-  }
-}

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

@@ -1,29 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple200 = Color(0xFFBB86FC)
-val Purple500 = Color(0xFF6200EE)
-val Purple700 = Color(0xFF3700B3)
-val Teal200 = Color(0xFF03DAC5)
-val Gray = Color(0x22222222)
-val Indigo = Color(0xFF9966FF)
-val SimplexBlue = Color(0, 136, 255, 255)  // If this value changes also need to update #0088ff in string resource files
-val SimplexGreen = Color(77, 218, 103, 255)
-val SecretColor = Color(0x40808080)
-val LightGray = Color(241, 242, 246, 255)
-val DarkGray = Color(43, 44, 46, 255)
-val HighOrLowlight = Color(139, 135, 134, 255)
-val MessagePreviewDark = Color(179, 175, 174, 255)
-val MessagePreviewLight = Color(49, 45, 44, 255)
-val ToolbarLight = Color(220, 220, 220, 12)
-val ToolbarDark = Color(80, 80, 80, 12)
-val SettingsSecondaryLight = Color(200, 196, 195, 90)
-val GroupDark = Color(80, 80, 80, 60)
-val IncomingCallLight = Color(239, 237, 236, 255)
-val IncomingCallDark = Color(34, 30, 29, 255)
-val WarningOrange = Color(255, 127, 0, 255)
-val WarningYellow = Color(255, 192, 0, 255)
-val FileLight = Color(183, 190, 199, 255)
-val FileDark = Color(101, 101, 106, 255)
-val MenuTextColorDark = Color.White.copy(alpha = 0.8f)

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

@@ -1,11 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
-import androidx.compose.ui.unit.dp
-
-val Shapes = Shapes(
-  small = RoundedCornerShape(4.dp),
-  medium = RoundedCornerShape(4.dp),
-  large = RoundedCornerShape(0.dp)
-)

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

@@ -1,269 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import android.app.UiModeManager
-import android.content.Context
-import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-enum class DefaultTheme {
-  SYSTEM, LIGHT, DARK, SIMPLEX;
-
-  // Call it only with base theme, not SYSTEM
-  fun hasChangedAnyColor(colors: Colors, appColors: AppColors): Boolean {
-    val palette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPalette
-      DARK -> DarkColorPalette
-      SIMPLEX -> SimplexColorPalette
-    }
-    val appPalette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPaletteApp
-      DARK -> DarkColorPaletteApp
-      SIMPLEX -> SimplexColorPaletteApp
-    }
-    return colors.primary != palette.primary ||
-        colors.primaryVariant != palette.primaryVariant ||
-        colors.secondary != palette.secondary ||
-        colors.secondaryVariant != palette.secondaryVariant ||
-        colors.background != palette.background ||
-        colors.surface != palette.surface ||
-        appColors != appPalette
-  }
-}
-
-data class AppColors(
-  val title: Color,
-  val sentMessage: Color,
-  val receivedMessage: Color
-)
-
-enum class ThemeColor {
-  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, RECEIVED_MESSAGE;
-
-  fun fromColors(colors: Colors, appColors: AppColors): Color {
-    return when (this) {
-      PRIMARY -> colors.primary
-      PRIMARY_VARIANT -> colors.primaryVariant
-      SECONDARY -> colors.secondary
-      SECONDARY_VARIANT -> colors.secondaryVariant
-      BACKGROUND -> colors.background
-      SURFACE -> colors.surface
-      TITLE -> appColors.title
-      SENT_MESSAGE -> appColors.sentMessage
-      RECEIVED_MESSAGE -> appColors.receivedMessage
-    }
-  }
-
-  val text: String
-    get() = when (this) {
-      PRIMARY -> generalGetString(R.string.color_primary)
-      PRIMARY_VARIANT -> generalGetString(R.string.color_primary_variant)
-      SECONDARY -> generalGetString(R.string.color_secondary)
-      SECONDARY_VARIANT -> generalGetString(R.string.color_secondary_variant)
-      BACKGROUND -> generalGetString(R.string.color_background)
-      SURFACE -> generalGetString(R.string.color_surface)
-      TITLE -> generalGetString(R.string.color_title)
-      SENT_MESSAGE -> generalGetString(R.string.color_sent_message)
-      RECEIVED_MESSAGE -> generalGetString(R.string.color_received_message)
-    }
-}
-
-@Serializable
-data class ThemeColors(
-  @SerialName("accent")
-  val primary: String? = null,
-  @SerialName("accentVariant")
-  val primaryVariant: String? = null,
-  val secondary: String? = null,
-  val secondaryVariant: String? = null,
-  val background: String? = null,
-  @SerialName("menus")
-  val surface: String? = null,
-  val title: String? = null,
-  val sentMessage: String? = null,
-  val receivedMessage: String? = null,
-) {
-  fun toColors(base: DefaultTheme): Colors {
-    val baseColors = when (base) {
-      DefaultTheme.LIGHT -> LightColorPalette
-      DefaultTheme.DARK -> DarkColorPalette
-      DefaultTheme.SIMPLEX -> SimplexColorPalette
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPalette
-    }
-    return baseColors.copy(
-      primary = primary?.colorFromReadableHex() ?: baseColors.primary,
-      primaryVariant = primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
-      secondary = secondary?.colorFromReadableHex() ?: baseColors.secondary,
-      secondaryVariant = secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
-      background = background?.colorFromReadableHex() ?: baseColors.background,
-      surface = surface?.colorFromReadableHex() ?: baseColors.surface,
-    )
-  }
-
-  fun toAppColors(base: DefaultTheme): AppColors {
-    val baseColors = when (base) {
-      DefaultTheme.LIGHT -> LightColorPaletteApp
-      DefaultTheme.DARK -> DarkColorPaletteApp
-      DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPaletteApp
-    }
-    return baseColors.copy(
-      title = title?.colorFromReadableHex() ?: baseColors.title,
-      sentMessage = sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage,
-      receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
-    )
-  }
-}
-
-private fun String.colorFromReadableHex(): Color =
-  Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
-
-@Serializable
-data class ThemeOverrides (
-  val base: DefaultTheme,
-  val colors: ThemeColors
-) {
-  fun withUpdatedColor(name: ThemeColor, color: String): ThemeOverrides {
-    return copy(colors = when (name) {
-      ThemeColor.PRIMARY -> colors.copy(primary = color)
-      ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
-      ThemeColor.SECONDARY -> colors.copy(secondary = color)
-      ThemeColor.SECONDARY_VARIANT -> colors.copy(secondaryVariant = color)
-      ThemeColor.BACKGROUND -> colors.copy(background = color)
-      ThemeColor.SURFACE -> colors.copy(surface = color)
-      ThemeColor.TITLE -> colors.copy(title = color)
-      ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
-      ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
-    })
-  }
-}
-
-@Serializable
-data class ThemeData (val colors: ThemeColors)
-
-fun Modifier.themedBackground(baseTheme: DefaultTheme = CurrentColors.value.base, shape: Shape = RectangleShape): Modifier {
-  return if (baseTheme == DefaultTheme.SIMPLEX) {
-    this.background(brush = Brush.linearGradient(
-      listOf(
-        CurrentColors.value.colors.background.darker(0.4f),
-        CurrentColors.value.colors.background.lighter(0.4f)
-      ),
-      Offset(0f, Float.POSITIVE_INFINITY),
-      Offset(Float.POSITIVE_INFINITY, 0f)
-    ), shape = shape)
-  } else {
-    this.background(color = CurrentColors.value.colors.background, shape = shape)
-  }
-}
-
-val DEFAULT_PADDING = 20.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 = SimplexBlue,
-  secondary = HighOrLowlight,
-  secondaryVariant = DarkGray,
-//  background = Color.Black,
-  surface = Color(0xFF222222),
-//  background = Color(0xFF121212),
-//  surface = Color(0xFF121212),
-  error = Color.Red,
-  onBackground = Color(0xFFFFFBFA),
-  onSurface = Color(0xFFFFFBFA),
-//  onError: Color = Color.Black,
-)
-val DarkColorPaletteApp = AppColors(
-  title = SimplexBlue,
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)
-
-val LightColorPalette = lightColors(
-  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexBlue,
-  secondary = HighOrLowlight,
-  secondaryVariant = LightGray,
-  error = Color.Red,
-//  background = Color.White,
-  surface = Color.White,
-//  onPrimary = Color.White,
-//  onSecondary = Color.Black,
-//  onBackground = Color.Black,
-//  onSurface = Color.Black,
-)
-val LightColorPaletteApp = AppColors(
-  title = SimplexBlue,
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)
-
-val SimplexColorPalette = darkColors(
-  primary = Color(0xFF70F0F9),  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = Color(0xFF1298A5),
-  secondary = HighOrLowlight,
-  secondaryVariant = Color(0xFF2C464D),
-  background = Color(0xFF111528),
-  //  surface = Color.Black,
-  //  background = Color(0xFF121212),
-  surface = Color(0xFF121C37),
-  error = Color.Red,
-//  onBackground = Color(0xFFFFFBFA),
-//  onSurface = Color(0xFFFFFBFA),
-  //  onError: Color = Color.Black,
-)
-val SimplexColorPaletteApp = AppColors(
-  title = Color(0xFF267BE5),
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)
-
-val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = 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.colors.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 (SimplexApp.context.chatModel.controller.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM.name && CurrentColors.value.colors.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.colors,
-    typography = Typography,
-    shapes = Shapes,
-    content = content
-  )
-}

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

@@ -1,154 +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
-import okhttp3.internal.toHexString
-
-object ThemeManager {
-  private val appPrefs: AppPreferences by lazy {
-    SimplexApp.context.chatModel.controller.appPrefs
-  }
-
-  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors)
-
-  private fun systemDarkThemeColors(): Pair<Colors, DefaultTheme> = when (appPrefs.systemDarkTheme.get()) {
-    DefaultTheme.DARK.name -> DarkColorPalette to DefaultTheme.DARK
-    DefaultTheme.SIMPLEX.name -> SimplexColorPalette to DefaultTheme.SIMPLEX
-    else -> SimplexColorPalette to DefaultTheme.SIMPLEX
-  }
-
-  fun currentColors(darkForSystemTheme: Boolean): ActiveTheme {
-    val themeName = appPrefs.currentTheme.get()!!
-    val themeOverrides = appPrefs.themeOverrides.get()
-
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val theme = themeOverrides[nonSystemThemeName]
-    val baseTheme = when (nonSystemThemeName) {
-      DefaultTheme.LIGHT.name -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-      DefaultTheme.DARK.name -> Triple(DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp)
-      DefaultTheme.SIMPLEX.name -> Triple(DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp)
-      else -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-    }
-    if (theme == null) {
-      return ActiveTheme(themeName, baseTheme.first, baseTheme.second, baseTheme.third)
-    }
-    return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.base))
-  }
-
-  fun currentThemeData(darkForSystemTheme: Boolean): ThemeData {
-    val t = currentColors(darkForSystemTheme)
-    return ThemeData(colors = ThemeColors(
-      primary = t.colors.primary.toReadableHex(),
-      primaryVariant = t.colors.primaryVariant.toReadableHex(),
-      secondary = t.colors.secondary.toReadableHex(),
-      secondaryVariant = t.colors.secondaryVariant.toReadableHex(),
-      background = t.colors.background.toReadableHex(),
-      surface = t.colors.surface.toReadableHex(),
-      title = t.appColors.title.toReadableHex(),
-      sentMessage = t.appColors.sentMessage.toReadableHex(),
-      receivedMessage = t.appColors.receivedMessage.toReadableHex()
-    ))
-  }
-
-  // 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) systemDarkThemeColors().first 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)
-      )
-    )
-    allThemes.add(
-      Triple(
-        SimplexColorPalette,
-        DefaultTheme.SIMPLEX,
-        generalGetString(R.string.theme_simplex)
-      )
-    )
-    return allThemes
-  }
-
-  fun applyTheme(theme: String, darkForSystemTheme: Boolean) {
-    appPrefs.currentTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
-  }
-
-  fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {
-    appPrefs.systemDarkTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
-  }
-
-  fun saveAndApplyThemeColor(name: ThemeColor, color: Color? = null, darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    var colorToSet = color
-    if (colorToSet == null) {
-      // Setting default color from a base theme
-      colorToSet = when(nonSystemThemeName) {
-        DefaultTheme.LIGHT.name -> name.fromColors(LightColorPalette, LightColorPaletteApp)
-        DefaultTheme.DARK.name -> name.fromColors(DarkColorPalette, DarkColorPaletteApp)
-        DefaultTheme.SIMPLEX.name -> name.fromColors(SimplexColorPalette, SimplexColorPaletteApp)
-        // Will not be here
-        else -> return
-      }
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[nonSystemThemeName] = prevValue.withUpdatedColor(name, colorToSet.toReadableHex())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
-  }
-
-  fun saveAndApplyThemeData(name: String, theme: ThemeData, darkForSystemTheme: Boolean) {
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[name] = prevValue.copy(colors = theme.colors)
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
-  }
-
-  fun resetAllThemeColors(darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: return
-    overrides[nonSystemThemeName] = prevValue.copy(colors = ThemeColors())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
-  }
-}
-
-private fun Color.toReadableHex(): String = "#" + toArgb().toHexString()

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

@@ -1,56 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.material.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.*
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-
-// https://github.com/rsms/inter
-val Inter = FontFamily(
-  Font(R.font.inter_regular),
-  Font(R.font.inter_italic, style = FontStyle.Italic),
-  Font(R.font.inter_bold, weight = FontWeight.Bold),
-  Font(R.font.inter_semi_bold, weight = FontWeight.SemiBold),
-  Font(R.font.inter_medium, weight = FontWeight.Medium),
-  Font(R.font.inter_light, weight = FontWeight.Light),
-)
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-  h1 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Bold,
-    fontSize = 32.sp,
-  ),
-  h2 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 24.sp
-  ),
-  h3 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 18.5.sp
-  ),
-  body1 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp
-  ),
-  body2 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 14.sp
-  ),
-  button = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp,
-  ),
-  caption = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 18.sp
-  )
-)

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

@@ -1,24 +0,0 @@
-package chat.simplex.app.views
-
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@Composable
-fun SplashView() {
-  Surface(
-    Modifier
-      .fillMaxSize(),
-    color = MaterialTheme.colors.background
-  ) {
-//    Image(
-//      painter = painterResource(R.drawable.logo),
-//      contentDescription = "Simplex Icon",
-//      modifier = Modifier
-//        .height(230.dp)
-//        .align(Alignment.Center)
-//    )
-  }
-}

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

@@ -1,158 +0,0 @@
-package chat.simplex.app.views
-
-import android.content.res.Configuration
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-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.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.helpers.*
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-
-@Composable
-fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
-  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }
-  BackHandler(onBack = {
-    close()
-  })
-    TerminalLayout(
-      remember { chatModel.terminalItems },
-      composeState,
-      sendCommand = { sendCommand(chatModel, composeState) },
-      close
-    )
-}
-
-private fun sendCommand(chatModel: ChatModel, composeState: MutableState<ComposeState>) {
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  val prefPerformLA = chatModel.controller.appPrefs.performLA.get()
-  val s = composeState.value.message
-  if (s.startsWith("/sql") && (!prefPerformLA || !developerTools)) {
-    val resp = CR.ChatCmdError(null, ChatError.ChatErrorChat(ChatErrorType.СommandError("Failed reading: empty")))
-    chatModel.addTerminalItem(TerminalItem.cmd(CC.Console(s)))
-    chatModel.addTerminalItem(TerminalItem.resp(resp))
-    composeState.value = ComposeState(useLinkPreviews = false)
-  } else {
-    withApi {
-      // show "in progress"
-      chatModel.controller.sendCmd(CC.Console(s))
-      composeState.value = ComposeState(useLinkPreviews = false)
-      // hide "in progress"
-    }
-  }
-}
-
-@Composable
-fun TerminalLayout(
-  terminalItems: List<TerminalItem>,
-  composeState: MutableState<ComposeState>,
-  sendCommand: () -> Unit,
-  close: () -> Unit
-) {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-
-  fun onMessageChange(s: String) {
-    composeState.value = composeState.value.copy(message = s)
-  }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Scaffold(
-      topBar = { CloseSheetBar(close) },
-      bottomBar = {
-        Box(Modifier.padding(horizontal = 8.dp)) {
-          SendMsgView(
-            composeState = composeState,
-            showVoiceRecordIcon = false,
-            recState = remember { mutableStateOf(RecordingState.NotStarted) },
-            isDirectChat = false,
-            liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
-            needToAllowVoiceToContact = false,
-            allowedVoiceByPrefs = false,
-            userIsObserver = false,
-            userCanSend = true,
-            allowVoiceToContact = {},
-            sendMessage = sendCommand,
-            sendLiveMessage = null,
-            updateLiveMessage = null,
-            onMessageChange = ::onMessageChange,
-            textStyle = textStyle
-          )
-        }
-      },
-      modifier = Modifier.navigationBarsWithImePadding()
-    ) { contentPadding ->
-      Surface(
-        modifier = Modifier
-          .padding(contentPadding)
-          .fillMaxWidth()
-          .themedBackground()
-      ) {
-        TerminalLog(terminalItems)
-      }
-    }
-  }
-}
-
-private var lazyListState = 0 to 0
-
-@Composable
-fun TerminalLog(terminalItems: List<TerminalItem>) {
-  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
-  DisposableEffect(Unit) {
-    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
-  }
-  val reversedTerminalItems by remember { derivedStateOf { terminalItems.reversed().toList() } }
-  val context = LocalContext.current
-  LazyColumn(state = listState, reverseLayout = true) {
-    items(reversedTerminalItems) { item ->
-      Text(
-        "${item.date.toString().subSequence(11, 19)} ${item.label}",
-        style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 18.sp, color = MaterialTheme.colors.primary),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        modifier = Modifier
-          .fillMaxWidth()
-          .clickable {
-            ModalManager.shared.showModal(endButtons = { ShareButton { shareText(context, item.details) } }) {
-              SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
-                Text(item.details, modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
-              }
-            }
-          }.padding(horizontal = 8.dp, vertical = 4.dp)
-      )
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewTerminalLayout() {
-  SimpleXTheme {
-    TerminalLayout(
-      terminalItems = TerminalItem.sampleData,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) },
-      sendCommand = {},
-      close = {}
-    )
-  }
-}

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

@@ -1,189 +0,0 @@
-package chat.simplex.app.views
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
-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.graphics.SolidColor
-import androidx.compose.ui.res.painterResource
-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
-
-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)) {
-        AppBarTitle(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 = painterResource(R.drawable.ic_arrow_back_ios_new),
-            textDecoration = TextDecoration.None,
-            fontWeight = FontWeight.Medium
-          ) { 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 = MaterialTheme.colors.secondary
-        }
-        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(painterResource(R.drawable.ic_arrow_forward_ios), 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) {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.6f)
-        } else {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.3f)
-        }
-      } else Color.Red
-    }
-  }
-  val modifier = Modifier
-    .fillMaxWidth()
-    .padding(horizontal = DEFAULT_PADDING)
-    .navigationBarsWithImePadding()
-    .onFocusChanged { focused = it.isFocused }
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .height(52.dp)
-      .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(50)),
-    contentAlignment = Alignment.Center
-  ) {
-    BasicTextField(
-      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,
-      cursorBrush = SolidColor(MaterialTheme.colors.secondary)
-    )
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { name.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}

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

@@ -1,109 +0,0 @@
-package chat.simplex.app.views.call
-
-import android.util.Log
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.helpers.ModalManager
-import chat.simplex.app.views.helpers.withApi
-import kotlinx.datetime.Clock
-import kotlin.time.Duration.Companion.minutes
-
-class CallManager(val chatModel: ChatModel) {
-  fun reportNewIncomingCall(invitation: RcvCallInvitation) {
-    Log.d(TAG, "CallManager.reportNewIncomingCall")
-    with (chatModel) {
-      callInvitations[invitation.contact.id] = invitation
-      if (invitation.user.showNotifications) {
-        if (Clock.System.now() - invitation.callTs <= 3.minutes) {
-          activeCallInvitation.value = invitation
-          controller.ntfManager.notifyCallInvitation(invitation)
-        } else {
-          val contact = invitation.contact
-          controller.ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
-        }
-      }
-    }
-  }
-
-  fun acceptIncomingCall(invitation: RcvCallInvitation) {
-    ModalManager.shared.closeModals()
-    val call = chatModel.activeCall.value
-    if (call == null) {
-      justAcceptIncomingCall(invitation = invitation)
-    } else {
-      withApi {
-        chatModel.switchingCall.value = true
-        try {
-          endCall(call = call)
-          justAcceptIncomingCall(invitation = invitation)
-        } finally {
-          withApi { chatModel.switchingCall.value = false }
-        }
-      }
-    }
-  }
-
-  private fun justAcceptIncomingCall(invitation: RcvCallInvitation) {
-    with (chatModel) {
-      activeCall.value = Call(
-        contact = invitation.contact,
-        callState = CallState.InvitationAccepted,
-        localMedia = invitation.callType.media,
-        sharedKey = invitation.sharedKey
-      )
-      showCallView.value = true
-      val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
-      val iceServers = getIceServers()
-      Log.d(TAG, "answerIncomingCall iceServers: $iceServers")
-      callCommand.value = WCallCommand.Start(
-        media = invitation.callType.media,
-        aesKey = invitation.sharedKey,
-        iceServers = iceServers,
-        relay = useRelay
-      )
-      callInvitations.remove(invitation.contact.id)
-      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
-        activeCallInvitation.value = null
-        controller.ntfManager.cancelCallNotification()
-      }
-    }
-  }
-
-  suspend fun endCall(call: Call) {
-    with (chatModel) {
-      if (call.callState == CallState.Ended) {
-        Log.d(TAG, "CallManager.endCall: call ended")
-        activeCall.value = null
-        showCallView.value = false
-      } else {
-        Log.d(TAG, "CallManager.endCall: ending call...")
-        callCommand.value = WCallCommand.End
-        showCallView.value = false
-        controller.apiEndCall(call.contact)
-        activeCall.value = null
-      }
-    }
-  }
-
-  fun endCall(invitation: RcvCallInvitation) {
-    with (chatModel) {
-      callInvitations.remove(invitation.contact.id)
-      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
-        activeCallInvitation.value = null
-        controller.ntfManager.cancelCallNotification()
-      }
-      withApi {
-        if (!controller.apiRejectCall(invitation.contact)) {
-          Log.e(TAG, "apiRejectCall error")
-        }
-      }
-    }
-  }
-
-  fun reportCallRemoteEnded(invitation: RcvCallInvitation) {
-    if (chatModel.activeCallInvitation.value?.contact?.id == invitation.contact.id) {
-      chatModel.activeCallInvitation.value = null
-      chatModel.controller.ntfManager.cancelCallNotification()
-    }
-  }
-}

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

@@ -1,573 +0,0 @@
-package chat.simplex.app.views.call
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.*
-import android.content.pm.ActivityInfo
-import android.media.*
-import android.os.Build
-import android.os.PowerManager
-import android.os.PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK
-import android.util.Log
-import android.view.ViewGroup
-import android.webkit.*
-import androidx.activity.compose.BackHandler
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.*
-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.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.webkit.WebViewAssetLoader
-import androidx.webkit.WebViewClientCompat
-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.ProfileImage
-import chat.simplex.app.views.helpers.withApi
-import chat.simplex.app.views.usersettings.NotificationsMode
-import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-
-@SuppressLint("SourceLockedOrientationActivity")
-@Composable
-fun ActiveCallView(chatModel: ChatModel) {
-  BackHandler(onBack = {
-    val call = chatModel.activeCall.value
-    if (call != null) withApi { chatModel.callManager.endCall(call) }
-  })
-  val audioViaBluetooth = rememberSaveable { mutableStateOf(false) }
-  val ntfModeService = remember { chatModel.controller.appPrefs.notificationsMode.get() == NotificationsMode.SERVICE.name }
-  LaunchedEffect(Unit) {
-    // Start service when call happening since it's not already started.
-    // It's needed to prevent Android from shutting down a microphone after a minute or so when screen is off
-    if (!ntfModeService) SimplexService.start(SimplexApp.context)
-  }
-  DisposableEffect(Unit) {
-    val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-    var btDeviceCount = 0
-    val audioCallback = object: AudioDeviceCallback() {
-      override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
-        Log.d(TAG, "Added audio devices: ${addedDevices.map { it.type }}")
-        super.onAudioDevicesAdded(addedDevices)
-        val addedCount = addedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-        btDeviceCount += addedCount
-        audioViaBluetooth.value = btDeviceCount > 0
-        if (addedCount > 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
-          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
-          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
-        }
-      }
-      override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
-        Log.d(TAG, "Removed audio devices: ${removedDevices.map { it.type }}")
-        super.onAudioDevicesRemoved(removedDevices)
-        val removedCount = removedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-        btDeviceCount -= removedCount
-        audioViaBluetooth.value = btDeviceCount > 0
-        if (btDeviceCount == 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
-          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
-          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
-        }
-      }
-    }
-    am.registerAudioDeviceCallback(audioCallback, null)
-    val pm = (SimplexApp.context.getSystemService(Context.POWER_SERVICE) as PowerManager)
-    val proximityLock = if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, SimplexApp.context.packageName + ":proximityLock")
-    } else {
-      null
-    }
-    proximityLock?.acquire()
-    onDispose {
-      // Stop it when call ended
-      if (!ntfModeService) SimplexService.safeStopService(SimplexApp.context)
-      dropAudioManagerOverrides()
-      am.unregisterAudioDeviceCallback(audioCallback)
-      proximityLock?.release()
-    }
-  }
-  val scope = rememberCoroutineScope()
-  Box(Modifier.fillMaxSize()) {
-    WebRTCView(chatModel.callCommand) { apiMsg ->
-      Log.d(TAG, "received from WebRTCView: $apiMsg")
-      val call = chatModel.activeCall.value
-      if (call != null) {
-        Log.d(TAG, "has active call $call")
-        when (val r = apiMsg.resp) {
-          is WCallResponse.Capabilities -> withApi {
-            val callType = CallType(call.localMedia, r.capabilities)
-            chatModel.controller.apiSendCallInvitation(call.contact, callType)
-            chatModel.activeCall.value = call.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities)
-          }
-          is WCallResponse.Offer -> withApi {
-            chatModel.controller.apiSendCallOffer(call.contact, r.offer, r.iceCandidates, call.localMedia, r.capabilities)
-            chatModel.activeCall.value = call.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities)
-          }
-          is WCallResponse.Answer -> withApi {
-            chatModel.controller.apiSendCallAnswer(call.contact, r.answer, r.iceCandidates)
-            chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
-          }
-          is WCallResponse.Ice -> withApi {
-            chatModel.controller.apiSendCallExtraInfo(call.contact, r.iceCandidates)
-          }
-          is WCallResponse.Connection ->
-            try {
-              val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
-              if (callStatus == WebRTCCallStatus.Connected) {
-                chatModel.activeCall.value = call.copy(callState = CallState.Connected)
-                setCallSound(call.soundSpeaker, audioViaBluetooth)
-              }
-              withApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
-            } catch (e: Error) {
-              Log.d(TAG,"call status ${r.state.connectionState} not used")
-            }
-          is WCallResponse.Connected -> {
-            chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
-            scope.launch {
-              setCallSound(call.soundSpeaker, audioViaBluetooth)
-            }
-          }
-          is WCallResponse.Ended -> {
-            chatModel.activeCall.value = call.copy(callState = CallState.Ended)
-            withApi { chatModel.callManager.endCall(call) }
-            chatModel.showCallView.value = false
-          }
-          is WCallResponse.Ok -> when (val cmd = apiMsg.command) {
-            is WCallCommand.Answer ->
-              chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
-            is WCallCommand.Media -> {
-              when (cmd.media) {
-                CallMediaType.Video -> chatModel.activeCall.value = call.copy(videoEnabled = cmd.enable)
-                CallMediaType.Audio -> chatModel.activeCall.value = call.copy(audioEnabled = cmd.enable)
-              }
-            }
-            is WCallCommand.Camera -> {
-              chatModel.activeCall.value = call.copy(localCamera = cmd.camera)
-              if (!call.audioEnabled) {
-                chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = false)
-              }
-            }
-            is WCallCommand.End ->
-              chatModel.showCallView.value = false
-            else -> {}
-          }
-          is WCallResponse.Error -> {
-            Log.e(TAG, "ActiveCallView: command error ${r.message}")
-          }
-        }
-      }
-    }
-    val call = chatModel.activeCall.value
-    if (call != null)  ActiveCallOverlay(call, chatModel, audioViaBluetooth)
-  }
-
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val prevVolumeControlStream = activity.volumeControlStream
-    activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
-    // Lock orientation to portrait in order to have good experience with calls
-    activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    onDispose {
-      activity.volumeControlStream = prevVolumeControlStream
-      // Unlock orientation
-      activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    }
-  }
-}
-
-@Composable
-private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetooth: MutableState<Boolean>) {
-  ActiveCallOverlayLayout(
-    call = call,
-    speakerCanBeEnabled = !audioViaBluetooth.value,
-    dismiss = { withApi { chatModel.callManager.endCall(call) } },
-    toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
-    toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
-    toggleSound = {
-      var call = chatModel.activeCall.value
-      if (call != null) {
-        call = call.copy(soundSpeaker = !call.soundSpeaker)
-        chatModel.activeCall.value = call
-        setCallSound(call.soundSpeaker, audioViaBluetooth)
-      }
-    },
-    flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
-  )
-}
-
-private fun setCallSound(speaker: Boolean, audioViaBluetooth: MutableState<Boolean>) {
-  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-  Log.d(TAG, "setCallSound: set audio mode, speaker enabled: $speaker")
-  am.mode = AudioManager.MODE_IN_COMMUNICATION
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-    val btDevice = am.availableCommunicationDevices.lastOrNull { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-    val preferredSecondaryDevice = if (speaker) AudioDeviceInfo.TYPE_BUILTIN_SPEAKER else AudioDeviceInfo.TYPE_BUILTIN_EARPIECE
-    if (btDevice != null) {
-      am.setCommunicationDevice(btDevice)
-    } else if (am.communicationDevice?.type != preferredSecondaryDevice) {
-      am.availableCommunicationDevices.firstOrNull { it.type == preferredSecondaryDevice }?.let {
-        am.setCommunicationDevice(it)
-      }
-    }
-  } else {
-    if (audioViaBluetooth.value) {
-      am.isSpeakerphoneOn = false
-      am.startBluetoothSco()
-    } else {
-      am.stopBluetoothSco()
-      am.isSpeakerphoneOn = speaker
-    }
-    am.isBluetoothScoOn = am.isBluetoothScoAvailableOffCall && audioViaBluetooth.value
-  }
-}
-
-private fun dropAudioManagerOverrides() {
-  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-  am.mode = AudioManager.MODE_NORMAL
-  // Clear selected communication device to default value after we changed it in call
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-    am.clearCommunicationDevice()
-  } else {
-    am.isSpeakerphoneOn = false
-    am.stopBluetoothSco()
-  }
-}
-
-@Composable
-private fun ActiveCallOverlayLayout(
-  call: Call,
-  speakerCanBeEnabled: Boolean,
-  dismiss: () -> Unit,
-  toggleAudio: () -> Unit,
-  toggleVideo: () -> Unit,
-  toggleSound: () -> Unit,
-  flipCamera: () -> Unit
-) {
-  Column(Modifier.padding(DEFAULT_PADDING)) {
-    when (call.peerMedia ?: call.localMedia) {
-      CallMediaType.Video -> {
-        CallInfoView(call, alignment = Alignment.Start)
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Row(Modifier.fillMaxWidth().padding(horizontal = 6.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
-          ToggleAudioButton(call, toggleAudio)
-          Spacer(Modifier.size(40.dp))
-          IconButton(onClick = dismiss) {
-            Icon(painterResource(R.drawable.ic_call_end_filled), stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
-          }
-          if (call.videoEnabled) {
-            ControlButton(call, painterResource(R.drawable.ic_flip_camera_android_filled), R.string.icon_descr_flip_camera, flipCamera)
-            ControlButton(call, painterResource(R.drawable.ic_videocam_filled), R.string.icon_descr_video_off, toggleVideo)
-          } else {
-            Spacer(Modifier.size(48.dp))
-            ControlButton(call, painterResource(R.drawable.ic_videocam_off), R.string.icon_descr_video_on, toggleVideo)
-          }
-        }
-      }
-      CallMediaType.Audio -> {
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Column(
-          Modifier.fillMaxWidth(),
-          horizontalAlignment = Alignment.CenterHorizontally,
-          verticalArrangement = Arrangement.Center
-        ) {
-          ProfileImage(size = 192.dp, image = call.contact.profile.image)
-          CallInfoView(call, alignment = Alignment.CenterHorizontally)
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
-          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-            IconButton(onClick = dismiss) {
-              Icon(painterResource(R.drawable.ic_call_end_filled), stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
-            }
-          }
-          Box(Modifier.padding(start = 32.dp)) {
-            ToggleAudioButton(call, toggleAudio)
-          }
-          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
-            Box(Modifier.padding(end = 32.dp)) {
-              ToggleSoundButton(call, speakerCanBeEnabled, toggleSound)
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun ControlButton(call: Call, icon: Painter, @StringRes iconText: Int, action: () -> Unit, enabled: Boolean = true) {
-  if (call.hasMedia) {
-    IconButton(onClick = action, enabled = enabled) {
-      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else MaterialTheme.colors.secondary, modifier = Modifier.size(40.dp))
-    }
-  } else {
-    Spacer(Modifier.size(40.dp))
-  }
-}
-
-@Composable
-private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
-  if (call.audioEnabled) {
-    ControlButton(call, painterResource(R.drawable.ic_mic), R.string.icon_descr_audio_off, toggleAudio)
-  } else {
-    ControlButton(call, painterResource(R.drawable.ic_mic_off), R.string.icon_descr_audio_on, toggleAudio)
-  }
-}
-
-@Composable
-private fun ToggleSoundButton(call: Call, enabled: Boolean, toggleSound: () -> Unit) {
-  if (call.soundSpeaker) {
-    ControlButton(call, painterResource(R.drawable.ic_volume_up), R.string.icon_descr_speaker_off, toggleSound, enabled)
-  } else {
-    ControlButton(call, painterResource(R.drawable.ic_volume_down), R.string.icon_descr_speaker_on, toggleSound, enabled)
-  }
-}
-
-@Composable
-fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
-  @Composable fun InfoText(text: String, style: TextStyle = MaterialTheme.typography.body2) =
-    Text(text, color = Color(0xFFFFFFD8), style = style)
-  Column(horizontalAlignment = alignment) {
-    InfoText(call.contact.chatViewName, style = MaterialTheme.typography.h2)
-    InfoText(call.callState.text)
-
-    val connInfo = call.connectionInfo
-//    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text}, ${connInfo.protocolText})"
-    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text})"
-    InfoText(call.encryptionStatus + connInfoText)
-  }
-}
-
-//@Composable
-//fun CallViewDebug(close: () -> Unit) {
-//  val callCommand = remember { mutableStateOf<WCallCommand?>(null)}
-//  val commandText = remember { mutableStateOf("{\"command\": {\"type\": \"start\", \"media\": \"video\", \"aesKey\": \"FwW+t6UbnwHoapYOfN4mUBUuqR7UtvYWxW16iBqM29U=\"}}") }
-//  val clipboard = ContextCompat.getSystemService(LocalContext.current, ClipboardManager::class.java)
-//
-//  BackHandler(onBack = close)
-//  Column(
-//    horizontalAlignment = Alignment.CenterHorizontally,
-//    verticalArrangement = Arrangement.spacedBy(12.dp),
-//    modifier = Modifier
-//      .themedBackground()
-//      .fillMaxSize()
-//  ) {
-//    WebRTCView(callCommand) { apiMsg ->
-//      // for debugging
-//      // commandText.value = apiMsg
-//      commandText.value = json.encodeToString(apiMsg)
-//    }
-//
-//    TextEditor(Modifier.height(180.dp), text = commandText)
-//
-//    Row(
-//      Modifier
-//        .fillMaxWidth()
-//        .padding(bottom = 6.dp),
-//      horizontalArrangement = Arrangement.SpaceBetween
-//    ) {
-//      Button(onClick = {
-//        val clip: ClipData = ClipData.newPlainText("js command", commandText.value)
-//        clipboard?.setPrimaryClip(clip)
-//      }) { Text("Copy") }
-//      Button(onClick = {
-//        try {
-//          val apiCall: WVAPICall = json.decodeFromString(commandText.value)
-//          commandText.value = ""
-//          println("sending: ${commandText.value}")
-//          callCommand.value = apiCall.command
-//        } catch(e: Error) {
-//          println("error parsing command: ${commandText.value}")
-//          println(e)
-//        }
-//      }) { Text("Send") }
-//      Button(onClick = {
-//        commandText.value = ""
-//      }) { Text("Clear") }
-//    }
-//  }
-//}
-
-@Composable
-fun WebRTCView(callCommand: MutableState<WCallCommand?>, onResponse: (WVAPIMessage) -> Unit) {
-  val scope = rememberCoroutineScope()
-  val webView = remember { mutableStateOf<WebView?>(null) }
-  val permissionsState = rememberMultiplePermissionsState(
-    permissions = listOf(
-      Manifest.permission.CAMERA,
-      Manifest.permission.RECORD_AUDIO,
-      Manifest.permission.MODIFY_AUDIO_SETTINGS,
-      Manifest.permission.INTERNET
-    )
-  )
-  fun processCommand(wv: WebView, cmd: WCallCommand) {
-    val apiCall = WVAPICall(command = cmd)
-    wv.evaluateJavascript("processCommand(${json.encodeToString(apiCall)})", null)
-  }
-  val lifecycleOwner = LocalLifecycleOwner.current
-  DisposableEffect(lifecycleOwner) {
-    val observer = LifecycleEventObserver { _, event ->
-      if (event == Lifecycle.Event.ON_RESUME || event == Lifecycle.Event.ON_START) {
-        permissionsState.launchMultiplePermissionRequest()
-      }
-    }
-    lifecycleOwner.lifecycle.addObserver(observer)
-    onDispose {
-      val wv = webView.value
-      if (wv != null) processCommand(wv, WCallCommand.End)
-      lifecycleOwner.lifecycle.removeObserver(observer)
-      webView.value?.destroy()
-      webView.value = null
-    }
-  }
-  LaunchedEffect(callCommand.value, webView.value) {
-    val cmd = callCommand.value
-    val wv = webView.value
-    if (cmd != null && wv != null) {
-      Log.d(TAG, "WebRTCView LaunchedEffect executing $cmd")
-      processCommand(wv, cmd)
-      callCommand.value = null
-    }
-  }
-  val assetLoader = WebViewAssetLoader.Builder()
-    .addPathHandler("/assets/www/", WebViewAssetLoader.AssetsPathHandler(LocalContext.current))
-    .build()
-
-  if (permissionsState.allPermissionsGranted) {
-    Box(Modifier.fillMaxSize()) {
-      AndroidView(
-        factory = { AndroidViewContext ->
-          WebView(AndroidViewContext).apply {
-            layoutParams = ViewGroup.LayoutParams(
-              ViewGroup.LayoutParams.MATCH_PARENT,
-              ViewGroup.LayoutParams.MATCH_PARENT,
-            )
-            this.webChromeClient = object: WebChromeClient() {
-              override fun onPermissionRequest(request: PermissionRequest) {
-                if (request.origin.toString().startsWith("file:/")) {
-                  request.grant(request.resources)
-                } else {
-                  Log.d(TAG, "Permission request from webview denied.")
-                  request.deny()
-                }
-              }
-            }
-            this.webViewClient = LocalContentWebViewClient(assetLoader)
-            this.clearHistory()
-            this.clearCache(true)
-            this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
-            val webViewSettings = this.settings
-            webViewSettings.allowFileAccess = true
-            webViewSettings.allowContentAccess = true
-            webViewSettings.javaScriptEnabled = true
-            webViewSettings.mediaPlaybackRequiresUserGesture = false
-            webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-            this.loadUrl("file:android_asset/www/call.html")
-          }
-        }
-      ) { wv ->
-        Log.d(TAG, "WebRTCView: webview ready")
-        // for debugging
-        // wv.evaluateJavascript("sendMessageToNative = ({resp}) => WebRTCInterface.postMessage(JSON.stringify({command: resp}))", null)
-        scope.launch {
-          delay(2000L)
-          wv.evaluateJavascript("sendMessageToNative = (msg) => WebRTCInterface.postMessage(JSON.stringify(msg))", null)
-          webView.value = wv
-        }
-      }
-    }
-  }
-}
-
-// for debugging
-// class WebRTCInterface(private val onResponse: (String) -> Unit) {
-class WebRTCInterface(private val onResponse: (WVAPIMessage) -> Unit) {
-  @JavascriptInterface
-  fun postMessage(message: String) {
-    Log.d(TAG, "WebRTCInterface.postMessage")
-    try {
-      // for debugging
-      // onResponse(message)
-      onResponse(json.decodeFromString(message))
-    } catch (e: Error) {
-      Log.e(TAG, "failed parsing WebView message: $message")
-    }
-  }
-}
-
-private class LocalContentWebViewClient(private val assetLoader: WebViewAssetLoader) : WebViewClientCompat() {
-  override fun shouldInterceptRequest(
-    view: WebView,
-    request: WebResourceRequest
-  ): WebResourceResponse? {
-    return assetLoader.shouldInterceptRequest(request.url)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewActiveCallOverlayVideo() {
-  SimpleXTheme {
-    ActiveCallOverlayLayout(
-      call = Call(
-        contact = Contact.sampleData,
-        callState = CallState.Negotiated,
-        localMedia = CallMediaType.Video,
-        peerMedia = CallMediaType.Video,
-        connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null),
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null)
-        )
-      ),
-      speakerCanBeEnabled = true,
-      dismiss = {},
-      toggleAudio = {},
-      toggleVideo = {},
-      toggleSound = {},
-      flipCamera = {}
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewActiveCallOverlayAudio() {
-  SimpleXTheme {
-    ActiveCallOverlayLayout(
-      call = Call(
-        contact = Contact.sampleData,
-        callState = CallState.Negotiated,
-        localMedia = CallMediaType.Audio,
-        peerMedia = CallMediaType.Audio,
-        connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null),
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null)
-        )
-      ),
-      speakerCanBeEnabled = true,
-      dismiss = {},
-      toggleAudio = {},
-      toggleVideo = {},
-      toggleSound = {},
-      flipCamera = {}
-    )
-  }
-}

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

@@ -1,248 +0,0 @@
-package chat.simplex.app.views.call
-
-import android.app.Activity
-import android.app.KeyguardManager
-import android.content.Context
-import android.content.Intent
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import android.view.WindowManager
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-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.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.model.NtfManager.Companion.OpenChatAction
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.ProfileImage
-import kotlinx.datetime.Clock
-
-class IncomingCallActivity: ComponentActivity() {
-  private val vm by viewModels<SimplexViewModel>()
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContent { IncomingCallActivityView(vm.chatModel) }
-    unlockForIncomingCall()
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-    lockAfterIncomingCall()
-  }
-
-  private fun unlockForIncomingCall() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-      setShowWhenLocked(true)
-      setTurnScreenOn(true)
-    } else {
-      window.addFlags(activityFlags)
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      getKeyguardManager(this).requestDismissKeyguard(this, null)
-    }
-  }
-
-  private fun lockAfterIncomingCall() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-      setShowWhenLocked(false)
-      setTurnScreenOn(false)
-    } else {
-      window.clearFlags(activityFlags)
-    }
-  }
-
-  companion object {
-    const val activityFlags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
-  }
-}
-
-fun getKeyguardManager(context: Context): KeyguardManager =
-  context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-
-@Composable
-fun IncomingCallActivityView(m: ChatModel) {
-  val switchingCall = m.switchingCall.value
-  val invitation = m.activeCallInvitation.value
-  val call = m.activeCall.value
-  val showCallView = m.showCallView.value
-  val activity = LocalContext.current as Activity
-  LaunchedEffect(invitation, call, switchingCall, showCallView) {
-    if (!switchingCall && invitation == null && (!showCallView || call == null)) {
-      Log.d(TAG, "IncomingCallActivityView: finishing activity")
-      activity.finish()
-    }
-  }
-  SimpleXTheme {
-    Surface(
-      Modifier
-        .themedBackground()
-        .fillMaxSize()) {
-      if (showCallView) {
-        Box {
-          ActiveCallView(m)
-          if (invitation != null) IncomingCallAlertView(invitation, m)
-        }
-      } else if (invitation != null) {
-        IncomingCallLockScreenAlert(invitation, m)
-      }
-    }
-  }
-}
-
-@Composable
-fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatModel) {
-  val cm = chatModel.callManager
-  val callOnLockScreen by remember { mutableStateOf(chatModel.controller.appPrefs.callOnLockScreen.get()) }
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    onDispose {
-      // Cancel notification whatever happens next since otherwise sound from notification and from inside the app can co-exist
-      chatModel.controller.ntfManager.cancelCallNotification()
-    }
-  }
-  IncomingCallLockScreenAlertLayout(
-    invitation,
-    callOnLockScreen,
-    chatModel,
-    rejectCall = { cm.endCall(invitation = invitation) },
-    ignoreCall = {
-      chatModel.activeCallInvitation.value = null
-      chatModel.controller.ntfManager.cancelCallNotification()
-    },
-    acceptCall = { cm.acceptIncomingCall(invitation = invitation) },
-    openApp = {
-      val intent = Intent(context, MainActivity::class.java)
-        .setAction(OpenChatAction)
-        .putExtra("userId", invitation.user.userId)
-        .putExtra("chatId", invitation.contact.id)
-      context.startActivity(intent)
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        getKeyguardManager(context).requestDismissKeyguard((context as Activity), null)
-      }
-      (context as Activity).finish()
-    }
-  )
-}
-
-@Composable
-fun IncomingCallLockScreenAlertLayout(
-  invitation: RcvCallInvitation,
-  callOnLockScreen: CallOnLockScreen?,
-  chatModel: ChatModel,
-  rejectCall: () -> Unit,
-  ignoreCall: () -> Unit,
-  acceptCall: () -> Unit,
-  openApp: () -> Unit
-) {
-  Column(
-    Modifier
-      .padding(30.dp)
-      .fillMaxSize(),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    IncomingCallInfo(invitation, chatModel)
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-    if (callOnLockScreen == CallOnLockScreen.ACCEPT) {
-      ProfileImage(size = 192.dp, image = invitation.contact.profile.image)
-      Text(invitation.contact.chatViewName, style = MaterialTheme.typography.h2)
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      Row {
-        LockScreenCallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
-        Spacer(Modifier.size(48.dp))
-        LockScreenCallButton(stringResource(R.string.ignore), painterResource(R.drawable.ic_close), MaterialTheme.colors.primary, ignoreCall)
-        Spacer(Modifier.size(48.dp))
-        LockScreenCallButton(stringResource(R.string.accept), painterResource(R.drawable.ic_check_filled), SimplexGreen, acceptCall)
-      }
-    } else if (callOnLockScreen == CallOnLockScreen.SHOW) {
-      SimpleXLogo()
-      Text(stringResource(R.string.open_simplex_chat_to_accept_call), textAlign = TextAlign.Center, lineHeight = 22.sp)
-      Text(stringResource(R.string.allow_accepting_calls_from_lock_screen), textAlign = TextAlign.Center, style = MaterialTheme.typography.body2, lineHeight = 22.sp)
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      SimpleButton(text = stringResource(R.string.open_verb), icon = painterResource(R.drawable.ic_check_filled), click = openApp)
-    }
-  }
-}
-
-@Composable
-private fun SimpleXLogo() {
-  Image(
-    painter = painterResource(if (isInDarkTheme()) R.drawable.logo_light else R.drawable.logo),
-    contentDescription = stringResource(R.string.image_descr_simplex_logo),
-    modifier = Modifier
-      .padding(vertical = DEFAULT_PADDING)
-      .fillMaxWidth(0.80f)
-  )
-}
-
-@Composable
-private fun LockScreenCallButton(text: String, icon: Painter, color: Color, action: () -> Unit) {
-  Surface(
-    shape = RoundedCornerShape(10.dp),
-    color = Color.Transparent
-  ) {
-    Column(
-      Modifier
-        .defaultMinSize(minWidth = 50.dp)
-        .padding(4.dp),
-      horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-      IconButton(action) {
-        Icon(icon, text, tint = color, modifier = Modifier.scale(1.75f))
-      }
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Text(text, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true
-)
-@Composable
-fun PreviewIncomingCallLockScreenAlert() {
-  SimpleXTheme(true) {
-    Surface(
-      Modifier
-        .themedBackground()
-        .fillMaxSize()) {
-      IncomingCallLockScreenAlertLayout(
-        invitation = RcvCallInvitation(
-          user = User.sampleData,
-          contact = Contact.sampleData,
-          callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
-          sharedKey = null,
-          callTs = Clock.System.now()
-        ),
-        callOnLockScreen = null,
-        chatModel = SimplexApp.context.chatModel,
-        rejectCall = {},
-        ignoreCall = {},
-        acceptCall = {},
-        openApp = {},
-      )
-    }
-  }
-}

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

@@ -1,122 +0,0 @@
-package chat.simplex.app.views.call
-
-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.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-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.SimplexApp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.ProfileImage
-import chat.simplex.app.views.usersettings.ProfilePreview
-import kotlinx.datetime.Clock
-
-@Composable
-fun IncomingCallAlertView(invitation: RcvCallInvitation, chatModel: ChatModel) {
-  val cm = chatModel.callManager
-  val cxt = LocalContext.current
-  val scope = rememberCoroutineScope()
-  LaunchedEffect(true) { SoundPlayer.shared.start(cxt, scope, sound = !chatModel.showCallView.value) }
-  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
-  IncomingCallAlertLayout(
-    invitation,
-    chatModel,
-    rejectCall = { cm.endCall(invitation = invitation) },
-    ignoreCall = {
-      chatModel.activeCallInvitation.value = null
-      chatModel.controller.ntfManager.cancelCallNotification()
-    },
-    acceptCall = { cm.acceptIncomingCall(invitation = invitation) }
-  )
-}
-
-@Composable
-fun IncomingCallAlertLayout(
-  invitation: RcvCallInvitation,
-  chatModel: ChatModel,
-  rejectCall: () -> Unit,
-  ignoreCall: () -> Unit,
-  acceptCall: () -> Unit
-) {
-  val color = if (isInDarkTheme()) IncomingCallDark else IncomingCallLight
-  Column(Modifier.fillMaxWidth().background(color).padding(top = DEFAULT_PADDING, bottom = DEFAULT_PADDING, start = DEFAULT_PADDING, end = 8.dp)) {
-    IncomingCallInfo(invitation, chatModel)
-    Spacer(Modifier.height(8.dp))
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
-      Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) {
-        ProfilePreview(profileOf = invitation.contact, size = 64.dp, color = Color.White)
-      }
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        CallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
-        CallButton(stringResource(R.string.ignore), painterResource(R.drawable.ic_close), MaterialTheme.colors.primary, ignoreCall)
-        CallButton(stringResource(R.string.accept), painterResource(R.drawable.ic_check_filled), SimplexGreen, acceptCall)
-      }
-    }
-  }
-}
-
-@Composable
-fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
-  @Composable fun CallIcon(icon: Painter, descr: String) = Icon(icon, descr, tint = SimplexGreen)
-  Row(verticalAlignment = Alignment.CenterVertically) {
-    if (chatModel.users.size > 1) {
-      ProfileImage(size = 32.dp, image = invitation.user.profile.image, color = MaterialTheme.colors.secondaryVariant)
-      Spacer(Modifier.width(4.dp))
-    }
-    if (invitation.callType.media == CallMediaType.Video) CallIcon(painterResource(R.drawable.ic_videocam_filled), stringResource(R.string.icon_descr_video_call))
-    else CallIcon(painterResource(R.drawable.ic_call_filled), stringResource(R.string.icon_descr_audio_call))
-    Spacer(Modifier.width(4.dp))
-    Text(invitation.callTypeText)
-  }
-}
-
-@Composable
-private fun CallButton(text: String, icon: Painter, color: Color, action: () -> Unit) {
-  Surface(
-    shape = RoundedCornerShape(10.dp),
-    color = Color.Transparent
-  ) {
-    Column(
-      Modifier
-        .clickable(onClick = action)
-        .defaultMinSize(minWidth = 50.dp)
-        .padding(4.dp),
-      horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-      Icon(icon, text, tint = color, modifier = Modifier.scale(1.2f))
-      Text(text, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewIncomingCallAlertLayout() {
-  SimpleXTheme {
-    IncomingCallAlertLayout(
-      invitation = RcvCallInvitation(
-        user = User.sampleData,
-        contact = Contact.sampleData,
-        callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
-        sharedKey = null,
-        callTs = Clock.System.now()
-      ),
-      chatModel = SimplexApp.context.chatModel,
-      rejectCall = {},
-      ignoreCall = {},
-      acceptCall = {}
-    )
-  }
-}

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

@@ -1,51 +0,0 @@
-package chat.simplex.app.views.call
-
-import android.content.Context
-import android.media.*
-import android.net.Uri
-import android.os.VibrationEffect
-import android.os.Vibrator
-import androidx.core.content.ContextCompat
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.withScope
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-
-class SoundPlayer {
-  private var player: MediaPlayer? = null
-  var playing = false
-
-  fun start(cxt: Context, scope: CoroutineScope, sound: Boolean) {
-    player?.reset()
-    player = MediaPlayer().apply {
-      setAudioAttributes(
-        AudioAttributes.Builder()
-          .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-          .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-          .build()
-      )
-      setDataSource(SimplexApp.context, Uri.parse("android.resource://" + SimplexApp.context.packageName + "/" + R.raw.ring_once))
-      prepare()
-    }
-    val vibrator = ContextCompat.getSystemService(cxt, Vibrator::class.java)
-    val effect = VibrationEffect.createOneShot(250, VibrationEffect.DEFAULT_AMPLITUDE)
-    playing = true
-    withScope(scope) {
-      while (playing) {
-        if (sound) player?.start()
-        vibrator?.vibrate(effect)
-        delay(3500)
-      }
-    }
-  }
-
-  fun stop() {
-    playing = false
-    player?.stop()
-  }
-
-  companion object {
-    val shared = SoundPlayer()
-  }
-}

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

@@ -1,221 +0,0 @@
-package chat.simplex.app.views.call
-
-import android.util.Log
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.toUpperCase
-import chat.simplex.app.*
-import chat.simplex.app.model.Contact
-import chat.simplex.app.model.User
-import chat.simplex.app.views.helpers.generalGetString
-import kotlinx.datetime.Instant
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.net.URI
-import java.util.*
-import kotlin.collections.ArrayList
-
-data class Call(
-  val contact: Contact,
-  val callState: CallState,
-  val localMedia: CallMediaType,
-  val localCapabilities: CallCapabilities? = null,
-  val peerMedia: CallMediaType? = null,
-  val sharedKey: String? = null,
-  val audioEnabled: Boolean = true,
-  val videoEnabled: Boolean = localMedia == CallMediaType.Video,
-  val soundSpeaker: Boolean = localMedia == CallMediaType.Video,
-  var localCamera: VideoCamera = VideoCamera.User,
-  val connectionInfo: ConnectionInfo? = null
-) {
-  val encrypted: Boolean get() = localEncrypted && sharedKey != null
-  val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false
-
-  val encryptionStatus: String @Composable get() = when(callState) {
-    CallState.WaitCapabilities -> ""
-    CallState.InvitationSent -> stringResource(if (localEncrypted) R.string.status_e2e_encrypted else R.string.status_no_e2e_encryption)
-    CallState.InvitationAccepted -> stringResource(if (sharedKey == null) R.string.status_contact_has_no_e2e_encryption else R.string.status_contact_has_e2e_encryption)
-    else -> stringResource(if (!localEncrypted) R.string.status_no_e2e_encryption else if (sharedKey == null) R.string.status_contact_has_no_e2e_encryption else R.string.status_e2e_encrypted)
-  }
-
-  val hasMedia: Boolean get() = callState == CallState.OfferSent || callState == CallState.Negotiated || callState == CallState.Connected
-}
-
-enum class CallState {
-  WaitCapabilities,
-  InvitationSent,
-  InvitationAccepted,
-  OfferSent,
-  OfferReceived,
-  AnswerReceived,
-  Negotiated,
-  Connected,
-  Ended;
-
-  val text: String @Composable get() = when(this) {
-    WaitCapabilities -> stringResource(R.string.callstate_starting)
-    InvitationSent -> stringResource(R.string.callstate_waiting_for_answer)
-    InvitationAccepted -> stringResource(R.string.callstate_starting)
-    OfferSent -> stringResource(R.string.callstate_waiting_for_confirmation)
-    OfferReceived -> stringResource(R.string.callstate_received_answer)
-    AnswerReceived -> stringResource(R.string.callstate_received_confirmation)
-    Negotiated -> stringResource(R.string.callstate_connecting)
-    Connected -> stringResource(R.string.callstate_connected)
-    Ended -> stringResource(R.string.callstate_ended)
-  }
-}
-
-@Serializable data class WVAPICall(val corrId: Int? = null, val command: WCallCommand)
-@Serializable data class WVAPIMessage(val corrId: Int? = null, val resp: WCallResponse, val command: WCallCommand? = null)
-
-@Serializable
-sealed class WCallCommand {
-  @Serializable @SerialName("capabilities") object Capabilities: WCallCommand()
-  @Serializable @SerialName("start") data class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
-  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
-  @Serializable @SerialName("answer") data class Answer (val answer: String, val iceCandidates: String): WCallCommand()
-  @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallCommand()
-  @Serializable @SerialName("media") data class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
-  @Serializable @SerialName("camera") data class Camera(val camera: VideoCamera): WCallCommand()
-  @Serializable @SerialName("end") object End: WCallCommand()
-}
-
-@Serializable
-sealed class WCallResponse {
-  @Serializable @SerialName("capabilities") data class Capabilities(val capabilities: CallCapabilities): WCallResponse()
-  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val capabilities: CallCapabilities): WCallResponse()
-  @Serializable @SerialName("answer") data class Answer(val answer: String, val iceCandidates: String): WCallResponse()
-  @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallResponse()
-  @Serializable @SerialName("connection") data class Connection(val state: ConnectionState): WCallResponse()
-  @Serializable @SerialName("connected") data class Connected(val connectionInfo: ConnectionInfo): WCallResponse()
-  @Serializable @SerialName("ended") object Ended: WCallResponse()
-  @Serializable @SerialName("ok") object Ok: WCallResponse()
-  @Serializable @SerialName("error") data class Error(val message: String): WCallResponse()
-}
-
-@Serializable data class WebRTCCallOffer(val callType: CallType, val rtcSession: WebRTCSession)
-@Serializable data class WebRTCSession(val rtcSession: String, val rtcIceCandidates: String)
-@Serializable data class WebRTCExtraInfo(val rtcIceCandidates: String)
-@Serializable data class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
-@Serializable data class RcvCallInvitation(val user: User, val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant) {
-  val callTypeText: String get() = generalGetString(when(callType.media) {
-    CallMediaType.Video -> if (sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
-    CallMediaType.Audio -> if (sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
-  })
-  val callTitle: String get() = generalGetString(when(callType.media) {
-    CallMediaType.Video -> R.string.incoming_video_call
-    CallMediaType.Audio -> R.string.incoming_audio_call
-  })
-}
-@Serializable data class CallCapabilities(val encryption: Boolean)
-@Serializable data class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
-  val text: String @Composable get() {
-    val local = localCandidate?.candidateType
-    val remote = remoteCandidate?.candidateType
-    return when {
-      local == RTCIceCandidateType.Host && remote == RTCIceCandidateType.Host ->
-        stringResource(R.string.call_connection_peer_to_peer)
-      local == RTCIceCandidateType.Relay && remote == RTCIceCandidateType.Relay ->
-        stringResource(R.string.call_connection_via_relay)
-      else ->
-        "${local?.value ?: "unknown"} / ${remote?.value ?: "unknown"}"
-    }
-  }
-
-  val protocolText: String get() {
-    val local = localCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localRelay = localCandidate?.relayProtocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val remote = remoteCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localText = if (localRelay == local || localCandidate?.relayProtocol == null) local else "$local ($localRelay)"
-    return if (local == remote) localText else "$localText / $remote"
-  }
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
-@Serializable data class RTCIceCandidate(val candidateType: RTCIceCandidateType?, val protocol: String?, val relayProtocol: String?)
-// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceServer
-@Serializable data class RTCIceServer(val urls: List<String>, val username: String? = null, val credential: String? = null)
-
-// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate/type
-@Serializable
-enum class RTCIceCandidateType(val value: String) {
-  @SerialName("host") Host("host"),
-  @SerialName("srflx") ServerReflexive("srflx"),
-  @SerialName("prflx") PeerReflexive("prflx"),
-  @SerialName("relay") Relay("relay")
-}
-
-@Serializable
-enum class WebRTCCallStatus(val value: String) {
-  @SerialName("connected") Connected("connected"),
-  @SerialName("connecting") Connecting("connecting"),
-  @SerialName("disconnected") Disconnected("disconnected"),
-  @SerialName("failed") Failed("failed")
-}
-
-@Serializable
-enum class CallMediaType {
-  @SerialName("video") Video,
-  @SerialName("audio") Audio
-}
-
-@Serializable
-enum class VideoCamera {
-  @SerialName("user") User,
-  @SerialName("environment") Environment;
-  val flipped: VideoCamera get() = if (this == User) Environment else User
-}
-
-@Serializable
-data class ConnectionState(
-  val connectionState: String,
-  val iceConnectionState: String,
-  val iceGatheringState: String,
-  val signalingState: String
-)
-
-// the servers are expected in this format:
-// stun:stun.simplex.im:443?transport=tcp
-// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
-fun parseRTCIceServer(str: String): RTCIceServer? {
-  var s = replaceScheme(str, "stun:")
-  s = replaceScheme(s, "turn:")
-  s = replaceScheme(s, "turns:")
-  val u = runCatching { URI(s) }.getOrNull()
-  if (u != null) {
-    val scheme = u.scheme
-    val host = u.host
-    val port = u.port
-    if (u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")) {
-      val userInfo = u.userInfo?.split(":")
-      val query = if (u.query == null || u.query == "") "" else "?${u.query}"
-      return RTCIceServer(
-        urls = listOf("$scheme:$host:$port$query"),
-        username = userInfo?.getOrNull(0),
-        credential = userInfo?.getOrNull(1)
-      )
-    }
-  }
-  return null
-}
-
-private fun replaceScheme(s: String, scheme: String): String = if (s.startsWith(scheme)) s.replace(scheme, "$scheme//") else s
-
-fun parseRTCIceServers(servers: List<String>): List<RTCIceServer>? {
-  val iceServers: ArrayList<RTCIceServer> = ArrayList()
-  for (s in servers) {
-    val server = parseRTCIceServer(s)
-    if (server != null) {
-      iceServers.add(server)
-    } else {
-      return null
-    }
-  }
-  return if (iceServers.isEmpty()) null else iceServers
-}
-
-fun getIceServers(): List<RTCIceServer>? {
-  val value = SimplexApp.context.chatController.appPrefs.webrtcIceServers.get() ?: return null
-  val servers: List<String> = value.split("\n")
-  return parseRTCIceServers(servers)
-}

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

@@ -1,465 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import InfoRowEllipsis
-import SectionBottomSpacer
-import SectionDividerSpaced
-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.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.painterResource
-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.showAlertDialog(
-    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()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    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()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-@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())
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      ChatInfoHeader(chat.chatInfo, contact)
-    }
-
-    LocalAliasEditor(localAlias, updateValue = onLocalAliasChanged)
-    SectionSpacer()
-    if (customUserProfile != null) {
-      SectionView(generalGetString(R.string.incognito).uppercase()) {
-        InfoRow(generalGetString(R.string.incognito_random_profile), customUserProfile.chatViewName)
-      }
-      SectionDividerSpaced()
-    }
-
-    SectionView {
-      if (connectionCode != null) {
-        VerifyCodeButton(contact.verified, verifyClicked)
-      }
-      ContactPreferencesButton(openPreferences)
-    }
-
-    SectionDividerSpaced()
-
-    SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchContactAddress)
-      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()) {
-          SimplexServers(stringResource(R.string.receiving_via), rcvServers)
-        }
-        val sndServers = connStats.sndServers
-        if (sndServers != null && sndServers.isNotEmpty()) {
-          SimplexServers(stringResource(R.string.sending_via), sndServers)
-        }
-      }
-    }
-    SectionDividerSpaced()
-    SectionView {
-      ClearChatButton(clearChat)
-      DeleteContactButton(deleteContact)
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), chat.chatInfo.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), chat.chatInfo.apiId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@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(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
-      }
-      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 = MaterialTheme.colors.secondary
-        )
-      },
-      leadingIcon = if (leadingIcon) {
-        { Icon(painterResource(R.drawable.ic_edit_filled), null, Modifier.padding(start = 7.dp)) }
-      } else null,
-      color = MaterialTheme.colors.secondary,
-      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(
-        painterResource(R.drawable.ic_info),
-        stringResource(R.string.network_status),
-        tint = MaterialTheme.colors.primary
-      )
-    }
-
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      Text(
-        networkStatus.statusString,
-        color = MaterialTheme.colors.secondary
-      )
-      ServerImage(networkStatus)
-    }
-  }
-}
-
-@Composable
-private fun ServerImage(networkStatus: NetworkStatus) {
-  Box(Modifier.size(18.dp)) {
-    when (networkStatus) {
-      is NetworkStatus.Connected ->
-        Icon(painterResource(R.drawable.ic_circle_filled), stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-      is NetworkStatus.Disconnected ->
-        Icon(painterResource(R.drawable.ic_pending_filled), stringResource(R.string.icon_descr_server_status_disconnected), tint = MaterialTheme.colors.secondary)
-      is NetworkStatus.Error ->
-        Icon(painterResource(R.drawable.ic_error_filled), stringResource(R.string.icon_descr_server_status_error), tint = MaterialTheme.colors.secondary)
-      else -> Icon(painterResource(R.drawable.ic_circle), stringResource(R.string.icon_descr_server_status_pending), tint = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@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) painterResource(R.drawable.ic_verified_user) else painterResource(R.drawable.ic_shield),
-    stringResource(if (contactVerified) R.string.view_security_code else R.string.verify_security_code),
-    click = onClick,
-    iconColor = MaterialTheme.colors.secondary,
-  )
-}
-
-@Composable
-private fun ContactPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_toggle_on),
-    stringResource(R.string.contact_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-fun ClearChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_settings_backup_restore),
-    stringResource(R.string.clear_chat_button),
-    click = onClick,
-    textColor = WarningOrange,
-    iconColor = WarningOrange,
-  )
-}
-
-@Composable
-private fun DeleteContactButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_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.showAlertDialog(
-    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)
-    },
-    destructive = true,
-  )
-}
-
-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/ComposeFileView.kt

@@ -1,59 +0,0 @@
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-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.ui.theme.*
-
-@Composable
-fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  Row(
-    Modifier
-      .height(60.dp)
-      .fillMaxWidth()
-      .padding(top = 8.dp)
-      .background(sentColor),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      painterResource(R.drawable.ic_draft_filled),
-      stringResource(R.string.icon_descr_file),
-      Modifier
-        .padding(start = 4.dp, end = 2.dp)
-        .size(36.dp),
-      tint = if (isInDarkTheme()) FileDark else FileLight
-    )
-    Text(fileName)
-    Spacer(Modifier.weight(1f))
-    if (cancelEnabled) {
-      IconButton(onClick = cancelFile, modifier = Modifier.padding(0.dp)) {
-        Icon(
-          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
-          tint = MaterialTheme.colors.primary,
-          modifier = Modifier.padding(10.dp)
-        )
-      }
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewComposeFileView() {
-  SimpleXTheme {
-    ComposeFileView(
-      "test.txt",
-      cancelFile = {},
-      cancelEnabled = true
-    )
-  }
-}

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

@@ -1,74 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.UploadContent
-import chat.simplex.app.views.helpers.base64ToBitmap
-
-@Composable
-fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  Row(
-    Modifier
-      .padding(top = 8.dp)
-      .background(sentColor),
-    verticalAlignment = Alignment.CenterVertically,
-  ) {
-    LazyRow(
-      Modifier.weight(1f).padding(start = DEFAULT_PADDING_HALF, end = if (cancelEnabled) 0.dp else DEFAULT_PADDING_HALF),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING_HALF),
-    ) {
-      itemsIndexed(media.images) { index, item ->
-        val content = media.content[index]
-        if (content is UploadContent.Video) {
-          Box(contentAlignment = Alignment.Center) {
-            val imageBitmap = base64ToBitmap(item).asImageBitmap()
-            Image(
-              imageBitmap,
-              "preview video",
-              modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
-            )
-            Icon(
-              painterResource(R.drawable.ic_videocam_filled),
-              "preview video",
-              Modifier
-                .size(20.dp),
-              tint = Color.White
-            )
-          }
-        } else {
-          val imageBitmap = base64ToBitmap(item).asImageBitmap()
-          Image(
-            imageBitmap,
-            "preview image",
-            modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
-          )
-        }
-      }
-    }
-    if (cancelEnabled) {
-      IconButton(onClick = cancelImages) {
-        Icon(
-          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(R.string.icon_descr_cancel_image_preview),
-          tint = MaterialTheme.colors.primary,
-        )
-      }
-    }
-  }
-}

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

@@ -1,850 +0,0 @@
-@file:UseSerializers(UriSerializer::class)
-package chat.simplex.app.views.chat
-
-import ComposeFileView
-import ComposeVoiceView
-import android.Manifest
-import android.app.Activity
-import android.content.*
-import android.content.pm.PackageManager
-import android.graphics.*
-import android.graphics.drawable.AnimatedImageDrawable
-import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.chat.item.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.serialization.*
-import java.io.File
-import java.nio.file.Files
-
-@Serializable
-sealed class ComposePreview {
-  @Serializable object NoPreview: ComposePreview()
-  @Serializable class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
-  @Serializable class MediaPreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
-  @Serializable data class VoicePreview(val voice: String, val durationMs: Int, val finished: Boolean): ComposePreview()
-  @Serializable class FilePreview(val fileName: String, val uri: Uri): ComposePreview()
-}
-
-@Serializable
-sealed class ComposeContextItem {
-  @Serializable object NoContextItem: ComposeContextItem()
-  @Serializable class QuotedItem(val chatItem: ChatItem): ComposeContextItem()
-  @Serializable class EditingItem(val chatItem: ChatItem): ComposeContextItem()
-}
-
-@Serializable
-data class LiveMessage(
-  val chatItem: ChatItem,
-  val typedMsg: String,
-  val sentMsg: String,
-  val sent: Boolean
-)
-
-@Serializable
-data class ComposeState(
-  val message: String = "",
-  val liveMessage: LiveMessage? = null,
-  val preview: ComposePreview = ComposePreview.NoPreview,
-  val contextItem: ComposeContextItem = ComposeContextItem.NoContextItem,
-  val inProgress: Boolean = false,
-  val useLinkPreviews: Boolean
-) {
-  constructor(editingItem: ChatItem, liveMessage: LiveMessage? = null, useLinkPreviews: Boolean): this(
-    editingItem.content.text,
-    liveMessage,
-    chatItemPreview(editingItem),
-    ComposeContextItem.EditingItem(editingItem),
-    useLinkPreviews = useLinkPreviews
-  )
-
-  val editing: Boolean
-    get() =
-      when (contextItem) {
-        is ComposeContextItem.EditingItem -> true
-        else -> false
-      }
-  val sendEnabled: () -> Boolean
-    get() = {
-      val hasContent = when (preview) {
-        is ComposePreview.MediaPreview -> true
-        is ComposePreview.VoicePreview -> true
-        is ComposePreview.FilePreview -> true
-        else -> message.isNotEmpty() || liveMessage != null
-      }
-      hasContent && !inProgress
-    }
-  val endLiveDisabled: Boolean
-    get() = liveMessage != null && message.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
-
-  val linkPreviewAllowed: Boolean
-    get() =
-      when (preview) {
-        is ComposePreview.MediaPreview -> false
-        is ComposePreview.VoicePreview -> false
-        is ComposePreview.FilePreview -> false
-        else -> useLinkPreviews
-      }
-  val linkPreview: LinkPreview?
-    get() =
-      when (preview) {
-        is ComposePreview.CLinkPreview -> preview.linkPreview
-        else -> null
-      }
-
-  val attachmentDisabled: Boolean
-    get() {
-      if (editing || liveMessage != null) return true
-      return when (preview) {
-        ComposePreview.NoPreview -> false
-        is ComposePreview.CLinkPreview -> false
-        else -> true
-      }
-    }
-
-  val empty: Boolean
-    get() = message.isEmpty() && preview is ComposePreview.NoPreview
-
-  companion object {
-    fun saver(): Saver<MutableState<ComposeState>, *> = Saver(
-      save = { json.encodeToString(serializer(), it.value) },
-      restore = {
-        mutableStateOf(json.decodeFromString(it))
-      }
-    )
-  }
-}
-
-sealed class RecordingState {
-  object NotStarted: RecordingState()
-  class Started(val filePath: String, val progressMs: Int = 0): RecordingState()
-  class Finished(val filePath: String, val durationMs: Int): RecordingState()
-
-  val filePathNullable: String?
-    get() = (this as? Started)?.filePath
-}
-
-fun chatItemPreview(chatItem: ChatItem): ComposePreview {
-  val fileName = chatItem.file?.fileName ?: ""
-  return when (val mc = chatItem.content.msgContent) {
-    is MsgContent.MCText -> ComposePreview.NoPreview
-    is MsgContent.MCLink -> ComposePreview.CLinkPreview(linkPreview = mc.preview)
-    // TODO: include correct type
-    is MsgContent.MCImage -> ComposePreview.MediaPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
-    is MsgContent.MCVideo -> ComposePreview.MediaPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
-    is MsgContent.MCVoice -> ComposePreview.VoicePreview(voice = fileName, mc.duration / 1000, true)
-    is MsgContent.MCFile -> ComposePreview.FilePreview(fileName, getAppFileUri(fileName))
-    is MsgContent.MCUnknown, null -> ComposePreview.NoPreview
-  }
-}
-
-@Composable
-fun ComposeView(
-  chatModel: ChatModel,
-  chat: Chat,
-  composeState: MutableState<ComposeState>,
-  attachmentOption: MutableState<AttachmentOption?>,
-  showChooseAttachment: () -> Unit
-) {
-  val context = LocalContext.current
-  val linkUrl = rememberSaveable { mutableStateOf<String?>(null) }
-  val prevLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
-  val pendingLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
-  val cancelledLinks = rememberSaveable { mutableSetOf<String>() }
-  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
-  val maxFileSize = getMaxFileSize(FileProtocol.XFTP)
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  val cameraLauncher = rememberCameraLauncher { uri: Uri? ->
-    if (uri != null) {
-      val bitmap: Bitmap? = getBitmapFromUri(uri)
-      if (bitmap != null) {
-        val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-        composeState.value = composeState.value.copy(preview = ComposePreview.MediaPreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
-      }
-    }
-  }
-  val cameraPermissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
-    if (isGranted) {
-      cameraLauncher.launchWithFallback()
-    } else {
-      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
-    }
-  }
-  val processPickedMedia = { uris: List<Uri>, text: String? ->
-    val content = ArrayList<UploadContent>()
-    val imagesPreview = ArrayList<String>()
-    uris.forEach { uri ->
-      var bitmap: Bitmap? = null
-      val isImage = MimeTypeMap.getSingleton().getMimeTypeFromExtension(getFileName(SimplexApp.context, uri)?.split(".")?.last())?.contains("image/") == true
-      when {
-        isImage -> {
-          // Image
-          val drawable = getDrawableFromUri(uri)
-          bitmap = if (drawable != null) getBitmapFromUri(uri) else null
-          val isAnimNewApi = Build.VERSION.SDK_INT >= 28 && drawable is AnimatedImageDrawable
-          val isAnimOldApi = Build.VERSION.SDK_INT < 28 &&
-              (getFileName(SimplexApp.context, uri)?.endsWith(".gif") == true || getFileName(SimplexApp.context, uri)?.endsWith(".webp") == true)
-          if (isAnimNewApi || isAnimOldApi) {
-            // It's a gif or webp
-            val fileSize = getFileSize(context, uri)
-            if (fileSize != null && fileSize <= maxFileSize) {
-              content.add(UploadContent.AnimatedImage(uri))
-            } else {
-              bitmap = null
-              AlertManager.shared.showAlertMsg(
-                generalGetString(R.string.large_file),
-                String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
-              )
-            }
-          } else {
-            content.add(UploadContent.SimpleImage(uri))
-          }
-        }
-        else -> {
-          // Video
-          val res = getBitmapFromVideo(uri)
-          bitmap = res.preview
-          val durationMs = res.duration
-          content.add(UploadContent.Video(uri, durationMs?.div(1000)?.toInt() ?: 0))
-        }
-      }
-      if (bitmap != null) {
-        imagesPreview.add(resizeImageToStrSize(bitmap, maxDataSize = 14000))
-      }
-    }
-    if (imagesPreview.isNotEmpty()) {
-      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.MediaPreview(imagesPreview, content))
-    }
-  }
-  val processPickedFile = { uri: Uri?, text: String? ->
-    if (uri != null) {
-      val fileSize = getFileSize(context, uri)
-      if (fileSize != null && fileSize <= maxFileSize) {
-        val fileName = getFileName(SimplexApp.context, uri)
-        if (fileName != null) {
-          composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.FilePreview(fileName, uri))
-        }
-      } else {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(R.string.large_file),
-          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
-        )
-      }
-    }
-  }
-  val galleryImageLauncher = rememberLauncherForActivityResult(contract = PickMultipleImagesFromGallery()) { processPickedMedia(it, null) }
-  val galleryImageLauncherFallback = rememberGetMultipleContentsLauncher { processPickedMedia(it, null) }
-  val galleryVideoLauncher = rememberLauncherForActivityResult(contract = PickMultipleVideosFromGallery()) { processPickedMedia(it, null) }
-  val galleryVideoLauncherFallback = rememberGetMultipleContentsLauncher { processPickedMedia(it, null) }
-
-  val filesLauncher = rememberGetContentLauncher { processPickedFile(it, null) }
-  val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }
-
-  LaunchedEffect(attachmentOption.value) {
-    when (attachmentOption.value) {
-      AttachmentOption.CameraPhoto -> {
-        when (PackageManager.PERMISSION_GRANTED) {
-          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
-            cameraLauncher.launchWithFallback()
-          }
-          else -> {
-            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
-          }
-        }
-        attachmentOption.value = null
-      }
-      AttachmentOption.GalleryImage -> {
-        try {
-          galleryImageLauncher.launch(0)
-        } catch (e: ActivityNotFoundException) {
-          galleryImageLauncherFallback.launch("image/*")
-        }
-        attachmentOption.value = null
-      }
-      AttachmentOption.GalleryVideo -> {
-        try {
-          galleryVideoLauncher.launch(0)
-        } catch (e: ActivityNotFoundException) {
-          galleryVideoLauncherFallback.launch("video/*")
-        }
-        attachmentOption.value = null
-      }
-      AttachmentOption.File -> {
-        filesLauncher.launch("*/*")
-        attachmentOption.value = null
-      }
-      else -> {}
-    }
-  }
-
-  fun isSimplexLink(link: String): Boolean =
-    link.startsWith("https://simplex.chat", true) || link.startsWith("http://simplex.chat", true)
-
-  fun parseMessage(msg: String): String? {
-    val parsedMsg = runBlocking { chatModel.controller.apiParseMarkdown(msg) }
-    val link = parsedMsg?.firstOrNull { ft -> ft.format is Format.Uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text) }
-    return link?.text
-  }
-
-  fun loadLinkPreview(url: String, wait: Long? = null) {
-    if (pendingLinkUrl.value == url) {
-      composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(null))
-      withApi {
-        if (wait != null) delay(wait)
-        val lp = getLinkPreview(url)
-        if (lp != null && pendingLinkUrl.value == url) {
-          composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(lp))
-          pendingLinkUrl.value = null
-        } else if (pendingLinkUrl.value == url) {
-          composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-          pendingLinkUrl.value = null
-        }
-      }
-    }
-  }
-
-  fun showLinkPreview(s: String) {
-    prevLinkUrl.value = linkUrl.value
-    linkUrl.value = parseMessage(s)
-    val url = linkUrl.value
-    if (url != null) {
-      if (url != composeState.value.linkPreview?.uri && url != pendingLinkUrl.value) {
-        pendingLinkUrl.value = url
-        loadLinkPreview(url, wait = if (prevLinkUrl.value == url) null else 1500L)
-      }
-    } else {
-      composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    }
-  }
-
-  fun resetLinkPreview() {
-    linkUrl.value = null
-    prevLinkUrl.value = null
-    pendingLinkUrl.value = null
-    cancelledLinks.clear()
-  }
-
-  fun clearState(live: Boolean = false) {
-    if (live) {
-      composeState.value = composeState.value.copy(inProgress = false)
-    } else {
-      composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
-      resetLinkPreview()
-    }
-    recState.value = RecordingState.NotStarted
-    textStyle.value = smallFont
-    chatModel.removeLiveDummy()
-  }
-
-  fun deleteUnusedFiles() {
-    chatModel.filesToDelete.forEach { it.delete() }
-    chatModel.filesToDelete.clear()
-  }
-
-  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false): ChatItem? {
-    val aChatItem = chatModel.controller.apiSendMessage(
-      type = cInfo.chatType,
-      id = cInfo.apiId,
-      file = file,
-      quotedItemId = quoted,
-      mc = mc,
-      live = live
-    )
-    if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
-    return aChatItem?.chatItem
-  }
-
-
-
-  suspend fun sendMessageAsync(text: String?, live: Boolean): ChatItem? {
-    val cInfo = chat.chatInfo
-    val cs = composeState.value
-    var sent: ChatItem?
-    val msgText = text ?: cs.message
-
-    fun sending() {
-      composeState.value = composeState.value.copy(inProgress = true)
-    }
-
-    fun checkLinkPreview(): MsgContent {
-      return when (val composePreview = cs.preview) {
-        is ComposePreview.CLinkPreview -> {
-          val url = parseMessage(msgText)
-          val lp = composePreview.linkPreview
-          if (lp != null && url == lp.uri) {
-            MsgContent.MCLink(msgText, preview = lp)
-          } else {
-            MsgContent.MCText(msgText)
-          }
-        }
-        else -> MsgContent.MCText(msgText)
-      }
-    }
-
-    fun updateMsgContent(msgContent: MsgContent): MsgContent {
-      return when (msgContent) {
-        is MsgContent.MCText -> checkLinkPreview()
-        is MsgContent.MCLink -> checkLinkPreview()
-        is MsgContent.MCImage -> MsgContent.MCImage(msgText, image = msgContent.image)
-        is MsgContent.MCVideo -> MsgContent.MCVideo(msgText, image = msgContent.image, duration = msgContent.duration)
-        is MsgContent.MCVoice -> MsgContent.MCVoice(msgText, duration = msgContent.duration)
-        is MsgContent.MCFile -> MsgContent.MCFile(msgText)
-        is MsgContent.MCUnknown -> MsgContent.MCUnknown(type = msgContent.type, text = msgText, json = msgContent.json)
-      }
-    }
-
-    suspend fun updateMessage(ei: ChatItem, cInfo: ChatInfo, live: Boolean): ChatItem? {
-      val oldMsgContent = ei.content.msgContent
-      if (oldMsgContent != null) {
-        val updatedItem = chatModel.controller.apiUpdateChatItem(
-          type = cInfo.chatType,
-          id = cInfo.apiId,
-          itemId = ei.meta.itemId,
-          mc = updateMsgContent(oldMsgContent),
-          live = live
-        )
-        if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
-        return updatedItem?.chatItem
-      }
-      return null
-    }
-
-    val liveMessage = cs.liveMessage
-    if (!live) {
-      if (liveMessage != null) composeState.value = cs.copy(liveMessage = null)
-      sending()
-    }
-
-    if (cs.contextItem is ComposeContextItem.EditingItem) {
-      val ei = cs.contextItem.chatItem
-      sent = updateMessage(ei, cInfo, live)
-    } else if (liveMessage != null && liveMessage.sent) {
-      sent = updateMessage(liveMessage.chatItem, cInfo, live)
-    } else {
-      val msgs: ArrayList<MsgContent> = ArrayList()
-      val files: ArrayList<String> = ArrayList()
-      when (val preview = cs.preview) {
-        ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(msgText))
-        is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
-        is ComposePreview.MediaPreview -> {
-          preview.content.forEachIndexed { index, it ->
-            val file = when (it) {
-              is UploadContent.SimpleImage -> saveImage(context, it.uri)
-              is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
-              is UploadContent.Video -> saveFileFromUri(context, it.uri)
-            }
-            if (file != null) {
-              files.add(file)
-              if (it is UploadContent.Video) {
-                msgs.add(MsgContent.MCVideo(if (preview.content.lastIndex == index) msgText else "", preview.images[index], it.duration))
-              } else {
-                msgs.add(MsgContent.MCImage(if (preview.content.lastIndex == index) msgText else "", preview.images[index]))
-              }
-            }
-          }
-        }
-        is ComposePreview.VoicePreview -> {
-          val tmpFile = File(preview.voice)
-          AudioPlayer.stop(tmpFile.absolutePath)
-          val actualFile = File(getAppFilePath(SimplexApp.context, tmpFile.name.replaceAfter(RecorderNative.extension, "")))
-          withContext(Dispatchers.IO) {
-            Files.move(tmpFile.toPath(), actualFile.toPath())
-          }
-          files.add(actualFile.name)
-          deleteUnusedFiles()
-          msgs.add(MsgContent.MCVoice(if (msgs.isEmpty()) msgText else "", preview.durationMs / 1000))
-        }
-        is ComposePreview.FilePreview -> {
-          val file = saveFileFromUri(context, preview.uri)
-          if (file != null) {
-            files.add((file))
-            msgs.add(MsgContent.MCFile(if (msgs.isEmpty()) msgText else ""))
-          }
-        }
-      }
-      val quotedItemId: Long? = when (cs.contextItem) {
-        is ComposeContextItem.QuotedItem -> cs.contextItem.chatItem.id
-        else -> null
-      }
-      sent = null
-      msgs.forEachIndexed { index, content ->
-        if (index > 0) delay(100)
-        sent = send(cInfo, content, if (index == 0) quotedItemId else null, files.getOrNull(index),
-          if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false
-        )
-      }
-      if (sent == null &&
-        (cs.preview is ComposePreview.MediaPreview ||
-            cs.preview is ComposePreview.FilePreview ||
-            cs.preview is ComposePreview.VoicePreview)
-        ) {
-        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live)
-      }
-    }
-    clearState(live)
-    return sent
-  }
-
-  fun sendMessage() {
-    withBGApi {
-      sendMessageAsync(null, false)
-    }
-  }
-
-  fun onMessageChange(s: String) {
-    composeState.value = composeState.value.copy(message = s)
-    if (isShortEmoji(s)) {
-      textStyle.value = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
-    } else {
-      textStyle.value = smallFont
-      if (composeState.value.linkPreviewAllowed) {
-        if (s.isNotEmpty()) showLinkPreview(s)
-        else resetLinkPreview()
-      }
-    }
-  }
-
-  fun onAudioAdded(filePath: String, durationMs: Int, finished: Boolean) {
-    val file = File(filePath)
-    chatModel.filesToDelete.add(file)
-    composeState.value = composeState.value.copy(preview = ComposePreview.VoicePreview(filePath, durationMs, finished))
-  }
-
-  fun allowVoiceToContact() {
-    val contact = (chat.chatInfo as ChatInfo.Direct?)?.contact ?: return
-    withApi {
-      chatModel.controller.allowFeatureToContact(contact, ChatFeature.Voice)
-    }
-  }
-
-  fun cancelLinkPreview() {
-    val uri = composeState.value.linkPreview?.uri
-    if (uri != null) {
-      cancelledLinks.add(uri)
-    }
-    pendingLinkUrl.value = null
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-  }
-
-  fun cancelImages() {
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-  }
-
-  fun cancelVoice() {
-    val filePath = recState.value.filePathNullable
-    recState.value = RecordingState.NotStarted
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    withBGApi {
-      RecorderNative.stopRecording?.invoke()
-      AudioPlayer.stop(filePath)
-      filePath?.let { File(it).delete() }
-    }
-  }
-
-  fun cancelFile() {
-    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-  }
-
-  fun truncateToWords(s: String): String {
-    var acc = ""
-    val word = StringBuilder()
-    for (c in s) {
-      if (c.isLetter() || c.isDigit()) {
-        word.append(c)
-      } else {
-        acc = acc + word.toString() + c
-        word.clear()
-      }
-    }
-    return acc
-  }
-
-  suspend fun sendLiveMessage() {
-    val cs = composeState.value
-    val typedMsg = cs.message
-    if ((cs.sendEnabled() || cs.contextItem is ComposeContextItem.QuotedItem) && (cs.liveMessage == null || !cs.liveMessage?.sent)) {
-      val ci = sendMessageAsync(typedMsg, live = true)
-      if (ci != null) {
-        composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = typedMsg, sent = true))
-      }
-    } else if (cs.liveMessage == null) {
-      val cItem = chatModel.addLiveDummy(chat.chatInfo)
-      composeState.value = composeState.value.copy(liveMessage = LiveMessage(cItem, typedMsg = typedMsg, sentMsg = typedMsg, sent = false))
-    }
-  }
-
-  fun liveMessageToSend(lm: LiveMessage, t: String): String? {
-    val s = if (t != lm.typedMsg) truncateToWords(t) else t
-    return if (s != lm.sentMsg) s else null
-  }
-
-  suspend fun updateLiveMessage() {
-    val typedMsg = composeState.value.message
-    val liveMessage = composeState.value.liveMessage
-    if (liveMessage != null) {
-      val sentMsg = liveMessageToSend(liveMessage, typedMsg)
-      if (sentMsg != null) {
-        val ci = sendMessageAsync(sentMsg, live = true)
-        if (ci != null) {
-          composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = sentMsg, sent = true))
-        }
-      } else if (liveMessage.typedMsg != typedMsg) {
-        composeState.value = composeState.value.copy(liveMessage = liveMessage.copy(typedMsg = typedMsg))
-      }
-    }
-  }
-
-  @Composable
-  fun previewView() {
-    when (val preview = composeState.value.preview) {
-      ComposePreview.NoPreview -> {}
-      is ComposePreview.CLinkPreview -> ComposeLinkView(preview.linkPreview, ::cancelLinkPreview)
-      is ComposePreview.MediaPreview -> ComposeImageView(
-        preview,
-        ::cancelImages,
-        cancelEnabled = !composeState.value.editing
-      )
-      is ComposePreview.VoicePreview -> ComposeVoiceView(
-        preview.voice,
-        preview.durationMs,
-        preview.finished,
-        cancelEnabled = !composeState.value.editing,
-        ::cancelVoice
-      )
-      is ComposePreview.FilePreview -> ComposeFileView(
-        preview.fileName,
-        ::cancelFile,
-        cancelEnabled = !composeState.value.editing
-      )
-    }
-  }
-
-  @Composable
-  fun contextItemView() {
-    when (val contextItem = composeState.value.contextItem) {
-      ComposeContextItem.NoContextItem -> {}
-      is ComposeContextItem.QuotedItem -> ContextItemView(contextItem.chatItem, painterResource(R.drawable.ic_reply)) {
-        composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
-      }
-      is ComposeContextItem.EditingItem -> ContextItemView(contextItem.chatItem, painterResource(R.drawable.ic_edit_filled)) {
-        clearState()
-      }
-    }
-  }
-
-  LaunchedEffect(chatModel.sharedContent.value) {
-    // Important. If it's null, don't do anything, chat is not closed yet but will be after a moment
-    if (chatModel.chatId.value == null) return@LaunchedEffect
-
-    when (val shared = chatModel.sharedContent.value) {
-      is SharedContent.Text -> onMessageChange(shared.text)
-      is SharedContent.Media -> processPickedMedia(shared.uris, shared.text)
-      is SharedContent.File -> processPickedFile(shared.uri, shared.text)
-      null -> {}
-    }
-    chatModel.sharedContent.value = null
-  }
-
-  val userCanSend = rememberUpdatedState(chat.userCanSend)
-  val userIsObserver = rememberUpdatedState(chat.userIsObserver)
-
-  Column {
-    contextItemView()
-    when {
-      composeState.value.editing && composeState.value.preview is ComposePreview.VoicePreview -> {}
-      composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
-      else -> previewView()
-    }
-    Row(
-      modifier = Modifier.padding(end = 8.dp),
-      verticalAlignment = Alignment.Bottom,
-    ) {
-      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled && rememberUpdatedState(chat.userCanSend).value) {
-        Icon(
-          painterResource(R.drawable.ic_attach_file_filled_500),
-          contentDescription = stringResource(R.string.attach),
-          tint = if (!composeState.value.attachmentDisabled && userCanSend.value) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-          modifier = Modifier
-            .size(28.dp)
-            .clip(CircleShape)
-        )
-      }
-      val allowedVoiceByPrefs = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.Voice) }
-      LaunchedEffect(allowedVoiceByPrefs) {
-        if (!allowedVoiceByPrefs && composeState.value.preview is ComposePreview.VoicePreview) {
-          // Voice was disabled right when this user records it, just cancel it
-          cancelVoice()
-        }
-      }
-      val needToAllowVoiceToContact = remember(chat.chatInfo) {
-        chat.chatInfo is ChatInfo.Direct && with(chat.chatInfo.contact.mergedPreferences.voice) {
-          ((userPreference as? ContactUserPref.User)?.preference?.allow == FeatureAllowed.NO || (userPreference as? ContactUserPref.Contact)?.preference?.allow == FeatureAllowed.NO) &&
-              contactPreference.allow == FeatureAllowed.YES
-        }
-      }
-      LaunchedEffect(Unit) {
-        snapshotFlow { recState.value }
-          .distinctUntilChanged()
-          .collect {
-            when(it) {
-              is RecordingState.Started -> onAudioAdded(it.filePath, it.progressMs, false)
-              is RecordingState.Finished -> onAudioAdded(it.filePath, it.durationMs, true)
-              is RecordingState.NotStarted -> {}
-            }
-          }
-      }
-
-      fun clearCurrentDraft() {
-        if (chatModel.draftChatId.value == chat.id) {
-          chatModel.draft.value = null
-          chatModel.draftChatId.value = null
-        }
-      }
-
-      LaunchedEffect(rememberUpdatedState(chat.userCanSend).value) {
-        if (!chat.userCanSend) {
-          clearCurrentDraft()
-          clearState()
-        }
-      }
-
-      val activity = LocalContext.current as Activity
-      DisposableEffect(Unit) {
-        val orientation = activity.resources.configuration.orientation
-        onDispose {
-          if (orientation == activity.resources.configuration.orientation) {
-            val cs = composeState.value
-            if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
-              sendMessage()
-              resetLinkPreview()
-              clearCurrentDraft()
-              deleteUnusedFiles()
-            } else if (!composeState.value.empty) {
-              if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
-                composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
-              }
-              chatModel.draft.value = composeState.value
-              chatModel.draftChatId.value = chat.id
-            } else {
-              clearCurrentDraft()
-              deleteUnusedFiles()
-            }
-            chatModel.removeLiveDummy()
-          }
-        }
-      }
-
-      SendMsgView(
-        composeState,
-        showVoiceRecordIcon = true,
-        recState,
-        chat.chatInfo is ChatInfo.Direct,
-        liveMessageAlertShown = chatModel.controller.appPrefs.liveMessageAlertShown,
-        needToAllowVoiceToContact,
-        allowedVoiceByPrefs,
-        allowVoiceToContact = ::allowVoiceToContact,
-        userIsObserver = userIsObserver.value,
-        userCanSend = userCanSend.value,
-        sendMessage = {
-          sendMessage()
-          resetLinkPreview()
-        },
-        sendLiveMessage = ::sendLiveMessage,
-        updateLiveMessage = ::updateLiveMessage,
-        cancelLiveMessage = {
-          composeState.value = composeState.value.copy(liveMessage = null)
-          chatModel.removeLiveDummy()
-        },
-        onMessageChange = ::onMessageChange,
-        textStyle = textStyle
-      )
-    }
-  }
-}
-
-class PickFromGallery: ActivityResultContract<Int, Uri?>() {
-  override fun createIntent(context: Context, input: Int) =
-    Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI).apply {
-      type = "image/*"
-    }
-
-  override fun parseResult(resultCode: Int, intent: Intent?): Uri? = intent?.data
-}
-
-class PickMultipleImagesFromGallery: ActivityResultContract<Int, List<Uri>>() {
-  override fun createIntent(context: Context, input: Int) =
-    Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI).apply {
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      type = "image/*"
-    }
-
-  override fun parseResult(resultCode: Int, intent: Intent?): List<Uri> =
-    if (intent?.data != null)
-      listOf(intent.data!!)
-    else if (intent?.clipData != null)
-      with(intent.clipData!!) {
-        val uris = ArrayList<Uri>()
-        for (i in 0 until kotlin.math.min(itemCount, 10)) {
-          val uri = getItemAt(i).uri
-          if (uri != null) uris.add(uri)
-        }
-        if (itemCount > 10) {
-          AlertManager.shared.showAlertMsg(R.string.images_limit_title, R.string.images_limit_desc)
-        }
-        uris
-      }
-    else
-      emptyList()
-}
-
-
-class PickMultipleVideosFromGallery: ActivityResultContract<Int, List<Uri>>() {
-  override fun createIntent(context: Context, input: Int) =
-    Intent(Intent.ACTION_PICK, MediaStore.Video.Media.INTERNAL_CONTENT_URI).apply {
-      putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-      type = "video/*"
-    }
-
-  override fun parseResult(resultCode: Int, intent: Intent?): List<Uri> =
-    if (intent?.data != null)
-      listOf(intent.data!!)
-    else if (intent?.clipData != null)
-      with(intent.clipData!!) {
-        val uris = ArrayList<Uri>()
-        for (i in 0 until kotlin.math.min(itemCount, 10)) {
-          val uri = getItemAt(i).uri
-          if (uri != null) uris.add(uri)
-        }
-        if (itemCount > 10) {
-          AlertManager.shared.showAlertMsg(R.string.videos_limit_title, R.string.videos_limit_desc)
-        }
-        uris
-      }
-    else
-      emptyList()
-}

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

@@ -1,131 +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.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-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.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)
-    )
-    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    Row(
-      Modifier
-        .height(60.dp)
-        .fillMaxWidth()
-        .padding(top = 8.dp)
-        .background(sentColor),
-      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) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-          stringResource(R.string.icon_descr_file),
-          Modifier
-            .padding(start = 4.dp, end = 2.dp)
-            .size(36.dp),
-          tint = if (finishedRecording) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-        )
-      }
-      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 = MaterialTheme.colors.secondary,
-      )
-      Spacer(Modifier.weight(1f))
-      if (cancelEnabled) {
-        IconButton(
-          onClick = {
-            AudioPlayer.stop(filePath)
-            cancelVoice()
-          },
-          modifier = Modifier.padding(0.dp)
-        ) {
-          Icon(
-            painterResource(R.drawable.ic_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/ContactPreferences.kt

@@ -1,225 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-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.usersettings.PreferenceToggle
-
-@Composable
-fun ContactPreferencesView(
-  m: ChatModel,
-  user: User,
-  contactId: Long,
-  close: () -> Unit,
-) {
-  val contact = remember { derivedStateOf { (m.getContactChat(contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }
-  val ct = contact.value ?: return
-  var featuresAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
-  var currentFeaturesAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
-
-  fun savePrefs(afterSave: () -> Unit = {}) {
-    withApi {
-      val prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
-      val toContact = m.controller.apiSetContactPrefs(ct.contactId, prefs)
-      if (toContact != null) {
-        m.updateContact(toContact)
-        currentFeaturesAllowed = featuresAllowed
-      }
-      afterSave()
-    }
-  }
-  ModalView(
-    close = {
-      if (featuresAllowed == currentFeaturesAllowed) close()
-      else showUnsavedChangesAlert({ savePrefs(close) }, close)
-    },
-  ) {
-    ContactPreferencesLayout(
-      featuresAllowed,
-      currentFeaturesAllowed,
-      user,
-      ct,
-      applyPrefs = { prefs ->
-        featuresAllowed = prefs
-      },
-      reset = {
-        featuresAllowed = currentFeaturesAllowed
-      },
-      savePrefs = ::savePrefs,
-    )
-  }
-}
-
-@Composable
-private fun ContactPreferencesLayout(
-  featuresAllowed: ContactFeaturesAllowed,
-  currentFeaturesAllowed: ContactFeaturesAllowed,
-  user: User,
-  contact: Contact,
-  applyPrefs: (ContactFeaturesAllowed) -> Unit,
-  reset: () -> Unit,
-  savePrefs: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.contact_preferences))
-    val timedMessages: MutableState<Boolean> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.timedMessagesAllowed) }
-    val onTTLUpdated = { ttl: Int? ->
-      applyPrefs(featuresAllowed.copy(timedMessagesTTL = ttl))
-    }
-    TimedMessagesFeatureSection(featuresAllowed, contact.mergedPreferences.timedMessages, timedMessages, onTTLUpdated) { allowed, ttl ->
-      applyPrefs(featuresAllowed.copy(timedMessagesAllowed = allowed, timedMessagesTTL = ttl ?: currentFeaturesAllowed.timedMessagesTTL))
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowFullDeletion: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.fullDelete) }
-    FeatureSection(ChatFeature.FullDelete, user.fullPreferences.fullDelete.allow, contact.mergedPreferences.fullDelete, allowFullDeletion) {
-      applyPrefs(featuresAllowed.copy(fullDelete = it))
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowVoice: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.voice) }
-    FeatureSection(ChatFeature.Voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, allowVoice) {
-      applyPrefs(featuresAllowed.copy(voice = it))
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowCalls: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.calls) }
-    FeatureSection(ChatFeature.Calls, user.fullPreferences.calls.allow, contact.mergedPreferences.calls, allowCalls) {
-      applyPrefs(featuresAllowed.copy(calls = it))
-    }
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
-    ResetSaveButtons(
-      reset = reset,
-      save = savePrefs,
-      disabled = featuresAllowed == currentFeaturesAllowed
-    )
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun FeatureSection(
-  feature: ChatFeature,
-  userDefault: FeatureAllowed,
-  pref: ContactUserPreference,
-  allowFeature: State<ContactFeatureAllowed>,
-  onSelected: (ContactFeatureAllowed) -> Unit
-) {
-  val enabled = FeatureEnabled.enabled(
-    feature.asymmetric,
-    user = SimpleChatPreference(allow = allowFeature.value.allowed),
-    contact = pref.contactPreference
-  )
-
-  SectionView(
-    feature.text.uppercase(),
-    icon = feature.iconFilled(),
-    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
-    leadingIcon = true,
-  ) {
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.chat_preferences_you_allow),
-      ContactFeatureAllowed.values(userDefault).map { it to it.text },
-      allowFeature,
-      icon = null,
-      enabled = remember { mutableStateOf(feature != ChatFeature.Calls) },
-      onSelected = onSelected
-    )
-    InfoRow(
-      generalGetString(R.string.chat_preferences_contact_allows),
-      pref.contactPreference.allow.text
-    )
-  }
-  SectionTextFooter(feature.enabledDescription(enabled) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
-}
-
-@Composable
-private fun TimedMessagesFeatureSection(
-  featuresAllowed: ContactFeaturesAllowed,
-  pref: ContactUserPreferenceTimed,
-  allowFeature: State<Boolean>,
-  onTTLUpdated: (Int?) -> Unit,
-  onSelected: (Boolean, Int?) -> Unit
-) {
-  val enabled = FeatureEnabled.enabled(
-    ChatFeature.TimedMessages.asymmetric,
-    user = TimedMessagesPreference(allow = if (allowFeature.value) FeatureAllowed.YES else FeatureAllowed.NO),
-    contact = pref.contactPreference
-  )
-
-  SectionView(
-    ChatFeature.TimedMessages.text.uppercase(),
-    icon = ChatFeature.TimedMessages.iconFilled(),
-    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
-    leadingIcon = true,
-  ) {
-    PreferenceToggle(
-      generalGetString(R.string.chat_preferences_you_allow),
-      checked = allowFeature.value,
-    ) { allow ->
-      onSelected(allow, if (allow) featuresAllowed.timedMessagesTTL ?: 86400 else null)
-    }
-    InfoRow(
-      generalGetString(R.string.chat_preferences_contact_allows),
-      pref.contactPreference.allow.text
-    )
-    if (featuresAllowed.timedMessagesAllowed) {
-      val ttl = rememberSaveable(featuresAllowed.timedMessagesTTL) { mutableStateOf(featuresAllowed.timedMessagesTTL) }
-      TimedMessagesTTLPicker(ttl, onTTLUpdated)
-    } else if (pref.contactPreference.allow == FeatureAllowed.YES || pref.contactPreference.allow == FeatureAllowed.ALWAYS) {
-      InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(pref.contactPreference.ttl))
-    }
-  }
-  SectionTextFooter(ChatFeature.TimedMessages.enabledDescription(enabled))
-}
-
-@Composable
-private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
-    }
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_contact), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-@Composable
-fun TimedMessagesTTLPicker(selection: MutableState<Int?>, onSelected: (Int?) -> Unit) {
-  val ttlValues = TimedMessagesPreference.ttlValues
-  val values = ttlValues + if (ttlValues.contains(selection.value)) listOf() else listOf(selection.value)
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.delete_after),
-    values.map { it to TimedMessagesPreference.ttlText(it) },
-    selection,
-    onSelected = onSelected
-  )
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_contact),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}

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

@@ -1,79 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.item.*
-import kotlinx.datetime.Clock
-
-@Composable
-fun ContextItemView(
-  contextItem: ChatItem,
-  contextIcon: Painter,
-  cancelContextItem: () -> Unit
-) {
-  val sent = contextItem.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
-  Row(
-    Modifier
-      .padding(top = 8.dp)
-      .background(if (sent) sentColor else receivedColor),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      Modifier
-        .padding(vertical = 12.dp)
-        .fillMaxWidth()
-        .weight(1F),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Icon(
-        contextIcon,
-        modifier = Modifier
-          .padding(horizontal = 8.dp)
-          .height(20.dp)
-          .width(20.dp),
-        contentDescription = stringResource(R.string.icon_descr_context),
-        tint = MaterialTheme.colors.secondary,
-      )
-      MarkdownText(
-        contextItem.text, contextItem.formattedText,
-        sender = contextItem.memberDisplayName, senderBold = true, maxLines = 3,
-        linkMode = SimplexLinkMode.DESCRIPTION,
-        modifier = Modifier.fillMaxWidth(),
-      )
-    }
-    IconButton(onClick = cancelContextItem) {
-      Icon(
-        painterResource(R.drawable.ic_close),
-        contentDescription = stringResource(R.string.cancel_verb),
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewContextItemView() {
-  SimpleXTheme {
-    ContextItemView(
-      contextItem = ChatItem.getSampleData(1, CIDirection.DirectRcv(), Clock.System.now(), "hello"),
-      contextIcon = painterResource(R.drawable.ic_edit_filled)
-    ) {}
-  }
-}

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

@@ -1,669 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.content.pm.ActivityInfo
-import android.content.res.Configuration
-import android.os.Build
-import android.text.InputType
-import android.util.Log
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.view.inputmethod.*
-import android.widget.EditText
-import android.widget.TextView
-import androidx.compose.animation.core.*
-import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
-import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.*
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.inputmethod.EditorInfoCompat
-import androidx.core.view.inputmethod.InputConnectionCompat
-import androidx.core.widget.*
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.ItemAction
-import chat.simplex.app.views.helpers.*
-import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import kotlinx.coroutines.*
-import java.lang.reflect.Field
-
-@Composable
-fun SendMsgView(
-  composeState: MutableState<ComposeState>,
-  showVoiceRecordIcon: Boolean,
-  recState: MutableState<RecordingState>,
-  isDirectChat: Boolean,
-  liveMessageAlertShown: SharedPreference<Boolean>,
-  needToAllowVoiceToContact: Boolean,
-  allowedVoiceByPrefs: Boolean,
-  userIsObserver: Boolean,
-  userCanSend: Boolean,
-  allowVoiceToContact: () -> Unit,
-  sendMessage: () -> Unit,
-  sendLiveMessage: (suspend () -> Unit)? = null,
-  updateLiveMessage: (suspend () -> Unit)? = null,
-  cancelLiveMessage: (() -> Unit)? = null,
-  onMessageChange: (String) -> Unit,
-  textStyle: MutableState<TextStyle>
-) {
-  Box(Modifier.padding(vertical = 8.dp)) {
-    val cs = composeState.value
-    val showProgress = cs.inProgress && (cs.preview is ComposePreview.MediaPreview || cs.preview is ComposePreview.FilePreview)
-    val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
-        cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
-    val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
-    // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
-      Box(Modifier
-        .matchParentSize()
-        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.observer_cant_send_message_title),
-            text = generalGetString(R.string.observer_cant_send_message_desc)
-          )
-        })
-      )
-    }
-    if (showDeleteTextButton.value) {
-      DeleteTextButton(composeState)
-    }
-    Box(Modifier.align(Alignment.BottomEnd)) {
-      val sendButtonSize = remember { Animatable(36f) }
-      val sendButtonAlpha = remember { Animatable(1f) }
-      val permissionsState = rememberMultiplePermissionsState(listOf(Manifest.permission.RECORD_AUDIO))
-      val scope = rememberCoroutineScope()
-      LaunchedEffect(Unit) {
-        // Making LiveMessage alive when screen orientation was changed
-        if (cs.liveMessage != null && sendLiveMessage != null && updateLiveMessage != null) {
-          startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-        }
-      }
-      when {
-        showProgress -> ProgressIndicator()
-        showVoiceButton -> {
-          Row(verticalAlignment = Alignment.CenterVertically) {
-            val stopRecOnNextClick = remember { mutableStateOf(false) }
-            when {
-              needToAllowVoiceToContact || !allowedVoiceByPrefs || !userCanSend -> {
-                DisallowedVoiceButton(userCanSend) {
-                  if (needToAllowVoiceToContact) {
-                    showNeedToAllowVoiceAlert(allowVoiceToContact)
-                  } else if (!allowedVoiceByPrefs) {
-                    showDisabledVoiceAlert(isDirectChat)
-                  }
-                }
-              }
-              !permissionsState.allPermissionsGranted ->
-                VoiceButtonWithoutPermission { permissionsState.launchMultiplePermissionRequest() }
-              else ->
-                RecordVoiceView(recState, stopRecOnNextClick)
-            }
-            if (sendLiveMessage != null 
-                && updateLiveMessage != null
-                && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
-                && cs.contextItem is ComposeContextItem.NoContextItem) {
-              Spacer(Modifier.width(10.dp))
-              StartLiveMessageButton(userCanSend) {
-                if (composeState.value.preview is ComposePreview.NoPreview) {
-                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                }
-              }
-            }
-          }
-        }
-        cs.liveMessage?.sent == false && cs.message.isEmpty() -> {
-          CancelLiveMessageButton {
-            cancelLiveMessage?.invoke()
-          }
-        }
-        else -> {
-          val cs = composeState.value
-          val icon = if (cs.editing || cs.liveMessage != null) painterResource(R.drawable.ic_check_filled) else painterResource(R.drawable.ic_arrow_upward)
-          val disabled = !cs.sendEnabled() ||
-                        (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-                        cs.endLiveDisabled
-          if (cs.liveMessage == null &&
-            cs.preview !is ComposePreview.VoicePreview && !cs.editing &&
-            cs.contextItem is ComposeContextItem.NoContextItem &&
-            sendLiveMessage != null && updateLiveMessage != null
-          ) {
-            val showDropdown = rememberSaveable { mutableStateOf(false) }
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage) { showDropdown.value = true }
-
-            DefaultDropdownMenu(
-              showDropdown,
-            ) {
-              ItemAction(
-                generalGetString(R.string.send_live_message),
-                BoltFilled,
-                onClick = {
-                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                  showDropdown.value = false
-                }
-              )
-            }
-          } else {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage)
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun NativeKeyboard(
-  composeState: MutableState<ComposeState>,
-  textStyle: MutableState<TextStyle>,
-  showDeleteTextButton: MutableState<Boolean>,
-  userIsObserver: Boolean,
-  onMessageChange: (String) -> Unit
-) {
-  val cs = composeState.value
-  val textColor = MaterialTheme.colors.onBackground
-  val tintColor = MaterialTheme.colors.secondaryVariant
-  val padding = PaddingValues(12.dp, 7.dp, 45.dp, 0.dp)
-  val paddingStart = with(LocalDensity.current) { 12.dp.roundToPx() }
-  val paddingTop = with(LocalDensity.current) { 7.dp.roundToPx() }
-  val paddingEnd = with(LocalDensity.current) { 45.dp.roundToPx() }
-  val paddingBottom = with(LocalDensity.current) { 7.dp.roundToPx() }
-  var showKeyboard by remember { mutableStateOf(false) }
-  LaunchedEffect(cs.contextItem) {
-    if (cs.contextItem is ComposeContextItem.QuotedItem) {
-      delay(100)
-      showKeyboard = true
-    } else if (cs.contextItem is ComposeContextItem.EditingItem) {
-      // Keyboard will not show up if we try to show it too fast
-      delay(300)
-      showKeyboard = true
-    }
-  }
-
-  AndroidView(modifier = Modifier, factory = {
-    val editText = @SuppressLint("AppCompatCustomView") object: EditText(it) {
-      override fun setOnReceiveContentListener(
-        mimeTypes: Array<out String>?,
-        listener: android.view.OnReceiveContentListener?
-      ) {
-        super.setOnReceiveContentListener(mimeTypes, listener)
-      }
-
-      override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
-        val connection = super.onCreateInputConnection(editorInfo)
-        EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf("image/*"))
-        val onCommit = InputConnectionCompat.OnCommitContentListener { inputContentInfo, _, _ ->
-          try {
-            inputContentInfo.requestPermission()
-          } catch (e: Exception) {
-            return@OnCommitContentListener false
-          }
-          SimplexApp.context.chatModel.sharedContent.value = SharedContent.Media("", listOf(inputContentInfo.contentUri))
-          true
-        }
-        return InputConnectionCompat.createWrapper(connection, editorInfo, onCommit)
-      }
-    }
-    editText.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-    editText.maxLines = 16
-    editText.inputType = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or editText.inputType
-    editText.setTextColor(textColor.toArgb())
-    editText.textSize = textStyle.value.fontSize.value
-    val drawable = it.getDrawable(R.drawable.send_msg_view_background)!!
-    DrawableCompat.setTint(drawable, tintColor.toArgb())
-    editText.background = drawable
-    editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
-    editText.setText(cs.message)
-    if (Build.VERSION.SDK_INT >= 29) {
-      editText.textCursorDrawable?.let { DrawableCompat.setTint(it, CurrentColors.value.colors.secondary.toArgb()) }
-    } else {
-      try {
-        val f: Field = TextView::class.java.getDeclaredField("mCursorDrawableRes")
-        f.isAccessible = true
-        f.set(editText, R.drawable.edit_text_cursor)
-      } catch (e: Exception) {
-        Log.e(chat.simplex.app.TAG, e.stackTraceToString())
-      }
-    }
-    editText.doOnTextChanged { text, _, _, _ -> onMessageChange(text.toString()) }
-    editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
-    editText
-  }) {
-    it.setTextColor(textColor.toArgb())
-    it.textSize = textStyle.value.fontSize.value
-    DrawableCompat.setTint(it.background, tintColor.toArgb())
-    it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview
-    it.isFocusableInTouchMode = it.isFocusable
-    if (cs.message != it.text.toString()) {
-      it.setText(cs.message)
-      // Set cursor to the end of the text
-      it.setSelection(it.text.length)
-    }
-    if (showKeyboard) {
-      it.requestFocus()
-      val imm: InputMethodManager = SimplexApp.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-      imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
-      showKeyboard = false
-    }
-    showDeleteTextButton.value = it.lineCount >= 4
-  }
-  if (composeState.value.preview is ComposePreview.VoicePreview) {
-    ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
-  } else if (userIsObserver) {
-    ComposeOverlay(R.string.you_are_observer, textStyle, padding)
-  }
-}
-
-@Composable
-private fun ComposeOverlay(textId: Int, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
-  Text(
-    generalGetString(textId),
-    Modifier.padding(padding),
-    color = MaterialTheme.colors.secondary,
-    style = textStyle.value.copy(fontStyle = FontStyle.Italic)
-  )
-}
-
-@Composable
-private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>) {
-  IconButton(
-    { composeState.value = composeState.value.copy(message = "") },
-    Modifier.align(Alignment.TopEnd).size(36.dp)
-  ) {
-    Icon(painterResource(R.drawable.ic_close), null, Modifier.padding(7.dp).size(36.dp), tint = MaterialTheme.colors.secondary)
-  }
-}
-
-@Composable
-private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNextClick: MutableState<Boolean>) {
-  val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
-  DisposableEffect(Unit) { onDispose { rec.stop() } }
-  val stopRecordingAndAddAudio: () -> Unit = {
-    recState.value.filePathNullable?.let {
-      recState.value = RecordingState.Finished(it, rec.stop())
-    }
-  }
-  if (stopRecOnNextClick.value) {
-    LaunchedEffect(recState.value) {
-      if (recState.value is RecordingState.NotStarted) {
-        stopRecOnNextClick.value = false
-      }
-    }
-    // Lock orientation to current orientation because screen rotation will break the recording
-    LockToCurrentOrientationUntilDispose()
-    StopRecordButton(stopRecordingAndAddAudio)
-  } else {
-    val startRecording: () -> Unit = {
-      recState.value = RecordingState.Started(
-        filePath = rec.start { progress: Int?, finished: Boolean ->
-          val state = recState.value
-          if (state is RecordingState.Started && progress != null) {
-            recState.value = if (!finished)
-              RecordingState.Started(state.filePath, progress)
-            else
-              RecordingState.Finished(state.filePath, progress)
-          }
-        },
-      )
-    }
-    val interactionSource = interactionSourceWithTapDetection(
-      onPress = { if (recState.value is RecordingState.NotStarted) startRecording() },
-      onClick = {
-        if (stopRecOnNextClick.value) {
-          stopRecordingAndAddAudio()
-        } else {
-          // tapped and didn't hold a finger
-          stopRecOnNextClick.value = true
-        }
-      },
-      onCancel = stopRecordingAndAddAudio,
-      onRelease = stopRecordingAndAddAudio
-    )
-    RecordVoiceButton(interactionSource)
-  }
-}
-
-@Composable
-private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
-    Icon(
-      painterResource(R.drawable.ic_keyboard_voice),
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.secondary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      painterResource(R.drawable.ic_keyboard_voice_filled),
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(34.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun LockToCurrentOrientationUntilDispose() {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    val activity = context as Activity
-    val manager = context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
-    val rotation = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) manager.defaultDisplay.rotation else activity.display?.rotation
-    activity.requestedOrientation = when (rotation) {
-      android.view.Surface.ROTATION_90 -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-      android.view.Surface.ROTATION_180 -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
-      android.view.Surface.ROTATION_270 -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-      else -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-    // Unlock orientation
-    onDispose { activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED }
-  }
-}
-
-@Composable
-private fun StopRecordButton(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      painterResource(R.drawable.ic_stop_filled),
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun RecordVoiceButton(interactionSource: MutableInteractionSource) {
-  IconButton({}, Modifier.size(36.dp), interactionSource = interactionSource) {
-    Icon(
-      painterResource(R.drawable.ic_keyboard_voice_filled),
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(34.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(Modifier.size(36.dp).padding(4.dp), color = MaterialTheme.colors.secondary, strokeWidth = 3.dp)
-}
-
-@Composable
-private fun CancelLiveMessageButton(
-  onClick: () -> Unit
-) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      painterResource(R.drawable.ic_close),
-      stringResource(R.string.icon_descr_cancel_live_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun SendMsgButton(
-  icon: Painter,
-  sizeDp: Animatable<Float, AnimationVector1D>,
-  alpha: Animatable<Float, AnimationVector1D>,
-  enabled: Boolean,
-  sendMessage: () -> Unit,
-  onLongClick: (() -> Unit)? = null
-) {
-  val interactionSource = remember { MutableInteractionSource() }
-  Box(
-    modifier = Modifier.requiredSize(36.dp)
-      .combinedClickable(
-        onClick = sendMessage,
-        onLongClick = onLongClick,
-        enabled = enabled,
-        role = Role.Button,
-        interactionSource = interactionSource,
-        indication = rememberRipple(bounded = false, radius = 24.dp)
-      ),
-    contentAlignment = Alignment.Center
-  ) {
-    Icon(
-      icon,
-      stringResource(R.string.icon_descr_send_message),
-      tint = Color.White,
-      modifier = Modifier
-        .size(sizeDp.value.dp)
-        .padding(4.dp)
-        .alpha(alpha.value)
-        .clip(CircleShape)
-        .background(if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary)
-        .padding(3.dp)
-    )
-  }
-}
-
-@Composable
-private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
-  val interactionSource = remember { MutableInteractionSource() }
-  Box(
-    modifier = Modifier.requiredSize(36.dp)
-      .clickable(
-        onClick = onClick,
-        enabled = enabled,
-        role = Role.Button,
-        interactionSource = interactionSource,
-        indication = rememberRipple(bounded = false, radius = 24.dp)
-      ),
-    contentAlignment = Alignment.Center
-  ) {
-    Icon(
-      BoltFilled,
-      stringResource(R.string.icon_descr_send_message),
-      tint = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-private fun startLiveMessage(
-  scope: CoroutineScope,
-  send: suspend () -> Unit,
-  update: suspend () -> Unit,
-  sendButtonSize: Animatable<Float, AnimationVector1D>,
-  sendButtonAlpha: Animatable<Float, AnimationVector1D>,
-  composeState: MutableState<ComposeState>,
-  liveMessageAlertShown: SharedPreference<Boolean>
-) {
-  fun run() {
-    scope.launch {
-      while (composeState.value.liveMessage != null) {
-        sendButtonSize.animateTo(if (sendButtonSize.value == 36f) 32f else 36f, tween(700, 50))
-      }
-      sendButtonSize.snapTo(36f)
-    }
-    scope.launch {
-      while (composeState.value.liveMessage != null) {
-        sendButtonAlpha.animateTo(if (sendButtonAlpha.value == 1f) 0.75f else 1f, tween(700, 50))
-      }
-      sendButtonAlpha.snapTo(1f)
-    }
-    scope.launch {
-      delay(3000)
-      while (composeState.value.liveMessage != null) {
-        update()
-        delay(3000)
-      }
-    }
-  }
-
-  fun start() = withBGApi {
-    if (composeState.value.liveMessage == null) {
-      send()
-    }
-    run()
-  }
-
-  if (liveMessageAlertShown.state.value) {
-    start()
-  } else {
-    AlertManager.shared.showAlertDialog(
-      title = generalGetString(R.string.live_message),
-      text = generalGetString(R.string.send_live_message_desc),
-      confirmText = generalGetString(R.string.send_verb),
-      onConfirm = {
-        liveMessageAlertShown.set(true)
-        start()
-      })
-  }
-}
-
-private fun showNeedToAllowVoiceAlert(onConfirm: () -> Unit) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.allow_voice_messages_question),
-    text = generalGetString(R.string.you_need_to_allow_to_send_voice),
-    confirmText = generalGetString(R.string.allow_verb),
-    dismissText = generalGetString(R.string.cancel_verb),
-    onConfirm = onConfirm,
-  )
-}
-
-private fun showDisabledVoiceAlert(isDirectChat: Boolean) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.voice_messages_prohibited),
-    text = generalGetString(
-      if (isDirectChat)
-        R.string.ask_your_contact_to_enable_voice
-      else
-        R.string.only_group_owners_can_enable_voice
-    )
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgView() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgViewEditing() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateEditing = ComposeState(editingItem = ChatItem.getSampleData(), useLinkPreviews = true)
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(composeStateEditing) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgViewInProgress() {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt", getAppFileUri("test.txt")), inProgress = true, useLinkPreviews = true)
-  SimpleXTheme {
-    SendMsgView(
-      composeState = remember { mutableStateOf(composeStateInProgress) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
-      sendMessage = {},
-      onMessageChange = { _ -> },
-      textStyle = textStyle
-    )
-  }
-}

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

@@ -1,137 +0,0 @@
-package chat.simplex.app.views.chat
-
-import SectionBottomSpacer
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-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.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun VerifyCodeView(
-  displayName: String,
-  connectionCode: String?,
-  connectionVerified: Boolean,
-  verify: suspend (String?) -> Pair<Boolean, String>?,
-  close: () -> Unit,
-) {
-  if (connectionCode != null) {
-    VerifyCodeLayout(
-      displayName,
-      connectionCode,
-      connectionVerified,
-      verifyCode = { newCode, cb ->
-        withBGApi {
-          val res = verify(newCode)
-          if (res != null) {
-            val (verified) = res
-            cb(verified)
-            if (verified) close()
-          }
-        }
-      }
-    )
-  }
-}
-
-@Composable
-private fun VerifyCodeLayout(
-  displayName: String,
-  connectionCode: String,
-  connectionVerified: Boolean,
-  verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .verticalScroll(rememberScrollState())
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.security_code), false)
-    val splitCode = splitToParts(connectionCode, 24)
-    Row(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF), horizontalArrangement = Arrangement.Center) {
-      if (connectionVerified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 4.dp).size(22.dp), tint = MaterialTheme.colors.secondary)
-        Text(String.format(stringResource(R.string.is_verified), displayName))
-      } else {
-        Text(String.format(stringResource(R.string.is_not_verified), displayName))
-      }
-    }
-
-    SectionView {
-      QRCode(connectionCode, Modifier.aspectRatio(1f))
-    }
-
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-      Spacer(Modifier.weight(2f))
-      SelectionContainer(Modifier.padding(vertical = DEFAULT_PADDING_HALF, horizontal = DEFAULT_PADDING_HALF)) {
-        Text(
-          splitCode,
-          fontFamily = FontFamily.Monospace,
-          fontSize = 18.sp,
-          maxLines = 20
-        )
-      }
-      val context = LocalContext.current
-      Box(Modifier.weight(1f)) {
-        IconButton({ shareText(context, connectionCode) }, Modifier.size(20.dp).align(Alignment.CenterStart)) {
-          Icon(painterResource(R.drawable.ic_share_filled), null, tint = MaterialTheme.colors.primary)
-        }
-      }
-      Spacer(Modifier.weight(1f))
-    }
-
-    Text(
-      generalGetString(R.string.to_verify_compare),
-      Modifier.padding(bottom = DEFAULT_PADDING)
-    )
-
-    Row(
-      Modifier.padding(bottom = DEFAULT_PADDING).align(Alignment.CenterHorizontally),
-      horizontalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      if (connectionVerified) {
-        SimpleButton(generalGetString(R.string.clear_verification), painterResource(R.drawable.ic_shield)) {
-          verifyCode(null) {}
-        }
-      } else {
-        SimpleButton(generalGetString(R.string.scan_code), painterResource(R.drawable.ic_qr_code)) {
-          ModalManager.shared.showModal {
-            ScanCodeView(verifyCode) { }
-          }
-        }
-        SimpleButton(generalGetString(R.string.mark_code_verified), painterResource(R.drawable.ic_verified_user)) {
-          verifyCode(connectionCode) { verified ->
-            if (!verified) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(R.string.incorrect_code)
-              )
-            }
-          }
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-private fun splitToParts(s: String, length: Int): String {
-  if (length >= s.length) return s
-  return (0..(s.length - 1) / length)
-    .map { s.drop(it * length).take(length) }
-    .joinToString(separator = "\n")
-}

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

@@ -1,336 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionBottomSpacer
-import SectionCustomFooter
-import SectionDividerSpaced
-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.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
-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 androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.ChatInfoToolbarTitle
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.InfoAboutIncognito
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun AddGroupMembersView(groupInfo: GroupInfo, creatingGroup: Boolean = false, chatModel: ChatModel, close: () -> Unit) {
-  val selectedContacts = remember { mutableStateListOf<Long>() }
-  val selectedRole = remember { mutableStateOf(GroupMemberRole.Member) }
-  var allowModifyMembers by remember { mutableStateOf(true) }
-  BackHandler(onBack = close)
-  AddGroupMembersLayout(
-    chatModel.incognito.value,
-    groupInfo = groupInfo,
-    creatingGroup = creatingGroup,
-    contactsToAdd = getContactsToAdd(chatModel),
-    selectedContacts = selectedContacts,
-    selectedRole = selectedRole,
-    allowModifyMembers = allowModifyMembers,
-    openPreferences = {
-      ModalManager.shared.showCustomModal { close ->
-        GroupPreferencesView(chatModel, groupInfo.id, close)
-      }
-    },
-    inviteMembers = {
-      allowModifyMembers = false
-      withApi {
-        for (contactId in selectedContacts) {
-          val member = chatModel.controller.apiAddMember(groupInfo.groupId, contactId, selectedRole.value)
-          if (member != null) {
-            chatModel.upsertGroupMember(groupInfo, member)
-          } else {
-            break
-          }
-        }
-        close.invoke()
-      }
-    },
-    clearSelection = { selectedContacts.clear() },
-    addContact = { contactId -> if (contactId !in selectedContacts) selectedContacts.add(contactId) },
-    removeContact = { contactId -> selectedContacts.removeIf { it == contactId } },
-    close = close,
-  )
-}
-
-fun getContactsToAdd(chatModel: ChatModel): List<Contact> {
-  val memberContactIds = chatModel.groupMembers
-    .filter { it.memberCurrent }
-    .mapNotNull { it.memberContactId }
-  return chatModel.chats
-    .asSequence()
-    .map { it.chatInfo }
-    .filterIsInstance<ChatInfo.Direct>()
-    .map { it.contact }
-    .filter { it.contactId !in memberContactIds }
-    .sortedBy { it.displayName.lowercase() }
-    .toList()
-}
-
-@Composable
-fun AddGroupMembersLayout(
-  chatModelIncognito: Boolean,
-  groupInfo: GroupInfo,
-  creatingGroup: Boolean,
-  contactsToAdd: List<Contact>,
-  selectedContacts: List<Long>,
-  selectedRole: MutableState<GroupMemberRole>,
-  allowModifyMembers: Boolean,
-  openPreferences: () -> Unit,
-  inviteMembers: () -> Unit,
-  clearSelection: () -> Unit,
-  addContact: (Long) -> Unit,
-  removeContact: (Long) -> Unit,
-  close: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.button_add_members))
-    InfoAboutIncognito(
-      chatModelIncognito,
-      false,
-      generalGetString(R.string.group_unsupported_incognito_main_profile_sent),
-      generalGetString(R.string.group_main_profile_sent),
-      true
-    )
-    Spacer(Modifier.size(DEFAULT_PADDING))
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      ChatInfoToolbarTitle(
-        ChatInfo.Group(groupInfo),
-        imageSize = 60.dp,
-        iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight
-      )
-    }
-    SectionSpacer()
-
-    if (contactsToAdd.isEmpty()) {
-      Row(
-        Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.Center
-      ) {
-        Text(
-          stringResource(R.string.no_contacts_to_add),
-          Modifier.padding(),
-          color = MaterialTheme.colors.secondary
-        )
-      }
-    } else {
-      SectionView {
-        if (creatingGroup) {
-          SectionItemView(openPreferences) {
-            Text(stringResource(R.string.set_group_preferences))
-          }
-        }
-        RoleSelectionRow(groupInfo, selectedRole, allowModifyMembers)
-        if (creatingGroup && selectedContacts.isEmpty()) {
-          SkipInvitingButton(close)
-        } else {
-          InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty() || !allowModifyMembers)
-        }
-      }
-      SectionCustomFooter {
-        InviteSectionFooter(selectedContactsCount = selectedContacts.size, allowModifyMembers, clearSelection)
-      }
-      SectionDividerSpaced(maxTopPadding = true)
-
-      SectionView(stringResource(R.string.select_contacts)) {
-        ContactList(contacts = contactsToAdd, selectedContacts, groupInfo, allowModifyMembers, addContact, removeContact)
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole>, enabled: Boolean) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    val values = GroupMemberRole.values().filter { it <= groupInfo.membership.memberRole }.map { it to it.text }
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.new_member_role),
-      values,
-      selectedRole,
-      icon = null,
-      enabled = rememberUpdatedState(enabled)
-    ) { selectedRole.value = it }
-  }
-}
-
-@Composable
-fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_check),
-    stringResource(R.string.invite_to_group_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-    disabled = disabled,
-  )
-}
-
-@Composable
-fun SkipInvitingButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_check),
-    stringResource(R.string.skip_inviting_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelection: () -> Unit) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    if (selectedContactsCount >= 1) {
-      Text(
-        String.format(generalGetString(R.string.num_contacts_selected), selectedContactsCount),
-        color = MaterialTheme.colors.secondary,
-        fontSize = 12.sp
-      )
-      Box(
-        Modifier.clickable { if (enabled) clearSelection() }
-      ) {
-        Text(
-          stringResource(R.string.clear_contacts_selection_button),
-          color = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-          fontSize = 12.sp
-        )
-      }
-    } else {
-      Text(
-        stringResource(R.string.no_contacts_selected),
-        color = MaterialTheme.colors.secondary,
-        fontSize = 12.sp
-      )
-    }
-  }
-}
-
-@Composable
-fun ContactList(
-  contacts: List<Contact>,
-  selectedContacts: List<Long>,
-  groupInfo: GroupInfo,
-  enabled: Boolean,
-  addContact: (Long) -> Unit,
-  removeContact: (Long) -> Unit
-) {
-  Column {
-    contacts.forEachIndexed { index, contact ->
-      ContactCheckRow(
-        contact, groupInfo, addContact, removeContact,
-        checked = selectedContacts.contains(contact.apiId),
-        enabled = enabled,
-      )
-    }
-  }
-}
-
-@Composable
-fun ContactCheckRow(
-  contact: Contact,
-  groupInfo: GroupInfo,
-  addContact: (Long) -> Unit,
-  removeContact: (Long) -> Unit,
-  checked: Boolean,
-  enabled: Boolean,
-) {
-  val prohibitedToInviteIncognito = !groupInfo.membership.memberIncognito && contact.contactConnIncognito
-  val icon: Painter
-  val iconColor: Color
-  if (prohibitedToInviteIncognito) {
-    icon = painterResource(R.drawable.ic_theater_comedy_filled)
-    iconColor = MaterialTheme.colors.secondary
-  } else if (checked) {
-    icon = painterResource(R.drawable.ic_check_circle_filled)
-    iconColor = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-  } else {
-    icon = painterResource(R.drawable.ic_circle)
-    iconColor = MaterialTheme.colors.secondary
-  }
-  SectionItemView(
-    click = if (enabled) {
-      {
-        if (prohibitedToInviteIncognito) {
-          showProhibitedToInviteIncognitoAlertDialog()
-        } else if (!checked)
-          addContact(contact.apiId)
-        else
-          removeContact(contact.apiId)
-      }
-    } else null
-  ) {
-    ProfileImage(size = 36.dp, contact.image)
-    Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
-    Text(
-      contact.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-      color = if (prohibitedToInviteIncognito) MaterialTheme.colors.secondary else Color.Unspecified
-    )
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    Icon(
-      icon,
-      contentDescription = stringResource(R.string.icon_descr_contact_checked),
-      tint = iconColor
-    )
-  }
-}
-
-fun showProhibitedToInviteIncognitoAlertDialog() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.invite_prohibited),
-    text = generalGetString(R.string.invite_prohibited_description),
-    confirmText = generalGetString(R.string.ok),
-  )
-}
-
-@Preview
-@Composable
-fun PreviewAddGroupMembersLayout() {
-  SimpleXTheme {
-    AddGroupMembersLayout(
-      chatModelIncognito = false,
-      groupInfo = GroupInfo.sampleData,
-      creatingGroup = false,
-      contactsToAdd = listOf(Contact.sampleData, Contact.sampleData, Contact.sampleData),
-      selectedContacts = remember { mutableStateListOf() },
-      selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) },
-      allowModifyMembers = true,
-      openPreferences = {},
-      inviteMembers = {},
-      clearSelection = {},
-      addContact = {},
-      removeContact = {},
-      close = {},
-    )
-  }
-}

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

@@ -1,410 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-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.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.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.showAlertDialog(
-    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()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    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()
-      }
-    },
-    destructive = true,
-  )
-}
-
-@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())
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupChatInfoHeader(chat.chatInfo)
-    }
-    SectionSpacer()
-
-    SectionView {
-      if (groupInfo.canEdit) {
-        EditGroupProfileButton(editGroupProfile)
-        AddOrEditWelcomeMessage(groupInfo.groupProfile.description, addOrEditWelcomeMessage)
-      }
-      GroupPreferencesButton(openPreferences)
-    }
-    SectionTextFooter(stringResource(R.string.only_group_owners_can_change_prefs))
-    SectionDividerSpaced(maxTopPadding = true)
-
-    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
-      if (groupInfo.canAddMembers) {
-        if (groupLink == null) {
-          CreateGroupLinkButton(manageGroupLink)
-        } else {
-          GroupLinkButton(manageGroupLink)
-        }
-
-        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
-        val tint = if (chat.chatInfo.incognito) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-        AddMembersButton(tint, onAddMembersClick)
-      }
-      SectionItemView(minHeight = 54.dp) {
-        MemberRow(groupInfo.membership, user = true)
-      }
-      MembersList(members, showMemberInfo)
-    }
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
-    SectionView {
-      ClearChatButton(clearChat)
-      if (groupInfo.canDelete) {
-        DeleteGroupButton(deleteGroup)
-      }
-      if (groupInfo.membership.memberCurrent) {
-        LeaveGroupButton(leaveGroup)
-      }
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@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(
-    painterResource(R.drawable.ic_toggle_on),
-    stringResource(R.string.group_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary, onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add),
-    stringResource(R.string.button_add_members),
-    onClick,
-    iconColor = tint,
-    textColor = tint
-  )
-}
-
-@Composable
-private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
-  Column {
-    members.forEachIndexed { index, member ->
-      Divider()
-      SectionItemView({ showMemberInfo(member) }, minHeight = 54.dp) {
-        MemberRow(member)
-      }
-    }
-  }
-}
-
-@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)
-      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
-      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 = MaterialTheme.colors.secondary,
-          fontSize = 12.sp,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis
-        )
-      }
-    }
-    val role = member.memberRole
-    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
-      Text(role.text, color = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@Composable
-private fun MemberVerifiedShield() {
-  Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 3.dp).size(16.dp), tint = MaterialTheme.colors.secondary)
-}
-
-@Composable
-private fun GroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun CreateGroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add_link),
-    stringResource(R.string.create_group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-fun EditGroupProfileButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_edit),
-    stringResource(R.string.button_edit_group_profile),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun AddOrEditWelcomeMessage(welcomeMessage: String?, onClick: () -> Unit) {
-  val text = if (welcomeMessage == null) {
-    stringResource(R.string.button_add_welcome_message)
-  } else {
-    stringResource(R.string.button_welcome_message)
-  }
-  SettingsActionItem(
-    painterResource(R.drawable.ic_maps_ugc),
-    text,
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun LeaveGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_logout),
-    stringResource(R.string.button_leave_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = Color.Red
-  )
-}
-
-@Composable
-private fun DeleteGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_delete_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = 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/GroupLinkView.kt

@@ -1,183 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionBottomSpacer
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-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.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-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.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, memberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit) {
-  var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
-  val groupLinkMemberRole = rememberSaveable { mutableStateOf(memberRole) }
-  var creatingLink by rememberSaveable { mutableStateOf(false) }
-  val cxt = LocalContext.current
-  fun createLink() {
-    creatingLink = true
-    withApi {
-      val link = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
-      if (link != null) {
-        groupLink = link.first
-        groupLinkMemberRole.value = link.second
-        onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
-      }
-      creatingLink = false
-    }
-  }
-  LaunchedEffect(Unit) {
-    if (groupLink == null && !creatingLink) {
-      createLink()
-    }
-  }
-  GroupLinkLayout(
-    groupLink = groupLink,
-    groupInfo,
-    groupLinkMemberRole,
-    creatingLink,
-    createLink = ::createLink,
-    share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
-    updateLink = {
-      val role = groupLinkMemberRole.value
-      if (role != null) {
-        withBGApi {
-          val link = chatModel.controller.apiGroupLinkMemberRole(groupInfo.groupId, role)
-          if (link != null) {
-            groupLink = link.first
-            groupLinkMemberRole.value = link.second
-            onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
-          }
-        }
-      }
-    },
-    deleteLink = {
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.delete_link_question),
-        text = generalGetString(R.string.all_group_members_will_remain_connected),
-        confirmText = generalGetString(R.string.delete_verb),
-        onConfirm = {
-          withApi {
-            val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
-            if (r) {
-              groupLink = null
-              onGroupLinkUpdated(null to null)
-            }
-          }
-        },
-        destructive = true,
-      )
-    }
-  )
-  if (creatingLink) {
-    ProgressIndicator()
-  }
-}
-
-@Composable
-fun GroupLinkLayout(
-  groupLink: String?,
-  groupInfo: GroupInfo,
-  groupLinkMemberRole: MutableState<GroupMemberRole?>,
-  creatingLink: Boolean,
-  createLink: () -> Unit,
-  share: () -> Unit,
-  updateLink: () -> Unit,
-  deleteLink: () -> Unit
-) {
-  Column(
-    Modifier
-      .verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.group_link))
-    Text(
-      stringResource(R.string.you_can_share_group_link_anybody_will_be_able_to_connect),
-      Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = 12.dp),
-      lineHeight = 22.sp
-    )
-    Column(
-      Modifier.fillMaxWidth(),
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceEvenly
-    ) {
-      if (groupLink == null) {
-        SimpleButton(stringResource(R.string.button_create_group_link), icon = painterResource(R.drawable.ic_add_link), disabled = creatingLink, click = createLink)
-      } else {
-        RoleSelectionRow(groupInfo, groupLinkMemberRole)
-        var initialLaunch by remember { mutableStateOf(true) }
-        LaunchedEffect(groupLinkMemberRole.value) {
-          if (!initialLaunch) {
-            updateLink()
-          }
-          initialLaunch = false
-        }
-        QRCode(groupLink, Modifier.aspectRatio(1f).padding(horizontal = DEFAULT_PADDING))
-        Row(
-          horizontalArrangement = Arrangement.spacedBy(10.dp),
-          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(horizontal = DEFAULT_PADDING, vertical = 10.dp)
-        ) {
-          SimpleButton(
-            stringResource(R.string.share_link),
-            icon = painterResource(R.drawable.ic_share),
-            click = share
-          )
-          SimpleButton(
-            stringResource(R.string.delete_link),
-            icon = painterResource(R.drawable.ic_delete),
-            color = Color.Red,
-            click = deleteLink
-          )
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole?>, enabled: Boolean = true) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    val values = listOf(GroupMemberRole.Member, GroupMemberRole.Observer).map { it to it.text }
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.initial_member_role),
-      values,
-      selectedRole,
-      icon = null,
-      enabled = rememberUpdatedState(enabled)
-    ) { selectedRole.value = it }
-  }
-}
-
-@Composable
-fun ProgressIndicator() {
-  Box(
-    Modifier.fillMaxSize(),
-    contentAlignment = Alignment.Center
-  ) {
-    CircularProgressIndicator(
-      Modifier
-        .padding(horizontal = 2.dp)
-        .size(30.dp),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 2.5.dp
-    )
-  }
-}

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

@@ -1,349 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-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.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.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.showAlertDialog(
-    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()
-      }
-    },
-    destructive = true,
-  )
-}
-
-@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()),
-  ) {
-    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) {
-            VerifyCodeButton(member.verified, verifyClicked)
-          }
-        }
-        SectionSpacer()
-      }
-    }
-
-    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
-      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
-      val roles = remember { member.canChangeRoleTo(groupInfo) }
-      if (roles != null) {
-        RoleSelectionRow(roles, newRole, onRoleSelected)
-      } else {
-        InfoRow(stringResource(R.string.role_in_group), member.memberRole.text)
-      }
-      val conn = member.activeConn
-      if (conn != null) {
-        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)
-      }
-    }
-    if (connStats != null) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchMemberAddress)
-        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()) {
-              SimplexServers(stringResource(R.string.sending_via), sndServers)
-            }
-          } else if (sndServers != null && sndServers.isNotEmpty()) {
-            SimplexServers(stringResource(R.string.sending_via), sndServers)
-          }
-        }
-      }
-    }
-
-    if (member.canBeRemoved(groupInfo)) {
-      SectionDividerSpaced(maxBottomPadding = false)
-      SectionView {
-        RemoveMemberButton(removeMember)
-      }
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), member.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), member.groupMemberId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@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(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
-      }
-      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(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_remove_member),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-@Composable
-fun OpenChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_chat),
-    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/GroupPreferences.kt

@@ -1,176 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.TimedMessagesTTLPicker
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.PreferenceToggleWithIcon
-
-@Composable
-fun GroupPreferencesView(m: ChatModel, chatId: String, close: () -> Unit,) {
-  val groupInfo = remember { derivedStateOf { (m.getChat(chatId)?.chatInfo as? ChatInfo.Group)?.groupInfo } }
-  val gInfo = groupInfo.value ?: return
-  var preferences by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(gInfo.fullGroupPreferences) }
-  var currentPreferences by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(preferences) }
-
-  fun savePrefs(afterSave: () -> Unit = {}) {
-    withApi {
-      val gp = gInfo.groupProfile.copy(groupPreferences = preferences.toGroupPreferences())
-      val gInfo = m.controller.apiUpdateGroup(gInfo.groupId, gp)
-      if (gInfo != null) {
-        m.updateGroup(gInfo)
-        currentPreferences = preferences
-      }
-      afterSave()
-    }
-  }
-  ModalView(
-    close = {
-      if (preferences == currentPreferences) close()
-      else showUnsavedChangesAlert({ savePrefs(close) }, close)
-    },
-  ) {
-    GroupPreferencesLayout(
-      preferences,
-      currentPreferences,
-      gInfo,
-      applyPrefs = { prefs ->
-        preferences = prefs
-      },
-      reset = {
-        preferences = currentPreferences
-      },
-      savePrefs = ::savePrefs,
-    )
-  }
-}
-
-@Composable
-private fun GroupPreferencesLayout(
-  preferences: FullGroupPreferences,
-  currentPreferences: FullGroupPreferences,
-  groupInfo: GroupInfo,
-  applyPrefs: (FullGroupPreferences) -> Unit,
-  reset: () -> Unit,
-  savePrefs: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.group_preferences))
-    val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.enable) }
-    val onTTLUpdated = { ttl: Int? ->
-      applyPrefs(preferences.copy(timedMessages = preferences.timedMessages.copy(ttl = ttl ?: 86400)))
-    }
-    FeatureSection(GroupFeature.TimedMessages, timedMessages, groupInfo, preferences, onTTLUpdated) { enable ->
-      if (enable == GroupFeatureEnabled.ON) {
-         applyPrefs(preferences.copy(timedMessages = TimedMessagesGroupPreference(enable = enable, ttl = preferences.timedMessages.ttl ?: 86400)))
-      } else {
-        applyPrefs(preferences.copy(timedMessages = TimedMessagesGroupPreference(enable = enable, ttl = currentPreferences.timedMessages.ttl)))
-      }
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowDirectMessages = remember(preferences) { mutableStateOf(preferences.directMessages.enable) }
-    FeatureSection(GroupFeature.DirectMessages, allowDirectMessages, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(directMessages = GroupPreference(enable = it)))
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowFullDeletion = remember(preferences) { mutableStateOf(preferences.fullDelete.enable) }
-    FeatureSection(GroupFeature.FullDelete, allowFullDeletion, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(fullDelete = GroupPreference(enable = it)))
-    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.enable) }
-    FeatureSection(GroupFeature.Voice, allowVoice, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(voice = GroupPreference(enable = it)))
-    }
-    if (groupInfo.canEdit) {
-      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
-      ResetSaveButtons(
-        reset = reset,
-        save = savePrefs,
-        disabled = preferences == currentPreferences
-      )
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun FeatureSection(
-  feature: GroupFeature,
-  enableFeature: State<GroupFeatureEnabled>,
-  groupInfo: GroupInfo,
-  preferences: FullGroupPreferences,
-  onTTLUpdated: (Int?) -> Unit,
-  onSelected: (GroupFeatureEnabled) -> Unit
-) {
-  SectionView {
-    val on = enableFeature.value == GroupFeatureEnabled.ON
-    val icon = if (on) feature.iconFilled() else feature.icon
-    val iconTint = if (on) SimplexGreen else MaterialTheme.colors.secondary
-    val timedOn = feature == GroupFeature.TimedMessages && enableFeature.value == GroupFeatureEnabled.ON
-    if (groupInfo.canEdit) {
-      PreferenceToggleWithIcon(
-        feature.text,
-        icon,
-        iconTint,
-        enableFeature.value == GroupFeatureEnabled.ON,
-      ) { checked ->
-        onSelected(if (checked) GroupFeatureEnabled.ON else GroupFeatureEnabled.OFF)
-      }
-      if (timedOn) {
-        val ttl = rememberSaveable(preferences.timedMessages) { mutableStateOf(preferences.timedMessages.ttl) }
-        TimedMessagesTTLPicker(ttl, onTTLUpdated)
-      }
-    } else {
-      InfoRow(
-        feature.text,
-        enableFeature.value.text,
-        icon = icon,
-        iconTint = iconTint,
-      )
-      if (timedOn) {
-        InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(preferences.timedMessages.ttl))
-      }
-    }
-  }
-  SectionTextFooter(feature.enableDescription(enableFeature.value, groupInfo.canEdit))
-}
-
-@Composable
-private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
-    }
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_group_members), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_group_members),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}

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

@@ -1,208 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionBottomSpacer
-import android.content.res.Configuration
-import android.net.Uri
-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.focus.FocusRequester
-import androidx.compose.ui.graphics.Color
-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.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.ProfileNameField
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.isValidDisplayName
-import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.app.views.usersettings.*
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-@Composable
-fun GroupProfileView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
-  GroupProfileLayout(
-    close = close,
-    groupProfile = groupInfo.groupProfile,
-    saveProfile = { p ->
-      withApi {
-        val gInfo = chatModel.controller.apiUpdateGroup(groupInfo.groupId, p)
-        if (gInfo != null) {
-          chatModel.updateGroup(gInfo)
-          close.invoke()
-        }
-      }
-    }
-  )
-}
-
-@Composable
-fun GroupProfileLayout(
-  close: () -> Unit,
-  groupProfile: GroupProfile,
-  saveProfile: (GroupProfile) -> Unit,
-) {
-  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
-  val displayName = rememberSaveable { mutableStateOf(groupProfile.displayName) }
-  val fullName = rememberSaveable { mutableStateOf(groupProfile.fullName) }
-  val chosenImage = rememberSaveable { mutableStateOf<Uri?>(null) }
-  val profileImage = rememberSaveable { mutableStateOf(groupProfile.image) }
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val focusRequester = remember { FocusRequester() }
-  val dataUnchanged =
-    displayName.value == groupProfile.displayName &&
-        fullName.value == groupProfile.fullName &&
-        groupProfile.image == profileImage.value
-  val closeWithAlert = {
-    if (dataUnchanged || !(displayName.value.isNotEmpty() && isValidDisplayName(displayName.value))) {
-      close()
-    } else {
-      showUnsavedChangesAlert({
-        saveProfile(
-          groupProfile.copy(
-            displayName = displayName.value,
-            fullName = fullName.value,
-            image = profileImage.value
-          )
-        )
-      }, close)
-    }
-  }
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    ModalBottomSheetLayout(
-      scrimColor = Color.Black.copy(alpha = 0.12F),
-      modifier = Modifier.navigationBarsWithImePadding(),
-      sheetContent = {
-        GetImageBottomSheet(
-          chosenImage,
-          onImageChange = { bitmap -> profileImage.value = resizeImageToStrSize(cropToSquare(bitmap), maxDataSize = 12500) },
-          hideBottomSheet = {
-            scope.launch { bottomSheetModalState.hide() }
-          })
-      },
-      sheetState = bottomSheetModalState,
-      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
-    ) {
-      ModalView(close = closeWithAlert) {
-        Column(
-          Modifier
-            .verticalScroll(scrollState)
-        ) {
-          Column(
-            Modifier.fillMaxWidth()
-              .padding(horizontal = DEFAULT_PADDING)
-          ) {
-            ReadableText(R.string.group_profile_is_stored_on_members_devices, TextAlign.Center)
-            Box(
-              Modifier
-                .fillMaxWidth()
-                .padding(bottom = 24.dp),
-              contentAlignment = Alignment.Center
-            ) {
-              Box(contentAlignment = Alignment.TopEnd) {
-                Box(contentAlignment = Alignment.Center) {
-                  ProfileImage(108.dp, profileImage.value, color = MaterialTheme.colors.secondary.copy(alpha = 0.1f))
-                  EditImageButton { scope.launch { bottomSheetModalState.show() } }
-                }
-                if (profileImage.value != null) {
-                  DeleteImageButton { profileImage.value = null }
-                }
-              }
-            }
-            Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-              Text(
-                stringResource(R.string.group_display_name_field),
-                fontSize = 16.sp
-              )
-              if (!isValidDisplayName(displayName.value)) {
-                Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-                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.group_full_name_field),
-              fontSize = 16.sp,
-              modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-            )
-            ProfileNameField(fullName)
-            Spacer(Modifier.height(DEFAULT_PADDING))
-            val enabled = !dataUnchanged && displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-            if (enabled) {
-              Text(
-                stringResource(R.string.save_group_profile),
-                modifier = Modifier.clickable {
-                  saveProfile(
-                    groupProfile.copy(
-                      displayName = displayName.value,
-                      fullName = fullName.value,
-                      image = profileImage.value
-                    )
-                  )
-                },
-                color = MaterialTheme.colors.primary
-              )
-            } else {
-              Text(
-                stringResource(R.string.save_group_profile),
-                color = MaterialTheme.colors.secondary
-              )
-            }
-          }
-
-          SectionBottomSpacer()
-
-          LaunchedEffect(Unit) {
-            delay(300)
-            focusRequester.requestFocus()
-          }
-        }
-      }
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_group_members),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewGroupProfileLayout() {
-  SimpleXTheme {
-    GroupProfileLayout(
-      close = {},
-      groupProfile = GroupProfile.sampleData,
-      saveProfile = { _ -> }
-    )
-  }
-}

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

@@ -1,95 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionBottomSpacer
-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)
-    },
-  ) {
-    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)
-    )
-    SectionBottomSpacer()
-  }
-}
-
-@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) MaterialTheme.colors.secondary 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/CICallItemView.kt

@@ -1,154 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.graphics.Color
-import androidx.compose.ui.res.painterResource
-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.*
-
-@Composable
-fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, duration: Int, acceptCall: (Contact) -> Unit) {
-  val sent = cItem.chatDir.sent
-  Column(
-    Modifier
-      .padding(horizontal = 4.dp)
-      .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-    @Composable fun ConnectingCallIcon() = Icon(painterResource(R.drawable.ic_settings_phone), stringResource(R.string.icon_descr_call_connecting), tint = SimplexGreen)
-    when (status) {
-      CICallStatus.Pending -> if (sent) {
-        Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_pending_sent))
-      } else {
-        AcceptCallButton(cInfo, acceptCall)
-      }
-      CICallStatus.Missed -> Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_missed), tint = Color.Red)
-      CICallStatus.Rejected -> Icon(painterResource(R.drawable.ic_call_end), stringResource(R.string.icon_descr_call_rejected), tint = Color.Red)
-      CICallStatus.Accepted -> ConnectingCallIcon()
-      CICallStatus.Negotiated -> ConnectingCallIcon()
-      CICallStatus.Progress -> Icon(painterResource(R.drawable.ic_phone_in_talk_filled), stringResource(R.string.icon_descr_call_progress), tint = SimplexGreen)
-      CICallStatus.Ended -> Row {
-        Icon(painterResource(R.drawable.ic_call_end), stringResource(R.string.icon_descr_call_ended), tint = MaterialTheme.colors.secondary, modifier = Modifier.padding(end = 4.dp))
-        Text(durationText(duration), color = MaterialTheme.colors.secondary)
-      }
-      CICallStatus.Error -> {}
-    }
-
-    Text(
-      cItem.timestampText,
-      color = MaterialTheme.colors.secondary,
-      fontSize = 14.sp,
-      modifier = Modifier.padding(start = 3.dp)
-    )
-  }
-}
-
-@Composable
-fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
-  if (cInfo is ChatInfo.Direct) {
-    SimpleButton(stringResource(R.string.answer_call), painterResource(R.drawable.ic_ring_volume)) { acceptCall(cInfo.contact) }
-  } else {
-    Icon(painterResource(R.drawable.ic_ring_volume), stringResource(R.string.answer_call), tint = MaterialTheme.colors.secondary)
-  }
-//    if case let .direct(contact) = chatInfo {
-//      Button {
-//        if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
-//        m.activeCallInvitation = nil
-//        m.activeCall = Call(
-//          contact: contact,
-//          callState: .invitationReceived,
-//        localMedia: invitation.peerMedia,
-//        sharedKey: invitation.sharedKey
-//        )
-//        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
-//      } else {
-//        AlertManager.shared.showAlertMsg(title: "Call already ended!")
-//      }
-//      } label: {
-//        Label("Answer call", systemImage: "phone.arrow.down.left")
-//      }
-//    } else {
-//      Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
-//    }
-
-}
-
-//struct CICallItemView: View {
-//  @EnvironmentObject var m: ChatModel
-//  var chatInfo: ChatInfo
-//  var chatItem: ChatItem
-//  var status: CICallStatus
-//  var duration: Int
-//
-//  var body: some View {
-//    switch status {
-//      case .pending:
-//      if sent {
-//        Image(systemName: "phone.arrow.up.right").foregroundColor(.secondary)
-//      } else {
-//        acceptCallButton()
-//      }
-//      case .missed: missedCallIcon(sent).foregroundColor(.red)
-//      case .rejected: Image(systemName: "phone.down").foregroundColor(.secondary)
-//      case .accepted: connectingCallIcon()
-//      case .negotiated: connectingCallIcon()
-//      case .progress: Image(systemName: "phone.and.waveform.fill").foregroundColor(.green)
-//      case .ended: endedCallIcon(sent)
-//      case .error: missedCallIcon(sent).foregroundColor(.orange)
-//    }
-//
-//    chatItem.timestampText
-//      .font(.caption)
-//    .foregroundColor(.secondary)
-//    .padding(.bottom, 8)
-//    .padding(.horizontal, 12)
-//  }
-//  }
-//
-//  private func missedCallIcon(_ sent: Bool) -> some View {
-//    Image(systemName: sent ? "phone.arrow.up.right" : "phone.arrow.down.left")
-//  }
-//
-//  private func connectingCallIcon() -> some View {
-//    Image(systemName: "phone.connection").foregroundColor(.green)
-//  }
-//
-//  @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
-//    HStack {
-//      Image(systemName: "phone.down")
-//      Text(CICallStatus.durationText(duration)).foregroundColor(.secondary)
-//    }
-//  }
-//
-//
-//  @ViewBuilder private func acceptCallButton() -> some View {
-//    if case let .direct(contact) = chatInfo {
-//      Button {
-//        if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
-//        m.activeCallInvitation = nil
-//        m.activeCall = Call(
-//          contact: contact,
-//          callState: .invitationReceived,
-//        localMedia: invitation.peerMedia,
-//        sharedKey: invitation.sharedKey
-//        )
-//        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
-//      } else {
-//        AlertManager.shared.showAlertMsg(title: "Call already ended!")
-//      }
-//      } label: {
-//        Label("Answer call", systemImage: "phone.arrow.down.left")
-//      }
-//    } else {
-//      Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
-//    }
-//  }
-//}

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

@@ -1,34 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.*
-
-@Composable
-fun CIChatFeatureView(
-  chatItem: ChatItem,
-  feature: Feature,
-  iconColor: Color,
-  icon: Painter? = null
-) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(icon ?: feature.iconFilled(), feature.text, Modifier.size(18.dp), tint = iconColor)
-    Text(
-      chatEventText(chatItem),
-      Modifier,
-      // this is important. Otherwise, aligning will be bad because annotated string has a Span with size 12.sp
-      fontSize = 12.sp
-    )
-  }
-}

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

@@ -1,61 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
-
-@Composable
-fun CIEventView(ci: ChatItem) {
-  @Composable
-  fun chatEventTextView(text: AnnotatedString) {
-    Text(text, style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp))
-  }
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    val memberDisplayName = ci.memberDisplayName
-    if (memberDisplayName != null) {
-      chatEventTextView(
-        buildAnnotatedString {
-          withStyle(chatEventStyle) { append(memberDisplayName) }
-          append(" ")
-        }.plus(chatEventText(ci))
-      )
-    } else {
-      chatEventTextView(chatEventText(ci))
-    }
-  }
-}
-
-val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = CurrentColors.value.colors.secondary)
-
-fun chatEventText(ci: ChatItem): AnnotatedString =
-  buildAnnotatedString {
-    withStyle(chatEventStyle) { append(ci.content.text + "  " + ci.timestampText) }
-  }
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun CIEventViewPreview() {
-  SimpleXTheme {
-    CIEventView(
-      ChatItem.getGroupEventSample()
-    )
-  }
-}

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

@@ -1,53 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun CIFeaturePreferenceView(
-  chatItem: ChatItem,
-  contact: Contact?,
-  feature: ChatFeature,
-  allowed: FeatureAllowed,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
-) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = MaterialTheme.colors.secondary)
-    if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
-      val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
-      val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
-      val acceptTextId = if (setParam) R.string.accept_feature_set_1_day else R.string.accept_feature
-      val param = if (setParam) 86400 else null
-      val annotatedText = buildAnnotatedString {
-        withStyle(chatEventStyle) { append(chatItem.content.text + "  ") }
-        withAnnotation(tag = "Accept", annotation = "Accept") {
-          withStyle(acceptStyle) { append(generalGetString(acceptTextId) + "  ") }
-        }
-        withStyle(chatEventStyle) { append(chatItem.timestampText) }
-      }
-      fun accept(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Accept", start = offset, end = offset).isNotEmpty()
-      ClickableText(
-        annotatedText,
-        onClick = { if (accept(it)) { acceptFeature(contact, feature, param) } },
-        shouldConsumeEvent = ::accept
-      )
-    } else {
-      Text(chatItem.content.text + "  " + chatItem.timestampText,
-        fontSize = 12.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colors.secondary)
-    }
-  }
-}

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

@@ -1,244 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.widget.Toast
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-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.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.datetime.Clock
-
-@Composable
-fun CIFileView(
-  file: CIFile?,
-  edited: Boolean,
-  receiveFile: (Long) -> Unit
-) {
-  val context = LocalContext.current
-  val saveFileLauncher = rememberSaveFileLauncher(cxt = context, ciFile = file)
-
-  @Composable
-  fun fileIcon(
-    innerIcon: Painter? = null,
-    color: Color = if (isInDarkTheme()) FileDark else FileLight
-  ) {
-    Box(
-      contentAlignment = Alignment.Center
-    ) {
-      Icon(
-        painterResource(R.drawable.ic_draft_filled),
-        stringResource(R.string.icon_descr_file),
-        Modifier.fillMaxSize(),
-        tint = color
-      )
-      if (innerIcon != null) {
-        Icon(
-          innerIcon,
-          stringResource(R.string.icon_descr_file),
-          Modifier
-            .size(32.dp)
-            .padding(top = 12.dp),
-          tint = Color.White
-        )
-      }
-    }
-  }
-
-  fun fileSizeValid(): Boolean {
-    if (file != null) {
-      return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-  }
-
-  fun fileAction() {
-    if (file != null) {
-      when (file.fileStatus) {
-        is 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)))
-            )
-          }
-        }
-        is CIFileStatus.RcvAccepted ->
-          when (file.fileProtocol) {
-            FileProtocol.XFTP ->
-              AlertManager.shared.showAlertMsg(
-                generalGetString(R.string.waiting_for_file),
-                generalGetString(R.string.file_will_be_received_when_contact_completes_uploading)
-              )
-            FileProtocol.SMP ->
-              AlertManager.shared.showAlertMsg(
-                generalGetString(R.string.waiting_for_file),
-                generalGetString(R.string.file_will_be_received_when_contact_is_online)
-              )
-          }
-        is CIFileStatus.RcvComplete -> {
-          val filePath = getLoadedFilePath(context, file)
-          if (filePath != null) {
-            saveFileLauncher.launch(file.fileName)
-          } else {
-            Toast.makeText(context, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-          }
-        }
-        else -> {}
-      }
-    }
-  }
-
-  @Composable
-  fun progressIndicator() {
-    CircularProgressIndicator(
-      Modifier.size(32.dp),
-      color = if (isInDarkTheme()) FileDark else FileLight,
-      strokeWidth = 3.dp
-    )
-  }
-
-  @Composable
-  fun progressCircle(progress: Long, total: Long) {
-    val angle = 360f * (progress.toDouble() / total.toDouble()).toFloat()
-    val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
-    val strokeColor = if (isInDarkTheme()) FileDark else FileLight
-    Surface(
-      Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
-      color = Color.Transparent,
-      shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
-    ) {
-      Box(Modifier.size(32.dp))
-    }
-  }
-
-  @Composable
-  fun fileIndicator() {
-    Box(
-      Modifier
-        .size(42.dp)
-        .clip(RoundedCornerShape(4.dp))
-        .clickable(onClick = { fileAction() }),
-      contentAlignment = Alignment.Center
-    ) {
-      if (file != null) {
-        when (file.fileStatus) {
-          is CIFileStatus.SndStored ->
-            when (file.fileProtocol) {
-              FileProtocol.XFTP -> progressIndicator()
-              FileProtocol.SMP -> fileIcon()
-            }
-          is CIFileStatus.SndTransfer ->
-            when (file.fileProtocol) {
-              FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
-              FileProtocol.SMP -> progressIndicator()
-            }
-          is CIFileStatus.SndComplete -> fileIcon(innerIcon = painterResource(R.drawable.ic_check_filled))
-          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.RcvInvitation ->
-            if (fileSizeValid())
-              fileIcon(innerIcon = painterResource(R.drawable.ic_arrow_downward), color = MaterialTheme.colors.primary)
-            else
-              fileIcon(innerIcon = painterResource(R.drawable.ic_priority_high), color = WarningOrange)
-          is CIFileStatus.RcvAccepted -> fileIcon(innerIcon = painterResource(R.drawable.ic_more_horiz))
-          is CIFileStatus.RcvTransfer ->
-            if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
-              progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
-            } else {
-              progressIndicator()
-            }
-          is CIFileStatus.RcvComplete -> fileIcon()
-          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-        }
-      } else {
-        fileIcon()
-      }
-    }
-  }
-
-  Row(
-    Modifier.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
-    verticalAlignment = Alignment.Bottom,
-    horizontalArrangement = Arrangement.spacedBy(2.dp)
-  ) {
-    fileIndicator()
-    val metaReserve = if (edited)
-      "                     "
-    else
-      "                 "
-    if (file != null) {
-      Column {
-        Text(
-          file.fileName,
-          maxLines = 1
-        )
-        Text(
-          formatBytes(file.fileSize) + metaReserve,
-          color = MaterialTheme.colors.secondary,
-          fontSize = 14.sp,
-          maxLines = 1
-        )
-      }
-    } else {
-      Text(metaReserve)
-    }
-  }
-}
-
-class ChatItemProvider: PreviewParameterProvider<ChatItem> {
-  private val sentFile = ChatItem(
-    chatDir = CIDirection.DirectSnd(),
-    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.SndSent(), itemEdited = true),
-    content = CIContent.SndMsgContent(msgContent = MsgContent.MCFile("")),
-    quotedItem = null,
-    file = CIFile.getSample(fileStatus = CIFileStatus.SndComplete)
-  )
-  private val fileChatItemWtFile = ChatItem(
-    chatDir = CIDirection.DirectRcv(),
-    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), ),
-    content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile("")),
-    quotedItem = null,
-    file = null
-  )
-  override val values = listOf(
-    sentFile,
-    ChatItem.getFileMsgContentSample(),
-    ChatItem.getFileMsgContentSample(fileName = "some_long_file_name_here", fileStatus = CIFileStatus.RcvInvitation),
-    ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvAccepted),
-    ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10)),
-    ChatItem.getFileMsgContentSample(fileStatus = CIFileStatus.RcvCancelled),
-    ChatItem.getFileMsgContentSample(fileSize = 1_000_000_000, fileStatus = CIFileStatus.RcvInvitation),
-    ChatItem.getFileMsgContentSample(text = "Hello there", fileStatus = CIFileStatus.RcvInvitation),
-    ChatItem.getFileMsgContentSample(text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus = CIFileStatus.RcvInvitation),
-    fileChatItemWtFile
-  ).asSequence()
-}
-
-@Preview
-@Composable
-fun PreviewCIFileFramedItemView(@PreviewParameter(ChatItemProvider::class) chatItem: ChatItem) {
-  val showMenu = remember { mutableStateOf(false) }
-  SimpleXTheme {
-    FramedItemView(ChatInfo.Direct.sampleData, chatItem, linkMode = SimplexLinkMode.DESCRIPTION, showMenu = showMenu, receiveFile = {})
-  }
-}

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

@@ -1,165 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-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.*
-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 CIGroupInvitationView(
-  ci: ChatItem,
-  groupInvitation: CIGroupInvitation,
-  memberRole: GroupMemberRole,
-  chatIncognito: Boolean = false,
-  joinGroup: (Long) -> Unit
-) {
-  val sent = ci.chatDir.sent
-  val action = !sent && groupInvitation.status == CIGroupInvitationStatus.Pending
-
-  @Composable
-  fun groupInfoView() {
-    val p = groupInvitation.groupProfile
-    val iconColor =
-      if (action) if (chatIncognito) Indigo else MaterialTheme.colors.primary
-      else if (isInDarkTheme()) FileDark else FileLight
-
-    Row(
-      Modifier
-        .defaultMinSize(minWidth = 220.dp)
-        .padding(vertical = 4.dp)
-        .padding(end = 2.dp)
-    ) {
-      ProfileImage(size = 60.dp, image = groupInvitation.groupProfile.image, icon = R.drawable.ic_supervised_user_circle_filled, color = iconColor)
-      Spacer(Modifier.padding(horizontal = 3.dp))
-      Column(
-        Modifier.defaultMinSize(minHeight = 60.dp),
-        verticalArrangement = Arrangement.Center
-      ) {
-        Text(p.displayName, style = MaterialTheme.typography.caption, fontWeight = FontWeight.Medium, maxLines = 2, overflow = TextOverflow.Ellipsis)
-        if (p.fullName != "" && p.displayName != p.fullName) {
-          Text(p.fullName, maxLines = 2, overflow = TextOverflow.Ellipsis)
-        }
-      }
-    }
-  }
-
-  @Composable
-  fun groupInvitationText() {
-    when {
-      sent -> Text(stringResource(R.string.you_sent_group_invitation))
-      !sent && groupInvitation.status == CIGroupInvitationStatus.Pending -> Text(stringResource(R.string.you_are_invited_to_group))
-      !sent && groupInvitation.status == CIGroupInvitationStatus.Accepted -> Text(stringResource(R.string.you_joined_this_group))
-      !sent && groupInvitation.status == CIGroupInvitationStatus.Rejected -> Text(stringResource(R.string.you_rejected_group_invitation))
-      !sent && groupInvitation.status == CIGroupInvitationStatus.Expired -> Text(stringResource(R.string.group_invitation_expired))
-    }
-  }
-
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
-  Surface(
-    modifier = if (action) Modifier.clickable(onClick = {
-      joinGroup(groupInvitation.groupId)
-    }) else Modifier,
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
-  ) {
-    Box(
-      Modifier
-        .width(IntrinsicSize.Min)
-        .padding(vertical = 3.dp)
-        .padding(start = 8.dp, end = 12.dp),
-      contentAlignment = Alignment.BottomEnd
-    ) {
-      Column(
-        Modifier
-          .defaultMinSize(minWidth = 220.dp)
-          .padding(bottom = 4.dp),
-      ) {
-        groupInfoView()
-        Column(Modifier.padding(top = 2.dp, start = 5.dp)) {
-          Divider(Modifier.fillMaxWidth().padding(bottom = 4.dp))
-          if (action) {
-            groupInvitationText()
-            Text(stringResource(
-              if (chatIncognito) R.string.group_invitation_tap_to_join_incognito else  R.string.group_invitation_tap_to_join),
-              color = if (chatIncognito) Indigo else MaterialTheme.colors.primary)
-          } else {
-            Box(Modifier.padding(end = 48.dp)) {
-              groupInvitationText()
-            }
-          }
-        }
-      }
-      Text(
-        ci.timestampText,
-        color = MaterialTheme.colors.secondary,
-        fontSize = 14.sp,
-        modifier = Modifier.padding(start = 3.dp)
-      )
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PendingCIGroupInvitationViewPreview() {
-  SimpleXTheme {
-    CIGroupInvitationView(
-      ci = ChatItem.getGroupInvitationSample(),
-      groupInvitation = CIGroupInvitation.getSample(),
-      memberRole = GroupMemberRole.Admin,
-      joinGroup = {}
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun CIGroupInvitationViewAcceptedPreview() {
-  SimpleXTheme {
-    CIGroupInvitationView(
-      ci = ChatItem.getGroupInvitationSample(),
-      groupInvitation = CIGroupInvitation.getSample(status = CIGroupInvitationStatus.Accepted),
-      memberRole = GroupMemberRole.Admin,
-      joinGroup = {}
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun CIGroupInvitationViewLongNamePreview() {
-  SimpleXTheme {
-    CIGroupInvitationView(
-      ci = ChatItem.getGroupInvitationSample(),
-      groupInvitation = CIGroupInvitation.getSample(
-        groupProfile = GroupProfile("group_with_a_really_really_really_long_name", "Group With A Really Really Really Long Name"),
-        status = CIGroupInvitationStatus.Accepted
-      ),
-      memberRole = GroupMemberRole.Admin,
-      joinGroup = {}
-    )
-  }
-}

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

@@ -1,215 +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.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.layout.ContentScale
-import androidx.compose.ui.layout.layoutId
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-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: Painter, @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(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_image_snd_complete)
-          is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_asked_to_receive)
-          is CIFileStatus.RcvAccepted -> fileIcon(painterResource(R.drawable.ic_more_horiz), R.string.icon_descr_waiting_for_image)
-          is CIFileStatus.RcvTransfer -> progressIndicator()
-          is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_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,45 +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.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-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(painterResource(R.drawable.ic_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/CIMetaView.kt

@@ -1,188 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
-import chat.simplex.app.R
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.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.model.*
-import chat.simplex.app.ui.theme.CurrentColors
-import kotlinx.datetime.Clock
-
-@Composable
-fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = MaterialTheme.colors.secondary) {
-  Row(Modifier.padding(start = 3.dp), verticalAlignment = Alignment.CenterVertically) {
-    if (chatItem.isDeletedContent) {
-      Text(
-        chatItem.timestampText,
-        color = metaColor,
-        fontSize = 14.sp,
-        modifier = Modifier.padding(start = 3.dp)
-      )
-    } else {
-      CIMetaText(chatItem.meta, timedMessagesTTL, metaColor)
-    }
-  }
-}
-
-@Composable
-// changing this function requires updating reserveSpaceForMeta
-private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
-  if (meta.itemEdited) {
-    StatusIconText(painterResource(R.drawable.ic_edit), color)
-    Spacer(Modifier.width(3.dp))
-  }
-  if (meta.disappearing) {
-    StatusIconText(painterResource(R.drawable.ic_timer), color)
-    val ttl = meta.itemTimed?.ttl
-    if (ttl != chatTTL) {
-      Text(TimedMessagesPreference.shortTtlText(ttl), color = color, fontSize = 13.sp)
-    }
-    Spacer(Modifier.width(4.dp))
-  }
-  val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color)
-  if (statusIcon != null) {
-    val (icon, statusColor) = statusIcon
-    StatusIconText(painterResource(icon), statusColor)
-    Spacer(Modifier.width(4.dp))
-  } else if (!meta.disappearing) {
-    StatusIconText(painterResource(R.drawable.ic_circle_filled), Color.Transparent)
-    Spacer(Modifier.width(4.dp))
-  }
-  Text(meta.timestampText, color = color, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
-}
-
-// the conditions in this function should match CIMetaText
-fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?): String {
-  val iconSpace = "    "
-  var res = ""
-  if (meta.itemEdited) res += iconSpace
-  if (meta.itemTimed != null) {
-    res += iconSpace
-    val ttl = meta.itemTimed.ttl
-    if (ttl != chatTTL) {
-      res += TimedMessagesPreference.shortTtlText(ttl)
-    }
-  }
-  if (meta.statusIcon(CurrentColors.value.colors.secondary) != null || !meta.disappearing) {
-    res += iconSpace
-  }
-  return res + meta.timestampText
-}
-
-@Composable
-private fun StatusIconText(icon: Painter, color: Color) {
-  Icon(icon, null, Modifier.height(12.dp), tint = color)
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaView() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewUnread() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.RcvNew()
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendFailed() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.SndError("CMD SYNTAX")
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendNoAuth() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndErrorAuth()
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewSendSent() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndSent()
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEdited() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      itemEdited = true
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEditedUnread() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectRcv(), Clock.System.now(), "hello",
-      itemEdited = true,
-      status=CIStatus.RcvNew()
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEditedSent() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      itemEdited = true,
-      status=CIStatus.SndSent()
-    ),
-    null
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewDeletedContent() {
-  CIMetaView(
-    chatItem = ChatItem.getDeletedContentSampleData(),
-    null
-  )
-}

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

@@ -1,338 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.graphics.Bitmap
-import android.graphics.Rect
-import android.net.Uri
-import androidx.annotation.StringRes
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.*
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.FileProvider
-import androidx.core.graphics.drawable.toDrawable
-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 com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
-import com.google.android.exoplayer2.ui.StyledPlayerView
-import java.io.File
-
-@Composable
-fun CIVideoView(
-  image: String,
-  duration: Int,
-  file: CIFile?,
-  imageProvider: () -> ImageGalleryProvider,
-  showMenu: MutableState<Boolean>,
-  receiveFile: (Long) -> Unit
-) {
-  Box(
-    Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID),
-    contentAlignment = Alignment.TopEnd
-  ) {
-    val context = LocalContext.current
-    val filePath = remember(file) { getLoadedFilePath(SimplexApp.context, file) }
-    val preview = remember(image) { base64ToBitmap(image) }
-    if (file != null && filePath != null) {
-      val uri = remember(filePath) { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))  }
-      val view = LocalView.current
-      VideoView(uri, file, preview, duration * 1000L, showMenu, onClick = {
-        hideKeyboard(view)
-        ModalManager.shared.showCustomModal(animated = false) { close ->
-          ImageFullScreenView(imageProvider, close)
-        }
-      })
-    } else {
-      Box {
-        ImageView(preview, showMenu, onClick = {
-          if (file != null) {
-            when (file.fileStatus) {
-              CIFileStatus.RcvInvitation ->
-                receiveFileIfValidSize(file, receiveFile)
-              CIFileStatus.RcvAccepted ->
-                when (file.fileProtocol) {
-                  FileProtocol.XFTP ->
-                    AlertManager.shared.showAlertMsg(
-                      generalGetString(R.string.waiting_for_video),
-                      generalGetString(R.string.video_will_be_received_when_contact_completes_uploading)
-                    )
-
-                  FileProtocol.SMP ->
-                    AlertManager.shared.showAlertMsg(
-                      generalGetString(R.string.waiting_for_video),
-                      generalGetString(R.string.video_will_be_received_when_contact_is_online)
-                    )
-                }
-              CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
-              CIFileStatus.RcvComplete -> {} // ?
-              CIFileStatus.RcvCancelled -> {} // TODO
-              else -> {}
-            }
-          }
-        })
-        if (file != null) {
-          DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
-        }
-        if (file?.fileStatus is CIFileStatus.RcvInvitation) {
-          PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, receiveFile) }
-        }
-      }
-    }
-    loadingIndicator(file)
-  }
-}
-
-@Composable
-private fun VideoView(uri: Uri, file: CIFile, defaultPreview: Bitmap, defaultDuration: Long, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
-  val context = LocalContext.current
-  val player = remember(uri) { VideoPlayer.getOrCreate(uri, false, defaultPreview, defaultDuration, true, context) }
-  val videoPlaying = remember(uri.path) { player.videoPlaying }
-  val progress = remember(uri.path) { player.progress }
-  val duration = remember(uri.path) { player.duration }
-  val preview by remember { player.preview }
-//  val soundEnabled by rememberSaveable(uri.path) { player.soundEnabled }
-  val brokenVideo by rememberSaveable(uri.path) { player.brokenVideo }
-  val play = {
-    player.enableSound(true)
-    player.play(true)
-  }
-  val stop = {
-    player.enableSound(false)
-    player.stop()
-  }
-  val showPreview = remember { derivedStateOf { !videoPlaying.value || progress.value == 0L } }
-  DisposableEffect(Unit) {
-    onDispose {
-      stop()
-    }
-  }
-  Box {
-    val windowWidth = LocalWindowWidth()
-    val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
-    AndroidView(
-      factory = { ctx ->
-        StyledPlayerView(ctx).apply {
-          useController = false
-          resizeMode = RESIZE_MODE_FIXED_WIDTH
-          this.player = player.player
-        }
-      },
-      Modifier
-        .width(width)
-        .combinedClickable(
-          onLongClick = { showMenu.value = true },
-          onClick = { if (player.player.playWhenReady) stop() else onClick() }
-        )
-    )
-    if (showPreview.value) {
-      ImageView(preview, showMenu, onClick)
-      PlayButton(brokenVideo, onLongClick =  { showMenu.value = true }, play)
-    }
-    DurationProgress(file, videoPlaying, duration, progress/*, soundEnabled*/)
-  }
-}
-
-@Composable
-private fun BoxScope.PlayButton(error: Boolean = false, onLongClick: () -> Unit, onClick: () -> Unit) {
-  Surface(
-    Modifier.align(Alignment.Center),
-    color = Color.Black.copy(alpha = 0.25f),
-    shape = RoundedCornerShape(percent = 50)
-  ) {
-    Box(
-      Modifier
-        .defaultMinSize(minWidth = 40.dp, minHeight = 40.dp)
-        .combinedClickable(onClick = onClick, onLongClick = onLongClick),
-      contentAlignment = Alignment.Center
-    ) {
-      Icon(
-        painterResource(R.drawable.ic_play_arrow_filled),
-        contentDescription = null,
-        tint = if (error) WarningOrange else Color.White
-      )
-    }
-  }
-}
-
-@Composable
-private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, duration: MutableState<Long>, progress: MutableState<Long>/*, soundEnabled: MutableState<Boolean>*/) {
-  if (duration.value > 0L || progress.value > 0) {
-    Row {
-      Box(
-        Modifier
-          .padding(DEFAULT_PADDING_HALF)
-          .background(Color.Black.copy(alpha = 0.35f), RoundedCornerShape(percent = 50))
-          .padding(vertical = 2.dp, horizontal = 4.dp)
-      ) {
-        val time = if (progress.value > 0) progress.value else duration.value
-        val timeStr = durationText((time / 1000).toInt())
-        val width = if (timeStr.length <= 5) 44 else 50
-        Text(
-          timeStr,
-          Modifier.widthIn(min = with(LocalDensity.current) { width.sp.toDp() }).padding(horizontal = 4.dp),
-          fontSize = 13.sp,
-          color = Color.White
-        )
-        /*if (!soundEnabled.value) {
-        Icon(painterResource(R.drawable.ic_volume_off_filled), null,
-          Modifier.padding(start = 5.dp).size(10.dp),
-          tint = Color.White
-        )
-      }*/
-      }
-      if (!playing.value) {
-        Box(
-          Modifier
-            .padding(top = DEFAULT_PADDING_HALF)
-            .background(Color.Black.copy(alpha = 0.35f), RoundedCornerShape(percent = 50))
-            .padding(vertical = 2.dp, horizontal = 4.dp)
-        ) {
-          Text(
-            formatBytes(file.fileSize),
-            Modifier.padding(horizontal = 4.dp),
-            fontSize = 13.sp,
-            color = Color.White
-          )
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun ImageView(preview: Bitmap, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
-  val windowWidth = LocalWindowWidth()
-  val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
-  Image(
-    preview.asImageBitmap(),
-    contentDescription = stringResource(R.string.video_descr),
-    modifier = Modifier
-      .width(width)
-      .combinedClickable(
-        onLongClick = { showMenu.value = true },
-        onClick = onClick
-      ),
-    contentScale = ContentScale.FillWidth,
-  )
-}
-
-@Composable
-private fun LocalWindowWidth(): Dp {
-  val view = LocalView.current
-  val density = LocalDensity.current.density
-  return remember {
-    val rect = Rect()
-    view.getWindowVisibleDisplayFrame(rect)
-    (rect.width() / density).dp
-  }
-}
-
-@Composable
-private fun progressIndicator() {
-  CircularProgressIndicator(
-    Modifier.size(16.dp),
-    color = Color.White,
-    strokeWidth = 2.dp
-  )
-}
-
-@Composable
-private fun fileIcon(icon: Painter, @StringRes stringId: Int) {
-  Icon(
-    icon,
-    stringResource(stringId),
-    Modifier.fillMaxSize(),
-    tint = Color.White
-  )
-}
-
-@Composable
-private fun progressCircle(progress: Long, total: Long) {
-  val angle = 360f * (progress.toDouble() / total.toDouble()).toFloat()
-  val strokeWidth = with(LocalDensity.current) { 2.dp.toPx() }
-  val strokeColor = Color.White
-  Surface(
-    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
-    color = Color.Transparent,
-    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
-  ) {
-    Box(Modifier.size(16.dp))
-  }
-}
-
-@Composable
-private fun loadingIndicator(file: CIFile?) {
-  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 ->
-          when (file.fileProtocol) {
-            FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
-            FileProtocol.SMP -> progressIndicator()
-          }
-        is CIFileStatus.SndComplete -> fileIcon(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_video_snd_complete)
-        is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_video_asked_to_receive)
-        is CIFileStatus.RcvAccepted -> fileIcon(painterResource(R.drawable.ic_more_horiz), R.string.icon_descr_waiting_for_video)
-        is CIFileStatus.RcvTransfer ->
-          if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
-            progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
-          } else {
-            progressIndicator()
-          }
-        is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        else -> {}
-      }
-    }
-  }
-}
-
-private fun fileSizeValid(file: CIFile?): Boolean {
-  if (file != null) {
-    return file.fileSize <= getMaxFileSize(file.fileProtocol)
-  }
-  return false
-}
-
-private fun receiveFileIfValidSize(file: CIFile, receiveFile: (Long) -> Unit) {
-  if (fileSizeValid(file)) {
-    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)))
-    )
-  }
-}
-
-private fun videoViewFullWidth(windowWidth: Dp): Dp {
-  val approximatePadding = 100.dp
-  return minOf(1000.dp, windowWidth - approximatePadding)
-}

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

@@ -1,262 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-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.draw.clip
-import androidx.compose.ui.draw.drawWithCache
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-// TODO refactor https://github.com/simplex-chat/simplex-chat/pull/1451#discussion_r1033429901
-
-@Composable
-fun CIVoiceView(
-  providedDurationSec: Int,
-  file: CIFile?,
-  edited: Boolean,
-  sent: Boolean,
-  hasText: Boolean,
-  ci: ChatItem,
-  timedMessagesTTL: Int?,
-  longClick: () -> Unit,
-) {
-  Row(
-    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = 6.dp, end = 6.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    if (file != null) {
-      val context = LocalContext.current
-      val filePath = remember(file.filePath, file.fileStatus) { getLoadedFilePath(context, file) }
-      var brokenAudio by rememberSaveable(file.filePath) { mutableStateOf(false) }
-      val audioPlaying = rememberSaveable(file.filePath) { mutableStateOf(false) }
-      val progress = rememberSaveable(file.filePath) { mutableStateOf(0) }
-      val duration = rememberSaveable(file.filePath) { mutableStateOf(providedDurationSec * 1000) }
-      val play = {
-        AudioPlayer.play(filePath, audioPlaying, progress, duration, true)
-        brokenAudio = !audioPlaying.value
-      }
-      val pause = {
-        AudioPlayer.pause(audioPlaying, progress)
-      }
-      val text = remember {
-        derivedStateOf {
-          val time = when {
-            audioPlaying.value || progress.value != 0 -> progress.value
-            else -> duration.value
-          }
-          durationText(time / 1000)
-        }
-      }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick)
-    } else {
-      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick)
-      val metaReserve = if (edited)
-        "                     "
-      else
-        "                 "
-      Text(metaReserve)
-    }
-  }
-}
-
-@Composable
-private fun VoiceLayout(
-  file: CIFile,
-  ci: ChatItem,
-  text: State<String>,
-  audioPlaying: State<Boolean>,
-  progress: State<Int>,
-  duration: State<Int>,
-  brokenAudio: Boolean,
-  sent: Boolean,
-  hasText: Boolean,
-  timedMessagesTTL: Int?,
-  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
-) {
-  when {
-    hasText -> {
-      Spacer(Modifier.width(6.dp))
-      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-      DurationText(text, PaddingValues(start = 12.dp))
-    }
-    sent -> {
-      Row {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          Spacer(Modifier.height(56.dp))
-          DurationText(text, PaddingValues(end = 12.dp))
-        }
-        Column {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
-            CIMetaView(ci, timedMessagesTTL)
-          }
-        }
-      }
-    }
-    else -> {
-      Row {
-        Column {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
-            CIMetaView(ci, timedMessagesTTL)
-          }
-        }
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          DurationText(text, PaddingValues(start = 12.dp))
-          Spacer(Modifier.height(56.dp))
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun DurationText(text: State<String>, padding: PaddingValues) {
-  val minWidth = with(LocalDensity.current) { 45.sp.toDp() }
-  Text(
-    text.value,
-    Modifier
-      .padding(padding)
-      .widthIn(min = minWidth),
-    color = MaterialTheme.colors.secondary,
-    fontSize = 16.sp,
-    maxLines = 1
-  )
-}
-
-@Composable
-private fun PlayPauseButton(
-  audioPlaying: Boolean,
-  sent: Boolean,
-  angle: Float,
-  strokeWidth: Float,
-  strokeColor: Color,
-  enabled: Boolean,
-  error: Boolean,
-  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
-) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
-  Surface(
-    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
-    color = if (sent) sentColor else receivedColor,
-    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
-  ) {
-    Box(
-      Modifier
-        .defaultMinSize(minWidth = 56.dp, minHeight = 56.dp)
-        .combinedClickable(
-          onClick = { if (!audioPlaying) play() else pause() },
-          onLongClick = longClick
-        ),
-      contentAlignment = Alignment.Center
-    ) {
-      Icon(
-        if (audioPlaying) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-        contentDescription = null,
-        Modifier.size(36.dp),
-        tint = if (error) WarningOrange else if (!enabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-      )
-    }
-  }
-}
-
-@Composable
-private fun VoiceMsgIndicator(
-  file: CIFile?,
-  audioPlaying: Boolean,
-  sent: Boolean,
-  hasText: Boolean,
-  progress: State<Int>?,
-  duration: State<Int>?,
-  error: Boolean,
-  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
-) {
-  val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
-  val strokeColor = MaterialTheme.colors.primary
-  if (file != null && file.loaded && progress != null && duration != null) {
-    val angle = 360f * (progress.value.toDouble() / duration.value).toFloat()
-    if (hasText) {
-      IconButton({ if (!audioPlaying) play() else pause() }, Modifier.size(56.dp).drawRingModifier(angle, strokeColor, strokeWidth)) {
-        Icon(
-          if (audioPlaying) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-          contentDescription = null,
-          Modifier.size(36.dp),
-          tint = MaterialTheme.colors.primary
-        )
-      }
-    } else {
-      PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause, longClick = longClick)
-    }
-  } else {
-    if (file?.fileStatus is CIFileStatus.RcvInvitation
-      || file?.fileStatus is CIFileStatus.RcvTransfer
-      || file?.fileStatus is CIFileStatus.RcvAccepted
-    ) {
-      Box(
-        Modifier
-          .size(56.dp)
-          .clip(RoundedCornerShape(4.dp)),
-        contentAlignment = Alignment.Center
-      ) {
-        ProgressIndicator()
-      }
-    } else {
-      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, false, false, {}, {}, longClick)
-    }
-  }
-}
-
-fun Modifier.drawRingModifier(angle: Float, color: Color, strokeWidth: Float) = drawWithCache {
-  val brush = Brush.linearGradient(
-    0f to Color.Transparent,
-    0f to color,
-    start = Offset(0f, 0f),
-    end = Offset(strokeWidth, strokeWidth),
-    tileMode = TileMode.Clamp
-  )
-  onDrawWithContent {
-    drawContent()
-    drawArc(
-      brush = brush,
-      startAngle = -90f,
-      sweepAngle = angle,
-      useCenter = false,
-      topLeft = Offset(strokeWidth / 2, strokeWidth / 2),
-      size = Size(size.width - strokeWidth, size.height - strokeWidth),
-      style = Stroke(width = strokeWidth, cap = StrokeCap.Square)
-    )
-  }
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier.size(32.dp),
-    color = if (isInDarkTheme()) FileDark else FileLight,
-    strokeWidth = 4.dp
-  )
-}

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

@@ -1,457 +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.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.painter.Painter
-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.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), painterResource(R.drawable.ic_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), painterResource(R.drawable.ic_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), painterResource(R.drawable.ic_content_copy), 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), painterResource(R.drawable.ic_download), 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), painterResource(R.drawable.ic_edit_filled), onClick = {
-              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-              showMenu.value = false
-            })
-          }
-          if (cItem.meta.itemDeleted != null && revealed.value) {
-            ItemAction(
-              stringResource(R.string.hide_verb),
-              painterResource(R.drawable.ic_visibility_off),
-              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),
-              painterResource(R.drawable.ic_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, MaterialTheme.colors.secondary, 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),
-    painterResource(R.drawable.ic_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),
-    painterResource(R.drawable.ic_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),
-    painterResource(R.drawable.ic_flag),
-    onClick = {
-      showMenu.value = false
-      moderateMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
-    },
-    color = Color.Red
-  )
-}
-
-@Composable
-fun ItemAction(text: String, icon: Painter, 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)
-    }
-  }
-}
-
-@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), color = MaterialTheme.colors.error) }
-        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), color = MaterialTheme.colors.error) }
-        }
-      }
-    }
-  )
-}
-
-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/chat/item/DeletedItemView.kt

@@ -1,58 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
-
-@Composable
-fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  val sent = ci.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.Bottom
-    ) {
-      Text(
-        buildAnnotatedString {
-          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(ci.content.text) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci, timedMessagesTTL)
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewDeletedItemView() {
-  SimpleXTheme {
-    DeletedItemView(
-      ChatItem.getDeletedContentSampleData(),
-      null
-    )
-  }
-}

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

@@ -1,49 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.text.TextStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-
-val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp)
-val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp)
-
-@Composable
-fun EmojiItemView(chatItem: ChatItem, timedMessagesTTL: Int?) {
-  Column(
-    Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    EmojiText(chatItem.content.text)
-    CIMetaView(chatItem, timedMessagesTTL)
-  }
-}
-
-@Composable
-fun EmojiText(text: String) {
-  val s = text.trim()
-  Text(s, style = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont)
-}
-
-// https://stackoverflow.com/a/46279500
-private const val emojiStr = "^(" +
-    "(?:[\\u2700-\\u27bf]|" +
-    "(?:[\\ud83c\\udde6-\\ud83c\\uddff]){2}|" +
-    "[\\ud800\\udc00-\\uDBFF\\uDFFF]|[\\u2600-\\u26FF])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]|[\\ud83c\\udffb-\\ud83c\\udfff])?" +
-    "(?:\\u200d(?:[^\\ud800-\\udfff]|" +
-    "(?:[\\ud83c\\udde6-\\ud83c\\uddff]){2}|" +
-    "[\\ud800\\udc00-\\uDBFF\\uDFFF]|[\\u2600-\\u26FF])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe23\\u20d0-\\u20f0]|[\\ud83c\\udffb-\\ud83c\\udfff])?)*|" +
-    "[\\u0023-\\u0039]\\ufe0f?\\u20e3|\\u3299|\\u3297|\\u303d|\\u3030|\\u24c2|[\\ud83c\\udd70-\\ud83c\\udd71]|[\\ud83c\\udd7e-\\ud83c\\udd7f]|\\ud83c\\udd8e|[\\ud83c\\udd91-\\ud83c\\udd9a]|[\\ud83c\\udde6-\\ud83c\\uddff]|[\\ud83c\\ude01-\\ud83c\\ude02]|\\ud83c\\ude1a|\\ud83c\\ude2f|[\\ud83c\\ude32-\\ud83c\\ude3a]|[\\ud83c\\ude50-\\ud83c\\ude51]|\\u203c|\\u2049|[\\u25aa-\\u25ab]|\\u25b6|\\u25c0|[\\u25fb-\\u25fe]|\\u00a9|\\u00ae|\\u2122|\\u2139|\\ud83c\\udc04|[\\u2600-\\u26FF]|\\u2b05|\\u2b06|\\u2b07|\\u2b1b|\\u2b1c|\\u2b50|\\u2b55|\\u231a|\\u231b|\\u2328|\\u23cf|[\\u23e9-\\u23f3]|[\\u23f8-\\u23fa]|\\ud83c\\udccf|\\u2934|\\u2935|[\\u2190-\\u21ff]" +
-    ")+$" // Multiple matches with emojis where one follows another without interruptions from other characters
-private val emojiRegex = Regex(emojiStr)
-
-fun isShortEmoji(str: String): Boolean {
-  val s = str.trim()
-  return s.codePoints().count() in 1..5 && emojiRegex.matches(str)
-}

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

@@ -1,218 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import android.view.View
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-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.graphics.*
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.input.pointer.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.view.isVisible
-import chat.simplex.app.R
-import chat.simplex.app.views.chat.ProviderMedia
-import chat.simplex.app.views.helpers.*
-import coil.ImageLoader
-import coil.compose.rememberAsyncImagePainter
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.request.ImageRequest
-import coil.size.Size
-import com.google.accompanist.pager.*
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.StyledPlayerView
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch
-import kotlin.math.absoluteValue
-
-interface ImageGalleryProvider {
-  val initialIndex: Int
-  val totalMediaSize: MutableState<Int>
-  fun getMedia(index: Int): ProviderMedia?
-  fun currentPageChanged(index: Int)
-  fun scrollToStart()
-  fun onDismiss(index: Int)
-}
-
-@OptIn(ExperimentalPagerApi::class)
-@Composable
-fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () -> Unit) {
-  val provider = remember { imageProvider() }
-  val pagerState = rememberPagerState(provider.initialIndex)
-  val goBack = { provider.onDismiss(pagerState.currentPage); close() }
-  BackHandler(onBack = goBack)
-  // Pager doesn't ask previous page at initialization step who knows why. By not doing this, prev page is not checked and can be blank,
-  // which makes this blank page visible for a moment. Prevent it by doing the check ourselves
-  LaunchedEffect(Unit) {
-    if (provider.getMedia(provider.initialIndex - 1) == null) {
-      provider.scrollToStart()
-      pagerState.scrollToPage(0)
-    }
-  }
-  val scope = rememberCoroutineScope()
-  val playersToRelease = rememberSaveable { mutableSetOf<Uri>() }
-  DisposableEffectOnGone(
-    whenGone = { playersToRelease.forEach { VideoPlayer.release(it, true, true) } }
-  )
-  HorizontalPager(count = remember { provider.totalMediaSize }.value, state = pagerState) { index ->
-    Column(
-      Modifier
-        .fillMaxSize()
-        .background(Color.Black)
-        .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = goBack)
-    ) {
-      var settledCurrentPage by remember { mutableStateOf(pagerState.currentPage) }
-      LaunchedEffect(pagerState) {
-        snapshotFlow {
-          if (!pagerState.isScrollInProgress) pagerState.currentPage else settledCurrentPage
-        }.collect {
-          settledCurrentPage = it
-        }
-      }
-      LaunchedEffect(settledCurrentPage) {
-        // Make this pager with infinity scrolling with only 3 pages at a time when left and right pages constructs in real time
-        if (settledCurrentPage != provider.initialIndex)
-          provider.currentPageChanged(index)
-      }
-      val media = provider.getMedia(index)
-      if (media == null) {
-        // No such image. Let's shrink total pages size or scroll to start of the list of pages to remove blank page automatically
-        SideEffect {
-          scope.launch {
-            when (settledCurrentPage) {
-              index - 1 -> provider.totalMediaSize.value = settledCurrentPage + 1
-              index + 1 -> {
-                provider.scrollToStart()
-                pagerState.scrollToPage(0)
-              }
-            }
-          }
-        }
-      } else {
-        var scale by remember { mutableStateOf(1f) }
-        var translationX by remember { mutableStateOf(0f) }
-        var translationY by remember { mutableStateOf(0f) }
-        var viewWidth by remember { mutableStateOf(0) }
-        var allowTranslate by remember { mutableStateOf(true) }
-        LaunchedEffect(settledCurrentPage) {
-          scale = 1f
-          translationX = 0f
-          translationY = 0f
-        }
-        val modifier = Modifier
-          .onGloballyPositioned {
-            viewWidth = it.size.width
-          }
-          .graphicsLayer(
-            scaleX = scale,
-            scaleY = scale,
-            translationX = translationX,
-            translationY = translationY,
-          )
-          .pointerInput(Unit) {
-            detectTransformGestures(
-              { allowTranslate },
-              onGesture = { _, pan, gestureZoom, _ ->
-                scale = (scale * gestureZoom).coerceIn(1f, 20f)
-                allowTranslate = viewWidth * (scale - 1f) - ((translationX + pan.x * scale).absoluteValue * 2) > 0
-                if (scale > 1 && allowTranslate) {
-                  translationX += pan.x * scale
-                  translationY += pan.y * scale
-                } else if (allowTranslate) {
-                  translationX = 0f
-                  translationY = 0f
-                }
-              }
-            )
-          }
-          .fillMaxSize()
-        if (media is ProviderMedia.Image) {
-          val (uri: Uri, imageBitmap: Bitmap) = media
-          // I'm making a new instance of imageLoader here because if I use one instance in multiple places
-          // after end of composition here a GIF from the first instance will be paused automatically which isn't what I want
-          val imageLoader = ImageLoader.Builder(LocalContext.current)
-            .components {
-              if (Build.VERSION.SDK_INT >= 28) {
-                add(ImageDecoderDecoder.Factory())
-              } else {
-                add(GifDecoder.Factory())
-              }
-            }
-            .build()
-          Image(
-            rememberAsyncImagePainter(
-              ImageRequest.Builder(LocalContext.current).data(data = uri).size(Size.ORIGINAL).build(),
-              placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
-              imageLoader = imageLoader
-            ),
-            contentDescription = stringResource(R.string.image_descr),
-            contentScale = ContentScale.Fit,
-            modifier = modifier,
-          )
-        } else if (media is ProviderMedia.Video) {
-          val preview = remember(media.uri.path) { base64ToBitmap(media.preview) }
-          VideoView(modifier, media.uri, preview, index == settledCurrentPage)
-          DisposableEffect(Unit) {
-            onDispose { playersToRelease.add(media.uri) }
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun VideoView(modifier: Modifier, uri: Uri, defaultPreview: Bitmap, currentPage: Boolean) {
-  val context = LocalContext.current
-  val player = remember(uri) { VideoPlayer.getOrCreate(uri, true, defaultPreview, 0L, true, context) }
-  val isCurrentPage = rememberUpdatedState(currentPage)
-  val play = {
-    player.play(true)
-  }
-  val stop = {
-    player.stop()
-  }
-  LaunchedEffect(Unit) {
-    player.enableSound(true)
-    snapshotFlow { isCurrentPage.value }
-      .distinctUntilChanged()
-      .collect { if (it) play() else stop() }
-  }
-
-  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    AndroidView(
-      factory = { ctx ->
-        StyledPlayerView(ctx).apply {
-          resizeMode = if (ctx.resources.configuration.screenWidthDp > ctx.resources.configuration.screenHeightDp) {
-            AspectRatioFrameLayout.RESIZE_MODE_FIXED_HEIGHT
-          } else {
-            AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
-          }
-          setShowPreviousButton(false)
-          setShowNextButton(false)
-          setShowSubtitleButton(false)
-          setShowVrButton(false)
-          controllerAutoShow = false
-          findViewById<View>(com.google.android.exoplayer2.R.id.exo_controls_background).setBackgroundColor(Color.Black.copy(alpha = 0.3f).toArgb())
-          findViewById<View>(com.google.android.exoplayer2.R.id.exo_settings).isVisible = false
-          this.player = player.player
-        }
-      },
-      modifier
-    )
-  }
-}