Delete README.md

* Create 20220808-simplex-chat-v3.1-chat-groups.md

* Update 20220808-simplex-chat-v3.1-chat-groups.md

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,7 +1,7 @@
 name: Bug
 description: File a bug report/issue
 title: "[Bug]: "
-labels: ["bug", "triage"]
+labels: ["type:bug", "type:triage"]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,7 +1,7 @@
 name: Feature
 description: Suggest your feature
 title: "[Feature]: "
-labels: ["enhancement", "triage"]
+labels: ["type:enhancement", "type:triage"]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/question.yml

@@ -1,7 +1,7 @@
 name: Question
 description: Ask your question
 title: "[Q]: "
-labels: ["question", "triage"]
+labels: ["type:question", "type:triage"]
 body:
 - type: markdown
   attributes:

.github/workflows/build.yml

@@ -8,8 +8,6 @@ on:
       - users
     tags:
       - "v*"
-      - "!*-fdroid"
-      - "!*-armv7a"
   pull_request:
 
 jobs:
@@ -18,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v4
+        uses: mikepenz/release-changelog-builder-action@v1
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -43,7 +41,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build:
-    name: build-${{ matrix.os }}-${{ matrix.ghc }}
+    name: build-${{ matrix.os }}
     if: always()
     needs: prepare-release
     runs-on: ${{ matrix.os }}
@@ -52,59 +50,34 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            ghc: "8.10.7"
-            cache_path: ~/.cabal/store
-          - os: ubuntu-20.04
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
-            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
           - os: ubuntu-22.04
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-22_04-x86-64
-            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
           - os: macos-latest
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-macos-aarch64
-            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
-          - os: macos-13
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
-            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
           - os: windows-latest
-            ghc: "9.6.3"
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
-            desktop_asset_name: simplex-desktop-windows-x86_64.msi
     steps:
-      - name: Configure pagefile (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: al-cheb/configure-pagefile-action@v1.3
-        with:
-          minimum-size: 16GB
-          maximum-size: 16GB
-          disk-root: "C:"
-
       - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v1
         with:
-          ghc-version: ${{ matrix.ghc }}
+          ghc-version: "8.10.7"
-          cabal-version: "3.10.1.0"
+          cabal-version: "latest"
 
-      - name: Restore cached build
+      - name: Cache dependencies
-        id: restore_cache
+        uses: actions/cache@v2
-        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ matrix.cache_path }}
             dist-newstyle
-          key: ${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
+          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
 
       # / Unix
 
@@ -112,36 +85,14 @@ jobs:
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
+          echo "ignore-project: False"                                      >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
+          echo "package direct-sqlcipher"                                   >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
+          echo "    flags: +openssl"                                        >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-13'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> 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 ""                                                              >> 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 AppImage dependencies
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        run: sudo apt install -y desktop-file-utils
 
       - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
@@ -152,195 +103,47 @@ jobs:
           echo "package direct-sqlcipher" >> cabal.project.local
           echo "    flags: +openssl"      >> cabal.project.local
 
-      - name: Unix build CLI
+      - name: Unix build
-        id: unix_cli_build
+        id: unix_build
         if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           cabal build --enable-tests
-          path=$(cabal list-bin simplex-chat)
+          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
-          echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Unix upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_cli_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.unix_cli_build.outputs.bin_hash }}
-
-      - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-          cache: 'gradle'
-
-      - name: Linux build desktop
-        id: linux_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        shell: bash
-        run: |
-          scripts/desktop/build-lib-linux.sh
-          cd apps/multiplatform
-          ./gradlew packageDeb
-          path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb)
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Linux make AppImage
-        id: linux_appimage_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        shell: bash
-        run: |
-          scripts/desktop/make-appimage-linux.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)
-          echo "appimage_path=$path" >> $GITHUB_OUTPUT
-          echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Mac build desktop
-        id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        shell: bash
-        env:
-          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
-          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
-          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
-        run: |
-          scripts/ci/build-desktop-mac.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Linux upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Linux update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_desktop_build.outputs.package_hash }}
-
-      - name: Linux upload AppImage to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
-          asset_name: simplex-desktop-x86_64.AppImage
-          tag: ${{ github.ref }}
-
-      - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_appimage_build.outputs.appimage_hash }}
-
-      - name: Mac upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.mac_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.mac_desktop_build.outputs.package_hash }}
-
-      - name: Cache unix build
-        uses: actions/cache/save@v3
-        if: matrix.os != 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
 
       - name: Unix test
         if: matrix.os != 'windows-latest'
-        timeout-minutes: 40
+        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
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
-
-      - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ucrt64
-          update: true
-          install: >-
-            git
-            perl
-            make
-          pacboy: >-
-            toolchain:p
-            cmake:p
 
+      # * 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: msys2 {0}
+        shell: cmd
         run: |
-          export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
-          scripts/desktop/prepare-openssl-windows.sh
-          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
-          rm cabal.project.local 2>/dev/null || true
-          echo "ignore-project: False" >> cabal.project.local
-          echo "package direct-sqlcipher" >> cabal.project.local
-          echo "    flags: +openssl" >> cabal.project.local
-          echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
-          echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
-
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
-          rm -rf dist-newstyle/src/direct-sq*
+          cabal list-bin simplex-chat > tmp_bin_path
-          path=$(cabal list-bin simplex-chat | tail -n 1)
+          set /p bin_path= < tmp_bin_path
-          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo ::set-output name=bin_path::%bin_path%
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Windows upload CLI binary to release
+      - name: Windows upload binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
@@ -349,55 +152,4 @@ jobs:
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 
-      - name: Windows update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_build.outputs.bin_hash }}
-
-      - name: Windows build desktop
-        id: windows_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        shell: msys2 {0}
-        run: |
-          export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
-          scripts/desktop/build-lib-windows.sh
-          cd apps/multiplatform
-          ./gradlew packageMsi
-          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Windows upload desktop package 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_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Windows update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_desktop_build.outputs.package_hash }}
-
-      - name: Cache windows build
-        uses: actions/cache/save@v3
-        if: matrix.os == 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
-
       # Windows /

.github/workflows/cla.yml

@@ -5,20 +5,14 @@ on:
   pull_request_target:
     types: [opened, closed, synchronize]
 
-permissions:
-  actions: write
-  contents: write
-  pull-requests: write
-  statuses: write
-
 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_target'
+        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.3.0
+        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
@@ -39,4 +33,4 @@ jobs:
           #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
+          #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/web.yml

@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - master
+      - stable
     paths:
       - website/**
       - images/**
       - blog/**
-      - docs/**
       - .github/workflows/web.yml
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [12.x]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

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

Dockerfile

@@ -1,41 +1,32 @@
-ARG TAG=22.04
+FROM ubuntu:focal AS build
 
-FROM ubuntu:${TAG} 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
-### Build stage
-
-# Install curl and git and simplex-chat dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev libssl-dev
-
-# Specify bootstrap Haskell versions
-ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.6.3
-ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0
 
 # Install ghcup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
+RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
-
+    chmod +x /usr/bin/ghcup
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
 
+# Install ghc
+RUN ghcup install ghc 8.10.7
+# Install cabal
+RUN ghcup install cabal
 # Set both as default
-RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
+RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+    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 build exe:simplex-chat
+RUN cabal install
 
-# Strip the binary from debug symbols to reduce size
-RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
-    mv "$bin" ./ && \
-    strip ./simplex-chat
-
-# Copy compiled app from build stage
 FROM scratch AS export-stage
-COPY --from=build /project/simplex-chat /
+COPY --from=build /root/.cabal/bin/simplex-chat /

PRIVACY.md

@@ -1,175 +1,96 @@
----
+# SimpleX Chat Terms & Privacy Policy
-layout: layouts/privacy.html
-permalink: /privacy/index.html
----
 
-# SimpleX Chat Privacy Policy and Conditions of Use
+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.
 
-SimpleX Chat is the first communication network based on a new protocol stack that builds on the same ideas of complete openness and decentralization as email and web, with the focus on providing security and privacy of communications, and without compromising on usability.
+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).
-
-SimpleX Chat communication protocol is the first protocol that has no user profile IDs of any kind, not even random numbers, cryptographic keys or hashes that identify the users. SimpleX Chat apps allow their users to send messages and files via relay server infrastructure. Relay server owners and providers do not have any access to your messages, thanks to double-ratchet end-to-end encryption algorithm (also known as Signal algorithm - do not confuse with Signal protocols or platform) and additional encryption layers, and they also have no access to your profile and contacts - as they do not provide any user accounts.
-
-Double ratchet algorithm has such important properties as [forward secrecy](/docs/GLOSSARY.md#forward-secrecy), sender [repudiation](/docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](/docs/GLOSSARY.md#post-compromise-security)).
-
-If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto: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 uses the best industry practices for security and encryption to provide client and server software for secure [end-to-end encrypted](/docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the relays servers, even if they are modified or compromised, via [man-in-the-middle attack](/docs/GLOSSARY.md#man-in-the-middle-attack), unlike most other communication platforms, services and networks.
+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 software is built on top of SimpleX messaging and application protocols, based on a new message routing protocol allowing to establish private connections without having any kind of addresses or other identifiers assigned to its users - it does not use emails, phone numbers, usernames, identity keys or any other user profile identifiers to pass messages between the user applications.
+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).
 
-SimpleX Chat software is similar in its design approach to email clients and browsers - it allows you to have full control of your data and freely choose the relay server providers, in the same way you choose which website or email provider to use, or use your own relay servers, simply by changing the configuration of the client software. The only current restriction to that is Apple push notifications - at the moment they can only be delivered via the preset servers that we operate, as explained below. We are exploring the solutions to deliver push notifications to iOS devices via other providers or users' own servers.
+### Information you provide
 
-While SimpleX Chat Ltd is not a communication service provider, and provide public preset relays "as is", as experimental, without any guarantees of availability or data retention, we are committed to maintain a high level of availability, reliability and security of these preset relays. We will be adding alternative preset infrastructure providers to the software in the future, and you will continue to be able to use any other providers or your own servers.
+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.
 
-We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.
+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.
 
-SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+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).
 
-### Your information
+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 profiles
+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.
-
-Servers used by SimpleX Chat apps do not create, store or identify user profiles. The profiles you can create in the app are local to your device, and can be removed at any time via the app.
-
-When you create the local profile, no records are created on any of the relay servers, and infrastructure providers, whether SimpleX Chat Ltd or any other, have no access to any part of your 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 your data and the private connections you created with other software users.
-
-You can transfer the profile to another device by creating a backup of the app data and restoring it on the new device, but you cannot use more than one device with the copy of the same profile at the same time - it will disrupt any active conversations on either or both devices, as a security property of end-to-end encryption.
-
-#### Messages and Files
-
-SimpleX relay servers cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](/docs/GLOSSARY.md#key-exchange) happens out-of-band.
-
-Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline, messaging relay servers temporarily store end-to-end encrypted messages – you can configure which relay servers are used to receive the messages from the new contacts, and you can manually change them for the existing contacts too.
-
-You do not have control over which servers are used to send messages to your contacts - they are chosen by them. To send messages your client needs to connect to these servers, therefore the servers chosen by your contacts can observe your IP address. You can use VPN or some overlay network (e.g., Tor) to hide your IP address from the servers chosen by your contacts. In the near future we will add the layer in the messaging protocol that will route sent message via the relays chosen by you as well.
-
-The messages are permanently removed from the used relay servers as soon as they are delivered, as long as these servers used unmodified published code. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
-
-The files are stored on file relay servers for the time configured in the relay servers you use (48 hours for preset file servers).
-
-If a messaging servers are restarted, the encrypted message can be stored in a backup file until it is overwritten by the next restart (usually within 1 week for preset relay servers).
-
-As this software is fully open-source and provided under AGPLv3 license, all infrastructure providers and owners, and the developers of the client and server applications who use the SimpleX Chat source code, are required to publish any changes to this software under the same AGPLv3 license - including any modifications to the provided servers.
-
-In addition to the AGPLv3 license terms, SimpleX Chat Ltd is committed to the software users that the preset relays that we provide via the apps will always be compiled from the [published open-source code](https://github.com/simplex-chat/simplexmq), without any modifications.
-
-#### Connections with other users
-
-When you create a connection with another user, two messaging queues (you can think about them as mailboxes) are created on messaging relay servers (chosen by you and your contact each), that can be the preset servers or the servers that you and your contact configured in the app. SimpleX messaging protocol uses separate queues for direct and response messages, and the apps prefer to create these queues on two different relay servers for increased privacy, in case you have more than one relay server configured in the app, which is the default.
-
-SimpleX relay 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 infrastructure owners and providers to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
-
-#### Connection links privacy
-
-When you create a connection with another user, the app generates a link/QR code that can be shared with the user to establish the connection via any channel (email, any other messenger, or a video call). This link is safe to share via insecure channels, as long as you can identify the recipient and also trust that this channel did not replace this link (to mitigate the latter risk you can validate the security code via the app).
-
-While the connection "links" contain SimpleX Chat Ltd domain name `simplex.chat`, this site is never accessed by the app, and is only used for these purposes:
-- to direct the new users to the app download instructions,
-- to show connection QR code that can be scanned via the app,
-- to "namespace" these links,
-- to open links directly in the installed app when it is clicked outside of the app.
-
-You can always safely replace the initial part of the link `https://simplex.chat/` either with `simplex:/` (which is a URI scheme provisionally registered with IANA) or with any other domain name where you can self-host the app download instructions and show the connection QR code (but in case it is your domain, it will not open in the app). Also, while the page renders QR code, all the information needed to render it is only available to the browser, as the part of the "link" after `#` symbol is not sent to the website server.
-
-#### iOS Push Notifications
-
-When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
-
-Preset notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who sends messages to you. Apple push notifications servers can only observe how many notifications are sent to you, but not from how many contacts, or from which messaging relays, as notifications are delivered to your device end-to-end encrypted by one of the preset notification servers - these notifications only contain end-to-end encrypted metadata, not even encrypted message content, and they look completely random to Apple push notification servers.
-
-You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).
-
-#### Another information stored on the servers
-
-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 design limits this additional technical information to the minimum required to operate the software and servers. To prevent server overloading or attacks, the servers can temporarily store data that can link to particular users or devices, including IP addresses, geographic location, or information related to the transport sessions. This information is not stored for the absolute majority of the app users, even for those who use the servers very actively.
-
-#### SimpleX Directory
-
-[SimpleX Directory](/docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the registered groups. You can connect to SimpleX Directory via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
-
-#### User Support
-
-If you contact SimpleX Chat Ltd, any personal data you 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, and avoid sharing any personal information.
 
 ### Information we may share
 
-SimpleX Chat Ltd operates preset relay servers using third parties. While we do not have access and cannot share any user data, these third parties may access the encrypted user messages (but NOT the actual unencrypted message content or size) as it is stored or transmitted via our servers. Hosting providers can also store IP addresses and other transport information as part of their logs.
+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 a third party for email services - if you ask for support via email, your and SimpleX Chat Ltd email providers may access these emails according to their privacy policies and terms. When the request is sensitive, we recommend contacting us via SimpleX Chat or using encrypted email using PGP key published at [openpgp.org](https://keys.openpgp.org/search?q=chat%40simplex.chat).
+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 Ltd may share the data temporarily stored on the servers:
+The cases when SimpleX Chat may need to share the data we temporarily store on the servers:
 
-- To meet any applicable law, or enforceable governmental request or court order.
+- To meet any applicable law, regulation, legal process or enforceable governmental request.
-- To enforce applicable terms, including investigation of potential violations.
+- 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 software users, SimpleX Chat Ltd, or the public as required or permitted by law.
+- 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 the preset relay servers or any information from the servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process to limit any information shared with the third parties to the minimally required 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.
-
-We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
 
 ### 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 software applications and preset relays infrastructure confirms your acceptance of our updated Privacy Policy.
+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 Conditions of Use of Software and Infrastructure below.
+Please also read our Terms of Service.
 
-If you have questions about our Privacy Policy please contact us via [email](mailto: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).
+If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
 
-## Conditions of Use of Software and Infrastructure
+## Terms of Service
 
-You accept the Conditions of Use of Software and Infrastructure ("Conditions") by installing or using any of our software or using any of our server infrastructure (collectively referred to as "Applications"), whether preset in the software or not.
+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 Applications. The minimum age to use our Applications without parental approval may be higher in your country.
+**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.
 
-**Infrastructure**. Our Infrastructure includes preset messaging and file relay servers, and iOS push notification servers provided by SimpleX Chat Ltd for public use. Our infrastructure does not have any modifications from the [published open-source code](https://github.com/simplex-chat/simplexmq) available under AGPLv3 license. Any infrastructure provider, whether commercial or not, is required by the Affero clause (named after Affero Inc. company that pioneered the community-based Q&A sites in early 2000s) to publish any modifications under the same license. The statements in relation to Infrastructure and relay servers anywhere in this document assume no modifications to the published code, even in the cases when it is not explicitly stated.
+**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.
 
-**Client applications**. Our client application Software (referred to as "app" or "apps") also has no modifications compared with published open-source code, and any developers of the alternative client apps based on our code are required to publish any modifications under the same AGPLv3 license. Client applications should not include any tracking or analytics code, and do not share any information with SimpleX Chat Ltd or any other third parties. If you ever discover any tracking or analytics code, please report it to us, so we can remove it.
+**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.
 
-**Accessing the infrastructure**. For the efficiency of the network access, the client Software by default accesses all queues your app creates on any relay server within one user profile via the same network (TCP/IP) connection. At the cost of additional traffic this configuration can be changed to use different transport session for each connection. Relay servers do not collect information about which queues were created or accessed via the same connection, so the relay servers cannot establish which queues belong to the same user profile. Whoever might observe your network traffic would know which relay 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 ciphertext in common, even inside TLS encryption layer. 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.
+**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.
 
-**Privacy of user data**. Servers do not retain any data we transmit for any longer than necessary to deliver the messages between apps. SimpleX Chat Ltd collects aggregate statistics across all its servers, as supported by published code and can be enabled by any infrastructure provider, but not any statistics per-user, or per geographic location, or per IP address, or per transport session. We do not have information about how many people use SimpleX Chat applications, we only know an approximate number of app installations and the aggregate traffic through the preset servers. In any case, we do not and will not sell or in any way monetize user data. Our future business model assumes charging for some optional Software features instead, in a transparent and fair way.
+**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.
 
-**Operating our Infrastructure**. For the purpose of using our Software, if you continue using preset servers, you agree that your end-to-end encrypted messages are transferred via the preset servers in any countries where we have or use facilities and service providers or partners. The information about geographic location of the servers will be made available in the apps in the near future.
+**Traffic and device costs**. You are solely responsible for the traffic and device costs on which you use our Services, and any associated taxes.
 
-**Software**. You agree to downloading and installing updates to our Applications when they are available; they would only be automatic if you configure your devices in this way.
+**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.
 
-**Traffic and device costs**. You are solely responsible for the traffic and device costs that you incur while using our Applications, and any associated taxes.
+**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.
 
-**Legal usage**. You agree to use our Applications only for legal purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.
+**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.
 
-**Damage to SimpleX Chat Ltd**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, our Infrastructure, or any other systems. For example, you must not 1) access our Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of our Infrastructure; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.
+**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.
 
-**Keeping your data secure**. SimpleX Chat is the first communication software that aims to be 100% private by design - server software neither has the ability to access your messages, nor it has information about who you communicate with. That means that you are solely responsible for keeping your device, your user profile and any data safe and secure. If you lose your phone or remove the Software from the device, you will not be able to recover the lost data, unless you made a back up. To protect the data you need to make regular backups, as using old backups may disrupt your communication with some of the contacts.
+**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.
 
-**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the Software you use. The databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app interface. In this case, if you make a backup of the data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the desktop apps can be configured to store the database passphrase in the configuration file in plaintext, and unless you set the passphrase when first running the app, a random passphrase will be used and stored on the device. You can remove it from the device via the app settings.
+**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.
 
-**Storing the files on the device**. The files currently sent and received in the apps by default (except CLI app) are stored on your device encrypted using unique keys, different for each file, that are stored in the database. Once the message that the file was attached to is removed, even if the copy of the encrypted file is retained, it should be impossible to recover the key allowing to decrypt the file. This local file encryption may affect app performance, and it can be disabled via the app settings. This change will only affect the new files. If you later re-enable the encryption, it will also affect only the new files. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access any unencrypted files. In any case, irrespective of the storage setting, the files are always sent by all apps end-to-end encrypted.
+**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.
 
-**No Access to Emergency Services**. Our Applications 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.
+**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)
 
-**Third-party services**. Our Applications may allow you to access, use, or interact with our or 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.
+**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.
 
-**Your Rights**. You own the messages and the information you transmit through our Applications. Your recipients are able to retain the messages they receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the Software. At the same time, repudiation property of the end-to-end encryption algorithm allows you to plausibly deny having sent the message, like you can deny what you said in a private face-to-face conversation, as the recipient cannot provide any proof to the third parties, by design.
+**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.
 
-**License**. SimpleX Chat Ltd grants you a limited, revocable, non-exclusive, and non-transferable license to use our Applications in accordance with these Conditions. The source-code of Applications is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE).
+**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.
 
-**SimpleX Chat Ltd Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Applications. 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.
+**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.
 
-**Disclaimers**. YOU USE OUR APPLICATIONS AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR APPLICATIONS 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 CHAT LTD DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR APPLICATIONS WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR APPLICATIONS WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR APPLICATIONS. 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.
+**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.
 
-**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 CONDITIONS, US, OR OUR APPLICATIONS, 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 CONDITIONS, US, OR OUR APPLICATIONS 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 CONDITIONS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+**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.
 
-**Availability**. Our Applications may be disrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Applications, including certain features and the support for certain devices and platforms, at any time.
+**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.
 
-**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Conditions, us, or our Applications 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 Conditions, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat Ltd and you, without regard to conflict of law provisions.
+**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.
 
-**Changes to the conditions**. SimpleX Chat Ltd may update the Conditions from time to time. Your continued use of our Applications confirms your acceptance of our updated Conditions and supersedes any prior Conditions. You will comply with all applicable export control and trade sanctions laws. Our Conditions cover the entire agreement between you and SimpleX Chat Ltd regarding our Applications. If you do not agree with our Conditions, you should stop using our Applications.
+Updated November 8, 2022
-
-**Enforcing the conditions**. If we fail to enforce any of our Conditions, that does not mean we waive the right to enforce them. If any provision of the Conditions is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Conditions and shall not affect the enforceability of the remaining provisions. Our Applications 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 Applications in any country. If you have specific questions about these Conditions, please contact us at chat@simplex.chat.
-
-**Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd at any time by deleting our Applications from your devices and discontinuing use of our Infrastructure. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd.
-
-Updated April 24, 2024

README.md

@@ -2,9 +2,9 @@
 [![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)
-<a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>
+[![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), [PL](/docs/lang/pl/README.md) |
+| 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%">
 
@@ -15,7 +15,7 @@
 ## Welcome to SimpleX Chat!
 
 1. 📲 [Install the app](#install-the-app).
-2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
+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).
@@ -40,29 +40,21 @@
 - 🚀 [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
+## Connect to the team via the app
-
-You can connect to the team via the app using "chat with the developers button" available when you have no conversations in the profile, "Send questions and ideas" in the app settings or via our [SimpleX address](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). Please connect to:
 
 - to ask any questions
 - to suggest any improvements
 - to share anything relevant
 
-We are replying the questions manually, so it is not instant – it can take up to 24 hours.
-
-If you are interested in helping us to integrate open-source language models, and in [joining our team](./docs/JOIN_TEAM.md), please get in touch.
-
 ## Join user groups
 
-You can join the groups created by other users via the new [directory service](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion). We are not responsible for the content shared in these 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, but only once. Once the group has more than 10 members it can be submitted to [SimpleX Directory Service](./docs/DIRECTORY.md) where the new users will be able to discover it.
+- having preliminary approved with the admin in direct message, share the link to a group you created.
 
 You must:
 - be polite to other users
@@ -72,30 +64,14 @@ You must:
 
 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 users group](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
+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 is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FvYCRjIflKNMGYlfTkuHe4B40qSlQ0439%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAHNdcqNbzXZhyMoSBjT2R0-Eb1EPaLyUg3KZjn-kmM1w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22PD20tcXjw7IpkkMCfR6HLA%3D%3D%22%7D) for developers who build on SimpleX platform:
-
-- chat bots and automations
-- integrations with other apps
-- social apps and services
-- etc.
 
 There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
 
-[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FaJ8O1O8A8GbeoaHTo_V8dcefaCl7ouPb%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA034qWTA3sWcTsi6aWhNf9BA34vKVCFaEBdP2R66z6Ao%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22wiZ1v_wNjLPlT-nCSB-bRA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
+[\#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.
 
-## Follow our updates
-
-We publish our updates and releases via:
-
-- [Reddit](https://www.reddit.com/r/SimpleXChat/), [Twitter](https://twitter.com/SimpleXChat), [Lemmy](https://lemmy.ml/c/simplex), [Mastodon](https://mastodon.social/@simplex) and [Nostr](https://snort.social/p/npub1exv22uulqnmlluszc4yk92jhs2e5ajcs6mu3t00a6avzjcalj9csm7d828).
-- SimpleX Chat [team profile](#connect-to-the-team).
-- [blog](https://simplex.chat/blog/) and [RSS feed](https://simplex.chat/feed.rss).
-- [mailing list](https://simplex.chat/#join-simplex), very rarely.
-
 ## 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.
@@ -119,24 +95,15 @@ 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)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/ar/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ar/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
-|🇧🇬 bg|Български | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>[![ios app](https://hosted.weblate.org/widget/simplex-chat/ios/bg/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/bg/)|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
-|🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
-|🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
-|🇭🇺 hu|Magyar    | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/hu/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/hu/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
+|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
-|🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
-|🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
-|🇹🇷 tr|Türkçe   | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/tr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/tr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/tr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/tr/)|||
-|🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
 
 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -145,7 +112,6 @@ Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https:/
 
 We would love to have you join the development! You can help us with:
 
-- [share the color theme](./docs/THEMES.md) you use in Android app!
 - writing a tutorial or recipes about hosting servers, chat bot automations, etc.
 - contributing to SimpleX Chat knowledge-base.
 - developing features - please connect to us via chat so we can help you get started.
@@ -164,14 +130,11 @@ 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: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- USDT:
+- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
-  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
-- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 
@@ -191,7 +154,7 @@ SimpleX Chat founder
 - [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 and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
+- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -232,28 +195,20 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 ## News and updates
 
-Recent and important updates:
+Recent updates:
-
-[Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
-
-[Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
-
-[Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
-
-[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
-
-[Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).
-
-[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
-
-[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
-
-[May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
 
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
 
+[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
+
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
 
+[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
+
+[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
+
+[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
+
 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
@@ -286,36 +241,29 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p
 
 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 and security: technical details and limitations
+## 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.
 
-We compiled a [glossary of terms](./docs/GLOSSARY.md) used to describe communication systems to help understand some terms below and to help compare advantages and disadvantages of various communication systems.
-
 What is already implemented:
 
-1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses [pairwise per-queue identifiers](./docs/GLOSSARY.md#pairwise-pseudonymous-identifier) (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
+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](./docs/GLOSSARY.md#end-to-end-encryption) in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
+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](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
+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](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
+5. Several levels of content padding to frustrate message size attacks.
-6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+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.
-12. Manual messaging queue rotations to move conversation to another SMP relay.
-13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
-14. Local files encryption.
 
-We plan to add:
+We plan to add soon:
 
-1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+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. Post-quantum resistant key exchange in double ratchet protocol.
+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. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
 
 ## For developers
 
@@ -328,8 +276,6 @@ You can:
 
 If you are considering developing with SimpleX platform please get in touch for any advice and support.
 
-Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) group to ask any questions and share your success stories.
-
 ## Roadmap
 
 - ✅ Easy to deploy SimpleX server with in-memory message storage, without any dependencies.
@@ -370,34 +316,26 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ 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.
+- 🏗 Improved Android app UI design.
-- ✅ Optional alternative access password.
+- 🏗 SMP queue redundancy and rotation (manual is supported).
-- ✅ Message reactions
+- 🏗 Reduced battery and traffic usage in large groups.
-- ✅ Message editing history
-- ✅ Reduced battery and traffic usage in large groups.
-- ✅ Message delivery confirmation (with sender opt-out per contact).
-- ✅ Desktop client.
-- ✅ Encryption of local files stored in the app.
-- ✅ Using mobile profiles from the desktop app.
-- ✅ Private notes.
-- ✅ Improve sending videos (including encryption of locally stored videos).
-- ✅ Post-quantum resistant key exchange in double ratchet protocol.
-- 🏗 Improve stability and reduce battery usage.
-- 🏗 Improve experience for the new users.
-- 🏗 Large groups, communities and public channels.
-- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
-- Privacy & security slider - a simple way to set all settings at once.
-- SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
-- Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
-- Feeds/broadcasts.
 - 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
@@ -414,13 +352,13 @@ We have never provided or have been requested access to our servers or any infor
 
 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 [Privacy Policy](./PRIVACY.md).
+Please read more in [Terms & privacy policy](./PRIVACY.md).
 
 ## Security contact
 
-Please see our [Security Policy](./docs/SECURITY.md) on how to report security vulnerabilities to us. We will coordinate the fix and disclosure.
+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 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
 

apps/android/.gitignore

@@ -0,0 +1,20 @@
+*.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

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

apps/android/.idea/compiler.xml

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

apps/android/.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?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

@@ -0,0 +1,20 @@
+<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

@@ -0,0 +1,6 @@
+<?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

@@ -4,6 +4,7 @@ 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
@@ -22,15 +23,3 @@ To find your SHA certificate fingerprint perform the following steps.
 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.
-
-## Adding icons
-
-1. Find a [Material symbol](https://fonts.google.com/icons?icon.style=Rounded) in Rounded category.
-
-2. Set weight to 400, grade to -25 and size to 48px.
-
-3. Click on the icon, choose Android and download XML file.
-
-4. Update the color to black (#FF000000) and the size to "24.dp", as in other icons.
-
-For example, this is [add reaction icon](https://fonts.google.com/icons?selected=Material+Symbols+Rounded:add_reaction:FILL@0;wght@300;GRAD@-25;opsz@24&icon.style=Rounded).

apps/android/app/build.gradle

@@ -0,0 +1,235 @@
+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/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
   <uses-feature android:name="android.hardware.camera" />
 
   <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <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" />
@@ -15,6 +14,7 @@
   <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" />
@@ -23,8 +23,9 @@
 
   <application
       android:name="SimplexApp"
-      android:allowBackup="false"
+      android:allowBackup="true"
-      android:fullBackupOnly="false"
+      android:fullBackupOnly="true"
+      android:backupAgent="BackupAgent"
       android:icon="@mipmap/icon"
       android:label="${app_name}"
       android:extractNativeLibs="${extract_native_libs}"
@@ -39,7 +40,6 @@
         android:exported="true"
         android:label="${app_name}"
         android:windowSoftInputMode="adjustResize"
-        android:configChanges="uiMode"
         android:theme="@style/Theme.SimpleX">
       <intent-filter>
         <category android:name="android.intent.category.LAUNCHER" />
@@ -103,14 +103,11 @@
       </intent-filter>
     </activity-alias>
 
-    <activity android:name=".views.call.CallActivity"
+
+    <activity android:name=".views.call.IncomingCallActivity"
         android:showOnLockScreen="true"
         android:exported="false"
-        android:launchMode="singleInstance"
+        android:launchMode="singleTask"/>
-        android:supportsPictureInPicture="true"
-        android:autoRemoveFromRecents="true"
-        android:screenOrientation="portrait"
-        android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
 
     <provider
         android:name="androidx.core.content.FileProvider"
@@ -136,18 +133,6 @@
         android:stopWithTask="false"></service>
 
     <!-- SimplexService restart on reboot -->
-
-    <service
-        android:name=".CallService"
-        android:enabled="true"
-        android:exported="false"
-        android:stopWithTask="false"/>
-
-    <receiver
-        android:name=".CallService$CallActionReceiver"
-        android:enabled="true"
-        android:exported="false" />
-
     <receiver
         android:name=".SimplexService$StartReceiver"
         android:enabled="true"

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

@@ -11,16 +11,9 @@ var VideoCamera;
     VideoCamera["User"] = "user";
     VideoCamera["Environment"] = "environment";
 })(VideoCamera || (VideoCamera = {}));
-var LayoutType;
-(function (LayoutType) {
-    LayoutType["Default"] = "default";
-    LayoutType["LocalVideo"] = "localVideo";
-    LayoutType["RemoteVideo"] = "remoteVideo";
-})(LayoutType || (LayoutType = {}));
 // for debugging
 // var sendMessageToNative = ({resp}: WVApiMessage) => console.log(JSON.stringify({command: resp}))
 var sendMessageToNative = (msg) => console.log(JSON.stringify(msg));
-var toggleScreenShare = async () => { };
 // Global object with cryptrographic/encoding functions
 const callCrypto = callCryptoFunction();
 var TransformOperation;
@@ -30,16 +23,11 @@ var TransformOperation;
 })(TransformOperation || (TransformOperation = {}));
 let activeCall;
 let answerTimeout = 30000;
-var useWorker = false;
-var isDesktop = false;
-var localizedState = "";
-var localizedDescription = "";
 const processCommand = (function () {
     const defaultIceServers = [
-        { urls: ["stuns:stun.simplex.im:443"] },
         { urls: ["stun:stun.simplex.im:443"] },
-        //{urls: ["turns:turn.simplex.im:443?transport=udp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"},
+        { urls: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
-        { urls: ["turns:turn.simplex.im:443?transport=tcp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj" },
+        { urls: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
     ];
     function getCallConfig(encodedInsertableStreams, iceServers, relay) {
         return {
@@ -50,9 +38,9 @@ const processCommand = (function () {
                 iceTransportPolicy: relay ? "relay" : "all",
             },
             iceCandidates: {
-                delay: 750,
+                delay: 3000,
-                extrasInterval: 1500,
+                extrasInterval: 2000,
-                extrasTimeout: 12000,
+                extrasTimeout: 8000,
             },
         };
     }
@@ -93,8 +81,6 @@ const processCommand = (function () {
                 if (delay)
                     clearTimeout(delay);
                 resolved = true;
-                // console.log("resolveIceCandidates", JSON.stringify(candidates))
-                console.log("resolveIceCandidates");
                 const iceCandidates = serialize(candidates);
                 candidates = [];
                 resolve(iceCandidates);
@@ -102,47 +88,19 @@ const processCommand = (function () {
             function sendIceCandidates() {
                 if (candidates.length === 0)
                     return;
-                // console.log("sendIceCandidates", JSON.stringify(candidates))
-                console.log("sendIceCandidates");
                 const iceCandidates = serialize(candidates);
                 candidates = [];
                 sendMessageToNative({ resp: { type: "ice", iceCandidates } });
             }
         });
     }
-    async function initializeCall(config, mediaType, aesKey) {
+    async function initializeCall(config, mediaType, aesKey, useWorker) {
-        var _a;
+        const pc = new RTCPeerConnection(config.peerConnectionConfig);
-        let pc;
-        try {
-            pc = new RTCPeerConnection(config.peerConnectionConfig);
-        }
-        catch (e) {
-            console.log("Error while constructing RTCPeerConnection, will try without 'stuns' specified: " + e);
-            const withoutStuns = (_a = config.peerConnectionConfig.iceServers) === null || _a === void 0 ? void 0 : _a.filter((elem) => typeof elem.urls === "string" ? !elem.urls.startsWith("stuns:") : !elem.urls.some((url) => url.startsWith("stuns:")));
-            config.peerConnectionConfig.iceServers = withoutStuns;
-            pc = new RTCPeerConnection(config.peerConnectionConfig);
-        }
         const remoteStream = new MediaStream();
         const localCamera = VideoCamera.User;
         const localStream = await getLocalMediaStream(mediaType, localCamera);
-        if (isDesktop) {
-            localStream
-                .getTracks()
-                .filter((elem) => elem.kind == "video")
-                .forEach((elem) => (elem.enabled = false));
-        }
         const iceCandidates = getIceCandidates(pc, config);
-        const call = {
+        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey, useWorker };
-            connection: pc,
-            iceCandidates,
-            localMedia: mediaType,
-            localCamera,
-            localStream,
-            remoteStream,
-            aesKey,
-            screenShareEnabled: false,
-            cameraEnabled: true,
-        };
         await setupMediaStreams(call);
         let connectionTimeout = setTimeout(connectionHandler, answerTimeout);
         pc.addEventListener("connectionstatechange", connectionStateChange);
@@ -220,17 +178,17 @@ const processCommand = (function () {
                     // 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(useWorker);
+                    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, iceServers, relay } = command;
+                    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);
+                    activeCall = await initializeCall(getCallConfig(encryption && !!aesKey, iceServers, relay), media, aesKey, useWorker);
                     const pc = activeCall.connection;
                     const offer = await pc.createOffer();
                     await pc.setLocalDescription(offer);
@@ -244,6 +202,7 @@ const processCommand = (function () {
                     //   iceServers,
                     //   relay,
                     //   aesKey,
+                    //   useWorker,
                     // }
                     resp = {
                         type: "offer",
@@ -251,23 +210,21 @@ const processCommand = (function () {
                         iceCandidates: await activeCall.iceCandidates,
                         capabilities: { encryption },
                     };
-                    // console.log("offer response", JSON.stringify(resp))
                     break;
                 }
                 case "offer":
                     if (activeCall) {
                         resp = { type: "error", message: "accept: call already started" };
                     }
-                    else if (!supportsInsertableStreams(useWorker) && command.aesKey) {
+                    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, iceServers, relay } = command;
+                        const { media, aesKey, useWorker, iceServers, relay } = command;
-                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey);
+                        activeCall = await initializeCall(getCallConfig(!!aesKey, iceServers, relay), media, aesKey, useWorker);
                         const pc = activeCall.connection;
-                        // console.log("offer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
                         await pc.setRemoteDescription(new RTCSessionDescription(offer));
                         const answer = await pc.createAnswer();
                         await pc.setLocalDescription(answer);
@@ -279,7 +236,6 @@ const processCommand = (function () {
                             iceCandidates: await activeCall.iceCandidates,
                         };
                     }
-                    // console.log("answer response", JSON.stringify(resp))
                     break;
                 case "answer":
                     if (!pc) {
@@ -294,7 +250,6 @@ const processCommand = (function () {
                     else {
                         const answer = parse(command.answer);
                         const remoteIceCandidates = parse(command.iceCandidates);
-                        // console.log("answer remoteIceCandidates", JSON.stringify(remoteIceCandidates))
                         await pc.setRemoteDescription(new RTCSessionDescription(answer));
                         addIceCandidates(pc, remoteIceCandidates);
                         resp = { type: "ok" };
@@ -331,15 +286,6 @@ const processCommand = (function () {
                         resp = { type: "ok" };
                     }
                     break;
-                case "description":
-                    localizedState = command.state;
-                    localizedDescription = command.description;
-                    resp = { type: "ok" };
-                    break;
-                case "layout":
-                    changeLayout(command.layout);
-                    resp = { type: "ok" };
-                    break;
                 case "end":
                     endCall();
                     resp = { type: "ok" };
@@ -364,14 +310,12 @@ const processCommand = (function () {
         catch (e) {
             console.log(e);
         }
-        shutdownCameraAndMic();
         activeCall = undefined;
         resetVideoElements();
     }
     function addIceCandidates(conn, iceCandidates) {
         for (const c of iceCandidates) {
             conn.addIceCandidate(new RTCIceCandidate(c));
-            // console.log("addIceCandidates", JSON.stringify(c))
         }
     }
     async function setupMediaStreams(call) {
@@ -386,19 +330,16 @@ const processCommand = (function () {
         // setupVideoElement(videos.remote)
         videos.local.srcObject = call.localStream;
         videos.remote.srcObject = call.remoteStream;
-        // Without doing it manually Firefox shows black screen but video can be played in Picture-in-Picture
-        videos.local.play();
-        videos.remote.play();
     }
     async function setupEncryptionWorker(call) {
         if (call.aesKey) {
             if (!call.key)
                 call.key = await callCrypto.decodeAesKey(call.aesKey);
-            if (useWorker && !call.worker) {
+            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({ error, filename, lineno, message });
+                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}))
+                call.worker.onmessage = ({ data }) => console.log(JSON.stringify({ message: data }));
             }
         }
     }
@@ -453,11 +394,7 @@ const processCommand = (function () {
         // 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;
-        // Using RTCRtpReceiver instead of RTCRtpSender, see these lines:
+        const capabilities = RTCRtpSender.getCapabilities("video");
-        // -    if (!is_recv_codec && !is_send_codec) {
-        // +    if (!is_recv_codec) {
-        // https://webrtc.googlesource.com/src.git/+/db2f52ba88cf9f98211df2dabb3f8aca9251c4a2%5E%21/
-        const capabilities = RTCRtpReceiver.getCapabilities("video");
         if (capabilities) {
             const { codecs } = capabilities;
             const selectedCodecIndex = codecs.findIndex((c) => c.mimeType === "video/VP8");
@@ -465,16 +402,8 @@ const processCommand = (function () {
             codecs.splice(selectedCodecIndex, 1);
             codecs.unshift(selectedCodec);
             for (const t of call.connection.getTransceivers()) {
-                // Firefox doesn't have this function implemented:
+                if (((_a = t.sender.track) === null || _a === void 0 ? void 0 : _a.kind) === "video") {
-                // https://bugzilla.mozilla.org/show_bug.cgi?id=1396922
+                    t.setCodecPreferences(codecs);
-                if (((_a = t.sender.track) === null || _a === void 0 ? void 0 : _a.kind) === "video" && t.setCodecPreferences) {
-                    try {
-                        t.setCodecPreferences(codecs);
-                    }
-                    catch (error) {
-                        // Shouldn't be here but in case something goes wrong, it will allow to make a call with auto-selected codecs
-                        console.log("Failed to set codec preferences, trying without any preferences: " + error);
-                    }
                 }
             }
         }
@@ -484,48 +413,14 @@ const processCommand = (function () {
         if (!videos)
             throw Error("no video elements");
         const pc = call.connection;
-        const oldAudioTracks = call.localStream.getAudioTracks();
+        for (const t of call.localStream.getTracks())
-        const audioWasEnabled = oldAudioTracks.some((elem) => elem.enabled);
+            t.stop();
-        let localStream;
-        try {
-            localStream = call.screenShareEnabled ? await getLocalScreenCaptureStream() : await getLocalMediaStream(call.localMedia, camera);
-        }
-        catch (e) {
-            if (call.screenShareEnabled) {
-                call.screenShareEnabled = false;
-            }
-            return;
-        }
-        if (!call.screenShareEnabled) {
-            for (const t of call.localStream.getTracks())
-                t.stop();
-        }
-        else {
-            // Don't stop audio track if switching to screenshare
-            for (const t of call.localStream.getVideoTracks())
-                t.stop();
-            // Replace new track from screenshare with old track from recording device
-            for (const t of localStream.getAudioTracks()) {
-                t.stop();
-                localStream.removeTrack(t);
-            }
-            for (const t of call.localStream.getAudioTracks())
-                localStream.addTrack(t);
-        }
         call.localCamera = camera;
-        const audioTracks = localStream.getAudioTracks();
+        const localStream = await getLocalMediaStream(call.localMedia, camera);
-        const videoTracks = localStream.getVideoTracks();
+        replaceTracks(pc, localStream.getVideoTracks());
-        if (!audioWasEnabled && oldAudioTracks.length > 0) {
+        replaceTracks(pc, localStream.getAudioTracks());
-            audioTracks.forEach((elem) => (elem.enabled = false));
-        }
-        if (!call.cameraEnabled && !call.screenShareEnabled) {
-            videoTracks.forEach((elem) => (elem.enabled = false));
-        }
-        replaceTracks(pc, audioTracks);
-        replaceTracks(pc, videoTracks);
         call.localStream = localStream;
         videos.local.srcObject = localStream;
-        videos.local.play();
     }
     function replaceTracks(pc, tracks) {
         if (!tracks.length)
@@ -560,23 +455,6 @@ const processCommand = (function () {
         const constraints = callMediaConstraints(mediaType, facingMode);
         return navigator.mediaDevices.getUserMedia(constraints);
     }
-    function getLocalScreenCaptureStream() {
-        const constraints /* DisplayMediaStreamConstraints */ = {
-            video: {
-                frameRate: 24,
-                //width: {
-                //min: 480,
-                //ideal: 720,
-                //max: 1280,
-                //},
-                //aspectRatio: 1.33,
-            },
-            audio: false,
-            // This works with Chrome, Edge, Opera, but not with Firefox and Safari
-            // systemAudio: "include"
-        };
-        return navigator.mediaDevices.getDisplayMedia(constraints);
-    }
     function callMediaConstraints(mediaType, facingMode) {
         switch (mediaType) {
             case CallMediaType.Audio:
@@ -601,11 +479,6 @@ const processCommand = (function () {
         return (("createEncodedStreams" in RTCRtpSender.prototype && "createEncodedStreams" in RTCRtpReceiver.prototype) ||
             (!!useWorker && "RTCRtpScriptTransform" in window));
     }
-    function shutdownCameraAndMic() {
-        if (activeCall === null || activeCall === void 0 ? void 0 : activeCall.localStream) {
-            activeCall.localStream.getTracks().forEach((track) => track.stop());
-        }
-    }
     function resetVideoElements() {
         const videos = getVideoElements();
         if (!videos)
@@ -631,57 +504,9 @@ const processCommand = (function () {
         const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
         for (const t of tracks)
             t.enabled = enable;
-        if (media == CallMediaType.Video && activeCall) {
-            activeCall.cameraEnabled = enable;
-        }
     }
-    toggleScreenShare = async function () {
-        const call = activeCall;
-        if (!call)
-            return;
-        call.screenShareEnabled = !call.screenShareEnabled;
-        await replaceMedia(call, call.localCamera);
-    };
     return processCommand;
 })();
-function toggleRemoteVideoFitFill() {
-    const remote = document.getElementById("remote-video-stream");
-    remote.style.objectFit = remote.style.objectFit != "contain" ? "contain" : "cover";
-}
-function toggleMedia(s, media) {
-    let res = false;
-    const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
-    for (const t of tracks) {
-        t.enabled = !t.enabled;
-        res = t.enabled;
-    }
-    if (media == CallMediaType.Video && activeCall) {
-        activeCall.cameraEnabled = res;
-    }
-    return res;
-}
-function changeLayout(layout) {
-    const local = document.getElementById("local-video-stream");
-    const remote = document.getElementById("remote-video-stream");
-    switch (layout) {
-        case LayoutType.Default:
-            local.className = "inline";
-            remote.className = "inline";
-            local.style.visibility = "visible";
-            remote.style.visibility = "visible";
-            break;
-        case LayoutType.LocalVideo:
-            local.className = "fullscreen";
-            local.style.visibility = "visible";
-            remote.style.visibility = "hidden";
-            break;
-        case LayoutType.RemoteVideo:
-            remote.className = "fullscreen";
-            local.style.visibility = "hidden";
-            remote.style.visibility = "visible";
-            break;
-    }
-}
 // Cryptography function - it is loaded both in the main window and in worker context (if the worker is used)
 function callCryptoFunction() {
     const initialPlainTextRequired = {

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

@@ -64,4 +64,4 @@ target_link_libraries( # Specifies the target library.
 
     # Links the target library to the log library
     # included in the NDK.
-    ${log-lib})
+    ${log-lib})

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

@@ -0,0 +1,111 @@
+#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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,666 @@
+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

@@ -0,0 +1,260 @@
+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

@@ -0,0 +1,329 @@
+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,50 +1,42 @@
 package chat.simplex.app.model
 
 import android.app.*
-import android.app.TaskStackBuilder
 import android.content.*
-import android.content.pm.PackageManager
-import android.graphics.Bitmap
 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.compose.ui.graphics.asAndroidBitmap
+import androidx.core.app.NotificationCompat
-import androidx.core.app.*
+import androidx.core.app.NotificationManagerCompat
 import chat.simplex.app.*
-import chat.simplex.app.TAG
+import chat.simplex.app.views.call.*
-import chat.simplex.app.views.call.CallActivity
+import chat.simplex.app.views.chatlist.acceptContactRequest
-import chat.simplex.app.views.call.getKeyguardManager
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.usersettings.NotificationPreviewMode
-import chat.simplex.common.model.*
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.CallMediaType
-import chat.simplex.common.views.call.RcvCallInvitation
 import kotlinx.datetime.Clock
-import chat.simplex.res.MR
 
-object NtfManager {
+class NtfManager(val context: Context, private val appPreferences: AppPreferences) {
-  const val MessageChannel: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
+  companion object {
-  const val MessageGroup: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
+    const val MessageChannel: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-  const val OpenChatAction: String = "chat.simplex.app.OPEN_CHAT"
+    const val MessageGroup: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-  const val ShowChatsAction: String = "chat.simplex.app.SHOW_CHATS"
+    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
+    // DO NOT change notification channel settings / names
-  const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_2"
+    const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_1"
-  const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
+    const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
-  const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
+    const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
-  const val EndCallAction: String = "chat.simplex.app.END_CALL"
+    const val CallNotificationId: Int = -1
-  const val CallNotificationId: Int = -1
-  private const val UserIdKey: String = "userId"
-  private const val ChatIdKey: String = "chatId"
-  private val appPreferences: AppPreferences = ChatController.appPrefs
-  private val context: Context
-    get() = SimplexApp.context
 
-  fun getUserIdFromIntent(intent: Intent?): Long? {
+    private const val UserIdKey: String = "userId"
-    val userId = intent?.getLongExtra(UserIdKey, -1L)
+    private const val ChatIdKey: String = "chatId"
-    return if (userId == -1L || userId == null) null else userId
+
+    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
@@ -55,14 +47,18 @@ object NtfManager {
     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 + "/raw/ring_once")
+    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
-    Log.d(TAG, "callNotificationChannel sound: $soundUri")
+    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
@@ -74,8 +70,8 @@ object NtfManager {
   fun cancelNotificationsForChat(chatId: String) {
     prevNtfTime.remove(chatId)
     manager.cancel(chatId.hashCode())
-    val msgNtfs = manager.activeNotifications.filter { ntf ->
+    val msgNtfs = manager.activeNotifications.filter {
-      ntf.notification.channelId == MessageChannel
+      ntf -> ntf.notification.channelId == MessageChannel
     }
     if (msgNtfs.count() == 1) {
       // Have a group notification with no children so cancel it
@@ -83,19 +79,45 @@ object NtfManager {
     }
   }
 
-  fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
+  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(MR.strings.notification_preview_somebody) else displayName
+    val title = if (previewMode == NotificationPreviewMode.HIDDEN.name) generalGetString(R.string.notification_preview_somebody) else displayName
-    val content = if (previewMode != NotificationPreviewMode.MESSAGE.name) generalGetString(MR.strings.notification_preview_new_message) else msgText
+    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).asAndroidBitmap()
+      else -> base64ToBitmap(image)
     }
     val builder = NotificationCompat.Builder(context, MessageChannel)
       .setContentTitle(title)
@@ -119,11 +141,11 @@ object NtfManager {
       actionIntent.putExtra(ChatIdKey, chatId)
       val actionPendingIntent: PendingIntent = PendingIntent.getBroadcast(SimplexApp.context, 0, actionIntent, flags)
       val actionButton = when (action) {
-        NotificationAction.ACCEPT_CONTACT_REQUEST -> generalGetString(MR.strings.accept)
+        NotificationAction.ACCEPT_CONTACT_REQUEST -> generalGetString(R.string.accept)
-        NotificationAction.ACCEPT_CONTACT_REQUEST_INCOGNITO -> generalGetString(MR.strings.accept_contact_incognito_button)
       }
       builder.addAction(0, actionButton, actionPendingIntent)
     }
+
     val summary = NotificationCompat.Builder(context, MessageChannel)
       .setSmallIcon(R.drawable.ntf_icon)
       .setColor(0x88FFFF)
@@ -135,23 +157,20 @@ object NtfManager {
 
     with(NotificationManagerCompat.from(context)) {
       // using cInfo.id only shows one notification per chat and updates it when the message arrives
-      if (ActivityCompat.checkSelfPermission(SimplexApp.context, android.Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
+      notify(chatId.hashCode(), builder.build())
-        notify(chatId.hashCode(), builder.build())
+      notify(0, summary)
-        notify(0, summary)
-      }
     }
   }
 
-  fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean {
+  fun notifyCallInvitation(invitation: RcvCallInvitation) {
     val keyguardManager = getKeyguardManager(context)
-    Log.d(
+    Log.d(TAG,
-      TAG,
       "notifyCallInvitation pre-requests: " +
           "keyguard locked ${keyguardManager.isKeyguardLocked}, " +
           "callOnLockScreen ${appPreferences.callOnLockScreen.get()}, " +
-          "onForeground ${isAppOnForeground}"
+          "onForeground ${SimplexApp.context.isAppOnForeground}"
     )
-    if (isAppOnForeground) return false
+    if (SimplexApp.context.isAppOnForeground) return
     val contactId = invitation.contact.id
     Log.d(TAG, "notifyCallInvitation $contactId")
     val image = invitation.contact.image
@@ -159,37 +178,37 @@ object NtfManager {
     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, CallActivity::class.java)
+        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 + "/raw/ring_once")
+        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(MR.strings.accept), chatPendingIntent(AcceptCallAction, invitation.user.userId, contactId))
+          .addAction(R.drawable.ntf_icon, generalGetString(R.string.accept), chatPendingIntent(AcceptCallAction, invitation.user.userId, contactId))
-          .addAction(R.drawable.ntf_icon, generalGetString(MR.strings.reject), chatPendingIntent(RejectCallAction, invitation.user.userId, contactId, true))
+          .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) MR.strings.video_call_no_encryption else MR.strings.encrypted_video_call
+        if (invitation.sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
       } else {
-        if (invitation.sharedKey == null) MR.strings.audio_call_no_encryption else MR.strings.encrypted_audio_call
+        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(MR.strings.notification_preview_somebody)
+      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).asAndroidBitmap()
+      base64ToBitmap(image)
 
     ntfBuilder = ntfBuilder
       .setContentTitle(title)
@@ -204,42 +223,7 @@ object NtfManager {
     // This makes notification sound and vibration repeat endlessly
     notification.flags = notification.flags or NotificationCompat.FLAG_INSISTENT
     with(NotificationManagerCompat.from(context)) {
-      if (ActivityCompat.checkSelfPermission(SimplexApp.context, android.Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
+      notify(CallNotificationId, notification)
-        notify(CallNotificationId, notification)
-      }
-    }
-    return true
-  }
-
-  fun showMessage(title: String, text: String) {
-    val builder = NotificationCompat.Builder(context, MessageChannel)
-      .setContentTitle(title)
-      .setContentText(text)
-      .setPriority(NotificationCompat.PRIORITY_HIGH)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(null as Bitmap?)
-      .setColor(0x88FFFF)
-      .setAutoCancel(true)
-      .setVibrate(null)
-      .setContentIntent(chatPendingIntent(ShowChatsAction, null, null))
-      .setSilent(false)
-
-    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)) {
-      if (ActivityCompat.checkSelfPermission(SimplexApp.context, android.Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
-        notify("MESSAGE".hashCode(), builder.build())
-        notify(0, summary)
-      }
     }
   }
 
@@ -247,12 +231,21 @@ object NtfManager {
     manager.cancel(CallNotificationId)
   }
 
-  fun cancelAllNotifications() {
-    manager.cancelAll()
-  }
-
   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()
@@ -279,11 +272,10 @@ object NtfManager {
    * old ones if needed
    * */
   fun createNtfChannelsMaybeShowAlert() {
-    manager.createNotificationChannel(NotificationChannel(MessageChannel, generalGetString(MR.strings.ntf_channel_messages), NotificationManager.IMPORTANCE_HIGH))
+    manager.createNotificationChannel(NotificationChannel(MessageChannel, generalGetString(R.string.ntf_channel_messages), NotificationManager.IMPORTANCE_HIGH))
-    manager.createNotificationChannel(callNotificationChannel(CallChannel, generalGetString(MR.strings.ntf_channel_calls)))
+    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.CALL_NOTIFICATION_1")
     manager.deleteNotificationChannel("chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION")
   }
 
@@ -297,15 +289,23 @@ object NtfManager {
       val chatId = intent?.getStringExtra(ChatIdKey) ?: return
       val m = SimplexApp.context.chatModel
       when (intent.action) {
-        NotificationAction.ACCEPT_CONTACT_REQUEST.name -> ntfManager.acceptContactRequestAction(userId, incognito = false, chatId)
+        NotificationAction.ACCEPT_CONTACT_REQUEST.name -> {
-        NotificationAction.ACCEPT_CONTACT_REQUEST_INCOGNITO.name -> ntfManager.acceptContactRequestAction(userId, incognito = true, chatId)
+          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,12 +1,6 @@
-package chat.simplex.common.ui.theme
+package chat.simplex.app.ui.theme
 
-import androidx.compose.material.LocalContentColor
+import androidx.compose.ui.graphics.Color
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.graphics.*
-import chat.simplex.common.views.helpers.mixWith
-import kotlin.math.min
 
 val Purple200 = Color(0xFFBB86FC)
 val Purple500 = Color(0xFF6200EE)
@@ -27,10 +21,9 @@ 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)
-val MenuTextColor: Color @Composable get () = if (isInDarkTheme()) LocalContentColor.current.copy(alpha = 0.8f) else Color.Black
-val NoteFolderIconColor: Color @Composable get() = MaterialTheme.appColors.primaryVariant2

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.ui.theme
+package chat.simplex.app.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

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

@@ -0,0 +1,269 @@
+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

@@ -0,0 +1,154 @@
+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,9 +1,20 @@
-package chat.simplex.common.ui.theme
+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(
@@ -22,11 +33,6 @@ val Typography = Typography(
     fontWeight = FontWeight.Normal,
     fontSize = 18.5.sp
   ),
-  h4 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 17.5.sp
-  ),
   body1 = TextStyle(
     fontFamily = Inter,
     fontWeight = FontWeight.Normal,

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

@@ -1,7 +1,8 @@
-package chat.simplex.common.views
+package chat.simplex.app.views
 
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 
@@ -10,11 +11,10 @@ fun SplashView() {
   Surface(
     Modifier
       .fillMaxSize(),
-    color = MaterialTheme.colors.background,
+    color = MaterialTheme.colors.background
-    contentColor = LocalContentColor.current
   ) {
 //    Image(
-//      painter = painterResource(MR.images.logo),
+//      painter = painterResource(R.drawable.logo),
 //      contentDescription = "Simplex Icon",
 //      modifier = Modifier
 //        .height(230.dp)

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

@@ -1,6 +1,7 @@
-package chat.simplex.common.views
+package chat.simplex.app.views
 
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import android.content.res.Configuration
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
@@ -8,36 +9,32 @@ 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.LocalClipboardManager
+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.common.model.*
+import chat.simplex.app.model.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.chat.*
+import chat.simplex.app.views.chat.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.model.ChatModel
+import com.google.accompanist.insets.ProvideWindowInsets
-import chat.simplex.common.platform.*
+import com.google.accompanist.insets.navigationBarsWithImePadding
 
 @Composable
 fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
   val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }
-  val close = {
-    close()
-    if (appPlatform.isDesktop) {
-      ModalManager.center.closeModals()
-    }
-  }
   BackHandler(onBack = {
     close()
   })
-  TerminalLayout(
+    TerminalLayout(
-    composeState,
+      remember { chatModel.terminalItems },
-    sendCommand = { sendCommand(chatModel, composeState) },
+      composeState,
-    close
+      sendCommand = { sendCommand(chatModel, composeState) },
-  )
+      close
+    )
 }
 
 private fun sendCommand(chatModel: ChatModel, composeState: MutableState<ComposeState>) {
@@ -45,15 +42,14 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
   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.CommandError("Failed reading: empty")))
+    val resp = CR.ChatCmdError(null, ChatError.ChatErrorChat(ChatErrorType.СommandError("Failed reading: empty")))
-    chatModel.addTerminalItem(TerminalItem.cmd(null, CC.Console(s)))
+    chatModel.addTerminalItem(TerminalItem.cmd(CC.Console(s)))
-    chatModel.addTerminalItem(TerminalItem.resp(null, resp))
+    chatModel.addTerminalItem(TerminalItem.resp(resp))
     composeState.value = ComposeState(useLinkPreviews = false)
   } else {
-    withBGApi {
+    withApi {
       // show "in progress"
-      // TODO show active remote host in chat console?
+      chatModel.controller.sendCmd(CC.Console(s))
-      chatModel.controller.sendCmd(chatModel.remoteHostId(), CC.Console(s))
       composeState.value = ComposeState(useLinkPreviews = false)
       // hide "in progress"
     }
@@ -62,6 +58,7 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
 
 @Composable
 fun TerminalLayout(
+  terminalItems: List<TerminalItem>,
   composeState: MutableState<ComposeState>,
   sendCommand: () -> Unit,
   close: () -> Unit
@@ -84,36 +81,28 @@ fun TerminalLayout(
             recState = remember { mutableStateOf(RecordingState.NotStarted) },
             isDirectChat = false,
             liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
-            sendMsgEnabled = true,
-            sendButtonEnabled = true,
-            nextSendGrpInv = false,
             needToAllowVoiceToContact = false,
             allowedVoiceByPrefs = false,
             userIsObserver = false,
             userCanSend = true,
             allowVoiceToContact = {},
-            sendMessage = { sendCommand() },
+            sendMessage = sendCommand,
             sendLiveMessage = null,
             updateLiveMessage = null,
-            editPrevMessage = {},
             onMessageChange = ::onMessageChange,
-            onFilesPasted = {},
             textStyle = textStyle
           )
         }
       },
-      contentColor = LocalContentColor.current,
-      drawerContentColor = LocalContentColor.current,
       modifier = Modifier.navigationBarsWithImePadding()
     ) { contentPadding ->
       Surface(
         modifier = Modifier
           .padding(contentPadding)
-          .fillMaxWidth(),
+          .fillMaxWidth()
-        color = MaterialTheme.colors.background,
+          .themedBackground()
-        contentColor = LocalContentColor.current
       ) {
-        TerminalLog()
+        TerminalLog(terminalItems)
       }
     }
   }
@@ -122,35 +111,26 @@ fun TerminalLayout(
 private var lazyListState = 0 to 0
 
 @Composable
-fun TerminalLog() {
+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 {
+  val reversedTerminalItems by remember { derivedStateOf { terminalItems.reversed().toList() } }
-    derivedStateOf { chatModel.terminalItems.value.asReversed() }
+  val context = LocalContext.current
-  }
+  LazyColumn(state = listState, reverseLayout = true) {
-  val clipboard = LocalClipboardManager.current
-  LazyColumnWithScrollBar(state = listState, reverseLayout = true) {
     items(reversedTerminalItems) { item ->
-      val rhId = item.remoteHostId
-      val rhIdStr = if (rhId == null) "" else "$rhId "
       Text(
-        "$rhIdStr${item.date.toString().subSequence(11, 19)} ${item.label}",
+        "${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.start.showModal(endButtons = { ShareButton { clipboard.shareText(item.details) } }) {
+            ModalManager.shared.showModal(endButtons = { ShareButton { shareText(context, item.details) } }) {
               SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
-                val details = item.details
+                Text(item.details, modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
-                  .let {
-                    if (it.length < 100_000) it
-                    else it.substring(0, 100_000)
-                  }
-                Text(details, modifier = Modifier.heightIn(max = 50_000.dp).padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
               }
             }
           }.padding(horizontal = 8.dp, vertical = 4.dp)
@@ -159,15 +139,17 @@ fun TerminalLog() {
   }
 }
 
-@Preview/*(
+@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

@@ -0,0 +1,189 @@
+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,8 +1,10 @@
-package chat.simplex.common.views.call
+package chat.simplex.app.views.call
 
-import chat.simplex.common.model.*
+import android.util.Log
-import chat.simplex.common.platform.*
+import chat.simplex.app.TAG
-import chat.simplex.common.views.helpers.withBGApi
+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
 
@@ -13,80 +15,72 @@ class CallManager(val chatModel: ChatModel) {
       callInvitations[invitation.contact.id] = invitation
       if (invitation.user.showNotifications) {
         if (Clock.System.now() - invitation.callTs <= 3.minutes) {
-          invitation.sentNotification = ntfManager.notifyCallInvitation(invitation)
           activeCallInvitation.value = invitation
+          controller.ntfManager.notifyCallInvitation(invitation)
         } else {
           val contact = invitation.contact
-          ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
+          controller.ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
         }
       }
     }
   }
 
-  fun acceptIncomingCall(invitation: RcvCallInvitation) = withBGApi {
+  fun acceptIncomingCall(invitation: RcvCallInvitation) {
+    ModalManager.shared.closeModals()
     val call = chatModel.activeCall.value
-    val contactInfo = chatModel.controller.apiContactInfo(invitation.remoteHostId, invitation.contact.contactId)
+    if (call == null) {
-    val profile = contactInfo?.second ?: invitation.user.profile.toProfile()
+      justAcceptIncomingCall(invitation = invitation)
-    // In case the same contact calling while previous call didn't end yet (abnormal ending of call from the other side)
-    if (call == null || (call.remoteHostId == invitation.remoteHostId && call.contact.id == invitation.contact.id)) {
-      justAcceptIncomingCall(invitation = invitation, profile)
     } else {
-      chatModel.switchingCall.value = true
+      withApi {
-      try {
+        chatModel.switchingCall.value = true
-        endCall(call = call)
+        try {
-        justAcceptIncomingCall(invitation = invitation, profile)
+          endCall(call = call)
-      } finally {
+          justAcceptIncomingCall(invitation = invitation)
-        chatModel.switchingCall.value = false
+        } finally {
+          withApi { chatModel.switchingCall.value = false }
+        }
       }
     }
   }
 
-  private fun justAcceptIncomingCall(invitation: RcvCallInvitation, userProfile: Profile) {
+  private fun justAcceptIncomingCall(invitation: RcvCallInvitation) {
     with (chatModel) {
       activeCall.value = Call(
-        remoteHostId = invitation.remoteHostId,
-        userProfile = userProfile,
         contact = invitation.contact,
         callState = CallState.InvitationAccepted,
         localMedia = invitation.callType.media,
-        sharedKey = invitation.sharedKey,
+        sharedKey = invitation.sharedKey
       )
       showCallView.value = true
       val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
       val iceServers = getIceServers()
       Log.d(TAG, "answerIncomingCall iceServers: $iceServers")
-      callCommand.add(WCallCommand.Start(
+      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
-        ntfManager.cancelCallNotification()
+        controller.ntfManager.cancelCallNotification()
       }
     }
   }
 
   suspend fun endCall(call: Call) {
-    with(chatModel) {
+    with (chatModel) {
-      // If there is active call currently and it's with other contact, don't interrupt it
-      if (activeCall.value != null && !(activeCall.value?.remoteHostId == call.remoteHostId && activeCall.value?.contact?.id == call.contact.id)) return
-
-      // Don't destroy WebView if you plan to accept next call right after this one
-      if (!switchingCall.value) {
-        showCallView.value = false
-        activeCall.value = null
-        activeCallViewIsCollapsed.value = false
-        platform.androidCallEnded()
-      }
       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.add(WCallCommand.End)
+        callCommand.value = WCallCommand.End
-        controller.apiEndCall(call.remoteHostId, call.contact)
+        showCallView.value = false
+        controller.apiEndCall(call.contact)
+        activeCall.value = null
       }
     }
   }
@@ -96,10 +90,10 @@ class CallManager(val chatModel: ChatModel) {
       callInvitations.remove(invitation.contact.id)
       if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
         activeCallInvitation.value = null
-        ntfManager.cancelCallNotification()
+        controller.ntfManager.cancelCallNotification()
       }
-      withBGApi {
+      withApi {
-        if (!controller.apiRejectCall(invitation.remoteHostId, invitation.contact)) {
+        if (!controller.apiRejectCall(invitation.contact)) {
           Log.e(TAG, "apiRejectCall error")
         }
       }
@@ -109,7 +103,7 @@ class CallManager(val chatModel: ChatModel) {
   fun reportCallRemoteEnded(invitation: RcvCallInvitation) {
     if (chatModel.activeCallInvitation.value?.contact?.id == invitation.contact.id) {
       chatModel.activeCallInvitation.value = null
-      ntfManager.cancelCallNotification()
+      chatModel.controller.ntfManager.cancelCallNotification()
     }
   }
 }

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

@@ -0,0 +1,573 @@
+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

@@ -0,0 +1,248 @@
+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,6 +1,5 @@
-package chat.simplex.common.views.call
+package chat.simplex.app.views.call
 
-import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -11,34 +10,33 @@ 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 dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.platform.LocalContext
-import dev.icerock.moko.resources.compose.stringResource
+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.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.platform.*
+import chat.simplex.app.SimplexApp
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.model.*
-import chat.simplex.common.views.helpers.ProfileImage
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.usersettings.ProfilePreview
+import chat.simplex.app.views.helpers.ProfileImage
-import chat.simplex.res.MR
+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(Unit) {
+  LaunchedEffect(true) { SoundPlayer.shared.start(cxt, scope, sound = !chatModel.showCallView.value) }
-    if (chatModel.activeCallInvitation.value?.sentNotification == false || appPlatform.isDesktop) {
+  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
-      SoundPlayer.start(scope, sound = !chatModel.showCallView.value)
-    }
-  }
-  DisposableEffect(true) { onDispose { SoundPlayer.stop() } }
   IncomingCallAlertLayout(
     invitation,
     chatModel,
     rejectCall = { cm.endCall(invitation = invitation) },
     ignoreCall = {
       chatModel.activeCallInvitation.value = null
-      ntfManager.cancelCallNotification()
+      chatModel.controller.ntfManager.cancelCallNotification()
     },
     acceptCall = { cm.acceptIncomingCall(invitation = invitation) }
   )
@@ -52,18 +50,18 @@ fun IncomingCallAlertLayout(
   ignoreCall: () -> Unit,
   acceptCall: () -> Unit
 ) {
-  val color = if (isInDarkTheme()) MaterialTheme.colors.surface else IncomingCallLight
+  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)
+        ProfilePreview(profileOf = invitation.contact, size = 64.dp, color = Color.White)
       }
       Row(verticalAlignment = Alignment.CenterVertically) {
-        CallButton(stringResource(MR.strings.reject), painterResource(MR.images.ic_call_end_filled), Color.Red, rejectCall)
+        CallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
-        CallButton(stringResource(MR.strings.ignore), painterResource(MR.images.ic_close), MaterialTheme.colors.primary, ignoreCall)
+        CallButton(stringResource(R.string.ignore), painterResource(R.drawable.ic_close), MaterialTheme.colors.primary, ignoreCall)
-        CallButton(stringResource(MR.strings.accept), painterResource(MR.images.ic_check_filled), SimplexGreen, acceptCall)
+        CallButton(stringResource(R.string.accept), painterResource(R.drawable.ic_check_filled), SimplexGreen, acceptCall)
       }
     }
   }
@@ -77,10 +75,10 @@ fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
       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(MR.images.ic_videocam_filled), stringResource(MR.strings.icon_descr_video_call))
+    if (invitation.callType.media == CallMediaType.Video) CallIcon(painterResource(R.drawable.ic_videocam_filled), stringResource(R.string.icon_descr_video_call))
-    else CallIcon(painterResource(MR.images.ic_call_filled), stringResource(MR.strings.icon_descr_audio_call))
+    else CallIcon(painterResource(R.drawable.ic_call_filled), stringResource(R.string.icon_descr_audio_call))
     Spacer(Modifier.width(4.dp))
-    Text(invitation.callTypeText, color = MaterialTheme.colors.onBackground)
+    Text(invitation.callTypeText)
   }
 }
 
@@ -88,8 +86,7 @@ fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
 private fun CallButton(text: String, icon: Painter, color: Color, action: () -> Unit) {
   Surface(
     shape = RoundedCornerShape(10.dp),
-    color = Color.Transparent,
+    color = Color.Transparent
-    contentColor = LocalContentColor.current
   ) {
     Column(
       Modifier
@@ -110,14 +107,13 @@ fun PreviewIncomingCallAlertLayout() {
   SimpleXTheme {
     IncomingCallAlertLayout(
       invitation = RcvCallInvitation(
-        remoteHostId = null,
         user = User.sampleData,
         contact = Contact.sampleData,
         callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
         sharedKey = null,
         callTs = Clock.System.now()
       ),
-      chatModel = ChatModel,
+      chatModel = SimplexApp.context.chatModel,
       rejectCall = {},
       ignoreCall = {},
       acceptCall = {}

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

@@ -0,0 +1,51 @@
+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,17 +1,21 @@
-package chat.simplex.common.views.call
+package chat.simplex.app.views.call
 
-import chat.simplex.common.views.helpers.generalGetString
+import android.util.Log
-import chat.simplex.common.model.*
+import androidx.compose.runtime.Composable
-import chat.simplex.res.MR
+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 remoteHostId: Long?,
-  val userProfile: Profile,
   val contact: Contact,
   val callState: CallState,
   val localMedia: CallMediaType,
@@ -20,24 +24,21 @@ data class Call(
   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 connectionInfo: ConnectionInfo? = null
-  var connectedAt: Instant? = null,
 ) {
   val encrypted: Boolean get() = localEncrypted && sharedKey != null
   val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false
 
-  val encryptionStatus: String get() = when(callState) {
+  val encryptionStatus: String @Composable get() = when(callState) {
     CallState.WaitCapabilities -> ""
-    CallState.InvitationSent -> generalGetString(if (localEncrypted) MR.strings.status_e2e_encrypted else MR.strings.status_no_e2e_encryption)
+    CallState.InvitationSent -> stringResource(if (localEncrypted) R.string.status_e2e_encrypted else R.string.status_no_e2e_encryption)
-    CallState.InvitationAccepted -> generalGetString(if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_contact_has_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 -> generalGetString(if (!localEncrypted) MR.strings.status_no_e2e_encryption else if (sharedKey == null) MR.strings.status_contact_has_no_e2e_encryption else MR.strings.status_e2e_encrypted)
+    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
-
-  fun supportsVideo(): Boolean = peerMedia == CallMediaType.Video || localMedia == CallMediaType.Video
-
 }
 
 enum class CallState {
@@ -51,16 +52,16 @@ enum class CallState {
   Connected,
   Ended;
 
-  val text: String get() = when(this) {
+  val text: String @Composable get() = when(this) {
-    WaitCapabilities -> generalGetString(MR.strings.callstate_starting)
+    WaitCapabilities -> stringResource(R.string.callstate_starting)
-    InvitationSent -> generalGetString(MR.strings.callstate_waiting_for_answer)
+    InvitationSent -> stringResource(R.string.callstate_waiting_for_answer)
-    InvitationAccepted -> generalGetString(MR.strings.callstate_starting)
+    InvitationAccepted -> stringResource(R.string.callstate_starting)
-    OfferSent -> generalGetString(MR.strings.callstate_waiting_for_confirmation)
+    OfferSent -> stringResource(R.string.callstate_waiting_for_confirmation)
-    OfferReceived -> generalGetString(MR.strings.callstate_received_answer)
+    OfferReceived -> stringResource(R.string.callstate_received_answer)
-    AnswerReceived -> generalGetString(MR.strings.callstate_received_confirmation)
+    AnswerReceived -> stringResource(R.string.callstate_received_confirmation)
-    Negotiated -> generalGetString(MR.strings.callstate_connecting)
+    Negotiated -> stringResource(R.string.callstate_connecting)
-    Connected -> generalGetString(MR.strings.callstate_connected)
+    Connected -> stringResource(R.string.callstate_connected)
-    Ended -> generalGetString(MR.strings.callstate_ended)
+    Ended -> stringResource(R.string.callstate_ended)
   }
 }
 
@@ -69,15 +70,13 @@ enum class CallState {
 
 @Serializable
 sealed class WCallCommand {
-  @Serializable @SerialName("capabilities") data class Capabilities(val media: CallMediaType): 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("description") data class Description(val state: String, val description: String): WCallCommand()
-  @Serializable @SerialName("layout") data class Layout(val layout: LayoutType): WCallCommand()
   @Serializable @SerialName("end") object End: WCallCommand()
 }
 
@@ -89,7 +88,6 @@ sealed class 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("end") object End: WCallResponse()
   @Serializable @SerialName("ended") object Ended: WCallResponse()
   @Serializable @SerialName("ok") object Ok: WCallResponse()
   @Serializable @SerialName("error") data class Error(val message: String): WCallResponse()
@@ -99,44 +97,42 @@ sealed class WCallResponse {
 @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(
+@Serializable data class RcvCallInvitation(val user: User, val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant) {
-  val remoteHostId: Long?,
-  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) MR.strings.video_call_no_encryption else MR.strings.encrypted_video_call
+    CallMediaType.Video -> if (sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
-    CallMediaType.Audio -> if (sharedKey == null) MR.strings.audio_call_no_encryption else MR.strings.encrypted_audio_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 -> MR.strings.incoming_video_call
+    CallMediaType.Video -> R.string.incoming_video_call
-    CallMediaType.Audio -> MR.strings.incoming_audio_call
+    CallMediaType.Audio -> R.string.incoming_audio_call
   })
-
-  // Shows whether notification was shown or not to prevent playing sound twice in both notification and in-app
-  var sentNotification: Boolean = false
 }
 @Serializable data class CallCapabilities(val encryption: Boolean)
 @Serializable data class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
-  val text: String get() {
+  val text: String @Composable get() {
     val local = localCandidate?.candidateType
     val remote = remoteCandidate?.candidateType
     return when {
       local == RTCIceCandidateType.Host && remote == RTCIceCandidateType.Host ->
-        generalGetString(MR.strings.call_connection_peer_to_peer)
+        stringResource(R.string.call_connection_peer_to_peer)
       local == RTCIceCandidateType.Relay && remote == RTCIceCandidateType.Relay ->
-        generalGetString(MR.strings.call_connection_via_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?)
+@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)
 
@@ -170,13 +166,6 @@ enum class VideoCamera {
   val flipped: VideoCamera get() = if (this == User) Environment else User
 }
 
-@Serializable
-enum class LayoutType {
-  @SerialName("default") Default,
-  @SerialName("localVideo") LocalVideo,
-  @SerialName("remoteVideo") RemoteVideo
-}
-
 @Serializable
 data class ConnectionState(
   val connectionState: String,
@@ -186,11 +175,10 @@ data class ConnectionState(
 )
 
 // the servers are expected in this format:
-// stuns:stun.simplex.im:443?transport=tcp
+// stun:stun.simplex.im:443?transport=tcp
-// turns:private2:Hxuq2QxUjnhj96Zq2r4HjqHRj@turn.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, "stuns:")
   s = replaceScheme(s, "turn:")
   s = replaceScheme(s, "turns:")
   val u = runCatching { URI(s) }.getOrNull()
@@ -198,7 +186,7 @@ fun parseRTCIceServer(str: String): RTCIceServer? {
     val scheme = u.scheme
     val host = u.host
     val port = u.port
-    if (u.path == "" && (scheme == "stun" || scheme == "stuns" || scheme == "turn" || scheme == "turns")) {
+    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(
@@ -227,7 +215,7 @@ fun parseRTCIceServers(servers: List<String>): List<RTCIceServer>? {
 }
 
 fun getIceServers(): List<RTCIceServer>? {
-  val value = ChatController.appPrefs.webrtcIceServers.get() ?: return null
+  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

@@ -0,0 +1,465 @@
+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,6 +1,3 @@
-package chat.simplex.common.views.chat
-
-import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -8,15 +5,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.R
-import chat.simplex.res.MR
+import chat.simplex.app.ui.theme.*
 
 @Composable
 fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
   Row(
     Modifier
       .height(60.dp)
@@ -26,8 +24,8 @@ fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boo
     verticalAlignment = Alignment.CenterVertically
   ) {
     Icon(
-      painterResource(MR.images.ic_draft_filled),
+      painterResource(R.drawable.ic_draft_filled),
-      stringResource(MR.strings.icon_descr_file),
+      stringResource(R.string.icon_descr_file),
       Modifier
         .padding(start = 4.dp, end = 2.dp)
         .size(36.dp),
@@ -38,8 +36,8 @@ fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boo
     if (cancelEnabled) {
       IconButton(onClick = cancelFile, modifier = Modifier.padding(0.dp)) {
         Icon(
-          painterResource(MR.images.ic_close),
+          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(MR.strings.icon_descr_cancel_file_preview),
+          contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
           tint = MaterialTheme.colors.primary,
           modifier = Modifier.padding(10.dp)
         )

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chat
+package chat.simplex.app.views.chat
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -10,17 +10,18 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.graphics.asImageBitmap
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.platform.base64ToBitmap
+import chat.simplex.app.R
-import chat.simplex.res.MR
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.views.helpers.UploadContent
-import chat.simplex.common.views.helpers.UploadContent
+import chat.simplex.app.views.helpers.base64ToBitmap
 
 @Composable
 fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
   Row(
     Modifier
       .padding(top = 8.dp)
@@ -36,14 +37,14 @@ fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Uni
         val content = media.content[index]
         if (content is UploadContent.Video) {
           Box(contentAlignment = Alignment.Center) {
-            val imageBitmap = base64ToBitmap(item)
+            val imageBitmap = base64ToBitmap(item).asImageBitmap()
             Image(
               imageBitmap,
               "preview video",
               modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
             )
             Icon(
-              painterResource(MR.images.ic_videocam_filled),
+              painterResource(R.drawable.ic_videocam_filled),
               "preview video",
               Modifier
                 .size(20.dp),
@@ -51,7 +52,7 @@ fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Uni
             )
           }
         } else {
-          val imageBitmap = base64ToBitmap(item)
+          val imageBitmap = base64ToBitmap(item).asImageBitmap()
           Image(
             imageBitmap,
             "preview image",
@@ -63,8 +64,8 @@ fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Uni
     if (cancelEnabled) {
       IconButton(onClick = cancelImages) {
         Icon(
-          painterResource(MR.images.ic_close),
+          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(MR.strings.icon_descr_cancel_image_preview),
+          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

@@ -0,0 +1,850 @@
+@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

@@ -0,0 +1,131 @@
+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,4 +1,4 @@
-package chat.simplex.common.views.chat
+package chat.simplex.app.views.chat
 
 import InfoRow
 import SectionBottomSpacer
@@ -14,33 +14,31 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.R
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.model.*
-import chat.simplex.common.views.usersettings.PreferenceToggle
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.model.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.app.views.usersettings.PreferenceToggle
-import chat.simplex.res.MR
 
 @Composable
 fun ContactPreferencesView(
   m: ChatModel,
   user: User,
-  rhId: Long?,
   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, user, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
+  var featuresAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
-  var currentFeaturesAllowed by rememberSaveable(ct, user, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
+  var currentFeaturesAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
 
   fun savePrefs(afterSave: () -> Unit = {}) {
-    withBGApi {
+    withApi {
       val prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
-      val toContact = m.controller.apiSetContactPrefs(rhId, ct.contactId, prefs)
+      val toContact = m.controller.apiSetContactPrefs(ct.contactId, prefs)
       if (toContact != null) {
-        m.updateContact(rhId, toContact)
+        m.updateContact(toContact)
         currentFeaturesAllowed = featuresAllowed
       }
       afterSave()
@@ -78,11 +76,12 @@ private fun ContactPreferencesLayout(
   reset: () -> Unit,
   savePrefs: () -> Unit,
 ) {
-  ColumnWithScrollBar(
+  Column(
     Modifier
-      .fillMaxWidth(),
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
   ) {
-    AppBarTitle(stringResource(MR.strings.contact_preferences))
+    AppBarTitle(stringResource(R.string.contact_preferences))
     val timedMessages: MutableState<Boolean> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.timedMessagesAllowed) }
     val onTTLUpdated = { ttl: Int? ->
       applyPrefs(featuresAllowed.copy(timedMessagesTTL = ttl))
@@ -96,11 +95,6 @@ private fun ContactPreferencesLayout(
       applyPrefs(featuresAllowed.copy(fullDelete = it))
     }
     SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowReactions: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.reactions) }
-    FeatureSection(ChatFeature.Reactions, user.fullPreferences.reactions.allow, contact.mergedPreferences.reactions, allowReactions) {
-      applyPrefs(featuresAllowed.copy(reactions = 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))
@@ -141,18 +135,19 @@ private fun FeatureSection(
     leadingIcon = true,
   ) {
     ExposedDropDownSettingRow(
-      generalGetString(MR.strings.chat_preferences_you_allow),
+      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(MR.strings.chat_preferences_contact_allows),
+      generalGetString(R.string.chat_preferences_contact_allows),
       pref.contactPreference.allow.text
     )
   }
-  SectionTextFooter(feature.enabledDescription(enabled))
+  SectionTextFooter(feature.enabledDescription(enabled) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
 }
 
 @Composable
@@ -176,28 +171,20 @@ private fun TimedMessagesFeatureSection(
     leadingIcon = true,
   ) {
     PreferenceToggle(
-      generalGetString(MR.strings.chat_preferences_you_allow),
+      generalGetString(R.string.chat_preferences_you_allow),
       checked = allowFeature.value,
     ) { allow ->
       onSelected(allow, if (allow) featuresAllowed.timedMessagesTTL ?: 86400 else null)
     }
     InfoRow(
-      generalGetString(MR.strings.chat_preferences_contact_allows),
+      generalGetString(R.string.chat_preferences_contact_allows),
       pref.contactPreference.allow.text
     )
     if (featuresAllowed.timedMessagesAllowed) {
       val ttl = rememberSaveable(featuresAllowed.timedMessagesTTL) { mutableStateOf(featuresAllowed.timedMessagesTTL) }
-      DropdownCustomTimePickerSettingRow(
+      TimedMessagesTTLPicker(ttl, onTTLUpdated)
-        selection = ttl,
-        propagateExternalSelectionUpdate = true, // for Reset
-        label = generalGetString(MR.strings.delete_after),
-        dropdownValues = TimedMessagesPreference.ttlValues,
-        customPickerTitle = generalGetString(MR.strings.delete_after),
-        customPickerConfirmButtonText = generalGetString(MR.strings.custom_time_picker_select),
-        onSelected = onTTLUpdated
-      )
     } else if (pref.contactPreference.allow == FeatureAllowed.YES || pref.contactPreference.allow == FeatureAllowed.ALWAYS) {
-      InfoRow(generalGetString(MR.strings.delete_after), timeText(pref.contactPreference.ttl))
+      InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(pref.contactPreference.ttl))
     }
   }
   SectionTextFooter(ChatFeature.TimedMessages.enabledDescription(enabled))
@@ -207,19 +194,31 @@ private fun TimedMessagesFeatureSection(
 private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
   SectionView {
     SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(MR.strings.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
     }
     SectionItemView(save, disabled = disabled) {
-      Text(stringResource(MR.strings.save_and_notify_contact), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      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(MR.strings.save_preferences_question),
+    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(MR.strings.save_and_notify_contact),
+    confirmText = generalGetString(R.string.save_and_notify_contact),
-    dismissText = generalGetString(MR.strings.exit_without_saving),
+    dismissText = generalGetString(R.string.exit_without_saving),
     onConfirm = save,
     onDismiss = revert,
   )

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

@@ -0,0 +1,79 @@
+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

@@ -0,0 +1,53 @@
+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,11 +1,24 @@
-package chat.simplex.common.views.chat
+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.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
@@ -15,21 +28,29 @@ 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 chat.simplex.common.model.*
+import androidx.compose.ui.viewinterop.AndroidView
-import chat.simplex.common.ui.theme.*
+import androidx.core.graphics.drawable.DrawableCompat
-import chat.simplex.common.views.chat.item.ItemAction
+import androidx.core.view.inputmethod.EditorInfoCompat
-import chat.simplex.common.views.helpers.*
+import androidx.core.view.inputmethod.InputConnectionCompat
-import chat.simplex.common.model.ChatItem
+import androidx.core.widget.*
-import chat.simplex.common.platform.*
+import chat.simplex.app.R
-import chat.simplex.common.views.usersettings.showInDevelopingAlert
+import chat.simplex.app.SimplexApp
-import chat.simplex.res.MR
+import chat.simplex.app.model.*
-import dev.icerock.moko.resources.compose.stringResource
+import chat.simplex.app.ui.theme.CurrentColors
-import dev.icerock.moko.resources.compose.painterResource
+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.net.URI
+import java.lang.reflect.Field
 
 @Composable
 fun SendMsgView(
@@ -38,70 +59,44 @@ fun SendMsgView(
   recState: MutableState<RecordingState>,
   isDirectChat: Boolean,
   liveMessageAlertShown: SharedPreference<Boolean>,
-  sendMsgEnabled: Boolean,
-  sendButtonEnabled: Boolean,
-  nextSendGrpInv: Boolean,
   needToAllowVoiceToContact: Boolean,
   allowedVoiceByPrefs: Boolean,
   userIsObserver: Boolean,
   userCanSend: Boolean,
-  sendButtonColor: Color = MaterialTheme.colors.primary,
   allowVoiceToContact: () -> Unit,
-  timedMessageAllowed: Boolean = false,
+  sendMessage: () -> Unit,
-  customDisappearingMessageTimePref: SharedPreference<Int>? = null,
-  sendMessage: (Int?) -> Unit,
   sendLiveMessage: (suspend () -> Unit)? = null,
   updateLiveMessage: (suspend () -> Unit)? = null,
   cancelLiveMessage: (() -> Unit)? = null,
-  editPrevMessage: () -> Unit,
-  onFilesPasted: (List<URI>) -> Unit,
   onMessageChange: (String) -> Unit,
   textStyle: MutableState<TextStyle>
 ) {
-  val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }
-
   Box(Modifier.padding(vertical = 8.dp)) {
     val cs = composeState.value
-    var progressByTimeout by rememberSaveable { mutableStateOf(false) }
+    val showProgress = cs.inProgress && (cs.preview is ComposePreview.MediaPreview || cs.preview is ComposePreview.FilePreview)
-    LaunchedEffect(composeState.value.inProgress) {
+    val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
-      progressByTimeout = if (composeState.value.inProgress) {
+        cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
-        delay(500)
-        composeState.value.inProgress
-      } else {
-        false
-      }
-    }
-    val showVoiceButton = !nextSendGrpInv && cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
-        !composeState.value.forwarding && cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    val sendMsgButtonDisabled = !sendMsgEnabled || !cs.sendEnabled() ||
+    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
-      (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-        cs.endLiveDisabled ||
-        !sendButtonEnabled
-    PlatformTextField(composeState, sendMsgEnabled, sendMsgButtonDisabled, textStyle, showDeleteTextButton, userIsObserver, onMessageChange, editPrevMessage, onFilesPasted) {
-      if (!cs.inProgress) {
-        sendMessage(null)
-      }
-    }
     // Disable clicks on text field
-    if (!sendMsgEnabled || cs.preview is ComposePreview.VoicePreview || !userCanSend || cs.inProgress) {
+    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
-      Box(
+      Box(Modifier
-        Modifier
+        .matchParentSize()
-          .matchParentSize()
+        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-          .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
+          AlertManager.shared.showAlertMsg(
-            AlertManager.shared.showAlertMsg(
+            title = generalGetString(R.string.observer_cant_send_message_title),
-              title = generalGetString(MR.strings.observer_cant_send_message_title),
+            text = generalGetString(R.string.observer_cant_send_message_desc)
-              text = generalGetString(MR.strings.observer_cant_send_message_desc)
+          )
-            )
+        })
-          })
       )
     }
     if (showDeleteTextButton.value) {
       DeleteTextButton(composeState)
     }
-    Box(Modifier.align(Alignment.BottomEnd).padding(bottom = if (appPlatform.isAndroid) 0.dp else 5.dp)) {
+    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
@@ -110,8 +105,8 @@ fun SendMsgView(
         }
       }
       when {
-        progressByTimeout -> ProgressIndicator()
+        showProgress -> ProgressIndicator()
-        showVoiceButton && sendMsgEnabled -> {
+        showVoiceButton -> {
           Row(verticalAlignment = Alignment.CenterVertically) {
             val stopRecOnNextClick = remember { mutableStateOf(false) }
             when {
@@ -124,16 +119,15 @@ fun SendMsgView(
                   }
                 }
               }
-              !allowedToRecordVoiceByPlatform() ->
+              !permissionsState.allPermissionsGranted ->
-                VoiceButtonWithoutPermissionByPlatform()
+                VoiceButtonWithoutPermission { permissionsState.launchMultiplePermissionRequest() }
               else ->
                 RecordVoiceView(recState, stopRecOnNextClick)
             }
-            if (sendLiveMessage != null
+            if (sendLiveMessage != null 
-              && updateLiveMessage != null
+                && updateLiveMessage != null
-              && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
+                && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
-              && cs.contextItem is ComposeContextItem.NoContextItem
+                && cs.contextItem is ComposeContextItem.NoContextItem) {
-            ) {
               Spacer(Modifier.width(10.dp))
               StartLiveMessageButton(userCanSend) {
                 if (composeState.value.preview is ComposePreview.NoPreview) {
@@ -150,60 +144,32 @@ fun SendMsgView(
         }
         else -> {
           val cs = composeState.value
-          val icon = if (cs.editing || cs.liveMessage != null) painterResource(MR.images.ic_check_filled) else painterResource(MR.images.ic_arrow_upward)
+          val icon = if (cs.editing || cs.liveMessage != null) painterResource(R.drawable.ic_check_filled) else painterResource(R.drawable.ic_arrow_upward)
-          val showDropdown = rememberSaveable { mutableStateOf(false) }
+          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 }
 
-          @Composable
+            DefaultDropdownMenu(
-          fun MenuItems(): List<@Composable () -> Unit> {
+              showDropdown,
-            val menuItems = mutableListOf<@Composable () -> Unit>()
+            ) {
-
+              ItemAction(
-            if (cs.liveMessage == null && !cs.editing && !nextSendGrpInv || sendMsgEnabled) {
+                generalGetString(R.string.send_live_message),
-              if (
+                BoltFilled,
-                cs.preview !is ComposePreview.VoicePreview &&
+                onClick = {
-                cs.contextItem is ComposeContextItem.NoContextItem &&
+                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                sendLiveMessage != null && updateLiveMessage != null
+                  showDropdown.value = false
-              ) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(MR.strings.send_live_message),
-                    BoltFilled,
-                    onClick = {
-                      startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                      showDropdown.value = false
-                    }
-                  )
                 }
-              }
+              )
-              if (timedMessageAllowed) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(MR.strings.disappearing_message),
-                    painterResource(MR.images.ic_timer),
-                    onClick = {
-                      showCustomDisappearingMessageDialog.value = true
-                      showDropdown.value = false
-                    }
-                  )
-                }
-              }
             }
-
-            return menuItems
-          }
-
-          val menuItems = MenuItems()
-          if (menuItems.isNotEmpty()) {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage) { showDropdown.value = true }
-            DefaultDropdownMenu(showDropdown) {
-              menuItems.forEach { composable -> composable() }
-            }
-            CustomDisappearingMessageDialog(
-              showCustomDisappearingMessageDialog,
-              sendMessage = sendMessage,
-              customDisappearingMessageTimePref = customDisappearingMessageTimePref
-            )
           } else {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage)
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage)
           }
         }
       }
@@ -212,52 +178,115 @@ fun SendMsgView(
 }
 
 @Composable
-expect fun allowedToRecordVoiceByPlatform(): Boolean
+private fun NativeKeyboard(
-
+  composeState: MutableState<ComposeState>,
-@Composable
+  textStyle: MutableState<TextStyle>,
-expect fun VoiceButtonWithoutPermissionByPlatform()
+  showDeleteTextButton: MutableState<Boolean>,
-
+  userIsObserver: Boolean,
-@Composable
+  onMessageChange: (String) -> Unit
-private fun CustomDisappearingMessageDialog(
-  showMenu: MutableState<Boolean>,
-  sendMessage: (Int?) -> Unit,
-  customDisappearingMessageTimePref: SharedPreference<Int>?
 ) {
-  DefaultDropdownMenu(showMenu) {
+  val cs = composeState.value
-    Text(
+  val textColor = MaterialTheme.colors.onBackground
-      generalGetString(MR.strings.send_disappearing_message),
+  val tintColor = MaterialTheme.colors.secondaryVariant
-      Modifier.padding(vertical = DEFAULT_PADDING_HALF, horizontal = DEFAULT_PADDING * 1.5f),
+  val padding = PaddingValues(12.dp, 7.dp, 45.dp, 0.dp)
-      fontSize = 16.sp,
+  val paddingStart = with(LocalDensity.current) { 12.dp.roundToPx() }
-      color = MaterialTheme.colors.secondary
+  val paddingTop = with(LocalDensity.current) { 7.dp.roundToPx() }
-    )
+  val paddingEnd = with(LocalDensity.current) { 45.dp.roundToPx() }
-
+  val paddingBottom = with(LocalDensity.current) { 7.dp.roundToPx() }
-    ItemAction(generalGetString(MR.strings.send_disappearing_message_30_seconds)) {
+  var showKeyboard by remember { mutableStateOf(false) }
-      sendMessage(30)
+  LaunchedEffect(cs.contextItem) {
-      showMenu.value = false
+    if (cs.contextItem is ComposeContextItem.QuotedItem) {
-    }
+      delay(100)
-    ItemAction(generalGetString(MR.strings.send_disappearing_message_1_minute)) {
+      showKeyboard = true
-      sendMessage(60)
+    } else if (cs.contextItem is ComposeContextItem.EditingItem) {
-      showMenu.value = false
+      // Keyboard will not show up if we try to show it too fast
-    }
+      delay(300)
-    ItemAction(generalGetString(MR.strings.send_disappearing_message_5_minutes)) {
+      showKeyboard = true
-      sendMessage(300)
-      showMenu.value = false
-    }
-    ItemAction(generalGetString(MR.strings.send_disappearing_message_custom_time)) {
-      showMenu.value = false
-      val selectedDisappearingMessageTime = mutableStateOf(customDisappearingMessageTimePref?.get?.invoke() ?: 300)
-      showCustomTimePickerDialog(
-        selectedDisappearingMessageTime,
-        title = generalGetString(MR.strings.delete_after),
-        confirmButtonText = generalGetString(MR.strings.send_disappearing_message_send),
-        confirmButtonAction = { ttl ->
-          sendMessage(ttl)
-          customDisappearingMessageTimePref?.set?.invoke(ttl)
-        },
-        cancel = { showMenu.value = false }
-      )
     }
   }
+
+  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
@@ -266,13 +295,13 @@ private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>)
     { composeState.value = composeState.value.copy(message = "") },
     Modifier.align(Alignment.TopEnd).size(36.dp)
   ) {
-    Icon(painterResource(MR.images.ic_close), null, Modifier.padding(7.dp).size(36.dp), tint = MaterialTheme.colors.secondary)
+    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: RecorderInterface = remember { RecorderNative() }
+  val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
   DisposableEffect(Unit) { onDispose { rec.stop() } }
   val stopRecordingAndAddAudio: () -> Unit = {
     recState.value.filePathNullable?.let {
@@ -289,10 +318,7 @@ private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNex
     LockToCurrentOrientationUntilDispose()
     StopRecordButton(stopRecordingAndAddAudio)
   } else {
-    val startRecording: () -> Unit = out@ {
+    val startRecording: () -> Unit = {
-      if (appPlatform.isDesktop) {
-        return@out showInDevelopingAlert()
-      }
       recState.value = RecordingState.Started(
         filePath = rec.start { progress: Int?, finished: Boolean ->
           val state = recState.value
@@ -326,8 +352,8 @@ private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNex
 private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
   IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
     Icon(
-      painterResource(MR.images.ic_keyboard_voice),
+      painterResource(R.drawable.ic_keyboard_voice),
-      stringResource(MR.strings.icon_descr_record_voice_message),
+      stringResource(R.string.icon_descr_record_voice_message),
       tint = MaterialTheme.colors.secondary,
       modifier = Modifier
         .size(36.dp)
@@ -337,11 +363,11 @@ private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
 }
 
 @Composable
-fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
+private fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
   IconButton(onClick, Modifier.size(36.dp)) {
     Icon(
-      painterResource(MR.images.ic_keyboard_voice_filled),
+      painterResource(R.drawable.ic_keyboard_voice_filled),
-      stringResource(MR.strings.icon_descr_record_voice_message),
+      stringResource(R.string.icon_descr_record_voice_message),
       tint = MaterialTheme.colors.primary,
       modifier = Modifier
         .size(34.dp)
@@ -350,12 +376,30 @@ fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
   }
 }
 
+@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(MR.images.ic_stop_filled),
+      painterResource(R.drawable.ic_stop_filled),
-      stringResource(MR.strings.icon_descr_record_voice_message),
+      stringResource(R.string.icon_descr_record_voice_message),
       tint = MaterialTheme.colors.primary,
       modifier = Modifier
         .size(36.dp)
@@ -368,8 +412,8 @@ private fun StopRecordButton(onClick: () -> Unit) {
 private fun RecordVoiceButton(interactionSource: MutableInteractionSource) {
   IconButton({}, Modifier.size(36.dp), interactionSource = interactionSource) {
     Icon(
-      painterResource(MR.images.ic_keyboard_voice_filled),
+      painterResource(R.drawable.ic_keyboard_voice_filled),
-      stringResource(MR.strings.icon_descr_record_voice_message),
+      stringResource(R.string.icon_descr_record_voice_message),
       tint = MaterialTheme.colors.primary,
       modifier = Modifier
         .size(34.dp)
@@ -389,8 +433,8 @@ private fun CancelLiveMessageButton(
 ) {
   IconButton(onClick, Modifier.size(36.dp)) {
     Icon(
-      painterResource(MR.images.ic_close),
+      painterResource(R.drawable.ic_close),
-      stringResource(MR.strings.icon_descr_cancel_live_message),
+      stringResource(R.string.icon_descr_cancel_live_message),
       tint = MaterialTheme.colors.primary,
       modifier = Modifier
         .size(36.dp)
@@ -404,35 +448,33 @@ private fun SendMsgButton(
   icon: Painter,
   sizeDp: Animatable<Float, AnimationVector1D>,
   alpha: Animatable<Float, AnimationVector1D>,
-  sendButtonColor: Color,
   enabled: Boolean,
-  sendMessage: (Int?) -> Unit,
+  sendMessage: () -> Unit,
   onLongClick: (() -> Unit)? = null
 ) {
   val interactionSource = remember { MutableInteractionSource() }
   Box(
     modifier = Modifier.requiredSize(36.dp)
       .combinedClickable(
-        onClick = { sendMessage(null) },
+        onClick = sendMessage,
         onLongClick = onLongClick,
         enabled = enabled,
         role = Role.Button,
         interactionSource = interactionSource,
         indication = rememberRipple(bounded = false, radius = 24.dp)
-      )
+      ),
-      .onRightClick { onLongClick?.invoke() },
     contentAlignment = Alignment.Center
   ) {
     Icon(
       icon,
-      stringResource(MR.strings.icon_descr_send_message),
+      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) sendButtonColor else MaterialTheme.colors.secondary.copy(alpha = 0.75f))
+        .background(if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary)
         .padding(3.dp)
     )
   }
@@ -454,7 +496,7 @@ private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
   ) {
     Icon(
       BoltFilled,
-      stringResource(MR.strings.icon_descr_send_message),
+      stringResource(R.string.icon_descr_send_message),
       tint = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
       modifier = Modifier
         .size(36.dp)
@@ -505,9 +547,9 @@ private fun startLiveMessage(
     start()
   } else {
     AlertManager.shared.showAlertDialog(
-      title = generalGetString(MR.strings.live_message),
+      title = generalGetString(R.string.live_message),
-      text = generalGetString(MR.strings.send_live_message_desc),
+      text = generalGetString(R.string.send_live_message_desc),
-      confirmText = generalGetString(MR.strings.send_verb),
+      confirmText = generalGetString(R.string.send_verb),
       onConfirm = {
         liveMessageAlertShown.set(true)
         start()
@@ -517,31 +559,32 @@ private fun startLiveMessage(
 
 private fun showNeedToAllowVoiceAlert(onConfirm: () -> Unit) {
   AlertManager.shared.showAlertDialog(
-    title = generalGetString(MR.strings.allow_voice_messages_question),
+    title = generalGetString(R.string.allow_voice_messages_question),
-    text = generalGetString(MR.strings.you_need_to_allow_to_send_voice),
+    text = generalGetString(R.string.you_need_to_allow_to_send_voice),
-    confirmText = generalGetString(MR.strings.allow_verb),
+    confirmText = generalGetString(R.string.allow_verb),
-    dismissText = generalGetString(MR.strings.cancel_verb),
+    dismissText = generalGetString(R.string.cancel_verb),
     onConfirm = onConfirm,
   )
 }
 
 private fun showDisabledVoiceAlert(isDirectChat: Boolean) {
   AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.voice_messages_prohibited),
+    title = generalGetString(R.string.voice_messages_prohibited),
     text = generalGetString(
       if (isDirectChat)
-        MR.strings.ask_your_contact_to_enable_voice
+        R.string.ask_your_contact_to_enable_voice
       else
-        MR.strings.only_group_owners_can_enable_voice
+        R.string.only_group_owners_can_enable_voice
     )
   )
 }
 
-@Preview/*(
+@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)
@@ -553,29 +596,24 @@ fun PreviewSendMsgView() {
       recState = remember { mutableStateOf(RecordingState.NotStarted) },
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      sendMsgEnabled = true,
-      sendButtonEnabled = true,
-      nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
-      editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }
 }
 
-@Preview/*(
+@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)
@@ -588,29 +626,24 @@ fun PreviewSendMsgViewEditing() {
       recState = remember { mutableStateOf(RecordingState.NotStarted) },
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      sendMsgEnabled = true,
-      sendButtonEnabled = true,
-      nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
-      editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }
 }
 
-@Preview/*(
+@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)
@@ -623,19 +656,13 @@ fun PreviewSendMsgViewInProgress() {
       recState = remember { mutableStateOf(RecordingState.NotStarted) },
       isDirectChat = true,
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      sendMsgEnabled = true,
-      sendButtonEnabled = true,
-      nextSendGrpInv = false,
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
-      editPrevMessage = {},
       onMessageChange = { _ -> },
-      onFilesPasted = {},
       textStyle = textStyle
     )
   }

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chat
+package chat.simplex.app.views.chat
 
 import SectionBottomSpacer
 import SectionView
@@ -10,17 +10,16 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+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.common.platform.*
+import chat.simplex.app.R
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.views.newchat.QRCode
+import chat.simplex.app.views.newchat.QRCode
-import chat.simplex.res.MR
 
 @Composable
 fun VerifyCodeView(
@@ -56,23 +55,26 @@ private fun VerifyCodeLayout(
   connectionVerified: Boolean,
   verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit,
 ) {
-  ColumnWithScrollBar(
+  Column(
     Modifier
       .fillMaxSize()
+      .verticalScroll(rememberScrollState())
       .padding(horizontal = DEFAULT_PADDING)
   ) {
-    AppBarTitle(stringResource(MR.strings.security_code), withPadding = false)
+    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(MR.images.ic_verified_user), null, Modifier.padding(end = 4.dp).size(22.dp), tint = MaterialTheme.colors.secondary)
+        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 4.dp).size(22.dp), tint = MaterialTheme.colors.secondary)
-        Text(String.format(stringResource(MR.strings.is_verified), displayName))
+        Text(String.format(stringResource(R.string.is_verified), displayName))
       } else {
-        Text(String.format(stringResource(MR.strings.is_not_verified), displayName))
+        Text(String.format(stringResource(R.string.is_not_verified), displayName))
       }
     }
 
-    QRCode(connectionCode, padding = PaddingValues(vertical = DEFAULT_PADDING_HALF))
+    SectionView {
+      QRCode(connectionCode, Modifier.aspectRatio(1f))
+    }
 
     Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
       Spacer(Modifier.weight(2f))
@@ -84,17 +86,17 @@ private fun VerifyCodeLayout(
           maxLines = 20
         )
       }
+      val context = LocalContext.current
       Box(Modifier.weight(1f)) {
-        val clipboard = LocalClipboardManager.current
+        IconButton({ shareText(context, connectionCode) }, Modifier.size(20.dp).align(Alignment.CenterStart)) {
-        IconButton({ clipboard.shareText(connectionCode) }, Modifier.size(20.dp).align(Alignment.CenterStart)) {
+          Icon(painterResource(R.drawable.ic_share_filled), null, tint = MaterialTheme.colors.primary)
-          Icon(painterResource(MR.images.ic_share_filled), null, tint = MaterialTheme.colors.primary)
         }
       }
       Spacer(Modifier.weight(1f))
     }
 
     Text(
-      generalGetString(MR.strings.to_verify_compare),
+      generalGetString(R.string.to_verify_compare),
       Modifier.padding(bottom = DEFAULT_PADDING)
     )
 
@@ -103,22 +105,20 @@ private fun VerifyCodeLayout(
       horizontalArrangement = Arrangement.spacedBy(10.dp)
     ) {
       if (connectionVerified) {
-        SimpleButton(generalGetString(MR.strings.clear_verification), painterResource(MR.images.ic_shield)) {
+        SimpleButton(generalGetString(R.string.clear_verification), painterResource(R.drawable.ic_shield)) {
           verifyCode(null) {}
         }
       } else {
-        if (appPlatform.isAndroid) {
+        SimpleButton(generalGetString(R.string.scan_code), painterResource(R.drawable.ic_qr_code)) {
-          SimpleButton(generalGetString(MR.strings.scan_code), painterResource(MR.images.ic_qr_code)) {
+          ModalManager.shared.showModal {
-            ModalManager.end.showModal {
+            ScanCodeView(verifyCode) { }
-              ScanCodeView(verifyCode) { }
-            }
           }
         }
-        SimpleButton(generalGetString(MR.strings.mark_code_verified), painterResource(MR.images.ic_verified_user)) {
+        SimpleButton(generalGetString(R.string.mark_code_verified), painterResource(R.drawable.ic_verified_user)) {
           verifyCode(connectionCode) { verified ->
             if (!verified) {
               AlertManager.shared.showAlertMsg(
-                title = generalGetString(MR.strings.incorrect_code)
+                title = generalGetString(R.string.incorrect_code)
               )
             }
           }

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chat.group
+package chat.simplex.app.views.chat.group
 
 import SectionBottomSpacer
 import SectionCustomFooter
@@ -6,59 +6,55 @@ 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.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 dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.model.*
-import chat.simplex.common.views.chat.ChatInfoToolbarTitle
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.chat.ChatInfoToolbarTitle
-import chat.simplex.common.views.usersettings.SettingsActionItem
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.model.GroupInfo
+import chat.simplex.app.views.newchat.InfoAboutIncognito
-import chat.simplex.common.platform.*
+import chat.simplex.app.views.usersettings.SettingsActionItem
-import chat.simplex.res.MR
 
 @Composable
-fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolean = false, chatModel: ChatModel, close: () -> Unit) {
+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) }
-  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
   BackHandler(onBack = close)
   AddGroupMembersLayout(
+    chatModel.incognito.value,
     groupInfo = groupInfo,
     creatingGroup = creatingGroup,
-    contactsToAdd = getContactsToAdd(chatModel, searchText.value.text),
+    contactsToAdd = getContactsToAdd(chatModel),
     selectedContacts = selectedContacts,
     selectedRole = selectedRole,
     allowModifyMembers = allowModifyMembers,
-    searchText,
     openPreferences = {
-      ModalManager.end.showCustomModal { close ->
+      ModalManager.shared.showCustomModal { close ->
-        GroupPreferencesView(chatModel, rhId, groupInfo.id, close)
+        GroupPreferencesView(chatModel, groupInfo.id, close)
       }
     },
     inviteMembers = {
       allowModifyMembers = false
-      withLongRunningApi(slow = 120_000) {
+      withApi {
         for (contactId in selectedContacts) {
-          val member = chatModel.controller.apiAddMember(rhId, groupInfo.groupId, contactId, selectedRole.value)
+          val member = chatModel.controller.apiAddMember(groupInfo.groupId, contactId, selectedRole.value)
           if (member != null) {
-            chatModel.upsertGroupMember(rhId, groupInfo, member)
+            chatModel.upsertGroupMember(groupInfo, member)
           } else {
             break
           }
@@ -68,16 +64,12 @@ fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolea
     },
     clearSelection = { selectedContacts.clear() },
     addContact = { contactId -> if (contactId !in selectedContacts) selectedContacts.add(contactId) },
-    removeContact = { contactId -> selectedContacts.removeAll { it == contactId } },
+    removeContact = { contactId -> selectedContacts.removeIf { it == contactId } },
     close = close,
   )
-  KeyChangeEffect(chatModel.chatId.value) {
-    close()
-  }
 }
 
-fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
+fun getContactsToAdd(chatModel: ChatModel): List<Contact> {
-  val s = search.trim().lowercase()
   val memberContactIds = chatModel.groupMembers
     .filter { it.memberCurrent }
     .mapNotNull { it.memberContactId }
@@ -86,20 +78,20 @@ fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
     .map { it.chatInfo }
     .filterIsInstance<ChatInfo.Direct>()
     .map { it.contact }
-    .filter { c -> c.ready && c.active && c.contactId !in memberContactIds && c.chatViewName.lowercase().contains(s) }
+    .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,
-  searchText: MutableState<TextFieldValue>,
   openPreferences: () -> Unit,
   inviteMembers: () -> Unit,
   clearSelection: () -> Unit,
@@ -107,30 +99,19 @@ fun AddGroupMembersLayout(
   removeContact: (Long) -> Unit,
   close: () -> Unit,
 ) {
-  @Composable fun profileText() {
+  Column(
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.Center
-    ) {
-      Icon(
-        painterResource(MR.images.ic_info),
-        null,
-        tint = MaterialTheme.colors.secondary,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(generalGetString(MR.strings.group_main_profile_sent), textAlign = TextAlign.Center, style = MaterialTheme.typography.body2)
-    }
-  }
-
-  ColumnWithScrollBar(
     Modifier
-      .fillMaxWidth(),
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
   ) {
-    AppBarTitle(stringResource(MR.strings.button_add_members))
+    AppBarTitle(stringResource(R.string.button_add_members))
-    profileText()
+    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(),
@@ -144,13 +125,13 @@ fun AddGroupMembersLayout(
     }
     SectionSpacer()
 
-    if (contactsToAdd.isEmpty() && searchText.value.text.isEmpty()) {
+    if (contactsToAdd.isEmpty()) {
       Row(
         Modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.Center
       ) {
         Text(
-          stringResource(MR.strings.no_contacts_to_add),
+          stringResource(R.string.no_contacts_to_add),
           Modifier.padding(),
           color = MaterialTheme.colors.secondary
         )
@@ -159,7 +140,7 @@ fun AddGroupMembersLayout(
       SectionView {
         if (creatingGroup) {
           SectionItemView(openPreferences) {
-            Text(stringResource(MR.strings.set_group_preferences))
+            Text(stringResource(R.string.set_group_preferences))
           }
         }
         RoleSelectionRow(groupInfo, selectedRole, allowModifyMembers)
@@ -173,10 +154,8 @@ fun AddGroupMembersLayout(
         InviteSectionFooter(selectedContactsCount = selectedContacts.size, allowModifyMembers, clearSelection)
       }
       SectionDividerSpaced(maxTopPadding = true)
-      SectionView(stringResource(MR.strings.select_contacts)) {
+
-        SectionItemView(padding = PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF)) {
+      SectionView(stringResource(R.string.select_contacts)) {
-          SearchRowView(searchText)
-        }
         ContactList(contacts = contactsToAdd, selectedContacts, groupInfo, allowModifyMembers, addContact, removeContact)
       }
     }
@@ -184,19 +163,6 @@ fun AddGroupMembersLayout(
   }
 }
 
-@Composable
-private fun SearchRowView(
-  searchText: MutableState<TextFieldValue> = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue()) }
-) {
-  Box(Modifier.width(36.dp), contentAlignment = Alignment.Center) {
-    Icon(painterResource(MR.images.ic_search), stringResource(MR.strings.search_verb), tint = MaterialTheme.colors.secondary)
-  }
-  Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
-  SearchTextField(Modifier.fillMaxWidth(), searchText = searchText, alwaysVisible = true) {
-    searchText.value = searchText.value.copy(it)
-  }
-}
-
 @Composable
 private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole>, enabled: Boolean) {
   Row(
@@ -204,11 +170,9 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
     verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.SpaceBetween
   ) {
-    val values = GroupMemberRole.values()
+    val values = GroupMemberRole.values().filter { it <= groupInfo.membership.memberRole }.map { it to it.text }
-      .filter { it <= groupInfo.membership.memberRole && it != GroupMemberRole.Author }
-      .map { it to it.text }
     ExposedDropDownSettingRow(
-      generalGetString(MR.strings.new_member_role),
+      generalGetString(R.string.new_member_role),
       values,
       selectedRole,
       icon = null,
@@ -220,8 +184,8 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
 @Composable
 fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
   SettingsActionItem(
-    painterResource(MR.images.ic_check),
+    painterResource(R.drawable.ic_check),
-    stringResource(MR.strings.invite_to_group_button),
+    stringResource(R.string.invite_to_group_button),
     click = onClick,
     textColor = MaterialTheme.colors.primary,
     iconColor = MaterialTheme.colors.primary,
@@ -232,8 +196,8 @@ fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
 @Composable
 fun SkipInvitingButton(onClick: () -> Unit) {
   SettingsActionItem(
-    painterResource(MR.images.ic_check),
+    painterResource(R.drawable.ic_check),
-    stringResource(MR.strings.skip_inviting_button),
+    stringResource(R.string.skip_inviting_button),
     click = onClick,
     textColor = MaterialTheme.colors.primary,
     iconColor = MaterialTheme.colors.primary,
@@ -249,7 +213,7 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
   ) {
     if (selectedContactsCount >= 1) {
       Text(
-        String.format(generalGetString(MR.strings.num_contacts_selected), selectedContactsCount),
+        String.format(generalGetString(R.string.num_contacts_selected), selectedContactsCount),
         color = MaterialTheme.colors.secondary,
         fontSize = 12.sp
       )
@@ -257,14 +221,14 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
         Modifier.clickable { if (enabled) clearSelection() }
       ) {
         Text(
-          stringResource(MR.strings.clear_contacts_selection_button),
+          stringResource(R.string.clear_contacts_selection_button),
           color = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
           fontSize = 12.sp
         )
       }
     } else {
       Text(
-        stringResource(MR.strings.no_contacts_selected),
+        stringResource(R.string.no_contacts_selected),
         color = MaterialTheme.colors.secondary,
         fontSize = 12.sp
       )
@@ -305,13 +269,13 @@ fun ContactCheckRow(
   val icon: Painter
   val iconColor: Color
   if (prohibitedToInviteIncognito) {
-    icon = painterResource(MR.images.ic_theater_comedy_filled)
+    icon = painterResource(R.drawable.ic_theater_comedy_filled)
     iconColor = MaterialTheme.colors.secondary
   } else if (checked) {
-    icon = painterResource(MR.images.ic_check_circle_filled)
+    icon = painterResource(R.drawable.ic_check_circle_filled)
     iconColor = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
   } else {
-    icon = painterResource(MR.images.ic_circle)
+    icon = painterResource(R.drawable.ic_circle)
     iconColor = MaterialTheme.colors.secondary
   }
   SectionItemView(
@@ -329,16 +293,13 @@ fun ContactCheckRow(
     ProfileImage(size = 36.dp, contact.image)
     Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
     Text(
-      contact.chatViewName,
+      contact.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-      modifier = Modifier.weight(10f, fill = true),
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
       color = if (prohibitedToInviteIncognito) MaterialTheme.colors.secondary else Color.Unspecified
     )
     Spacer(Modifier.fillMaxWidth().weight(1f))
     Icon(
       icon,
-      contentDescription = stringResource(MR.strings.icon_descr_contact_checked),
+      contentDescription = stringResource(R.string.icon_descr_contact_checked),
       tint = iconColor
     )
   }
@@ -346,9 +307,9 @@ fun ContactCheckRow(
 
 fun showProhibitedToInviteIncognitoAlertDialog() {
   AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.invite_prohibited),
+    title = generalGetString(R.string.invite_prohibited),
-    text = generalGetString(MR.strings.invite_prohibited_description),
+    text = generalGetString(R.string.invite_prohibited_description),
-    confirmText = generalGetString(MR.strings.ok),
+    confirmText = generalGetString(R.string.ok),
   )
 }
 
@@ -357,13 +318,13 @@ fun showProhibitedToInviteIncognitoAlertDialog() {
 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,
-      searchText = remember { mutableStateOf(TextFieldValue("")) },
       openPreferences = {},
       inviteMembers = {},
       clearSelection = {},

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

@@ -0,0 +1,410 @@
+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,4 +1,4 @@
-package chat.simplex.common.views.chat.group
+package chat.simplex.app.views.chat.group
 
 import SectionBottomSpacer
 import androidx.compose.foundation.layout.*
@@ -10,41 +10,31 @@ 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.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.app.model.*
-import chat.simplex.common.platform.shareText
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.newchat.QRCode
-import chat.simplex.common.views.newchat.*
-import chat.simplex.res.MR
 
 @Composable
-fun GroupLinkView(
+fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, memberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit) {
-  chatModel: ChatModel,
-  rhId: Long?,
-  groupInfo: GroupInfo,
-  connReqContact: String?,
-  memberRole: GroupMemberRole?,
-  onGroupLinkUpdated: ((Pair<String, GroupMemberRole>?) -> Unit)?,
-  creatingGroup: Boolean = false,
-  close: (() -> Unit)? = null
-) {
   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
-    withBGApi {
+    withApi {
-      val link = chatModel.controller.apiCreateGroupLink(rhId, groupInfo.groupId)
+      val link = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
       if (link != null) {
         groupLink = link.first
         groupLinkMemberRole.value = link.second
-        onGroupLinkUpdated?.invoke(link)
+        onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
       }
       creatingLink = false
     }
@@ -60,38 +50,37 @@ fun GroupLinkView(
     groupLinkMemberRole,
     creatingLink,
     createLink = ::createLink,
+    share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
     updateLink = {
       val role = groupLinkMemberRole.value
       if (role != null) {
         withBGApi {
-          val link = chatModel.controller.apiGroupLinkMemberRole(rhId, groupInfo.groupId, role)
+          val link = chatModel.controller.apiGroupLinkMemberRole(groupInfo.groupId, role)
           if (link != null) {
             groupLink = link.first
             groupLinkMemberRole.value = link.second
-            onGroupLinkUpdated?.invoke(link)
+            onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
           }
         }
       }
     },
     deleteLink = {
       AlertManager.shared.showAlertDialog(
-        title = generalGetString(MR.strings.delete_link_question),
+        title = generalGetString(R.string.delete_link_question),
-        text = generalGetString(MR.strings.all_group_members_will_remain_connected),
+        text = generalGetString(R.string.all_group_members_will_remain_connected),
-        confirmText = generalGetString(MR.strings.delete_verb),
+        confirmText = generalGetString(R.string.delete_verb),
         onConfirm = {
-          withBGApi {
+          withApi {
-            val r = chatModel.controller.apiDeleteGroupLink(rhId, groupInfo.groupId)
+            val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
             if (r) {
               groupLink = null
-              onGroupLinkUpdated?.invoke(null)
+              onGroupLinkUpdated(null to null)
             }
           }
         },
         destructive = true,
       )
-    },
+    }
-    creatingGroup = creatingGroup,
-    close = close
   )
   if (creatingLink) {
     ProgressIndicator()
@@ -105,26 +94,17 @@ fun GroupLinkLayout(
   groupLinkMemberRole: MutableState<GroupMemberRole?>,
   creatingLink: Boolean,
   createLink: () -> Unit,
+  share: () -> Unit,
   updateLink: () -> Unit,
-  deleteLink: () -> Unit,
+  deleteLink: () -> Unit
-  creatingGroup: Boolean = false,
-  close: (() -> Unit)? = null
 ) {
-  @Composable
+  Column(
-  fun ContinueButton(close: () -> Unit) {
+    Modifier
-    SimpleButton(
+      .verticalScroll(rememberScrollState()),
-      stringResource(MR.strings.continue_to_next_step),
-      icon = painterResource(MR.images.ic_check),
-      click = close
-    )
-  }
-
-  ColumnWithScrollBar(
-    Modifier,
   ) {
-    AppBarTitle(stringResource(MR.strings.group_link))
+    AppBarTitle(stringResource(R.string.group_link))
     Text(
-      stringResource(MR.strings.you_can_share_group_link_anybody_will_be_able_to_connect),
+      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
     )
@@ -134,16 +114,7 @@ fun GroupLinkLayout(
       verticalArrangement = Arrangement.SpaceEvenly
     ) {
       if (groupLink == null) {
-        Row(
+        SimpleButton(stringResource(R.string.button_create_group_link), icon = painterResource(R.drawable.ic_add_link), disabled = creatingLink, click = createLink)
-          horizontalArrangement = Arrangement.spacedBy(10.dp),
-          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(horizontal = DEFAULT_PADDING, vertical = 10.dp)
-        ) {
-          SimpleButton(stringResource(MR.strings.button_create_group_link), icon = painterResource(MR.images.ic_add_link), disabled = creatingLink, click = createLink)
-          if (creatingGroup && close != null) {
-            ContinueButton(close)
-          }
-        }
       } else {
         RoleSelectionRow(groupInfo, groupLinkMemberRole)
         var initialLaunch by remember { mutableStateOf(true) }
@@ -153,28 +124,23 @@ fun GroupLinkLayout(
           }
           initialLaunch = false
         }
-        SimpleXLinkQRCode(groupLink)
+        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)
         ) {
-          val clipboard = LocalClipboardManager.current
           SimpleButton(
-            stringResource(MR.strings.share_link),
+            stringResource(R.string.share_link),
-            icon = painterResource(MR.images.ic_share),
+            icon = painterResource(R.drawable.ic_share),
-            click = { clipboard.shareText(simplexChatLink(groupLink)) }
+            click = share
+          )
+          SimpleButton(
+            stringResource(R.string.delete_link),
+            icon = painterResource(R.drawable.ic_delete),
+            color = Color.Red,
+            click = deleteLink
           )
-          if (creatingGroup && close != null) {
-            ContinueButton(close)
-          } else {
-            SimpleButton(
-              stringResource(MR.strings.delete_link),
-              icon = painterResource(MR.images.ic_delete),
-              color = Color.Red,
-              click = deleteLink
-            )
-          }
         }
       }
     }
@@ -191,7 +157,7 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
   ) {
     val values = listOf(GroupMemberRole.Member, GroupMemberRole.Observer).map { it to it.text }
     ExposedDropDownSettingRow(
-      generalGetString(MR.strings.initial_member_role),
+      generalGetString(R.string.initial_member_role),
       values,
       selectedRole,
       icon = null,

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

@@ -0,0 +1,349 @@
+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

@@ -0,0 +1,176 @@
+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,7 +1,8 @@
-package chat.simplex.common.views.chat.group
+package chat.simplex.app.views.chat.group
 
 import SectionBottomSpacer
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import android.content.res.Configuration
+import android.net.Uri
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -12,33 +13,34 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.stringResource
+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.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.platform.*
+import chat.simplex.app.model.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.*
+import chat.simplex.app.views.ProfileNameField
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.common.views.onboarding.ReadableText
+import chat.simplex.app.views.isValidDisplayName
-import chat.simplex.common.views.usersettings.*
+import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.res.MR
+import chat.simplex.app.views.usersettings.*
-import dev.icerock.moko.resources.compose.painterResource
+import com.google.accompanist.insets.ProvideWindowInsets
+import com.google.accompanist.insets.navigationBarsWithImePadding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.net.URI
 
 @Composable
-fun GroupProfileView(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
+fun GroupProfileView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
   GroupProfileLayout(
     close = close,
     groupProfile = groupInfo.groupProfile,
     saveProfile = { p ->
-      withBGApi {
+      withApi {
-        val gInfo = chatModel.controller.apiUpdateGroup(rhId, groupInfo.groupId, p)
+        val gInfo = chatModel.controller.apiUpdateGroup(groupInfo.groupId, p)
         if (gInfo != null) {
-          chatModel.updateGroup(rhId, gInfo)
+          chatModel.updateGroup(gInfo)
           close.invoke()
         }
       }
@@ -55,7 +57,7 @@ fun GroupProfileLayout(
   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 chosenImage = rememberSaveable { mutableStateOf<Uri?>(null) }
   val profileImage = rememberSaveable { mutableStateOf(groupProfile.image) }
   val scope = rememberCoroutineScope()
   val scrollState = rememberScrollState()
@@ -65,13 +67,13 @@ fun GroupProfileLayout(
         fullName.value == groupProfile.fullName &&
         groupProfile.image == profileImage.value
   val closeWithAlert = {
-    if (dataUnchanged || !canUpdateProfile(displayName.value, groupProfile)) {
+    if (dataUnchanged || !(displayName.value.isNotEmpty() && isValidDisplayName(displayName.value))) {
       close()
     } else {
       showUnsavedChangesAlert({
         saveProfile(
           groupProfile.copy(
-            displayName = displayName.value.trim(),
+            displayName = displayName.value,
             fullName = fullName.value,
             image = profileImage.value
           )
@@ -95,14 +97,15 @@ fun GroupProfileLayout(
       sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
     ) {
       ModalView(close = closeWithAlert) {
-        ColumnWithScrollBar(
+        Column(
           Modifier
+            .verticalScroll(scrollState)
         ) {
           Column(
             Modifier.fillMaxWidth()
               .padding(horizontal = DEFAULT_PADDING)
           ) {
-            ReadableText(MR.strings.group_profile_is_stored_on_members_devices, TextAlign.Center)
+            ReadableText(R.string.group_profile_is_stored_on_members_devices, TextAlign.Center)
             Box(
               Modifier
                 .fillMaxWidth()
@@ -121,35 +124,35 @@ fun GroupProfileLayout(
             }
             Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
               Text(
-                stringResource(MR.strings.group_display_name_field),
+                stringResource(R.string.group_display_name_field),
                 fontSize = 16.sp
               )
-              if (!isValidNewProfileName(displayName.value, groupProfile)) {
+              if (!isValidDisplayName(displayName.value)) {
                 Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-                IconButton({ showInvalidNameAlert(mkValidName(displayName.value), displayName) }, Modifier.size(20.dp)) {
+                Text(
-                  Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.error)
+                  stringResource(R.string.no_spaces),
-                }
+                  fontSize = 16.sp,
+                  color = Color.Red
+                )
               }
             }
-            ProfileNameField(displayName, "", { isValidNewProfileName(it, groupProfile) }, focusRequester)
+            ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-            if (groupProfile.fullName.isNotEmpty() && groupProfile.fullName != groupProfile.displayName) {
-              Spacer(Modifier.height(DEFAULT_PADDING))
-              Text(
-                stringResource(MR.strings.group_full_name_field),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-              )
-              ProfileNameField(fullName)
-            }
             Spacer(Modifier.height(DEFAULT_PADDING))
-            val enabled = !dataUnchanged && canUpdateProfile(displayName.value, groupProfile)
+            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(MR.strings.save_group_profile),
+                stringResource(R.string.save_group_profile),
                 modifier = Modifier.clickable {
                   saveProfile(
                     groupProfile.copy(
-                      displayName = displayName.value.trim(),
+                      displayName = displayName.value,
                       fullName = fullName.value,
                       image = profileImage.value
                     )
@@ -159,7 +162,7 @@ fun GroupProfileLayout(
               )
             } else {
               Text(
-                stringResource(MR.strings.save_group_profile),
+                stringResource(R.string.save_group_profile),
                 color = MaterialTheme.colors.secondary
               )
             }
@@ -177,27 +180,22 @@ fun GroupProfileLayout(
   }
 }
 
-private fun canUpdateProfile(displayName: String, groupProfile: GroupProfile): Boolean =
-  displayName.trim().isNotEmpty() && isValidNewProfileName(displayName, groupProfile)
-
-private fun isValidNewProfileName(displayName: String, groupProfile: GroupProfile): Boolean =
-  displayName == groupProfile.displayName || isValidDisplayName(displayName.trim())
-
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
   AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(MR.strings.save_preferences_question),
+    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(MR.strings.save_and_notify_group_members),
+    confirmText = generalGetString(R.string.save_and_notify_group_members),
-    dismissText = generalGetString(MR.strings.exit_without_saving),
+    dismissText = generalGetString(R.string.exit_without_saving),
     onConfirm = save,
     onDismiss = revert,
   )
 }
 
-@Preview/*(
+@Preview(showBackground = true)
+@Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
   showBackground = true,
   name = "Dark Mode"
-)*/
+)
 @Composable
 fun PreviewGroupProfileLayout() {
   SimpleXTheme {

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

@@ -0,0 +1,95 @@
+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,4 +1,4 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -6,57 +6,55 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.ui.theme.*
+import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.views.helpers.SimpleButton
+import chat.simplex.app.model.*
-import chat.simplex.res.MR
+import chat.simplex.app.ui.theme.*
 
 @Composable
-fun CICallItemView(
+fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, duration: Int, acceptCall: (Contact) -> Unit) {
-  cInfo: ChatInfo,
-  cItem: ChatItem,
-  status: CICallStatus,
-  duration: Int,
-  acceptCall: (Contact) -> Unit,
-  timedMessagesTTL: Int?
-) {
   val sent = cItem.chatDir.sent
   Column(
     Modifier
       .padding(horizontal = 4.dp)
       .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-    @Composable fun ConnectingCallIcon() = Icon(painterResource(MR.images.ic_settings_phone), stringResource(MR.strings.icon_descr_call_connecting), tint = SimplexGreen)
+    @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(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_pending_sent))
+        Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_pending_sent))
       } else {
         AcceptCallButton(cInfo, acceptCall)
       }
-      CICallStatus.Missed -> Icon(painterResource(MR.images.ic_call), stringResource(MR.strings.icon_descr_call_missed), tint = Color.Red)
+      CICallStatus.Missed -> Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_missed), tint = Color.Red)
-      CICallStatus.Rejected -> Icon(painterResource(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_rejected), 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(MR.images.ic_phone_in_talk_filled), stringResource(MR.strings.icon_descr_call_progress), tint = SimplexGreen)
+      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(MR.images.ic_call_end), stringResource(MR.strings.icon_descr_call_ended), tint = MaterialTheme.colors.secondary, modifier = Modifier.padding(end = 4.dp))
+        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 -> {}
     }
 
-    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false)
+    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(MR.strings.answer_call), painterResource(MR.images.ic_ring_volume)) { acceptCall(cInfo.contact) }
+    SimpleButton(stringResource(R.string.answer_call), painterResource(R.drawable.ic_ring_volume)) { acceptCall(cInfo.contact) }
   } else {
-    Icon(painterResource(MR.images.ic_ring_volume), stringResource(MR.strings.answer_call), tint = MaterialTheme.colors.secondary)
+    Icon(painterResource(R.drawable.ic_ring_volume), stringResource(R.string.answer_call), tint = MaterialTheme.colors.secondary)
   }
 //    if case let .direct(contact) = chatInfo {
 //      Button {
@@ -69,7 +67,7 @@ fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
 //        sharedKey: invitation.sharedKey
 //        )
 //        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey: true)
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
 //      } else {
 //        AlertManager.shared.showAlertMsg(title: "Call already ended!")
 //      }
@@ -142,7 +140,7 @@ fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
 //        sharedKey: invitation.sharedKey
 //        )
 //        m.showCallView = true
-//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey: true)
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
 //      } else {
 //        AlertManager.shared.showAlertMsg(title: "Call already ended!")
 //      }

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

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,61 @@
+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,4 +1,4 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -9,9 +9,9 @@ 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.common.views.helpers.generalGetString
+import chat.simplex.app.R
-import chat.simplex.common.model.*
+import chat.simplex.app.model.*
-import chat.simplex.res.MR
+import chat.simplex.app.views.helpers.generalGetString
 
 @Composable
 fun CIFeaturePreferenceView(
@@ -30,7 +30,7 @@ fun CIFeaturePreferenceView(
     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) MR.strings.accept_feature_set_1_day else MR.strings.accept_feature
+      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 + "  ") }

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

@@ -1,6 +1,7 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
-import androidx.compose.foundation.combinedClickable
+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
@@ -11,27 +12,27 @@ 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 dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+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.common.model.*
+import chat.simplex.app.R
-import chat.simplex.common.platform.*
+import chat.simplex.app.model.*
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.res.MR
+import kotlinx.datetime.Clock
-import java.io.File
-import java.net.URI
 
 @Composable
 fun CIFileView(
   file: CIFile?,
   edited: Boolean,
-  showMenu: MutableState<Boolean>,
   receiveFile: (Long) -> Unit
 ) {
-  val saveFileLauncher = rememberSaveFileLauncher(ciFile = file)
+  val context = LocalContext.current
+  val saveFileLauncher = rememberSaveFileLauncher(cxt = context, ciFile = file)
 
   @Composable
   fun fileIcon(
@@ -42,15 +43,15 @@ fun CIFileView(
       contentAlignment = Alignment.Center
     ) {
       Icon(
-        painterResource(MR.images.ic_draft_filled),
+        painterResource(R.drawable.ic_draft_filled),
-        stringResource(MR.strings.icon_descr_file),
+        stringResource(R.string.icon_descr_file),
         Modifier.fillMaxSize(),
         tint = color
       )
       if (innerIcon != null) {
         Icon(
           innerIcon,
-          stringResource(MR.strings.icon_descr_file),
+          stringResource(R.string.icon_descr_file),
           Modifier
             .size(32.dp)
             .padding(top = 12.dp),
@@ -60,47 +61,45 @@ fun CIFileView(
     }
   }
 
+  fun fileSizeValid(): Boolean {
+    if (file != null) {
+      return file.fileSize <= getMaxFileSize(file.fileProtocol)
+    }
+    return false
+  }
+
   fun fileAction() {
     if (file != null) {
-      when {
+      when (file.fileStatus) {
-        file.fileStatus is CIFileStatus.RcvInvitation || file.fileStatus is CIFileStatus.RcvAborted -> {
+        is CIFileStatus.RcvInvitation -> {
-          if (fileSizeValid(file)) {
+          if (fileSizeValid()) {
             receiveFile(file.fileId)
           } else {
             AlertManager.shared.showAlertMsg(
-              generalGetString(MR.strings.large_file),
+              generalGetString(R.string.large_file),
-              String.format(generalGetString(MR.strings.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
+              String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
             )
           }
         }
-        file.fileStatus is CIFileStatus.RcvAccepted ->
+        is CIFileStatus.RcvAccepted ->
           when (file.fileProtocol) {
             FileProtocol.XFTP ->
               AlertManager.shared.showAlertMsg(
-                generalGetString(MR.strings.waiting_for_file),
+                generalGetString(R.string.waiting_for_file),
-                generalGetString(MR.strings.file_will_be_received_when_contact_completes_uploading)
+                generalGetString(R.string.file_will_be_received_when_contact_completes_uploading)
               )
             FileProtocol.SMP ->
               AlertManager.shared.showAlertMsg(
-                generalGetString(MR.strings.waiting_for_file),
+                generalGetString(R.string.waiting_for_file),
-                generalGetString(MR.strings.file_will_be_received_when_contact_is_online)
+                generalGetString(R.string.file_will_be_received_when_contact_is_online)
               )
-            FileProtocol.LOCAL -> {}
           }
-        file.forwardingAllowed() -> {
+        is CIFileStatus.RcvComplete -> {
-          withLongRunningApi(slow = 600_000) {
+          val filePath = getLoadedFilePath(context, file)
-            var filePath = getLoadedFilePath(file)
+          if (filePath != null) {
-            if (chatModel.connectedToRemote() && filePath == null) {
+            saveFileLauncher.launch(file.fileName)
-              file.loadRemoteFile(true)
+          } else {
-              filePath = getLoadedFilePath(file)
+            Toast.makeText(context, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-            }
-            if (filePath != null) {
-              withLongRunningApi {
-                saveFileLauncher.launch(file.fileName)
-              }
-            } else {
-              showToast(generalGetString(MR.strings.file_not_found))
-            }
           }
         }
         else -> {}
@@ -125,8 +124,7 @@ fun CIFileView(
     Surface(
       Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
       color = Color.Transparent,
-      shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50)),
+      shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
-      contentColor = LocalContentColor.current
     ) {
       Box(Modifier.size(32.dp))
     }
@@ -137,7 +135,8 @@ fun CIFileView(
     Box(
       Modifier
         .size(42.dp)
-        .clip(RoundedCornerShape(4.dp)),
+        .clip(RoundedCornerShape(4.dp))
+        .clickable(onClick = { fileAction() }),
       contentAlignment = Alignment.Center
     ) {
       if (file != null) {
@@ -146,41 +145,30 @@ fun CIFileView(
             when (file.fileProtocol) {
               FileProtocol.XFTP -> progressIndicator()
               FileProtocol.SMP -> fileIcon()
-              FileProtocol.LOCAL -> fileIcon()
             }
           is CIFileStatus.SndTransfer ->
             when (file.fileProtocol) {
               FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
               FileProtocol.SMP -> progressIndicator()
-              FileProtocol.LOCAL -> {}
             }
-          is CIFileStatus.SndComplete -> {
+          is CIFileStatus.SndComplete -> fileIcon(innerIcon = painterResource(R.drawable.ic_check_filled))
-            if ((file.forwardingAllowed() || (chatModel.connectedToRemote() && CIFile.cachedRemoteFileRequests[file.fileSource] == true))) {
+          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-              fileIcon()
+          is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-            } else {
-              fileIcon(innerIcon = painterResource(MR.images.ic_check_filled))
-            }
-          }
-          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
-          is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
           is CIFileStatus.RcvInvitation ->
-            if (fileSizeValid(file))
+            if (fileSizeValid())
-              fileIcon(innerIcon = painterResource(MR.images.ic_arrow_downward), color = MaterialTheme.colors.primary)
+              fileIcon(innerIcon = painterResource(R.drawable.ic_arrow_downward), color = MaterialTheme.colors.primary)
             else
-              fileIcon(innerIcon = painterResource(MR.images.ic_priority_high), color = WarningOrange)
+              fileIcon(innerIcon = painterResource(R.drawable.ic_priority_high), color = WarningOrange)
-          is CIFileStatus.RcvAccepted -> fileIcon(innerIcon = painterResource(MR.images.ic_more_horiz))
+          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.RcvAborted ->
-            fileIcon(innerIcon = painterResource(MR.images.ic_sync_problem), color = MaterialTheme.colors.primary)
           is CIFileStatus.RcvComplete -> fileIcon()
-          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
+          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
+          is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.Invalid -> fileIcon(innerIcon = painterResource(MR.images.ic_question_mark))
         }
       } else {
         fileIcon()
@@ -189,21 +177,15 @@ fun CIFileView(
   }
 
   Row(
-    Modifier
+    Modifier.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
-      .combinedClickable(
-        onClick = { fileAction() },
-        onLongClick = { showMenu.value = true }
-      )
-      .padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
-    //Modifier.clickable(enabled = file?.fileSource != null) { if (file?.fileSource != null && getLoadedFilePath(file) != null) openFile(file.fileSource) }.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(
@@ -223,40 +205,12 @@ fun CIFileView(
   }
 }
 
-fun fileSizeValid(file: CIFile): Boolean = file.fileSize <= getMaxFileSize(file.fileProtocol)
-
-@Composable
-fun rememberSaveFileLauncher(ciFile: CIFile?): FileChooserLauncher =
-  rememberFileChooserLauncher(false, ciFile) { to: URI? ->
-    val filePath = getLoadedFilePath(ciFile)
-    if (filePath != null && to != null) {
-      if (ciFile?.fileSource?.cryptoArgs != null) {
-        createTmpFileAndDelete { tmpFile ->
-          try {
-            decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
-          } catch (e: Exception) {
-            Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
-            AlertManager.shared.showAlertMsg(title = generalGetString(MR.strings.error), text = e.stackTraceToString())
-            tmpFile.delete()
-            return@createTmpFileAndDelete
-          }
-          copyFileToFile(tmpFile, to) {}
-          tmpFile.delete()
-        }
-      } else {
-        copyFileToFile(File(filePath), to) {}
-      }
-    }
-  }
-
-/*
 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,
-    reactions = listOf(),
     file = CIFile.getSample(fileStatus = CIFileStatus.SndComplete)
   )
   private val fileChatItemWtFile = ChatItem(
@@ -264,7 +218,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
     meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), ),
     content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile("")),
     quotedItem = null,
-    reactions = listOf(),
     file = null
   )
   override val values = listOf(
@@ -288,4 +241,4 @@ fun PreviewCIFileFramedItemView(@PreviewParameter(ChatItemProvider::class) chatI
   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

@@ -0,0 +1,165 @@
+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

@@ -0,0 +1,215 @@
+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

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,188 @@
+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

@@ -0,0 +1,24 @@
+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,5 +1,9 @@
-package chat.simplex.common.views.chat.item
+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
@@ -8,21 +12,25 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
-import androidx.compose.ui.graphics.*
+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 dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.*
-import chat.simplex.res.MR
+import androidx.compose.ui.viewinterop.AndroidView
-import chat.simplex.common.ui.theme.*
+import androidx.core.content.FileProvider
-import chat.simplex.common.views.helpers.*
+import androidx.core.graphics.drawable.toDrawable
-import chat.simplex.common.model.*
+import chat.simplex.app.*
-import chat.simplex.common.platform.*
+import chat.simplex.app.R
-import dev.icerock.moko.resources.StringResource
+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
-import java.net.URI
 
 @Composable
 fun CIVideoView(
@@ -37,57 +45,38 @@ fun CIVideoView(
     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) }
-    val filePath = remember(file, CIFile.cachedRemoteFileRequests.toList()) { mutableStateOf(getLoadedFilePath(file)) }
+    if (file != null && filePath != null) {
-    if (chatModel.connectedToRemote()) {
+      val uri = remember(filePath) { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))  }
-      LaunchedEffect(file) {
+      val view = LocalView.current
-        withLongRunningApi(slow = 600_000) {
+      VideoView(uri, file, preview, duration * 1000L, showMenu, onClick = {
-          if (file != null && file.loaded && getLoadedFilePath(file) == null) {
-            file.loadRemoteFile(false)
-            filePath.value = getLoadedFilePath(file)
-          }
-        }
-      }
-    }
-    val f = filePath.value
-    if (file != null && f != null) {
-      val view = LocalMultiplatformView()
-      val openFullscreen = {
         hideKeyboard(view)
-        ModalManager.fullscreen.showCustomModal(animated = false) { close ->
+        ModalManager.shared.showCustomModal(animated = false) { close ->
           ImageFullScreenView(imageProvider, close)
         }
-      }
+      })
-
-      val uri = remember(filePath) { getAppFileUri(f.substringAfterLast(File.separator))  }
-      val autoPlay = remember { mutableStateOf(false) }
-      val uriDecrypted = remember(filePath) { mutableStateOf(if (file.fileSource?.cryptoArgs == null) uri else file.fileSource.decryptedGet()) }
-      val decrypted = uriDecrypted.value
-      if (decrypted != null) {
-        VideoView(decrypted, file, preview, duration * 1000L, autoPlay, showMenu, openFullscreen = openFullscreen)
-      } else {
-        VideoViewEncrypted(uriDecrypted, file, preview, duration * 1000L, autoPlay, showMenu, openFullscreen = openFullscreen)
-      }
     } else {
       Box {
-        VideoPreviewImageView(preview, onClick = {
+        ImageView(preview, showMenu, onClick = {
           if (file != null) {
             when (file.fileStatus) {
-              CIFileStatus.RcvInvitation, CIFileStatus.RcvAborted ->
+              CIFileStatus.RcvInvitation ->
                 receiveFileIfValidSize(file, receiveFile)
               CIFileStatus.RcvAccepted ->
                 when (file.fileProtocol) {
                   FileProtocol.XFTP ->
                     AlertManager.shared.showAlertMsg(
-                      generalGetString(MR.strings.waiting_for_video),
+                      generalGetString(R.string.waiting_for_video),
-                      generalGetString(MR.strings.video_will_be_received_when_contact_completes_uploading)
+                      generalGetString(R.string.video_will_be_received_when_contact_completes_uploading)
                     )
+
                   FileProtocol.SMP ->
                     AlertManager.shared.showAlertMsg(
-                      generalGetString(MR.strings.waiting_for_video),
+                      generalGetString(R.string.waiting_for_video),
-                      generalGetString(MR.strings.video_will_be_received_when_contact_is_online)
+                      generalGetString(R.string.video_will_be_received_when_contact_is_online)
                     )
-                  FileProtocol.LOCAL -> {}
                 }
               CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
               CIFileStatus.RcvComplete -> {} // ?
@@ -95,14 +84,11 @@ fun CIVideoView(
               else -> {}
             }
           }
-        },
+        })
-          onLongClick = {
-            showMenu.value = true
-          })
         if (file != null) {
           DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
         }
-        if (file?.fileStatus is CIFileStatus.RcvInvitation || file?.fileStatus is CIFileStatus.RcvAborted) {
+        if (file?.fileStatus is CIFileStatus.RcvInvitation) {
           PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, receiveFile) }
         }
       }
@@ -112,46 +98,14 @@ fun CIVideoView(
 }
 
 @Composable
-private fun VideoViewEncrypted(
+private fun VideoView(uri: Uri, file: CIFile, defaultPreview: Bitmap, defaultDuration: Long, showMenu: MutableState<Boolean>, onClick: () -> Unit) {
-  uriUnencrypted: MutableState<URI?>,
+  val context = LocalContext.current
-  file: CIFile,
+  val player = remember(uri) { VideoPlayer.getOrCreate(uri, false, defaultPreview, defaultDuration, true, context) }
-  defaultPreview: ImageBitmap,
-  defaultDuration: Long,
-  autoPlay: MutableState<Boolean>,
-  showMenu: MutableState<Boolean>,
-  openFullscreen: () -> Unit,
-) {
-  var decryptionInProgress by rememberSaveable(file.fileName) { mutableStateOf(false) }
-  val onLongClick = { showMenu.value = true }
-  Box {
-    VideoPreviewImageView(defaultPreview, if (decryptionInProgress) {{}} else openFullscreen, onLongClick)
-    if (decryptionInProgress) {
-      VideoDecryptionProgress(onLongClick = onLongClick)
-    } else {
-      PlayButton(false, onLongClick = onLongClick) {
-        decryptionInProgress = true
-        withBGApi {
-          try {
-            uriUnencrypted.value = file.fileSource?.decryptedGetOrCreate()
-            autoPlay.value = uriUnencrypted.value != null
-          } finally {
-            decryptionInProgress = false
-          }
-        }
-      }
-    }
-    DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(defaultDuration) }, remember { mutableStateOf(0L) })
-  }
-}
-
-@Composable
-private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defaultDuration: Long, autoPlay: MutableState<Boolean>, showMenu: MutableState<Boolean>, openFullscreen: () -> Unit) {
-  val player = remember(uri) { VideoPlayerHolder.getOrCreate(uri, false, defaultPreview, defaultDuration, true) }
   val videoPlaying = remember(uri.path) { player.videoPlaying }
   val progress = remember(uri.path) { player.progress }
   val duration = remember(uri.path) { player.duration }
   val preview by remember { player.preview }
-  //  val soundEnabled by rememberSaveable(uri.path) { player.soundEnabled }
+//  val soundEnabled by rememberSaveable(uri.path) { player.soundEnabled }
   val brokenVideo by rememberSaveable(uri.path) { player.brokenVideo }
   val play = {
     player.enableSound(true)
@@ -162,59 +116,52 @@ private fun VideoView(uri: URI, file: CIFile, defaultPreview: ImageBitmap, defau
     player.stop()
   }
   val showPreview = remember { derivedStateOf { !videoPlaying.value || progress.value == 0L } }
-  LaunchedEffect(uri) {
-    if (autoPlay.value) play()
-  }
-  // Drop autoPlay only when show preview changes to prevent blinking of the view
-  KeyChangeEffect(showPreview.value) {
-    autoPlay.value = false
-  }
   DisposableEffect(Unit) {
     onDispose {
       stop()
     }
   }
-  val onLongClick = { showMenu.value = true }
   Box {
     val windowWidth = LocalWindowWidth()
-    val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else DEFAULT_MAX_IMAGE_WIDTH }
+    val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
-    PlayerView(
+    AndroidView(
-      player,
+      factory = { ctx ->
-      width,
+        StyledPlayerView(ctx).apply {
-      onClick = openFullscreen,
+          useController = false
-      onLongClick = onLongClick,
+          resizeMode = RESIZE_MODE_FIXED_WIDTH
-      stop
+          this.player = player.player
+        }
+      },
+      Modifier
+        .width(width)
+        .combinedClickable(
+          onLongClick = { showMenu.value = true },
+          onClick = { if (player.player.playWhenReady) stop() else onClick() }
+        )
     )
     if (showPreview.value) {
-      VideoPreviewImageView(preview, openFullscreen, onLongClick)
+      ImageView(preview, showMenu, onClick)
-      if (!autoPlay.value) {
+      PlayButton(brokenVideo, onLongClick =  { showMenu.value = true }, play)
-        PlayButton(brokenVideo, onLongClick = onLongClick, play)
-      }
     }
     DurationProgress(file, videoPlaying, duration, progress/*, soundEnabled*/)
   }
 }
 
-@Composable
-expect fun PlayerView(player: VideoPlayer, width: Dp, onClick: () -> Unit, onLongClick: () -> Unit, stop: () -> Unit)
-
 @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),
+    shape = RoundedCornerShape(percent = 50)
-    contentColor = LocalContentColor.current
   ) {
     Box(
       Modifier
         .defaultMinSize(minWidth = 40.dp, minHeight = 40.dp)
-        .combinedClickable(onClick = onClick, onLongClick = onLongClick)
+        .combinedClickable(onClick = onClick, onLongClick = onLongClick),
-        .onRightClick { onLongClick.invoke() },
       contentAlignment = Alignment.Center
     ) {
       Icon(
-        painterResource(MR.images.ic_play_arrow_filled),
+        painterResource(R.drawable.ic_play_arrow_filled),
         contentDescription = null,
         tint = if (error) WarningOrange else Color.White
       )
@@ -222,31 +169,6 @@ private fun BoxScope.PlayButton(error: Boolean = false, onLongClick: () -> Unit,
   }
 }
 
-@Composable
-fun BoxScope.VideoDecryptionProgress(onLongClick: () -> Unit) {
-  Surface(
-    Modifier.align(Alignment.Center),
-    color = Color.Black.copy(alpha = 0.25f),
-    shape = RoundedCornerShape(percent = 50),
-    contentColor = LocalContentColor.current
-  ) {
-    Box(
-      Modifier
-        .defaultMinSize(minWidth = 40.dp, minHeight = 40.dp)
-        .combinedClickable(onClick = {}, onLongClick = onLongClick)
-        .onRightClick { onLongClick.invoke() },
-      contentAlignment = Alignment.Center
-    ) {
-      CircularProgressIndicator(
-        Modifier
-          .size(30.dp),
-        color = Color.White,
-        strokeWidth = 2.5.dp
-      )
-    }
-  }
-}
-
 @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) {
@@ -267,7 +189,7 @@ private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, durat
           color = Color.White
         )
         /*if (!soundEnabled.value) {
-        Icon(painterResource(MR.images.ic_volume_off_filled), null,
+        Icon(painterResource(R.drawable.ic_volume_off_filled), null,
           Modifier.padding(start = 5.dp).size(10.dp),
           tint = Color.White
         )
@@ -293,42 +215,33 @@ private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, durat
 }
 
 @Composable
-fun VideoPreviewImageView(preview: ImageBitmap, onClick: () -> Unit, onLongClick: () -> Unit) {
+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 DEFAULT_MAX_IMAGE_WIDTH }
+  val width = remember(preview) { if (preview.width * 0.97 <= preview.height) videoViewFullWidth(windowWidth) * 0.75f else 1000.dp }
   Image(
-    preview,
+    preview.asImageBitmap(),
-    contentDescription = stringResource(MR.strings.video_descr),
+    contentDescription = stringResource(R.string.video_descr),
     modifier = Modifier
       .width(width)
       .combinedClickable(
-        onLongClick = onLongClick,
+        onLongClick = { showMenu.value = true },
         onClick = onClick
-      )
+      ),
-      .onRightClick(onLongClick),
     contentScale = ContentScale.FillWidth,
   )
 }
 
 @Composable
-fun VideoPreviewImageViewFullScreen(preview: ImageBitmap, onClick: () -> Unit, onLongClick: () -> Unit) {
+private fun LocalWindowWidth(): Dp {
-  Image(
+  val view = LocalView.current
-    preview,
+  val density = LocalDensity.current.density
-    contentDescription = stringResource(MR.strings.video_descr),
+  return remember {
-    modifier = Modifier
+    val rect = Rect()
-      .fillMaxSize()
+    view.getWindowVisibleDisplayFrame(rect)
-      .combinedClickable(
+    (rect.width() / density).dp
-        onLongClick = onLongClick,
+  }
-        onClick = onClick
-      )
-      .onRightClick(onLongClick),
-    contentScale = ContentScale.FillWidth,
-  )
 }
 
-@Composable
-expect fun LocalWindowWidth(): Dp
-
 @Composable
 private fun progressIndicator() {
   CircularProgressIndicator(
@@ -339,7 +252,7 @@ private fun progressIndicator() {
 }
 
 @Composable
-private fun fileIcon(icon: Painter, stringId: StringResource) {
+private fun fileIcon(icon: Painter, @StringRes stringId: Int) {
   Icon(
     icon,
     stringResource(stringId),
@@ -356,8 +269,7 @@ private fun progressCircle(progress: Long, total: Long) {
   Surface(
     Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
     color = Color.Transparent,
-    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50)),
+    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
-    contentColor = LocalContentColor.current
   ) {
     Box(Modifier.size(16.dp))
   }
@@ -377,29 +289,25 @@ private fun loadingIndicator(file: CIFile?) {
           when (file.fileProtocol) {
             FileProtocol.XFTP -> progressIndicator()
             FileProtocol.SMP -> {}
-            FileProtocol.LOCAL -> {}
           }
         is CIFileStatus.SndTransfer ->
           when (file.fileProtocol) {
             FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
             FileProtocol.SMP -> progressIndicator()
-            FileProtocol.LOCAL -> {}
           }
-        is CIFileStatus.SndComplete -> fileIcon(painterResource(MR.images.ic_check_filled), MR.strings.icon_descr_video_snd_complete)
+        is CIFileStatus.SndComplete -> fileIcon(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_video_snd_complete)
-        is CIFileStatus.SndCancelled -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
+        is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.SndError -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
+        is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvInvitation -> fileIcon(painterResource(MR.images.ic_arrow_downward), MR.strings.icon_descr_video_asked_to_receive)
+        is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_video_asked_to_receive)
-        is CIFileStatus.RcvAccepted -> fileIcon(painterResource(MR.images.ic_more_horiz), MR.strings.icon_descr_waiting_for_video)
+        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.RcvAborted -> fileIcon(painterResource(MR.images.ic_sync_problem), MR.strings.icon_descr_file)
+        is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvCancelled -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
+        is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvError -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
-        is CIFileStatus.Invalid -> fileIcon(painterResource(MR.images.ic_question_mark), MR.strings.icon_descr_file)
         else -> {}
       }
     }
@@ -418,13 +326,13 @@ private fun receiveFileIfValidSize(file: CIFile, receiveFile: (Long) -> Unit) {
     receiveFile(file.fileId)
   } else {
     AlertManager.shared.showAlertMsg(
-      generalGetString(MR.strings.large_file),
+      generalGetString(R.string.large_file),
-      String.format(generalGetString(MR.strings.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
+      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(DEFAULT_MAX_IMAGE_WIDTH, windowWidth - approximatePadding)
+  return minOf(1000.dp, windowWidth - approximatePadding)
 }

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

@@ -0,0 +1,262 @@
+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

@@ -0,0 +1,457 @@
+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,5 +1,6 @@
-package chat.simplex.common.views.chat.item
+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.*
@@ -9,21 +10,20 @@ 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.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.ChatItem
+import chat.simplex.app.model.ChatItem
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.ui.theme.*
 
 @Composable
-fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean) {
+fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
   val sent = ci.chatDir.sent
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
   Surface(
     shape = RoundedCornerShape(18.dp),
     color = if (sent) sentColor else receivedColor,
-    contentColor = LocalContentColor.current
   ) {
     Row(
       Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -31,27 +31,28 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean)
     ) {
       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, showViaProxy = showViaProxy)
+      CIMetaView(ci, timedMessagesTTL)
     }
   }
 }
 
-@Preview/*(
+@Preview(showBackground = true)
+@Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
   name = "Dark Mode"
-)*/
+)
 @Composable
 fun PreviewDeletedItemView() {
   SimpleXTheme {
     DeletedItemView(
       ChatItem.getDeletedContentSampleData(),
-      null,
+      null
-      showViaProxy = false
     )
   }
 }

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
@@ -9,26 +9,27 @@ 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.common.model.ChatItem
+import chat.simplex.app.model.ChatItem
-import chat.simplex.common.model.MREmojiChar
-import chat.simplex.common.ui.theme.EmojiFont
 
-val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp, fontFamily = EmojiFont)
+val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp)
-val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp, fontFamily = EmojiFont)
+val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp)
 
 @Composable
-fun EmojiItemView(chatItem: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean) {
+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, showViaProxy = showViaProxy)
+    CIMetaView(chatItem, timedMessagesTTL)
   }
 }
 
 @Composable
-expect fun EmojiText(text: String)
+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 = "^(" +

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -10,20 +10,23 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 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.UriHandler
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.*
 import androidx.compose.ui.unit.*
-import chat.simplex.common.model.*
+import androidx.compose.ui.util.fastMap
-import chat.simplex.common.platform.*
+import chat.simplex.app.R
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.model.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.res.MR
+import chat.simplex.app.views.helpers.*
+import kotlinx.datetime.Clock
 import kotlin.math.min
 
 @Composable
@@ -32,8 +35,8 @@ fun FramedItemView(
   ci: ChatItem,
   uriHandler: UriHandler? = null,
   imageProvider: (() -> ImageGalleryProvider)? = null,
+  showMember: Boolean = false,
   linkMode: SimplexLinkMode,
-  showViaProxy: Boolean,
   showMenu: MutableState<Boolean>,
   receiveFile: (Long) -> Unit,
   onLinkLongClick: (link: String) -> Unit = {},
@@ -47,18 +50,7 @@ fun FramedItemView(
   }
 
   @Composable
-  fun ciQuotedMsgTextView(qi: CIQuote, lines: Int) {
+  fun Color.toQuote(): Color = if (isInDarkTheme()) lighter(0.12f) else darker(0.12f)
-    MarkdownText(
-      qi.text,
-      qi.formattedText,
-      toggleSecrets = true,
-      maxLines = lines,
-      overflow = TextOverflow.Ellipsis,
-      style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface),
-      linkMode = linkMode,
-      uriHandler = if (appPlatform.isDesktop) uriHandler else null
-    )
-  }
 
   @Composable
   fun ciQuotedMsgView(qi: CIQuote) {
@@ -66,35 +58,24 @@ fun FramedItemView(
       Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
       contentAlignment = Alignment.TopStart
     ) {
-      val sender = qi.sender(membership())
+      MarkdownText(
-      if (sender != null) {
+        qi.text, qi.formattedText, sender = qi.sender(membership()), senderBold = true, maxLines = 3,
-        Column(
+        style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface),
-          horizontalAlignment = Alignment.Start
+        linkMode = linkMode
-        ) {
+      )
-          Text(
-            sender,
-            style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
-            maxLines = 1
-          )
-          ciQuotedMsgTextView(qi, lines = 2)
-        }
-      } else {
-        ciQuotedMsgTextView(qi, lines = 3)
-      }
     }
   }
 
   @Composable
-  fun FramedItemHeader(caption: String, italic: Boolean, icon: Painter? = null, pad: Boolean = false) {
+  fun FramedItemHeader(caption: String, italic: Boolean, icon: Painter? = null) {
-    val sentColor = MaterialTheme.appColors.sentQuote
+    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = MaterialTheme.appColors.receivedQuote
+    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
     Row(
       Modifier
-        .background(if (sent) sentColor else receivedColor)
+        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
         .fillMaxWidth()
-        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (pad || (ci.quotedItem == null && ci.meta.itemForwarded == null)) 6.dp else 0.dp),
+        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (ci.quotedItem == null) 6.dp else 0.dp),
       horizontalArrangement = Arrangement.spacedBy(4.dp),
-      verticalAlignment = Alignment.CenterVertically
     ) {
       if (icon != null) {
         Icon(
@@ -119,27 +100,26 @@ fun FramedItemView(
 
   @Composable
   fun ciQuoteView(qi: CIQuote) {
-    val sentColor = MaterialTheme.appColors.sentQuote
+    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = MaterialTheme.appColors.receivedQuote
+    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
     Row(
       Modifier
-        .background(if (sent) sentColor else receivedColor)
+        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
         .fillMaxWidth()
         .combinedClickable(
           onLongClick = { showMenu.value = true },
           onClick = { scrollToItem(qi.itemId?: return@combinedClickable) }
         )
-        .onRightClick { showMenu.value = true }
     ) {
       when (qi.content) {
         is MsgContent.MCImage -> {
           Box(Modifier.fillMaxWidth().weight(1f)) {
             ciQuotedMsgView(qi)
           }
-          val imageBitmap = base64ToBitmap(qi.content.image)
+          val imageBitmap = base64ToBitmap(qi.content.image).asImageBitmap()
           Image(
             imageBitmap,
-            contentDescription = stringResource(MR.strings.image_descr),
+            contentDescription = stringResource(R.string.image_descr),
             contentScale = ContentScale.Crop,
             modifier = Modifier.size(68.dp).clipToBounds()
           )
@@ -148,10 +128,10 @@ fun FramedItemView(
           Box(Modifier.fillMaxWidth().weight(1f)) {
             ciQuotedMsgView(qi)
           }
-          val imageBitmap = base64ToBitmap(qi.content.image)
+          val imageBitmap = base64ToBitmap(qi.content.image).asImageBitmap()
           Image(
             imageBitmap,
-            contentDescription = stringResource(MR.strings.video_descr),
+            contentDescription = stringResource(R.string.video_descr),
             contentScale = ContentScale.Crop,
             modifier = Modifier.size(68.dp).clipToBounds()
           )
@@ -161,8 +141,8 @@ fun FramedItemView(
             ciQuotedMsgView(qi)
           }
           Icon(
-            if (qi.content is MsgContent.MCFile) painterResource(MR.images.ic_draft_filled) else painterResource(MR.images.ic_mic_filled),
+            if (qi.content is MsgContent.MCFile) painterResource(R.drawable.ic_draft_filled) else painterResource(R.drawable.ic_mic_filled),
-            if (qi.content is MsgContent.MCFile) stringResource(MR.strings.icon_descr_file) else stringResource(MR.strings.voice_message),
+            if (qi.content is MsgContent.MCFile) stringResource(R.string.icon_descr_file) else stringResource(R.string.voice_message),
             Modifier
               .padding(top = 6.dp, end = 4.dp)
               .size(22.dp),
@@ -176,26 +156,19 @@ fun FramedItemView(
 
   @Composable
   fun ciFileView(ci: ChatItem, text: String) {
-    CIFileView(ci.file, ci.meta.itemEdited, showMenu, receiveFile)
+    CIFileView(ci.file, ci.meta.itemEdited, receiveFile)
     if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(ci, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy)
+      CIMarkdownText(ci, chatTTL, showMember, linkMode = linkMode, uriHandler)
     }
   }
 
   val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
-      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null && ci.meta.itemForwarded == null
+      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null
 
-  val sentColor = MaterialTheme.appColors.sentMessage
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
   Box(Modifier
     .clip(RoundedCornerShape(18.dp))
-    .background(
-      when {
-        transparentBackground -> Color.Transparent
-        sent -> MaterialTheme.colors.background
-        else -> MaterialTheme.colors.background
-      }
-    )
     .background(
       when {
         transparentBackground -> Color.Transparent
@@ -208,28 +181,15 @@ fun FramedItemView(
       Column(Modifier.width(IntrinsicSize.Max)) {
         PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
           if (ci.meta.itemDeleted != null) {
-            when (ci.meta.itemDeleted) {
+            if (ci.meta.itemDeleted is CIDeleted.Moderated) {
-              is CIDeleted.Moderated -> {
+              FramedItemHeader(String.format(stringResource(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, painterResource(R.drawable.ic_flag))
-                FramedItemHeader(String.format(stringResource(MR.strings.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, painterResource(MR.images.ic_flag))
+            } else {
-              }
+              FramedItemHeader(stringResource(R.string.marked_deleted_description), true, painterResource(R.drawable.ic_delete))
-              is CIDeleted.Blocked -> {
-                FramedItemHeader(stringResource(MR.strings.blocked_item_description), true, painterResource(MR.images.ic_back_hand))
-              }
-              is CIDeleted.BlockedByAdmin -> {
-                FramedItemHeader(stringResource(MR.strings.blocked_by_admin_item_description), true, painterResource(MR.images.ic_back_hand))
-              }
-              is CIDeleted.Deleted -> {
-                FramedItemHeader(stringResource(MR.strings.marked_deleted_description), true, painterResource(MR.images.ic_delete))
-              }
             }
           } else if (ci.meta.isLive) {
-            FramedItemHeader(stringResource(MR.strings.live), false)
+            FramedItemHeader(stringResource(R.string.live), false)
-          }
-          if (ci.quotedItem != null) {
-            ciQuoteView(ci.quotedItem)
-          } else if (ci.meta.itemForwarded != null) {
-            FramedItemHeader(ci.meta.itemForwarded.text(chatInfo.chatType), true, painterResource(MR.images.ic_forward), pad = true)
           }
+          ci.quotedItem?.let { ciQuoteView(it) }
           if (ci.file == null && ci.formattedText == null && !ci.meta.isLive && isShortEmoji(ci.content.text)) {
             Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
               Column(
@@ -249,7 +209,7 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
+                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                 }
               }
               is MsgContent.MCVideo -> {
@@ -257,35 +217,33 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
+                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                 }
               }
               is MsgContent.MCVoice -> {
-                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, showViaProxy = showViaProxy, longClick = { onLinkLongClick("") }, receiveFile)
+                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") })
                 if (mc.text != "") {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
+                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                 }
               }
               is MsgContent.MCFile -> ciFileView(ci, mc.text)
               is MsgContent.MCUnknown ->
                 if (ci.file == null) {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
+                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
                 } else {
                   ciFileView(ci, mc.text)
                 }
               is MsgContent.MCLink -> {
                 ChatItemLinkView(mc.preview)
-                Box(Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
+                CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
-                }
               }
-              else -> CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
+              else -> CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
             }
           }
         }
       }
       Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
-        CIMetaView(ci, chatTTL, metaColor, showViaProxy = showViaProxy)
+        CIMetaView(ci, chatTTL, metaColor)
       }
     }
   }
@@ -295,17 +253,17 @@ fun FramedItemView(
 fun CIMarkdownText(
   ci: ChatItem,
   chatTTL: Int?,
+  showMember: Boolean,
   linkMode: SimplexLinkMode,
   uriHandler: UriHandler?,
-  onLinkLongClick: (link: String) -> Unit = {},
+  onLinkLongClick: (link: String) -> Unit = {}
-  showViaProxy: Boolean
 ) {
   Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
     val text = if (ci.meta.isLive) ci.content.msgContent?.text ?: ci.text else ci.text
     MarkdownText(
-      text, if (text.isEmpty()) emptyList() else ci.formattedText, toggleSecrets = true,
+      text, if (text.isEmpty()) emptyList() else ci.formattedText, if (showMember) ci.memberDisplayName else null,
       meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
-      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick, showViaProxy = showViaProxy
+      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick
     )
   }
 }
@@ -325,8 +283,8 @@ fun PriorityLayout(
   content: @Composable () -> Unit
 ) {
   /**
-   * Limiting max value for height + width in order to not crash the app, see [androidx.compose.ui.unit.Constraints.createConstraints]
+  * Limiting max value for height + width in order to not crash the app, see [androidx.compose.ui.unit.Constraints.createConstraints]
-   * */
+  * */
   fun maxSafeHeight(width: Int) = when { // width bits + height bits should be <= 31
     width < 0x1FFF /*MaxNonFocusMask*/ -> 0x3FFFF - 1 /* MaxFocusMask */ // 13 bits width + 18 bits height
     width < 0x7FFF /*MinNonFocusMask*/ -> 0xFFFF - 1 /* MinFocusMask */ // 15 bits width + 16 bits height
@@ -342,7 +300,7 @@ fun PriorityLayout(
     // Find important element which should tell what max width other elements can use
     // Expecting only one such element. Can be less than one but not more
     val imagePlaceable = measureable.firstOrNull { it.layoutId == priorityLayoutId }?.measure(constraints)
-    val placeables: List<Placeable> = measureable.map {
+    val placeables: List<Placeable> = measureable.fastMap {
       if (it.layoutId == priorityLayoutId)
         imagePlaceable!!
       else
@@ -359,7 +317,6 @@ fun PriorityLayout(
     }
   }
 }
-/*
 
 class EditedProvider: PreviewParameterProvider<Boolean> {
   override val values = listOf(false, true).asSequence()
@@ -549,4 +506,3 @@ fun PreviewQuoteWithLongTextAndFile(@PreviewParameter(EditedProvider::class) edi
     )
   }
 }
-*/

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

@@ -1,25 +1,42 @@
-package chat.simplex.common.views.chat.item
+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.foundation.pager.HorizontalPager
+import androidx.compose.material.*
-import androidx.compose.foundation.pager.rememberPagerState
 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 chat.simplex.common.model.CryptoFile
+import androidx.compose.ui.platform.*
-import chat.simplex.common.platform.*
+import androidx.compose.ui.res.stringResource
-import chat.simplex.common.views.chat.ProviderMedia
+import androidx.compose.ui.unit.*
-import chat.simplex.common.views.helpers.*
+import androidx.compose.ui.viewinterop.AndroidView
-import chat.simplex.res.MR
+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 java.net.URI
 import kotlin.math.absoluteValue
 
 interface ImageGalleryProvider {
@@ -31,15 +48,11 @@ interface ImageGalleryProvider {
   fun onDismiss(index: Int)
 }
 
+@OptIn(ExperimentalPagerApi::class)
 @Composable
 fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () -> Unit) {
   val provider = remember { imageProvider() }
-  val pagerState = rememberPagerState(
+  val pagerState = rememberPagerState(provider.initialIndex)
-    initialPage = provider.initialIndex,
-    initialPageOffsetFraction = 0f
-  ) {
-    provider.totalMediaSize.value
-  }
   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,
@@ -51,13 +64,11 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
     }
   }
   val scope = rememberCoroutineScope()
-  val playersToRelease = rememberSaveable { mutableSetOf<URI>() }
+  val playersToRelease = rememberSaveable { mutableSetOf<Uri>() }
   DisposableEffectOnGone(
-    whenGone = { playersToRelease.forEach { VideoPlayerHolder.release(it, true, true) } }
+    whenGone = { playersToRelease.forEach { VideoPlayer.release(it, true, true) } }
   )
-
+  HorizontalPager(count = remember { provider.totalMediaSize }.value, state = pagerState) { index ->
-  @Composable
-  fun Content(index: Int) {
     Column(
       Modifier
         .fillMaxSize()
@@ -88,8 +99,6 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
                 provider.scrollToStart()
                 pagerState.scrollToPage(0)
               }
-              // Current media was deleted or moderated, close gallery
-              index -> close()
             }
           }
         }
@@ -131,56 +140,45 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
             )
           }
           .fillMaxSize()
-        // LALAL
-        // https://github.com/JetBrains/compose-multiplatform/pull/2015/files#diff-841b3825c504584012e1d1c834d731bae794cce6acad425d81847c8bbbf239e0R24
         if (media is ProviderMedia.Image) {
-          val (data: ByteArray, imageBitmap: ImageBitmap) = media
+          val (uri: Uri, imageBitmap: Bitmap) = media
-          FullScreenImageView(modifier, data, imageBitmap)
+          // 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) }
-          val uriDecrypted = remember(media.uri.path) { mutableStateOf(if (media.fileSource?.cryptoArgs == null) media.uri else media.fileSource.decryptedGet()) }
+          VideoView(modifier, media.uri, preview, index == settledCurrentPage)
-          val decrypted = uriDecrypted.value
+          DisposableEffect(Unit) {
-          if (decrypted != null) {
+            onDispose { playersToRelease.add(media.uri) }
-            VideoView(modifier, decrypted, preview, index == settledCurrentPage, close)
-            DisposableEffect(Unit) {
-              onDispose { playersToRelease.add(decrypted) }
-            }
-          } else if (media.fileSource != null) {
-            VideoViewEncrypted(uriDecrypted, media.fileSource, preview, close)
           }
         }
       }
     }
   }
-  if (appPlatform.isAndroid) {
-    HorizontalPager(state = pagerState) { index -> Content(index) }
-  } else {
-    Content(pagerState.currentPage)
-  }
 }
 
 @Composable
-expect fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap: ImageBitmap)
+private fun VideoView(modifier: Modifier, uri: Uri, defaultPreview: Bitmap, currentPage: Boolean) {
-
+  val context = LocalContext.current
-@Composable
+  val player = remember(uri) { VideoPlayer.getOrCreate(uri, true, defaultPreview, 0L, true, context) }
-private fun VideoViewEncrypted(uriUnencrypted: MutableState<URI?>, fileSource: CryptoFile, defaultPreview: ImageBitmap, close: () -> Unit) {
-  LaunchedEffect(Unit) {
-    withBGApi {
-      uriUnencrypted.value = fileSource.decryptedGetOrCreate()
-      if (uriUnencrypted.value == null) {
-        close()
-      }
-    }
-  }
-  Box(contentAlignment = Alignment.Center) {
-    VideoPreviewImageViewFullScreen(defaultPreview, {}, {})
-    VideoDecryptionProgress {}
-  }
-}
-
-@Composable
-private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap, currentPage: Boolean, close: () -> Unit) {
-  val player = remember(uri) { VideoPlayerHolder.getOrCreate(uri, true, defaultPreview, 0L, true) }
   val isCurrentPage = rememberUpdatedState(currentPage)
   val play = {
     player.play(true)
@@ -189,18 +187,32 @@ private fun VideoView(modifier: Modifier, uri: URI, defaultPreview: ImageBitmap,
     player.stop()
   }
   LaunchedEffect(Unit) {
+    player.enableSound(true)
     snapshotFlow { isCurrentPage.value }
       .distinctUntilChanged()
-      .collect {
+      .collect { if (it) play() else stop() }
-        if (it) play() else stop()
-        player.enableSound(true)
-      }
   }
 
   Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    FullScreenVideoView(player, modifier, close)
+    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
+    )
   }
 }
-
-@Composable
-expect fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier, close: () -> Unit)

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

@@ -1,5 +1,6 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
+import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
@@ -12,50 +13,50 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.ChatItem
+import chat.simplex.app.R
-import chat.simplex.common.model.MsgErrorType
+import chat.simplex.app.model.ChatItem
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.model.MsgErrorType
-import chat.simplex.common.views.helpers.AlertManager
+import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.res.MR
+import chat.simplex.app.views.helpers.AlertManager
+import chat.simplex.app.views.helpers.generalGetString
 
 @Composable
-fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, timedMessagesTTL: Int?) {
+fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  CIMsgError(ci, timedMessagesTTL) {
+  CIMsgError(ci, timedMessagesTTL, showMember) {
     when (msgError) {
       is MsgErrorType.MsgSkipped ->
         AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.alert_title_skipped_messages),
+          title = generalGetString(R.string.alert_title_skipped_messages),
-          text = generalGetString(MR.strings.alert_text_skipped_messages_it_can_happen_when)
+          text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
         )
       is MsgErrorType.MsgBadHash ->
         AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.alert_title_msg_bad_hash),
+          title = generalGetString(R.string.alert_title_msg_bad_hash),
-          text = generalGetString(MR.strings.alert_text_msg_bad_hash) + "\n" +
+          text = generalGetString(R.string.alert_text_msg_bad_hash) + "\n" +
-              generalGetString(MR.strings.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
+              generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-              generalGetString(MR.strings.alert_text_fragment_please_report_to_developers)
+              generalGetString(R.string.alert_text_fragment_please_report_to_developers)
         )
       is MsgErrorType.MsgBadId, is MsgErrorType.MsgDuplicate ->
         AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.alert_title_msg_bad_id),
+          title = generalGetString(R.string.alert_title_msg_bad_id),
-          text = generalGetString(MR.strings.alert_text_msg_bad_id) + "\n" +
+          text = generalGetString(R.string.alert_text_msg_bad_id) + "\n" +
-              generalGetString(MR.strings.alert_text_fragment_please_report_to_developers)
+              generalGetString(R.string.alert_text_fragment_please_report_to_developers)
         )
     }
   }
 }
 
 @Composable
-fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, onClick: () -> Unit) {
+fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false, onClick: () -> Unit) {
-  val receivedColor = MaterialTheme.appColors.receivedMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
   Surface(
     Modifier.clickable(onClick = onClick),
     shape = RoundedCornerShape(18.dp),
     color = receivedColor,
-    contentColor = LocalContentColor.current
   ) {
     Row(
       Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -63,20 +64,22 @@ fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, onClick: () -> Unit) {
     ) {
       Text(
         buildAnnotatedString {
+          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
           withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
         },
         style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
         modifier = Modifier.padding(end = 8.dp)
       )
-      CIMetaView(ci, timedMessagesTTL, showViaProxy = false)
+      CIMetaView(ci, timedMessagesTTL)
     }
   }
 }
 
-@Preview/*(
+@Preview(showBackground = true)
+@Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
   name = "Dark Mode"
-)*/
+)
 @Composable
 fun IntegrityErrorItemViewPreview() {
   SimpleXTheme {

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

@@ -0,0 +1,74 @@
+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.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.CIDeleted
+import chat.simplex.app.model.ChatItem
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.generalGetString
+
+@Composable
+fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
+  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  Surface(
+    shape = RoundedCornerShape(18.dp),
+    color = if (ci.chatDir.sent) sentColor else receivedColor,
+  ) {
+    Row(
+      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      Box(Modifier.weight(1f, false)) {
+        if (ci.meta.itemDeleted is CIDeleted.Moderated) {
+          MarkedDeletedText(String.format(generalGetString(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName))
+        } else {
+          MarkedDeletedText(generalGetString(R.string.marked_deleted_description))
+        }
+      }
+      CIMetaView(ci, timedMessagesTTL)
+    }
+  }
+}
+
+@Composable
+private fun MarkedDeletedText(text: String) {
+  Text(
+    buildAnnotatedString {
+      // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
+      withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(text) }
+    },
+    style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+    modifier = Modifier.padding(end = 8.dp),
+    maxLines = 1,
+    overflow = TextOverflow.Ellipsis,
+  )
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewMarkedDeletedItemView() {
+  SimpleXTheme {
+    DeletedItemView(
+      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted()),
+      null
+    )
+  }
+}

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

@@ -1,32 +1,43 @@
-package chat.simplex.common.views.chat.item
+package chat.simplex.app.views.chat.item
 
-import androidx.compose.foundation.text.BasicText
+import android.app.Activity
-import androidx.compose.foundation.text.InlineTextContent
+import android.content.ActivityNotFoundException
+import android.util.Log
+import androidx.annotation.IntRange
+import androidx.compose.foundation.text.*
 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.input.pointer.*
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.*
-import androidx.compose.ui.unit.sp
+import androidx.core.text.BidiFormatter
-import chat.simplex.common.model.*
+import chat.simplex.app.TAG
-import chat.simplex.common.platform.*
+import chat.simplex.app.model.*
-import chat.simplex.common.ui.theme.CurrentColors
+import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.views.helpers.detectGesture
 import kotlinx.coroutines.*
-import java.awt.*
 
 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
 
+fun appendGroupMember(b: AnnotatedString.Builder, chatItem: ChatItem, groupMemberBold: Boolean) {
+  if (chatItem.chatDir is CIDirection.GroupRcv) {
+    val name = chatItem.chatDir.groupMember.memberProfile.displayName
+    if (groupMemberBold) b.withStyle(boldFont) { append(name) }
+    else b.append(name)
+    b.append(": ")
+  }
+}
+
 fun appendSender(b: AnnotatedString.Builder, sender: String?, senderBold: Boolean) {
   if (sender != null) {
     if (senderBold) b.withStyle(boldFont) { append(sender) }
@@ -45,7 +56,7 @@ private val typingIndicators: List<AnnotatedString> = listOf(
 )
 
 
-private fun typingIndicator(recent: Boolean, typingIdx: Int): AnnotatedString = buildAnnotatedString {
+private fun typingIndicator(recent: Boolean, @IntRange (from = 0, to = 4) typingIdx: Int): AnnotatedString = buildAnnotatedString {
   pushStyle(SpanStyle(color = CurrentColors.value.colors.secondary, fontFamily = FontFamily.Monospace, letterSpacing = (-1).sp))
   append(if (recent) typingIndicators[typingIdx] else noTyping)
 }
@@ -60,7 +71,6 @@ fun MarkdownText (
   sender: String? = null,
   meta: CIMeta? = null,
   chatTTL: Int? = null,
-  toggleSecrets: Boolean,
   style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
   maxLines: Int = Int.MAX_VALUE,
   overflow: TextOverflow = TextOverflow.Clip,
@@ -68,17 +78,16 @@ fun MarkdownText (
   senderBold: Boolean = false,
   modifier: Modifier = Modifier,
   linkMode: SimplexLinkMode,
-  inlineContent: Pair<AnnotatedString.Builder.() -> Unit, Map<String, InlineTextContent>>? = null,
+  inlineContent: Map<String, InlineTextContent>? = null,
-  onLinkLongClick: (link: String) -> Unit = {},
+  onLinkLongClick: (link: String) -> Unit = {}
-  showViaProxy: Boolean = false
 ) {
   val textLayoutDirection = remember (text) {
-    if (isRtl(text.subSequence(0, kotlin.math.min(50, text.length)))) LayoutDirection.Rtl else LayoutDirection.Ltr
+    if (BidiFormatter.getInstance().isRtl(text.subSequence(0, kotlin.math.min(50, text.length)))) LayoutDirection.Rtl else LayoutDirection.Ltr
   }
   val reserve = if (textLayoutDirection != LocalLayoutDirection.current && meta != null) {
     "\n"
   } else if (meta != null) {
-    reserveSpaceForMeta(meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy)
+    reserveSpaceForMeta(meta, chatTTL)
   } else {
     "    "
   }
@@ -91,7 +100,6 @@ fun MarkdownText (
   ) {
     var timer: Job? by remember { mutableStateOf(null) }
     var typingIdx by rememberSaveable { mutableStateOf(0) }
-    val showSecrets = remember { mutableStateMapOf<String, Boolean>() }
     fun stopTyping() {
       timer?.cancel()
       timer = null
@@ -109,18 +117,21 @@ fun MarkdownText (
       }
     }
     if (meta?.isLive == true) {
+      val activity = LocalContext.current as Activity
       LaunchedEffect(meta.recent, meta.isLive) {
         switchTyping()
       }
-      DisposableEffectOnGone(
+      DisposableEffect(Unit) {
-        whenGone = {
+        val orientation = activity.resources.configuration.orientation
-          stopTyping()
+        onDispose {
+          if (orientation == activity.resources.configuration.orientation) {
+            stopTyping()
+          }
         }
-      )
+      }
     }
     if (formattedText == null) {
       val annotatedText = buildAnnotatedString {
-        inlineContent?.first?.invoke(this)
         appendSender(this, sender, senderBold)
         if (text is String) append(text)
         else if (text is AnnotatedString) append(text)
@@ -129,27 +140,23 @@ fun MarkdownText (
         }
         if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
       }
-      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow, inlineContent = inlineContent?.second ?: mapOf())
+      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow, inlineContent = inlineContent ?: mapOf())
     } else {
-      var hasAnnotations = false
+      var hasLinks = false
       val annotatedText = buildAnnotatedString {
-        inlineContent?.first?.invoke(this)
         appendSender(this, sender, senderBold)
-        for ((i, ft) in formattedText.withIndex()) {
+        for (ft in formattedText) {
           if (ft.format == null) append(ft.text)
-          else if (toggleSecrets && ft.format is Format.Secret) {
+          else {
-            val ftStyle = ft.format.style
-            hasAnnotations = true
-            val key = i.toString()
-            withAnnotation(tag = "SECRET", annotation = key) {
-              if (showSecrets[key] == true) append(ft.text) else withStyle(ftStyle) { append(ft.text) }
-            }
-          } else {
             val link = ft.link(linkMode)
             if (link != null) {
-              hasAnnotations = true
+              hasLinks = true
-              val ftStyle = ft.format.style
+              val ftStyle = if (ft.format is Format.SimplexLink && !ft.format.trustedUri && linkMode == SimplexLinkMode.BROWSER) {
-              withAnnotation(tag = if (ft.format is Format.SimplexLink) "SIMPLEX_URL" else "URL", annotation = link) {
+                SpanStyle(color = Color.Red, textDecoration = TextDecoration.Underline)
+              } else {
+                ft.format.style
+              }
+              withAnnotation(tag = "URL", annotation = link) {
                 withStyle(ftStyle) { append(ft.viewText(linkMode)) }
               }
             } else {
@@ -165,55 +172,30 @@ fun MarkdownText (
           withStyle(reserveTimestampStyle) { append("\n" + metaText) }
         else */if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
       }
-      if (hasAnnotations && uriHandler != null) {
+      if (hasLinks && uriHandler != null) {
-        val icon = remember { mutableStateOf(PointerIcon.Default) }
+        ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
-        ClickableText(annotatedText, style = style, modifier = modifier.pointerHoverIcon(icon.value), maxLines = maxLines, overflow = overflow,
           onLongClick = { offset ->
             annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
               .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
           },
           onClick = { offset ->
             annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
               .firstOrNull()?.let { annotation ->
                 try {
                   uriHandler.openUri(annotation.item)
-                } catch (e: Exception) {
+                } catch (e: ActivityNotFoundException) {
                   // It can happen, for example, when you click on a text 0.00001 but don't have any app that can catch
                   // `tel:` scheme in url installed on a device (no phone app or contacts, maybe)
                   Log.e(TAG, "Open url: ${e.stackTraceToString()}")
                 }
               }
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
-                uriHandler.openVerifiedSimplexUri(annotation.item)
-              }
-            annotatedText.getStringAnnotations(tag = "SECRET", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
-                val key = annotation.item
-                showSecrets[key] = !(showSecrets[key] ?: false)
-              }
-          },
-          onHover = { offset ->
-            icon.value = annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let {
-                PointerIcon.Hand
-              } ?: annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let {
-                PointerIcon.Hand
-              } ?: annotatedText.getStringAnnotations(tag = "SECRET", start = offset, end = offset)
-              .firstOrNull()?.let {
-                PointerIcon.Hand
-              } ?: PointerIcon.Default
           },
           shouldConsumeEvent = { offset ->
             annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset).any()
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset).any()
           }
         )
       } else {
-        Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow, inlineContent = inlineContent?.second ?: mapOf())
+        Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
       }
     }
   }
@@ -230,7 +212,6 @@ fun ClickableText(
   onTextLayout: (TextLayoutResult) -> Unit = {},
   onClick: (Int) -> Unit,
   onLongClick: (Int) -> Unit = {},
-  onHover: (Int) -> Unit = {},
   shouldConsumeEvent: (Int) -> Boolean
 ) {
   val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -247,21 +228,13 @@ fun ClickableText(
         }
       }
     }, shouldConsumeEvent = { pos ->
-      var consume = false
+        var consume = false
-      layoutResult.value?.let { layoutResult ->
-        consume = shouldConsumeEvent(layoutResult.getOffsetForPosition(pos))
-      }
-      consume
-    }
-    )
-  }.pointerInput(onHover) {
-    if (appPlatform.isDesktop) {
-      detectCursorMove { pos ->
         layoutResult.value?.let { layoutResult ->
-          onHover(layoutResult.getOffsetForPosition(pos))
+          consume = shouldConsumeEvent(layoutResult.getOffsetForPosition(pos))
         }
+      consume
       }
-    }
+    )
   }
 
   BasicText(
@@ -277,13 +250,3 @@ fun ClickableText(
     }
   )
 }
-
-private fun isRtl(s: CharSequence): Boolean {
-  for (element in s) {
-    val d = Character.getDirectionality(element)
-    if (d == Character.DIRECTIONALITY_RIGHT_TO_LEFT || d == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC || d == Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING || d == Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE) {
-      return true
-    }
-  }
-  return false
-}

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

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

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

@@ -0,0 +1,687 @@
+package chat.simplex.app.views.chatlist
+
+import android.content.res.Configuration
+import androidx.compose.foundation.combinedClickable
+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.platform.LocalDensity
+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.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.*
+import chat.simplex.app.views.chat.group.deleteGroupDialog
+import chat.simplex.app.views.chat.group.leaveGroupDialog
+import chat.simplex.app.views.chat.item.InvalidJSONView
+import chat.simplex.app.views.chat.item.ItemAction
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.newchat.ContactConnectionInfoView
+import kotlinx.coroutines.delay
+import kotlinx.datetime.Clock
+
+@Composable
+fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
+  val showMenu = remember { mutableStateOf(false) }
+  val showMarkRead = remember(chat.chatStats.unreadCount, chat.chatStats.unreadChat) {
+    chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
+  }
+  val stopped = chatModel.chatRunning.value == false
+  val linkMode by remember { chatModel.controller.appPrefs.simplexLinkMode.state }
+  LaunchedEffect(chat.id) {
+    showMenu.value = false
+    delay(500L)
+  }
+  when (chat.chatInfo) {
+    is ChatInfo.Direct -> {
+      val contactNetworkStatus = chatModel.contactNetworkStatus(chat.chatInfo.contact)
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ChatPreviewView(chat, chatModel.draft.value, chatModel.draftChatId.value, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, contactNetworkStatus, stopped, linkMode) },
+        click = { directChatAction(chat.chatInfo, chatModel) },
+        dropdownMenuItems = { ContactMenuItems(chat, chatModel, showMenu, showMarkRead) },
+        showMenu,
+        stopped
+      )
+    }
+    is ChatInfo.Group ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ChatPreviewView(chat, chatModel.draft.value, chatModel.draftChatId.value, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, null, stopped, linkMode) },
+        click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
+        dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, showMarkRead) },
+        showMenu,
+        stopped
+      )
+    is ChatInfo.ContactRequest ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ContactRequestView(chatModel.incognito.value, chat.chatInfo) },
+        click = { contactRequestAlertDialog(chat.chatInfo, chatModel) },
+        dropdownMenuItems = { ContactRequestMenuItems(chat.chatInfo, chatModel, showMenu) },
+        showMenu,
+        stopped
+      )
+    is ChatInfo.ContactConnection ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ContactConnectionView(chat.chatInfo.contactConnection) },
+        click = {
+          ModalManager.shared.showModalCloseable(true) { close ->
+            ContactConnectionInfoView(chatModel, chat.chatInfo.contactConnection.connReqInv, chat.chatInfo.contactConnection, false, close)
+          }
+        },
+        dropdownMenuItems = { ContactConnectionMenuItems(chat.chatInfo, chatModel, showMenu) },
+        showMenu,
+        stopped
+      )
+    is ChatInfo.InvalidJSON ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = {
+          InvalidDataView()
+        },
+        click = {
+          ModalManager.shared.showModal(true) { InvalidJSONView(chat.chatInfo.json) }
+        },
+        dropdownMenuItems = null,
+        showMenu,
+        stopped
+      )
+  }
+}
+
+fun directChatAction(chatInfo: ChatInfo, chatModel: ChatModel) {
+  if (chatInfo.ready) {
+    withApi { openChat(chatInfo, chatModel) }
+  } else {
+    pendingContactAlertDialog(chatInfo, chatModel)
+  }
+}
+
+fun groupChatAction(groupInfo: GroupInfo, chatModel: ChatModel) {
+  when (groupInfo.membership.memberStatus) {
+    GroupMemberStatus.MemInvited -> acceptGroupInvitationAlertDialog(groupInfo, chatModel)
+    GroupMemberStatus.MemAccepted -> groupInvitationAcceptedAlert()
+    else -> withApi { openChat(ChatInfo.Group(groupInfo), chatModel) }
+  }
+}
+
+suspend fun openChat(chatInfo: ChatInfo, chatModel: ChatModel) {
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId)
+  if (chat != null) {
+    chatModel.chatItems.clear()
+    chatModel.chatItems.addAll(chat.chatItems)
+    chatModel.chatId.value = chatInfo.id
+  }
+}
+
+suspend fun apiLoadPrevMessages(chatInfo: ChatInfo, chatModel: ChatModel, beforeChatItemId: Long, search: String) {
+  val pagination = ChatPagination.Before(beforeChatItemId, ChatPagination.PRELOAD_COUNT)
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, pagination, search) ?: return
+  chatModel.chatItems.addAll(0, chat.chatItems)
+}
+
+suspend fun apiFindMessages(chatInfo: ChatInfo, chatModel: ChatModel, search: String) {
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, search = search) ?: return
+  chatModel.chatItems.clear()
+  chatModel.chatItems.addAll(0, chat.chatItems)
+}
+
+suspend fun setGroupMembers(groupInfo: GroupInfo, chatModel: ChatModel) {
+  val groupMembers = chatModel.controller.apiListMembers(groupInfo.groupId)
+  chatModel.groupMembers.clear()
+  chatModel.groupMembers.addAll(groupMembers)
+}
+
+@Composable
+fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
+  if (showMarkRead) {
+    MarkReadChatAction(chat, chatModel, showMenu)
+  } else {
+    MarkUnreadChatAction(chat, chatModel, showMenu)
+  }
+  ToggleNotificationsChatAction(chat, chatModel, chat.chatInfo.ntfsEnabled, showMenu)
+  ClearChatAction(chat, chatModel, showMenu)
+  DeleteContactAction(chat, chatModel, showMenu)
+}
+
+@Composable
+fun GroupMenuItems(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
+  when (groupInfo.membership.memberStatus) {
+    GroupMemberStatus.MemInvited -> {
+      JoinGroupAction(chat, groupInfo, chatModel, showMenu)
+      if (groupInfo.canDelete) {
+        DeleteGroupAction(chat, groupInfo, chatModel, showMenu)
+      }
+    }
+    else -> {
+      if (showMarkRead) {
+        MarkReadChatAction(chat, chatModel, showMenu)
+      } else {
+        MarkUnreadChatAction(chat, chatModel, showMenu)
+      }
+      ToggleNotificationsChatAction(chat, chatModel, chat.chatInfo.ntfsEnabled, showMenu)
+      ClearChatAction(chat, chatModel, showMenu)
+      if (groupInfo.membership.memberCurrent) {
+        LeaveGroupAction(groupInfo, chatModel, showMenu)
+      }
+      if (groupInfo.canDelete) {
+        DeleteGroupAction(chat, groupInfo, chatModel, showMenu)
+      }
+    }
+  }
+}
+
+@Composable
+fun MarkReadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.mark_read),
+    painterResource(R.drawable.ic_check),
+    onClick = {
+      markChatRead(chat, chatModel)
+      chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun MarkUnreadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.mark_unread),
+    painterResource(R.drawable.ic_mark_chat_unread),
+    onClick = {
+      markChatUnread(chat, chatModel)
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun ToggleNotificationsChatAction(chat: Chat, chatModel: ChatModel, ntfsEnabled: Boolean, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    if (ntfsEnabled) stringResource(R.string.mute_chat) else stringResource(R.string.unmute_chat),
+    if (ntfsEnabled) painterResource(R.drawable.ic_notifications_off) else painterResource(R.drawable.ic_notifications),
+    onClick = {
+      changeNtfsStatePerChat(!ntfsEnabled, mutableStateOf(ntfsEnabled), chat, chatModel)
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun ClearChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.clear_chat_menu_action),
+    painterResource(R.drawable.ic_settings_backup_restore),
+    onClick = {
+      clearChatDialog(chat.chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = WarningOrange
+  )
+}
+
+@Composable
+fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.delete_contact_menu_action),
+    painterResource(R.drawable.ic_delete),
+    onClick = {
+      deleteContactDialog(chat.chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun DeleteGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.delete_group_menu_action),
+    painterResource(R.drawable.ic_delete),
+    onClick = {
+      deleteGroupDialog(chat.chatInfo, groupInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun JoinGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  val joinGroup: () -> Unit = { withApi { chatModel.controller.apiJoinGroup(groupInfo.groupId) } }
+  ItemAction(
+    if (chat.chatInfo.incognito) stringResource(R.string.join_group_incognito_button) else stringResource(R.string.join_group_button),
+    if (chat.chatInfo.incognito) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_login),
+    color = if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.onBackground,
+    onClick = {
+      joinGroup()
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun LeaveGroupAction(groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.leave_group_button),
+    painterResource(R.drawable.ic_logout),
+    onClick = {
+      leaveGroupDialog(groupInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    if (chatModel.incognito.value) stringResource(R.string.accept_contact_incognito_button) else stringResource(R.string.accept_contact_button),
+    if (chatModel.incognito.value) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_check),
+    color = if (chatModel.incognito.value) Indigo else MaterialTheme.colors.onBackground,
+    onClick = {
+      acceptContactRequest(chatInfo.apiId, chatInfo, true, chatModel)
+      showMenu.value = false
+    }
+  )
+  ItemAction(
+    stringResource(R.string.reject_contact_button),
+    painterResource(R.drawable.ic_close),
+    onClick = {
+      rejectContactRequest(chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.set_contact_name),
+    painterResource(R.drawable.ic_edit),
+    onClick = {
+      ModalManager.shared.showModalCloseable(true) { close ->
+        ContactConnectionInfoView(chatModel, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, true, close)
+      }
+      showMenu.value = false
+    },
+  )
+  ItemAction(
+    stringResource(R.string.delete_verb),
+    painterResource(R.drawable.ic_delete),
+    onClick = {
+      deleteContactConnectionAlert(chatInfo.contactConnection, chatModel) {}
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+private fun InvalidDataView() {
+  Row {
+    ProfileImage(72.dp, null, R.drawable.ic_account_circle_filled, MaterialTheme.colors.secondary)
+    Column(
+      modifier = Modifier
+        .padding(horizontal = 8.dp)
+        .weight(1F)
+    ) {
+      Text(
+        stringResource(R.string.invalid_data),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        style = MaterialTheme.typography.h3,
+        fontWeight = FontWeight.Bold,
+        color = Color.Red
+      )
+      val height = with(LocalDensity.current) { 46.sp.toDp() }
+      Spacer(Modifier.height(height))
+    }
+  }
+}
+
+fun markChatRead(c: Chat, chatModel: ChatModel) {
+  var chat = c
+  withApi {
+    if (chat.chatStats.unreadCount > 0) {
+      val minUnreadItemId = chat.chatStats.minUnreadItemId
+      chatModel.markChatItemsRead(chat.chatInfo)
+      chatModel.controller.apiChatRead(
+        chat.chatInfo.chatType,
+        chat.chatInfo.apiId,
+        CC.ItemRange(minUnreadItemId, chat.chatItems.last().id)
+      )
+      chat = chatModel.getChat(chat.id) ?: return@withApi
+    }
+    if (chat.chatStats.unreadChat) {
+      val success = chatModel.controller.apiChatUnread(
+        chat.chatInfo.chatType,
+        chat.chatInfo.apiId,
+        false
+      )
+      if (success) {
+        chatModel.replaceChat(chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = false)))
+      }
+    }
+  }
+}
+
+fun markChatUnread(chat: Chat, chatModel: ChatModel) {
+  // Just to be sure
+  if (chat.chatStats.unreadChat) return
+
+  withApi {
+    val success = chatModel.controller.apiChatUnread(
+      chat.chatInfo.chatType,
+      chat.chatInfo.apiId,
+      true
+    )
+    if (success) {
+      chatModel.replaceChat(chat.id, chat.copy(chatStats = chat.chatStats.copy(unreadChat = true)))
+    }
+  }
+}
+
+fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.accept_connection_request__question),
+    text = generalGetString(R.string.if_you_choose_to_reject_the_sender_will_not_be_notified),
+    confirmText = if (chatModel.incognito.value) generalGetString(R.string.accept_contact_incognito_button) else generalGetString(R.string.accept_contact_button),
+    onConfirm = { acceptContactRequest(contactRequest.apiId, contactRequest, true, chatModel) },
+    dismissText = generalGetString(R.string.reject_contact_button),
+    onDismiss = { rejectContactRequest(contactRequest, chatModel) }
+  )
+}
+
+fun acceptContactRequest(apiId: Long, contactRequest: ChatInfo.ContactRequest?, isCurrentUser: Boolean, chatModel: ChatModel) {
+  withApi {
+    val contact = chatModel.controller.apiAcceptContactRequest(apiId)
+    if (contact != null && isCurrentUser && contactRequest != null) {
+      val chat = Chat(ChatInfo.Direct(contact), listOf())
+      chatModel.replaceChat(contactRequest.id, chat)
+    }
+  }
+}
+
+fun rejectContactRequest(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
+  withApi {
+    chatModel.controller.apiRejectContactRequest(contactRequest.apiId)
+    chatModel.removeChat(contactRequest.id)
+  }
+}
+
+fun contactConnectionAlertDialog(connection: PendingContactConnection, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialogButtons(
+    title = generalGetString(
+      if (connection.initiated) R.string.you_invited_your_contact
+      else R.string.you_accepted_connection
+    ),
+    text = generalGetString(
+      if (connection.viaContactUri) R.string.you_will_be_connected_when_your_connection_request_is_accepted
+      else R.string.you_will_be_connected_when_your_contacts_device_is_online
+    ),
+    buttons = {
+      Row(
+        Modifier
+          .fillMaxWidth()
+          .padding(horizontal = 8.dp, vertical = 2.dp),
+        horizontalArrangement = Arrangement.Center,
+      ) {
+        TextButton(onClick = {
+          AlertManager.shared.hideAlert()
+          deleteContactConnectionAlert(connection, chatModel) {}
+        }) {
+          Text(stringResource(R.string.delete_verb))
+        }
+        Spacer(Modifier.padding(horizontal = 4.dp))
+        TextButton(onClick = { AlertManager.shared.hideAlert() }) {
+          Text(stringResource(R.string.ok))
+        }
+      }
+    }
+  )
+}
+
+fun deleteContactConnectionAlert(connection: PendingContactConnection, chatModel: ChatModel, onSuccess: () -> Unit) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.delete_pending_connection__question),
+    text = generalGetString(
+      if (connection.initiated) R.string.contact_you_shared_link_with_wont_be_able_to_connect
+      else R.string.connection_you_accepted_will_be_cancelled
+    ),
+    confirmText = generalGetString(R.string.delete_verb),
+    onConfirm = {
+      withApi {
+        AlertManager.shared.hideAlert()
+        if (chatModel.controller.apiDeleteChat(ChatType.ContactConnection, connection.apiId)) {
+          chatModel.removeChat(connection.id)
+          onSuccess()
+        }
+      }
+    },
+    destructive = true,
+  )
+}
+
+fun pendingContactAlertDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.alert_title_contact_connection_pending),
+    text = generalGetString(R.string.alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry),
+    confirmText = generalGetString(R.string.button_delete_contact),
+    onConfirm = {
+      withApi {
+        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
+        if (r) {
+          chatModel.removeChat(chatInfo.id)
+          chatModel.chatId.value = null
+        }
+      }
+    },
+    destructive = true,
+    dismissText = generalGetString(R.string.cancel_verb),
+  )
+}
+
+fun acceptGroupInvitationAlertDialog(groupInfo: GroupInfo, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.join_group_question),
+    text = generalGetString(R.string.you_are_invited_to_group_join_to_connect_with_group_members),
+    confirmText = if (groupInfo.membership.memberIncognito) generalGetString(R.string.join_group_incognito_button) else generalGetString(R.string.join_group_button),
+    onConfirm = { withApi { chatModel.controller.apiJoinGroup(groupInfo.groupId) } },
+    dismissText = generalGetString(R.string.delete_verb),
+    onDismiss = { deleteGroup(groupInfo, chatModel) }
+  )
+}
+
+fun cantInviteIncognitoAlert() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.alert_title_cant_invite_contacts),
+    text = generalGetString(R.string.alert_title_cant_invite_contacts_descr),
+    confirmText = generalGetString(R.string.ok),
+  )
+}
+
+fun deleteGroup(groupInfo: GroupInfo, chatModel: ChatModel) {
+  withApi {
+    val r = chatModel.controller.apiDeleteChat(ChatType.Group, groupInfo.apiId)
+    if (r) {
+      chatModel.removeChat(groupInfo.id)
+      chatModel.chatId.value = null
+      chatModel.controller.ntfManager.cancelNotificationsForChat(groupInfo.id)
+    }
+  }
+}
+
+fun groupInvitationAcceptedAlert() {
+  AlertManager.shared.showAlertMsg(
+    generalGetString(R.string.joining_group),
+    generalGetString(R.string.youve_accepted_group_invitation_connecting_to_inviting_group_member)
+  )
+}
+
+fun changeNtfsStatePerChat(enabled: Boolean, currentState: MutableState<Boolean>, chat: Chat, chatModel: ChatModel) {
+  val newChatInfo = when(chat.chatInfo) {
+    is ChatInfo.Direct -> with (chat.chatInfo) {
+      ChatInfo.Direct(contact.copy(chatSettings = contact.chatSettings.copy(enableNtfs = enabled)))
+    }
+    is ChatInfo.Group -> with(chat.chatInfo) {
+      ChatInfo.Group(groupInfo.copy(chatSettings = groupInfo.chatSettings.copy(enableNtfs = enabled)))
+    }
+    else -> null
+  }
+  withApi {
+    val res = when (newChatInfo) {
+      is ChatInfo.Direct -> with(newChatInfo) {
+        chatModel.controller.apiSetSettings(chatType, apiId, contact.chatSettings)
+      }
+      is ChatInfo.Group -> with(newChatInfo) {
+        chatModel.controller.apiSetSettings(chatType, apiId, groupInfo.chatSettings)
+      }
+      else -> false
+    }
+    if (res && newChatInfo != null) {
+      chatModel.updateChatInfo(newChatInfo)
+      if (!enabled) {
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+      }
+      currentState.value = enabled
+    }
+  }
+}
+
+@Composable
+fun ChatListNavLinkLayout(
+  chatLinkPreview: @Composable () -> Unit,
+  click: () -> Unit,
+  dropdownMenuItems: (@Composable () -> Unit)?,
+  showMenu: MutableState<Boolean>,
+  stopped: Boolean
+) {
+  var modifier = Modifier.fillMaxWidth()
+  if (!stopped) modifier = modifier.combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
+  Box(modifier) {
+    Row(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(start = 8.dp, top = 8.dp, end = 12.dp, bottom = 8.dp),
+      verticalAlignment = Alignment.Top
+    ) {
+      chatLinkPreview()
+    }
+    if (dropdownMenuItems != null) {
+      DefaultDropdownMenu(showMenu, dropdownMenuItems = dropdownMenuItems)
+    }
+  }
+  Divider(Modifier.padding(horizontal = 8.dp))
+}
+
+@Preview
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewChatListNavLinkDirect() {
+  SimpleXTheme {
+    ChatListNavLinkLayout(
+      chatLinkPreview = {
+        ChatPreviewView(
+          chat = Chat(
+            chatInfo = ChatInfo.Direct.sampleData,
+            chatItems = listOf(
+              ChatItem.getSampleData(
+                1,
+                CIDirection.DirectSnd(),
+                Clock.System.now(),
+                "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."
+              )
+            ),
+            chatStats = Chat.ChatStats()
+          ),
+          null,
+          null,
+          false,
+          null,
+          null,
+          stopped = false,
+          linkMode = SimplexLinkMode.DESCRIPTION
+        )
+      },
+      click = {},
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
+    )
+  }
+}
+
+@Preview
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewChatListNavLinkGroup() {
+  SimpleXTheme {
+    ChatListNavLinkLayout(
+      chatLinkPreview = {
+        ChatPreviewView(
+          Chat(
+            chatInfo = ChatInfo.Group.sampleData,
+            chatItems = listOf(
+              ChatItem.getSampleData(
+                1,
+                CIDirection.DirectSnd(),
+                Clock.System.now(),
+                "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."
+              )
+            ),
+            chatStats = Chat.ChatStats()
+          ),
+          null,
+          null,
+          false,
+          null,
+          null,
+          stopped = false,
+          linkMode = SimplexLinkMode.DESCRIPTION
+        )
+      },
+      click = {},
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
+    )
+  }
+}
+
+@Preview
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewChatListNavLinkContactRequest() {
+  SimpleXTheme {
+    ChatListNavLinkLayout(
+      chatLinkPreview = {
+        ContactRequestView(false, ChatInfo.ContactRequest.sampleData)
+      },
+      click = {},
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
+    )
+  }
+}

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

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

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

@@ -0,0 +1,309 @@
+package chat.simplex.app.views.chatlist
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+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.platform.LocalDensity
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.*
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.ComposePreview
+import chat.simplex.app.views.chat.ComposeState
+import chat.simplex.app.views.chat.item.MarkdownText
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun ChatPreviewView(
+  chat: Chat,
+  chatModelDraft: ComposeState?,
+  chatModelDraftChatId: ChatId?,
+  chatModelIncognito: Boolean,
+  currentUserProfileDisplayName: String?,
+  contactNetworkStatus: NetworkStatus?,
+  stopped: Boolean,
+  linkMode: SimplexLinkMode
+) {
+  val cInfo = chat.chatInfo
+
+  @Composable
+  fun groupInactiveIcon() {
+    Icon(
+      painterResource(R.drawable.ic_cancel_filled),
+      stringResource(R.string.icon_descr_group_inactive),
+      Modifier.size(18.dp).background(MaterialTheme.colors.background, CircleShape),
+      tint = MaterialTheme.colors.secondary
+    )
+  }
+
+  @Composable
+  fun chatPreviewImageOverlayIcon() {
+    if (cInfo is ChatInfo.Group) {
+      when (cInfo.groupInfo.membership.memberStatus) {
+        GroupMemberStatus.MemLeft -> groupInactiveIcon()
+        GroupMemberStatus.MemRemoved -> groupInactiveIcon()
+        GroupMemberStatus.MemGroupDeleted -> groupInactiveIcon()
+        else -> {}
+      }
+    }
+  }
+
+  @Composable
+  fun chatPreviewTitleText(color: Color = Color.Unspecified) {
+    Text(
+      cInfo.chatViewName,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+      style = MaterialTheme.typography.h3,
+      fontWeight = FontWeight.Bold,
+      color = color
+    )
+  }
+
+  @Composable
+  fun VerifiedIcon() {
+    Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
+  }
+
+  fun messageDraft(draft: ComposeState): Pair<AnnotatedString, Map<String, InlineTextContent>> {
+    fun attachment(): Pair<Int, String?>? =
+      when (draft.preview) {
+        is ComposePreview.FilePreview -> R.drawable.ic_draft_filled to draft.preview.fileName
+        is ComposePreview.MediaPreview -> R.drawable.ic_image to null
+        is ComposePreview.VoicePreview -> R.drawable.ic_play_arrow_filled to durationText(draft.preview.durationMs / 1000)
+        else -> null
+      }
+
+    val attachment = attachment()
+    val text = buildAnnotatedString {
+      appendInlineContent(id = "editIcon")
+      append(" ")
+      if (attachment != null) {
+        appendInlineContent(id = "attachmentIcon")
+        if (attachment.second != null) {
+          append(attachment.second as String)
+        }
+        append(" ")
+      }
+      append(draft.message)
+    }
+    val inlineContent: Map<String, InlineTextContent> = mapOf(
+      "editIcon" to InlineTextContent(
+        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
+      ) {
+        Icon(painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.primary)
+      },
+      "attachmentIcon" to InlineTextContent(
+        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
+      ) {
+        Icon(if (attachment?.first != null) painterResource(attachment.first) else painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.secondary)
+      }
+    )
+    return text to inlineContent
+  }
+
+  @Composable
+  fun chatPreviewTitle() {
+    when (cInfo) {
+      is ChatInfo.Direct ->
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          if (cInfo.contact.verified) {
+            VerifiedIcon()
+          }
+          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else MaterialTheme.colors.secondary)
+        }
+      is ChatInfo.Group ->
+        when (cInfo.groupInfo.membership.memberStatus) {
+          GroupMemberStatus.MemInvited -> chatPreviewTitleText(if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary)
+          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(MaterialTheme.colors.secondary)
+          else -> chatPreviewTitleText()
+        }
+      else -> chatPreviewTitleText()
+    }
+  }
+
+  @Composable
+  fun chatPreviewText(chatModelIncognito: Boolean) {
+    val ci = chat.chatItems.lastOrNull()
+    if (ci != null) {
+      val (text: CharSequence, inlineTextContent) = when {
+        chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { messageDraft(chatModelDraft) }
+        ci.meta.itemDeleted == null -> ci.text to null
+        else -> generalGetString(R.string.marked_deleted_description) to null
+      }
+      val formattedText = when {
+        chatModelDraftChatId == chat.id && chatModelDraft != null -> null
+        ci.meta.itemDeleted == null -> ci.formattedText
+        else -> null
+      }
+      MarkdownText(
+        text,
+        formattedText,
+        sender = when {
+          chatModelDraftChatId == chat.id && chatModelDraft != null -> null
+          cInfo is ChatInfo.Group && !ci.chatDir.sent -> ci.memberDisplayName
+          else -> null
+        },
+        linkMode = linkMode,
+        senderBold = true,
+        maxLines = 2,
+        overflow = TextOverflow.Ellipsis,
+        style = MaterialTheme.typography.body1.copy(color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
+        inlineContent = inlineTextContent,
+        modifier = Modifier.fillMaxWidth(),
+      )
+    } else {
+      when (cInfo) {
+        is ChatInfo.Direct ->
+          if (!cInfo.ready) {
+            Text(stringResource(R.string.contact_connection_pending), color = MaterialTheme.colors.secondary)
+          }
+        is ChatInfo.Group ->
+          when (cInfo.groupInfo.membership.memberStatus) {
+            GroupMemberStatus.MemInvited -> Text(groupInvitationPreviewText(chatModelIncognito, currentUserProfileDisplayName, cInfo.groupInfo))
+            GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = MaterialTheme.colors.secondary)
+            else -> {}
+          }
+        else -> {}
+      }
+    }
+  }
+
+  Row {
+    Box(contentAlignment = Alignment.BottomEnd) {
+      ChatInfoImage(cInfo, size = 72.dp)
+      Box(Modifier.padding(end = 6.dp, bottom = 6.dp)) {
+        chatPreviewImageOverlayIcon()
+      }
+    }
+    Column(
+      modifier = Modifier
+        .padding(horizontal = 8.dp)
+        .weight(1F)
+    ) {
+      chatPreviewTitle()
+      val height = with(LocalDensity.current) { 46.sp.toDp() }
+      Row(Modifier.heightIn(min = height)) {
+        chatPreviewText(chatModelIncognito)
+      }
+    }
+    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.updatedAt)
+
+    Box(
+      contentAlignment = Alignment.TopEnd
+    ) {
+      Text(
+        ts,
+        color = MaterialTheme.colors.secondary,
+        style = MaterialTheme.typography.body2,
+        modifier = Modifier.padding(bottom = 5.dp)
+      )
+      val n = chat.chatStats.unreadCount
+      val showNtfsIcon = !chat.chatInfo.ntfsEnabled && (chat.chatInfo is ChatInfo.Direct || chat.chatInfo is ChatInfo.Group)
+      if (n > 0 || chat.chatStats.unreadChat) {
+        Box(
+          Modifier.padding(top = 24.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          Text(
+            if (n > 0) unreadCountStr(n) else "",
+            color = Color.White,
+            fontSize = 11.sp,
+            modifier = Modifier
+              .background(if (stopped || showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant, shape = CircleShape)
+              .badgeLayout()
+              .padding(horizontal = 3.dp)
+              .padding(vertical = 1.dp)
+          )
+        }
+      } else if (showNtfsIcon) {
+        Box(
+          Modifier.padding(top = 24.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          Icon(
+            painterResource(R.drawable.ic_notifications_off_filled),
+            contentDescription = generalGetString(R.string.notifications),
+            tint = MaterialTheme.colors.secondary,
+            modifier = Modifier
+              .padding(horizontal = 3.dp)
+              .padding(vertical = 1.dp)
+              .size(17.dp)
+          )
+        }
+      }
+      if (cInfo is ChatInfo.Direct) {
+        Box(
+          Modifier.padding(top = 52.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          ChatStatusImage(contactNetworkStatus)
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun groupInvitationPreviewText(chatModelIncognito: Boolean, currentUserProfileDisplayName: String?, groupInfo: GroupInfo): String {
+  return if (groupInfo.membership.memberIncognito)
+    String.format(stringResource(R.string.group_preview_join_as), groupInfo.membership.memberProfile.displayName)
+  else if (chatModelIncognito)
+    String.format(stringResource(R.string.group_preview_join_as), currentUserProfileDisplayName ?: "")
+  else
+    stringResource(R.string.group_preview_you_are_invited)
+}
+
+@Composable
+fun unreadCountStr(n: Int): String {
+  return if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation)
+}
+
+@Composable
+fun ChatStatusImage(s: NetworkStatus?) {
+  val descr = s?.statusString
+  if (s is NetworkStatus.Error) {
+    Icon(
+      painterResource(R.drawable.ic_error),
+      contentDescription = descr,
+      tint = MaterialTheme.colors.secondary,
+      modifier = Modifier
+        .size(19.dp)
+    )
+  } else if (s !is NetworkStatus.Connected) {
+    CircularProgressIndicator(
+      Modifier
+        .padding(horizontal = 2.dp)
+        .size(15.dp),
+      color = MaterialTheme.colors.secondary,
+      strokeWidth = 1.5.dp
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewChatPreviewView() {
+  SimpleXTheme {
+    ChatPreviewView(Chat.sampleData, null, null, false, "", contactNetworkStatus = NetworkStatus.Connected(), stopped = false, linkMode = SimplexLinkMode.DESCRIPTION)
+  }
+}

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chatlist
+package chat.simplex.app.views.chatlist
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
@@ -7,21 +7,21 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.R
-import chat.simplex.common.views.helpers.ProfileImage
+import chat.simplex.app.model.*
-import chat.simplex.common.model.PendingContactConnection
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.model.getTimestampText
+import chat.simplex.app.views.helpers.ProfileImage
-import chat.simplex.res.MR
 
 @Composable
 fun ContactConnectionView(contactConnection: PendingContactConnection) {
   Row {
     Box(Modifier.size(72.dp), contentAlignment = Alignment.Center) {
-      ProfileImage(size = 54.dp, null, if (contactConnection.initiated) MR.images.ic_add_link else MR.images.ic_link)
+      ProfileImage(size = 54.dp, null, if (contactConnection.initiated) R.drawable.ic_add_link else R.drawable.ic_link)
     }
     Column(
       modifier = Modifier
@@ -39,22 +39,16 @@ fun ContactConnectionView(contactConnection: PendingContactConnection) {
       val height = with(LocalDensity.current) { 46.sp.toDp() }
       Text(contactConnection.description, Modifier.heightIn(min = height), maxLines = 2, color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
     }
-    Box(
+    val ts = getTimestampText(contactConnection.updatedAt)
-      contentAlignment = Alignment.TopEnd
+    Column(
+      Modifier.fillMaxHeight(),
     ) {
-      val ts = getTimestampText(contactConnection.updatedAt)
       Text(
         ts,
         color = MaterialTheme.colors.secondary,
         style = MaterialTheme.typography.body2,
         modifier = Modifier.padding(bottom = 5.dp)
       )
-      Box(
-        Modifier.padding(top = 50.dp),
-        contentAlignment = Alignment.Center
-      ) {
-        IncognitoIcon(contactConnection.incognito)
-      }
     }
   }
 }

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chatlist
+package chat.simplex.app.views.chatlist
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
@@ -6,19 +6,18 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.R
-import chat.simplex.common.views.helpers.ChatInfoImage
+import chat.simplex.app.model.*
-import chat.simplex.common.model.ChatInfo
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.model.getTimestampText
+import chat.simplex.app.views.helpers.ChatInfoImage
-import chat.simplex.res.MR
 
 @Composable
-fun ContactRequestView(contactRequest: ChatInfo.ContactRequest) {
+fun ContactRequestView(chatModelIncognito: Boolean, contactRequest: ChatInfo.ContactRequest) {
   Row {
     ChatInfoImage(contactRequest, size = 72.dp)
     Column(
@@ -32,10 +31,10 @@ fun ContactRequestView(contactRequest: ChatInfo.ContactRequest) {
         overflow = TextOverflow.Ellipsis,
         style = MaterialTheme.typography.h3,
         fontWeight = FontWeight.Bold,
-        color = MaterialTheme.colors.primary
+        color = if (chatModelIncognito) Indigo else MaterialTheme.colors.primary
       )
       val height = with(LocalDensity.current) { 46.sp.toDp() }
-      Text(stringResource(MR.strings.contact_wants_to_connect_with_you), Modifier.heightIn(min = height), maxLines = 2, color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
+      Text(stringResource(R.string.contact_wants_to_connect_with_you), Modifier.heightIn(min = height), maxLines = 2, color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
     }
     val ts = getTimestampText(contactRequest.contactRequest.updatedAt)
     Column(

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

@@ -1,4 +1,4 @@
-package chat.simplex.common.views.chatlist
+package chat.simplex.app.views.chatlist
 
 import SectionItemView
 import androidx.compose.foundation.layout.*
@@ -9,10 +9,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.views.helpers.ProfileImage
+import chat.simplex.app.model.*
-import chat.simplex.common.model.*
+import chat.simplex.app.ui.theme.Indigo
-import chat.simplex.common.ui.theme.*
+import chat.simplex.app.views.helpers.ProfileImage
-import chat.simplex.res.MR
 
 @Composable
 fun ShareListNavLinkView(chat: Chat, chatModel: ChatModel) {
@@ -21,19 +20,13 @@ fun ShareListNavLinkView(chat: Chat, chatModel: ChatModel) {
     is ChatInfo.Direct ->
       ShareListNavLinkLayout(
         chatLinkPreview = { SharePreviewView(chat) },
-        click = { directChatAction(chat.remoteHostId, chat.chatInfo.contact, chatModel) },
+        click = { directChatAction(chat.chatInfo, chatModel) },
         stopped
       )
     is ChatInfo.Group ->
       ShareListNavLinkLayout(
         chatLinkPreview = { SharePreviewView(chat) },
-        click = { groupChatAction(chat.remoteHostId, chat.chatInfo.groupInfo, chatModel) },
+        click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
-        stopped
-      )
-    is ChatInfo.Local ->
-      ShareListNavLinkLayout(
-        chatLinkPreview = { SharePreviewView(chat) },
-        click = { noteFolderChatAction(chat.remoteHostId, chat.chatInfo.noteFolder) },
         stopped
       )
     is ChatInfo.ContactRequest, is ChatInfo.ContactConnection, is ChatInfo.InvalidJSON -> {}
@@ -63,11 +56,7 @@ private fun SharePreviewView(chat: Chat) {
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.spacedBy(4.dp)
     ) {
-      if (chat.chatInfo is ChatInfo.Local) {
+      ProfileImage(size = 46.dp, chat.chatInfo.image)
-        ProfileImage(size = 46.dp, null, icon = MR.images.ic_folder_filled, color = NoteFolderIconColor)
-      } else {
-        ProfileImage(size = 46.dp, chat.chatInfo.image)
-      }
       Text(
         chat.chatInfo.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
         color = if (chat.chatInfo.incognito) Indigo else Color.Unspecified

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

@@ -1,6 +1,9 @@
-package chat.simplex.common.views.chatlist
+package chat.simplex.app.views.chatlist
 
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -8,33 +11,31 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
+import androidx.compose.ui.res.painterResource
-import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.SettingsViewState
+import chat.simplex.app.R
-import chat.simplex.common.model.*
+import chat.simplex.app.model.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.app.ui.theme.*
-import chat.simplex.common.platform.*
+import chat.simplex.app.views.helpers.*
-import chat.simplex.res.MR
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @Composable
-fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stopped: Boolean) {
+fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
   var searchInList by rememberSaveable { mutableStateOf("") }
-  val (userPickerState, scaffoldState) = settingsState
+  val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
-  val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
+  val switchingUsers = rememberSaveable { mutableStateOf(false) }
   Scaffold(
-    Modifier.padding(end = endPadding),
-    contentColor = LocalContentColor.current,
-    drawerContentColor = LocalContentColor.current,
-    scaffoldState = scaffoldState,
     topBar = { Column { ShareListToolbar(chatModel, userPickerState, stopped) { searchInList = it.trim() } } },
   ) {
     Box(Modifier.padding(it)) {
       Column(
         modifier = Modifier
           .fillMaxSize()
+          .themedBackground()
       ) {
         if (chatModel.chats.isNotEmpty()) {
           ShareList(chatModel, search = searchInList)
@@ -44,20 +45,15 @@ fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stoppe
       }
     }
   }
-  if (appPlatform.isAndroid) {
+  UserPicker(chatModel, userPickerState, switchingUsers, showSettings = false, showCancel = true, cancelClicked = {
-    tryOrShowError("UserPicker", error = {}) {
+    chatModel.sharedContent.value = null
-      UserPicker(chatModel, userPickerState, showSettings = false, showCancel = true, cancelClicked = {
+  })
-        chatModel.sharedContent.value = null
-        userPickerState.value = AnimatedViewState.GONE
-      })
-    }
-  }
 }
 
 @Composable
 private fun EmptyList() {
   Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Text(stringResource(MR.strings.you_have_no_chats), color = MaterialTheme.colors.secondary)
+    Text(stringResource(R.string.you_have_no_chats), color = MaterialTheme.colors.secondary)
   }
 }
 
@@ -73,7 +69,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
   val navButton: @Composable RowScope.() -> Unit = {
     when {
       showSearch -> NavigationButtonBack(hideSearchOnBack)
-      (users.size > 1 || chatModel.remoteHosts.isNotEmpty()) && remember { chatModel.sharedContent }.value !is SharedContent.Forward -> {
+      users.size > 1 -> {
         val allRead = users
           .filter { u -> !u.user.activeUser && !u.user.hidden }
           .all { u -> u.unreadCount == 0 }
@@ -81,20 +77,13 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
           userPickerState.value = AnimatedViewState.VISIBLE
         }
       }
-      else -> NavigationButtonBack(onButtonClicked = {
+      else -> NavigationButtonBack { chatModel.sharedContent.value = null }
-        val sharedContent = chatModel.sharedContent.value
-        // Drop shared content
-        chatModel.sharedContent.value = null
-        if (sharedContent is SharedContent.Forward) {
-          chatModel.chatId.value = sharedContent.fromChatInfo.id
-        }
-      })
     }
   }
   if (chatModel.chats.size >= 8) {
     barButtons.add {
       IconButton({ showSearch = true }) {
-        Icon(painterResource(MR.images.ic_search_500), stringResource(MR.strings.search_verb), tint = MaterialTheme.colors.primary)
+        Icon(painterResource(R.drawable.ic_search_500), stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
       }
     }
   }
@@ -102,13 +91,13 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
     barButtons.add {
       IconButton(onClick = {
         AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.chat_is_stopped_indication),
+          generalGetString(R.string.chat_is_stopped_indication),
-          generalGetString(MR.strings.you_can_start_chat_via_setting_or_by_restarting_the_app)
+          generalGetString(R.string.you_can_start_chat_via_setting_or_by_restarting_the_app)
         )
       }) {
         Icon(
-          painterResource(MR.images.ic_report_filled),
+          painterResource(R.drawable.ic_report_filled),
-          generalGetString(MR.strings.chat_is_stopped_indication),
+          generalGetString(R.string.chat_is_stopped_indication),
           tint = Color.Red,
         )
       }
@@ -121,15 +110,22 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
       Row(verticalAlignment = Alignment.CenterVertically) {
         Text(
           when (chatModel.sharedContent.value) {
-            is SharedContent.Text -> stringResource(MR.strings.share_message)
+            is SharedContent.Text -> stringResource(R.string.share_message)
-            is SharedContent.Media -> stringResource(MR.strings.share_image)
+            is SharedContent.Media -> stringResource(R.string.share_image)
-            is SharedContent.File -> stringResource(MR.strings.share_file)
+            is SharedContent.File -> stringResource(R.string.share_file)
-            is SharedContent.Forward -> stringResource(MR.strings.forward_message)
+            else -> stringResource(R.string.share_message)
-            null -> stringResource(MR.strings.share_message)
           },
           color = MaterialTheme.colors.onBackground,
           fontWeight = FontWeight.SemiBold,
         )
+        if (chatModel.incognito.value) {
+          Icon(
+            painterResource(R.drawable.ic_theater_comedy_filled),
+            stringResource(R.string.incognito),
+            tint = Indigo,
+            modifier = Modifier.padding(10.dp).size(26.dp)
+          )
+        }
       }
     },
     onTitleClick = null,
@@ -142,17 +138,15 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
 
 @Composable
 private fun ShareList(chatModel: ChatModel, search: String) {
+  val filter: (Chat) -> Boolean = { chat: Chat ->
+    chat.chatInfo.chatViewName.lowercase().contains(search.lowercase())
+  }
   val chats by remember(search) {
     derivedStateOf {
-      val sorted = chatModel.chats.toList().sortedByDescending { it.chatInfo is ChatInfo.Local }
+      if (search.isEmpty()) chatModel.chats.filter { it.chatInfo.ready } else chatModel.chats.filter { it.chatInfo.ready }.filter(filter)
-      if (search.isEmpty()) {
-        sorted.filter { it.chatInfo.ready }
-      } else {
-        sorted.filter { it.chatInfo.ready && it.chatInfo.chatViewName.lowercase().contains(search.lowercase()) }
-      }
     }
   }
-  LazyColumnWithScrollBar(
+  LazyColumn(
     modifier = Modifier.fillMaxWidth()
   ) {
     items(chats) { chat ->