Merge branch 'master-ghc8107' into master-android

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
     tags:
       - "v*"
       - "!*-fdroid"
-      - "!*-armv7a"
   pull_request:
 
 jobs:
@@ -43,7 +42,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,30 +51,18 @@ 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
@@ -92,19 +79,18 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: ${{ matrix.ghc }}
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
-      - name: Restore cached build
-        id: restore_cache
-        uses: actions/cache/restore@v3
+      - name: Cache dependencies
+        uses: actions/cache@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 +98,18 @@ jobs:
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> 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 ""                                                              >> 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
+          echo "ignore-project: False"                                      >> cabal.project.local
+          echo "package direct-sqlcipher"                                   >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                        >> cabal.project.local
 
       - name: Install AppImage dependencies
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
       - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
@@ -163,7 +131,7 @@ jobs:
           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'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -172,7 +140,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -182,7 +150,7 @@ jobs:
             ${{ steps.unix_cli_build.outputs.bin_hash }}
 
       - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
@@ -191,7 +159,7 @@ jobs:
 
       - 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')
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
         shell: bash
         run: |
           scripts/desktop/build-lib-linux.sh
@@ -200,10 +168,10 @@ jobs:
           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'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         shell: bash
         run: |
           scripts/desktop/make-appimage-linux.sh
@@ -213,20 +181,20 @@ jobs:
 
       - name: Mac build desktop
         id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
         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
+          scripts/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')
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -235,7 +203,7 @@ jobs:
           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')
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -245,7 +213,7 @@ jobs:
             ${{ 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'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -254,7 +222,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -264,7 +232,7 @@ jobs:
             ${{ 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')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -273,7 +241,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -282,58 +250,24 @@ jobs:
           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
 
       # 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*
           path=$(cabal list-bin simplex-chat | tail -n 1)
@@ -359,45 +293,4 @@ jobs:
           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:

.gitignore

@@ -54,7 +54,6 @@ website/translations.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
-
-### 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 curl and simplex-chat-related dependencies
+RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev libssl-dev
 
 # Install ghcup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
-
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup
 
+# Install ghc
+RUN ghcup install ghc 8.10.7
+# Install cabal
+RUN ghcup install cabal
 # Set both as default
-RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
-    ghcup set cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+RUN ghcup set ghc 8.10.7 && \
+    ghcup set cabal
 
 COPY . /project
 WORKDIR /project
 
+# Adjust PATH
+ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+
 # Adjust build
 RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
 
 # Compile simplex-chat
 RUN cabal update
-RUN cabal 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,134 @@
----
-layout: layouts/privacy.html
-permalink: /privacy/index.html
----
+# SimpleX Chat Terms & Privacy Policy
 
-# 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.
-
-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).
+If you believe that some of the clauses in this document are not aligned with our mission or principles, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Privacy Policy
 
-SimpleX Chat Ltd 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 encryption to provide secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the servers via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack).
 
-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 is built on top of SimpleX messaging and application platform that uses a new message routing protocol allowing to establish private connections 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 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.
+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.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
-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 see users and data sovereignty, and device and provider portability as critically important properties for any communication system.
-
-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).
-
-### Your information
+### Information you provide
 
 #### User profiles
 
-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.
+We do not store user profiles. The profile you create in the app is local to your device.
 
-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.
+When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
 
 #### Messages 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.
+SimpleX Chat 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 256kb, 1mb or 8mb via all or some of the configured file 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.
+Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.
 
-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 preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
 
-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 (XFTP) servers for the time configured in the file servers you use (48 hours for preset file 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.
+If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).
 
 #### 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.
+When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or 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.
 
-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.
+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 two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
 
 #### 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.
+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, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging 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).
+It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, 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 observe 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).
 
 #### 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.
+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.
 
-#### SimpleX Directory
+#### SimpleX Directory Service
 
-[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).
+[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service 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
+#### 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.
+If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
 
 ### Information we may share
 
-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 a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to 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 enforce applicable terms, including investigation of potential violations.
+- To meet any applicable law, regulation, legal process or enforceable governmental request.
+- To enforce applicable Terms, including investigation of potential violations.
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
-- To protect against harm to the rights, property, or safety of 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.
-
-We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
+At the time of updating this document, we have never provided or have been requested the access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process.
 
 ### Updates
 
-We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our 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 below.
 
-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 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).
 
-## 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 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 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 ciphertext 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**. 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 application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.
 
-**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.
+**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.
 
-**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.
+**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 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.
+**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.
 
-**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.
+**Your Rights**. You own the messages and the 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. 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 app.
 
-**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.
+**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 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
 
-**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.
+**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.
 
-**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).
+**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.
 
-**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.
+**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.
 
-**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.
+**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.
 
-**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.
+**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.
 
-**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.
+**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.
 
-**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.
+**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.
 
-**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.
+**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.
 
-**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
+Updated August 17, 2023

README.md

@@ -4,7 +4,7 @@
 [![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>
 
-| 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%">
 
@@ -72,9 +72,9 @@ 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-4](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2Fw2GlucRXtRVgYnbt_9ZP-kmt76DekxxS%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0tJhTyMGUxznwmjb7aT24P1I1Wry_iURTuhOFlMb1Eo%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22WoPxjFqGEDlVazECOSi2dg%3D%3D%22%7D)
 
-There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-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:
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
 
 - chat bots and automations
 - integrations with other apps
@@ -127,7 +127,6 @@ Join our translators to help SimpleX grow!
 |🇫🇮 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/)||
@@ -135,7 +134,6 @@ Join our translators to help SimpleX grow!
 |🇧🇷 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/)||
 
@@ -234,16 +232,6 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important 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).
@@ -307,7 +295,7 @@ What is already implemented:
 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.
+14. Local files encryption, except videos (to be added later).
 
 We plan to add:
 
@@ -378,15 +366,13 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ 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).
+- 🏗 Using mobile profiles from the desktop app.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Post-quantum resistant key exchange in double ratchet protocol.
+- Large groups, communities and public channels.
 - Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - 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.).
@@ -414,13 +400,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/ios/Shared/AppDelegate.swift

@@ -15,8 +15,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
         if #available(iOS 17.0, *) { trackKeyboard() }
-        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
-        removePasscodesIfReinstalled()
         return true
     }
 
@@ -38,17 +36,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         ChatModel.shared.keyboardHeight = 0
     }
 
-    @objc func pasteboardChanged() {
-        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
-    }
-
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
         let m = ChatModel.shared
         let deviceToken = DeviceToken(pushProvider: PushProvider(env: pushEnvironment), token: token)
         m.deviceToken = deviceToken
-        // savedToken is set in startChat, when it is started before this method is called
         if m.savedToken != nil {
             registerToken(token: deviceToken)
         }
@@ -62,6 +55,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                      didReceiveRemoteNotification userInfo: [AnyHashable : Any],
                      fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         logger.debug("AppDelegate: didReceiveRemoteNotification")
+        print("*** userInfo", userInfo)
         let m = ChatModel.shared
         if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
            m.notificationMode != .off {
@@ -87,7 +81,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 }
             } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)
@@ -127,23 +121,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
         BGManager.shared.receiveMessages(complete)
     }
-
-    private func removePasscodesIfReinstalled() {
-        // Check for the database existence, because app and self destruct passcodes
-        // will be saved and restored by iOS when a user deletes and re-installs the app.
-        // In this case the database and settings will be deleted, but the passcodes won't be.
-        // Deleting passcodes ensures that the user will not get stuck on "Opening app..." screen.
-        if (kcAppPassword.get() != nil || kcSelfDestructPassword.get() != nil) &&
-           !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA) && !hasDatabase() {
-            _ = kcAppPassword.remove()
-            _ = kcSelfDestructPassword.remove()
-            _ = kcDatabasePassword.remove()
-        }
-    }
-
-    static func keepScreenOn(_ on: Bool) {
-        UIApplication.shared.isIdleTimerDisabled = on
-    }
 }
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {

apps/ios/Shared/ContentView.swift

@@ -14,14 +14,11 @@ struct ContentView: View {
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
     @Environment(\.colorScheme) var colorScheme
-
-    var contentAccessAuthenticationExtended: Bool
-
-    @Environment(\.scenePhase) var scenePhase
-    @State private var automaticAuthenticationAttempted = false
-    @State private var canConnectViewCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-
+    @Binding var doAuthenticate: Bool
+    @Binding var userAuthorized: Bool?
+    @Binding var canConnectCall: Bool
+    @Binding var lastSuccessfulUnlock: TimeInterval?
+    @Binding var showInitializationView: Bool
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -31,58 +28,28 @@ struct ContentView: View {
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
     @State private var showSetPasscode = false
-    @State private var waitingForOrPassedAuth = true
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
-    private let callTopPadding: CGFloat = 50
-
     private enum ChatListActionSheet: Identifiable {
-        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
+        case connectViaUrl(action: ConnReqType, link: String)
 
         var id: String {
             switch self {
-            case let .planAndConnectSheet(sheet): return sheet.id
+            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
             }
         }
     }
 
-    private var accessAuthenticated: Bool {
-        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
-    }
-
     var body: some View {
         ZStack {
-            let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
-            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
-            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
-            if !prefPerformLA || accessAuthenticated {
-                contentView()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
-            } else {
-                lockButton()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
-            }
-
-            if showCallArea, let call = chatModel.activeCall {
-                VStack {
-                    activeCallInteractiveArea(call)
-                    Spacer()
-                }
-            }
-
+            contentView()
             if chatModel.showCallView, let call = chatModel.activeCall {
                 callView(call)
             }
-
             if !showSettings, let la = chatModel.laRequest {
                 LocalAuthView(authRequest: la)
-                    .onDisappear {
-                        // this flag is separate from accessAuthenticated to show initializationView while we wait for authentication
-                        waitingForOrPassedAuth = accessAuthenticated
-                    }
             } else if showSetPasscode {
                 SetAppPasscodeView {
-                    chatModel.contentViewAccessAuthenticated = true
                     prefPerformLA = true
                     showSetPasscode = false
                     privacyLocalAuthModeDefault.set(.passcode)
@@ -92,10 +59,15 @@ struct ContentView: View {
                     showSetPasscode = false
                     alertManager.showAlert(laPasscodeNotSetAlert())
                 }
-            } else if chatModel.chatDbStatus == nil && AppChatState.shared.value != .stopped && waitingForOrPassedAuth {
-                initializationView()
             }
         }
+        .onAppear {
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
+        }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
         .sheet(isPresented: $showSettings) {
             SettingsView(showSettings: $showSettings)
@@ -104,44 +76,14 @@ struct ContentView: View {
             Button("System authentication") { initialEnableLA() }
             Button("Passcode entry") { showSetPasscode = true }
         }
-        .onChange(of: scenePhase) { phase in
-            logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-            switch (phase) {
-            case .background:
-                // also see .onChange(of: scenePhase) in SimpleXApp: on entering background
-                // it remembers enteredBackgroundAuthenticated and sets chatModel.contentViewAccessAuthenticated to false
-                automaticAuthenticationAttempted = false
-                canConnectViewCall = false
-            case .active:
-                canConnectViewCall = !prefPerformLA || contentAccessAuthenticationExtended || unlockedRecently()
-                
-                // condition `!chatModel.contentViewAccessAuthenticated` is required for when authentication is enabled in settings or on initial notice
-                if prefPerformLA && !chatModel.contentViewAccessAuthenticated {
-                    if AppChatState.shared.value != .stopped {
-                        if contentAccessAuthenticationExtended {
-                            chatModel.contentViewAccessAuthenticated = true
-                        } else {
-                            if !automaticAuthenticationAttempted {
-                                automaticAuthenticationAttempted = true
-                                // authenticate if call kit call is not in progress
-                                if !(CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil) {
-                                    authenticateContentViewAccess()
-                                }
-                            }
-                        }
-                    } else {
-                        // when app is stopped automatic authentication is not attempted
-                        chatModel.contentViewAccessAuthenticated = contentAccessAuthenticationExtended
-                    }
-                }
-            default:
-                break
-            }
-        }
     }
 
     @ViewBuilder private func contentView() -> some View {
-        if let status = chatModel.chatDbStatus, status != .ok {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if chatModel.chatDbStatus == nil && showInitializationView {
+            initializationView()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
             DatabaseErrorView(status: status)
         } else if !chatModel.v3DBMigration.startChat {
             MigrateToAppGroupView()
@@ -149,11 +91,11 @@ struct ContentView: View {
             if case .onboardingComplete = step,
                chatModel.currentUser != nil {
                 mainView()
-                    .actionSheet(item: $chatListActionSheet) { sheet in
-                        switch sheet {
-                        case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
-                        }
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
                     }
+                }
             } else {
                 OnboardingView(onboarding: step)
             }
@@ -164,11 +106,11 @@ struct ContentView: View {
         if CallController.useCallKit() {
             ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                 .onDisappear {
-                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
                 }
         } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
-            if prefPerformLA && !accessAuthenticated {
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
+            if prefPerformLA && userAuthorized != true {
                 Rectangle()
                     .fill(colorScheme == .dark ? .black : .white)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -177,64 +119,25 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder private func activeCallInteractiveArea(_ call: Call) -> some View {
-        HStack {
-            Text(call.contact.displayName).font(.body).foregroundColor(.white)
-            Spacer()
-            CallDuration(call: call)
-        }
-        .padding(.horizontal)
-        .frame(height: callTopPadding - 10)
-        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
-        .onTapGesture {
-            chatModel.activeCallViewIsCollapsed = false
-        }
-    }
-
-    struct CallDuration: View {
-        let call: Call
-        @State var text: String = ""
-        @State var timer: Timer? = nil
-
-        var body: some View {
-            Text(text).frame(minWidth: text.count <= 5 ? 52 : 77, alignment: .leading).offset(x: 4).font(.body).foregroundColor(.white)
-            .onAppear {
-                timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { timer in
-                    if let connectedAt = call.connectedAt {
-                        text = durationText(Int(Date.now.timeIntervalSince1970 - connectedAt.timeIntervalSince1970))
-                    }
-                }
-            }
-            .onDisappear {
-                _ = timer?.invalidate()
-            }
-        }
-    }
-
     private func lockButton() -> some View {
-        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
     }
 
     private func initializationView() -> some View {
         VStack {
             ProgressView().scaleEffect(2)
-            Text("Opening app…")
+            Text("Opening database…")
                 .padding()
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity )
-        .background(
-            Rectangle()
-                .fill(.background)
-        ) 
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
             ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
-                requestNtfAuthorization()
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
-                if (!prefLANoticeShown && prefShowLANotice && chatModel.chats.count > 2) {
+                if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
                     alertManager.showAlert(laNoticeAlert())
                 } else if !chatModel.showCallView && CallController.shared.activeCallInvitation == nil {
@@ -284,37 +187,48 @@ struct ContentView: View {
         }
     }
 
-    private func unlockedRecently() -> Bool {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
-        } else {
-            return false
+    private func initAuthenticate() {
+        logger.debug("initAuthenticate")
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
         }
     }
 
-    private func authenticateContentViewAccess() {
-        logger.debug("DEBUGGING: authenticateContentViewAccess")
-        dismissAllSheets(animated: false) {
-            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
-            chatModel.chatId = nil
+    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
+        if !prefPerformLA {
+            userAuthorized = true
+        } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
+            dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
+                chatModel.chatId = nil
+                justAuthenticate()
+            }
+        }
+    }
 
-            authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-                logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
-                switch (laResult) {
-                case .success:
-                    chatModel.contentViewAccessAuthenticated = true
-                    canConnectViewCall = true
-                    lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
-                case .failed:
-                    chatModel.contentViewAccessAuthenticated = false
-                    if privacyLocalAuthModeDefault.get() == .passcode {
-                        AlertManager.shared.showAlert(laFailedAlert())
-                    }
-                case .unavailable:
-                    prefPerformLA = false
-                    canConnectViewCall = true
-                    AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
+    private func justAuthenticate() {
+        userAuthorized = false
+        let laMode = privacyLocalAuthModeDefault.get()
+        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
+            switch (laResult) {
+            case .success:
+                userAuthorized = true
+                canConnectCall = true
+                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
+            case .failed:
+                if laMode == .passcode {
+                    AlertManager.shared.showAlert(laFailedAlert())
                 }
+            case .unavailable:
+                userAuthorized = true
+                prefPerformLA = false
+                canConnectCall = true
+                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
@@ -345,7 +259,6 @@ struct ContentView: View {
         authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
             switch laResult {
             case .success:
-                chatModel.contentViewAccessAuthenticated = true
                 prefPerformLA = true
                 alertManager.showAlert(laTurnedOnAlert())
             case .failed:
@@ -377,16 +290,12 @@ struct ContentView: View {
             if let url = m.appOpenUrl {
                 m.appOpenUrl = nil
                 var path = url.path
+                logger.debug("ContentView.connectViaUrl path: \(path)")
                 if (path == "/contact" || path == "/invitation") {
                     path.removeFirst()
+                    let action: ConnReqType = path == "contact" ? .contact : .invitation
                     let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                    planAndConnect(
-                        link,
-                        showAlert: showPlanAndConnectAlert,
-                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
-                        dismiss: false,
-                        incognito: nil
-                    )
+                    chatListActionSheet = .connectViaUrl(action: action, link: link)
                 } else {
                     AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
                 }
@@ -394,8 +303,20 @@ struct ContentView: View {
         }
     }
 
-    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
-        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
+        let title: LocalizedStringKey
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
+        )
     }
 }
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -46,7 +46,6 @@ class AudioRecorder {
             audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
 
             await MainActor.run {
-                AppDelegate.keepScreenOn(true)
                 recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
                     guard let time = self.audioRecorder?.currentTime else { return }
                     self.onTimer?(time)
@@ -58,10 +57,6 @@ class AudioRecorder {
             }
             return nil
         } catch let error {
-            await MainActor.run {
-                AppDelegate.keepScreenOn(false)
-            }
-            try? av.setCategory(AVAudioSession.Category.soloAmbient)
             logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
             return .error(error.localizedDescription)
         }
@@ -76,8 +71,6 @@ class AudioRecorder {
             timer.invalidate()
         }
         recordingTimer = nil
-        AppDelegate.keepScreenOn(false)
-        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
     }
 
     private func checkPermission() async -> Bool {
@@ -128,19 +121,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
 
         playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
             if self.audioPlayer?.isPlaying ?? false {
-                AppDelegate.keepScreenOn(true)
                 guard let time = self.audioPlayer?.currentTime else { return }
                 self.onTimer?(time)
-                AudioPlayer.changeAudioSession(true)
-            } else {
-                AudioPlayer.changeAudioSession(false)
             }
         }
     }
 
     func pause() {
         audioPlayer?.pause()
-        AppDelegate.keepScreenOn(false)
     }
 
     func play() {
@@ -161,8 +149,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     func stop() {
         if let player = audioPlayer {
             player.stop()
-            AppDelegate.keepScreenOn(false)
-            AudioPlayer.changeAudioSession(false)
         }
         audioPlayer = nil
         if let timer = playbackTimer {
@@ -171,24 +157,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         playbackTimer = nil
     }
 
-    static func changeAudioSession(_ playback: Bool) {
-        // When there is a audio recording, setting any other category will disable sound
-        if AVAudioSession.sharedInstance().category == .playAndRecord {
-            return
-        }
-        if playback {
-            if AVAudioSession.sharedInstance().category != .playback {
-                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: [.duckOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            }
-        } else {
-            if AVAudioSession.sharedInstance().category != .soloAmbient {
-                logger.log("AudioSession: soloAmbient")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
-            }
-        }
-    }
-
     func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         stop()
         self.onFinishPlayback?()

apps/ios/Shared/Model/BGManager.swift

@@ -15,13 +15,7 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6
 
-// This is the smallest interval between refreshes, and also target interval in "off" mode
-private let bgRefreshInterval: TimeInterval = 600 // 10 minutes
-
-// This intervals are used for background refresh in instant and periodic modes
-private let periodicBgRefreshInterval: TimeInterval = 1200 // 20 minutes
-
-private let maxBgRefreshInterval: TimeInterval = 2400 // 40 minutes
+private let bgRefreshInterval: TimeInterval = 450
 
 private let maxTimerCount = 9
 
@@ -39,14 +33,14 @@ class BGManager {
         }
     }
 
-    func schedule(interval: TimeInterval? = nil) {
+    func schedule() {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.schedule: disabled")
             return
         }
         logger.debug("BGManager.schedule")
         let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
         do {
             try BGTaskScheduler.shared.submit(request)
         } catch {
@@ -54,34 +48,20 @@ class BGManager {
         }
     }
 
-    var runInterval: TimeInterval {
-        switch ChatModel.shared.notificationMode {
-        case .instant: maxBgRefreshInterval
-        case .periodic: periodicBgRefreshInterval
-        case .off: bgRefreshInterval
-        }
-    }
-
-    var lastRanLongAgo: Bool {
-        Date.now.timeIntervalSince(chatLastBackgroundRunGroupDefault.get()) > runInterval
-    }
-
     private func handleRefresh(_ task: BGAppRefreshTask) {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.handleRefresh: disabled")
             return
         }
         logger.debug("BGManager.handleRefresh")
-        let shouldRun_ = lastRanLongAgo
-        if allowBackgroundRefresh() && shouldRun_ {
-            schedule()
+        schedule()
+        if appStateGroupDefault.get().inactive {
             let completeRefresh = completionHandler {
                 task.setTaskCompleted(success: true)
             }
             task.expirationHandler = { completeRefresh("expirationHandler") }
             receiveMessages(completeRefresh)
         } else {
-            schedule(interval: shouldRun_ ? bgRefreshInterval : runInterval)
             logger.debug("BGManager.completionHandler: already active, not started")
             task.setTaskCompleted(success: true)
         }
@@ -110,22 +90,20 @@ class BGManager {
         }
         self.completed = false
         DispatchQueue.main.async {
-            chatLastBackgroundRunGroupDefault.set(Date.now)
             let m = ChatModel.shared
             if (!m.chatInitialized) {
-                setAppState(.bgRefresh)
                 do {
                     try initializeChat(start: true)
                 } catch let error {
                     fatalError("Failed to start or load chats: \(responseError(error))")
                 }
             }
-            activateChat(appState: .bgRefresh)
             if m.currentUser == nil {
                 completeReceiving("no current user")
                 return
             }
             logger.debug("BGManager.receiveMessages: starting chat")
+            activateChat(appState: .bgRefresh)
             let cr = ChatReceiver()
             self.chatReceiver = cr
             cr.start()

apps/ios/Shared/Model/ChatModel.swift

@@ -54,21 +54,16 @@ final class ChatModel: ObservableObject {
     @Published var chatDbChanged = false
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
-    @Published var ctrlInitInProgress: Bool = false
-    // local authentication
-    @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
     @Published var chats: [Chat] = []
-    @Published var deletedChats: Set<String> = []
     // map of connections network statuses, key is agent connection id
     @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
-    @Published var groupMembers: [GMember] = []
+    @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
     @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
@@ -80,7 +75,6 @@ final class ChatModel: ObservableObject {
     @Published var tokenRegistered = false
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
-    @Published var notificationServer: String?
     @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
     // pending notification actions
     @Published var ntfContactRequest: NTFContactRequest?
@@ -88,22 +82,16 @@ final class ChatModel: ObservableObject {
     // current WebRTC call
     @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
     @Published var activeCall: Call?
-    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
+    @Published var callCommand: WCallCommand?
     @Published var showCallView = false
-    @Published var activeCallViewIsCollapsed = false
-    // remote desktop
-    @Published var remoteCtrlSession: RemoteCtrlSession?
-    // currently showing invitation
-    @Published var showingInvitation: ShowingInvitation?
-    @Published var migrationState: MigrationToState? = MigrationToDeviceState.makeMigrationState()
+    // currently showing QR code
+    @Published var connReqInv: String?
     // audio recording and playback
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
     // tracks keyboard height via subscription in AppDelegate
     @Published var keyboardHeight: CGFloat = 0
-    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
-    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -113,14 +101,12 @@ final class ChatModel: ObservableObject {
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
-    let ntfEnableLocal = true
-
-    var ntfEnablePeriodic: Bool {
-        notificationMode != .off
+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
     }
 
-    var activeRemoteCtrl: Bool {
-        remoteCtrlSession?.active ?? false
+    var ntfEnablePeriodic: Bool {
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
     }
 
     func getUser(_ userId: Int64) -> User? {
@@ -143,7 +129,7 @@ final class ChatModel: ObservableObject {
     }
 
     func removeUser(_ user: User) {
-        if let i = getUserIndex(user) {
+        if let i = getUserIndex(user), users[i].user.userId != currentUser?.userId {
             users.remove(at: i)
         }
     }
@@ -166,20 +152,6 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func getGroupChat(_ groupId: Int64) -> Chat? {
-        chats.first { chat in
-            if case let .group(groupInfo) = chat.chatInfo {
-                return groupInfo.groupId == groupId
-            } else {
-                return false
-            }
-        }
-    }
-
-    func getGroupMember(_ groupMemberId: Int64) -> GMember? {
-        groupMembers.first { $0.groupMemberId == groupMemberId }
-    }
-
     private func getChatIndex(_ id: String) -> Int? {
         chats.firstIndex(where: { $0.id == id })
     }
@@ -193,7 +165,6 @@ final class ChatModel: ObservableObject {
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatInfo = cInfo
-            chats[i].created = Date.now
         }
     }
 
@@ -207,7 +178,7 @@ final class ChatModel: ObservableObject {
 
     func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
         var updatedConn = contact.activeConn
-        updatedConn?.connectionStats = connectionStats
+        updatedConn.connectionStats = connectionStats
         var updatedContact = contact
         updatedContact.activeConn = updatedConn
         updateContact(updatedContact)
@@ -274,20 +245,7 @@ final class ChatModel: ObservableObject {
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         // update previews
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = switch cInfo {
-            case .group:
-                if let currentPreviewItem = chats[i].chatItems.first {
-                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
-                        [cItem]
-                    } else {
-                        [currentPreviewItem]
-                    }
-                } else {
-                    [cItem]
-                }
-            default:
-                [cItem]
-            }
+            chats[i].chatItems = [cItem]
             if case .rcvNew = cItem.meta.itemStatus {
                 chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                 increaseUnreadCounter(user: currentUser!)
@@ -338,11 +296,7 @@ final class ChatModel: ObservableObject {
             return false
         } else {
             withAnimation(itemAnimation()) {
-                var ci = cItem
-                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                    ci.meta.itemStatus = status
-                }
-                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -355,22 +309,26 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
             withAnimation {
                 _updateChatItem(at: i, with: cItem)
             }
-        } else if let status = status {
-            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
+        let ci = reversedChatItems[i]
         reversedChatItems[i] = cItem
         reversedChatItems[i].viewTimestamp = .now
+        // on some occasions the confirmation of message being accepted by the server (tick)
+        // arrives earlier than the response from API, and item remains without tick
+        if case .sndNew = cItem.meta.itemStatus {
+            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
+        }
     }
 
-    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
         reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
@@ -506,7 +464,6 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             reversedChatItems = []
         }
     }
@@ -559,62 +516,27 @@ final class ChatModel: ObservableObject {
             users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
     }
 
-    // this function analyses "connected" events and assumes that each member will be there only once
-    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
-        var count = 0
+    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
+        guard var i = getChatItemIndex(ci) else { return [] }
         var ns: [String] = []
-        if let ciCategory = chatItem.mergeCategory,
-           var i = getChatItemIndex(chatItem) {
-            while i < reversedChatItems.count {
-                let ci = reversedChatItems[i]
-                if ci.mergeCategory != ciCategory { break }
-                if let m = ci.memberConnected {
-                    ns.append(m.displayName)
-                }
-                count += 1
-                i += 1
-            }
+        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
+            ns.append(m.displayName)
+            i += 1
         }
-        return (count, ns)
+        return ns
     }
 
-    // returns the index of the passed item and the next item (it has smaller index)
-    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
-        if let i = getChatItemIndex(ci) {
-            (i, i > 0 ? reversedChatItems[i - 1] : nil)
+    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
+        if let i = getChatItemIndex(ci)  {
+            return (
+                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
+                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
+            )
         } else {
-            (nil, nil)
+            return (nil, nil)
         }
     }
 
-    // returns the index of the first item in the same merged group (the first hidden item)
-    // and the previous visible item with another merge category
-    func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
-        guard var i = ciIndex else { return (nil, nil) }
-        let fst = reversedChatItems.count - 1
-        while i < fst {
-            i = i + 1
-            let ci = reversedChatItems[i]
-            if ciCategory == nil || ciCategory != ci.mergeCategory {
-                return (i - 1, ci)
-            }
-        }
-        return (i, nil)
-    }
-
-    // returns the previous member in the same merge group and the count of members in this group
-    func getPrevHiddenMember(_ member: GroupMember, _ range: ClosedRange<Int>) -> (GroupMember?, Int) {
-        var prevMember: GroupMember? = nil
-        var memberIds: Set<Int64> = []
-        for i in range {
-            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
-                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
-                memberIds.insert(m.groupMemberId)
-            }
-        }
-        return (prevMember, memberIds.count)
-    }
-
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
             popChat_(i)
@@ -627,16 +549,14 @@ final class ChatModel: ObservableObject {
     }
 
     func dismissConnReqView(_ id: String) {
-        if id == showingInvitation?.connId {
-            markShowingInvitationUsed()
+        if let connReqInv = connReqInv,
+           let c = getChat(id),
+           case let .contactConnection(contactConnection) = c.chatInfo,
+           connReqInv == contactConnection.connReqInv {
             dismissAllSheets()
         }
     }
 
-    func markShowingInvitationUsed() {
-        showingInvitation?.connChatUsed = true
-    }
-
     func removeChat(_ id: String) {
         withAnimation {
             chats.removeAll(where: { $0.id == id })
@@ -651,14 +571,13 @@ final class ChatModel: ObservableObject {
         }
         // update current chat
         if chatId == groupInfo.id {
-            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+            if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
                 withAnimation(.default) {
-                    self.groupMembers[i].wrapped = member
-                    self.groupMembers[i].created = Date.now
+                    self.groupMembers[i] = member
                 }
                 return false
             } else {
-                withAnimation { groupMembers.append(GMember(member)) }
+                withAnimation { groupMembers.append(member) }
                 return true
             }
         } else {
@@ -667,10 +586,11 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
-        if var conn = member.activeConn {
-            conn.connectionStats = connectionStats
+        if let conn = member.activeConn {
+            var updatedConn = conn
+            updatedConn.connectionStats = connectionStats
             var updatedMember = member
-            updatedMember.activeConn = conn
+            updatedMember.activeConn = updatedConn
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
@@ -699,25 +619,14 @@ final class ChatModel: ObservableObject {
     }
 
     func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
+        networkStatuses[contact.activeConn.agentConnId] = status
     }
 
     func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
+        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
     }
 }
 
-struct ShowingInvitation {
-    var connId: String
-    var connChatUsed: Bool
-}
-
 struct NTFContactRequest {
     var incognito: Bool
     var chatId: String
@@ -760,8 +669,6 @@ final class Chat: ObservableObject, Identifiable {
         case let .group(groupInfo):
             let m = groupInfo.membership
             return m.memberActive && m.memberRole >= .member
-        case .local:
-            return true
         default: return false
         }
     }
@@ -779,74 +686,43 @@ final class Chat: ObservableObject, Identifiable {
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }
 
-    func groupFeatureEnabled(_ feature: GroupFeature) -> Bool {
-        if case let .group(groupInfo) = self.chatInfo {
-            let p = groupInfo.fullGroupPreferences
-            return switch feature {
-            case .timedMessages: p.timedMessages.on
-            case .directMessages: p.directMessages.on(for: groupInfo.membership)
-            case .fullDelete: p.fullDelete.on
-            case .reactions: p.reactions.on
-            case .voice: p.voice.on(for: groupInfo.membership)
-            case .files: p.files.on(for: groupInfo.membership)
-            case .simplexLinks: p.simplexLinks.on(for: groupInfo.membership)
-            case .history: p.history.on
-            }
-        } else {
-            return true
-        }
-    }
-
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 
-final class GMember: ObservableObject, Identifiable {
-    @Published var wrapped: GroupMember
-    var created = Date.now
+enum NetworkStatus: Decodable, Equatable {
+    case unknown
+    case connected
+    case disconnected
+    case error(String)
 
-    init(_ member: GroupMember) {
-        self.wrapped = member
+    var statusString: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "connected"
+            case .error: return "error"
+            default: return "connecting"
+            }
+        }
     }
 
-    var id: String { wrapped.id }
-    var groupId: Int64 { wrapped.groupId }
-    var groupMemberId: Int64 { wrapped.groupMemberId }
-    var displayName: String { wrapped.displayName }
-    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
-    static let sampleData = GMember(GroupMember.sampleData)
-}
-
-struct RemoteCtrlSession {
-    var ctrlAppInfo: CtrlAppInfo?
-    var appVersion: String
-    var sessionState: UIRemoteCtrlSessionState
-
-    func updateState(_ state: UIRemoteCtrlSessionState) -> RemoteCtrlSession {
-        RemoteCtrlSession(ctrlAppInfo: ctrlAppInfo, appVersion: appVersion, sessionState: state)
+    var statusExplanation: LocalizedStringKey {
+        get {
+            switch self {
+            case .connected: return "You are connected to the server used to receive messages from this contact."
+            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
+            default: return "Trying to connect to the server used to receive messages from this contact."
+            }
+        }
     }
 
-    var active: Bool {
-        if case .connected = sessionState { true } else { false }
-    }
-
-    var discovery: Bool {
-        if case .searching = sessionState { true } else { false }
-    }
-
-    var sessionCode: String? {
-        switch sessionState {
-        case let .pendingConfirmation(_, sessionCode): sessionCode
-        case let .connected(_, sessionCode): sessionCode
-        default: nil
+    var imageName: String {
+        get {
+            switch self {
+            case .unknown: return "circle.dotted"
+            case .connected: return "circle.fill"
+            case .disconnected: return "ellipsis.circle.fill"
+            case .error: return "exclamationmark.circle.fill"
+            }
         }
     }
 }
-
-enum UIRemoteCtrlSessionState {
-    case starting
-    case searching
-    case found(remoteCtrl: RemoteCtrlInfo, compatible: Bool)
-    case connecting(remoteCtrl_: RemoteCtrlInfo?)
-    case pendingConfirmation(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case connected(remoteCtrl: RemoteCtrlInfo, sessionCode: String)
-}

apps/ios/Shared/Model/ImageUtils.swift

@@ -158,8 +158,7 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
     return false
 }
 
-func saveFileFromURL(_ url: URL) -> CryptoFile? {
-    let encrypted = privacyEncryptLocalFilesGroupDefault.get()
+func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
     let savedFile: CryptoFile?
     if url.startAccessingSecurityScopedResource() {
         do {
@@ -186,37 +185,28 @@ func saveFileFromURL(_ url: URL) -> CryptoFile? {
 
 func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     do {
-        let encrypted = privacyEncryptLocalFilesGroupDefault.get()
         let fileName = uniqueCombine(url.lastPathComponent)
-        let savedFile: CryptoFile?
-        if encrypted {
-            let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: getAppFilePath(fileName).path)
-            try FileManager.default.removeItem(atPath: url.path)
-            savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-        } else {
-            try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
-            savedFile = CryptoFile.plain(fileName)
-        }
+        try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
         ChatModel.shared.filesToDelete.remove(url)
-        return savedFile
+        return CryptoFile.plain(fileName)
     } catch {
         logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
         return nil
     }
 }
 
-func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
+func generateNewFileName(_ prefix: String, _ ext: String) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }
 
-private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
+private func uniqueCombine(_ fileName: String) -> String {
     func tryCombine(_ fileName: String, _ n: Int) -> String {
         let ns = fileName as NSString
         let name = ns.deletingPathExtension
         let ext = ns.pathExtension
         let suffix = (n == 0) ? "" : "_\(n)"
         let f = "\(name)\(suffix).\(ext)"
-        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
     }
     return tryCombine(fileName, 0)
 }

apps/ios/Shared/Model/NSESubscriber.swift

@@ -1,83 +0,0 @@
-//
-//  NSESubscriber.swift
-//  SimpleXChat
-//
-//  Created by Evgeny on 09/12/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SimpleXChat
-
-private var nseSubscribers: [UUID:NSESubscriber] = [:]
-
-// timeout for active notification service extension going into "suspending" state.
-// If in two seconds the state does not change, we assume that it was not running and proceed with app activation/answering call.
-private let SUSPENDING_TIMEOUT: TimeInterval = 2
-
-// timeout should be larger than SUSPENDING_TIMEOUT
-func waitNSESuspended(timeout: TimeInterval, suspended: @escaping (Bool) -> Void) {
-    if timeout <= SUSPENDING_TIMEOUT {
-        logger.warning("waitNSESuspended: small timeout \(timeout), using \(SUSPENDING_TIMEOUT + 1)")
-    }
-    var state = nseStateGroupDefault.get()
-    if case .suspended = state {
-        DispatchQueue.main.async { suspended(true) }
-        return
-    }
-    let id = UUID()
-    var suspendedCalled = false
-    checkTimeout()
-    nseSubscribers[id] = nseMessageSubscriber { msg in
-        if case let .state(newState) = msg {
-            state = newState
-            logger.debug("waitNSESuspended state: \(state.rawValue)")
-            if case .suspended = newState {
-                notifySuspended(true)
-            }
-        }
-    }
-    return
-
-    func notifySuspended(_ ok: Bool) {
-        logger.debug("waitNSESuspended notifySuspended: \(ok)")
-        if !suspendedCalled {
-            logger.debug("waitNSESuspended notifySuspended: calling suspended(\(ok))")
-            suspendedCalled = true
-            nseSubscribers.removeValue(forKey: id)
-            DispatchQueue.main.async { suspended(ok) }
-        }
-    }
-
-    func checkTimeout() {
-        if !suspending() {
-            checkSuspendingTimeout()
-        } else if state == .suspending {
-            checkSuspendedTimeout()
-        }
-    }
-
-    func suspending() -> Bool {
-        suspendedCalled || state == .suspended || state == .suspending
-    }
-
-    func checkSuspendingTimeout() {
-        DispatchQueue.global().asyncAfter(deadline: .now() + SUSPENDING_TIMEOUT) {
-            logger.debug("waitNSESuspended check suspending timeout")
-            if !suspending() {
-                notifySuspended(false)
-            } else if state != .suspended {
-                checkSuspendedTimeout()
-            }
-        }
-    }
-
-    func checkSuspendedTimeout() {
-        DispatchQueue.global().asyncAfter(deadline: .now() + min(timeout - SUSPENDING_TIMEOUT, 1)) {
-            logger.debug("waitNSESuspended check suspended timeout")
-            if state != .suspended {
-                notifySuspended(false)
-            }
-        }
-    }
-}

apps/ios/Shared/Model/NetworkObserver.swift

@@ -1,73 +0,0 @@
-//
-//  NetworkObserver.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 05.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import Network
-import SimpleXChat
-
-class NetworkObserver {
-    static let shared = NetworkObserver()
-    private let queue: DispatchQueue = DispatchQueue(label: "chat.simplex.app.NetworkObserver")
-    private var prevInfo: UserNetworkInfo? = nil
-    private var monitor: NWPathMonitor?
-    private let monitorLock: DispatchQueue = DispatchQueue(label: "chat.simplex.app.monitorLock")
-
-    func restartMonitor() {
-        monitorLock.sync {
-            monitor?.cancel()
-            let mon = NWPathMonitor()
-            mon.pathUpdateHandler = { [weak self] path in
-                self?.networkPathChanged(path: path)
-            }
-            mon.start(queue: queue)
-            monitor = mon
-        }
-    }
-
-    private func networkPathChanged(path: NWPath) {
-        let info = UserNetworkInfo(
-            networkType: networkTypeFromPath(path),
-            online: path.status == .satisfied
-        )
-        if (prevInfo != info) {
-            prevInfo = info
-            setNetworkInfo(info)
-        }
-    }
-
-    private func networkTypeFromPath(_ path: NWPath) -> UserNetworkType {
-        if path.usesInterfaceType(.wiredEthernet) {
-            .ethernet
-        } else if path.usesInterfaceType(.wifi) {
-            .wifi
-        } else if path.usesInterfaceType(.cellular) {
-            .cellular
-        } else if path.usesInterfaceType(.other) {
-            .other
-        } else {
-            .none
-        }
-    }
-
-    private static var networkObserver: NetworkObserver? = nil
-
-    private func setNetworkInfo(_ info: UserNetworkInfo) {
-        logger.debug("setNetworkInfo Network changed: \(String(describing: info))")
-        DispatchQueue.main.sync {
-            ChatModel.shared.networkInfo = info
-        }
-        if !hasChatCtrl() { return }
-        self.monitorLock.sync {
-            do {
-                try apiSetNetworkInfo(info)
-            } catch let err {
-                logger.error("setNetworkInfo error: \(responseError(err))")
-            }
-        }
-    }
-}

apps/ios/Shared/Model/SuspendChat.swift

@@ -9,63 +9,51 @@
 import Foundation
 import UIKit
 import SimpleXChat
-import SwiftUI
 
 private let suspendLockQueue = DispatchQueue(label: "chat.simplex.app.suspend.lock")
 
+let appSuspendTimeout: Int = 15 // seconds
+
 let bgSuspendTimeout: Int = 5 // seconds
 
 let terminationTimeout: Int = 3 // seconds
 
-let activationDelay: TimeInterval = 1.5
-
-let nseSuspendTimeout: TimeInterval = 5
-
 private func _suspendChat(timeout: Int) {
-    // this is a redundant check to prevent logical errors, like the one fixed in this PR
-    let state = AppChatState.shared.value
-    if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue)")
-    } else if ChatModel.ok {
-        AppChatState.shared.set(.suspending)
+    if ChatModel.ok {
+        appStateGroupDefault.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
         DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
     } else {
-        AppChatState.shared.set(.suspended)
+        appStateGroupDefault.set(.suspended)
     }
 }
 
 func suspendChat() {
     suspendLockQueue.sync {
-        _suspendChat(timeout: appSuspendTimeout)
+        if appStateGroupDefault.get() != .stopped {
+            _suspendChat(timeout: appSuspendTimeout)
+        }
     }
 }
 
 func suspendBgRefresh() {
     suspendLockQueue.sync {
-        if case .bgRefresh = AppChatState.shared.value  {
+        if case .bgRefresh = appStateGroupDefault.get()  {
             _suspendChat(timeout: bgSuspendTimeout)
         }
     }
 }
 
 func terminateChat() {
-    logger.debug("terminateChat")
     suspendLockQueue.sync {
-        switch AppChatState.shared.value {
+        switch appStateGroupDefault.get() {
         case .suspending:
             // suspend instantly if already suspending
             _chatSuspended()
-            // when apiSuspendChat is called with timeout 0, it won't send any events on suspension
             if ChatModel.ok { apiSuspendChat(timeoutMicroseconds: 0) }
-            chatCloseStore()
-        case .suspended:
-            chatCloseStore()
-        case .stopped:
-            chatCloseStore()
+        case .stopped: ()
         default:
-            // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
     }
@@ -73,7 +61,7 @@ func terminateChat() {
 
 func chatSuspended() {
     suspendLockQueue.sync {
-        if case .suspending = AppChatState.shared.value {
+        if case .suspending = appStateGroupDefault.get() {
             _chatSuspended()
         }
     }
@@ -81,23 +69,16 @@ func chatSuspended() {
 
 private func _chatSuspended() {
     logger.debug("_chatSuspended")
-    AppChatState.shared.set(.suspended)
+    appStateGroupDefault.set(.suspended)
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
-    chatCloseStore()
-}
-
-func setAppState(_ appState: AppState) {
-    suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
-    }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
     suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+        appStateGroupDefault.set(appState)
         if ChatModel.ok { apiActivateChat() }
         logger.debug("DEBUGGING: activateChat: after apiActivateChat")
     }
@@ -106,86 +87,24 @@ func activateChat(appState: AppState = .active) {
 func initChatAndMigrate(refreshInvitations: Bool = true) {
     let m = ChatModel.shared
     if (!m.chatInitialized) {
-        m.v3DBMigration = v3DBMigrationDefault.get()
-        if AppChatState.shared.value == .stopped && storeDBPassphraseGroupDefault.get() && kcDatabasePassword.get() != nil {
-            initialize(start: true, confirmStart: true)
-        } else {
-            initialize(start: true)
-        }
-    }
-
-    func initialize(start: Bool, confirmStart: Bool = false) {
         do {
-            try initializeChat(start: m.v3DBMigration.startChat && start, confirmStart: m.v3DBMigration.startChat && confirmStart, refreshInvitations: refreshInvitations)
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
         } catch let error {
-            AlertManager.shared.showAlertMsg(
-                title: start ? "Error starting chat" : "Error opening chat",
-                message: "Please contact developers.\nError: \(responseError(error))"
-            )
+            fatalError("Failed to start or load chats: \(responseError(error))")
         }
     }
 }
 
-func startChatForCall() {
-    logger.debug("DEBUGGING: startChatForCall")
-    if ChatModel.shared.chatRunning == true {
-        ChatReceiver.shared.start()
-        logger.debug("DEBUGGING: startChatForCall: after ChatReceiver.shared.start")
-    }
-    if .active != AppChatState.shared.value {
-        logger.debug("DEBUGGING: startChatForCall: before activateChat")
-        activateChat()
-        logger.debug("DEBUGGING: startChatForCall: after activateChat")
-    }
-}
-
-func startChatAndActivate(_ completion: @escaping () -> Void) {
+func startChatAndActivate() {
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()
         logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
     }
-    if case .active = AppChatState.shared.value {
-        completion()
-    } else if nseStateGroupDefault.get().inactive {
-        activate()
-    } else {
-        // setting app state to "activating" to notify NSE that it should suspend
-        setAppState(.activating)
-        waitNSESuspended(timeout: nseSuspendTimeout) { ok in
-            if !ok {
-                // if for some reason NSE failed to suspend,
-                // e.g., it crashed previously without setting its state to "suspended",
-                // set it to "suspended" state anyway, so that next time app
-                // does not have to wait when activating.
-                nseStateGroupDefault.set(.suspended)
-            }
-            if AppChatState.shared.value == .activating {
-                activate()
-            }
-        }
-    }
-
-    func activate() {
+    if .active != appStateGroupDefault.get()  {
         logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
         activateChat()
-        completion()
         logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
     }
 }
-
-// appStateGroupDefault must not be used in the app directly, only via this singleton
-class AppChatState {
-    static let shared = AppChatState()
-    private var value_ = appStateGroupDefault.get()
-
-    var value: AppState {
-        value_
-    }
-
-    func set(_ state: AppState) {
-        appStateGroupDefault.set(state)
-        sendAppState(state)
-        value_ = state
-    }
-}

apps/ios/Shared/SimpleXApp.swift

@@ -16,15 +16,17 @@ struct SimpleXApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject private var chatModel = ChatModel.shared
     @ObservedObject var alertManager = AlertManager.shared
-
     @Environment(\.scenePhase) var scenePhase
-    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
+    @State private var userAuthorized: Bool?
+    @State private var doAuthenticate = false
+    @State private var enteredBackground: TimeInterval? = nil
+    @State private var canConnectCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+    @State private var showInitializationView = false
 
     init() {
-        DispatchQueue.global(qos: .background).sync {
-            haskell_init()
-//            hs_init(0, nil)
-        }
+        hs_init(0, nil)
         UserDefaults.standard.register(defaults: appDefaults)
         setGroupDefaults()
         registerGroupDefaults()
@@ -34,60 +36,53 @@ struct SimpleXApp: App {
     }
 
     var body: some Scene {
-        WindowGroup {
-            // contentAccessAuthenticationExtended has to be passed to ContentView on view initialization,
-            // so that it's computed by the time view renders, and not on event after rendering
-            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
+        return WindowGroup {
+            ContentView(
+                doAuthenticate: $doAuthenticate,
+                userAuthorized: $userAuthorized,
+                canConnectCall: $canConnectCall,
+                lastSuccessfulUnlock: $lastSuccessfulUnlock,
+                showInitializationView: $showInitializationView
+            )
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
                 }
                 .onAppear() {
-                    // Present screen for continue migration if it wasn't finished yet
-                    if chatModel.migrationState != nil {
-                        // It's important, otherwise, user may be locked in undefined state
-                        onboardingStageDefault.set(.step1_SimpleXInfo)
-                        chatModel.onboardingStage = onboardingStageDefault.get()
-                    } else if kcAppPassword.get() == nil || kcSelfDestructPassword.get() == nil {
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
-                            initChatAndMigrate()
-                        }
+                    showInitializationView = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                        initChatAndMigrate()
                     }
                 }
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                     switch (phase) {
                     case .background:
-                        // --- authentication
-                        // see ContentView .onChange(of: scenePhase) for remaining authentication logic
-                        if chatModel.contentViewAccessAuthenticated {
-                            enteredBackgroundAuthenticated = ProcessInfo.processInfo.systemUptime
-                        }
-                        chatModel.contentViewAccessAuthenticated = false
-                        // authentication ---
-
                         if CallController.useCallKit() && chatModel.activeCall != nil {
                             CallController.shared.shouldSuspendChat = true
                         } else {
                             suspendChat()
                             BGManager.shared.schedule()
                         }
+                        if userAuthorized == true {
+                            enteredBackground = ProcessInfo.processInfo.systemUptime
+                        }
+                        doAuthenticate = false
+                        canConnectCall = false
                         NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                     case .active:
                         CallController.shared.shouldSuspendChat = false
-                        let appState = AppChatState.shared.value
-
-                        if appState != .stopped {
-                            startChatAndActivate {
-                                if appState.inactive && chatModel.chatRunning == true {
-                                    updateChats()
-                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                        updateCallInvitations()
-                                    }
-                                }
+                        let appState = appStateGroupDefault.get()
+                        startChatAndActivate()
+                        if appState.inactive && chatModel.chatRunning == true {
+                            updateChats()
+                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                updateCallInvitations()
                             }
                         }
+                        doAuthenticate = authenticationExpired()
+                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                     default:
                         break
                     }
@@ -105,12 +100,12 @@ struct SimpleXApp: App {
         if legacyDatabase, case .documents = dbContainerGroupDefault.get() {
             dbContainerGroupDefault.set(.documents)
             setMigrationState(.offer)
-            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath(), privacy: .public)*.db")
         } else {
             dbContainerGroupDefault.set(.group)
             setMigrationState(.ready)
-            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
-            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath(), privacy: .public)*.db")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not", privacy: .public) present")
         }
     }
 
@@ -120,14 +115,22 @@ struct SimpleXApp: App {
     }
 
     private func authenticationExpired() -> Bool {
-        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
+        if let enteredBackground = enteredBackground {
             let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
         } else {
             return true
         }
     }
 
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
+        } else {
+            return false
+        }
+    }
+
     private func updateChats() {
         do {
             let chats = try apiGetChats()

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

@@ -9,84 +9,68 @@
 import SwiftUI
 import WebKit
 import SimpleXChat
-import AVFoundation
 
 struct ActiveCallView: View {
     @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var call: Call
     @Environment(\.scenePhase) var scenePhase
     @State private var client: WebRTCClient? = nil
     @State private var activeCall: WebRTCClient.Call? = nil
     @State private var localRendererAspectRatio: CGFloat? = nil
     @Binding var canConnectCall: Bool
-    @State var prevColorScheme: ColorScheme = .dark
-    @State var pipShown = false
-    @State var wasConnected = false
 
     var body: some View {
-        ZStack(alignment: .topLeading) {
-            ZStack(alignment: .bottom) {
-                if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
-                    GeometryReader { g in
-                        let width = g.size.width * 0.3
-                        ZStack(alignment: .topTrailing) {
-                            CallViewRemote(client: client, activeCall: $activeCall, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, pipShown: $pipShown)
-                            CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
-                                .cornerRadius(10)
-                                .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
-                                .padding([.top, .trailing], 17)
-                            ZStack(alignment: .center) {
-                                // For some reason, when the view in GeometryReader and ZStack is visible, it steals clicks on a back button, so showing something on top like this with background color helps (.clear color doesn't work)
-                            }
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                            .background(Color.primary.opacity(0.000001))
-                        }
+        ZStack(alignment: .bottom) {
+            if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
+                GeometryReader { g in
+                    let width = g.size.width * 0.3
+                    ZStack(alignment: .topTrailing) {
+                        CallViewRemote(client: client, activeCall: $activeCall)
+                        CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio)
+                            .cornerRadius(10)
+                            .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
+                            .padding([.top, .trailing], 17)
                     }
                 }
-                if let call = m.activeCall, let client = client, (!pipShown || !call.supportsVideo) {
-                    ActiveCallOverlay(call: call, client: client)
-                }
+            }
+            if let call = m.activeCall, let client = client {
+                ActiveCallOverlay(call: call, client: client)
             }
         }
-        .allowsHitTesting(!m.activeCallViewIsCollapsed)
-        .opacity(m.activeCallViewIsCollapsed ? 0 : 1)
         .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
-            AppDelegate.keepScreenOn(true)
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
             createWebRTCClient()
             dismissAllSheets()
-            hideKeyboard()
-            prevColorScheme = colorScheme
         }
         .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
             createWebRTCClient()
         }
-        .onChange(of: m.activeCallViewIsCollapsed) { _ in
-            hideKeyboard()
-        }
         .onDisappear {
             logger.debug("ActiveCallView: disappear")
-            Task { await m.callCommand.setClient(nil) }
-            AppDelegate.keepScreenOn(false)
             client?.endCall()
-            CallSoundsPlayer.shared.stop()
-            try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)
-            if (wasConnected) {
-                CallSoundsPlayer.shared.vibrate(long: true)
-            }
         }
-        .background(m.activeCallViewIsCollapsed ? .clear : .black)
-        // Quite a big delay when opening/closing the view when a scheme changes (globally) this way. It's not needed when CallKit is used since status bar is green with white text on it
-        .preferredColorScheme(m.activeCallViewIsCollapsed || CallController.useCallKit() ? prevColorScheme : .dark)
+        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
+        .background(.black)
+        .preferredColorScheme(.dark)
     }
 
     private func createWebRTCClient() {
         if client == nil && canConnectCall {
             client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            sendCommandToClient()
+        }
+    }
+
+    private func sendCommandToClient() {
+        if call == m.activeCall,
+           m.activeCall != nil,
+           let client = client,
+           let cmd = m.callCommand {
+            m.callCommand = nil
+            logger.debug("sendCallCommand: \(cmd.cmdType)")
             Task {
-                await m.callCommand.setClient(client)
+                await client.sendCallCommand(command: cmd)
             }
         }
     }
@@ -94,8 +78,8 @@ struct ActiveCallView: View {
     @MainActor
     private func processRtcMessage(msg: WVAPIMessage) {
         if call == m.activeCall,
-           let call = m.activeCall,
-           let client = client {
+            let call = m.activeCall,
+            let client = client {
             logger.debug("ActiveCallView: response \(msg.resp.respType)")
             switch msg.resp {
             case let .capabilities(capabilities):
@@ -110,17 +94,12 @@ struct ActiveCallView: View {
                         call.callState = .invitationSent
                         call.localCapabilities = capabilities
                     }
-                    if call.supportsVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
-                        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    }
-                    CallSoundsPlayer.shared.startConnectingCallSound()
-                    activeCallWaitDeliveryReceipt()
                 }
             case let .offer(offer, iceCandidates, capabilities):
                 Task {
                     do {
                         try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                                   media: call.localMedia, capabilities: capabilities)
+                                               media: call.localMedia, capabilities: capabilities)
                     } catch {
                         logger.error("apiSendCallOffer \(responseError(error))")
                     }
@@ -138,7 +117,6 @@ struct ActiveCallView: View {
                     }
                     await MainActor.run {
                         call.callState = .negotiated
-                        CallSoundsPlayer.shared.stop()
                     }
                 }
             case let .ice(iceCandidates):
@@ -153,19 +131,13 @@ struct ActiveCallView: View {
                 if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
                    case .connected = callStatus {
                     call.direction == .outgoing
-                    ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
-                    : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
+                        ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
+                        : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                     call.callState = .connected
-                    call.connectedAt = .now
-                    if !wasConnected {
-                        CallSoundsPlayer.shared.vibrate(long: false)
-                        wasConnected = true
-                    }
                 }
                 if state.connectionState == "closed" {
                     closeCallView(client)
                     m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                 }
                 Task {
                     do {
@@ -177,11 +149,6 @@ struct ActiveCallView: View {
             case let .connected(connectionInfo):
                 call.callState = .connected
                 call.connectionInfo = connectionInfo
-                call.connectedAt = .now
-                if !wasConnected {
-                    CallSoundsPlayer.shared.vibrate(long: false)
-                    wasConnected = true
-                }
             case .ended:
                 closeCallView(client)
                 call.callState = .ended
@@ -195,31 +162,12 @@ struct ActiveCallView: View {
                 case .end:
                     closeCallView(client)
                     m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                 default: ()
                 }
             case let .error(message):
                 logger.debug("ActiveCallView: command error: \(message)")
-                AlertManager.shared.showAlert(Alert(title: Text("Error"), message: Text(message)))
             case let .invalid(type):
                 logger.debug("ActiveCallView: invalid response: \(type)")
-                AlertManager.shared.showAlert(Alert(title: Text("Invalid response"), message: Text(type)))
-            }
-        }
-    }
-
-    private func activeCallWaitDeliveryReceipt() {
-        ChatReceiver.shared.messagesChannel = { msg in
-            guard let call = ChatModel.shared.activeCall, call.callState == .invitationSent else {
-                ChatReceiver.shared.messagesChannel = nil
-                return
-            }
-            if case let .chatItemStatusUpdated(_, msg) = msg,
-               msg.chatInfo.id == call.contact.id,
-               case .sndCall = msg.chatItem.content,
-               case .sndRcvd = msg.chatItem.meta.itemStatus {
-                CallSoundsPlayer.shared.startInCallSound()
-                ChatReceiver.shared.messagesChannel = nil
             }
         }
     }
@@ -235,13 +183,12 @@ struct ActiveCallOverlay: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var call: Call
     var client: WebRTCClient
-    @ObservedObject private var deviceManager = CallAudioDeviceManager.shared
 
     var body: some View {
         VStack {
             switch call.localMedia {
             case .video:
-                videoCallInfoView(call)
+                callInfoView(call, .leading)
                 .foregroundColor(.white)
                 .opacity(0.8)
                 .padding()
@@ -251,16 +198,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     toggleAudioButton()
                     Spacer()
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(width: 40, height: 40)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 40, maxHeight: 40)
-                    } else {
-                        Color.clear.frame(width: 40, height: 40)
-                    }
+                    Color.clear.frame(width: 40, height: 40)
                     Spacer()
                     endCallButton()
                     Spacer()
@@ -277,23 +215,16 @@ struct ActiveCallOverlay: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
             case .audio:
-                ZStack(alignment: .topLeading) {
-                    Button {
-                        chatModel.activeCallViewIsCollapsed = true
-                    } label: {
-                        Label("Back", systemImage: "chevron.left")
-                            .padding()
-                            .foregroundColor(.white.opacity(0.8))
-                    }
-                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image, size: 192)
-                        audioCallInfoView(call)
-                    }
-                    .foregroundColor(.white)
-                    .opacity(0.8)
-                    .padding()
-                    .frame(maxHeight: .infinity)
+                VStack {
+                    ProfileImage(imageStr: call.contact.profile.image)
+                        .scaledToFit()
+                        .frame(width: 192, height: 192)
+                    callInfoView(call, .center)
                 }
+                .foregroundColor(.white)
+                .opacity(0.8)
+                .padding()
+                .frame(maxHeight: .infinity)
 
                 Spacer()
 
@@ -301,81 +232,34 @@ struct ActiveCallOverlay: View {
                     toggleAudioButton()
                         .frame(maxWidth: .infinity, alignment: .leading)
                     endCallButton()
-                    // Check if the only input is microphone. And in this case show toggle button, 
-                    // If there are more inputs, it probably means something like bluetooth headphones are available
-                    // and in this case show iOS button for choosing different output.
-                    // There is no way to get available outputs, only inputs
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 50, maxHeight: 40)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else {
-                        Color.clear.frame(width: 50, height: 40)
-                    }
+                    toggleSpeakerButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                 }
                 .padding(.bottom, 60)
                 .padding(.horizontal, 48)
             }
         }
         .frame(maxWidth: .infinity)
-        .onAppear {
-            deviceManager.start()
-        }
-        .onDisappear {
-            deviceManager.stop()
-        }
     }
 
-    private func audioCallInfoView(_ call: Call) -> some View {
+    private func callInfoView(_ call: Call, _ alignment: Alignment) -> some View {
         VStack {
             Text(call.contact.chatViewName)
                 .lineLimit(1)
                 .font(.title)
-                .frame(maxWidth: .infinity, alignment: .center)
+                .frame(maxWidth: .infinity, alignment: alignment)
             Group {
                 Text(call.callState.text)
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
+//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
                         Text("(") + Text(connInfo.text) + Text(")")
                     }
                 }
             }
             .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func videoCallInfoView(_ call: Call) -> some View {
-        VStack {
-            Button {
-                chatModel.activeCallViewIsCollapsed = true
-            } label: {
-                HStack(alignment: .center, spacing: 16) {
-                    Image(systemName: "chevron.left")
-                        .resizable()
-                        .frame(width: 10, height: 18)
-                    Text(call.contact.chatViewName)
-                        .lineLimit(1)
-                        .font(.title)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                }
-            }
-            Group {
-                Text(call.callState.text)
-                HStack {
-                    Text(call.encryptionStatus)
-                    if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
-                    }
-                }
-            }
-            .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: alignment)
         }
     }
 
@@ -405,17 +289,12 @@ struct ActiveCallOverlay: View {
     private func toggleSpeakerButton() -> some View {
         controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
             Task {
-                let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
+                client.setSpeakerEnabledAndConfigureSession(!call.speakerEnabled)
                 DispatchQueue.main.async {
-                    call.speakerEnabled = !speakerEnabled
+                    call.speakerEnabled = !call.speakerEnabled
                 }
             }
         }
-        .onAppear {
-            deviceManager.call = call
-            //call.speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-        }
     }
 
     private func toggleVideoButton() -> some View {

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

@@ -1,25 +0,0 @@
-//
-//  MPVolumeView.swift
-//  SimpleX (iOS)
-//
-//  Created by Stanislav on 24.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import UIKit
-import AVKit
-
-struct AudioDevicePicker: UIViewRepresentable {
-    func makeUIView(context: Context) -> some UIView {
-        let v = AVRoutePickerView(frame: .zero)
-        v.activeTintColor = .white
-        v.tintColor = .white
-        return v
-    }
-
-    func updateUIView(_ uiView: UIViewType, context: Context) {
-
-    }
-}

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

@@ -1,67 +0,0 @@
-//
-//  CallAudioDeviceManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-import AVKit
-import WebRTC
-
-class CallAudioDeviceManager: ObservableObject {
-    static let shared = CallAudioDeviceManager()
-    let audioSession: AVAudioSession
-    let nc = NotificationCenter.default
-
-    var call: Call?
-    var timer: Timer? = nil
-
-    // Actually, only one output
-    @Published var outputs: [AVAudioSessionPortDescription]
-    @Published var currentDevice: AVAudioSessionPortDescription? = nil
-    // All devices that can record audio (the ones that can play audio are not included)
-    @Published var availableInputs: [AVAudioSessionPortDescription] = []
-
-
-    init(_ audioSession: AVAudioSession? = nil) {
-        self.audioSession = audioSession ?? RTCAudioSession.sharedInstance().session
-        self.outputs = self.audioSession.currentRoute.outputs
-        self.availableInputs = self.audioSession.availableInputs ?? []
-    }
-
-    func reloadDevices() {
-        outputs = audioSession.currentRoute.outputs
-        currentDevice = audioSession.currentRoute.outputs.first
-        availableInputs = audioSession.availableInputs ?? []
-        call?.speakerEnabled = currentDevice?.portType == .builtInSpeaker
-
-
-        // Workaround situation:
-        // have bluetooth device connected, choosing speaker, disconnecting bluetooth device. In this case iOS will not post notification, so do it manually
-        timer?.invalidate()
-        if availableInputs.contains(where: { $0.portType != .builtInReceiver && $0.portType != .builtInSpeaker }) {
-            timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { t in
-                self.reloadDevices()
-            }
-        }
-    }
-
-    @objc func audioCallback(notification: Notification) {
-        reloadDevices()
-
-        logger.debug("Changes in devices, current audio devices: \(String(describing: self.availableInputs.map({ $0.portType.rawValue }))), output: \(String(describing: self.currentDevice?.portType.rawValue))")
-    }
-
-    func start() {
-        nc.addObserver(self, selector: #selector(audioCallback), name: AVAudioSession.routeChangeNotification, object: nil)
-    }
-
-    func stop() {
-        nc.removeObserver(self, name: AVAudioSession.routeChangeNotification, object: nil)
-        timer?.invalidate()
-    }
-}

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

@@ -103,27 +103,12 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
         RTCAudioSession.sharedInstance().isAudioEnabled = true
         do {
-            let supportsVideo = ChatModel.shared.activeCall?.supportsVideo == true
-            if supportsVideo {
-                try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            } else {
-                try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            }
-            // Without any delay sound is not playing from speaker or external device in incoming call
-            Task {
-                for i in 0 ... 3 {
-                    try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
-                    if let preferred = audioSession.preferredInputDevice() {
-                        await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if supportsVideo {
-                        await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
-                    }
-                }
-            }
+            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
             logger.debug("audioSession category set")
             try audioSession.setActive(true)
             logger.debug("audioSession activated")
         } catch {
+            print(error)
             logger.error("failed activating audio session")
         }
     }
@@ -136,6 +121,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(false)
             logger.debug("audioSession deactivated")
         } catch {
+            print(error)
             logger.error("failed deactivating audio session")
         }
         suspendOnEndCall()
@@ -146,7 +132,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             // The delay allows to accept the second call before suspending a chat
             // see `.onChange(of: scenePhase)` in SimpleXApp
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
                 if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                     self?.shouldSuspendChat = false
                     suspendChat()
@@ -158,46 +144,33 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     @objc(pushRegistry:didUpdatePushCredentials:forType:)
     func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
     }
 
     func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.debug("CallController: did receive push with type \(type.rawValue)")
+        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
         if type != .voIP {
             completion()
             return
         }
-        if AppChatState.shared.value == .stopped {
-            self.reportExpiredCall(payload: payload, completion)
-            return
-        }
+        logger.debug("CallController: initializing chat")
         if (!ChatModel.shared.chatInitialized) {
-            logger.debug("CallController: initializing chat")
-            do {
-                try initializeChat(start: true, refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                self.reportExpiredCall(payload: payload, completion)
-                return
-            }
+            initChatAndMigrate(refreshInvitations: false)
         }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
+        startChatAndActivate()
+        shouldSuspendChat = true
         // There are no invitations in the model, as it was processed by NSE
         _ = try? justRefreshCallInvitations()
-        logger.debug("CallController: updated call invitations chat")
         // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
         // Extract the call information from the push notification payload
         let m = ChatModel.shared
         if let contactId = payload.dictionaryPayload["contactId"] as? String,
            let invitation = m.callInvitations[contactId] {
-            let update = self.cxCallUpdate(invitation: invitation)
+            let update = cxCallUpdate(invitation: invitation)
             if let uuid = invitation.callkitUUID {
                 logger.debug("CallController: report pushkit call via CallKit")
-                let update = self.cxCallUpdate(invitation: invitation)
-                self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
+                let update = cxCallUpdate(invitation: invitation)
+                provider.reportNewIncomingCall(with: uuid, update: update) { error in
                     if error != nil {
                         m.callInvitations.removeValue(forKey: contactId)
                     }
@@ -205,10 +178,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     completion()
                 }
             } else {
-                self.reportExpiredCall(update: update, completion)
+                reportExpiredCall(update: update, completion)
             }
         } else {
-            self.reportExpiredCall(payload: payload, completion)
+            reportExpiredCall(payload: payload, completion)
         }
     }
 
@@ -239,7 +212,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
         if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
@@ -379,7 +352,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
         controller.request(CXTransaction(action: action)) { error in
             if let error = error {
-                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
             } else {
                 logger.debug("CallController.requestTransaction requested transaction successfully")
                 onSuccess()

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

@@ -22,7 +22,7 @@ class CallManager {
         let m = ChatModel.shared
         if let call = m.activeCall, call.callkitUUID == callUUID {
             m.showCallView = true
-            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
+            m.callCommand = .capabilities(media: call.localMedia)
             return true
         }
         return false
@@ -57,21 +57,19 @@ class CallManager {
             m.activeCall = call
             m.showCallView = true
 
-            Task {
-                await m.callCommand.processCommand(.start(
+            m.callCommand = .start(
                 media: invitation.callType.media,
                 aesKey: invitation.sharedKey,
                 iceServers: iceServers,
                 relay: useRelay
-                ))
-            }
+            )
         }
     }
 
     func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
         if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
             let m = ChatModel.shared
-            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
+            m.callCommand = .media(media: media, enable: enable)
             return true
         }
         return false
@@ -92,19 +90,15 @@ class CallManager {
         if case .ended = call.callState {
             logger.debug("CallManager.endCall: call ended")
             m.activeCall = nil
-            m.activeCallViewIsCollapsed = false
             m.showCallView = false
             completed()
         } else {
             logger.debug("CallManager.endCall: ending call...")
+            m.callCommand = .end
+            m.activeCall = nil
+            m.showCallView = false
+            completed()
             Task {
-                await m.callCommand.processCommand(.end)
-                await MainActor.run {
-                    m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
-                    m.showCallView = false
-                    completed()
-                }
                 do {
                     try await apiEndCall(call.contact)
                 } catch {

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

@@ -6,20 +6,14 @@
 import SwiftUI
 import WebRTC
 import SimpleXChat
-import AVKit
 
 struct CallViewRemote: UIViewRepresentable {
     var client: WebRTCClient
     var activeCall: Binding<WebRTCClient.Call?>
-    @State var enablePip: (Bool) -> Void = {_ in }
-    @Binding var activeCallViewIsCollapsed: Bool
-    @Binding var pipShown: Bool
 
-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, activeCallViewIsCollapsed: Binding<Bool>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>) {
         self.client = client
         self.activeCall = activeCall
-        self._activeCallViewIsCollapsed = activeCallViewIsCollapsed
-        self._pipShown = pipShown
     }
 
     func makeUIView(context: Context) -> UIView {
@@ -29,120 +23,12 @@ struct CallViewRemote: UIViewRepresentable {
             remoteRenderer.videoContentMode = .scaleAspectFill
             client.addRemoteRenderer(call, remoteRenderer)
             addSubviewAndResize(remoteRenderer, into: view)
-
-            if AVPictureInPictureController.isPictureInPictureSupported() {
-                makeViewWithRTCRenderer(call, remoteRenderer, view, context)
-            }
         }
         return view
     }
-    
-    func makeViewWithRTCRenderer(_ call: WebRTCClient.Call, _ remoteRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
-        let pipRemoteRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteRenderer.videoContentMode = .scaleAspectFill
-        
-        let pipVideoCallViewController = AVPictureInPictureVideoCallViewController()
-        pipVideoCallViewController.preferredContentSize = CGSize(width: 1080, height: 1920)
-        addSubviewAndResize(pipRemoteRenderer, into: pipVideoCallViewController.view)
-        let pipContentSource = AVPictureInPictureController.ContentSource(
-            activeVideoCallSourceView: view,
-            contentViewController: pipVideoCallViewController
-        )
-        
-        let pipController = AVPictureInPictureController(contentSource: pipContentSource)
-        pipController.canStartPictureInPictureAutomaticallyFromInline = true
-        pipController.delegate = context.coordinator
-        context.coordinator.pipController = pipController
-        context.coordinator.willShowHide = { show in
-            if show {
-                client.addRemoteRenderer(call, pipRemoteRenderer)
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    activeCallViewIsCollapsed = true
-                }
-            } else {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                    activeCallViewIsCollapsed = false
-                }
-            }
-        }
-        context.coordinator.didShowHide = { show in
-            if show {
-                remoteRenderer.isHidden = true
-            } else {
-                client.removeRemoteRenderer(call, pipRemoteRenderer)
-                remoteRenderer.isHidden = false
-            }
-            pipShown = show
-        }
-        DispatchQueue.main.async {
-            enablePip = { enable in
-                if enable != pipShown /* pipController.isPictureInPictureActive */ {
-                    if enable {
-                        pipController.startPictureInPicture()
-                    } else {
-                        pipController.stopPictureInPicture()
-                    }
-                }
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        Coordinator()
-    }
 
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView remote")
-        DispatchQueue.main.async {
-            if activeCallViewIsCollapsed != pipShown {
-                enablePip(activeCallViewIsCollapsed)
-            }
-        }
-    }
-    
-    // MARK: - Coordinator
-    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
-        var pipController: AVPictureInPictureController? = nil
-        var willShowHide: (Bool) -> Void = { _ in }
-        var didShowHide: (Bool) -> Void = { _ in }
-        
-        func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(true)
-        }
-
-        func pictureInPictureControllerDidStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(true)
-        }
-
-        func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, failedToStartPictureInPictureWithError error: Error) {
-            logger.error("PiP failed to start: \(error.localizedDescription)")
-        }
-        
-        func pictureInPictureControllerWillStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(false)
-        }
-        
-        func pictureInPictureControllerDidStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(false)
-        }
-
-        deinit {
-            pipController?.stopPictureInPicture()
-            pipController?.canStartPictureInPictureAutomaticallyFromInline = false
-            pipController?.contentSource = nil
-            pipController?.delegate = nil
-            pipController = nil
-        }
-    }
-    
-    class SampleBufferVideoCallView: UIView {
-        override class var layerClass: AnyClass {
-            get { return AVSampleBufferDisplayLayer.self }
-        }
-        
-        var sampleBufferDisplayLayer: AVSampleBufferDisplayLayer {
-            return layer as! AVSampleBufferDisplayLayer
-        }
     }
 }
 
@@ -150,14 +36,11 @@ struct CallViewLocal: UIViewRepresentable {
     var client: WebRTCClient
     var activeCall: Binding<WebRTCClient.Call?>
     var localRendererAspectRatio: Binding<CGFloat?>
-    @State var pipStateChanged: (Bool) -> Void = {_ in }
-    @Binding var pipShown: Bool
 
-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>) {
         self.client = client
         self.activeCall = activeCall
         self.localRendererAspectRatio = localRendererAspectRatio
-        self._pipShown = pipShown
     }
 
     func makeUIView(context: Context) -> UIView {
@@ -167,18 +50,12 @@ struct CallViewLocal: UIViewRepresentable {
             client.addLocalRenderer(call, localRenderer)
             client.startCaptureLocalVideo(call)
             addSubviewAndResize(localRenderer, into: view)
-            DispatchQueue.main.async {
-                pipStateChanged = { shown in
-                    localRenderer.isHidden = shown
-                }
-            }
         }
         return view
     }
 
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView local")
-        pipStateChanged(pipShown)
     }
 }
 

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

@@ -30,7 +30,8 @@ struct IncomingCallView: View {
         VStack(alignment: .leading, spacing: 6) {
             HStack {
                 if m.users.count > 1 {
-                    ProfileImage(imageStr: invitation.user.image, size: 24, color: .white)
+                    ProfileImage(imageStr: invitation.user.image, color: .white)
+                        .frame(width: 24, height: 24)
                 }
                 Image(systemName: invitation.callType.media == .video ? "video.fill" : "phone.fill").foregroundColor(.green)
                 Text(invitation.callTypeText)

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

@@ -8,7 +8,6 @@
 
 import Foundation
 import AVFoundation
-import UIKit
 
 class SoundPlayer {
     static let shared = SoundPlayer()
@@ -44,63 +43,3 @@ class SoundPlayer {
         audioPlayer = nil
     }
 }
-
-class CallSoundsPlayer {
-    static let shared = CallSoundsPlayer()
-    private var audioPlayer: AVAudioPlayer?
-    private var playerTask: Task = Task {}
-
-    private func start(_ soundName: String, delayMs: Double) {
-        audioPlayer?.stop()
-        playerTask.cancel()
-        logger.debug("start \(soundName)")
-        guard let path = Bundle.main.path(forResource: soundName, ofType: "mp3", inDirectory: "sounds") else {
-            logger.debug("start: file not found")
-            return
-        }
-        do {
-            let player = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: path))
-            if player.prepareToPlay() {
-                audioPlayer = player
-            }
-        } catch {
-            logger.debug("start: AVAudioPlayer error \(error.localizedDescription)")
-        }
-
-        playerTask = Task {
-            while let player = audioPlayer {
-                player.play()
-                do {
-                    try await Task.sleep(nanoseconds: UInt64((player.duration * 1_000_000_000) + delayMs * 1_000_000))
-                } catch {
-                    break
-                }
-            }
-        }
-    }
-
-    func startConnectingCallSound() {
-        start("connecting_call", delayMs: 0)
-    }
-
-    func startInCallSound() {
-        // Taken from https://github.com/TelegramOrg/Telegram-Android
-        // https://github.com/TelegramOrg/Telegram-Android/blob/master/LICENSE
-        start("in_call", delayMs: 1000)
-    }
-
-    func stop() {
-        playerTask.cancel()
-        audioPlayer?.stop()
-        audioPlayer = nil
-    }
-
-    func vibrate(long: Bool) {
-        // iOS just don't want to vibrate more than once after a short period of time, and all 'styles' feel the same
-        if long {
-            AudioServicesPlayAlertSound(kSystemSoundID_Vibrate)
-        } else {
-            UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
-        }
-    }
-}

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

@@ -28,7 +28,6 @@ class Call: ObservableObject, Equatable {
     @Published var speakerEnabled = false
     @Published var videoEnabled: Bool
     @Published var connectionInfo: ConnectionInfo?
-    @Published var connectedAt: Date? = nil
 
     init(
         direction: CallDirection,
@@ -60,7 +59,6 @@ class Call: ObservableObject, Equatable {
         }
     }
     var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
-    var supportsVideo: Bool { get { peerMedia == .video || localMedia == .video } }
 }
 
 enum CallDirection {
@@ -337,50 +335,6 @@ extension WCallResponse: Encodable {
     }
 }
 
-actor WebRTCCommandProcessor {
-    private var client: WebRTCClient? = nil
-    private var commands: [WCallCommand] = []
-    private var running: Bool = false
-
-    func setClient(_ client: WebRTCClient?) async {
-        logger.debug("WebRTC: setClient, commands count \(self.commands.count)")
-        self.client = client
-        if client != nil {
-            await processAllCommands()
-        } else {
-            commands.removeAll()
-        }
-    }
-
-    func processCommand(_ c: WCallCommand) async {
-//        logger.debug("WebRTC: process command \(c.cmdType)")
-        commands.append(c)
-        if !running && client != nil {
-            await processAllCommands()
-        }
-    }
-
-    func processAllCommands() async {
-        logger.debug("WebRTC: process all commands, commands count \(self.commands.count), client == nil \(self.client == nil)")
-        if let client = client {
-            running = true
-            while let c = commands.first, shouldRunCommand(client, c) {
-                commands.remove(at: 0)
-                await client.sendCallCommand(command: c)
-                logger.debug("WebRTC: processed cmd \(c.cmdType)")
-            }
-            running = false
-        }
-    }
-
-    func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
-        switch c {
-        case .capabilities, .start, .offer, .end: true
-        default: client.activeCall.wrappedValue != nil
-        }
-    }
-}
-
 struct ConnectionState: Codable, Equatable {
     var connectionState: String
     var iceConnectionState: String
@@ -404,12 +358,26 @@ struct ConnectionInfo: Codable, Equatable {
             return "\(local?.rawValue ?? unknown) / \(remote?.rawValue ?? unknown)"
         }
     }
+
+    var protocolText: String {
+        let unknown = NSLocalizedString("unknown", comment: "connection info")
+        let local = localCandidate?.protocol?.uppercased() ?? unknown
+        let localRelay = localCandidate?.relayProtocol?.uppercased() ?? unknown
+        let remote = remoteCandidate?.protocol?.uppercased() ?? unknown
+        let localText = localRelay == local || localCandidate?.relayProtocol == nil
+                        ? local
+                        : "\(local) (\(localRelay))"
+        return local == remote
+                ? localText
+                : "\(localText) / \(remote)"
+    }
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
 struct RTCIceCandidate: Codable, Equatable {
     var candidateType: RTCIceCandidateType?
     var `protocol`: String?
+    var relayProtocol: String?
     var sdpMid: String?
     var sdpMLineIndex: Int?
     var candidate: String
@@ -431,18 +399,17 @@ struct RTCIceServer: Codable, Equatable {
 }
 
 // the servers are expected in this format:
-// stuns:stun.simplex.im:443?transport=tcp
-// turns:private2:Hxuq2QxUjnhj96Zq2r4HjqHRj@turn.simplex.im:443?transport=tcp
+// stun:stun.simplex.im:443?transport=tcp
+// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
 func parseRTCIceServer(_ str: String) -> RTCIceServer? {
     var s = replaceScheme(str, "stun:")
-    s = replaceScheme(s, "stuns:")
     s = replaceScheme(s, "turn:")
     s = replaceScheme(s, "turns:")
     if let u: URL = URL(string: s),
        let scheme = u.scheme,
        let host = u.host,
        let port = u.port,
-       u.path == "" && (scheme == "stun" || scheme == "stuns" || scheme == "turn" || scheme == "turns")  {
+       u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")  {
         let query = u.query == nil || u.query == "" ? "" : "?" + (u.query ?? "")
         return RTCIceServer(
             urls: ["\(scheme):\(host):\(port)\(query)"],

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

@@ -18,11 +18,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }()
     private static let ivTagBytes: Int = 28
     private static let enableEncryption: Bool = true
-    private var chat_ctrl = getChatCtrl()
 
     struct Call {
         var connection: RTCPeerConnection
-        var iceCandidates: IceCandidates
+        var iceCandidates: [RTCIceCandidate]
         var localMedia: CallMediaType
         var localCamera: RTCVideoCapturer?
         var localVideoSource: RTCVideoSource?
@@ -34,24 +33,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         var frameDecryptor: RTCFrameDecryptor?
     }
 
-    actor IceCandidates {
-        private var candidates: [RTCIceCandidate] = []
-
-        func getAndClear() async -> [RTCIceCandidate] {
-            let cs = candidates
-            candidates = []
-            return cs
-        }
-
-        func append(_ c: RTCIceCandidate) async {
-            candidates.append(c)
-        }
-    }
-
     private let rtcAudioSession =  RTCAudioSession.sharedInstance()
-    private let audioQueue = DispatchQueue(label: "chat.simplex.app.audio")
+    private let audioQueue = DispatchQueue(label: "audio")
     private var sendCallResponse: (WVAPIMessage) async -> Void
-    var activeCall: Binding<Call?>
+    private var activeCall: Binding<Call?>
     private var localRendererAspectRatio: Binding<CGFloat?>
 
     @available(*, unavailable)
@@ -65,17 +50,17 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         self.localRendererAspectRatio = localRendererAspectRatio
         rtcAudioSession.useManualAudio = CallController.useCallKit()
         rtcAudioSession.isAudioEnabled = !CallController.useCallKit()
-        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)")
+        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)}")
         super.init()
     }
 
     let defaultIceServers: [WebRTC.RTCIceServer] = [
-        WebRTC.RTCIceServer(urlStrings: ["stuns:stun.simplex.im:443"]),
-        //WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=udp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
-        WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=tcp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
+        WebRTC.RTCIceServer(urlStrings: ["stun:stun.simplex.im:443"]),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
     ]
 
-    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
         let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
         connection.delegate = self
         createAudioSender(connection)
@@ -102,7 +87,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
         return Call(
             connection: connection,
-            iceCandidates: IceCandidates(),
+            iceCandidates: remoteIceCandidates,
             localMedia: mediaType,
             localCamera: localCamera,
             localVideoSource: localVideoSource,
@@ -159,18 +144,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             logger.debug("starting incoming call - create webrtc session")
             if activeCall.wrappedValue != nil { endCall() }
             let encryption = WebRTCClient.enableEncryption
-            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
             activeCall.wrappedValue = call
-            let (offer, error) = await call.connection.offer()
-            if let offer = offer {
-                resp = .offer(
-                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
-                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
-                    capabilities: CallCapabilities(encryption: encryption)
-                )
-                self.waitForMoreIceCandidates()
-            } else {
-                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
+            call.connection.offer { answer in
+                Task {
+                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
+                    if gotCandidates {
+                        await self.sendCallResponse(.init(
+                            corrId: nil,
+                            resp: .offer(
+                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
+                                capabilities: CallCapabilities(encryption: encryption)
+                            ),
+                            command: command)
+                        )
+                    } else {
+                        self.endCall()
+                    }
+                }
+
             }
         case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
             if activeCall.wrappedValue != nil {
@@ -179,21 +172,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .error(message: "accept: encryption is not supported")
             } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                       let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
-                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
                 activeCall.wrappedValue = call
                 let pc = call.connection
                 if let type = offer.type, let sdp = offer.sdp {
                     if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        let (answer, error) = await pc.answer()
-                        if let answer = answer {
+                        pc.answer { answer in
                             self.addIceCandidates(pc, remoteIceCandidates)
-                            resp = .answer(
-                                answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                                iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates()))
-                            )
-                            self.waitForMoreIceCandidates()
-                        } else {
-                            resp = .error(message: "answer error: \(error?.localizedDescription ?? "unknown error")")
+//                            Task {
+//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
+                            Task {
+                                await self.sendCallResponse(.init(
+                                    corrId: nil,
+                                    resp: .answer(
+                                        answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
+                                    ),
+                                    command: command)
+                                )
+                            }
+//                            }
                         }
                     } else {
                         resp = .error(message: "accept: remote description is not set")
@@ -236,7 +234,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .ok
             }
         case .end:
-            // TODO possibly, endCall should be called before returning .ok
             await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
             endCall()
         }
@@ -245,33 +242,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
     }
 
-    func getInitialIceCandidates() async -> [RTCIceCandidate] {
-        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
-        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
-        return candidates
-    }
-
-    func waitForMoreIceCandidates() {
-        Task {
-            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
-                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-                if candidates.count > 0 {
-                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
-                    await self.sendIceCandidates(candidates)
-                }
-            }
-        }
-    }
-
-    func sendIceCandidates(_ candidates: [RTCIceCandidate]) async {
-        await self.sendCallResponse(.init(
-            corrId: nil,
-            resp: .ice(iceCandidates: compressToBase64(input: encodeJSON(candidates))),
-            command: nil)
-        )
-    }
-
     func enableMedia(_ media: CallMediaType, _ enable: Bool) {
         logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
         media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
@@ -309,7 +279,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
             let isKeyFrame = unencrypted[0] & 1 == 0
             let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
-            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
             return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
         } else {
             return nil
@@ -331,10 +301,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         activeCall.remoteStream?.add(renderer)
     }
 
-    func removeRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
-        activeCall.remoteStream?.remove(renderer)
-    }
-
     func startCaptureLocalVideo(_ activeCall: Call) {
 #if targetEnvironment(simulator)
         guard
@@ -414,7 +380,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         guard let call = activeCall.wrappedValue else { return }
         logger.debug("WebRTCClient: ending the call")
         activeCall.wrappedValue = nil
-        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
         call.connection.close()
         call.connection.delegate = nil
         call.frameEncryptor?.delegate = nil
@@ -422,13 +387,12 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         audioSessionToDefaults()
     }
 
-    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
-        var t: UInt64 = 0
-        repeat {
-            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
-            t += stepMs
-            await action()
-        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
+    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
+        let startedAt = DispatchTime.now()
+        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
+            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
+        }
+        return success()
     }
 }
 
@@ -441,33 +405,25 @@ extension WebRTC.RTCPeerConnection {
             optionalConstraints: nil)
     }
 
-    func offer() async -> (RTCSessionDescription?, Error?) {
-        await withCheckedContinuation { cont in
-            offer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
+    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
+        offer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
             }
-        }
-    }
-
-    func answer() async -> (RTCSessionDescription?, Error?)  {
-        await withCheckedContinuation { cont in
-            answer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
-            }
-        }
-    }
-
-    private func processSDP(_ cont: CheckedContinuation<(RTCSessionDescription?, Error?), Never>, _ sdp: RTCSessionDescription?, _ error: Error?) {
-        if let sdp = sdp {
             self.setLocalDescription(sdp, completionHandler: { (error) in
-                if let error = error {
-                    cont.resume(returning: (nil, error))
-                } else {
-                    cont.resume(returning: (sdp, nil))
-                }
+                completion(sdp)
+            })
+        }
+    }
+
+    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
+        answer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
+            }
+            self.setLocalDescription(sdp, completionHandler: { (error) in
+                completion(sdp)
             })
-        } else {
-            cont.resume(returning: (nil, error))
         }
     }
 }
@@ -523,7 +479,6 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                 default: enableSpeaker = false
                 }
                 setSpeakerEnabledAndConfigureSession(enableSpeaker)
-            case .connected: sendConnectedEvent(connection)
             case .disconnected, .failed: endCall()
             default: do {}
             }
@@ -536,9 +491,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 
     func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
-        Task {
-            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
-        }
+        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
     }
 
     func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -553,9 +506,10 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                         lastReceivedMs lastDataReceivedMs: Int32,
                         changeReason reason: String) {
 //        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
+        sendConnectedEvent(connection, local: local, remote: remote)
     }
 
-    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
         connection.statistics { (stats: RTCStatisticsReport) in
             stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -563,25 +517,24 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                    let localId = stat.values["localCandidateId"] as? String,
                    let remoteId = stat.values["remoteCandidateId"] as? String,
                    let localStats = stats.statistics[localId],
-                   let remoteStats = stats.statistics[remoteId]
+                   let remoteStats = stats.statistics[remoteId],
+                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
+                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
                 {
                     Task {
                         await self.sendCallResponse(.init(
                             corrId: nil,
                             resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: RTCIceCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    protocol: localStats.values["protocol"] as? String,
-                                    sdpMid: nil,
-                                    sdpMLineIndex: nil,
-                                    candidate: ""
+                                localCandidate: local.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    localStats.values["protocol"] as? String,
+                                    localStats.values["relayProtocol"] as? String
                                 ),
-                                remoteCandidate: RTCIceCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
-                                    protocol: remoteStats.values["protocol"] as? String,
-                                    sdpMid: nil,
-                                    sdpMLineIndex: nil,
-                                    candidate: ""))),
+                                remoteCandidate: remote.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    remoteStats.values["protocol"] as? String,
+                                    remoteStats.values["relayProtocol"] as? String
+                                ))),
                             command: nil)
                         )
                     }
@@ -605,23 +558,9 @@ extension WebRTCClient {
                 self.rtcAudioSession.unlockForConfiguration()
             }
             do {
-                let hasExternalAudioDevice = self.rtcAudioSession.session.hasExternalAudioDevice()
-                if enabled {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.defaultToSpeaker, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.videoChat.rawValue)
-                    if hasExternalAudioDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
-                        try self.rtcAudioSession.setPreferredInput(preferred)
-                    } else {
-                        try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
-                    }
-                } else {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
-                    try self.rtcAudioSession.overrideOutputAudioPort(.none)
-                }
-                if hasExternalAudioDevice {
-                    logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
-                }
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
                 try self.rtcAudioSession.setActive(true)
                 logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
             } catch let error {
@@ -672,17 +611,6 @@ extension WebRTCClient {
     }
 }
 
-extension AVAudioSession {
-    func hasExternalAudioDevice() -> Bool {
-        availableInputs?.allSatisfy({ $0.portType == .builtInMic }) != true
-    }
-
-    func preferredInputDevice() -> AVAudioSessionPortDescription? {
-//        logger.debug("Preferred input device: \(String(describing: self.availableInputs?.filter({ $0.portType != .builtInMic })))")
-        return availableInputs?.filter({ $0.portType != .builtInMic }).last
-    }
-}
-
 struct CustomRTCSessionDescription: Codable {
     public var type: RTCSdpType?
     public var sdp: String?
@@ -706,10 +634,11 @@ extension RTCIceCandidate {
 }
 
 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
         RTCIceCandidate(
             candidateType: candidateType,
             protocol: `protocol`,
+            relayProtocol: relayProtocol,
             sdpMid: sdpMid,
             sdpMLineIndex: Int(sdpMLineIndex),
             candidate: sdp

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

@@ -25,11 +25,11 @@ struct ChatInfoToolbar: View {
             }
             ChatInfoImage(
                 chat: chat,
-                size: imageSize,
                 color: colorScheme == .dark
                         ? chatImageColorDark
                         : chatImageColorLight
             )
+            .frame(width: imageSize, height: imageSize)
             .padding(.trailing, 4)
             VStack {
                 let t = Text(cInfo.displayName).font(.headline)

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

@@ -49,7 +49,7 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
     }
 }
 
-func serverHost(_ s: String) -> String {
+private func serverHost(_ s: String) -> String {
     if let i = s.range(of: "@")?.lowerBound {
         return String(s[i...].dropFirst())
     } else {
@@ -99,12 +99,12 @@ struct ChatInfoView: View {
     @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
-    @State private var showDeleteContactActionSheet = false
     @State private var sendReceipts = SendReceipts.userDefault(true)
     @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum ChatInfoViewAlert: Identifiable {
+        case deleteContactAlert
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
@@ -114,6 +114,7 @@ struct ChatInfoView: View {
 
         var id: String {
             switch self {
+            case .deleteContactAlert: return "deleteContactAlert"
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
@@ -163,19 +164,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
-                .disabled(!contact.ready || !contact.active)
-
-                if let conn = contact.activeConn {
-                    Section {
-                        infoRow(Text(String("E2E encryption")), conn.connPQEnabled ? "Quantum resistant" : "Standard")
-                    }
-                }
+                .disabled(!contact.ready)
 
                 if let contactLink = contact.contactLink {
                     Section {
-                        SimpleXLinkQRCode(uri: contactLink)
+                        QRCode(uri: contactLink)
                         Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
+                            showShareSheet(items: [contactLink])
                         } label: {
                             Label("Share address", systemImage: "square.and.arrow.up")
                         }
@@ -186,7 +181,7 @@ struct ChatInfoView: View {
                     }
                 }
 
-                if contact.ready && contact.active {
+                if contact.ready {
                     Section("Servers") {
                         networkStatusRow()
                             .onTapGesture {
@@ -197,7 +192,8 @@ struct ChatInfoView: View {
                                 alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                !contact.ready
+                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || connStats.ratchetSyncSendProhibited
                             )
                             if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
@@ -238,6 +234,7 @@ struct ChatInfoView: View {
         }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
+            case .deleteContactAlert: return deleteContactAlert()
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
@@ -246,32 +243,13 @@ struct ChatInfoView: View {
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
-                        .destructive(Text("Delete")) { deleteContact(notify: false) },
-                        .cancel()
-                    ]
-                )
-            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { deleteContact() },
-                        .cancel()
-                    ]
-                )
-            }
-        }
     }
 
     private func contactInfoHeader() -> some View {
         VStack {
             let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
             if contact.verified {
@@ -343,7 +321,7 @@ struct ChatInfoView: View {
                 verify: { code in
                     if let r = apiVerifyContact(chat.chatInfo.apiId, connectionCode: code) {
                         let (verified, existingCode) = r
-                        contact.activeConn?.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
+                        contact.activeConn.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         DispatchQueue.main.async {
                             chat.chatInfo = .direct(contact: contact)
@@ -437,7 +415,7 @@ struct ChatInfoView: View {
 
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            showDeleteContactActionSheet = true
+            alert = .deleteContactAlert
         } label: {
             Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
@@ -453,23 +431,30 @@ struct ChatInfoView: View {
         }
     }
 
-    private func deleteContact(notify: Bool? = nil) {
-        Task {
-            do {
-                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
-                await MainActor.run {
-                    dismiss()
-                    chatModel.chatId = nil
-                    chatModel.removeChat(chat.chatInfo.id)
+    private func deleteContactAlert() -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task {
+                    do {
+                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
+                        await MainActor.run {
+                            dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
+                        }
+                    } catch let error {
+                        logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                        let a = getErrorAlert(error, "Error deleting contact")
+                        await MainActor.run {
+                            alert = .error(title: a.title, error: a.message)
+                        }
+                    }
                 }
-            } catch let error {
-                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                let a = getErrorAlert(error, "Error deleting contact")
-                await MainActor.run {
-                    alert = .error(title: a.title, error: a.message)
-                }
-            }
-        }
+            },
+            secondaryButton: .cancel()
+        )
     }
 
     private func clearChatAlert() -> Alert {

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

@@ -11,7 +11,7 @@ import SimpleXChat
 
 struct CICallItemView: View {
     @EnvironmentObject var m: ChatModel
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var status: CICallStatus
     var duration: Int
@@ -35,7 +35,9 @@ struct CICallItemView: View {
             case .error: missedCallIcon(sent).foregroundColor(.orange)
             }
 
-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }
@@ -58,7 +60,7 @@ struct CICallItemView: View {
 
 
     @ViewBuilder private func acceptCallButton() -> some View {
-        if case let .direct(contact) = chat.chatInfo {
+        if case let .direct(contact) = chatInfo {
             Button {
                 if let invitation = m.callInvitations[contact.id] {
                     CallController.shared.answerCall(invitation: invitation)

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

@@ -10,93 +10,20 @@ import SwiftUI
 import SimpleXChat
 
 struct CIChatFeatureView: View {
-    @EnvironmentObject var m: ChatModel
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
-    @Binding var revealed: Bool
     var feature: Feature
     var icon: String? = nil
     var iconColor: Color
 
     var body: some View {
-        if !revealed, let fs = mergedFeatures() {
-            HStack {
-                ForEach(fs, content: featureIconView)
-            }
-            .padding(.horizontal, 6)
-            .padding(.vertical, 6)
-        } else {
-            fullFeatureView
-        }
-    }
-
-    private struct FeatureInfo: Identifiable {
-        var icon: String
-        var scale: CGFloat
-        var color: Color
-        var param: String?
-
-        init(_ f: Feature, _ color: Color, _ param: Int?) {
-            self.icon = f.iconFilled
-            self.scale = f.iconScale
-            self.color = color
-            self.param = f.hasParam && param != nil ? timeText(param) : nil
-        }
-
-        var id: String {
-            "\(icon) \(color) \(param ?? "")"
-        }
-    }
-
-    private func mergedFeatures() -> [FeatureInfo]? {
-        var fs: [FeatureInfo] = []
-        var icons: Set<String> = []
-        if var i = m.getChatItemIndex(chatItem) {
-            while i < m.reversedChatItems.count,
-                  let f = featureInfo(m.reversedChatItems[i]) {
-                if !icons.contains(f.icon) {
-                    fs.insert(f, at: 0)
-                    icons.insert(f.icon)
-                }
-                i += 1
-            }
-        }
-        return fs.count > 1 ? fs : nil
-    }
-
-    private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
-        switch ci.content {
-        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
-        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
-        case let .rcvGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor, param)
-        case let .sndGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor, param)
-        default: nil
-        }
-    }
-
-    @ViewBuilder private func featureIconView(_ f: FeatureInfo) -> some View {
-        let i = Image(systemName: f.icon)
-            .foregroundColor(f.color)
-            .scaleEffect(f.scale)
-        if let param = f.param {
-            HStack {
-                i
-                chatEventText(Text(param)).lineLimit(1)
-            }
-        } else {
-            i
-        }
-    }
-
-    private var fullFeatureView: some View {
         HStack(alignment: .bottom, spacing: 4) {
             Image(systemName: icon ?? feature.iconFilled)
                 .foregroundColor(iconColor)
                 .scaleEffect(feature.iconScale)
             chatEventText(chatItem)
         }
-        .padding(.horizontal, 6)
-        .padding(.vertical, 4)
+        .padding(.leading, 6)
+        .padding(.bottom, 6)
         .textSelection(.disabled)
     }
 }
@@ -104,6 +31,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
     static var previews: some View {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chat: Chat.sampleData, chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
     }
 }

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

@@ -13,11 +13,12 @@ struct CIEventView: View {
     var eventText: Text
 
     var body: some View {
-        eventText
-        .padding(.horizontal, 6)
-        .padding(.vertical, 4)
+        HStack(alignment: .bottom, spacing: 0) {
+            eventText
+        }
+        .padding(.leading, 6)
+        .padding(.bottom, 6)
         .textSelection(.disabled)
-        .lineLimit(4)
     }
 }
 

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFeaturePreferenceView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var feature: ChatFeature
     var allowed: FeatureAllowed
@@ -80,6 +80,7 @@ struct CIFeaturePreferenceView_Previews: PreviewProvider {
             quotedItem: nil,
             file: nil
         )
-        CIFeaturePreferenceView(chat: Chat.sampleData, chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
+        CIFeaturePreferenceView(chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
+            .environmentObject(Chat.sampleData)
     }
 }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFileView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let file: CIFile?
     let edited: Bool
@@ -52,7 +51,7 @@ struct CIFileView: View {
     private var itemInteractive: Bool {
         if let file = file {
             switch (file.fileStatus) {
-            case .sndStored: return file.fileProtocol == .local
+            case .sndStored: return false
             case .sndTransfer: return false
             case .sndComplete: return false
             case .sndCancelled: return false
@@ -60,7 +59,6 @@ struct CIFileView: View {
             case .rcvInvitation: return true
             case .rcvAccepted: return true
             case .rcvTransfer: return false
-            case .rcvAborted: return true
             case .rcvComplete: return true
             case .rcvCancelled: return false
             case .rcvError: return false
@@ -70,16 +68,24 @@ struct CIFileView: View {
         return false
     }
 
+    private func fileSizeValid() -> Bool {
+        if let file = file {
+            return file.fileSize <= getMaxFileSize(file.fileProtocol)
+        }
+        return false
+    }
+
     private func fileAction() {
         logger.debug("CIFileView fileAction")
         if let file = file {
             switch (file.fileStatus) {
-            case .rcvInvitation, .rcvAborted:
-                if fileSizeValid(file) {
+            case .rcvInvitation:
+                if fileSizeValid() {
                     Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
-                        if let user = m.currentUser {
-                            await receiveFile(user: user, fileId: file.fileId)
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
+                        if let user = ChatModel.shared.currentUser {
+                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
+                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                         }
                     }
                 } else {
@@ -101,18 +107,12 @@ struct CIFileView: View {
                         title: "Waiting for file",
                         message: "File will be received when your contact is online, please wait or check later!"
                     )
-                case .local: ()
                 }
             case .rcvComplete:
                 logger.debug("CIFileView fileAction - in .rcvComplete")
                 if let fileSource = getLoadedFileSource(file) {
                     saveCryptoFile(fileSource)
                 }
-            case .sndStored:
-                logger.debug("CIFileView fileAction - in .sndStored")
-                if file.fileProtocol == .local, let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
-                }
             default: break
             }
         }
@@ -125,19 +125,17 @@ struct CIFileView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: fileIcon("doc.fill")
-                case .local: fileIcon("doc.fill")
                 }
             case let .sndTransfer(sndProgress, sndTotal):
                 switch file.fileProtocol {
                 case .xftp: progressCircle(sndProgress, sndTotal)
                 case .smp: progressView()
-                case .local: EmptyView()
                 }
             case .sndComplete: fileIcon("doc.fill", innerIcon: "checkmark", innerIconSize: 10)
             case .sndCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .sndError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvInvitation:
-                if fileSizeValid(file) {
+                if fileSizeValid() {
                     fileIcon("arrow.down.doc.fill", color: .accentColor)
                 } else {
                     fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
@@ -149,8 +147,6 @@ struct CIFileView: View {
                 } else {
                     progressView()
                 }
-            case .rcvAborted:
-                fileIcon("doc.fill", color: .accentColor, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
@@ -197,13 +193,6 @@ struct CIFileView: View {
     }
 }
 
-func fileSizeValid(_ file: CIFile?) -> Bool {
-    if let file = file {
-        return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-}
-
 func saveCryptoFile(_ fileSource: CryptoFile) {
     if let cfArgs = fileSource.cryptoArgs {
         let url = getAppFilePath(fileSource.filePath)
@@ -245,17 +234,18 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -12,60 +12,42 @@ import SimpleXChat
 struct CIGroupInvitationView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var groupInvitation: CIGroupInvitation
     var memberRole: GroupMemberRole
     var chatIncognito: Bool = false
     @State private var frameWidth: CGFloat = 0
-    @State private var inProgress = false
-    @State private var progressByTimeout = false
-
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
 
     var body: some View {
         let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
         let v = ZStack(alignment: .bottomTrailing) {
-            ZStack {
-                VStack(alignment: .leading) {
-                    groupInfoView(action)
-                        .padding(.horizontal, 2)
-                        .padding(.top, 8)
-                        .padding(.bottom, 6)
+            VStack(alignment: .leading) {
+                groupInfoView(action)
+                .padding(.horizontal, 2)
+                .padding(.top, 8)
+                .padding(.bottom, 6)
+                .overlay(DetermineWidth())
+
+                Divider().frame(width: frameWidth)
+
+                if action {
+                    groupInvitationText()
                         .overlay(DetermineWidth())
-
-                    Divider().frame(width: frameWidth)
-
-                    if action {
-                        VStack(alignment: .leading, spacing: 2) {
-                            groupInvitationText()
-                                .overlay(DetermineWidth())
-                            (
-                                Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                                    .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
-                                    .font(.callout)
-                                + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
-                            )
-                            .overlay(DetermineWidth())
-                        }
-                    } else {
-                        (
-                            groupInvitationText()
-                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
-                        )
+                    Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                        .foregroundColor(chatIncognito ? .indigo : .accentColor)
+                        .font(.callout)
+                        .padding(.trailing, 60)
+                        .overlay(DetermineWidth())
+                } else {
+                    groupInvitationText()
+                        .padding(.trailing, 60)
                         .overlay(DetermineWidth())
-                    }
-                }
-                .padding(.bottom, 2)
-
-                if progressByTimeout {
-                    ProgressView().scaleEffect(2)
                 }
             }
-
-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            .padding(.bottom, 2)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
@@ -73,24 +55,11 @@ struct CIGroupInvitationView: View {
         .cornerRadius(18)
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
-        .onChange(of: inProgress) { inProgress in
-            if inProgress {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    progressByTimeout = inProgress
-                }
-            } else {
-                progressByTimeout = false
-            }
-        }
 
         if action {
             v.onTapGesture {
-                inProgress = true
-                joinGroup(groupInvitation.groupId) {
-                    await MainActor.run { inProgress = false }
-                }
+                joinGroup(groupInvitation.groupId)
             }
-            .disabled(inProgress)
         } else {
             v
         }
@@ -98,7 +67,7 @@ struct CIGroupInvitationView: View {
 
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
-        if action && !inProgress {
+        if action {
             color = chatIncognito ? .indigo : .accentColor
         } else {
             color = Color(uiColor: .tertiaryLabel)
@@ -107,9 +76,9 @@ struct CIGroupInvitationView: View {
             ProfileImage(
                 imageStr: groupInvitation.groupProfile.image,
                 iconName: "person.2.circle.fill",
-                size: 44,
                 color: color
             )
+            .frame(width: 44, height: 44)
             .padding(.trailing, 4)
             VStack(alignment: .leading) {
                 let p = groupInvitation.groupProfile
@@ -122,7 +91,7 @@ struct CIGroupInvitationView: View {
         }
     }
 
-    private func groupInvitationText() -> Text {
+    private func groupInvitationText() -> some View {
         Text(groupInvitationStr())
             .font(.callout)
     }
@@ -144,8 +113,8 @@ struct CIGroupInvitationView: View {
 struct CIGroupInvitationView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
         }
     }
 }

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

@@ -10,13 +10,13 @@ import SwiftUI
 import SimpleXChat
 
 struct CIImageView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let chatItem: ChatItem
     let image: String
     let maxWidth: CGFloat
     @Binding var imgWidth: CGFloat?
     @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
     @State private var showFullScreenImage = false
 
     var body: some View {
@@ -28,19 +28,16 @@ struct CIImageView: View {
                     FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
                 }
                 .onTapGesture { showFullScreenImage = true }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenImage = false
-                }
             } else if let data = Data(base64Encoded: dropImagePrefix(image)),
                       let uiImage = UIImage(data: data) {
                 imageView(uiImage)
                     .onTapGesture {
                         if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                 Task {
-                                    if let user = m.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId)
+                                    if let user = ChatModel.shared.currentUser {
+                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                     }
                                 }
                             case .rcvAccepted:
@@ -55,7 +52,6 @@ struct CIImageView: View {
                                         title: "Waiting for image",
                                         message: "Image will be received when your contact is online, please wait or check later!"
                                     )
-                                case .local: ()
                                 }
                             case .rcvTransfer: () // ?
                             case .rcvComplete: () // ?
@@ -69,14 +65,14 @@ struct CIImageView: View {
     }
 
     private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : img.imageData == nil ? .infinity : maxWidth
         DispatchQueue.main.async { imgWidth = w }
         return ZStack(alignment: .topTrailing) {
             if img.imageData == nil {
                 Image(uiImage: img)
                         .resizable()
                         .scaledToFit()
-                        .frame(width: w)
+                        .frame(maxWidth: w)
             } else {
                 SwiftyGif(image: img)
                         .frame(width: w, height: w * img.size.height / img.size.width)
@@ -93,7 +89,6 @@ struct CIImageView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: EmptyView()
-                case .local: EmptyView()
                 }
             case .sndTransfer: progressView()
             case .sndComplete: fileIcon("checkmark", 10, 13)
@@ -102,7 +97,6 @@ struct CIImageView: View {
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case .rcvTransfer: progressView()
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
@@ -116,7 +110,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
             .padding(padding)
     }
 

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMemberCreatedContactView: View {
-    @EnvironmentObject var m: ChatModel
     var chatItem: ChatItem
     
     var body: some View {
@@ -22,7 +21,7 @@ struct CIMemberCreatedContactView: View {
                         .onTapGesture {
                             dismissAllSheets(animated: true)
                             DispatchQueue.main.async {
-                                m.chatId = "@\(contactId)"
+                                ChatModel.shared.chatId = "@\(contactId)"
                             }
                         }
                 } else {

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

@@ -10,14 +10,10 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMetaView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
     var paleMetaColor = Color(UIColor.tertiaryLabel)
-    var showStatus = true
-    var showEdited = true
-
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
 
     var body: some View {
         if chatItem.isDeletedContent {
@@ -29,24 +25,24 @@ struct CIMetaView: View {
             switch meta.itemStatus {
             case let .sndSent(sndProgress):
                 switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
                 }
             case let .sndRcvd(_, sndProgress):
                 switch sndProgress {
                 case .complete:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
                     }
                 case .partial:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
                     }
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
             }
         }
     }
@@ -58,19 +54,9 @@ enum SentCheckmark {
     case rcvd2
 }
 
-func ciMetaText(
-    _ meta: CIMeta,
-    chatTTL: Int?,
-    encrypted: Bool?,
-    color: Color = .clear,
-    transparent: Bool = false,
-    sent: SentCheckmark? = nil,
-    showStatus: Bool = true,
-    showEdited: Bool = true,
-    showViaProxy: Bool
-) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
-    if showEdited, meta.itemEdited {
+    if meta.itemEdited {
         r = r + statusIconText("pencil", color)
     }
     if meta.disappearing {
@@ -81,24 +67,19 @@ func ciMetaText(
         }
         r = r + Text(" ")
     }
-    if showViaProxy, meta.sentViaProxy == true {
-        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
-    }
-    if showStatus {
-        if let (icon, statusColor) = meta.statusIcon(color) {
-            let t = Text(Image(systemName: icon)).font(.caption2)
-            let gap = Text("  ").kerning(-1.25)
-            let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
-            switch sent {
-            case nil: r = r + t1
-            case .sent: r = r + t1 + gap
-            case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
-            case .rcvd2: r = r + gap + t1
-            }
-            r = r + Text(" ")
-        } else if !meta.disappearing {
-            r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
+    if let (icon, statusColor) = meta.statusIcon(color) {
+        let t = Text(Image(systemName: icon)).font(.caption2)
+        let gap = Text("  ").kerning(-1.25)
+        let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
+        switch sent {
+        case nil: r = r + t1
+        case .sent: r = r + t1 + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd2: r = r + gap + t1
         }
+        r = r + Text(" ")
+    } else if !meta.disappearing {
+        r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
     if let enc = encrypted {
         r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
@@ -114,14 +95,15 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -12,15 +12,12 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
 
 struct CIRcvDecryptionError: View {
-    @EnvironmentObject var m: ChatModel
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
     @State private var alert: CIRcvDecryptionErrorAlert?
 
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
     enum CIRcvDecryptionErrorAlert: Identifiable {
         case syncAllowedAlert(_ syncConnection: () -> Void)
         case syncNotSupportedContactAlert
@@ -48,7 +45,7 @@ struct CIRcvDecryptionError: View {
                     do {
                         let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                         if let s = stats {
-                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
+                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
                         }
                     } catch let error {
                         logger.error("apiGroupMemberInfo error: \(responseError(error))")
@@ -68,7 +65,7 @@ struct CIRcvDecryptionError: View {
 
     @ViewBuilder private func viewBody() -> some View {
         if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn?.connectionStats {
+           let contactStats = contact.activeConn.connectionStats {
             if contactStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncContactConnection(contact) }
@@ -82,8 +79,8 @@ struct CIRcvDecryptionError: View {
             }
         } else if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let mem = m.getGroupMember(groupMember.groupMemberId),
-                  let memberStats = mem.wrapped.activeConn?.connectionStats {
+                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
+                  let memberStats = modelMember.activeConn?.connectionStats {
             if memberStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
@@ -121,11 +118,11 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -142,10 +139,10 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -167,8 +164,6 @@ struct CIRcvDecryptionError: View {
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
         case .other:
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
-        case .ratchetSync:
-            message = Text("Encryption re-negotiation failed.")
         }
         return message
     }
@@ -178,7 +173,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
                 await MainActor.run {
-                    m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
                 }
             } catch let error {
                 logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
@@ -195,7 +190,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let stats = try apiSyncContactRatchet(contact.apiId, false)
                 await MainActor.run {
-                    m.updateContactConnectionStats(contact, stats)
+                    ChatModel.shared.updateContactConnectionStats(contact, stats)
                 }
             } catch let error {
                 logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")

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

@@ -9,10 +9,8 @@
 import SwiftUI
 import AVKit
 import SimpleXChat
-import Combine
 
 struct CIVideoView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     private let chatItem: ChatItem
     private let image: String
@@ -26,12 +24,9 @@ struct CIVideoView: View {
     @State private var player: AVPlayer?
     @State private var fullPlayer: AVPlayer?
     @State private var url: URL?
-    @State private var urlDecrypted: URL?
-    @State private var decryptionInProgress: Bool = false
     @State private var showFullScreenPlayer = false
     @State private var timeObserver: Any? = nil
     @State private var fullScreenTimeObserver: Any? = nil
-    @State private var publisher: AnyCancellable? = nil
 
     init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
         self.chatItem = chatItem
@@ -41,12 +36,8 @@ struct CIVideoView: View {
         self._videoWidth = videoWidth
         self.scrollProxy = scrollProxy
         if let url = getLoadedVideo(chatItem.file) {
-            let decrypted = chatItem.file?.fileSource?.cryptoArgs == nil ? url : chatItem.file?.fileSource?.decryptedGet()
-            self._urlDecrypted = State(initialValue: decrypted)
-            if let decrypted = decrypted {
-                self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(decrypted, false))
-                self._fullPlayer = State(initialValue: AVPlayer(url: decrypted))
-            }
+            self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
+            self._fullPlayer = State(initialValue: AVPlayer(url: url))
             self._url = State(initialValue: url)
         }
         if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -59,18 +50,16 @@ struct CIVideoView: View {
         let file = chatItem.file
         ZStack {
             ZStack(alignment: .topLeading) {
-                if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
-                    videoView(player, decrypted, file, preview, duration)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
-                    videoViewEncrypted(file, defaultPreview, duration)
+                if let file = file, let preview = preview, let player = player, let url = url {
+                    videoView(player, url, file, preview, duration)
                 } else if let data = Data(base64Encoded: dropImagePrefix(image)),
                           let uiImage = UIImage(data: data) {
                     imageView(uiImage)
                     .onTapGesture {
                         if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
-                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                            case .rcvInvitation:
+                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
                                 case .xftp:
@@ -83,7 +72,6 @@ struct CIVideoView: View {
                                         title: "Waiting for video",
                                         message: "Video will be received when your contact is online, please wait or check later!"
                                     )
-                                case .local: ()
                                 }
                             case .rcvTransfer: () // ?
                             case .rcvComplete: () // ?
@@ -95,9 +83,9 @@ struct CIVideoView: View {
                 }
                 durationProgress()
             }
-            if let file = file, showDownloadButton(file.fileStatus) {
+            if let file = file, case .rcvInvitation = file.fileStatus {
                 Button {
-                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                 } label: {
                     playPauseIcon("play.fill")
                 }
@@ -105,60 +93,15 @@ struct CIVideoView: View {
         }
     }
 
-    private func showDownloadButton(_ fileStatus: CIFileStatus) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
-    }
-
-    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
-        return ZStack(alignment: .topTrailing) {
-            ZStack(alignment: .center) {
-                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
-                imageView(defaultPreview)
-                .fullScreenCover(isPresented: $showFullScreenPlayer) {
-                    if let decrypted = urlDecrypted {
-                        fullScreenPlayer(decrypted)
-                    }
-                }
-                .onTapGesture {
-                    decrypt(file: file) {
-                        showFullScreenPlayer = urlDecrypted != nil
-                    }
-                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
-                if !decryptionInProgress {
-                    Button {
-                        decrypt(file: file) {
-                            if urlDecrypted != nil {
-                                videoPlaying = true
-                                player?.play()
-                            }
-                        }
-                    } label: {
-                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                    }
-                    .disabled(!canBePlayed)
-                } else {
-                    videoDecryptionProgress()
-                }
-            }
-        }
-    }
-
     private func videoView(_ player: AVPlayer, _ url: URL, _ file: CIFile, _ preview: UIImage, _ duration: Int) -> some View {
         let w = preview.size.width <= preview.size.height ? maxWidth * 0.75 : maxWidth
         DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             ZStack(alignment: .center) {
-                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
+                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                 VideoPlayerView(player: player, url: url, showControls: false)
                 .frame(width: w, height: w * preview.size.height / preview.size.width)
-                .onChange(of: m.stopPreviousRecPlay) { playingUrl in
+                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
                     if playingUrl != url {
                         player.pause()
                         videoPlaying = false
@@ -179,12 +122,9 @@ struct CIVideoView: View {
                     default: ()
                     }
                 }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
                 if !videoPlaying {
                     Button {
-                        m.stopPreviousRecPlay = url
+                        ChatModel.shared.stopPreviousRecPlay = url
                         player.play()
                     } label: {
                         playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
@@ -216,16 +156,6 @@ struct CIVideoView: View {
         .clipShape(Circle())
     }
 
-    private func videoDecryptionProgress(_ color: Color = .white) -> some View {
-        ProgressView()
-            .progressViewStyle(.circular)
-            .frame(width: 12, height: 12)
-            .tint(color)
-            .frame(width: 40, height: 40)
-            .background(Color.black.opacity(0.35))
-            .clipShape(Circle())
-    }
-
     private func durationProgress() -> some View {
         HStack {
             Text("\(durationText(videoPlaying ? progress : duration))")
@@ -251,13 +181,13 @@ struct CIVideoView: View {
     }
 
     private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : .infinity
         DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             Image(uiImage: img)
             .resizable()
             .scaledToFit()
-            .frame(width: w)
+            .frame(maxWidth: w)
             loadingIndicator()
         }
     }
@@ -269,13 +199,11 @@ struct CIVideoView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: EmptyView()
-                case .local: EmptyView()
                 }
             case let .sndTransfer(sndProgress, sndTotal):
                 switch file.fileProtocol {
                 case .xftp: progressCircle(sndProgress, sndTotal)
                 case .smp: progressView()
-                case .local: EmptyView()
                 }
             case .sndComplete: fileIcon("checkmark", 10, 13)
             case .sndCancelled: fileIcon("xmark", 10, 13)
@@ -288,7 +216,6 @@ struct CIVideoView: View {
                 } else {
                     progressView()
                 }
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
@@ -327,10 +254,10 @@ struct CIVideoView: View {
     }
 
     // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
         Task {
-            if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false, false)
+            if let user = ChatModel.shared.currentUser {
+                await receiveFile(user, file.fileId, encrypted, false)
             }
         }
     }
@@ -363,17 +290,9 @@ struct CIVideoView: View {
             )
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    m.stopPreviousRecPlay = url
+                    ChatModel.shared.stopPreviousRecPlay = url
                     if let player = fullPlayer {
                         player.play()
-                        var played = false
-                        publisher = player.publisher(for: \.timeControlStatus).sink { status in
-                            if played || status == .playing {
-                                AppDelegate.keepScreenOn(status == .playing)
-                                AudioPlayer.changeAudioSession(status == .playing)
-                            }
-                            played = status == .playing
-                        }
                         fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
                             player.seek(to: CMTime.zero)
                             player.play()
@@ -388,23 +307,6 @@ struct CIVideoView: View {
                 fullScreenTimeObserver = nil
                 fullPlayer?.pause()
                 fullPlayer?.seek(to: CMTime.zero)
-                publisher?.cancel()
-            }
-        }
-    }
-
-    private func decrypt(file: CIFile, completed: (() -> Void)? = nil) {
-        if decryptionInProgress { return }
-        decryptionInProgress = true
-        Task {
-            urlDecrypted = await file.fileSource?.decryptedGetOrCreate(&ChatModel.shared.filesToDelete)
-            await MainActor.run {
-                if let decrypted = urlDecrypted {
-                    player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                    fullPlayer = AVPlayer(url: decrypted)
-                }
-                decryptionInProgress = true
-                completed?()
             }
         }
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIVoiceView: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
@@ -92,7 +91,7 @@ struct CIVoiceView: View {
     }
 
     private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem)
+        CIMetaView(chatItem: chatItem)
     }
 }
 
@@ -139,10 +138,9 @@ struct VoiceMessagePlayer: View {
                 case .sndComplete: playbackButton()
                 case .sndCancelled: playbackButton()
                 case .sndError: playbackButton()
-                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
+                case .rcvInvitation: downloadButton(recordingFile)
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
-                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                 case .rcvComplete: playbackButton()
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -218,15 +216,15 @@ struct VoiceMessagePlayer: View {
         }
     }
 
-    private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
+    private func downloadButton(_ recordingFile: CIFile) -> some View {
         Button {
             Task {
-                if let user = chatModel.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                if let user = ChatModel.shared.currentUser {
+                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                 }
             }
         } label: {
-            playPauseIcon(icon)
+            playPauseIcon("play.fill")
         }
     }
 
@@ -286,7 +284,6 @@ struct CIVoiceView_Previews: PreviewProvider {
         )
         Group {
             CIVoiceView(
-                chat: Chat.sampleData,
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
@@ -295,11 +292,12 @@ struct CIVoiceView_Previews: PreviewProvider {
                 playbackTime: .constant(TimeInterval(20)),
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct DeletedItemView: View {
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -19,7 +18,7 @@ struct DeletedItemView: View {
             Text(chatItem.content.text)
                 .foregroundColor(.secondary)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -33,8 +32,8 @@ struct DeletedItemView: View {
 struct DeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct EmojiItemView: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -18,7 +17,7 @@ struct EmojiItemView: View {
             emojiText(chatItem.content.text)
                 .padding(.top, 8)
                 .padding(.horizontal, 6)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }
@@ -33,8 +32,8 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
-            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
+            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
         }
         .previewLayout(.fixed(width: 360, height: 70))
     }

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

@@ -88,12 +88,13 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -150,7 +150,7 @@ struct FullScreenMediaView: View {
 
     private func startPlayerAndNotify() {
         if let player = player {
-            m.stopPreviousRecPlay = url
+            ChatModel.shared.stopPreviousRecPlay = url
             player.play()
         }
     }

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

@@ -10,12 +10,11 @@ import SwiftUI
 import SimpleXChat
 
 struct IntegrityErrorItemView: View {
-    @ObservedObject var chat: Chat
     var msgError: MsgErrorType
     var chatItem: ChatItem
 
     var body: some View {
-        CIMsgError(chat: chat, chatItem: chatItem) {
+        CIMsgError(chatItem: chatItem) {
             switch msgError {
             case .msgSkipped:
                 AlertManager.shared.showAlertMsg(
@@ -53,7 +52,6 @@ struct IntegrityErrorItemView: View {
 }
 
 struct CIMsgError: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var onTap: () -> Void
 
@@ -62,7 +60,7 @@ struct CIMsgError: View {
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -76,6 +74,6 @@ struct CIMsgError: View {
 
 struct IntegrityErrorItemView_Previews: PreviewProvider {
     static var previews: some View {
-        IntegrityErrorItemView(chat: Chat.sampleData, msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
+        IntegrityErrorItemView(msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
     }
 }

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

@@ -10,77 +10,39 @@ import SwiftUI
 import SimpleXChat
 
 struct MarkedDeletedItemView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
-    @Binding var revealed: Bool
 
     var body: some View {
-        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .padding(.horizontal, 12)
+        HStack(alignment: .bottom, spacing: 0) {
+            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
+                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
+            } else {
+                markedDeletedText("marked deleted")
+            }
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .padding(.leading, 12)
         .padding(.vertical, 6)
         .background(chatItemFrameColor(chatItem, colorScheme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }
 
-    var mergedMarkedDeletedText: LocalizedStringKey {
-        if !revealed,
-           let ciCategory = chatItem.mergeCategory,
-           var i = m.getChatItemIndex(chatItem) {
-            var moderated = 0
-            var blocked = 0
-            var blockedByAdmin = 0
-            var deleted = 0
-            var moderatedBy: Set<String> = []
-            while i < m.reversedChatItems.count,
-                  let ci = .some(m.reversedChatItems[i]),
-                  ci.mergeCategory == ciCategory,
-                  let itemDeleted = ci.meta.itemDeleted {
-                switch itemDeleted {
-                case let .moderated(_, byGroupMember):
-                    moderated += 1
-                    moderatedBy.insert(byGroupMember.displayName)
-                case .blocked: blocked += 1
-                case .blockedByAdmin: blockedByAdmin += 1
-                case .deleted: deleted += 1
-                }
-                i += 1
-            }
-            let total = moderated + blocked + blockedByAdmin + deleted
-            return total <= 1
-            ? markedDeletedText
-            : total == moderated
-            ? "\(total) messages moderated by \(moderatedBy.joined(separator: ", "))"
-            : total == blockedByAdmin
-            ? "\(total) messages blocked by admin"
-            : total == blocked + blockedByAdmin
-            ? "\(total) messages blocked"
-            : "\(total) messages marked deleted"
-        } else {
-            return markedDeletedText
-        }
-    }
-
-    // same texts are in markedDeletedText in ChatPreviewView, but it returns String;
-    // can be refactored into a single function if functions calling these are changed to return same type
-    var markedDeletedText: LocalizedStringKey {
-        switch chatItem.meta.itemDeleted {
-        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
-        case .blocked: "blocked"
-        case .blockedByAdmin: "blocked by admin"
-        case .deleted, nil: "marked deleted"
-        }
+    func markedDeletedText(_ s: LocalizedStringKey) -> some View {
+        Text(s)
+            .font(.caption)
+            .foregroundColor(.secondary)
+            .italic()
+            .lineLimit(1)
     }
 }
 
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -9,7 +9,7 @@
 import SwiftUI
 import SimpleXChat
 
-let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
+private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
 
 private let noTyping = Text("   ")
 
@@ -25,18 +25,15 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 }
 
 struct MsgContentView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
     var meta: CIMeta? = nil
     var rightToLeft = false
-    var showSecrets: Bool
     @State private var typingIdx = 0
     @State private var timer: Timer?
 
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
     var body: some View {
         if meta?.isLive == true {
             msgContentView()
@@ -65,7 +62,7 @@ struct MsgContentView: View {
     }
 
     private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets)
+        var v = messageText(text, formattedText, sender)
         if let mt = meta {
             if mt.isLive {
                 v = v + typingIndicator(mt.recent)
@@ -83,18 +80,18 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
     }
 }
 
-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
     let s = text
     var res: Text
     if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
-        res = formatText(ft[0], preview, showSecret: showSecrets)
+        res = formatText(ft[0], preview)
         var i = 1
         while i < ft.count {
-            res = res + formatText(ft[i], preview, showSecret: showSecrets)
+            res = res + formatText(ft[i], preview)
             i = i + 1
         }
     } else {
@@ -113,7 +110,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
     }
 }
 
-private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool) -> Text {
+private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
     let t = ft.text
     if let f = ft.format {
         switch (f) {
@@ -121,20 +118,16 @@ private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool)
         case .italic: return Text(t).italic()
         case .strikeThrough: return Text(t).strikethrough()
         case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return
-            showSecret
-            ? Text(t)
-            : Text(AttributedString(t, attributes: AttributeContainer([
-                .foregroundColor: UIColor.clear as Any,
-                .backgroundColor: UIColor.secondarySystemFill as Any
-            ])))
+        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
         case let .colored(color): return Text(t).foregroundColor(color.uiColor)
         case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, trustedUri, smpHosts):
             switch privacySimplexLinkModeDefault.get() {
             case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
             case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return linkText(t, simplexUri, preview, prefix: "")
+            case .browser: return trustedUri
+                                    ? linkText(t, t, preview, prefix: "")
+                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
             }
         case .email: return linkText(t, t, preview, prefix: "mailto:")
         case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
@@ -153,7 +146,7 @@ private func linkText(_ s: String, _ link: String, _ preview: Bool, prefix: Stri
     ]))).underline()
 }
 
-func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
+private func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
     linkType.description + " " + "(via \(smpHosts.first ?? "?"))"
 }
 
@@ -161,12 +154,10 @@ struct MsgContentView_Previews: PreviewProvider {
     static var previews: some View {
         let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
         return MsgContentView(
-            chat: Chat.sampleData,
             text: chatItem.text,
             formattedText: chatItem.formattedText,
             sender: chatItem.memberDisplayName,
-            meta: chatItem.meta,
-            showSecrets: false
+            meta: chatItem.meta
         )
         .environmentObject(Chat.sampleData)
     }

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

@@ -1,151 +0,0 @@
-//
-//  ChatItemForwardingView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 12.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ChatItemForwardingView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
-
-    var ci: ChatItem
-    var fromChatInfo: ChatInfo
-    @Binding var composeState: ComposeState
-
-    @State private var searchText: String = ""
-    @FocusState private var searchFocused
-
-    var body: some View {
-        NavigationView {
-            forwardListView()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarLeading) {
-                        Button("Cancel") {
-                            dismiss()
-                        }
-                    }
-                    ToolbarItem(placement: .principal) {
-                        Text("Forward")
-                            .bold()
-                    }
-                }
-        }
-    }
-
-    @ViewBuilder private func forwardListView() -> some View {
-        VStack(alignment: .leading) {
-            let chatsToForwardTo = filterChatsToForwardTo()
-            if !chatsToForwardTo.isEmpty {
-                ScrollView {
-                    LazyVStack(alignment: .leading, spacing: 8) {
-                        searchFieldView(text: $searchText, focussed: $searchFocused)
-                            .padding(.leading, 2)
-                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                        let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { filterChatSearched($0, s) }
-                        ForEach(chats) { chat in
-                            Divider()
-                            forwardListNavLinkView(chat)
-                                .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
-                        }
-                    }
-                    .padding(.horizontal)
-                    .padding(.vertical, 8)
-                    .background(Color(uiColor: .systemBackground))
-                    .cornerRadius(12)
-                    .padding(.horizontal)
-                }
-                .background(Color(.systemGroupedBackground))
-            } else {
-                emptyList()
-            }
-        }
-    }
-
-    private func filterChatsToForwardTo() -> [Chat] {
-        var filteredChats = chatModel.chats.filter({ canForwardToChat($0) })
-        if let index = filteredChats.firstIndex(where: { $0.chatInfo.chatType == .local }) {
-            let privateNotes = filteredChats.remove(at: index)
-            filteredChats.insert(privateNotes, at: 0)
-        }
-        return filteredChats
-    }
-
-    private func filterChatSearched(_ chat: Chat, _ searchStr: String) -> Bool {
-        let cInfo = chat.chatInfo
-        return switch cInfo {
-        case let .direct(contact):
-            viewNameContains(cInfo, searchStr) ||
-            contact.profile.displayName.localizedLowercase.contains(searchStr) ||
-            contact.fullName.localizedLowercase.contains(searchStr)
-        default:
-            viewNameContains(cInfo, searchStr)
-        }
-
-        func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
-            cInfo.chatViewName.localizedLowercase.contains(s)
-        }
-    }
-
-    private func canForwardToChat(_ chat: Chat) -> Bool {
-        switch chat.chatInfo {
-        case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
-        case let .group(groupInfo): groupInfo.sendMsgEnabled
-        case let .local(noteFolder): noteFolder.sendMsgEnabled
-        case .contactRequest: false
-        case .contactConnection: false
-        case .invalidJSON: false
-        }
-    }
-
-    private func emptyList() -> some View {
-        Text("No filtered chats")
-            .foregroundColor(.secondary)
-            .frame(maxWidth: .infinity)
-    }
-
-    @ViewBuilder private func forwardListNavLinkView(_ chat: Chat) -> some View {
-        Button {
-            dismiss()
-            if chat.id == fromChatInfo.id {
-                 composeState = ComposeState(
-                     message: composeState.message,
-                     preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                     contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
-                 )
-            } else {
-                composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                chatModel.chatId = chat.id
-            }
-        } label: {
-            HStack {
-                ChatInfoImage(chat: chat, size: 30)
-                    .padding(.trailing, 2)
-                Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(.primary)
-                    .lineLimit(1)
-                if chat.chatInfo.incognito {
-                    Spacer()
-                    Image(systemName: "theatermasks")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(.secondary)
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-}
-
-#Preview {
-    ChatItemForwardingView(
-        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
-        fromChatInfo: .direct(contact: Contact.sampleData),
-        composeState: Binding.constant(ComposeState(message: "hello"))
-    )
-}

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

@@ -10,8 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemInfoView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
     @Environment(\.colorScheme) var colorScheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
@@ -22,7 +20,6 @@ struct ChatItemInfoView: View {
     enum CIInfoTab {
         case history
         case quote
-        case forwarded
         case delivery
     }
 
@@ -55,9 +52,7 @@ struct ChatItemInfoView: View {
     }
 
     private var title: String {
-        ci.localNote
-        ? NSLocalizedString("Saved message", comment: "message info title")
-        : ci.chatDir.sent
+        ci.chatDir.sent
         ? NSLocalizedString("Sent message", comment: "message info title")
         : NSLocalizedString("Received message", comment: "message info title")
     }
@@ -70,20 +65,9 @@ struct ChatItemInfoView: View {
         if ci.quotedItem != nil {
             numTabs += 1
         }
-        if chatItemInfo?.forwardedFromChatItem != nil {
-            numTabs += 1
-        }
         return numTabs
     }
 
-    private var local: Bool {
-        switch ci.chatDir {
-        case .localSnd: true
-        case .localRcv: true
-        default: false
-        }
-    }
-
     @ViewBuilder private func itemInfoView() -> some View {
         if numTabs > 1 {
             TabView(selection: $selection) {
@@ -106,13 +90,6 @@ struct ChatItemInfoView: View {
                         }
                         .tag(CIInfoTab.quote)
                 }
-                if let forwardedFromItem = chatItemInfo?.forwardedFromChatItem {
-                    forwardedFromTab(forwardedFromItem)
-                        .tabItem {
-                            Label(local ? "Saved" : "Forwarded", systemImage: "arrowshape.turn.up.forward")
-                        }
-                        .tag(CIInfoTab.forwarded)
-                }
             }
             .onAppear {
                 if chatItemInfo?.memberDeliveryStatuses != nil {
@@ -132,11 +109,7 @@ struct ChatItemInfoView: View {
                 .bold()
                 .padding(.bottom)
 
-            if ci.localNote {
-                infoRow("Created at", localTimestamp(meta.itemTs))
-            } else {
-                infoRow("Sent at", localTimestamp(meta.itemTs))
-            }
+            infoRow("Sent at", localTimestamp(meta.itemTs))
             if !ci.chatDir.sent {
                 infoRow("Received at", localTimestamp(meta.createdAt))
             }
@@ -194,6 +167,7 @@ struct ChatItemInfoView: View {
     @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
         VStack(alignment: .leading, spacing: 4) {
             textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
+                .allowsHitTesting(false)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(chatItemFrameColor(ci, colorScheme))
@@ -223,7 +197,7 @@ struct ChatItemInfoView: View {
 
     @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
         if text != "" {
-            TextBubble(text: text, formattedText: formattedText, sender: sender)
+            messageText(text, formattedText, sender)
         } else {
             Text("no text")
                 .italic()
@@ -231,17 +205,6 @@ struct ChatItemInfoView: View {
         }
     }
 
-    private struct TextBubble: View {
-        var text: String
-        var formattedText: [FormattedText]?
-        var sender: String? = nil
-        @State private var showSecrets = false
-
-        var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets))
-        }
-    }
-
     @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
@@ -263,6 +226,7 @@ struct ChatItemInfoView: View {
     @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
         VStack(alignment: .leading, spacing: 4) {
             textBubble(qi.text, qi.formattedText, qi.getSender(nil))
+                .allowsHitTesting(false)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(quotedMsgFrameColor(qi, colorScheme))
@@ -295,74 +259,6 @@ struct ChatItemInfoView: View {
         : Color(uiColor: .tertiarySystemGroupedBackground)
     }
 
-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 16) {
-                details()
-                Divider().padding(.vertical)
-                Text(local ? "Saved from" : "Forwarded from")
-                    .font(.title2)
-                    .padding(.bottom, 4)
-                forwardedFromView(forwardedFromItem)
-            }
-            .padding()
-        }
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    private func forwardedFromView(_ forwardedFromItem: AChatItem) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Button {
-                Task {
-                    await MainActor.run {
-                        chatModel.chatId = forwardedFromItem.chatInfo.id
-                        dismiss()
-                    }
-                }
-            } label: {
-                forwardedFromSender(forwardedFromItem)
-            }
-
-            if !local {
-                Divider().padding(.top, 32)
-                Text("Recipient(s) can't see who this message is from.")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
-        HStack {
-            ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
-                .padding(.trailing, 6)
-
-            if forwardedFromItem.chatItem.chatDir.sent {
-                VStack(alignment: .leading) {
-                    Text("you")
-                        .italic()
-                        .foregroundColor(.primary)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-            } else if case let .groupRcv(groupMember) = forwardedFromItem.chatItem.chatDir {
-                VStack(alignment: .leading) {
-                    Text(groupMember.chatViewName)
-                        .foregroundColor(.primary)
-                        .lineLimit(1)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-            } else {
-                Text(forwardedFromItem.chatInfo.chatViewName)
-                    .foregroundColor(.primary)
-                    .lineLimit(1)
-            }
-        }
-    }
-
     @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 16) {
@@ -383,7 +279,7 @@ struct ChatItemInfoView: View {
             let mss = membersStatuses(memberDeliveryStatuses)
             if !mss.isEmpty {
                 ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
                 }
             } else {
                 Text("No delivery information")
@@ -392,27 +288,24 @@ struct ChatItemInfoView: View {
         }
     }
 
-    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus, Bool?)] {
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
         memberDeliveryStatuses.compactMap({ mds in
-            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
-                return (mem.wrapped, mds.memberDeliveryStatus, mds.sentViaProxy)
+            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
+                return (mem, mds.memberDeliveryStatus)
             } else {
                 return nil
             }
         })
     }
 
-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus, _ sentViaProxy: Bool?) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
         HStack{
-            ProfileImage(imageStr: member.image, size: 30)
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
                 .padding(.trailing, 2)
             Text(member.chatViewName)
                 .lineLimit(1)
             Spacer()
-            if sentViaProxy == true {
-                Image(systemName: "arrow.forward")
-                    .foregroundColor(.secondary).opacity(0.67)
-            }
             let v = Group {
                 if let (icon, statusColor) = status.statusIcon(Color.secondary) {
                     switch status {
@@ -447,12 +340,7 @@ struct ChatItemInfoView: View {
     private func itemInfoShareText() -> String {
         let meta = ci.meta
         var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
-        shareText += [String.localizedStringWithFormat(
-            ci.localNote
-                ? NSLocalizedString("Created at: %@", comment: "copied message info")
-                : NSLocalizedString("Sent at: %@", comment: "copied message info"),
-            localTimestamp(meta.itemTs))
-        ]
+        shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
         if !ci.chatDir.sent {
             shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
         }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemView: View {
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
@@ -19,19 +19,8 @@ struct ChatItemView: View {
     @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-    init(
-        chat: Chat,
-        chatItem: ChatItem,
-        showMember: Bool = false,
-        maxWidth: CGFloat = .infinity,
-        scrollProxy: ScrollViewProxy? = nil,
-        revealed: Binding<Bool>,
-        allowMenu: Binding<Bool> = .constant(false),
-        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
-        playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback),
-        playbackTime: Binding<TimeInterval?> = .constant(nil)
-    ) {
-        self.chat = chat
+    init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
+        self.chatInfo = chatInfo
         self.chatItem = chatItem
         self.maxWidth = maxWidth
         _scrollProxy = .init(initialValue: scrollProxy)
@@ -44,15 +33,15 @@ struct ChatItemView: View {
 
     var body: some View {
         let ci = chatItem
-        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
-        } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
+        if chatItem.meta.itemDeleted != nil && !revealed {
+            MarkedDeletedItemView(chatItem: chatItem)
+        } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
-                EmojiItemView(chat: chat, chatItem: ci)
+                EmojiItemView(chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
+                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -62,15 +51,14 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
-    @Binding var revealed: Bool
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
@@ -84,14 +72,14 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvCall(status, duration): callItemView(status, duration)
         case let .rcvIntegrityError(msgError):
             if developerTools {
-                IntegrityErrorItemView(chat: chat, msgError: msgError, chatItem: chatItem)
+                IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
             } else {
                 ZStack {}
             }
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(chat: chat, msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvDirectEvent: eventItemView()
+        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()
         case .sndGroupEvent: eventItemView()
@@ -100,34 +88,29 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .rcvChatPreference(feature, allowed, param):
-            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
+            CIFeaturePreferenceView(chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
-        case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor)
-        case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor)
+            CIChatFeatureView(chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: .secondary)
+        case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
+        case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
         case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
         case .sndModerated: deletedItemView()
         case .rcvModerated: deletedItemView()
-        case .rcvBlocked: deletedItemView()
-        case let .sndDirectE2EEInfo(e2eeInfo): CIEventView(eventText: directE2EEInfoText(e2eeInfo))
-        case let .rcvDirectE2EEInfo(e2eeInfo): CIEventView(eventText: directE2EEInfoText(e2eeInfo))
-        case .sndGroupE2EEInfo: CIEventView(eventText: e2eeInfoNoPQText())
-        case .rcvGroupE2EEInfo: CIEventView(eventText: e2eeInfoNoPQText())
         case let .invalidJSON(json): CIInvalidJSONView(json: json)
         }
     }
 
     private func deletedItemView() -> some View {
-        DeletedItemView(chat: chat, chatItem: chatItem)
+        DeletedItemView(chatItem: chatItem)
     }
 
     private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
-        CICallItemView(chat: chat, chatItem: chatItem, status: status, duration: duration)
+        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
     }
 
     private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chat: chat, chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
     }
 
     private func eventItemView() -> some View {
@@ -135,9 +118,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func eventItemViewText() -> Text {
-        if !revealed, let t = mergedGroupEventText {
-            return chatEventText(t + Text(" ") + chatItem.timestampText)
-        } else if let member = chatItem.memberDisplayName {
+        if let member = chatItem.memberDisplayName {
             return Text(member + " ")
                     .font(.caption)
                     .foregroundColor(.secondary)
@@ -149,58 +130,34 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
 
-    private var mergedGroupEventText: Text? {
-        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
-        let members: LocalizedStringKey =
-            switch ns.count {
-            case 1: "\(ns[0]) connected"
-            case 2: "\(ns[0]) and \(ns[1]) connected"
-            case 3: "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
-            default:
-                ns.count > 3
-                ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
-                : ""
-            }
-        return if count <= 1 {
-            nil
-        } else if ns.count == 0 {
-            Text("\(count) group events")
-        } else if count > ns.count {
-            Text(members) + Text(" ") + Text("and \(count - ns.count) other events")
+    private var membersConnectedItemText: Text {
+        if let t = membersConnectedText {
+            return chatEventText(t, chatItem.timestampText)
         } else {
-            Text(members)
+            return eventItemViewText()
         }
     }
 
-    private func directE2EEInfoText(_ info: E2EEInfo) -> Text {
-        info.pqEnabled
-        ? Text("Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.")
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .fontWeight(.light)
-        : e2eeInfoNoPQText()
+    private var membersConnectedText: LocalizedStringKey? {
+        let ns = chatModel.getConnectedMemberNames(chatItem)
+        return ns.count > 3
+            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
+            : ns.count == 3
+            ? "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
+            : ns.count == 2
+            ? "\(ns[0]) and \(ns[1]) connected"
+            : nil
     }
-
-    private func e2eeInfoNoPQText() -> Text {
-        Text("Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.")
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .fontWeight(.light)
-    }
-}
-
-func chatEventText(_ text: Text) -> Text {
-    text
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .fontWeight(.light)
 }
 
 func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
-    chatEventText(Text(eventText) + Text(" ") + ts)
+    (Text(eventText) + Text(" ") + ts)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
 }
 
 func chatEventText(_ ci: ChatItem) -> Text {
@@ -210,15 +167,15 @@ func chatEventText(_ ci: ChatItem) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
@@ -230,7 +187,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -241,7 +198,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
@@ -252,7 +209,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -263,7 +220,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -274,7 +231,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),

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

@@ -23,7 +23,6 @@ enum ComposeContextItem {
     case noContextItem
     case quotedItem(chatItem: ChatItem)
     case editingItem(chatItem: ChatItem)
-    case forwardingItem(chatItem: ChatItem, fromChatInfo: ChatInfo)
 }
 
 enum VoiceMessageRecordingState {
@@ -73,13 +72,6 @@ struct ComposeState {
         }
     }
 
-    init(forwardingItem: ChatItem, fromChatInfo: ChatInfo) {
-        self.message = ""
-        self.preview = .noPreview
-        self.contextItem = .forwardingItem(chatItem: forwardingItem, fromChatInfo: fromChatInfo)
-        self.voiceMessageRecordingState = .noRecording
-    }
-
     func copy(
         message: String? = nil,
         liveMessage: LiveMessage? = nil,
@@ -110,19 +102,12 @@ struct ComposeState {
         }
     }
 
-    var forwarding: Bool {
-        switch contextItem {
-        case .forwardingItem: return true
-        default: return false
-        }
-    }
-
     var sendEnabled: Bool {
         switch preview {
-        case let .mediaPreviews(media): return !media.isEmpty
+        case .mediaPreviews: return true
         case .voicePreview: return voiceMessageRecordingState == .finished
         case .filePreview: return true
-        default: return !message.isEmpty || forwarding || liveMessage != nil
+        default: return !message.isEmpty || liveMessage != nil
         }
     }
 
@@ -168,7 +153,7 @@ struct ComposeState {
     }
 
     var attachmentDisabled: Bool {
-        if editing || forwarding || liveMessage != nil || inProgress { return true }
+        if editing || liveMessage != nil || inProgress { return true }
         switch preview {
         case .noPreview: return false
         case .linkPreview: return false
@@ -176,16 +161,6 @@ struct ComposeState {
         }
     }
 
-    var attachmentPreview: Bool {
-        switch preview {
-        case .noPreview: false
-        case .linkPreview: false
-        case let .mediaPreviews(mediaPreviews): !mediaPreviews.isEmpty
-        case .voicePreview: false
-        case .filePreview: true
-        }
-    }
-
     var empty: Bool {
         message == "" && noPreview
     }
@@ -259,7 +234,6 @@ struct ComposeView: View {
     @Binding var keyboardVisible: Bool
 
     @State var linkUrl: URL? = nil
-    @State var hasSimplexLink: Bool = false
     @State var prevLinkUrl: URL? = nil
     @State var pendingLinkUrl: URL? = nil
     @State var cancelledLinks: Set<String> = []
@@ -286,16 +260,6 @@ struct ComposeView: View {
             if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                 ContextInvitingContactMemberView()
             }
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
-            let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
-            if simplexLinkProhibited {
-                msgNotAllowedView("SimpleX links not allowed", icon: "link")
-            } else if fileProhibited {
-                msgNotAllowedView("Files and media not allowed", icon: "doc")
-            } else if voiceProhibited {
-                msgNotAllowedView("Voice messages not allowed", icon: "mic")
-            }
             contextItemView()
             switch (composeState.editing, composeState.preview) {
             case (true, .filePreview): EmptyView()
@@ -314,7 +278,7 @@ struct ComposeView: View {
                 .padding(.bottom, 12)
                 .padding(.leading, 12)
                 if case let .group(g) = chat.chatInfo,
-                   !g.fullGroupPreferences.files.on(for: g.membership) {
+                   !g.fullGroupPreferences.files.on {
                     b.disabled(true).onTapGesture {
                         AlertManager.shared.showAlertMsg(
                             title: "Files and media prohibited!",
@@ -331,7 +295,7 @@ struct ComposeView: View {
                             sendMessage(ttl: ttl)
                             resetLinkPreview()
                         },
-                        sendLiveMessage: chat.chatInfo.chatType != .local ? sendLiveMessage : nil,
+                        sendLiveMessage: sendLiveMessage,
                         updateLiveMessage: updateLiveMessage,
                         cancelLiveMessage: {
                             composeState.liveMessage = nil
@@ -339,7 +303,6 @@ struct ComposeView: View {
                         },
                         nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                         voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
-                        disableSendButton: simplexLinkProhibited || fileProhibited || voiceProhibited,
                         showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                         startVoiceMessageRecording: {
                             Task {
@@ -374,18 +337,13 @@ struct ComposeView: View {
                 }
             }
         }
-        .onChange(of: composeState.message) { msg in
+        .onChange(of: composeState.message) { _ in
             if composeState.linkPreviewAllowed {
-                if msg.count > 0 {
-                    showLinkPreview(msg)
+                if composeState.message.count > 0 {
+                    showLinkPreview(composeState.message)
                 } else {
                     resetLinkPreview()
-                    hasSimplexLink = false
                 }
-            } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
-            } else {
-                hasSimplexLink = false
             }
         }
         .onChange(of: chat.userCanSend) { canSend in
@@ -426,10 +384,10 @@ struct ComposeView: View {
             }
         }
         .sheet(isPresented: $showMediaPicker) {
-            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
-                await MainActor.run {
-                    showMediaPicker = false
-                    if itemsSelected {
+            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
+                showMediaPicker = false
+                if itemsSelected {
+                    DispatchQueue.main.async {
                         composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                     }
                 }
@@ -530,30 +488,6 @@ struct ComposeView: View {
         }
     }
 
-    private func addMediaContent(_ content: UploadContent) async {
-        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
-            var newMedia: [(String, UploadContent?)] = []
-            if case var .mediaPreviews(media) = composeState.preview {
-                media.append((img, content))
-                newMedia = media
-            } else {
-                newMedia = [(img, content)]
-            }
-            await MainActor.run {
-                composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: newMedia))
-            }
-        }
-    }
-
-    // When error occurs while converting video, remove media preview
-    private func finishedPreprocessingMediaContent() {
-        if case let .mediaPreviews(media) = composeState.preview, media.isEmpty {
-            DispatchQueue.main.async {
-                composeState = composeState.copy(preview: .noPreview)
-            }
-        }
-    }
-
     private var maxFileSize: Int64 {
         getMaxFileSize(.xftp)
     }
@@ -652,44 +586,22 @@ struct ComposeView: View {
         }
     }
 
-    private func msgNotAllowedView(_ reason: LocalizedStringKey, icon: String) -> some View {
-        HStack {
-            Image(systemName: icon).foregroundColor(.secondary)
-            Text(reason).italic()
-        }
-        .padding(12)
-        .frame(minHeight: 50)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(Color(uiColor: .tertiarySystemGroupedBackground))
-        .padding(.top, 8)
-    }
-
     @ViewBuilder private func contextItemView() -> some View {
         switch composeState.contextItem {
         case .noContextItem:
             EmptyView()
         case let .quotedItem(chatItem: quotedItem):
             ContextItemView(
-                chat: chat,
                 contextItem: quotedItem,
                 contextIcon: "arrowshape.turn.up.left",
                 cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
             )
         case let .editingItem(chatItem: editingItem):
             ContextItemView(
-                chat: chat,
                 contextItem: editingItem,
                 contextIcon: "pencil",
                 cancelContextItem: { clearState() }
             )
-        case let .forwardingItem(chatItem: forwardedItem, _):
-            ContextItemView(
-                chat: chat,
-                contextItem: forwardedItem,
-                contextIcon: "arrowshape.turn.up.forward",
-                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) },
-                showSender: false
-            )
         }
     }
 
@@ -711,11 +623,6 @@ struct ComposeView: View {
         }
         if chat.chatInfo.contact?.nextSendGrpInv ?? false {
             await sendMemberContactInvitation()
-        } else if case let .forwardingItem(ci, fromChatInfo) = composeState.contextItem {
-            sent = await forwardItem(ci, fromChatInfo, ttl)
-            if !composeState.message.isEmpty {
-                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
-            }
         } else if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
         } else if let liveMessage = liveMessage, liveMessage.sentMsg != nil {
@@ -756,20 +663,12 @@ struct ComposeView: View {
                 let file = voiceCryptoFile(recordingFileName)
                 sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
             case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file) {
+                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
                     sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                 }
             }
         }
-        await MainActor.run {
-            let wasForwarding = composeState.forwarding
-            clearState(live: live)
-            if wasForwarding,
-               chatModel.draftChatId == chat.chatInfo.id,
-               let draft = chatModel.draft {
-                composeState = draft
-            }
-        }
+        await MainActor.run { clearState(live: live) }
         return sent
 
         func sending() async {
@@ -867,17 +766,15 @@ struct ComposeView: View {
         }
 
         func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            if let chatItem = chat.chatInfo.chatType == .local
-                ? await apiCreateChatItem(noteFolderId: chat.chatInfo.apiId, file: file, msg: mc)
-                : await apiSendMessage(
-                    type: chat.chatInfo.chatType,
-                    id: chat.chatInfo.apiId,
-                    file: file,
-                    quotedItemId: quoted,
-                    msg: mc,
-                    live: live,
-                    ttl: ttl
-                ) {
+            if let chatItem = await apiSendMessage(
+                type: chat.chatInfo.chatType,
+                id: chat.chatInfo.apiId,
+                file: file,
+                quotedItemId: quoted,
+                msg: mc,
+                live: live,
+                ttl: ttl
+            ) {
                 await MainActor.run {
                     chatModel.removeLiveDummy(animated: false)
                     chatModel.addChatItem(chat.chatInfo, chatItem)
@@ -890,27 +787,10 @@ struct ComposeView: View {
             return nil
         }
 
-        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
-            if let chatItem = await apiForwardChatItem(
-                toChatType: chat.chatInfo.chatType,
-                toChatId: chat.chatInfo.apiId,
-                fromChatType: fromChatInfo.chatType,
-                fromChatId: fromChatInfo.apiId,
-                itemId: forwardedItem.id,
-                ttl: ttl
-            ) {
-                await MainActor.run {
-                    chatModel.addChatItem(chat.chatInfo, chatItem)
-                }
-                return chatItem
-            }
-            return nil
-        }
-
         func checkLinkPreview() -> MsgContent {
             switch (composeState.preview) {
             case let .linkPreview(linkPreview: linkPreview):
-                if let url = parseMessage(msgText).url,
+                if let url = parseMessage(msgText),
                    let linkPreview = linkPreview,
                    url == linkPreview.uri {
                     return .link(text: msgText, preview: linkPreview)
@@ -1039,7 +919,7 @@ struct ComposeView: View {
 
     private func showLinkPreview(_ s: String) {
         prevLinkUrl = linkUrl
-        (linkUrl, hasSimplexLink) = parseMessage(s)
+        linkUrl = parseMessage(s)
         if let url = linkUrl {
             if url != composeState.linkPreview?.uri && url != pendingLinkUrl {
                 pendingLinkUrl = url
@@ -1056,17 +936,13 @@ struct ComposeView: View {
         }
     }
 
-    private func parseMessage(_ msg: String) -> (url: URL?, hasSimplexLink: Bool) {
-        guard let parsedMsg = parseSimpleXMarkdown(msg) else { return (nil, false) }
-        let url: URL? = if let uri = parsedMsg.first(where: { ft in
+    private func parseMessage(_ msg: String) -> URL? {
+        let parsedMsg = parseSimpleXMarkdown(msg)
+        let uri = parsedMsg?.first(where: { ft in
             ft.format == .uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text)
-        }) {
-            URL(string: uri.text)
-        } else {
-            nil
-        }
-        let simplexLink = parsedMsg.contains(where: { ft in ft.format?.isSimplexLink ?? false })
-        return (url, simplexLink)
+        })
+        if let uri = uri { return URL(string: uri.text) }
+        else { return nil }
     }
 
     private func isSimplexLink(_ link: String) -> Bool {
@@ -1074,9 +950,6 @@ struct ComposeView: View {
     }
 
     private func cancelLinkPreview() {
-        if let pendingLink = pendingLinkUrl?.absoluteString {
-            cancelledLinks.insert(pendingLink)
-        }
         if let uri = composeState.linkPreview?.uri.absoluteString {
             cancelledLinks.insert(uri)
         }

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

@@ -11,11 +11,9 @@ import SimpleXChat
 
 struct ContextItemView: View {
     @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
     let contextItem: ChatItem
     let contextIcon: String
     let cancelContextItem: () -> Void
-    var showSender: Bool = true
 
     var body: some View {
         HStack {
@@ -24,7 +22,7 @@ struct ContextItemView: View {
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 16, height: 16)
                 .foregroundColor(.secondary)
-            if showSender, let sender = contextItem.memberDisplayName {
+            if let sender = contextItem.memberDisplayName {
                 VStack(alignment: .leading, spacing: 4) {
                     Text(sender).font(.caption).foregroundColor(.secondary)
                     msgContentView(lines: 2)
@@ -49,32 +47,18 @@ struct ContextItemView: View {
     }
 
     private func msgContentView(lines: Int) -> some View {
-        contextMsgPreview()
-            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-            .lineLimit(lines)
-    }
-
-    private func contextMsgPreview() -> Text {
-        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false)
-
-        func attachment() -> Text {
-            switch contextItem.content.msgContent {
-            case .file: return image("doc.fill")
-            case .image: return image("photo")
-            case .voice: return image("play.fill")
-            default: return Text("")
-            }
-        }
-
-        func image(_ s: String) -> Text {
-            Text(Image(systemName: s)).foregroundColor(Color(uiColor: .tertiaryLabel)) + Text(" ")
-        }
+        MsgContentView(
+            text: contextItem.text,
+            formattedText: contextItem.formattedText
+        )
+        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+        .lineLimit(lines)
     }
 }
 
 struct ContextItemView_Previews: PreviewProvider {
     static var previews: some View {
         let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
     }
 }

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

@@ -14,31 +14,21 @@ import PhotosUI
 struct NativeTextEditor: UIViewRepresentable {
     @Binding var text: String
     @Binding var disableEditing: Bool
-    @Binding var height: CGFloat
+    let height: CGFloat
+    let font: UIFont
     @Binding var focused: Bool
+    let alignment: TextAlignment
     let onImagesAdded: ([UploadContent]) -> Void
     
-    private let minHeight: CGFloat = 37
-
-    private let defaultHeight: CGFloat = {
-        let field = CustomUITextField(height: Binding.constant(0))
-        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
-        return min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, 37), 360).rounded(.down)
-    }()
-    
     func makeUIView(context: Context) -> UITextView {
-        let field = CustomUITextField(height: _height)
+        let field = CustomUITextField()
         field.text = text
-        field.textAlignment = alignment(text)
+        field.font = font
+        field.textAlignment = alignment == .leading ? .left : .right
         field.autocapitalizationType = .sentences
         field.setOnTextChangedListener { newText, images in
             if !disableEditing {
                 text = newText
-                field.textAlignment = alignment(text)
-                updateFont(field)
-                // Speed up the process of updating layout, reduce jumping content on screen
-                updateHeight(field)
-                self.height = field.frame.size.height
             } else {
                 field.text = text
             }
@@ -49,81 +39,24 @@ struct NativeTextEditor: UIViewRepresentable {
         field.setOnFocusChangedListener { focused = $0 }
         field.delegate = field
         field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
-        updateFont(field)
-        updateHeight(field)
         return field
     }
     
     func updateUIView(_ field: UITextView, context: Context) {
-        if field.markedTextRange == nil && field.text != text {
-            field.text = text
-            field.textAlignment = alignment(text)
-            updateFont(field)
-            updateHeight(field)
-        }
+        field.text = text
+        field.font = font
+        field.textAlignment = alignment == .leading ? .left : .right
     }
-
-    private func updateHeight(_ field: UITextView) {
-        let maxHeight = min(360, field.font!.lineHeight * 12)
-        // When having emoji in text view and then removing it, sizeThatFits shows previous size (too big for empty text view), so using work around with default size
-        let newHeight = field.text == ""
-        ? defaultHeight
-        : min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, minHeight), maxHeight).rounded(.down)
-
-        if field.frame.size.height != newHeight {
-            field.frame.size = CGSizeMake(field.frame.size.width, newHeight)
-            (field as! CustomUITextField).invalidateIntrinsicContentHeight(newHeight)
-        }
-    }
-
-    private func updateFont(_ field: UITextView) {
-        let newFont = isShortEmoji(field.text)
-        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
-        : UIFont.preferredFont(forTextStyle: .body)
-        if field.font != newFont {
-            field.font = newFont
-        }
-    }
-}
-
-private func alignment(_ text: String) -> NSTextAlignment {
-    isRightToLeft(text) ? .right : .left
 }
 
 private class CustomUITextField: UITextView, UITextViewDelegate {
-    var height: Binding<CGFloat>
-    var newHeight: CGFloat = 0
     var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
     var onFocusChanged: (Bool) -> Void = { focused in }
     
-    init(height: Binding<CGFloat>) {
-        self.height = height
-        super.init(frame: .zero, textContainer: nil)
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("Not implemented")
-    }
-
-    // This func here needed because using frame.size.height in intrinsicContentSize while loading a screen with text (for example. when you have a draft),
-    // produces incorrect height because at that point intrinsicContentSize has old value of frame.size.height even if it was set to new value right before the call
-    // (who knows why...)
-    func invalidateIntrinsicContentHeight(_ newHeight: CGFloat) {
-        self.newHeight = newHeight
-        invalidateIntrinsicContentSize()
-    }
-
-    override var intrinsicContentSize: CGSize {
-        if height.wrappedValue != newHeight {
-            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
-        }
-        return CGSizeMake(0, newHeight)
-    }
-
     func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
         self.onTextChanged = onTextChanged
     }
-
+    
     func setOnFocusChangedListener(onFocusChanged: @escaping (Bool) -> Void) {
         self.onFocusChanged = onFocusChanged
     }
@@ -211,13 +144,14 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
 struct NativeTextEditor_Previews: PreviewProvider{
     static var previews: some View {
-        NativeTextEditor(
+        return NativeTextEditor(
             text: Binding.constant("Hello, world!"),
             disableEditing: Binding.constant(false),
-            height: Binding.constant(100),
+            height: 100,
+            font: UIFont.preferredFont(forTextStyle: .body),
             focused: Binding.constant(false),
+            alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )
-        .fixedSize(horizontal: false, vertical: true)
     }
 }

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

@@ -20,7 +20,6 @@ struct SendMessageView: View {
     var nextSendGrpInv: Bool = false
     var showVoiceMessageButton: Bool = true
     var voiceMessageAllowed: Bool = true
-    var disableSendButton = false
     var showEnableVoiceMessagesAlert: ChatInfo.ShowEnableVoiceMessagesAlert = .other
     var startVoiceMessageRecording: (() -> Void)? = nil
     var finishVoiceMessageRecording: (() -> Void)? = nil
@@ -33,12 +32,15 @@ struct SendMessageView: View {
     var sendButtonColor = Color.accentColor
     @State private var teHeight: CGFloat = 42
     @State private var teFont: Font = .body
+    @State private var teUiFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
     @State private var sendButtonSize: CGFloat = 29
     @State private var sendButtonOpacity: CGFloat = 1
     @State private var showCustomDisappearingMessageDialogue = false
     @State private var showCustomTimePicker = false
     @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
     @State private var progressByTimeout = false
+    var maxHeight: CGFloat = 360
+    var minHeight: CGFloat = 37
     @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
 
     var body: some View {
@@ -54,15 +56,31 @@ struct SendMessageView: View {
                             .padding(.vertical, 8)
                             .frame(maxWidth: .infinity)
                     } else {
+                        let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
+                        Text(composeState.message)
+                            .lineLimit(10)
+                            .font(teFont)
+                            .multilineTextAlignment(alignment)
+// put text on top (after NativeTextEditor) and set color to precisely align it on changes
+//                            .foregroundColor(.red)
+                            .foregroundColor(.clear)
+                            .padding(.horizontal, 10)
+                            .padding(.top, 8)
+                            .padding(.bottom, 6)
+                            .matchedGeometryEffect(id: "te", in: namespace)
+                            .background(GeometryReader(content: updateHeight))
+
                         NativeTextEditor(
                             text: $composeState.message,
                             disableEditing: $composeState.inProgress,
-                            height: $teHeight,
+                            height: teHeight,
+                            font: teUiFont,
                             focused: $keyboardVisible,
+                            alignment: alignment,
                             onImagesAdded: onMediaAdded
                         )
                         .allowsTightening(false)
-                        .fixedSize(horizontal: false, vertical: true)
+                        .frame(height: teHeight)
                     }
                 }
 
@@ -82,13 +100,11 @@ struct SendMessageView: View {
                     .frame(height: teHeight, alignment: .bottom)
                 }
             }
-            .padding(.vertical, 1)
-            .overlay(
+
             RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
                 .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-            )
+                .frame(height: teHeight)
         }
-        .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
             if inProgress {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
@@ -108,7 +124,6 @@ struct SendMessageView: View {
         } else if showVoiceMessageButton
             && composeState.message.isEmpty
             && !composeState.editing
-            && !composeState.forwarding
             && composeState.liveMessage == nil
             && ((composeState.noPreview && vmrs == .noRecording)
                 || (vmrs == .recording && holdingVMR)) {
@@ -184,8 +199,7 @@ struct SendMessageView: View {
             !composeState.sendEnabled ||
             composeState.inProgress ||
             (!voiceMessageAllowed && composeState.voicePreview) ||
-            composeState.endLiveDisabled ||
-            disableSendButton
+            composeState.endLiveDisabled
         )
         .frame(width: 29, height: 29)
         .contextMenu{
@@ -401,12 +415,16 @@ struct SendMessageView: View {
         .padding([.bottom, .trailing], 4)
     }
 
-    private func updateFont(_ text: String) {
+    private func updateHeight(_ g: GeometryProxy) -> Color {
         DispatchQueue.main.async {
-            teFont = isShortEmoji(text)
-            ? (text.count < 4 ? largeEmojiFont : mediumEmojiFont)
-            : .body
+            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
+            (teFont, teUiFont) = isShortEmoji(composeState.message)
+                                    ? composeState.message.count < 4
+                                        ? (largeEmojiFont, largeEmojiUIFont)
+                                        : (mediumEmojiFont, mediumEmojiUIFont)
+                                    : (.body, UIFont.preferredFont(forTextStyle: .body))
         }
+        return Color.clear
     }
 }
 

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

@@ -35,7 +35,7 @@ struct ContactPreferencesView: View {
                 .disabled(currentFeaturesAllowed == featuresAllowed)
             }
         }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
+        .modifier(BackButton {
             if currentFeaturesAllowed == featuresAllowed {
                 dismiss()
             } else {
@@ -116,6 +116,7 @@ struct ContactPreferencesView: View {
 
     private func featureFooter(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
         Text(feature.enabledDescription(enabled))
+        .frame(height: 36, alignment: .topLeading)
     }
 
     private func savePreferences() {

apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift

@@ -144,7 +144,7 @@ struct AddGroupMembersViewCommon: View {
             do {
                 for contactId in selectedContacts {
                     let member = try await apiAddMember(groupInfo.groupId, contactId, selectedRole)
-                    await MainActor.run { _ = chatModel.upsertGroupMember(groupInfo, member) }
+                    await MainActor.run { _ = ChatModel.shared.upsertGroupMember(groupInfo, member) }
                 }
                 addedMembersCb(selectedContacts)
             } catch {
@@ -157,7 +157,7 @@ struct AddGroupMembersViewCommon: View {
     private func rolePicker() -> some View {
         Picker("New member role", selection: $selectedRole) {
             ForEach(GroupMemberRole.allCases) { role in
-                if role <= groupInfo.membership.memberRole && role != .author {
+                if role <= groupInfo.membership.memberRole {
                     Text(role.text)
                 }
             }
@@ -194,7 +194,8 @@ struct AddGroupMembersViewCommon: View {
             }
         } label: {
             HStack{
-                ProfileImage(imageStr: contact.image, size: 30)
+                ProfileImage(imageStr: contact.image)
+                    .frame(width: 30, height: 30)
                     .padding(.trailing, 2)
                 Text(ChatInfo.direct(contact: contact).chatViewName)
                     .foregroundColor(prohibitedToInviteIncognito ? .secondary : .primary)

apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift

@@ -15,7 +15,8 @@ struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
-    @Binding var groupInfo: GroupInfo
+    @State var groupInfo: GroupInfo
+    @ObservedObject private var alertManager = AlertManager.shared
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
@@ -34,35 +35,15 @@ struct GroupChatInfoView: View {
         case leaveGroupAlert
         case cantInviteIncognitoAlert
         case largeGroupReceiptsDisabled
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
-        case blockForAllAlert(mem: GroupMember)
-        case unblockForAllAlert(mem: GroupMember)
-        case removeMemberAlert(mem: GroupMember)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
-        var id: String {
-            switch self {
-            case .deleteGroupAlert: return "deleteGroupAlert"
-            case .clearChatAlert: return "clearChatAlert"
-            case .leaveGroupAlert: return "leaveGroupAlert"
-            case .cantInviteIncognitoAlert: return "cantInviteIncognitoAlert"
-            case .largeGroupReceiptsDisabled: return "largeGroupReceiptsDisabled"
-            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
-            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
-            case let .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)"
-            case let .unblockForAllAlert(mem): return "unblockForAllAlert \(mem.groupMemberId)"
-            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
-            case let .error(title, _): return "error \(title)"
-            }
-        }
+        var id: GroupChatInfoViewAlert { get { self } }
     }
 
     var body: some View {
         NavigationView {
             let members = chatModel.groupMembers
-                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
-                .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+                .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved }
+                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
 
             List {
                 groupInfoHeader()
@@ -76,7 +57,7 @@ struct GroupChatInfoView: View {
                         addOrEditWelcomeMessage()
                     }
                     groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                         sendReceiptsOption()
                     } else {
                         sendReceiptsOptionDisabled()
@@ -103,17 +84,17 @@ struct GroupChatInfoView: View {
                             .padding(.leading, 8)
                     }
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
-                    MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
+                    let filteredMembers = s == "" ? members : members.filter { $0.chatViewName.localizedLowercase.contains(s) }
+                    memberView(groupInfo.membership, user: true)
                     ForEach(filteredMembers) { member in
                         ZStack {
                             NavigationLink {
-                                memberInfoView(member)
+                                memberInfoView(member.groupMemberId)
                             } label: {
                                 EmptyView()
                             }
                             .opacity(0)
-                            MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
+                            memberView(member)
                         }
                     }
                 }
@@ -145,12 +126,6 @@ struct GroupChatInfoView: View {
             case .leaveGroupAlert: return leaveGroupAlert()
             case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
             case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
-            case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
-            case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
-            case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
-            case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem)
-            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
             }
         }
         .onAppear {
@@ -172,7 +147,8 @@ struct GroupChatInfoView: View {
     private func groupInfoHeader() -> some View {
         VStack {
             let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
             Text(cInfo.displayName)
@@ -198,7 +174,7 @@ struct GroupChatInfoView: View {
                     Task {
                         let groupMembers = await apiListMembers(groupInfo.groupId)
                         await MainActor.run {
-                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                            ChatModel.shared.groupMembers = groupMembers
                         }
                     }
                 }
@@ -207,133 +183,51 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private struct MemberRowView: View {
-        var groupInfo: GroupInfo
-        @ObservedObject var groupMember: GMember
-        var user: Bool = false
-        @Binding var alert: GroupChatInfoViewAlert?
-
-        var body: some View {
-            let member = groupMember.wrapped
-            let v = HStack{
-                ProfileImage(imageStr: member.image, size: 38)
-                    .padding(.trailing, 2)
-                // TODO server connection status
-                VStack(alignment: .leading) {
-                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
-                    (member.verified ? memberVerifiedShield + t : t)
-                        .lineLimit(1)
-                    let s = Text(member.memberStatus.shortText)
-                    (user ? Text ("you: ") + s : s)
-                        .lineLimit(1)
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                }
-                Spacer()
-                memberInfo(member)
-            }
-            
-            if user {
-                v
-            } else if groupInfo.membership.memberRole >= .admin {
-                // TODO if there are more actions, refactor with lists of swipeActions
-                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
-                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
-                if canBlockForAll && canRemove {
-                    removeSwipe(member, blockForAllSwipe(member, v))
-                } else if canBlockForAll {
-                    blockForAllSwipe(member, v)
-                } else if canRemove {
-                    removeSwipe(member, v)
-                } else {
-                    v
-                }
-            } else {
-                if !member.blockedByAdmin {
-                    blockSwipe(member, v)
-                } else {
-                    v
-                }
-            }
-        }
-
-        @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
-            if member.blocked {
-                Text("blocked")
+    private func memberView(_ member: GroupMember, user: Bool = false) -> some View {
+        HStack{
+            ProfileImage(imageStr: member.image)
+                .frame(width: 38, height: 38)
+                .padding(.trailing, 2)
+            // TODO server connection status
+            VStack(alignment: .leading) {
+                let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
+                (member.verified ? memberVerifiedShield + t : t)
+                    .lineLimit(1)
+                let s = Text(member.memberStatus.shortText)
+                (user ? Text ("you: ") + s : s)
+                    .lineLimit(1)
+                    .font(.caption)
                     .foregroundColor(.secondary)
-            } else {
-                let role = member.memberRole
-                if [.owner, .admin, .observer].contains(role) {
-                    Text(member.memberRole.text)
-                        .foregroundColor(.secondary)
-                }
             }
-        }
-
-        private func blockSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
-            v.swipeActions(edge: .leading) {
-                if member.memberSettings.showMessages {
-                    Button {
-                        alert = .blockMemberAlert(mem: member)
-                    } label: {
-                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
-                    }
-                } else {
-                    Button {
-                        alert = .unblockMemberAlert(mem: member)
-                    } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
-                    }
-                }
-            }
-        }
-
-        private func blockForAllSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
-            v.swipeActions(edge: .leading) {
-                if member.blockedByAdmin {
-                    Button {
-                        alert = .unblockForAllAlert(mem: member)
-                    } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
-                    }
-                } else {
-                    Button {
-                        alert = .blockForAllAlert(mem: member)
-                    } label: {
-                        Label("Block for all", systemImage: "hand.raised").foregroundColor(.secondary)
-                    }
-                }
-            }
-        }
-
-        private func removeSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
-            v.swipeActions(edge: .trailing) {
-                Button(role: .destructive) {
-                    alert = .removeMemberAlert(mem: member)
-                } label: {
-                    Label("Remove member", systemImage: "trash")
-                        .foregroundColor(Color.red)
-                }
+            Spacer()
+            let role = member.memberRole
+            if role == .owner || role == .admin {
+                Text(member.memberRole.text)
+                    .foregroundColor(.secondary)
             }
         }
     }
 
-    private func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
-            .navigationBarHidden(false)
+    private var memberVerifiedShield: Text {
+        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+            .font(.caption)
+            .baselineOffset(2)
+            .kerning(-2)
+            .foregroundColor(.secondary)
+    }
+
+    @ViewBuilder private func memberInfoView(_ groupMemberId: Int64?) -> some View {
+        if let mId = groupMemberId, let member = chatModel.groupMembers.first(where: { $0.groupMemberId == mId }) {
+            GroupMemberInfoView(groupInfo: groupInfo, member: member)
+                .navigationBarHidden(false)
+        }
     }
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            GroupLinkView(
-                groupId: groupInfo.groupId,
-                groupLink: $groupLink,
-                groupLinkMemberRole: $groupLinkMemberRole,
-                showTitle: false,
-                creatingGroup: false
-            )
-            .navigationBarTitle("Group link")
-            .navigationBarTitleDisplayMode(.large)
+            GroupLinkView(groupId: groupInfo.groupId, groupLink: $groupLink, groupLinkMemberRole: $groupLinkMemberRole)
+                .navigationBarTitle("Group link")
+                .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
                 Label("Create group link", systemImage: "link.badge.plus")
@@ -358,11 +252,7 @@ struct GroupChatInfoView: View {
 
     private func addOrEditWelcomeMessage() -> some View {
         NavigationLink {
-            GroupWelcomeView(
-                groupInfo: $groupInfo,
-                groupProfile: groupInfo.groupProfile,
-                welcomeText: groupInfo.groupProfile.description ?? ""
-            )
+            GroupWelcomeView(groupId: groupInfo.groupId, groupInfo: $groupInfo)
             .navigationTitle("Welcome message")
             .navigationBarTitleDisplayMode(.large)
         } label: {
@@ -485,28 +375,6 @@ struct GroupChatInfoView: View {
             alert = .largeGroupReceiptsDisabled
         }
     }
-
-    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
-        Alert(
-            title: Text("Remove member?"),
-            message: Text("Member will be removed from group - this cannot be undone!"),
-            primaryButton: .destructive(Text("Remove")) {
-                Task {
-                    do {
-                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
-                        await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
-                        }
-                    } catch let error {
-                        logger.error("apiRemoveMember error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error removing member")
-                        alert = .error(title: a.title, error: a.message)
-                    }
-                }
-            },
-            secondaryButton: .cancel()
-        )
-    }
 }
 
 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -528,14 +396,6 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
     }
 }
 
-private var memberVerifiedShield: Text {
-    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-        .font(.caption)
-        .baselineOffset(2)
-        .kerning(-2)
-        .foregroundColor(.secondary)
-}
-
 func cantInviteIncognitoAlert() -> Alert {
     Alert(
         title: Text("Can't invite contacts!"),
@@ -552,9 +412,6 @@ func largeGroupReceiptsDisabledAlert() -> Alert {
 
 struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupChatInfoView(
-            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData)
-        )
+        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
     }
 }

apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift

@@ -13,12 +13,8 @@ struct GroupLinkView: View {
     var groupId: Int64
     @Binding var groupLink: String?
     @Binding var groupLinkMemberRole: GroupMemberRole
-    var showTitle: Bool = false
-    var creatingGroup: Bool = false
-    var linkCreatedCb: (() -> Void)? = nil
     @State private var creatingLink = false
     @State private var alert: GroupLinkAlert?
-    @State private var shouldCreate = true
 
     private enum GroupLinkAlert: Identifiable {
         case deleteLink
@@ -33,35 +29,10 @@ struct GroupLinkView: View {
     }
 
     var body: some View {
-        if creatingGroup {
-            NavigationView {
-                groupLinkView()
-                    .toolbar {
-                        ToolbarItem(placement: .navigationBarTrailing) {
-                            Button ("Continue") { linkCreatedCb?() }
-                        }
-                    }
-            }
-        } else {
-            groupLinkView()
-        }
-    }
-
-    private func groupLinkView() -> some View {
         List {
-            Group {
-                if showTitle {
-                    Text("Group link")
-                        .font(.largeTitle)
-                        .bold()
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-                Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
-            }
-            .listRowBackground(Color.clear)
-            .listRowSeparator(.hidden)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
+            Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
+                .listRowBackground(Color.clear)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
             Section {
                 if let groupLink = groupLink {
                     Picker("Initial role", selection: $groupLinkMemberRole) {
@@ -70,18 +41,15 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
-                        .id("simplex-qrcode-view-for-\(groupLink)")
+                    QRCode(uri: groupLink)
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
-                    if !creatingGroup {
-                        Button(role: .destructive) { alert = .deleteLink } label: {
-                            Label("Delete link", systemImage: "trash")
-                        }
+                    Button(role: .destructive) { alert = .deleteLink } label: {
+                        Label("Delete link", systemImage: "trash")
                     }
                 } else {
                     Button(action: createGroupLink) {
@@ -127,10 +95,9 @@ struct GroupLinkView: View {
                 }
             }
             .onAppear {
-                if groupLink == nil && !creatingLink && shouldCreate {
+                if groupLink == nil && !creatingLink {
                     createGroupLink()
                 }
-                shouldCreate = false
             }
         }
     }

apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift

@@ -12,44 +12,38 @@ import SimpleXChat
 struct GroupMemberInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @State var groupInfo: GroupInfo
-    @ObservedObject var groupMember: GMember
+    var groupInfo: GroupInfo
+    @State var member: GroupMember
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
+    @State private var connectToMemberDialog: Bool = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
     @State private var progressIndicator = false
 
     enum GroupMemberInfoViewAlert: Identifiable {
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
-        case blockForAllAlert(mem: GroupMember)
-        case unblockForAllAlert(mem: GroupMember)
         case removeMemberAlert(mem: GroupMember)
         case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole)
         case switchAddressAlert
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
-        case planAndConnectAlert(alert: PlanAndConnectAlert)
+        case connRequestSentAlert(type: ConnReqType)
         case error(title: LocalizedStringKey, error: LocalizedStringKey)
+        case other(alert: Alert)
 
         var id: String {
             switch self {
-            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
-            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
-            case let .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)"
-            case let .unblockForAllAlert(mem): return "unblockForAllAlert \(mem.groupMemberId)"
-            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
-            case let .changeMemberRoleAlert(mem, role): return "changeMemberRoleAlert \(mem.groupMemberId) \(role.rawValue)"
+            case .removeMemberAlert: return "removeMemberAlert"
+            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
             case .switchAddressAlert: return "switchAddressAlert"
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
+            case .connRequestSentAlert: return "connRequestSentAlert"
             case let .error(title, _): return "error \(title)"
+            case let .other(alert): return "other \(alert)"
             }
         }
     }
@@ -74,7 +68,6 @@ struct GroupMemberInfoView: View {
     private func groupMemberInfoView() -> some View {
         ZStack {
             VStack {
-                let member = groupMember.wrapped
                 List {
                     groupMemberInfoHeader(member)
                         .listRowBackground(Color.clear)
@@ -83,7 +76,7 @@ struct GroupMemberInfoView: View {
                         Section {
                             if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
                                 knownDirectChatButton(chat)
-                            } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                            } else if groupInfo.fullGroupPreferences.directMessages.on {
                                 if let contactId = member.memberContactId {
                                     newDirectChatButton(contactId)
                                 } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
@@ -103,14 +96,14 @@ struct GroupMemberInfoView: View {
 
                     if let contactLink = member.contactLink {
                         Section {
-                            SimpleXLinkQRCode(uri: contactLink)
+                            QRCode(uri: contactLink)
                             Button {
-                                showShareSheet(items: [simplexChatLink(contactLink)])
+                                showShareSheet(items: [contactLink])
                             } label: {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
                             if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
                                     connectViaAddressButton(contactLink)
                                 }
                             } else {
@@ -168,10 +161,10 @@ struct GroupMemberInfoView: View {
                         }
                     }
 
-                    if groupInfo.membership.memberRole >= .admin {
-                        adminDestructiveSection(member)
-                    } else {
-                        nonAdminBlockSection(member)
+                    if member.canBeRemoved(groupInfo: groupInfo) {
+                        Section {
+                            removeMemberButton(member)
+                        }
                     }
 
                     if developerTools {
@@ -187,46 +180,37 @@ struct GroupMemberInfoView: View {
                         // this condition prevents re-setting picker
                         if !justOpened { return }
                     }
-                    justOpened = false
-                    DispatchQueue.main.async {
-                        newRole = member.memberRole
-                        do {
-                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                            _ = chatModel.upsertGroupMember(groupInfo, mem)
-                            connectionStats = stats
-                            connectionCode = code
-                        } catch let error {
-                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
-                        }
+                    newRole = member.memberRole
+                    do {
+                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                        member = mem
+                        connectionStats = stats
+                        connectionCode = code
+                    } catch let error {
+                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                     }
+                    justOpened = false
                 }
-                .onChange(of: newRole) { newRole in
+                .onChange(of: newRole) { _ in
                     if newRole != member.memberRole {
                         alert = .changeMemberRoleAlert(mem: member, role: newRole)
                     }
                 }
-                .onChange(of: member.memberRole) { role in
-                    newRole = role
-                }
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             .alert(item: $alert) { alertItem in
                 switch(alertItem) {
-                case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
-                case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
-                case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
-                case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem)
                 case let .removeMemberAlert(mem): return removeMemberAlert(mem)
                 case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem)
                 case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
                 case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                 case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
-                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
+                case let .connRequestSentAlert(type): return connReqSentAlert(type)
                 case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                case let .other(alert): return alert
                 }
             }
-            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
 
             if progressIndicator {
                 ProgressView().scaleEffect(2)
@@ -236,16 +220,25 @@ struct GroupMemberInfoView: View {
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            planAndConnect(
-                contactLink,
-                showAlert: { alert = .planAndConnectAlert(alert: $0) },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: nil
-            )
+            connectToMemberDialog = true
         } label: {
             Label("Connect", systemImage: "link")
         }
+        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
+            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
+            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
+        }
+    }
+
+    func connectViaAddress(incognito: Bool, contactLink: String) {
+        Task {
+            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
+            if let connReqType = connReqType {
+                alert = .connRequestSentAlert(type: connReqType)
+            } else if let connectAlert = connectAlert {
+                alert = .other(alert: connectAlert)
+            }
+        }
     }
 
     func knownDirectChatButton(_ chat: Chat) -> some View {
@@ -281,7 +274,7 @@ struct GroupMemberInfoView: View {
             progressIndicator = true
             Task {
                 do {
-                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, member.groupMemberId)
                     await MainActor.run {
                         progressIndicator = false
                         chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
@@ -305,7 +298,8 @@ struct GroupMemberInfoView: View {
 
     private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
         VStack {
-            ProfileImage(imageStr: mem.image, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
             if mem.verified {
@@ -338,20 +332,20 @@ struct GroupMemberInfoView: View {
     }
 
     private func verifyCodeButton(_ code: String) -> some View {
-        let member = groupMember.wrapped
-        return NavigationLink {
+        NavigationLink {
             VerifyCodeView(
                 displayName: member.displayName,
                 connectionCode: code,
                 connectionVerified: member.verified,
                 verify: { code in
-                    var member = groupMember.wrapped
                     if let r = apiVerifyGroupMember(member.groupId, member.groupMemberId, connectionCode: code) {
                         let (verified, existingCode) = r
                         let connCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         member.activeConn?.connectionCode = connCode
-                        _ = chatModel.upsertGroupMember(groupInfo, member)
+                        if let i = chatModel.groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+                            chatModel.groupMembers[i].activeConn?.connectionCode = connCode
+                        }
                         return r
                     }
                     return nil
@@ -385,78 +379,12 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    @ViewBuilder private func adminDestructiveSection(_ mem: GroupMember) -> some View {
-        let canBlockForAll = mem.canBlockForAll(groupInfo: groupInfo)
-        let canRemove = mem.canBeRemoved(groupInfo: groupInfo)
-        if canBlockForAll || canRemove {
-            Section {
-                if canBlockForAll {
-                    if mem.blockedByAdmin {
-                        unblockForAllButton(mem)
-                    } else {
-                        blockForAllButton(mem)
-                    }
-                }
-                if canRemove {
-                    removeMemberButton(mem)
-                }
-            }
-        }
-    }
-
-    private func nonAdminBlockSection(_ mem: GroupMember) -> some View {
-        Section {
-            if mem.blockedByAdmin {
-                Label("Blocked by admin", systemImage: "hand.raised")
-                    .foregroundColor(.secondary)
-            } else if mem.memberSettings.showMessages {
-                blockMemberButton(mem)
-            } else {
-                unblockMemberButton(mem)
-            }
-        }
-    }
-
-    private func blockForAllButton(_ mem: GroupMember) -> some View {
-        Button(role: .destructive) {
-            alert = .blockForAllAlert(mem: mem)
-        } label: {
-            Label("Block for all", systemImage: "hand.raised")
-                .foregroundColor(.red)
-        }
-    }
-
-    private func unblockForAllButton(_ mem: GroupMember) -> some View {
-        Button {
-            alert = .unblockForAllAlert(mem: mem)
-        } label: {
-            Label("Unblock for all", systemImage: "hand.raised.slash")
-        }
-    }
-
-    private func blockMemberButton(_ mem: GroupMember) -> some View {
-        Button(role: .destructive) {
-            alert = .blockMemberAlert(mem: mem)
-        } label: {
-            Label("Block member", systemImage: "hand.raised")
-                .foregroundColor(.red)
-        }
-    }
-
-    private func unblockMemberButton(_ mem: GroupMember) -> some View {
-        Button {
-            alert = .unblockMemberAlert(mem: mem)
-        } label: {
-            Label("Unblock member", systemImage: "hand.raised.slash")
-        }
-    }
-
     private func removeMemberButton(_ mem: GroupMember) -> some View {
         Button(role: .destructive) {
             alert = .removeMemberAlert(mem: mem)
         } label: {
             Label("Remove member", systemImage: "trash")
-                .foregroundColor(.red)
+                .foregroundColor(Color.red)
         }
     }
 
@@ -492,6 +420,7 @@ struct GroupMemberInfoView: View {
                     do {
                         let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
                         await MainActor.run {
+                            member = updatedMember
                             _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                         }
                         
@@ -512,10 +441,10 @@ struct GroupMemberInfoView: View {
     private func switchMemberAddress() {
         Task {
             do {
-                let stats = try apiSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                     dismiss()
                 }
             } catch let error {
@@ -531,10 +460,10 @@ struct GroupMemberInfoView: View {
     private func abortSwitchMemberAddress() {
         Task {
             do {
-                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                 }
             } catch let error {
                 logger.error("abortSwitchMemberAddress apiAbortSwitchGroupMember error: \(responseError(error))")
@@ -549,7 +478,7 @@ struct GroupMemberInfoView: View {
     private func syncMemberConnection(force: Bool) {
         Task {
             do {
-                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, groupMember.groupMemberId, force)
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, force)
                 connectionStats = stats
                 await MainActor.run {
                     chatModel.updateGroupMemberConnectionStats(groupInfo, mem, stats)
@@ -566,89 +495,11 @@ struct GroupMemberInfoView: View {
     }
 }
 
-func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Block member?"),
-        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
-        primaryButton: .destructive(Text("Block")) {
-            toggleShowMemberMessages(gInfo, mem, false)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func unblockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Unblock member?"),
-        message: Text("Messages from \(mem.chatViewName) will be shown!"),
-        primaryButton: .default(Text("Unblock")) {
-            toggleShowMemberMessages(gInfo, mem, true)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func toggleShowMemberMessages(_ gInfo: GroupInfo, _ member: GroupMember, _ showMessages: Bool) {
-    var memberSettings = member.memberSettings
-    memberSettings.showMessages = showMessages
-    updateMemberSettings(gInfo, member, memberSettings)
-}
-
-func updateMemberSettings(_ gInfo: GroupInfo, _ member: GroupMember, _ memberSettings: GroupMemberSettings) {
-    Task {
-        do {
-            try await apiSetMemberSettings(gInfo.groupId, member.groupMemberId, memberSettings)
-            await MainActor.run {
-                var mem = member
-                mem.memberSettings = memberSettings
-                _ = ChatModel.shared.upsertGroupMember(gInfo, mem)
-            }
-        } catch let error {
-            logger.error("apiSetMemberSettings error \(responseError(error))")
-        }
-    }
-}
-
-func blockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Block member for all?"),
-        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
-        primaryButton: .destructive(Text("Block for all")) {
-            blockMemberForAll(gInfo, mem, true)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func unblockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Unblock member for all?"),
-        message: Text("Messages from \(mem.chatViewName) will be shown!"),
-        primaryButton: .default(Text("Unblock for all")) {
-            blockMemberForAll(gInfo, mem, false)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func blockMemberForAll(_ gInfo: GroupInfo, _ member: GroupMember, _ blocked: Bool) {
-    Task {
-        do {
-            let updatedMember = try await apiBlockMemberForAll(gInfo.groupId, member.groupMemberId, blocked)
-            await MainActor.run {
-                _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
-            }
-        } catch let error {
-            logger.error("apiBlockMemberForAll error: \(responseError(error))")
-        }
-    }
-}
-
 struct GroupMemberInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
-            groupMember: GMember.sampleData
+            member: GroupMember.sampleData
         )
     }
 }

apps/ios/Shared/Views/Chat/Group/GroupPreferencesView.swift

@@ -9,12 +9,6 @@
 import SwiftUI
 import SimpleXChat
 
-private let featureRoles: [(role: GroupMemberRole?, text: LocalizedStringKey)] = [
-    (nil, "all members"),
-    (.admin, "admins"),
-    (.owner, "owners")
-]
-
 struct GroupPreferencesView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var chatModel: ChatModel
@@ -30,13 +24,11 @@ struct GroupPreferencesView: View {
             List {
                 featureSection(.timedMessages, $preferences.timedMessages.enable)
                 featureSection(.fullDelete, $preferences.fullDelete.enable)
-                featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
+                featureSection(.directMessages, $preferences.directMessages.enable)
                 featureSection(.reactions, $preferences.reactions.enable)
-                featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
-                featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                // TODO enable simplexLinks preference in 5.8
-                // featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
-                featureSection(.history, $preferences.history.enable)
+                featureSection(.voice, $preferences.voice.enable)
+//                TODO uncomment in 5.3
+//                featureSection(.files, $preferences.files.enable)
 
                 if groupInfo.canEdit {
                     Section {
@@ -56,7 +48,7 @@ struct GroupPreferencesView: View {
                 preferences.timedMessages.ttl = currentPreferences.timedMessages.ttl
             }
         }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
+        .modifier(BackButton {
             if currentPreferences == preferences {
                 dismiss()
             } else {
@@ -72,7 +64,7 @@ struct GroupPreferencesView: View {
         }
     }
 
-    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>, _ enableForRole: Binding<GroupMemberRole?>? = nil) -> some View {
+    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>) -> some View {
         Section {
             let color: Color = enableFeature.wrappedValue == .on ? .green : .secondary
             let icon = enableFeature.wrappedValue == .on ? feature.iconFilled : feature.icon
@@ -95,16 +87,6 @@ struct GroupPreferencesView: View {
                     )
                     .frame(height: 36)
                 }
-                if enableFeature.wrappedValue == .on, let enableForRole {
-                    Picker("Enabled for", selection: enableForRole) {
-                        ForEach(featureRoles, id: \.role) { fr in
-                            Text(fr.text)
-                        }
-                    }
-                    .frame(height: 36)
-                    // remove in v5.8
-                    .disabled(true)
-                }
             } else {
                 settingsRow(icon, color: color) {
                     infoRow(Text(feature.text), enableFeature.wrappedValue.text)
@@ -112,25 +94,10 @@ struct GroupPreferencesView: View {
                 if timedOn {
                     infoRow("Delete after", timeText(preferences.timedMessages.ttl))
                 }
-                if enableFeature.wrappedValue == .on, let enableForRole {
-                    HStack {
-                        Text("Enabled for").foregroundColor(.secondary)
-                        Spacer()
-                        Text(
-                            featureRoles.first(where: { fr in fr.role == enableForRole.wrappedValue })?.text
-                            ?? "all members"
-                        )
-                        .foregroundColor(.secondary)
-                    }
-                }
             }
         } footer: {
             Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.canEdit))
-        }
-        .onChange(of: enableFeature.wrappedValue) { enabled in
-            if case .off = enabled {
-                enableForRole?.wrappedValue = nil
-            }
+                .frame(height: 36, alignment: .topLeading)
         }
     }
 

apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift

@@ -9,18 +9,6 @@
 import SwiftUI
 import SimpleXChat
 
-enum GroupProfileAlert: Identifiable {
-    case saveError(err: String)
-    case invalidName(validName: String)
-
-    var id: String {
-        switch self {
-        case let .saveError(err): return "saveError \(err)"
-        case let .invalidName(validName): return "invalidName \(validName)"
-        }
-    }
-}
-
 struct GroupProfileView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -30,7 +18,8 @@ struct GroupProfileView: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: GroupProfileAlert?
+    @State private var showSaveErrorAlert = false
+    @State private var saveGroupError: String? = nil
     @FocusState private var focusDisplayName
 
     var body: some View {
@@ -58,29 +47,20 @@ struct GroupProfileView: View {
             .frame(maxWidth: .infinity, alignment: .center)
 
             VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
-                    if !validNewProfileName() {
-                        Button {
-                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
-                        } label: {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
+                ZStack(alignment: .leading) {
+                    if !validDisplayName(groupProfile.displayName) {
+                        Image(systemName: "exclamationmark.circle")
+                            .foregroundColor(.red)
+                            .padding(.bottom, 10)
                     }
                     profileNameTextEdit("Group display name", $groupProfile.displayName)
                         .focused($focusDisplayName)
                 }
-                .padding(.bottom)
-                let fullName = groupInfo.groupProfile.fullName
-                if fullName != "" && fullName != groupProfile.displayName {
-                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
-                        .padding(.bottom)
-                }
+                profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
                 HStack(spacing: 20) {
                     Button("Cancel") { dismiss() }
                     Button("Save group profile") { saveProfile() }
-                        .disabled(!canUpdateProfile())
+                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
                 }
             }
             .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -103,10 +83,8 @@ struct GroupProfileView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
             }
         }
         .onChange(of: chosenImage) { image in
@@ -121,39 +99,27 @@ struct GroupProfileView: View {
                 focusDisplayName = true
             }
         }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .saveError(err):
-                return Alert(
-                    title: Text("Error saving group profile"),
-                    message: Text(err)
-                )
-            case let .invalidName(name):
-                return createInvalidNameAlert(name, $groupProfile.displayName)
-            }
+        .alert(isPresented: $showSaveErrorAlert) {
+            Alert(
+                title: Text("Error saving group profile"),
+                message: Text("\(saveGroupError ?? "Unexpected error")")
+            )
         }
         .contentShape(Rectangle())
         .onTapGesture { hideKeyboard() }
     }
 
-    private func canUpdateProfile() -> Bool {
-        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
-    }
-
-    private func validNewProfileName() -> Bool {
-        groupProfile.displayName == groupInfo.groupProfile.displayName
-            || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
-    }
-
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func saveProfile() {
         Task {
             do {
-                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
                     groupInfo = gInfo
@@ -162,7 +128,8 @@ struct GroupProfileView: View {
                 }
             } catch let error {
                 let err = responseError(error)
-                alert = .saveError(err: err)
+                saveGroupError = err
+                showSaveErrorAlert = true
                 logger.error("GroupProfile apiUpdateGroup error: \(err)")
             }
         }

apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift

@@ -11,32 +11,29 @@ import SimpleXChat
 
 struct GroupWelcomeView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject private var m: ChatModel
+    var groupId: Int64
     @Binding var groupInfo: GroupInfo
-    @State var groupProfile: GroupProfile
-    @State var welcomeText: String
+    @State private var welcomeText: String = ""
     @State private var editMode = true
     @FocusState private var keyboardVisible: Bool
     @State private var showSaveDialog = false
 
-    let maxByteCount = 1200
-
     var body: some View {
         VStack {
             if groupInfo.canEdit {
                 editorView()
-                    .modifier(BackButton(disabled: Binding.constant(false)) {
-                        if welcomeTextUnchanged() {
+                    .modifier(BackButton {
+                        if welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil) {
                             dismiss()
                         } else {
                             showSaveDialog = true
                         }
                     })
-                    .confirmationDialog(
-                        welcomeTextFitsLimit() ? "Save welcome message?" : "Welcome message is too long",
-                        isPresented: $showSaveDialog
-                    ) {
-                        if welcomeTextFitsLimit() {
-                            Button("Save and update group profile") { save() }
+                    .confirmationDialog("Save welcome message?", isPresented: $showSaveDialog) {
+                        Button("Save and update group profile") {
+                            save()
+                            dismiss()
                         }
                         Button("Exit without saving") { dismiss() }
                     }
@@ -50,15 +47,15 @@ struct GroupWelcomeView: View {
             }
         }
         .onAppear {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                keyboardVisible = true
-            }
+            welcomeText = groupInfo.groupProfile.description ?? ""
+            keyboardVisible = true
         }
     }
 
     private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
-            .frame(minHeight: 130, alignment: .topLeading)
+        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil)
+            .allowsHitTesting(false)
+            .frame(minHeight: 140, alignment: .topLeading)
             .frame(maxWidth: .infinity, alignment: .leading)
     }
 
@@ -78,7 +75,7 @@ struct GroupWelcomeView: View {
                         }
                         .padding(.horizontal, -5)
                         .padding(.top, -8)
-                        .frame(height: 130, alignment: .topLeading)
+                        .frame(height: 140, alignment: .topLeading)
                         .frame(maxWidth: .infinity, alignment: .leading)
                     }
                 } else {
@@ -97,9 +94,6 @@ struct GroupWelcomeView: View {
                 }
                 .disabled(welcomeText.isEmpty)
                 copyButton()
-            } footer: {
-                Text(!welcomeTextFitsLimit() ? "Message too large" : "")
-                    .foregroundColor(.red)
             }
 
             Section {
@@ -120,15 +114,7 @@ struct GroupWelcomeView: View {
         Button("Save and update group profile") {
             save()
         }
-        .disabled(welcomeTextUnchanged() || !welcomeTextFitsLimit())
-    }
-
-    private func welcomeTextUnchanged() -> Bool {
-        welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil)
-    }
-
-    private func welcomeTextFitsLimit() -> Bool {
-        chatJsonLength(welcomeText) <= maxByteCount
+        .disabled(welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil))
     }
 
     private func save() {
@@ -138,13 +124,11 @@ struct GroupWelcomeView: View {
                 if welcome?.count == 0 {
                     welcome = nil
                 }
-                groupProfile.description = welcome
-                let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
-                await MainActor.run {
-                    groupInfo = gInfo
-                    ChatModel.shared.updateGroup(gInfo)
-                    dismiss()
-                }
+                var groupProfileUpdated = groupInfo.groupProfile
+                groupProfileUpdated.description = welcome
+                groupInfo = try await apiUpdateGroup(groupId, groupProfileUpdated)
+                m.updateGroup(groupInfo)
+                welcomeText = welcome ?? ""
             } catch let error {
                 logger.error("apiUpdateGroup error: \(responseError(error))")
             }
@@ -154,6 +138,6 @@ struct GroupWelcomeView: View {
 
 struct GroupWelcomeView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupProfileView(groupInfo: Binding.constant(GroupInfo.sampleData), groupProfile: GroupProfile.sampleData)
+        GroupWelcomeView(groupId: 1, groupInfo: Binding.constant(GroupInfo.sampleData))
     }
 }

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

@@ -17,7 +17,7 @@ struct ScanCodeView: View {
 
     var body: some View {
         VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
             Text("Scan security code from your contact's app.")

apps/ios/Shared/Views/ChatList/ChatHelp.swift

@@ -11,7 +11,7 @@ import SwiftUI
 struct ChatHelp: View {
     @EnvironmentObject var chatModel: ChatModel
     @Binding var showSettings: Bool
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
+    @State private var showAddChat = false
 
     var body: some View {
         ScrollView { chatHelp() }
@@ -39,12 +39,13 @@ struct ChatHelp: View {
 
                 HStack(spacing: 8) {
                     Text("Tap button ")
-                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                    NewChatButton(showAddChat: $showAddChat)
                     Text("above, then choose:")
                 }
 
-                Text("**Add contact**: to create a new invitation link, or connect via a link you received.")
-                Text("**Create group**: to create a new group.")
+                Text("**Create link / QR code** for your contact to use.")
+                Text("**Paste received link** or open it in the browser and tap **Open in mobile app**.")
+                Text("**Scan QR code**: to connect to your contact in person or via video call.")
             }
             .padding(.top, 24)
 

apps/ios/Shared/Views/ChatList/ChatListNavLink.swift

@@ -32,112 +32,55 @@ struct ChatListNavLink: View {
     @State private var showJoinGroupDialog = false
     @State private var showContactConnectionInfo = false
     @State private var showInvalidJSON = false
-    @State private var showDeleteContactActionSheet = false
-    @State private var showConnectContactViaAddressDialog = false
-    @State private var inProgress = false
-    @State private var progressByTimeout = false
 
     var body: some View {
-        Group {
-            switch chat.chatInfo {
-            case let .direct(contact):
-                contactNavLink(contact)
-            case let .group(groupInfo):
-                groupNavLink(groupInfo)
-            case let .local(noteFolder):
-                noteFolderNavLink(noteFolder)
-            case let .contactRequest(cReq):
-                contactRequestNavLink(cReq)
-            case let .contactConnection(cConn):
-                contactConnectionNavLink(cConn)
-            case let .invalidJSON(json):
-                invalidJSONPreview(json)
-            }
-        }
-        .onChange(of: inProgress) { inProgress in
-            if inProgress {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    progressByTimeout = inProgress
-                }
-            } else {
-                progressByTimeout = false
-            }
+        switch chat.chatInfo {
+        case let .direct(contact):
+            contactNavLink(contact)
+        case let .group(groupInfo):
+            groupNavLink(groupInfo)
+        case let .contactRequest(cReq):
+            contactRequestNavLink(cReq)
+        case let .contactConnection(cConn):
+            contactConnectionNavLink(cConn)
+        case let .invalidJSON(json):
+            invalidJSONPreview(json)
         }
     }
 
     @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil {
-                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: rowHeights[dynamicTypeSize])
-                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                        Button {
-                            showDeleteContactActionSheet = true
-                        } label: {
-                            Label("Delete", systemImage: "trash")
-                        }
-                        .tint(.red)
-                    }
-                    .onTapGesture { showConnectContactViaAddressDialog = true }
-                    .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-                        Button("Use current profile") { connectContactViaAddress_(contact, false) }
-                        Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-                    }
-            } else {
-                NavLinkPlain(
-                    tag: chat.chatInfo.id,
-                    selection: $chatModel.chatId,
-                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
-                )
-                .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                    markReadButton()
-                    toggleFavoriteButton()
-                    ToggleNtfsButton(chat: chat)
-                }
-                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                    if !chat.chatItems.isEmpty {
-                        clearChatButton()
-                    }
-                    Button {
-                        if contact.ready || !contact.active {
-                            showDeleteContactActionSheet = true
-                        } else {
-                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
-                        }
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
-                    .tint(.red)
-                }
-                .frame(height: rowHeights[dynamicTypeSize])
-            }
+        NavLinkPlain(
+            tag: chat.chatInfo.id,
+            selection: $chatModel.chatId,
+            label: { ChatPreviewView(chat: chat) }
+        )
+        .swipeActions(edge: .leading, allowsFullSwipe: true) {
+            markReadButton()
+            toggleFavoriteButton()
+            toggleNtfsButton(chat)
         }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.ready && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
-                        .cancel()
-                    ]
-                )
-            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
-                        .cancel()
-                    ]
-                )
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            if !chat.chatItems.isEmpty {
+                clearChatButton()
             }
+            Button {
+                AlertManager.shared.showAlert(
+                    contact.ready
+                    ? deleteContactAlert(chat.chatInfo)
+                    : deletePendingContactAlert(chat, contact)
+                )
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
         }
+        .frame(height: rowHeights[dynamicTypeSize])
     }
 
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
-            ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
@@ -148,16 +91,12 @@ struct ChatListNavLink: View {
                 .onTapGesture { showJoinGroupDialog = true }
                 .confirmationDialog("Group invitation", isPresented: $showJoinGroupDialog, titleVisibility: .visible) {
                     Button(chat.chatInfo.incognito ? "Join incognito" : "Join group") {
-                        inProgress = true
-                        joinGroup(groupInfo.groupId) {
-                            await MainActor.run { inProgress = false }
-                        }
+                        joinGroup(groupInfo.groupId)
                     }
                     Button("Delete invitation", role: .destructive) { Task { await deleteChat(chat) } }
                 }
-                .disabled(inProgress)
         case .memAccepted:
-            ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
@@ -174,14 +113,14 @@ struct ChatListNavLink: View {
             NavLinkPlain(
                 tag: chat.chatInfo.id,
                 selection: $chatModel.chatId,
-                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
+                label: { ChatPreviewView(chat: chat) },
                 disabled: !groupInfo.ready
             )
             .frame(height: rowHeights[dynamicTypeSize])
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
                 markReadButton()
                 toggleFavoriteButton()
-                ToggleNtfsButton(chat: chat)
+                toggleNtfsButton(chat)
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 if !chat.chatItems.isEmpty {
@@ -197,30 +136,9 @@ struct ChatListNavLink: View {
         }
     }
 
-    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
-        NavLinkPlain(
-            tag: chat.chatInfo.id,
-            selection: $chatModel.chatId,
-            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
-            disabled: !noteFolder.ready
-        )
-        .frame(height: rowHeights[dynamicTypeSize])
-        .swipeActions(edge: .leading, allowsFullSwipe: true) {
-            markReadButton()
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            if !chat.chatItems.isEmpty {
-                clearNoteFolderButton()
-            }
-        }
-    }
-
     private func joinGroupButton() -> some View {
         Button {
-            inProgress = true
-            joinGroup(chat.chatInfo.apiId) {
-                await MainActor.run { inProgress = false }
-            }
+            joinGroup(chat.chatInfo.apiId)
         } label: {
             Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
@@ -273,15 +191,6 @@ struct ChatListNavLink: View {
         .tint(Color.orange)
     }
 
-    private func clearNoteFolderButton() -> some View {
-        Button {
-            AlertManager.shared.showAlert(clearNoteFolderAlert())
-        } label: {
-            Label("Clear", systemImage: "gobackward")
-        }
-        .tint(Color.orange)
-    }
-
     private func leaveGroupChatButton(_ groupInfo: GroupInfo) -> some View {
         Button {
             AlertManager.shared.showAlert(leaveGroupAlert(groupInfo))
@@ -360,6 +269,17 @@ struct ChatListNavLink: View {
         }
     }
 
+    private func deleteContactAlert(_ chatInfo: ChatInfo) -> Alert {
+        Alert(
+            title: Text("Delete contact?"),
+            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
+            primaryButton: .destructive(Text("Delete")) {
+                Task { await deleteChat(chat) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group?"),
@@ -386,17 +306,6 @@ struct ChatListNavLink: View {
         )
     }
 
-    private func clearNoteFolderAlert() -> Alert {
-        Alert(
-            title: Text("Clear private notes?"),
-            message: Text("All messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Clear")) {
-                Task { await clearChat(chat) }
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
     private func leaveGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Leave group?"),
@@ -472,17 +381,6 @@ struct ChatListNavLink: View {
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
             }
     }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
-            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
-            }
-        }
-    }
 }
 
 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
@@ -511,22 +409,7 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
     )
 }
 
-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
-    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
-    if let alert = alert {
-        AlertManager.shared.showAlert(alert)
-        return false
-    } else if let contact = contact {
-        await MainActor.run {
-            ChatModel.shared.updateContact(contact)
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
-        }
-        return true
-    }
-    return false
-}
-
-func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
+func joinGroup(_ groupId: Int64) {
     Task {
         logger.debug("joinGroup")
         do {
@@ -541,9 +424,7 @@ func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
                 AlertManager.shared.showAlertMsg(title: "No group!", message: "This group no longer exists.")
                 await deleteGroup()
             }
-            await onComplete()
         } catch let error {
-            await onComplete()
             let a = getErrorAlert(error, "Error joining group")
             AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
         }

apps/ios/Shared/Views/ChatList/ChatListView.swift

@@ -12,14 +12,9 @@ import SimpleXChat
 struct ChatListView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Binding var showSettings: Bool
-    @State private var searchMode = false
-    @FocusState private var searchFocussed
     @State private var searchText = ""
-    @State private var searchShowingSimplexLink = false
-    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
+    @State private var showAddChat = false
     @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
 
     var body: some View {
@@ -34,7 +29,7 @@ struct ChatListView: View {
         ZStack(alignment: .topLeading) {
             NavStackCompat(
                 isActive: Binding(
-                    get: { chatModel.chatId != nil },
+                    get: { ChatModel.shared.chatId != nil },
                     set: { _ in }
                 ),
                 destination: chatView
@@ -53,20 +48,17 @@ struct ChatListView: View {
                     }
                 }
             }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
+            UserPicker(showSettings: $showSettings, userPickerVisible: $userPickerVisible)
         }
     }
 
     private var chatListView: some View {
         VStack {
-            chatList
+            if chatModel.chats.count > 0 {
+                chatList.searchable(text: $searchText)
+            } else {
+                chatList
+            }
         }
         .onDisappear() { withAnimation { userPickerVisible = false } }
         .refreshable {
@@ -85,14 +77,15 @@ struct ChatListView: View {
                 secondaryButton: .cancel()
             ))
         }
+        .offset(x: -8)
         .listStyle(.plain)
         .navigationBarTitleDisplayMode(.inline)
-        .navigationBarHidden(searchMode)
         .toolbar {
             ToolbarItem(placement: .navigationBarLeading) {
                 let user = chatModel.currentUser ?? User.sampleData
                 ZStack(alignment: .topTrailing) {
-                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
+                    ProfileImage(imageStr: user.image, color: Color(uiColor: .quaternaryLabel))
+                        .frame(width: 32, height: 32)
                         .padding(.trailing, 4)
                     let allRead = chatModel.users
                         .filter { u in !u.user.activeUser && !u.user.hidden }
@@ -123,7 +116,7 @@ struct ChatListView: View {
             }
             ToolbarItem(placement: .navigationBarTrailing) {
                 switch chatModel.chatRunning {
-                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                case .some(true): NewChatButton(showAddChat: $showAddChat)
                 case .some(false): chatStoppedIcon()
                 case .none: EmptyView()
                 }
@@ -143,25 +136,11 @@ struct ChatListView: View {
     @ViewBuilder private var chatList: some View {
         let cs = filteredChats()
         ZStack {
-            VStack {
-                List {
-                    if !chatModel.chats.isEmpty {
-                        ChatListSearchBar(
-                            searchMode: $searchMode,
-                            searchFocussed: $searchFocussed,
-                            searchText: $searchText,
-                            searchShowingSimplexLink: $searchShowingSimplexLink,
-                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
-                        )
-                        .listRowSeparator(.hidden)
-                        .frame(maxWidth: .infinity)
-                    }
-                    ForEach(cs, id: \.viewId) { chat in
-                        ChatListNavLink(chat: chat)
-                            .padding(.trailing, -16)
-                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
-                    }
-                    .offset(x: -8)
+            List {
+                ForEach(cs, id: \.viewId) { chat in
+                    ChatListNavLink(chat: chat)
+                        .padding(.trailing, -16)
+                        .disabled(chatModel.chatRunning != true)
                 }
             }
             .onChange(of: chatModel.chatId) { _ in
@@ -195,9 +174,16 @@ struct ChatListView: View {
             .padding(.trailing, 12)
 
             connectButton("Tap to start a new chat") {
-                newChatMenuOption = .newContact
+                showAddChat = true
             }
 
+            connectButton("or chat with the developers") {
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(simplexTeamURL)
+                }
+            }
+            .padding(.top, 10)
+
             Spacer()
             Text("You have no chats")
                 .foregroundColor(.secondary)
@@ -227,27 +213,22 @@ struct ChatListView: View {
     }
 
     private func filteredChats() -> [Chat] {
-        if let linkChatId = searchChatFilteredBySimplexLink {
-            return chatModel.chats.filter { $0.id == linkChatId }
-        } else {
-            let s = searchString()
-            return s == "" && !showUnreadAndFavorites
+        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+        return s == "" && !showUnreadAndFavorites
             ? chatModel.chats
             : chatModel.chats.filter { chat in
                 let cInfo = chat.chatInfo
                 switch cInfo {
                 case let .direct(contact):
                     return s == ""
-                    ? filtered(chat)
-                    : (viewNameContains(cInfo, s) ||
-                       contact.profile.displayName.localizedLowercase.contains(s) ||
-                       contact.fullName.localizedLowercase.contains(s))
+                            ? filtered(chat)
+                            : (viewNameContains(cInfo, s) ||
+                               contact.profile.displayName.localizedLowercase.contains(s) ||
+                               contact.fullName.localizedLowercase.contains(s))
                 case let .group(gInfo):
                     return s == ""
-                    ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
-                    : viewNameContains(cInfo, s)
-                case .local:
-                    return s == "" || viewNameContains(cInfo, s)
+                            ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
+                            : viewNameContains(cInfo, s)
                 case .contactRequest:
                     return s == "" || viewNameContains(cInfo, s)
                 case let .contactConnection(conn):
@@ -256,16 +237,9 @@ struct ChatListView: View {
                     return false
                 }
             }
-        }
-
-        func searchString() -> String {
-            searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-        }
 
         func filtered(_ chat: Chat) -> Bool {
-            (chat.chatInfo.chatSettings?.favorite ?? false) ||
-            chat.chatStats.unreadChat ||
-            (chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0)
+            (chat.chatInfo.chatSettings?.favorite ?? false) || chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
         }
 
         func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
@@ -274,121 +248,6 @@ struct ChatListView: View {
     }
 }
 
-struct ChatListSearchBar: View {
-    @EnvironmentObject var m: ChatModel
-    @Binding var searchMode: Bool
-    @FocusState.Binding var searchFocussed: Bool
-    @Binding var searchText: String
-    @Binding var searchShowingSimplexLink: Bool
-    @Binding var searchChatFilteredBySimplexLink: String?
-    @State private var ignoreSearchTextChange = false
-    @State private var showScanCodeSheet = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        VStack(spacing: 12) {
-            HStack(spacing: 12) {
-                HStack(spacing: 4) {
-                    Image(systemName: "magnifyingglass")
-                    TextField("Search or paste SimpleX link", text: $searchText)
-                        .foregroundColor(searchShowingSimplexLink ? .secondary : .primary)
-                        .disabled(searchShowingSimplexLink)
-                        .focused($searchFocussed)
-                        .frame(maxWidth: .infinity)
-                    if !searchText.isEmpty {
-                        Image(systemName: "xmark.circle.fill")
-                            .onTapGesture {
-                                searchText = ""
-                            }
-                    } else if !searchFocussed {
-                        HStack(spacing: 24) {
-                            if m.pasteboardHasStrings {
-                                Image(systemName: "doc")
-                                    .onTapGesture {
-                                        if let str = UIPasteboard.general.string {
-                                            searchText = str
-                                        }
-                                    }
-                            }
-
-                            Image(systemName: "qrcode")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 20, height: 20)
-                                .onTapGesture {
-                                    showScanCodeSheet = true
-                                }
-                        }
-                        .padding(.trailing, 2)
-                    }
-                }
-                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
-                .foregroundColor(.secondary)
-                .background(Color(.tertiarySystemFill))
-                .cornerRadius(10.0)
-
-                if searchFocussed {
-                    Text("Cancel")
-                        .foregroundColor(.accentColor)
-                        .onTapGesture {
-                            searchText = ""
-                            searchFocussed = false
-                        }
-                }
-            }
-            Divider()
-        }
-        .sheet(isPresented: $showScanCodeSheet) {
-            NewChatView(selection: .connect, showQRCodeScanner: true)
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
-        }
-        .onChange(of: searchFocussed) { sf in
-            withAnimation { searchMode = sf }
-        }
-        .onChange(of: searchText) { t in
-            if ignoreSearchTextChange {
-                ignoreSearchTextChange = false
-            } else {
-                if let link = strHasSingleSimplexLink(t.trimmingCharacters(in: .whitespaces)) { // if SimpleX link is pasted, show connection dialogue
-                    searchFocussed = false
-                    if case let .simplexLink(linkType, _, smpHosts) = link.format {
-                        ignoreSearchTextChange = true
-                        searchText = simplexLinkText(linkType, smpHosts)
-                    }
-                    searchShowingSimplexLink = true
-                    searchChatFilteredBySimplexLink = nil
-                    connect(link.text)
-                } else {
-                    if t != "" { // if some other text is pasted, enter search mode
-                        searchFocussed = true
-                    }
-                    searchShowingSimplexLink = false
-                    searchChatFilteredBySimplexLink = nil
-                }
-            }
-        }
-        .alert(item: $alert) { a in
-            planAndConnectAlert(a, dismiss: true, cleanup: { searchText = "" })
-        }
-        .actionSheet(item: $sheet) { s in
-            planAndConnectActionSheet(s, dismiss: true, cleanup: { searchText = "" })
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: false,
-            incognito: nil,
-            filterKnownContact: { searchChatFilteredBySimplexLink = $0.id },
-            filterKnownGroup: { searchChatFilteredBySimplexLink = $0.id }
-        )
-    }
-}
-
 func chatStoppedIcon() -> some View {
     Button {
         AlertManager.shared.showAlertMsg(

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -12,8 +12,6 @@ import SimpleXChat
 struct ChatPreviewView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var chat: Chat
-    @Binding var progressByTimeout: Bool
-    @State var deleting: Bool = false
     @Environment(\.colorScheme) var colorScheme
     var darkGreen = Color(red: 0, green: 0.5, blue: 0)
 
@@ -23,7 +21,8 @@ struct ChatPreviewView: View {
         let cItem = chat.chatItems.last
         return HStack(spacing: 8) {
             ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat, size: 63)
+                ChatInfoImage(chat: chat)
+                    .frame(width: 63, height: 63)
                 chatPreviewImageOverlayIcon()
                     .padding([.bottom, .trailing], 1)
             }
@@ -33,7 +32,7 @@ struct ChatPreviewView: View {
                 HStack(alignment: .top) {
                     chatPreviewTitle()
                     Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.updatedAt))
                         .font(.subheadline)
                         .frame(minWidth: 60, alignment: .trailing)
                         .foregroundColor(.secondary)
@@ -55,32 +54,22 @@ struct ChatPreviewView: View {
             .frame(maxHeight: .infinity)
         }
         .padding(.bottom, -8)
-        .onChange(of: chatModel.deletedChats.contains(chat.chatInfo.id)) { contains in
-            deleting = contains
-        }
     }
 
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            if !contact.active {
-                inactiveIcon()
-            } else {
-                EmptyView()
-            }
-        case let .group(groupInfo):
+        if case let .group(groupInfo) = chat.chatInfo {
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: inactiveIcon()
-            case .memRemoved: inactiveIcon()
-            case .memGroupDeleted: inactiveIcon()
+            case .memLeft: groupInactiveIcon()
+            case .memRemoved: groupInactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
             default: EmptyView()
             }
-        default:
+        } else {
             EmptyView()
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    @ViewBuilder private func groupInactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -90,13 +79,14 @@ struct ChatPreviewView: View {
         let t = Text(chat.chatInfo.chatViewName).font(.title3).fontWeight(.bold)
         switch chat.chatInfo {
         case let .direct(contact):
-            previewTitle(contact.verified == true ? verifiedIcon + t : t).foregroundColor(deleting ? Color.secondary : nil)
+            previewTitle(contact.verified == true ? verifiedIcon + t : t)
+                .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
         case let .group(groupInfo):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
-            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : .accentColor)
+            case .memInvited: v.foregroundColor(chat.chatInfo.incognito ? .indigo : .accentColor)
             case .memAccepted: v.foregroundColor(.secondary)
-            default: if deleting  { v.foregroundColor(.secondary) } else { v }
+            default: v
             }
         default: previewTitle(t)
         }
@@ -115,17 +105,14 @@ struct ChatPreviewView: View {
 
     private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
         ZStack(alignment: .topTrailing) {
-            let t = text
+            text
                 .lineLimit(2)
                 .multilineTextAlignment(.leading)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-            if !showChatPreviews && !draft {
-                t.privacySensitive(true).redacted(reason: .privacy)
-            } else {
-                t
-            }
+                .privacySensitive(!showChatPreviews && !draft)
+                .redacted(reason: .privacy)
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -133,9 +120,9 @@ struct ChatPreviewView: View {
                     .foregroundColor(.white)
                     .padding(.horizontal, 4)
                     .frame(minWidth: 18, minHeight: 18)
-                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? Color.accentColor : Color.secondary)
+                    .background(chat.chatInfo.ntfsEnabled ? Color.accentColor : Color.secondary)
                     .cornerRadius(10)
-            } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
+            } else if !chat.chatInfo.ntfsEnabled {
                 Image(systemName: "speaker.slash.fill")
                     .foregroundColor(.secondary)
             } else if chat.chatInfo.chatSettings?.favorite ?? false {
@@ -153,7 +140,7 @@ struct ChatPreviewView: View {
         let msg = draft.message
         return image("rectangle.and.pencil.and.ellipsis", color: .accentColor)
                 + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false)
+                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true)
 
         func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
             Text(Image(systemName: s)).foregroundColor(color) + Text(" ")
@@ -170,20 +157,9 @@ struct ChatPreviewView: View {
     }
 
     func chatItemPreview(_ cItem: ChatItem) -> Text {
-        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
+        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
         let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)
-
-        // same texts are in markedDeletedText in MarkedDeletedItemView, but it returns LocalizedStringKey;
-        // can be refactored into a single function if functions calling these are changed to return same type
-        func markedDeletedText() -> String {
-            switch cItem.meta.itemDeleted {
-            case let .moderated(_, byGroupMember): String.localizedStringWithFormat(NSLocalizedString("moderated by %@", comment: "marked deleted chat item preview text"), byGroupMember.displayName)
-            case .blocked: NSLocalizedString("blocked", comment: "marked deleted chat item preview text")
-            case .blockedByAdmin: NSLocalizedString("blocked by admin", comment: "marked deleted chat item preview text")
-            case .deleted, nil: NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
-            }
-        }
+        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true)
 
         func attachment() -> String? {
             switch cItem.content.msgContent {
@@ -204,13 +180,10 @@ struct ChatPreviewView: View {
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil {
-                    chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
-                } else if !contact.ready && contact.activeConn != nil {
+                if !contact.ready {
                     if contact.nextSendGrpInv {
                         chatPreviewInfoText("send direct message")
-                    } else if contact.active {
+                    } else {
                         chatPreviewInfoText("connecting…")
                     }
                 }
@@ -240,14 +213,14 @@ struct ChatPreviewView: View {
 
     private func itemStatusMark(_ cItem: ChatItem) -> Text {
         switch cItem.meta.itemStatus {
-        case .sndErrorAuth, .sndError:
+        case .sndErrorAuth:
             return Text(Image(systemName: "multiply"))
                 .font(.caption)
                 .foregroundColor(.red) + Text(" ")
-        case .sndWarning:
+        case .sndError:
             return Text(Image(systemName: "exclamationmark.triangle.fill"))
                 .font(.caption)
-                .foregroundColor(.orange) + Text(" ")
+                .foregroundColor(.yellow) + Text(" ")
         default: return Text("")
         }
     }
@@ -255,26 +228,16 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatStatusImage() -> some View {
         switch chat.chatInfo {
         case let .direct(contact):
-            if contact.active && contact.activeConn != nil {
-                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito)
-                case .error:
-                    Image(systemName: "exclamationmark.circle")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 17, height: 17)
-                        .foregroundColor(.secondary)
-                default:
-                    ProgressView()
-                }
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
-            }
-        case .group:
-            if progressByTimeout {
+            switch (chatModel.contactNetworkStatus(contact)) {
+            case .connected: incognitoIcon(chat.chatInfo.incognito)
+            case .error:
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 17, height: 17)
+                    .foregroundColor(.secondary)
+            default:
                 ProgressView()
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
             }
         default:
             incognitoIcon(chat.chatInfo.incognito)
@@ -304,30 +267,30 @@ struct ChatPreviewView_Previews: PreviewProvider {
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: []
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.group,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, d. consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ), progressByTimeout: Binding.constant(false))
+            ))
         }
         .previewLayout(.fixed(width: 360, height: 78))
     }

apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift

@@ -61,7 +61,7 @@ struct ContactConnectionInfo: View {
 
                     if contactConnection.initiated,
                        let connReqInv = contactConnection.connReqInv {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                        QRCode(uri: connReqInv)
                         incognitoEnabled()
                         shareLinkButton(connReqInv)
                         oneTimeLinkLearnMoreButton()
@@ -119,7 +119,7 @@ struct ContactConnectionInfo: View {
                 if let conn = try await apiSetConnectionAlias(connId: contactConnection.pccConnId, localAlias: localAlias) {
                     await MainActor.run {
                         contactConnection = conn
-                        m.updateContactConnection(conn)
+                        ChatModel.shared.updateContactConnection(conn)
                         dismiss()
                     }
                 }
@@ -164,28 +164,6 @@ struct ContactConnectionInfo: View {
     }
 }
 
-private func shareLinkButton(_ connReqInvitation: String) -> some View {
-    Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
-    } label: {
-        settingsRow("square.and.arrow.up") {
-            Text("Share 1-time link")
-        }
-    }
-}
-
-private func oneTimeLinkLearnMoreButton() -> some View {
-    NavigationLink {
-        AddContactLearnMore(showTitle: false)
-            .navigationTitle("One-time invitation link")
-            .navigationBarTitleDisplayMode(.large)
-    } label: {
-        settingsRow("info.circle") {
-            Text("Learn more")
-        }
-    }
-}
-
 struct ContactConnectionInfo_Previews: PreviewProvider {
     static var previews: some View {
         ContactConnectionInfo(contactConnection: PendingContactConnection.getSampleData())

apps/ios/Shared/Views/ChatList/ContactRequestView.swift

@@ -16,7 +16,8 @@ struct ContactRequestView: View {
 
     var body: some View {
         HStack(spacing: 8) {
-            ChatInfoImage(chat: chat, size: 63)
+            ChatInfoImage(chat: chat)
+                .frame(width: 63, height: 63)
                 .padding(.leading, 4)
             VStack(alignment: .leading, spacing: 0) {
                 HStack(alignment: .top) {

apps/ios/Shared/Views/ChatList/UserPicker.swift

@@ -12,9 +12,7 @@ private let fillColorLight = Color(uiColor: UIColor(red: 0.99, green: 0.99, blue
 struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
-    @Environment(\.scenePhase) var scenePhase
     @Binding var showSettings: Bool
-    @Binding var showConnectDesktop: Bool
     @Binding var userPickerVisible: Bool
     @State var scrollViewContentSize: CGSize = .zero
     @State var disableScrolling: Bool = true
@@ -64,13 +62,6 @@ struct UserPicker: View {
                 .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
                 .frame(maxHeight: scrollViewContentSize.height)
 
-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-                Divider()
                 menuButton("Settings", icon: "gearshape") {
                     showSettings = true
                     withAnimation {
@@ -92,12 +83,9 @@ struct UserPicker: View {
         .opacity(userPickerVisible ? 1.0 : 0.0)
         .onAppear {
             do {
-                // This check prevents the call of listUsers after the app is suspended, and the database is closed.
-                if case .active = scenePhase {
-                    m.users = try listUsers()
-                }
+                m.users = try listUsers()
             } catch let error {
-                logger.error("Error loading users \(responseError(error))")
+                logger.error("Error updating users \(responseError(error))")
             }
         }
     }
@@ -127,7 +115,8 @@ struct UserPicker: View {
             }
         }, label: {
             HStack(spacing: 0) {
-                ProfileImage(imageStr: user.image, size: 44, color: Color(uiColor: .tertiarySystemFill))
+                ProfileImage(imageStr: user.image, color: Color(uiColor: .tertiarySystemFill))
+                    .frame(width: 44, height: 44)
                     .padding(.trailing, 12)
                 Text(user.chatViewName)
                     .fontWeight(user.activeUser ? .medium : .regular)
@@ -155,8 +144,7 @@ struct UserPicker: View {
                     .overlay(DetermineWidth())
                 Spacer()
                 Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(.secondary)
+//                    .frame(width: 24, alignment: .center)
             }
             .padding(.horizontal)
             .padding(.vertical, 22)
@@ -182,7 +170,6 @@ struct UserPicker_Previews: PreviewProvider {
         m.users = [UserInfo.sampleData, UserInfo.sampleData]
         return UserPicker(
             showSettings: Binding.constant(false),
-            showConnectDesktop: Binding.constant(false),
             userPickerVisible: Binding.constant(true)
         )
         .environmentObject(m)

apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift

@@ -36,7 +36,6 @@ enum DatabaseEncryptionAlert: Identifiable {
 struct DatabaseEncryptionView: View {
     @EnvironmentObject private var m: ChatModel
     @Binding var useKeychain: Bool
-    var migration: Bool
     @State private var alert: DatabaseEncryptionAlert? = nil
     @State private var progressIndicator = false
     @State private var useKeychainToggle = storeDBPassphraseGroupDefault.get()
@@ -49,12 +48,7 @@ struct DatabaseEncryptionView: View {
 
     var body: some View {
         ZStack {
-            List {
-                if migration {
-                    chatStoppedView()
-                }
-                databaseEncryptionView()
-            }
+            databaseEncryptionView()
             if progressIndicator {
                 ProgressView().scaleEffect(2)
             }
@@ -62,71 +56,72 @@ struct DatabaseEncryptionView: View {
     }
 
     private func databaseEncryptionView() -> some View {
-        Section {
-            settingsRow(storedKey ? "key.fill" : "key", color: storedKey ? .green : .secondary) {
-                Toggle("Save passphrase in Keychain", isOn: $useKeychainToggle)
+        List {
+            Section {
+                settingsRow(storedKey ? "key.fill" : "key", color: storedKey ? .green : .secondary) {
+                    Toggle("Save passphrase in Keychain", isOn: $useKeychainToggle)
                     .onChange(of: useKeychainToggle) { _ in
                         if useKeychainToggle {
                             setUseKeychain(true)
-                        } else if storedKey && !migration {
-                            // Don't show in migration process since it will remove the key after successfull encryption
+                        } else if storedKey {
                             alert = .keychainRemoveKey
                         } else {
                             setUseKeychain(false)
                         }
                     }
-                    .disabled(initialRandomDBPassphrase && !migration)
-            }
-
-            if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
-                PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-            }
-
-            PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
-            PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
-
-            settingsRow("lock.rotation") {
-                Button(migration ? "Set passphrase" : "Update database passphrase") {
-                    alert = currentKey == ""
-                    ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
-                    : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                    .disabled(initialRandomDBPassphrase)
                 }
-            }
-            .disabled(
-                (m.chatDbEncrypted == true && currentKey == "") ||
-                currentKey == newKey ||
-                newKey != confirmNewKey ||
-                newKey == "" ||
-                !validKey(currentKey) ||
-                !validKey(newKey)
-            )
-        } header: {
-            Text(migration ? "Database passphrase" : "")
-        } footer: {
-            VStack(alignment: .leading, spacing: 16) {
-                if m.chatDbEncrypted == false {
-                    Text("Your chat database is not encrypted - set passphrase to encrypt it.")
-                } else if useKeychain {
-                    if storedKey {
-                        Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
-                        if initialRandomDBPassphrase && !migration {
-                            Text("Database is encrypted using a random passphrase, you can change it.")
+
+                if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
+                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
+                }
+
+                PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
+                PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
+
+                settingsRow("lock.rotation") {
+                    Button("Update database passphrase") {
+                        alert = currentKey == ""
+                        ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
+                        : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                    }
+                }
+                .disabled(
+                    (m.chatDbEncrypted == true && currentKey == "") ||
+                    currentKey == newKey ||
+                    newKey != confirmNewKey ||
+                    newKey == "" ||
+                    !validKey(currentKey) ||
+                    !validKey(newKey)
+                )
+            } header: {
+                Text("")
+            } footer: {
+                VStack(alignment: .leading, spacing: 16) {
+                    if m.chatDbEncrypted == false {
+                        Text("Your chat database is not encrypted - set passphrase to encrypt it.")
+                    } else if useKeychain {
+                        if storedKey {
+                            Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
+                            if initialRandomDBPassphrase {
+                                Text("Database is encrypted using a random passphrase, you can change it.")
+                            } else {
+                                Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                            }
                         } else {
-                            Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                            Text("iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications.")
                         }
                     } else {
-                        Text("iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications.")
-                    }
-                } else {
-                    Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
-                    Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
-                    if  m.notificationMode == .instant && m.notificationPreview != .hidden && !migration {
-                        Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
+                        Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
+                        Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                        if  m.notificationMode == .instant && m.notificationPreview != .hidden {
+                            Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
+                        }
                     }
                 }
+                .padding(.top, 1)
+                .font(.callout)
             }
-            .padding(.top, 1)
-            .font(.callout)
         }
         .onAppear {
             if initialRandomDBPassphrase { currentKey = kcDatabasePassword.get() ?? "" }
@@ -141,15 +136,9 @@ struct DatabaseEncryptionView: View {
             do {
                 encryptionStartedDefault.set(true)
                 encryptionStartedAtDefault.set(Date.now)
-                if !m.chatDbChanged {
-                    try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-                }
                 try await apiStorageEncryption(currentKey: currentKey, newKey: newKey)
                 encryptionStartedDefault.set(false)
                 initialRandomDBPassphraseGroupDefault.set(false)
-                if migration {
-                    storeDBPassphraseGroupDefault.set(useKeychain)
-                }
                 if useKeychain {
                     if kcDatabasePassword.set(newKey) {
                         await resetFormAfterEncryption(true)
@@ -159,9 +148,6 @@ struct DatabaseEncryptionView: View {
                         await operationEnded(.error(title: "Keychain error", error: "Error saving passphrase to keychain"))
                     }
                 } else {
-                    if migration {
-                        removePassphraseFromKeyChain()
-                    }
                     await resetFormAfterEncryption()
                     await operationEnded(.databaseEncrypted)
                 }
@@ -188,10 +174,7 @@ struct DatabaseEncryptionView: View {
 
     private func setUseKeychain(_ value: Bool) {
         useKeychain = value
-        // Postpone it when migrating to the end of encryption process
-        if !migration {
-            storeDBPassphraseGroupDefault.set(value)
-        }
+        storeDBPassphraseGroupDefault.set(value)
     }
 
     private func databaseEncryptionAlert(_ alertItem: DatabaseEncryptionAlert) -> Alert {
@@ -201,7 +184,13 @@ struct DatabaseEncryptionView: View {
                 title: Text("Remove passphrase from keychain?"),
                 message: Text("Instant push notifications will be hidden!\n") + storeSecurelyDanger(),
                 primaryButton: .destructive(Text("Remove")) {
-                    removePassphraseFromKeyChain()
+                    if kcDatabasePassword.remove() {
+                        logger.debug("passphrase removed from keychain")
+                        setUseKeychain(false)
+                        storedKey = false
+                    } else {
+                        alert = .error(title: "Keychain error", error: "Failed to remove passphrase")
+                    }
                 },
                 secondaryButton: .cancel() {
                     withAnimation { useKeychainToggle = true }
@@ -247,16 +236,6 @@ struct DatabaseEncryptionView: View {
         }
     }
 
-    private func removePassphraseFromKeyChain() {
-        if kcDatabasePassword.remove() {
-            logger.debug("passphrase removed from keychain")
-            setUseKeychain(false)
-            storedKey = false
-        } else {
-            alert = .error(title: "Keychain error", error: "Failed to remove passphrase")
-        }
-    }
-
     private func storeSecurelySaved() -> Text {
         Text("Please store passphrase securely, you will NOT be able to change it if you lose it.")
     }
@@ -367,6 +346,6 @@ func validKey(_ s: String) -> Bool {
 
 struct DatabaseEncryptionView_Previews: PreviewProvider {
     static var previews: some View {
-        DatabaseEncryptionView(useKeychain: Binding.constant(true), migration: false)
+        DatabaseEncryptionView(useKeychain: Binding.constant(true))
     }
 }

apps/ios/Shared/Views/Database/DatabaseErrorView.swift

@@ -64,7 +64,7 @@ struct DatabaseErrorView: View {
                 case let .migrationError(mtrError):
                     titleText("Incompatible database version")
                     fileNameText(dbFile)
-                    Text("Error: ") + Text(DatabaseErrorView.mtrErrorDescription(mtrError))
+                    Text("Error: ") + Text(mtrErrorDescription(mtrError))
                 }
             case let .errorSQL(dbFile, migrationSQLError):
                 titleText("Database error")
@@ -105,7 +105,7 @@ struct DatabaseErrorView: View {
         Text("Migrations: \(ms.joined(separator: ", "))")
     }
 
-    static func mtrErrorDescription(_ err: MTRError) -> LocalizedStringKey {
+    private func mtrErrorDescription(_ err: MTRError) -> LocalizedStringKey {
         switch err {
         case let .noDown(dbMigrations):
             return "database version is newer than the app, but no down migration for: \(dbMigrations.joined(separator: ", "))"
@@ -149,7 +149,7 @@ struct DatabaseErrorView: View {
     private func runChatSync(confirmMigrations: MigrationConfirmation? = nil) {
         do {
             resetChatCtrl()
-            try initializeChat(start: m.v3DBMigration.startChat, confirmStart: m.v3DBMigration.startChat && AppChatState.shared.value == .stopped, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
+            try initializeChat(start: m.v3DBMigration.startChat, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
             if let s = m.chatDbStatus {
                 status = s
                 let am = AlertManager.shared

apps/ios/Shared/Views/Database/DatabaseView.swift

@@ -116,7 +116,7 @@ struct DatabaseView: View {
                 let color: Color = unencrypted ? .orange : .secondary
                 settingsRow(unencrypted ? "lock.open" : useKeychain ? "key" : "lock", color: color) {
                     NavigationLink {
-                        DatabaseEncryptionView(useKeychain: $useKeychain, migration: false)
+                        DatabaseEncryptionView(useKeychain: $useKeychain)
                             .navigationTitle("Database passphrase")
                     } label: {
                         Text("Database passphrase")
@@ -415,7 +415,7 @@ struct DatabaseView: View {
                 do {
                     try initializeChat(start: true)
                     m.chatDbChanged = false
-                    AppChatState.shared.set(.active)
+                    appStateGroupDefault.set(.active)
                 } catch let error {
                     fatalError("Error starting chat \(responseError(error))")
                 }
@@ -427,7 +427,7 @@ struct DatabaseView: View {
                 m.chatRunning = true
                 ChatReceiver.shared.start()
                 chatLastStartGroupDefault.set(Date.now)
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.set(.active)
             } catch let error {
                 runChat = false
                 alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,18 +477,13 @@ func stopChatAsync() async throws {
     try await apiStopChat()
     ChatReceiver.shared.stop()
     await MainActor.run { ChatModel.shared.chatRunning = false }
-    AppChatState.shared.set(.stopped)
+    appStateGroupDefault.set(.stopped)
 }
 
 func deleteChatAsync() async throws {
     try await apiDeleteStorage()
     _ = kcDatabasePassword.remove()
     storeDBPassphraseGroupDefault.set(true)
-    deleteAppDatabaseAndFiles()
-    // Clean state so when creating new user the app will start chat automatically (see CreateProfile:createProfile())
-    DispatchQueue.main.async {
-        ChatModel.shared.users = []
-    }
 }
 
 struct DatabaseView_Previews: PreviewProvider {

apps/ios/Shared/Views/Database/MigrateToAppGroupView.swift

@@ -188,7 +188,6 @@ struct MigrateToAppGroupView: View {
         let config = ArchiveConfig(archivePath: getDocumentsDirectory().appendingPathComponent(archiveName).path)
         Task {
             do {
-                try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
                 try await apiExportArchive(config: config)
                 await MainActor.run { setV3DBMigration(.exported) }
             } catch let error {
@@ -205,11 +204,7 @@ struct MigrateToAppGroupView: View {
                 resetChatCtrl()
                 try await MainActor.run { try initializeChat(start: false) }
                 let _ = try await apiImportArchive(config: config)
-                let appSettings = try apiGetAppSettings(settings: AppSettings.current.prepareForExport())
-                await MainActor.run {
-                    appSettings.importIntoApp()
-                    setV3DBMigration(.migrated)
-                }
+                await MainActor.run { setV3DBMigration(.migrated) }
             } catch let error {
                 dbContainerGroupDefault.set(.documents)
                 await MainActor.run {
@@ -221,22 +216,16 @@ struct MigrateToAppGroupView: View {
     }
 }
 
-func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
+func exportChatArchive() async throws -> URL {
     let archiveTime = Date.now
     let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
     let archiveName = "simplex-chat.\(ts).zip"
-    let archivePath = (storagePath ?? getDocumentsDirectory()).appendingPathComponent(archiveName)
+    let archivePath = getDocumentsDirectory().appendingPathComponent(archiveName)
     let config = ArchiveConfig(archivePath: archivePath.path)
-    // Settings should be saved before changing a passphrase, otherwise the database needs to be migrated first
-    if !ChatModel.shared.chatDbChanged {
-        try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-    }
     try await apiExportArchive(config: config)
-    if storagePath == nil {
-        deleteOldArchive()
-        UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
-        chatArchiveTimeDefault.set(archiveTime)
-    }
+    deleteOldArchive()
+    UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
+    chatArchiveTimeDefault.set(archiveTime)
     return archivePath
 }
 

apps/ios/Shared/Views/Helpers/ChatInfoImage.swift

@@ -10,9 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatInfoImage: View {
-    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var chat: Chat
-    var size: CGFloat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
 
     var body: some View {
@@ -20,17 +18,13 @@ struct ChatInfoImage: View {
         switch chat.chatInfo {
         case .direct: iconName = "person.crop.circle.fill"
         case .group: iconName = "person.2.circle.fill"
-        case .local: iconName = "folder.circle.fill"
         case .contactRequest: iconName = "person.crop.circle.fill"
         default: iconName = "circle.fill"
         }
-        let notesColor = colorScheme == .light ? notesChatColorLight : notesChatColorDark
-        let iconColor = if case .local = chat.chatInfo { notesColor } else { color }
         return ProfileImage(
             imageStr: chat.chatInfo.image,
             iconName: iconName,
-            size: size,
-            color: iconColor
+            color: color
         )
     }
 }
@@ -38,9 +32,8 @@ struct ChatInfoImage: View {
 struct ChatInfoImage_Previews: PreviewProvider {
     static var previews: some View {
         ChatInfoImage(
-            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
-            size: 63,
-            color:  Color(red: 0.9, green: 0.9, blue: 0.9)
+            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
+            , color:  Color(red: 0.9, green: 0.9, blue: 0.9)
         )
         .previewLayout(.fixed(width: 63, height: 63))
     }

apps/ios/Shared/Views/Helpers/ContextMenu.swift

@@ -11,43 +11,28 @@ import UIKit
 import SwiftUI
 
 extension View {
-    func uiKitContextMenu(hasImageOrVideo: Bool, maxWidth: CGFloat, itemWidth: Binding<CGFloat>, menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
-        Group {
-            if allowMenu.wrappedValue {
-                if hasImageOrVideo {
-                    InteractionView(content:
-                        self.environmentObject(ChatModel.shared)
-                        .overlay(DetermineWidthImageVideoItem())
-                        .onPreferenceChange(DetermineWidthImageVideoItem.Key.self) { itemWidth.wrappedValue = $0 == 0 ? maxWidth : $0 }
-                    , maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
-                    .frame(maxWidth: itemWidth.wrappedValue)
-                } else {
-                    InteractionView(content: self.environmentObject(ChatModel.shared), maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
-                        .fixedSize(horizontal: true, vertical: false)
+    func uiKitContextMenu(menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
+            self.overlay {
+                if allowMenu.wrappedValue {
+                    self.overlay(Color(uiColor: .systemBackground)).overlay(InteractionView(content: self, menu: menu))
                 }
-            } else {
-                self
             }
-        }
     }
 }
 
-private class HostingViewHolder: UIView {
-    var contentSize: CGSize = CGSizeMake(0, 0)
-    override var intrinsicContentSize: CGSize { get { contentSize } }
+private struct InteractionConfig<Content: View> {
+    let content: Content
+    let menu: UIMenu
 }
 
-struct InteractionView<Content: View>: UIViewRepresentable {
+private struct InteractionView<Content: View>: UIViewRepresentable {
     let content: Content
-    var maxWidth: CGFloat
-    var itemWidth: Binding<CGFloat>
     @Binding var menu: UIMenu
 
     func makeUIView(context: Context) -> UIView {
-        let view = HostingViewHolder()
+        let view = UIView()
         view.backgroundColor = .clear
         let hostView = UIHostingController(rootView: content)
-        view.contentSize = hostView.view.intrinsicContentSize
         hostView.view.translatesAutoresizingMaskIntoConstraints = false
         let constraints = [
             hostView.view.topAnchor.constraint(equalTo: view.topAnchor),
@@ -59,20 +44,12 @@ struct InteractionView<Content: View>: UIViewRepresentable {
         ]
         view.addSubview(hostView.view)
         view.addConstraints(constraints)
-        view.layer.cornerRadius = 18
-        hostView.view.layer.cornerRadius = 18
         let menuInteraction = UIContextMenuInteraction(delegate: context.coordinator)
         view.addInteraction(menuInteraction)
         return view
     }
 
-    func updateUIView(_ uiView: UIView, context: Context) {
-        let was = (uiView as! HostingViewHolder).contentSize
-        (uiView as! HostingViewHolder).contentSize = uiView.subviews[0].sizeThatFits(CGSizeMake(itemWidth.wrappedValue, .infinity))
-        if was != (uiView as! HostingViewHolder).contentSize {
-            uiView.invalidateIntrinsicContentSize()
-        }
-    }
+    func updateUIView(_ uiView: UIView, context: Context) {}
 
     func makeCoordinator() -> Coordinator {
         Coordinator(self)

apps/ios/Shared/Views/Helpers/DetermineWidth.swift

@@ -21,19 +21,6 @@ struct DetermineWidth: View {
     }
 }
 
-struct DetermineWidthImageVideoItem: View {
-    typealias Key = MaximumWidthImageVideoPreferenceKey
-    var body: some View {
-        GeometryReader { proxy in
-            Color.clear
-                .preference(
-                    key: MaximumWidthImageVideoPreferenceKey.self,
-                    value: proxy.size.width
-                )
-        }
-    }
-}
-
 struct MaximumWidthPreferenceKey: PreferenceKey {
     static var defaultValue: CGFloat = 0
     static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
@@ -41,13 +28,6 @@ struct MaximumWidthPreferenceKey: PreferenceKey {
     }
 }
 
-struct MaximumWidthImageVideoPreferenceKey: PreferenceKey {
-    static var defaultValue: CGFloat = 0
-    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
 struct DetermineWidth_Previews: PreviewProvider {
     static var previews: some View {
         DetermineWidth()

apps/ios/Shared/Views/Helpers/ImagePicker.swift

@@ -13,130 +13,112 @@ import SimpleXChat
 
 struct LibraryImagePicker: View {
     @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
-    @State var mediaAdded = false
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    @State var images: [UploadContent] = []
 
     var body: some View {
-        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
-    }
-
-    private func addMedia(_ content: UploadContent) async {
-        if mediaAdded { return }
-        await MainActor.run {
-            mediaAdded = true
-            image = content.uiImage
-        }
+        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
+            .onChange(of: images) { _ in
+                if let img = images.first {
+                    image = img.uiImage
+                }
+            }
     }
 }
 
 struct LibraryMediaListPicker: UIViewControllerRepresentable {
     typealias UIViewControllerType = PHPickerViewController
-    var addMedia: (_ content: UploadContent) async -> Void
+    @Binding var media: [UploadContent]
     var selectionLimit: Int
-    var finishedPreprocessing: () -> Void = {}
-    var didFinishPicking: (_ didSelectItems: Bool) async -> Void
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
 
     class Coordinator: PHPickerViewControllerDelegate {
         let parent: LibraryMediaListPicker
         let dispatchQueue = DispatchQueue(label: "chat.simplex.app.LibraryMediaListPicker")
+        var media: [UploadContent] = []
+        var mediaCount: Int = 0
 
         init(_ parent: LibraryMediaListPicker) {
             self.parent = parent
         }
 
         func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-            Task {
-                await parent.didFinishPicking(!results.isEmpty)
-                if results.isEmpty { return }
-                for r in results {
-                    await loadItem(r.itemProvider)
-                }
-                parent.finishedPreprocessing()
+            parent.didFinishPicking(!results.isEmpty)
+            guard !results.isEmpty else {
+                return
             }
-        }
 
-        private func loadItem(_ p: NSItemProvider) async {
-            logger.debug("LibraryMediaListPicker result")
-            if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                if let video = await loadVideo(p) {
-                    await self.parent.addMedia(video)
-                    logger.debug("LibraryMediaListPicker: added video")
-                }
-            } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                if let img = await loadImageData(p) {
-                    await self.parent.addMedia(img)
-                    logger.debug("LibraryMediaListPicker: added image")
-                }
-            } else if p.canLoadObject(ofClass: UIImage.self) {
-                if let img = await loadImage(p) {
-                    await self.parent.addMedia(.simpleImage(image: img))
-                    logger.debug("LibraryMediaListPicker: added image")
-                }
-            }
-        }
-
-        private func loadImageData(_ p: NSItemProvider) async -> UploadContent? {
-            await withCheckedContinuation { cont in
-                loadFileURL(p, type: UTType.data) { url in
-                    if let url = url {
-                        let img = UploadContent.loadFromURL(url: url)
-                        cont.resume(returning: img)
-                    } else {
-                        cont.resume(returning: nil)
-                    }
-                }
-            }
-        }
-
-        private func loadImage(_ p: NSItemProvider) async -> UIImage? {
-            await withCheckedContinuation { cont in
-                p.loadObject(ofClass: UIImage.self)  { obj, err in
-                    if let err = err {
-                        logger.error("LibraryMediaListPicker result image error: \(err.localizedDescription)")
-                        cont.resume(returning: nil)
-                    } else  {
-                        cont.resume(returning: obj as? UIImage)
-                    }
-                }
-            }
-        }
-
-        private func loadVideo(_ p: NSItemProvider) async -> UploadContent? {
-            await withCheckedContinuation { cont in
-                loadFileURL(p, type: UTType.movie) { url in
-                    if let url = url  {
-                        let tempUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "rawvideo", url.pathExtension, fullPath: true))
-                        let convertedVideoUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", "mp4", fullPath: true))
-                        do {
-//                          logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
-                            try FileManager.default.copyItem(at: url, to: tempUrl)
-                        } catch let err {
-                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
-                            return cont.resume(returning: nil)
-                        }
-                        Task {
-                            let success = await makeVideoQualityLower(tempUrl, outputUrl: convertedVideoUrl)
-                            try? FileManager.default.removeItem(at: tempUrl)
-                            if success {
-                                _ = ChatModel.shared.filesToDelete.insert(convertedVideoUrl)
-                                let video = UploadContent.loadVideoFromURL(url: convertedVideoUrl)
-                                return cont.resume(returning: video)
+            parent.media = []
+            media = []
+            mediaCount = results.count
+            for result in results {
+                logger.log("LibraryMediaListPicker result")
+                let p = result.itemProvider
+                if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
+                        if let url = url {
+                            let tempUrl = URL(fileURLWithPath: getTempFilesDirectory().path + "/" + generateNewFileName("video", url.pathExtension))
+                            if ((try? FileManager.default.copyItem(at: url, to: tempUrl)) != nil) {
+                                ChatModel.shared.filesToDelete.insert(tempUrl)
+                                self.loadVideo(url: tempUrl, error: error)
                             }
-                            try? FileManager.default.removeItem(at: convertedVideoUrl)
-                            cont.resume(returning: nil)
                         }
                     }
+                } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.data.identifier) { url, error in
+                        self.loadImage(object: url, error: error)
+                    }
+                } else if p.canLoadObject(ofClass: UIImage.self) {
+                    p.loadObject(ofClass: UIImage.self)  { image, error in
+                        DispatchQueue.main.async {
+                            self.loadImage(object: image, error: error)
+                        }
+                    }
+                } else {
+                    dispatchQueue.sync { self.mediaCount -= 1}
+                }
+            }
+            DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+                self.dispatchQueue.sync {
+                    if self.parent.media.count == 0 {
+                        logger.log("LibraryMediaListPicker: added \(self.media.count) images out of \(results.count)")
+                        self.parent.media = self.media
+                    }
                 }
             }
         }
 
-        private func loadFileURL(_ p: NSItemProvider, type: UTType, completion: @escaping (URL?) -> Void) {
-            p.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, err in
-                if let err = err {
-                    logger.error("LibraryMediaListPicker loadFileURL error: \(err.localizedDescription)")
-                    completion(nil)
-                } else {
-                    completion(url)
+        func loadImage(object: Any?, error: Error? = nil) {
+            if let error = error {
+                logger.error("LibraryMediaListPicker: couldn't load image with error: \(error.localizedDescription)")
+            } else if let image = object as? UIImage {
+                media.append(.simpleImage(image: image))
+                logger.log("LibraryMediaListPicker: added image")
+            } else if let url = object as? URL, let image = UploadContent.loadFromURL(url: url) {
+                media.append(image)
+            }
+            dispatchQueue.sync {
+                self.mediaCount -= 1
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
+                    logger.log("LibraryMediaListPicker: added all media")
+                    self.parent.media = self.media
+                    self.media = []
+                }
+            }
+        }
+
+        func loadVideo(url: URL?, error: Error? = nil) {
+            if let error = error {
+                logger.error("LibraryMediaListPicker: couldn't load video with error: \(error.localizedDescription)")
+            } else if let url = url as URL?, let video = UploadContent.loadVideoFromURL(url: url) {
+                media.append(video)
+            }
+            dispatchQueue.sync {
+                self.mediaCount -= 1
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
+                    logger.log("LibraryMediaListPicker: added all media")
+                    self.parent.media = self.media
+                    self.media = []
                 }
             }
         }

apps/ios/Shared/Views/Helpers/ProfileImage.swift

@@ -9,51 +9,29 @@
 import SwiftUI
 import SimpleXChat
 
-let defaultProfileImageCorner = 22.5
-
 struct ProfileImage: View {
     var imageStr: String? = nil
     var iconName: String = "person.crop.circle.fill"
-    var size: CGFloat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
-    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
-
+    
     var body: some View {
         if let image = imageStr,
            let data = Data(base64Encoded: dropImagePrefix(image)),
            let uiImage = UIImage(data: data) {
-            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius)
+            Image(uiImage: uiImage)
+                .resizable()
+                .clipShape(Circle())
         } else {
             Image(systemName: iconName)
                 .resizable()
                 .foregroundColor(color)
-                .frame(width: size, height: size)
         }
     }
 }
 
-private let squareToCircleRatio = 0.935
-
-private let radiusFactor = (1 - squareToCircleRatio) / 50
-
-@ViewBuilder func clipProfileImage(_ img: Image, size: CGFloat, radius: Double) -> some View {
-    let v = img.resizable()
-    if radius >= 50 {
-        v.frame(width: size, height: size).clipShape(Circle())
-    } else if radius <= 0 {
-        let sz = size * squareToCircleRatio
-        v.frame(width: sz, height: sz).padding((size - sz) / 2)
-    } else {
-        let sz = size * (squareToCircleRatio + radius * radiusFactor)
-        v.frame(width: sz, height: sz)
-        .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
-        .padding((size - sz) / 2)
-    }
-}
-
 struct ProfileImage_Previews: PreviewProvider {
     static var previews: some View {
-        ProfileImage(imageStr: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAKHGlDQ1BJQ0MgUHJvZmlsZQAASImFVgdUVNcWve9Nb7QZeu9NehtAem/Sq6gMQ28OQxWxgAQjEFFEREARNFQFg1KjiIhiIQgoYA9IEFBisCAq6OQNJNH4//r/zDpz9ttzz7n73ffWmg0A6QCDxYqD+QCIT0hmezlYywQEBsngngEYCAIy0AC6DGYSy8rDwxUg8Xf9d7wbAxC33tHgzvrP3/9nCISFJzEBgIIRTGey2MkILkawT1oyi4tnEUxjI6IQvMLFkauYqxjQQtewwuoaHy8bBNMBwJMZDHYkAERbhJdJZUYic4hhCNZOCItOQDB3vjkzioFwxLsIXhcRl5IOAImrRzs+fivCk7QRrIL0shAcwNUW+tX8yH/tFfrPXgxG5D84Pi6F+dc9ck+HHJ7g641UMSQlQATQBHEgBaQDGcACbLAVYaIRJhx5Dv+9j77aZ4OsZIFtSEc0iARRIBnpt/9qlvfqpGSQBhjImnCEcUU+NtxnujZy4fbqVEiU/wuXdQyA9S0cDqfzC+e2F4DzyLkSB79wyi0A8KoBcL2GmcJOXePQ3C8MIAJeQAOiQArIAxXuWwMMgSmwBHbAGbgDHxAINgMmojceUZUGMkEWyAX54AA4DMpAJTgJ6sAZ0ALawQVwGVwDt8AQGAUPwQSYBi/AAngHliEIwkEUiAqJQtKQIqQO6UJ0yByyg1whLygQCoEioQQoBcqE9kD5UBFUBlVB9dBPUCd0GboBDUP3oUloDnoNfYRRMBmmwZKwEqwF02Er2AX2gTfBkXAinAHnwPvhUrgaPg23wZfhW/AoPAG/gBdRAEVCCaFkURooOsoG5Y4KQkWg2KidqDxUCaoa1YTqQvWj7qAmUPOoD2gsmoqWQWugTdGOaF80E52I3okuQJeh69Bt6D70HfQkegH9GUPBSGDUMSYYJ0wAJhKThsnFlGBqMK2Yq5hRzDTmHRaLFcIqY42wjthAbAx2O7YAewzbjO3BDmOnsIs4HE4Up44zw7njGLhkXC7uKO407hJuBDeNe48n4aXxunh7fBA+AZ+NL8E34LvxI/gZ/DKBj6BIMCG4E8II2wiFhFOELsJtwjRhmchPVCaaEX2IMcQsYimxiXiV+Ij4hkQiyZGMSZ6kaNJuUinpLOk6aZL0gSxAViPbkIPJKeT95FpyD/k++Q2FQlGiWFKCKMmU/ZR6yhXKE8p7HiqPJo8TTxjPLp5ynjaeEZ6XvAReRV4r3s28GbwlvOd4b/PO8xH4lPhs+Bh8O/nK+Tr5xvkW+an8Ovzu/PH8BfwN/Df4ZwVwAkoCdgJhAjkCJwWuCExRUVR5qg2VSd1DPUW9Sp2mYWnKNCdaDC2fdoY2SFsQFBDUF/QTTBcsF7woOCGEElISchKKEyoUahEaE/ooLClsJRwuvE+4SXhEeElEXMRSJFwkT6RZZFTko6iMqJ1orOhB0XbRx2JoMTUxT7E0seNiV8XmxWnipuJM8TzxFvEHErCEmoSXxHaJkxIDEouSUpIOkizJo5JXJOelhKQspWKkiqW6peakqdLm0tHSxdKXpJ/LCMpYycTJlMr0ySzISsg6yqbIVskOyi7LKcv5ymXLNcs9lifK0+Uj5Ivle+UXFKQV3BQyFRoVHigSFOmKUYpHFPsVl5SUlfyV9iq1K80qiyg7KWcoNyo/UqGoWKgkqlSr3FXFqtJVY1WPqQ6pwWoGalFq5Wq31WF1Q/Vo9WPqw+sw64zXJayrXjeuQdaw0kjVaNSY1BTSdNXM1mzXfKmloBWkdVCrX+uztoF2nPYp7Yc6AjrOOtk6XTqvddV0mbrlunf1KHr2erv0OvRe6avrh+sf179nQDVwM9hr0GvwydDIkG3YZDhnpGAUYlRhNE6n0T3oBfTrxhhja+NdxheMP5gYmiSbtJj8YaphGmvaYDq7Xnl9+PpT66fM5MwYZlVmE+Yy5iHmJ8wnLGQtGBbVFk8t5S3DLGssZ6xUrWKsTlu9tNa2Zlu3Wi/ZmNjssOmxRdk62ObZDtoJ2Pnaldk9sZezj7RvtF9wMHDY7tDjiHF0cTzoOO4k6cR0qndacDZy3uHc50J28XYpc3nqqubKdu1yg92c3Q65PdqguCFhQ7s7cHdyP+T+2EPZI9HjZ0+sp4dnueczLx2vTK9+b6r3Fu8G73c+1j6FPg99VXxTfHv9eP2C/er9lvxt/Yv8JwK0AnYE3AoUC4wO7AjCBfkF1QQtbrTbeHjjdLBBcG7w2CblTembbmwW2xy3+eIW3i2MLedCMCH+IQ0hKwx3RjVjMdQptCJ0gWnDPMJ8EWYZVhw2F24WXhQ+E2EWURQxG2kWeShyLsoiqiRqPtomuiz6VYxjTGXMUqx7bG0sJ84/rjkeHx8S35kgkBCb0LdVamv61mGWOiuXNZFokng4cYHtwq5JgpI2JXUk05A/0oEUlZTvUiZTzVPLU9+n+aWdS+dPT0gf2Ka2bd+2mQz7jB+3o7czt/dmymZmZU7usNpRtRPaGbqzd5f8rpxd07sddtdlEbNis37J1s4uyn67x39PV45kzu6cqe8cvmvM5cll547vNd1b+T36++jvB/fp7Tu673NeWN7NfO38kvyVAmbBzR90fij9gbM/Yv9goWHh8QPYAwkHxg5aHKwr4i/KKJo65HaorVimOK/47eEth2+U6JdUHiEeSTkyUepa2nFU4eiBoytlUWWj5dblzRUSFfsqlo6FHRs5bnm8qVKyMr/y44noE/eqHKraqpWqS05iT6aefHbK71T/j/Qf62vEavJrPtUm1E7UedX11RvV1zdINBQ2wo0pjXOng08PnbE909Gk0VTVLNScfxacTTn7/KeQn8ZaXFp6z9HPNZ1XPF/RSm3Na4PatrUttEe1T3QEdgx3Onf2dpl2tf6s+XPtBdkL5RcFLxZ2E7tzujmXMi4t9rB65i9HXp7q3dL78ErAlbt9nn2DV12uXr9mf+1Kv1X/petm1y/cMLnReZN+s/2W4a22AYOB1l8MfmkdNBxsu210u2PIeKhreP1w94jFyOU7tneu3XW6e2t0w+jwmO/YvfHg8Yl7Yfdm78fdf/Ug9cHyw92PMI/yHvM9Lnki8aT6V9VfmycMJy5O2k4OPPV++nCKOfXit6TfVqZznlGelcxIz9TP6s5emLOfG3q+8fn0C9aL5fnc3/l/r3ip8vL8H5Z/DCwELEy/Yr/ivC54I/qm9q3+295Fj8Un7+LfLS/lvRd9X/eB/qH/o//HmeW0FdxK6SfVT12fXT4/4sRzOCwGm7FqBVBIwhERALyuBYASCAB1CPEPG9f8119+BvrK2fyNwVndL5jhvubRVsMQgCakeCFp04OsQ1LJEgAe5NodqT6WANbT+yf/iqQIPd21PXgaAcDJcjivtwJAQHLFgcNZ9uBwPlUgYhHf1z37f7V9g9e8ITewiP88wfWIYET6HPg21nzjV2fybQVcxfrg2/onng/F50lD/ccAAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAABigAwAEAAAAAQAAABgAAAAAwf1XlwAAAaNJREFUSA3FlT1LA0EQQBN/gYUYRTksJZVgEbCR/D+7QMr8ABtttBBCsLGzsLG2sxaxED/ie4d77u0dyaE5HHjczn7MzO7M7nU6/yXz+bwLhzCCjTQO+rZhDH3opuNLdRYN4RHe4RIKJ7R34Ro+4AEGSw2mE1iUwT18gpI74WvkGlccu4XNdH0jnYU7cAUacidn37qR23cOxc4aGU0nYUAn7iSWEHkz46w0ocdQu1X6B/AMQZ5o7KfBqNOfwRH8JB7FajGhnmcpKvQe3MEbvILiDm5gPXaCHnZr4vvFGMoEKudKn8YvQIOOe+YzCPop7dwJ3zRfJ7GDuso4YJGRa0yZgg4tUaNXdGrbuZWKKxzYYEJc2xp9AUUjGt8KC2jvgYadF8+10vJyDnNLXwbdiWUZi0fUK01Eoc+AZhCLZVzK4Vq6sDUdz+0dEcbbTTIOJmAyTVhx/WmvrExbv2jtPhWLKodjCtefZiEeZeVZWWSndgwj6fVf3XON8Qwq15++uoqrfYVrow6dGBpCq79ME291jaB0/Q2CPncyht/99MNO/vr9AqW/CGi8sJqbAAAAAElFTkSuQmCC", size: 63)
+        ProfileImage(imageStr: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAKHGlDQ1BJQ0MgUHJvZmlsZQAASImFVgdUVNcWve9Nb7QZeu9NehtAem/Sq6gMQ28OQxWxgAQjEFFEREARNFQFg1KjiIhiIQgoYA9IEFBisCAq6OQNJNH4//r/zDpz9ttzz7n73ffWmg0A6QCDxYqD+QCIT0hmezlYywQEBsngngEYCAIy0AC6DGYSy8rDwxUg8Xf9d7wbAxC33tHgzvrP3/9nCISFJzEBgIIRTGey2MkILkawT1oyi4tnEUxjI6IQvMLFkauYqxjQQtewwuoaHy8bBNMBwJMZDHYkAERbhJdJZUYic4hhCNZOCItOQDB3vjkzioFwxLsIXhcRl5IOAImrRzs+fivCk7QRrIL0shAcwNUW+tX8yH/tFfrPXgxG5D84Pi6F+dc9ck+HHJ7g641UMSQlQATQBHEgBaQDGcACbLAVYaIRJhx5Dv+9j77aZ4OsZIFtSEc0iARRIBnpt/9qlvfqpGSQBhjImnCEcUU+NtxnujZy4fbqVEiU/wuXdQyA9S0cDqfzC+e2F4DzyLkSB79wyi0A8KoBcL2GmcJOXePQ3C8MIAJeQAOiQArIAxXuWwMMgSmwBHbAGbgDHxAINgMmojceUZUGMkEWyAX54AA4DMpAJTgJ6sAZ0ALawQVwGVwDt8AQGAUPwQSYBi/AAngHliEIwkEUiAqJQtKQIqQO6UJ0yByyg1whLygQCoEioQQoBcqE9kD5UBFUBlVB9dBPUCd0GboBDUP3oUloDnoNfYRRMBmmwZKwEqwF02Er2AX2gTfBkXAinAHnwPvhUrgaPg23wZfhW/AoPAG/gBdRAEVCCaFkURooOsoG5Y4KQkWg2KidqDxUCaoa1YTqQvWj7qAmUPOoD2gsmoqWQWugTdGOaF80E52I3okuQJeh69Bt6D70HfQkegH9GUPBSGDUMSYYJ0wAJhKThsnFlGBqMK2Yq5hRzDTmHRaLFcIqY42wjthAbAx2O7YAewzbjO3BDmOnsIs4HE4Up44zw7njGLhkXC7uKO407hJuBDeNe48n4aXxunh7fBA+AZ+NL8E34LvxI/gZ/DKBj6BIMCG4E8II2wiFhFOELsJtwjRhmchPVCaaEX2IMcQsYimxiXiV+Ij4hkQiyZGMSZ6kaNJuUinpLOk6aZL0gSxAViPbkIPJKeT95FpyD/k++Q2FQlGiWFKCKMmU/ZR6yhXKE8p7HiqPJo8TTxjPLp5ynjaeEZ6XvAReRV4r3s28GbwlvOd4b/PO8xH4lPhs+Bh8O/nK+Tr5xvkW+an8Ovzu/PH8BfwN/Df4ZwVwAkoCdgJhAjkCJwWuCExRUVR5qg2VSd1DPUW9Sp2mYWnKNCdaDC2fdoY2SFsQFBDUF/QTTBcsF7woOCGEElISchKKEyoUahEaE/ooLClsJRwuvE+4SXhEeElEXMRSJFwkT6RZZFTko6iMqJ1orOhB0XbRx2JoMTUxT7E0seNiV8XmxWnipuJM8TzxFvEHErCEmoSXxHaJkxIDEouSUpIOkizJo5JXJOelhKQspWKkiqW6peakqdLm0tHSxdKXpJ/LCMpYycTJlMr0ySzISsg6yqbIVskOyi7LKcv5ymXLNcs9lifK0+Uj5Ivle+UXFKQV3BQyFRoVHigSFOmKUYpHFPsVl5SUlfyV9iq1K80qiyg7KWcoNyo/UqGoWKgkqlSr3FXFqtJVY1WPqQ6pwWoGalFq5Wq31WF1Q/Vo9WPqw+sw64zXJayrXjeuQdaw0kjVaNSY1BTSdNXM1mzXfKmloBWkdVCrX+uztoF2nPYp7Yc6AjrOOtk6XTqvddV0mbrlunf1KHr2erv0OvRe6avrh+sf179nQDVwM9hr0GvwydDIkG3YZDhnpGAUYlRhNE6n0T3oBfTrxhhja+NdxheMP5gYmiSbtJj8YaphGmvaYDq7Xnl9+PpT66fM5MwYZlVmE+Yy5iHmJ8wnLGQtGBbVFk8t5S3DLGssZ6xUrWKsTlu9tNa2Zlu3Wi/ZmNjssOmxRdk62ObZDtoJ2Pnaldk9sZezj7RvtF9wMHDY7tDjiHF0cTzoOO4k6cR0qndacDZy3uHc50J28XYpc3nqqubKdu1yg92c3Q65PdqguCFhQ7s7cHdyP+T+2EPZI9HjZ0+sp4dnueczLx2vTK9+b6r3Fu8G73c+1j6FPg99VXxTfHv9eP2C/er9lvxt/Yv8JwK0AnYE3AoUC4wO7AjCBfkF1QQtbrTbeHjjdLBBcG7w2CblTembbmwW2xy3+eIW3i2MLedCMCH+IQ0hKwx3RjVjMdQptCJ0gWnDPMJ8EWYZVhw2F24WXhQ+E2EWURQxG2kWeShyLsoiqiRqPtomuiz6VYxjTGXMUqx7bG0sJ84/rjkeHx8S35kgkBCb0LdVamv61mGWOiuXNZFokng4cYHtwq5JgpI2JXUk05A/0oEUlZTvUiZTzVPLU9+n+aWdS+dPT0gf2Ka2bd+2mQz7jB+3o7czt/dmymZmZU7usNpRtRPaGbqzd5f8rpxd07sddtdlEbNis37J1s4uyn67x39PV45kzu6cqe8cvmvM5cll547vNd1b+T36++jvB/fp7Tu673NeWN7NfO38kvyVAmbBzR90fij9gbM/Yv9goWHh8QPYAwkHxg5aHKwr4i/KKJo65HaorVimOK/47eEth2+U6JdUHiEeSTkyUepa2nFU4eiBoytlUWWj5dblzRUSFfsqlo6FHRs5bnm8qVKyMr/y44noE/eqHKraqpWqS05iT6aefHbK71T/j/Qf62vEavJrPtUm1E7UedX11RvV1zdINBQ2wo0pjXOng08PnbE909Gk0VTVLNScfxacTTn7/KeQn8ZaXFp6z9HPNZ1XPF/RSm3Na4PatrUttEe1T3QEdgx3Onf2dpl2tf6s+XPtBdkL5RcFLxZ2E7tzujmXMi4t9rB65i9HXp7q3dL78ErAlbt9nn2DV12uXr9mf+1Kv1X/petm1y/cMLnReZN+s/2W4a22AYOB1l8MfmkdNBxsu210u2PIeKhreP1w94jFyOU7tneu3XW6e2t0w+jwmO/YvfHg8Yl7Yfdm78fdf/Ug9cHyw92PMI/yHvM9Lnki8aT6V9VfmycMJy5O2k4OPPV++nCKOfXit6TfVqZznlGelcxIz9TP6s5emLOfG3q+8fn0C9aL5fnc3/l/r3ip8vL8H5Z/DCwELEy/Yr/ivC54I/qm9q3+295Fj8Un7+LfLS/lvRd9X/eB/qH/o//HmeW0FdxK6SfVT12fXT4/4sRzOCwGm7FqBVBIwhERALyuBYASCAB1CPEPG9f8119+BvrK2fyNwVndL5jhvubRVsMQgCakeCFp04OsQ1LJEgAe5NodqT6WANbT+yf/iqQIPd21PXgaAcDJcjivtwJAQHLFgcNZ9uBwPlUgYhHf1z37f7V9g9e8ITewiP88wfWIYET6HPg21nzjV2fybQVcxfrg2/onng/F50lD/ccAAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAABigAwAEAAAAAQAAABgAAAAAwf1XlwAAAaNJREFUSA3FlT1LA0EQQBN/gYUYRTksJZVgEbCR/D+7QMr8ABtttBBCsLGzsLG2sxaxED/ie4d77u0dyaE5HHjczn7MzO7M7nU6/yXz+bwLhzCCjTQO+rZhDH3opuNLdRYN4RHe4RIKJ7R34Ro+4AEGSw2mE1iUwT18gpI74WvkGlccu4XNdH0jnYU7cAUacidn37qR23cOxc4aGU0nYUAn7iSWEHkz46w0ocdQu1X6B/AMQZ5o7KfBqNOfwRH8JB7FajGhnmcpKvQe3MEbvILiDm5gPXaCHnZr4vvFGMoEKudKn8YvQIOOe+YzCPop7dwJ3zRfJ7GDuso4YJGRa0yZgg4tUaNXdGrbuZWKKxzYYEJc2xp9AUUjGt8KC2jvgYadF8+10vJyDnNLXwbdiWUZi0fUK01Eoc+AZhCLZVzK4Vq6sDUdz+0dEcbbTTIOJmAyTVhx/WmvrExbv2jtPhWLKodjCtefZiEeZeVZWWSndgwj6fVf3XON8Qwq15++uoqrfYVrow6dGBpCq79ME291jaB0/Q2CPncyht/99MNO/vr9AqW/CGi8sJqbAAAAAElFTkSuQmCC")
             .previewLayout(.fixed(width: 63, height: 63))
             .background(.black)
     }

apps/ios/Shared/Views/Helpers/VideoPlayerView.swift

@@ -6,7 +6,6 @@
 import Foundation
 import SwiftUI
 import AVKit
-import Combine
 
 struct VideoPlayerView: UIViewRepresentable {
 
@@ -38,14 +37,6 @@ struct VideoPlayerView: UIViewRepresentable {
             player.seek(to: CMTime.zero)
             player.play()
         }
-        var played = false
-        context.coordinator.publisher = player.publisher(for: \.timeControlStatus).sink { status in
-            if played || status == .playing {
-                AppDelegate.keepScreenOn(status == .playing)
-                AudioPlayer.changeAudioSession(status == .playing)
-            }
-            played = status == .playing
-        }
         return controller.view
     }
 
@@ -59,13 +50,12 @@ struct VideoPlayerView: UIViewRepresentable {
     class Coordinator: NSObject {
         var controller: AVPlayerViewController?
         var timeObserver: Any? = nil
-        var publisher: AnyCancellable? = nil
 
         deinit {
+            print("deinit coordinator of VideoPlayer")
             if let timeObserver = timeObserver {
                 NotificationCenter.default.removeObserver(timeObserver)
             }
-            publisher?.cancel()
         }
     }
 }

apps/ios/Shared/Views/Helpers/VideoUtils.swift

@@ -1,26 +0,0 @@
-//
-//  VideoUtils.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 25.12.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import AVFoundation
-import Foundation
-import SimpleXChat
-
-func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
-    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
-    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
-        s.outputURL = outputUrl
-        s.outputFileType = .mp4
-        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
-        await s.export()
-        if let err = s.error {
-            logger.error("Failed to export video with error: \(err)")
-        }
-        return s.status == .completed
-    }
-    return false
-}

apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift

@@ -13,28 +13,19 @@ struct LocalAuthView: View {
     @EnvironmentObject var m: ChatModel
     var authRequest: LocalAuthRequest
     @State private var password = ""
-    @State private var allowToReact = true
 
     var body: some View {
-        PasscodeView(passcode: $password, title: authRequest.title ?? "Enter Passcode", reason: authRequest.reason, submitLabel: "Submit",
-                     buttonsEnabled: $allowToReact) {
+        PasscodeView(passcode: $password, title: authRequest.title ?? "Enter Passcode", reason: authRequest.reason, submitLabel: "Submit") {
             if let sdPassword = kcSelfDestructPassword.get(), authRequest.selfDestruct && password == sdPassword {
-                allowToReact = false
                 deleteStorageAndRestart(sdPassword) { r in
                     m.laRequest = nil
                     authRequest.completed(r)
                 }
                 return
             }
-            let r: LAResult
-            if password == authRequest.password {
-                if authRequest.selfDestruct && kcSelfDestructPassword.get() != nil && !m.chatInitialized {
-                    initChatAndMigrate()
-                }
-                r = .success
-            } else {
-                r = .failed(authError: NSLocalizedString("Incorrect passcode", comment: "PIN entry"))
-            }
+            let r: LAResult = password == authRequest.password
+                            ? .success
+                            : .failed(authError: NSLocalizedString("Incorrect passcode", comment: "PIN entry"))
             m.laRequest = nil
             authRequest.completed(r)
         } cancel: {
@@ -46,27 +37,8 @@ struct LocalAuthView: View {
     private func deleteStorageAndRestart(_ password: String, completed: @escaping (LAResult) -> Void) {
         Task {
             do {
-                /** Waiting until [initializeChat] finishes */
-                while (m.ctrlInitInProgress) {
-                    try await Task.sleep(nanoseconds: 50_000000)
-                }
-                if m.chatRunning == true {
-                    try await stopChatAsync()
-                }
-                if m.chatInitialized {
-                    /**
-                     * The following sequence can bring a user here:
-                     * the user opened the app, entered app passcode, went to background, returned back, entered self-destruct code.
-                     * In this case database should be closed to prevent possible situation when OS can deny database removal command
-                     * */
-                    chatCloseStore()
-                }
-                deleteAppDatabaseAndFiles()
-                // Clear sensitive data on screen just in case app fails to hide its views while new database is created
-                m.chatId = nil
-                m.reversedChatItems = []
-                m.chats = []
-                m.users = []
+                try await stopChatAsync()
+                try await deleteChatAsync()
                 _ = kcAppPassword.set(password)
                 _ = kcSelfDestructPassword.remove()
                 await NtfManager.shared.removeAllNotifications()
@@ -80,8 +52,8 @@ struct LocalAuthView: View {
                 resetChatCtrl()
                 try initializeChat(start: true)
                 m.chatDbChanged = false
-                AppChatState.shared.set(.active)
-                if m.currentUser != nil || !m.chatInitialized { return }
+                appStateGroupDefault.set(.active)
+                if m.currentUser != nil { return }
                 var profile: Profile? = nil
                 if let displayName = displayName, displayName != "" {
                     profile = Profile(displayName: displayName, fullName: "")

apps/ios/Shared/Views/LocalAuth/PasscodeView.swift

@@ -14,8 +14,6 @@ struct PasscodeView: View {
     var reason: String? = nil
     var submitLabel: LocalizedStringKey
     var submitEnabled: ((String) -> Bool)?
-    @Binding var buttonsEnabled: Bool
-
     var submit: () -> Void
     var cancel: () -> Void
 
@@ -72,11 +70,11 @@ struct PasscodeView: View {
     @ViewBuilder private func buttonsView() -> some View {
         Button(action: cancel) {
             Label("Cancel", systemImage: "multiply")
-        }.disabled(!buttonsEnabled)
+        }
         Button(action: submit) {
             Label(submitLabel, systemImage: "checkmark")
         }
-        .disabled(submitEnabled?(passcode) == false || passcode.count < 4 || !buttonsEnabled)
+        .disabled(submitEnabled?(passcode) == false || passcode.count < 4)
     }
 }
 
@@ -87,7 +85,6 @@ struct PasscodeViewView_Previews: PreviewProvider {
             title: "Enter Passcode",
             reason: "Unlock app",
             submitLabel: "Submit",
-            buttonsEnabled: Binding.constant(true),
             submit: {},
             cancel: {}
         )

apps/ios/Shared/Views/LocalAuth/SetAppPasscodeView.swift

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct SetAppPasscodeView: View {
     var passcodeKeychain: KeyChainItem = kcAppPassword
-    var prohibitedPasscodeKeychain: KeyChainItem = kcSelfDestructPassword
     var title: LocalizedStringKey = "New Passcode"
     var reason: String?
     var submit: () -> Void
@@ -42,10 +41,7 @@ struct SetAppPasscodeView: View {
                     }
                 }
             } else {
-                setPasswordView(title: title,
-                                submitLabel: "Save",
-                                // Do not allow to set app passcode == selfDestruct passcode
-                                submitEnabled: { pwd in pwd != prohibitedPasscodeKeychain.get() }) {
+                setPasswordView(title: title, submitLabel: "Save") {
                     enteredPassword = passcode
                     passcode = ""
                     confirming = true
@@ -58,7 +54,7 @@ struct SetAppPasscodeView: View {
     }
 
     private func setPasswordView(title: LocalizedStringKey, submitLabel: LocalizedStringKey, submitEnabled: (((String) -> Bool))? = nil, submit: @escaping () -> Void) -> some View {
-        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, buttonsEnabled: Binding.constant(true), submit: submit) {
+        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, submit: submit) {
             dismiss()
             cancel()
         }

apps/ios/Shared/Views/Migration/MigrateFromDevice.swift

@@ -1,734 +0,0 @@
-//
-//  MigrateFromDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 14.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private enum MigrationFromState: Equatable {
-    case chatStopInProgress
-    case chatStopFailed(reason: String)
-    case passphraseNotSet
-    case passphraseConfirmation
-    case uploadConfirmation
-    case archiving
-    case uploadProgress(uploadedBytes: Int64, totalBytes: Int64, fileId: Int64, archivePath: URL, ctrl: chat_ctrl?)
-    case uploadFailed(totalBytes: Int64, archivePath: URL)
-    case linkCreation
-    case linkShown(fileId: Int64, link: String, archivePath: URL, ctrl: chat_ctrl)
-    case finished(chatDeletion: Bool)
-}
-
-private enum MigrateFromDeviceViewAlert: Identifiable {
-    case deleteChat(_ title: LocalizedStringKey = "Delete chat profile?", _ text: LocalizedStringKey = "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.")
-    case startChat(_ title: LocalizedStringKey = "Start chat?", _ text: LocalizedStringKey = "Warning: starting chat on multiple devices is not supported and will cause message delivery failures")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case let .deleteChat(title, text): return "\(title) \(text)"
-        case let .startChat(title, text): return "\(title) \(text)"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateFromDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showSettings: Bool
-    @Binding var showProgressOnSettings: Bool
-    @State private var migrationState: MigrationFromState = .chatStopInProgress
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @AppStorage(GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE, store: groupDefaults) private var initialRandomDBPassphrase: Bool = false
-    @State private var alert: MigrateFromDeviceViewAlert?
-    @State private var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    @State private var backDisabled: Bool = false
-
-    var body: some View {
-        if authorized {
-            migrateView()
-        } else {
-            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
-                .onAppear(perform: runAuth)
-        }
-    }
-
-    private func runAuth() { authorize(NSLocalizedString("Open migration to another device", comment: "authentication reason"), $authorized) }
-
-    func migrateView() -> some View {
-        VStack {
-            switch migrationState {
-            case .chatStopInProgress:
-                chatStopInProgressView()
-            case let .chatStopFailed(reason):
-                chatStopFailedView(reason)
-            case .passphraseNotSet:
-                passphraseNotSetView()
-            case .passphraseConfirmation:
-                PassphraseConfirmationView(migrationState: $migrationState, alert: $alert)
-            case .uploadConfirmation:
-                uploadConfirmationView()
-            case .archiving:
-                archivingView()
-            case let .uploadProgress(uploaded, total, _, archivePath, _):
-                uploadProgressView(uploaded, totalBytes: total, archivePath)
-            case let .uploadFailed(total, archivePath):
-                uploadFailedView(totalBytes: total, archivePath)
-            case .linkCreation:
-                linkCreationView()
-            case let .linkShown(fileId, link, archivePath, ctrl):
-                linkShownView(fileId, link, archivePath, ctrl)
-            case let .finished(chatDeletion):
-                finishedView(chatDeletion)
-            }
-        }
-        .modifier(BackButton(label: "Back", disabled: $backDisabled) {
-            dismiss()
-        })
-        .onChange(of: migrationState) { state in
-            backDisabled = switch migrationState {
-            case .chatStopInProgress, .archiving, .linkShown, .finished: true
-            case .chatStopFailed, .passphraseNotSet, .passphraseConfirmation, .uploadConfirmation, .uploadProgress, .uploadFailed, .linkCreation: false
-            }
-        }
-        .onAppear {
-            stopChat()
-        }
-        .onDisappear {
-            Task {
-                if !backDisabled {
-                    await MainActor.run {
-                        showProgressOnSettings = true
-                    }
-                    await startChatAndDismiss(false)
-                    await MainActor.run {
-                        showProgressOnSettings = false
-                    }
-                }
-                if case let .uploadProgress(_, _, fileId, _, ctrl) = migrationState, let ctrl {
-                    await cancelUploadedArchive(fileId, ctrl)
-                }
-                chatReceiver?.stopAndCleanUp()
-                try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .startChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .destructive(Text("Start chat")) {
-                        Task {
-                            await startChatAndDismiss()
-                        }
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .deleteChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .default(Text("Delete")) {
-                        deleteChatAndDismiss()
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func chatStopInProgressView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Stopping chat")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func chatStopFailedView(_ reason: String) -> some View {
-        List {
-            Section {
-                Text(reason)
-                Button(action: stopChat) {
-                    settingsRow("stop.fill") {
-                        Text("Stop chat").foregroundColor(.red)
-                    }
-                }
-            } header: {
-                Text("Error stopping chat")
-            } footer: {
-                Text("In order to continue, chat should be stopped.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func passphraseNotSetView() -> some View {
-        DatabaseEncryptionView(useKeychain: $useKeychain, migration: true)
-            .onChange(of: initialRandomDBPassphrase) { initial in
-                if !initial {
-                    migrationState = .uploadConfirmation
-                }
-            }
-    }
-
-    private func uploadConfirmationView() -> some View {
-        List {
-            Section {
-                Button(action: { migrationState = .archiving }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Archive and upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Confirm upload")
-            } footer: {
-                Text("All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func archivingView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Archiving database")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            exportArchive()
-        }
-    }
-
-    private func uploadProgressView(_ uploadedBytes: Int64, totalBytes: Int64, _ archivePath: URL) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Uploading archive")
-                }
-            }
-            let ratio = Float(uploadedBytes) / Float(totalBytes)
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: uploadedBytes, countStyle: .binary)) uploaded")
-        }
-        .onAppear {
-            startUploading(totalBytes, archivePath)
-        }
-    }
-
-    private func uploadFailedView(totalBytes: Int64, _ archivePath: URL) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Repeat upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Upload failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stopAndCleanUp()
-        }
-    }
-
-    private func linkCreationView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Creating archive link")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func linkShownView(_ fileId: Int64, _ link: String, _ archivePath: URL, _ ctrl: chat_ctrl) -> some View {
-        List {
-            Section {
-                Button(action: { cancelMigration(fileId, ctrl) }) {
-                    settingsRow("multiply") {
-                        Text("Cancel migration").foregroundColor(.red)
-                    }
-                }
-                Button(action: { finishMigration(fileId, ctrl) }) {
-                    settingsRow("checkmark") {
-                        Text("Finalize migration").foregroundColor(.accentColor)
-                    }
-                }
-            } footer: {
-                VStack(alignment: .leading, spacing: 16) {
-                    Text("**Warning**: the archive will be removed.")
-                    Text("Choose _Migrate from another device_ on the new device and scan QR code.")
-                }
-                .font(.callout)
-            }
-            Section("Show QR code") {
-                SimpleXLinkQRCode(uri: link)
-                    .padding()
-                    .background(
-                        RoundedRectangle(cornerRadius: 12, style: .continuous)
-                            .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                    )
-                    .padding(.horizontal)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-            }
-
-            Section("Or securely share this file link") {
-                shareLinkView(link)
-            }
-            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
-        }
-    }
-
-    private func finishedView(_ chatDeletion: Bool) -> some View {
-        ZStack {
-            List {
-                Section {
-                    Button(action: { alert = .startChat() }) {
-                        settingsRow("play.fill") {
-                            Text("Start chat").foregroundColor(.red)
-                        }
-                    }
-                    Button(action: { alert = .deleteChat() }) {
-                        settingsRow("trash.fill") {
-                            Text("Delete database from this device").foregroundColor(.accentColor)
-                        }
-                    }
-                } header: {
-                    Text("Migration complete")
-                } footer: {
-                    VStack(alignment: .leading, spacing: 16) {
-                        Text("You **must not** use the same database on two devices.")
-                        Text("**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.")
-                    }
-                    .font(.callout)
-                }
-            }
-            if chatDeletion {
-                progressView()
-            }
-        }
-    }
-
-    private func shareLinkView(_ link: String) -> some View {
-        HStack {
-            linkTextView(link)
-            Button {
-                showShareSheet(items: [link])
-            } label: {
-                Image(systemName: "square.and.arrow.up")
-                    .padding(.top, -7)
-            }
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func linkTextView(_ link: String) -> some View {
-        Text(link)
-            .lineLimit(1)
-            .font(.caption)
-            .truncationMode(.middle)
-    }
-
-    static func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey) -> some View {
-        ZStack {
-            VStack {
-                Text(description)
-                    .font(.title3)
-                    .hidden()
-
-                Text(title)
-                    .font(.system(size: 54))
-                    .bold()
-                    .foregroundColor(.accentColor)
-
-                Text(description)
-                    .font(.title3)
-            }
-
-            Circle()
-                .trim(from: 0, to: CGFloat(value))
-                .stroke(
-                    Color.accentColor,
-                    style: StrokeStyle(lineWidth: 27)
-                )
-                .rotationEffect(.degrees(180))
-                .animation(.linear, value: value)
-                .frame(maxWidth: .infinity)
-                .padding(.horizontal)
-                .padding(.horizontal)
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func stopChat() {
-        Task {
-            do {
-                try await stopChatAsync()
-                do {
-                    try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-                    await MainActor.run {
-                        migrationState = initialRandomDBPassphraseGroupDefault.get() ? .passphraseNotSet :  .passphraseConfirmation
-                    }
-                } catch let error {
-                    alert = .error(title: "Error saving settings", error: error.localizedDescription)
-                    migrationState = .chatStopFailed(reason: NSLocalizedString("Error saving settings", comment: "when migrating"))
-                }
-            } catch let e {
-                await MainActor.run {
-                    migrationState = .chatStopFailed(reason: e.localizedDescription)
-                }
-            }
-        }
-    }
-
-    private func exportArchive() {
-        Task {
-            do {
-                try? FileManager.default.createDirectory(at: getMigrationTempFilesDirectory(), withIntermediateDirectories: true)
-                let archivePath = try await exportChatArchive(getMigrationTempFilesDirectory())
-                if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
-                    let totalBytes = attrs[.size] as? Int64 {
-                    await MainActor.run {
-                        migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                    }
-                } else {
-                    await MainActor.run {
-                        alert = .error(title: "Exported file doesn't exist")
-                        migrationState = .uploadConfirmation
-                    }
-                }
-            } catch let error {
-                await MainActor.run {
-                    alert = .error(title: "Error exporting chat database", error: responseError(error))
-                    migrationState = .uploadConfirmation
-                }
-            }
-        }
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startUploading(_ totalBytes: Int64, _ archivePath: URL) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
-                await MainActor.run {
-                    switch msg {
-                    case let .sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize):
-                        if case let .uploadProgress(uploaded, total, _, _, _) = migrationState, uploaded != total {
-                            migrationState = .uploadProgress(uploadedBytes: sentSize, totalBytes: totalSize, fileId: fileTransferMeta.fileId, archivePath: archivePath, ctrl: ctrl)
-                        }
-                    case .sndFileRedirectStartXFTP:
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkCreation
-                        }
-                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
-                        let cfg = getNetCfg()
-                        let data = MigrationFileLinkData.init(
-                            networkConfig: MigrationFileLinkData.NetworkConfig(
-                                socksProxy: cfg.socksProxy,
-                                hostMode: cfg.hostMode,
-                                requiredHostMode: cfg.requiredHostMode
-                            )
-                        )
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkShown(fileId: fileTransferMeta.fileId, link: data.addToLink(link: rcvURIs[0]), archivePath: archivePath, ctrl: ctrl)
-                        }
-                    case .sndFileError:
-                        alert = .error(title: "Upload failed", error: "Check your internet connection and try again")
-                        migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await uploadStandaloneFile(user: user, file: CryptoFile.plain(archivePath.lastPathComponent), ctrl: ctrl)
-            await MainActor.run {
-                guard let res = res else {
-                    migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-                    return alert = .error(title: "Error uploading the archive", error: error ?? "")
-                }
-                migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: res.fileSize, fileId: res.fileId, archivePath: archivePath, ctrl: ctrl)
-            }
-        }
-    }
-
-    private func cancelUploadedArchive(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func cancelMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedArchive(fileId, ctrl)
-            await startChatAndDismiss()
-        }
-    }
-
-    private func finishMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedArchive(fileId, ctrl)
-            await MainActor.run {
-                migrationState = .finished(chatDeletion: false)
-            }
-        }
-    }
-
-    private func deleteChatAndDismiss() {
-        Task {
-            do {
-                try await deleteChatAsync()
-                m.chatDbChanged = true
-                m.chatInitialized = false
-                migrationState = .finished(chatDeletion: true)
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    resetChatCtrl()
-                    do {
-                        try initializeChat(start: false)
-                        m.chatDbChanged = false
-                        AppChatState.shared.set(.active)
-                    } catch let error {
-                        fatalError("Error starting chat \(responseError(error))")
-                    }
-                    showSettings = false
-                }
-            } catch let error {
-                alert = .error(title: "Error deleting database", error: responseError(error))
-            }
-        }
-    }
-
-    private func startChatAndDismiss(_ dismiss: Bool = true) async {
-        AppChatState.shared.set(.active)
-        do {
-            if m.chatDbChanged {
-                resetChatCtrl()
-                try initializeChat(start: true)
-                m.chatDbChanged = false
-            } else {
-                try startChat(refreshInvitations: true)
-            }
-        } catch let error {
-            alert = .error(title: "Error starting chat", error: responseError(error))
-        }
-        // Hide settings anyway if chatDbStatus is not ok, probably passphrase needs to be entered
-        if dismiss || m.chatDbStatus != .ok {
-            await MainActor.run {
-                showSettings = false
-            }
-        }
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseConfirmationView: View {
-    @Binding var migrationState: MigrationFromState
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var currentKey: String = ""
-    @State private var verifyingPassphrase: Bool = false
-    @FocusState private var keyboardVisible: Bool
-    @Binding var alert: MigrateFromDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                chatStoppedView()
-                Section {
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                        .focused($keyboardVisible)
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            await verifyDatabasePassphrase(currentKey)
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow(useKeychain ? "key" : "lock", color: .secondary) {
-                            Text("Verify passphrase")
-                        }
-                    }
-                    .disabled(verifyingPassphrase || currentKey.isEmpty)
-                } header: {
-                    Text("Verify database passphrase")
-                } footer: {
-                    Text("Confirm that you remember database passphrase to migrate it.")
-                        .font(.callout)
-                }
-                .onAppear {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                        keyboardVisible = true
-                    }
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-
-    private func verifyDatabasePassphrase(_ dbKey: String) async {
-        do {
-            try await testStorageEncryption(key: dbKey)
-            await MainActor.run {
-                migrationState = .uploadConfirmation
-            }
-        } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorOpen(.errorNotADatabase))) = error as? ChatResponse {
-                showErrorOnMigrationIfNeeded(.errorNotADatabase(dbFile: ""), $alert)
-            } else {
-                alert = .error(title: "Error", error: NSLocalizedString("Error verifying passphrase:", comment: "") + " " + String(String(describing: error)))
-            }
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateFromDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-func chatStoppedView() -> some View {
-    settingsRow("exclamationmark.octagon.fill", color: .red) {
-        Text("Chat is stopped")
-    }
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.databaseUrl = databaseUrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
-            }
-            logger.debug("processReceivedMsg: \(msg.responseType)")
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stopAndCleanUp() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_chat.db")
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_agent.db")
-    }
-}
-
-struct MigrateFromDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateFromDevice(showSettings: Binding.constant(true), showProgressOnSettings: Binding.constant(false))
-    }
-}

apps/ios/Shared/Views/Migration/MigrateToDevice.swift

@@ -1,717 +0,0 @@
-//
-//  MigrateToDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-enum MigrationToDeviceState: Codable, Equatable {
-    case downloadProgress(link: String, archiveName: String)
-    case archiveImport(archiveName: String)
-    case passphrase
-
-    // Here we check whether it's needed to show migration process after app restart or not
-    // It's important to NOT show the process when archive was corrupted/not fully downloaded
-    static func makeMigrationState() -> MigrationToState? {
-        let state: MigrationToDeviceState? = UserDefaults.standard.string(forKey: DEFAULT_MIGRATION_TO_STAGE) != nil ? decodeJSON(UserDefaults.standard.string(forKey: DEFAULT_MIGRATION_TO_STAGE)!) : nil
-        var initial: MigrationToState? = .pasteOrScanLink
-        //logger.debug("Inited with migrationState: \(String(describing: state))")
-        switch state {
-        case nil:
-            initial = nil
-        case .downloadProgress:
-            // No migration happens at the moment actually since archive were not downloaded fully
-            logger.debug("MigrateToDevice: archive wasn't fully downloaded, removed broken file")
-            initial = nil
-        case let .archiveImport(archiveName):
-            let archivePath = getMigrationTempFilesDirectory().path + "/" + archiveName
-            initial = .archiveImportFailed(archivePath: archivePath)
-        case .passphrase:
-            initial = .passphrase(passphrase: "")
-        }
-        if initial == nil {
-            UserDefaults.standard.removeObject(forKey: DEFAULT_MIGRATION_TO_STAGE)
-            try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-        }
-        return initial
-    }
-
-    static func save(_ state: MigrationToDeviceState?) {
-        if let state {
-            UserDefaults.standard.setValue(encodeJSON(state), forKey: DEFAULT_MIGRATION_TO_STAGE)
-        } else {
-            UserDefaults.standard.removeObject(forKey: DEFAULT_MIGRATION_TO_STAGE)
-        }
-    }
-}
-
-enum MigrationToState: Equatable {
-    case pasteOrScanLink
-    case linkDownloading(link: String)
-    case downloadProgress(downloadedBytes: Int64, totalBytes: Int64, fileId: Int64, link: String, archivePath: String, ctrl: chat_ctrl?)
-    case downloadFailed(totalBytes: Int64, link: String, archivePath: String)
-    case archiveImport(archivePath: String)
-    case archiveImportFailed(archivePath: String)
-    case passphrase(passphrase: String)
-    case migrationConfirmation(status: DBMigrationResult, passphrase: String, useKeychain: Bool)
-    case migration(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Bool)
-    case onion(appSettings: AppSettings)
-}
-
-private enum MigrateToDeviceViewAlert: Identifiable {
-    case chatImportedWithErrors(title: LocalizedStringKey = "Chat database imported",
-                                text: LocalizedStringKey = "Some non-fatal errors occurred during import - you may see Chat console for more details.")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case .chatImportedWithErrors: return "chatImportedWithErrors"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateToDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @Binding var migrationState: MigrationToState?
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var alert: MigrateToDeviceViewAlert?
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    // Prevent from hiding the view until migration is finished or app deleted
-    @State private var backDisabled: Bool = false
-    @State private var showQRCodeScanner: Bool = true
-
-    var body: some View {
-        VStack {
-            switch migrationState {
-            case nil: EmptyView()
-            case .pasteOrScanLink:
-                pasteOrScanLinkView()
-            case let .linkDownloading(link):
-                linkDownloadingView(link)
-            case let .downloadProgress(downloaded, total, _, _, _, _):
-                downloadProgressView(downloaded, totalBytes: total)
-            case let .downloadFailed(total, link, archivePath):
-                downloadFailedView(totalBytes: total, link, archivePath)
-            case let .archiveImport(archivePath):
-                archiveImportView(archivePath)
-            case let .archiveImportFailed(archivePath):
-                archiveImportFailedView(archivePath)
-            case let .passphrase(passphrase):
-                PassphraseEnteringView(migrationState: $migrationState, currentKey: passphrase, alert: $alert)
-            case let .migrationConfirmation(status, passphrase, useKeychain):
-                migrationConfirmationView(status, passphrase, useKeychain)
-            case let .migration(passphrase, confirmation, useKeychain):
-                migrationView(passphrase, confirmation, useKeychain)
-            case let .onion(appSettings):
-                OnionView(appSettings: appSettings, finishMigration: finishMigration)
-            }
-        }
-        .onAppear {
-            backDisabled = switch migrationState {
-            case nil, .pasteOrScanLink, .linkDownloading, .downloadProgress, .downloadFailed, .archiveImportFailed: false
-            case .archiveImport, .passphrase, .migrationConfirmation, .migration, .onion: true
-            }
-        }
-        .onChange(of: migrationState) { state in
-            backDisabled = switch state {
-            case nil, .pasteOrScanLink, .linkDownloading, .downloadProgress, .downloadFailed, .archiveImportFailed: false
-            case .archiveImport, .passphrase, .migrationConfirmation, .migration, .onion: true
-            }
-        }
-        .onDisappear {
-            Task {
-                if case .archiveImportFailed = migrationState {
-                    // Original database is not exist, nothing is setup correctly for showing to a user yet. Return to clean state
-                    deleteAppDatabaseAndFiles()
-                    initChatAndMigrate()
-                } else if case let .downloadProgress(_, _, fileId, _, _, ctrl) = migrationState, let ctrl {
-                    await stopArchiveDownloading(fileId, ctrl)
-                }
-                chatReceiver?.stopAndCleanUp()
-                if !backDisabled {
-                    try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-                    MigrationToDeviceState.save(nil)
-                }
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .chatImportedWithErrors(title, text): 
-                return Alert(title: Text(title), message: Text(text))
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func pasteOrScanLinkView() -> some View {
-        ZStack {
-            List {
-                Section("Scan QR code") {
-                    ScannerInView(showQRCodeScanner: $showQRCodeScanner) { resp in
-                        switch resp {
-                        case let .success(r):
-                            let link = r.string
-                            if strHasSimplexFileLink(link.trimmingCharacters(in: .whitespaces)) {
-                                migrationState = .linkDownloading(link: link.trimmingCharacters(in: .whitespaces))
-                            } else {
-                                alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                            }
-                        case let .failure(e):
-                            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-                            alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                        }
-                    }
-                }
-                if developerTools {
-                    Section("Or paste archive link") {
-                        pasteLinkView()
-                    }
-                }
-            }
-        }
-    }
-
-    private func pasteLinkView() -> some View {
-        Button {
-            if let str = UIPasteboard.general.string {
-                if strHasSimplexFileLink(str.trimmingCharacters(in: .whitespaces)) {
-                    migrationState = .linkDownloading(link: str.trimmingCharacters(in: .whitespaces))
-                } else {
-                    alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                }
-            }
-        } label: {
-            Text("Tap to paste link")
-        }
-        .disabled(!ChatModel.shared.pasteboardHasStrings)
-        .frame(maxWidth: .infinity, alignment: .center)
-    }
-
-    private func linkDownloadingView(_ link: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading link details")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            downloadLinkDetails(link)
-        }
-    }
-
-    private func downloadProgressView(_ downloadedBytes: Int64, totalBytes: Int64) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading archive")
-                }
-            }
-            let ratio = Float(downloadedBytes) / Float(max(totalBytes, 1))
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: downloadedBytes, countStyle: .binary)) downloaded")
-        }
-    }
-
-    private func downloadFailedView(totalBytes: Int64, _ link: String, _ archivePath: String) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    try? FileManager.default.removeItem(atPath: archivePath)
-                    migrationState = .linkDownloading(link: link)
-                }) {
-                    settingsRow("tray.and.arrow.down") {
-                        Text("Repeat download").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Download failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stopAndCleanUp()
-            try? FileManager.default.removeItem(atPath: archivePath)
-            MigrationToDeviceState.save(nil)
-        }
-    }
-
-    private func archiveImportView(_ archivePath: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Importing archive")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            importArchive(archivePath)
-        }
-    }
-
-    private func archiveImportFailedView(_ archivePath: String) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .archiveImport(archivePath: archivePath)
-                }) {
-                    settingsRow("square.and.arrow.down") {
-                        Text("Repeat import").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Import failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func migrationConfirmationView(_ status: DBMigrationResult, _ passphrase: String, _ useKeychain: Bool) -> some View {
-        List {
-            let (header, button, footer, confirmation): (LocalizedStringKey, LocalizedStringKey?, String, MigrationConfirmation?) = switch status {
-            case let .errorMigration(_, migrationError):
-                switch migrationError {
-                case .upgrade:
-                    ("Database upgrade",
-                    "Upgrade and open chat",
-                     "",
-                     .yesUp)
-                case .downgrade:
-                    ("Database downgrade",
-                    "Downgrade and open chat",
-                     NSLocalizedString("Warning: you may lose some data!", comment: ""),
-                    .yesUpDown)
-                case let .migrationError(mtrError):
-                    ("Incompatible database version",
-                     nil,
-                     "\(NSLocalizedString("Error: ", comment: "")) \(DatabaseErrorView.mtrErrorDescription(mtrError))",
-                     nil)
-                }
-            default: ("Error", nil, "Unknown error", nil)
-            }
-            Section {
-                if let button, let confirmation {
-                    Button(action: {
-                        migrationState = .migration(passphrase: passphrase, confirmation: confirmation, useKeychain: useKeychain)
-                    }) {
-                        settingsRow("square.and.arrow.down") {
-                            Text(button).foregroundColor(.accentColor)
-                        }
-                    }
-                } else {
-                    EmptyView()
-                }
-            } header: {
-                Text(header)
-            } footer: {
-                Text(footer)
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func migrationView(_ passphrase: String, _ confirmation: MigrationConfirmation, _ useKeychain: Bool) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Migrating")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            startChat(passphrase, confirmation, useKeychain)
-        }
-    }
-
-    struct OnionView: View {
-        @State var appSettings: AppSettings
-        @State private var onionHosts: OnionHosts = .no
-        var finishMigration: (AppSettings) -> Void
-
-        var body: some View {
-            List {
-                Section {
-                    Button(action: {
-                        var updated = appSettings.networkConfig!
-                        let (hostMode, requiredHostMode) = onionHosts.hostMode
-                        updated.hostMode = hostMode
-                        updated.requiredHostMode = requiredHostMode
-                        updated.socksProxy = nil
-                        appSettings.networkConfig = updated
-                        finishMigration(appSettings)
-                    }) {
-                        settingsRow("checkmark") {
-                            Text("Apply").foregroundColor(.accentColor)
-                        }
-                    }
-                } header: {
-                    Text("Confirm network settings")
-                } footer: {
-                    Text("Please confirm that network settings are correct for this device.")
-                        .font(.callout)
-                }
-
-                Section("Network settings") {
-                    Picker("Use .onion hosts", selection: $onionHosts) {
-                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-                }
-            }
-        }
-    }
-
-    private func downloadLinkDetails(_ link: String) {
-        let archiveTime = Date.now
-        let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
-        let archiveName = "simplex-chat.\(ts).zip"
-        let archivePath = getMigrationTempFilesDirectory().appendingPathComponent(archiveName)
-
-        startDownloading(0, link, archivePath.path)
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startDownloading(_ totalBytes: Int64, _ link: String, _ archivePath: String) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
-                await MainActor.run {
-                    switch msg {
-                    case let .rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer):
-                        migrationState = .downloadProgress(downloadedBytes: receivedSize, totalBytes: totalSize, fileId: rcvFileTransfer.fileId, link: link, archivePath: archivePath, ctrl: ctrl)
-                        MigrationToDeviceState.save(.downloadProgress(link: link, archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
-                    case .rcvStandaloneFileComplete:
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            // User closed the whole screen before new state was saved
-                            if migrationState == nil {
-                                MigrationToDeviceState.save(nil)
-                            } else {
-                                migrationState = .archiveImport(archivePath: archivePath)
-                                MigrationToDeviceState.save(.archiveImport(archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
-                            }
-                        }
-                    case .rcvFileError:
-                        alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
-                        migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                    case .chatError(_, .error(.noRcvFileUser)):
-                        alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
-                        migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await downloadStandaloneFile(user: user, url: link, file: CryptoFile.plain(URL(fileURLWithPath: archivePath).lastPathComponent), ctrl: ctrl)
-            if res == nil {
-                await MainActor.run {
-                    migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                }
-                return alert = .error(title: "Error downloading the archive", error: error ?? "")
-            }
-        }
-    }
-
-    private func importArchive(_ archivePath: String) {
-        Task {
-            do {
-                if !hasChatCtrl() {
-                    chatInitControllerRemovingDatabases()
-                }
-                try await apiDeleteStorage()
-                do {
-                    let config = ArchiveConfig(archivePath: archivePath)
-                    let archiveErrors = try await apiImportArchive(config: config)
-                    if !archiveErrors.isEmpty {
-                        alert = .chatImportedWithErrors()
-                    }
-                    await MainActor.run {
-                        migrationState = .passphrase(passphrase: "")
-                        MigrationToDeviceState.save(.passphrase)
-                    }
-                } catch let error {
-                    await MainActor.run {
-                        migrationState = .archiveImportFailed(archivePath: archivePath)
-                    }
-                    alert = .error(title: "Error importing chat database", error: responseError(error))
-                }
-            } catch let error {
-                await MainActor.run {
-                    migrationState = .archiveImportFailed(archivePath: archivePath)
-                }
-                alert = .error(title: "Error deleting chat database", error: responseError(error))
-            }
-        }
-    }
-
-
-    private func stopArchiveDownloading(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func startChat(_ passphrase: String, _ confirmation: MigrationConfirmation, _ useKeychain: Bool) {
-        if useKeychain {
-            _ = kcDatabasePassword.set(passphrase)
-        } else {
-            _ = kcDatabasePassword.remove()
-        }
-        storeDBPassphraseGroupDefault.set(useKeychain)
-        initialRandomDBPassphraseGroupDefault.set(false)
-        AppChatState.shared.set(.active)
-        Task {
-            do {
-                resetChatCtrl()
-                try initializeChat(start: false, confirmStart: false, dbKey: passphrase, refreshInvitations: true, confirmMigrations: confirmation)
-                var appSettings = try apiGetAppSettings(settings: AppSettings.current.prepareForExport())
-                let hasOnionConfigured = appSettings.networkConfig?.socksProxy != nil || appSettings.networkConfig?.hostMode == .onionHost
-                appSettings.networkConfig?.socksProxy = nil
-                appSettings.networkConfig?.hostMode = .publicHost
-                appSettings.networkConfig?.requiredHostMode = true
-                await MainActor.run {
-                    if hasOnionConfigured {
-                        migrationState = .onion(appSettings: appSettings)
-                    } else {
-                        finishMigration(appSettings)
-                    }
-                }
-            } catch let error {
-                hideView()
-                AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
-            }
-        }
-    }
-
-    private func finishMigration(_ appSettings: AppSettings) {
-        do {
-            try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            MigrationToDeviceState.save(nil)
-            appSettings.importIntoApp()
-            try SimpleX.startChat(refreshInvitations: true)
-            AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
-        } catch let error {
-            AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
-        }
-        hideView()
-    }
-
-    private func hideView() {
-        onboardingStageDefault.set(.onboardingComplete)
-        m.onboardingStage = .onboardingComplete
-        dismiss()
-    }
-
-    private func strHasSimplexFileLink(_ text: String) -> Bool {
-        text.starts(with: "simplex:/file") || text.starts(with: "https://simplex.chat/file")
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseEnteringView: View {
-    @Binding var migrationState: MigrationToState?
-    @State private var useKeychain = true
-    @State var currentKey: String
-    @State private var verifyingPassphrase: Bool = false
-    @FocusState private var keyboardVisible: Bool
-    @Binding var alert: MigrateToDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                Section {
-                    settingsRow("key", color: .secondary) {
-                        Toggle("Save passphrase in Keychain", isOn: $useKeychain)
-                    }
-
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                        .focused($keyboardVisible)
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            let (status, _) = chatInitTemporaryDatabase(url: getAppDatabasePath(), key: currentKey, confirmation: .yesUp)
-                            let success = switch status {
-                            case .ok, .invalidConfirmation: true
-                            default: false
-                            }
-                            if success {
-                                await MainActor.run {
-                                    migrationState = .migration(passphrase: currentKey, confirmation: .yesUp, useKeychain: useKeychain)
-                                }
-                            } else if case .errorMigration = status {
-                                await MainActor.run {
-                                    migrationState = .migrationConfirmation(status: status, passphrase: currentKey, useKeychain: useKeychain)
-                                }
-                            } else {
-                                showErrorOnMigrationIfNeeded(status, $alert)
-                            }
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow("key", color: .secondary) {
-                            Text("Open chat")
-                        }
-                    }
-                    .disabled(verifyingPassphrase || currentKey.isEmpty)
-                } header: {
-                    Text("Enter passphrase")
-                } footer: {
-                    VStack(alignment: .leading, spacing: 16) {
-                        if useKeychain {
-                            Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
-                        } else {
-                            Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
-                            Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
-                            Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
-                        }
-                    }
-                    .font(.callout)
-                    .padding(.top, 1)
-                    .onTapGesture { keyboardVisible = false }
-                }
-                .onAppear {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                        keyboardVisible = true
-                    }
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateToDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.databaseUrl = databaseUrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
-            }
-            logger.debug("processReceivedMsg: \(msg.responseType)")
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stopAndCleanUp() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_chat.db")
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_agent.db")
-    }
-}
-
-struct MigrateToDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateToDevice(migrationState: Binding.constant(.pasteOrScanLink))
-    }
-}

apps/ios/Shared/Views/NewChat/AddContactLearnMore.swift

@@ -9,20 +9,8 @@
 import SwiftUI
 
 struct AddContactLearnMore: View {
-    var showTitle: Bool
-
     var body: some View {
         List {
-            if showTitle {
-                Text("One-time invitation link")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.vertical)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-            }
             VStack(alignment: .leading, spacing: 18) {
                 Text("To connect, your contact can scan QR code or use the link in the app.")
                 Text("If you can't meet in person, show QR code in a video call, or share the link.")
@@ -35,6 +23,6 @@ struct AddContactLearnMore: View {
 
 struct AddContactLearnMore_Previews: PreviewProvider {
     static var previews: some View {
-        AddContactLearnMore(showTitle: true)
+        AddContactLearnMore()
     }
 }

apps/ios/Shared/Views/NewChat/AddContactView.swift

@@ -0,0 +1,129 @@
+//
+//  AddContactView.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 29/01/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import CoreImage.CIFilterBuiltins
+import SimpleXChat
+
+struct AddContactView: View {
+    @EnvironmentObject private var chatModel: ChatModel
+    @Binding var contactConnection: PendingContactConnection?
+    var connReqInvitation: String
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+
+    var body: some View {
+        VStack {
+            List {
+                Section {
+                    if connReqInvitation != "" {
+                        QRCode(uri: connReqInvitation)
+                    } else {
+                        ProgressView()
+                            .progressViewStyle(.circular)
+                            .scaleEffect(2)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical)
+                    }
+                    IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                        .disabled(contactConnection == nil)
+                    shareLinkButton(connReqInvitation)
+                    oneTimeLinkLearnMoreButton()
+                } header: {
+                    Text("1-time link")
+                } footer: {
+                    sharedProfileInfo(incognitoDefault)
+                }
+            }
+        }
+        .onAppear { chatModel.connReqInv = connReqInvitation }
+        .onChange(of: incognitoDefault) { incognito in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            ChatModel.shared.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
+        }
+    }
+}
+
+struct IncognitoToggle: View {
+    @Binding var incognitoEnabled: Bool
+    @State private var showIncognitoSheet = false
+
+    var body: some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
+                .font(.system(size: 14))
+            Toggle(isOn: $incognitoEnabled) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+            }
+            .padding(.leading, 36)
+        }
+        .sheet(isPresented: $showIncognitoSheet) {
+            IncognitoHelp()
+        }
+    }
+}
+
+func sharedProfileInfo(_ incognito: Bool) -> Text {
+    let name = ChatModel.shared.currentUser?.displayName ?? ""
+    return Text(
+        incognito
+        ? "A new random profile will be shared."
+        : "Your profile **\(name)** will be shared."
+    )
+}
+
+func shareLinkButton(_ connReqInvitation: String) -> some View {
+    Button {
+        showShareSheet(items: [connReqInvitation])
+    } label: {
+        settingsRow("square.and.arrow.up") {
+            Text("Share 1-time link")
+        }
+    }
+}
+
+func oneTimeLinkLearnMoreButton() -> some View {
+    NavigationLink {
+        AddContactLearnMore()
+            .navigationTitle("One-time invitation link")
+            .navigationBarTitleDisplayMode(.large)
+    } label: {
+        settingsRow("info.circle") {
+            Text("Learn more")
+        }
+    }
+}
+
+struct AddContactView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddContactView(
+            contactConnection: Binding.constant(PendingContactConnection.getSampleData()),
+            connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D"
+        )
+    }
+}

apps/ios/Shared/Views/NewChat/AddGroupView.swift

@@ -12,45 +12,27 @@ import SimpleXChat
 struct AddGroupView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @State private var chat: Chat?
     @State private var groupInfo: GroupInfo?
     @State private var profile = GroupProfile(displayName: "", fullName: "")
     @FocusState private var focusDisplayName
+    @FocusState private var focusFullName
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var showInvalidNameAlert = false
-    @State private var groupLink: String?
-    @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
         if let chat = chat, let groupInfo = groupInfo {
-            if !groupInfo.membership.memberIncognito {
-                AddGroupMembersViewCommon(
-                    chat: chat,
-                    groupInfo: groupInfo,
-                    creatingGroup: true,
-                    showFooterCounter: false
-                ) { _ in
-                    dismiss()
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
-                    }
-                }
-            } else {
-                GroupLinkView(
-                    groupId: groupInfo.groupId,
-                    groupLink: $groupLink,
-                    groupLinkMemberRole: $groupLinkMemberRole,
-                    showTitle: true,
-                    creatingGroup: true
-                ) {
-                    dismiss()
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
-                    }
+            AddGroupMembersViewCommon(
+                chat: chat,
+                groupInfo: groupInfo,
+                creatingGroup: true,
+                showFooterCounter: false
+            ) { _ in
+                dismiss()
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    m.chatId = groupInfo.id
                 }
             }
         } else {
@@ -59,60 +41,79 @@ struct AddGroupView: View {
     }
 
     func createGroupView() -> some View {
-        List {
-            Group {
-                Text("Create secret group")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.bottom, 24)
-                    .onTapGesture(perform: hideKeyboard)
+        VStack(alignment: .leading) {
+            Text("Create secret group")
+                .font(.largeTitle)
+                .padding(.vertical, 4)
+            Text("The group is fully decentralized – it is visible only to the members.")
+                .padding(.bottom, 4)
 
-                ZStack(alignment: .center) {
-                    ZStack(alignment: .topTrailing) {
-                        ProfileImage(imageStr: profile.image, size: 128, color: Color(uiColor: .secondarySystemGroupedBackground))
-                        if profile.image != nil {
-                            Button {
-                                profile.image = nil
-                            } label: {
-                                Image(systemName: "multiply")
-                                    .resizable()
-                                    .aspectRatio(contentMode: .fit)
-                                    .frame(width: 12)
-                            }
+            HStack {
+                Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                Spacer().frame(width: 8)
+                Text("Your chat profile will be sent to group members").font(.footnote)
+            }
+            .padding(.bottom)
+
+            ZStack(alignment: .center) {
+                ZStack(alignment: .topTrailing) {
+                    profileImageView(profile.image)
+                    if profile.image != nil {
+                        Button {
+                            profile.image = nil
+                        } label: {
+                            Image(systemName: "multiply")
+                                .resizable()
+                                .aspectRatio(contentMode: .fit)
+                                .frame(width: 12)
                         }
                     }
+                }
 
-                    editImageButton { showChooseSource = true }
-                        .buttonStyle(BorderlessButtonStyle()) // otherwise whole "list row" is clickable
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
+                editImageButton { showChooseSource = true }
             }
-            .listRowBackground(Color.clear)
-            .listRowSeparator(.hidden)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            .frame(maxWidth: .infinity, alignment: .center)
+            .padding(.bottom, 4)
 
-            Section {
-                groupNameTextField()
-                Button(action: createGroup) {
-                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
+            ZStack(alignment: .topLeading) {
+                if !validDisplayName(profile.displayName) {
+                    Image(systemName: "exclamationmark.circle")
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
                 }
-                .disabled(!canCreateProfile())
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedGroupProfileInfo(incognitoDefault)
-                    Text("Fully decentralized – visible only to members.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .onTapGesture(perform: hideKeyboard)
+                textField("Group display name", text: $profile.displayName)
+                    .focused($focusDisplayName)
+                    .submitLabel(.next)
+                    .onSubmit {
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
+                    }
             }
+            textField("Group full name (optional)", text: $profile.fullName)
+                .focused($focusFullName)
+                .submitLabel(.go)
+                .onSubmit {
+                    if canCreateProfile() { createGroup() }
+                    else { focusFullName = true }
+                }
+
+            Spacer()
+
+            Button {
+                createGroup()
+            } label: {
+                Text("Create")
+                Image(systemName: "greaterthan")
+            }
+            .disabled(!canCreateProfile())
+            .frame(maxWidth: .infinity, alignment: .trailing)
         }
         .onAppear() {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 focusDisplayName = true
             }
         }
+        .padding()
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -128,15 +129,10 @@ struct AddGroupView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
             }
         }
-        .alert(isPresented: $showInvalidNameAlert) {
-            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
-        }
         .onChange(of: chosenImage) { image in
             if let image = image {
                 profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
@@ -144,53 +140,26 @@ struct AddGroupView: View {
                 profile.image = nil
             }
         }
-    }
-
-    func groupNameTextField() -> some View {
-        ZStack(alignment: .leading) {
-            let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-            if name != mkValidName(name) {
-                Button {
-                    showInvalidNameAlert = true
-                } label: {
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                }
-            } else {
-                Image(systemName: "pencil").foregroundColor(.secondary)
-            }
-            textField("Enter group name…", text: $profile.displayName)
-                .focused($focusDisplayName)
-                .submitLabel(.continue)
-                .onSubmit {
-                    if canCreateProfile() { createGroup() }
-                }
-        }
+        .contentShape(Rectangle())
+        .onTapGesture { hideKeyboard() }
     }
 
     func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
         TextField(placeholder, text: text)
-            .padding(.leading, 36)
-    }
-
-    func sharedGroupProfileInfo(_ incognito: Bool) -> Text {
-        let name = ChatModel.shared.currentUser?.displayName ?? ""
-        return Text(
-            incognito
-            ? "A new random profile will be shared."
-            : "Your profile **\(name)** will be shared."
-        )
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
     }
 
     func createGroup() {
         hideKeyboard()
         do {
-            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
-            profile.groupPreferences = GroupPreferences(history: GroupPreference(enable: .on))
-            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
+            let gInfo = try apiNewGroup(profile)
             Task {
                 let groupMembers = await apiListMembers(gInfo.groupId)
                 await MainActor.run {
-                    m.groupMembers = groupMembers.map { GMember.init($0) }
+                    ChatModel.shared.groupMembers = groupMembers
                 }
             }
             let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
@@ -211,8 +180,7 @@ struct AddGroupView: View {
     }
 
     func canCreateProfile() -> Bool {
-        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
-        return name != "" && validDisplayName(name)
+        profile.displayName != "" && validDisplayName(profile.displayName)
     }
 }
 

apps/ios/Shared/Views/NewChat/ConnectViaLinkView.swift

@@ -0,0 +1,42 @@
+//
+//  ConnectViaLinkView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 21/09/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+enum ConnectViaLinkTab: String {
+    case scan
+    case paste
+}
+
+struct ConnectViaLinkView: View {
+    @State private var selection: ConnectViaLinkTab = connectViaLinkTabDefault.get()
+
+    var body: some View {
+        TabView(selection: $selection) {
+            ScanToConnectView()
+                .tabItem {
+                    Label("Scan QR code", systemImage: "qrcode")
+                }
+                .tag(ConnectViaLinkTab.scan)
+            PasteToConnectView()
+                .tabItem {
+                    Label("Paste received link", systemImage: "doc.plaintext")
+                }
+                .tag(ConnectViaLinkTab.paste)
+        }
+        .onChange(of: selection) { _ in
+            connectViaLinkTabDefault.set(selection)
+        }
+    }
+}
+
+struct ConnectViaLinkView_Previews: PreviewProvider {
+    static var previews: some View {
+        ConnectViaLinkView()
+    }
+}

apps/ios/Shared/Views/NewChat/CreateLinkView.swift

@@ -0,0 +1,93 @@
+//
+//  CreateLinkView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 21/09/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+enum CreateLinkTab {
+    case oneTime
+    case longTerm
+
+    var title: LocalizedStringKey {
+        switch self {
+        case .oneTime: return "One-time invitation link"
+        case .longTerm: return "Your SimpleX address"
+        }
+    }
+}
+
+struct CreateLinkView: View {
+    @EnvironmentObject var m: ChatModel
+    @State var selection: CreateLinkTab
+    @State var connReqInvitation: String = ""
+    @State var contactConnection: PendingContactConnection? = nil
+    @State private var creatingConnReq = false
+    var viaNavLink = false
+
+    var body: some View {
+        if viaNavLink {
+            createLinkView()
+        } else {
+            NavigationView {
+                createLinkView()
+            }
+        }
+    }
+
+    private func createLinkView() -> some View {
+        TabView(selection: $selection) {
+            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
+                .tabItem {
+                    Label(
+                        connReqInvitation == ""
+                        ? "Create one-time invitation link"
+                        : "One-time invitation link",
+                        systemImage: "1.circle"
+                    )
+                }
+                .tag(CreateLinkTab.oneTime)
+            UserAddressView(viaCreateLinkView: true)
+                .tabItem {
+                    Label("Your SimpleX address", systemImage: "infinity.circle")
+                }
+                .tag(CreateLinkTab.longTerm)
+        }
+        .onChange(of: selection) { _ in
+            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
+                createInvitation()
+            }
+        }
+        .onAppear { m.connReqInv = connReqInvitation }
+        .onDisappear { m.connReqInv = nil }
+        .navigationTitle(selection.title)
+        .navigationBarTitleDisplayMode(.large)
+    }
+
+    private func createInvitation() {
+        creatingConnReq = true
+        Task {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
+                    connReqInvitation = connReq
+                    contactConnection = pcc
+                    m.connReqInv = connReq
+                }
+            } else {
+                await MainActor.run {
+                    creatingConnReq = false
+                }
+            }
+        }
+    }
+}
+
+struct CreateLinkView_Previews: PreviewProvider {
+    static var previews: some View {
+        CreateLinkView(selection: CreateLinkTab.oneTime)
+    }
+}

apps/ios/Shared/Views/NewChat/NewChatButton.swift

@@ -0,0 +1,127 @@
+//
+//  NewChatButton.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 31/01/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+enum NewChatAction: Identifiable {
+    case createLink(link: String, connection: PendingContactConnection)
+    case connectViaLink
+    case createGroup
+
+    var id: String {
+        switch self {
+        case let .createLink(link, _): return "createLink \(link)"
+        case .connectViaLink: return "connectViaLink"
+        case .createGroup: return "createGroup"
+        }
+    }
+}
+
+struct NewChatButton: View {
+    @Binding var showAddChat: Bool
+    @State private var actionSheet: NewChatAction?
+
+    var body: some View {
+        Button { showAddChat = true } label: {
+            Image(systemName: "square.and.pencil")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 24, height: 24)
+        }
+        .confirmationDialog("Start a new chat", isPresented: $showAddChat, titleVisibility: .visible) {
+            Button("Share one-time invitation link") { addContactAction() }
+            Button("Connect via link / QR code") { actionSheet = .connectViaLink }
+            Button("Create secret group") { actionSheet = .createGroup }
+        }
+        .sheet(item: $actionSheet) { sheet in
+            switch sheet {
+            case let .createLink(link, pcc):
+                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
+            case .connectViaLink: ConnectViaLinkView()
+            case .createGroup: AddGroupView()
+            }
+        }
+    }
+
+    func addContactAction() {
+        Task {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                actionSheet = .createLink(link: connReq, connection: pcc)
+            }
+        }
+    }
+}
+
+enum ConnReqType: Equatable {
+    case contact
+    case invitation
+}
+
+func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
+    Task {
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
+            DispatchQueue.main.async {
+                dismiss?()
+                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
+            }
+        } else {
+            DispatchQueue.main.async {
+                dismiss?()
+            }
+        }
+    }
+}
+
+struct CReqClientData: Decodable {
+    var type: String
+    var groupLinkId: String?
+}
+
+func parseLinkQueryData(_ connectionLink: String) -> CReqClientData? {
+    if let hashIndex = connectionLink.firstIndex(of: "#"),
+       let urlQuery = URL(string: String(connectionLink[connectionLink.index(after: hashIndex)...])),
+       let components = URLComponents(url: urlQuery, resolvingAgainstBaseURL: false),
+       let data = components.queryItems?.first(where: { $0.name == "data" })?.value,
+       let d = data.data(using: .utf8),
+       let crData = try? getJSONDecoder().decode(CReqClientData.self, from: d) {
+        return crData
+    } else {
+        return nil
+    }
+}
+
+func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
+    return crData.type == "group" && crData.groupLinkId != nil
+}
+
+func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
+    return Alert(
+        title: Text("Connect via group link?"),
+        message: Text("You will join a group this link refers to and connect to its group members."),
+        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
+            connectViaLink(connectionLink, incognito: incognito)
+        },
+        secondaryButton: .cancel()
+    )
+}
+
+func connReqSentAlert(_ type: ConnReqType) -> Alert {
+    return mkAlert(
+        title: "Connection request sent!",
+        message: type == .contact
+            ? "You will be connected when your connection request is accepted, please wait or check later!"
+            : "You will be connected when your contact's device is online, please wait or check later!"
+    )
+}
+
+struct NewChatButton_Previews: PreviewProvider {
+    static var previews: some View {
+        NewChatButton(showAddChat: Binding.constant(false))
+    }
+}

apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift

@@ -1,52 +0,0 @@
-//
-//  NewChatMenuButton.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 28.11.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-enum NewChatMenuOption: Identifiable {
-    case newContact
-    case newGroup
-
-    var id: Self { self }
-}
-
-struct NewChatMenuButton: View {
-    @Binding var newChatMenuOption: NewChatMenuOption?
-
-    var body: some View {
-        Menu {
-            Button {
-                newChatMenuOption = .newContact
-            } label: {
-                Text("Add contact")
-            }
-            Button {
-                newChatMenuOption = .newGroup
-            } label: {
-                Text("Create group")
-            }
-        } label: {
-            Image(systemName: "square.and.pencil")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-        }
-        .sheet(item: $newChatMenuOption) { opt in
-            switch opt {
-            case .newContact: NewChatView(selection: .invite)
-            case .newGroup: AddGroupView()
-            }
-        }
-    }
-}
-
-#Preview {
-    NewChatMenuButton(
-        newChatMenuOption: Binding.constant(nil)
-    )
-}

apps/ios/Shared/Views/NewChat/NewChatView.swift

@@ -1,965 +0,0 @@
-//
-//  NewChatView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 28.11.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-import CodeScanner
-import AVFoundation
-
-enum SomeAlert: Identifiable {
-    case someAlert(alert: Alert, id: String)
-
-    var id: String {
-        switch self {
-        case let .someAlert(_, id): return id
-        }
-    }
-}
-
-private enum NewChatViewAlert: Identifiable {
-    case planAndConnectAlert(alert: PlanAndConnectAlert)
-    case newChatSomeAlert(alert: SomeAlert)
-
-    var id: String {
-        switch self {
-        case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
-        case let .newChatSomeAlert(alert): return "newChatSomeAlert \(alert.id)"
-        }
-    }
-}
-
-enum NewChatOption: Identifiable {
-    case invite
-    case connect
-
-    var id: Self { self }
-}
-
-struct NewChatView: View {
-    @EnvironmentObject var m: ChatModel
-    @State var selection: NewChatOption
-    @State var showQRCodeScanner = false
-    @State private var invitationUsed: Bool = false
-    @State private var contactConnection: PendingContactConnection? = nil
-    @State private var connReqInvitation: String = ""
-    @State private var creatingConnReq = false
-    @State private var pastedLink: String = ""
-    @State private var alert: NewChatViewAlert?
-
-    var body: some View {
-        VStack(alignment: .leading) {
-            HStack {
-                Text("New chat")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                Spacer()
-                InfoSheetButton {
-                    AddContactLearnMore(showTitle: true)
-                }
-            }
-            .padding()
-            .padding(.top)
-
-            Picker("New chat", selection: $selection) {
-                Label("Add contact", systemImage: "link")
-                    .tag(NewChatOption.invite)
-                Label("Connect via link", systemImage: "qrcode")
-                    .tag(NewChatOption.connect)
-            }
-            .pickerStyle(.segmented)
-            .padding()
-
-            VStack {
-                // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
-                // https://developer.apple.com/forums/thread/714977?answerId=731615022#731615022
-                if case .invite = selection {
-                    prepareAndInviteView()
-                        .transition(.move(edge: .leading))
-                        .onAppear {
-                            createInvitation()
-                        }
-                }
-                if case .connect = selection {
-                    ConnectView(showQRCodeScanner: $showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
-                        .transition(.move(edge: .trailing))
-                }
-            }
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .background(
-                // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
-                Rectangle()
-                    .fill(Color(uiColor: .systemGroupedBackground))
-            )
-            .animation(.easeInOut(duration: 0.3333), value: selection)
-            .gesture(DragGesture(minimumDistance: 20.0, coordinateSpace: .local)
-                .onChanged { value in
-                    switch(value.translation.width, value.translation.height) {
-                    case (...0, -30...30): // left swipe
-                        if selection == .invite {
-                            selection = .connect
-                        }
-                    case (0..., -30...30): // right swipe
-                        if selection == .connect {
-                            selection = .invite
-                        }
-                    default: ()
-                    }
-                }
-            )
-        }
-        .background(Color(.systemGroupedBackground))
-        .onChange(of: invitationUsed) { used in
-            if used && !(m.showingInvitation?.connChatUsed ?? true) {
-                m.markShowingInvitationUsed()
-            }
-        }
-        .onDisappear {
-            if !(m.showingInvitation?.connChatUsed ?? true),
-               let conn = contactConnection {
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Keep unused invitation?"),
-                    message: Text("You can view invitation link again in connection details."),
-                    primaryButton: .default(Text("Keep")) {},
-                    secondaryButton: .destructive(Text("Delete")) {
-                        Task {
-                            await deleteChat(Chat(
-                                chatInfo: .contactConnection(contactConnection: conn),
-                                chatItems: []
-                            ))
-                        }
-                    }
-                ))
-            }
-            m.showingInvitation = nil
-        }
-        .alert(item: $alert) { a in
-            switch(a) {
-            case let .planAndConnectAlert(alert):
-                return planAndConnectAlert(alert, dismiss: true, cleanup: { pastedLink = "" })
-            case let .newChatSomeAlert(.someAlert(alert, _)):
-                return alert
-            }
-        }
-    }
-
-    private func prepareAndInviteView() -> some View {
-        ZStack { // ZStack is needed for views to not make transitions between each other
-            if connReqInvitation != "" {
-                InviteView(
-                    invitationUsed: $invitationUsed,
-                    contactConnection: $contactConnection,
-                    connReqInvitation: connReqInvitation
-                )
-            } else if creatingConnReq {
-                creatingLinkProgressView()
-            } else {
-                retryButton()
-            }
-        }
-    }
-
-    private func createInvitation() {
-        if connReqInvitation == "" && contactConnection == nil && !creatingConnReq {
-            creatingConnReq = true
-            Task {
-                _ = try? await Task.sleep(nanoseconds: 250_000000)
-                let (r, apiAlert) = await apiAddContact(incognito: incognitoGroupDefault.get())
-                if let (connReq, pcc) = r {
-                    await MainActor.run {
-                        m.updateContactConnection(pcc)
-                        m.showingInvitation = ShowingInvitation(connId: pcc.id, connChatUsed: false)
-                        connReqInvitation = connReq
-                        contactConnection = pcc
-                    }
-                } else {
-                    await MainActor.run {
-                        creatingConnReq = false
-                        if let apiAlert = apiAlert {
-                            alert = .newChatSomeAlert(alert: .someAlert(alert: apiAlert, id: "createInvitation error"))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Rectangle here and in retryButton are needed for gesture to work
-    private func creatingLinkProgressView() -> some View {
-        ProgressView("Creating link…")
-            .progressViewStyle(.circular)
-    }
-
-    private func retryButton() -> some View {
-        Button(action: createInvitation) {
-            VStack(spacing: 6) {
-                Image(systemName: "arrow.counterclockwise")
-                Text("Retry")
-            }
-        }
-    }
-}
-
-private struct InviteView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var invitationUsed: Bool
-    @Binding var contactConnection: PendingContactConnection?
-    var connReqInvitation: String
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-
-    var body: some View {
-        List {
-            Section("Share this 1-time invite link") {
-                shareLinkView()
-            }
-            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
-
-            qrCodeView()
-
-            Section {
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                sharedProfileInfo(incognitoDefault)
-            }
-        }
-        .onChange(of: incognitoDefault) { incognito in
-            Task {
-                do {
-                    if let contactConn = contactConnection,
-                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
-                        await MainActor.run {
-                            contactConnection = conn
-                            chatModel.updateContactConnection(conn)
-                        }
-                    }
-                } catch {
-                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
-                }
-            }
-            setInvitationUsed()
-        }
-    }
-
-    private func shareLinkView() -> some View {
-        HStack {
-            let link = simplexChatLink(connReqInvitation)
-            linkTextView(link)
-            Button {
-                showShareSheet(items: [link])
-                setInvitationUsed()
-            } label: {
-                Image(systemName: "square.and.arrow.up")
-                    .padding(.top, -7)
-            }
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func qrCodeView() -> some View {
-        Section("Or show this code") {
-            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
-                .padding()
-                .background(
-                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                )
-                .padding(.horizontal)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-        }
-    }
-
-    private func setInvitationUsed() {
-        if !invitationUsed {
-            invitationUsed = true
-        }
-    }
-}
-
-private struct ConnectView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showQRCodeScanner: Bool
-    @Binding var pastedLink: String
-    @Binding var alert: NewChatViewAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        List {
-            Section("Paste the link you received") {
-                pasteLinkView()
-            }
-            Section("Or scan QR code") {
-                ScannerInView(showQRCodeScanner: $showQRCodeScanner, processQRCode: processQRCode)
-            }
-        }
-        .actionSheet(item: $sheet) { s in
-            planAndConnectActionSheet(s, dismiss: true, cleanup: { pastedLink = "" })
-        }
-    }
-
-    @ViewBuilder private func pasteLinkView() -> some View {
-        if pastedLink == "" {
-            Button {
-                if let str = UIPasteboard.general.string {
-                    if let link = strHasSingleSimplexLink(str.trimmingCharacters(in: .whitespaces)) {
-                        pastedLink = link.text
-                        // It would be good to hide it, but right now it is not clear how to release camera in CodeScanner
-                        // https://github.com/twostraws/CodeScanner/issues/121
-                        // No known tricks worked (changing view ID, wrapping it in another view, etc.)
-                        // showQRCodeScanner = false
-                        connect(pastedLink)
-                    } else {
-                        alert = .newChatSomeAlert(alert: .someAlert(
-                            alert: mkAlert(title: "Invalid link", message: "The text you pasted is not a SimpleX link."),
-                            id: "pasteLinkView: code is not a SimpleX link"
-                        ))
-                    }
-                }
-            } label: {
-                Text("Tap to paste link")
-            }
-            .disabled(!ChatModel.shared.pasteboardHasStrings)
-            .frame(maxWidth: .infinity, alignment: .center)
-        } else {
-            linkTextView(pastedLink)
-        }
-    }
-
-    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            let link = r.string
-            if strIsSimplexLink(r.string) {
-                connect(link)
-            } else {
-                alert = .newChatSomeAlert(alert: .someAlert(
-                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
-                    id: "processQRCode: code is not a SimpleX link"
-                ))
-            }
-        case let .failure(e):
-            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: .someAlert(
-                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
-                id: "processQRCode: failure"
-            ))
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = .planAndConnectAlert(alert: $0) },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: nil
-        )
-    }
-}
-
-struct ScannerInView: View {
-    @Binding var showQRCodeScanner: Bool
-    let processQRCode: (_ resp: Result<ScanResult, ScanError>) -> Void
-    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
-
-    var body: some View {
-        Group {
-            if showQRCodeScanner, case .authorized = cameraAuthorizationStatus {
-                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .cornerRadius(12)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                    .padding(.horizontal)
-            } else {
-                Button {
-                    switch cameraAuthorizationStatus {
-                    case .notDetermined: askCameraAuthorization { showQRCodeScanner = true }
-                    case .restricted: ()
-                    case .denied: UIApplication.shared.open(appSettingsURL)
-                    case .authorized: showQRCodeScanner = true
-                    default: askCameraAuthorization { showQRCodeScanner = true }
-                    }
-                } label: {
-                    ZStack {
-                        Rectangle()
-                            .aspectRatio(contentMode: .fill)
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                            .foregroundColor(Color.clear)
-                        switch cameraAuthorizationStatus {
-                        case .restricted: Text("Camera not available")
-                        case .denied:  Label("Enable camera access", systemImage: "camera")
-                        default: Label("Tap to scan", systemImage: "qrcode")
-                        }
-                    }
-                }
-                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
-                .padding()
-                .background(
-                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                )
-                .padding(.horizontal)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .disabled(cameraAuthorizationStatus == .restricted)
-            }
-        }
-        .onAppear {
-            let status = AVCaptureDevice.authorizationStatus(for: .video)
-            cameraAuthorizationStatus = status
-            if showQRCodeScanner {
-                switch status {
-                case .notDetermined: askCameraAuthorization()
-                case .restricted: showQRCodeScanner = false
-                case .denied: showQRCodeScanner = false
-                case .authorized: ()
-                @unknown default: askCameraAuthorization()
-                }
-            }
-        }
-    }
-
-    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
-        AVCaptureDevice.requestAccess(for: .video) { allowed in
-            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
-            if allowed { cb?() }
-        }
-    }
-}
-
-private func linkTextView(_ link: String) -> some View {
-    Text(link)
-        .lineLimit(1)
-        .font(.caption)
-        .truncationMode(.middle)
-}
-
-struct InfoSheetButton<Content: View>: View {
-    @ViewBuilder let content: Content
-    @State private var showInfoSheet = false
-
-    var body: some View {
-        Button {
-            showInfoSheet = true
-        } label: {
-            Image(systemName: "info.circle")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-        }
-        .sheet(isPresented: $showInfoSheet) {
-            content
-        }
-    }
-}
-
-func strIsSimplexLink(_ str: String) -> Bool {
-    if let parsedMd = parseSimpleXMarkdown(str),
-       parsedMd.count == 1,
-       case .simplexLink = parsedMd[0].format {
-        return true
-    } else {
-        return false
-    }
-}
-
-func strHasSingleSimplexLink(_ str: String) -> FormattedText? {
-    if let parsedMd = parseSimpleXMarkdown(str) {
-       let parsedLinks = parsedMd.filter({ $0.format?.isSimplexLink ?? false })
-        if parsedLinks.count == 1 {
-            return parsedLinks[0]
-        } else {
-            return nil
-        }
-    } else {
-        return nil
-    }
-}
-
-struct IncognitoToggle: View {
-    @Binding var incognitoEnabled: Bool
-    @State private var showIncognitoSheet = false
-
-    var body: some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
-                .font(.system(size: 14))
-            Toggle(isOn: $incognitoEnabled) {
-                HStack(spacing: 6) {
-                    Text("Incognito")
-                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
-                        .font(.system(size: 14))
-                }
-                .onTapGesture {
-                    showIncognitoSheet = true
-                }
-            }
-            .padding(.leading, 36)
-        }
-        .sheet(isPresented: $showIncognitoSheet) {
-            IncognitoHelp()
-        }
-    }
-}
-
-func sharedProfileInfo(_ incognito: Bool) -> Text {
-    let name = ChatModel.shared.currentUser?.displayName ?? ""
-    return Text(
-        incognito
-        ? "A new random profile will be shared."
-        : "Your profile **\(name)** will be shared."
-    )
-}
-
-enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
-
-    var id: String {
-        switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (() -> Void)? = nil) -> Alert {
-    switch alert {
-    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own one-time link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case .invitationLinkConnecting:
-        return Alert(
-            title: Text("Already connecting!"),
-            message: Text("You are already connecting via this one-time link!"),
-            dismissButton: .default(Text("OK")) { cleanup?() }
-        )
-    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own SimpleX address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat connection request?"),
-            message: Text("You have already requested connection via this address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Join group?"),
-            message: Text("You will connect to all group members."),
-            primaryButton: .default(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat join request?"),
-            message: Text("You are already joining the group via this link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConnecting(_, groupInfo):
-        if let groupInfo = groupInfo {
-            return Alert(
-                title: Text("Group already exists!"),
-                message: Text("You are already joining the group \(groupInfo.displayName)."),
-                dismissButton: .default(Text("OK")) { cleanup?() }
-            )
-        } else {
-            return Alert(
-                title: Text("Already joining the group!"),
-                message: Text("You are already joining the group via this link."),
-                dismissButton: .default(Text("OK")) { cleanup?() }
-            )
-        }
-    }
-}
-
-enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
-
-    var id: String {
-        switch self {
-        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool, cleanup: (() -> Void)? = nil) -> ActionSheet {
-    switch sheet {
-    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
-        return ActionSheet(
-            title: Text("Connect with \(contact.chatViewName)"),
-            buttons: [
-                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
-        if let incognito = incognito {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) },
-                    .cancel() { cleanup?() }
-                ]
-            )
-        } else {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                    .cancel() { cleanup?() }
-                ]
-            )
-        }
-    }
-}
-
-func planAndConnect(
-    _ connectionLink: String,
-    showAlert: @escaping (PlanAndConnectAlert) -> Void,
-    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
-    dismiss: Bool,
-    incognito: Bool?,
-    cleanup: (() -> Void)? = nil,
-    filterKnownContact: ((Contact) -> Void)? = nil,
-    filterKnownGroup: ((GroupInfo) -> Void)? = nil
-) {
-    Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
-            switch connectionPlan {
-            case let .invitationLink(ilp):
-                switch ilp {
-                case .ok:
-                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
-                    }
-                case let .connecting(contact_):
-                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        if let f = filterKnownContact {
-                            f(contact)
-                        } else {
-                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                        }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                    }
-                }
-            case let .contactAddress(cap):
-                switch cap {
-                case .ok:
-                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
-                    }
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
-                    }
-                case let .connectingProhibit(contact):
-                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                    }
-                case let .contactViaAddress(contact):
-                    logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
-                    }
-                }
-            case let .groupLink(glp):
-                switch glp {
-                case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
-                    }
-                case let .ownLink(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
-                    }
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
-                    }
-                case let .connectingProhibit(groupInfo_):
-                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
-                case let .known(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
-                    } else {
-                        openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
-                    }
-                }
-            }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
-            }
-        }
-    }
-}
-
-private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool, cleanup: (() -> Void)? = nil) {
-    Task {
-        if dismiss {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true)
-            }
-        }
-        _ = await connectContactViaAddress(contact.contactId, incognito)
-        cleanup?()
-    }
-}
-
-private func connectViaLink(
-    _ connectionLink: String,
-    connectionPlan: ConnectionPlan?,
-    dismiss: Bool,
-    incognito: Bool,
-    cleanup: (() -> Void)?
-) {
-    Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            await MainActor.run {
-                ChatModel.shared.updateContactConnection(pcc)
-            }
-            let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
-            } else {
-                crt = connReqType
-            }
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(crt))
-                    }
-                } else {
-                    AlertManager.shared.showAlert(connReqSentAlert(crt))
-                }
-            }
-        } else {
-            if dismiss {
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true)
-                }
-            }
-        }
-        cleanup?()
-    }
-}
-
-func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = c.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = g.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connecting to \(contact.displayName)."
-    )
-}
-
-func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    mkAlert(
-        title: "Group already exists",
-        message: "You are already in group \(groupInfo.displayName)."
-    )
-}
-
-enum ConnReqType: Equatable {
-    case invitation
-    case contact
-    case groupLink
-
-    var connReqSentText: LocalizedStringKey {
-        switch self {
-        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
-        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
-        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
-        }
-    }
-}
-
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
-    switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
-    }
-}
-
-func connReqSentAlert(_ type: ConnReqType) -> Alert {
-    return mkAlert(
-        title: "Connection request sent!",
-        message: type.connReqSentText
-    )
-}
-
-#Preview {
-    NewChatView(
-        selection: .invite
-    )
-}

apps/ios/Shared/Views/NewChat/PasteToConnectView.swift

@@ -0,0 +1,100 @@
+//
+//  PasteToConnectView.swift
+//  SimpleX (iOS)
+//
+//  Created by Ian Davies on 22/04/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct PasteToConnectView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @State private var connectionLink: String = ""
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @FocusState private var linkEditorFocused: Bool
+
+    var body: some View {
+        List {
+            Text("Connect via link")
+                .font(.largeTitle)
+                .bold()
+                .fixedSize(horizontal: false, vertical: true)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .onTapGesture { linkEditorFocused = false }
+
+            Section {
+                linkEditor()
+
+                Button {
+                    if connectionLink == "" {
+                        connectionLink = UIPasteboard.general.string ?? ""
+                    } else {
+                        connectionLink = ""
+                    }
+                } label: {
+                    if connectionLink == "" {
+                        settingsRow("doc.plaintext") { Text("Paste") }
+                    } else {
+                        settingsRow("multiply") { Text("Clear") }
+                    }
+                }
+                
+                Button {
+                    connect()
+                } label: {
+                    settingsRow("link") { Text("Connect") }
+                }
+                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
+                
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                sharedProfileInfo(incognitoDefault)
+                + Text(String("\n\n"))
+                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+            }
+        }
+    }
+
+    private func linkEditor() -> some View {
+        ZStack {
+            Group {
+                if connectionLink.isEmpty {
+                    TextEditor(text: Binding.constant(NSLocalizedString("Paste the link you received to connect with your contact.", comment: "placeholder")))
+                        .foregroundColor(.secondary)
+                        .disabled(true)
+                }
+                TextEditor(text: $connectionLink)
+                    .onSubmit(connect)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .focused($linkEditorFocused)
+            }
+            .allowsTightening(false)
+            .padding(.horizontal, -5)
+            .padding(.top, -8)
+            .frame(height: 180, alignment: .topLeading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+
+    private func connect() {
+        let link = connectionLink.trimmingCharacters(in: .whitespaces)
+        if let crData = parseLinkQueryData(link),
+           checkCRDataGroup(crData) {
+            dismiss()
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
+        } else {
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
+        }
+    }
+}
+
+struct PasteToConnectView_Previews: PreviewProvider {
+    static var previews: some View {
+        PasteToConnectView()
+    }
+}

apps/ios/Shared/Views/NewChat/QRCode.swift

@@ -11,39 +11,29 @@ import CoreImage.CIFilterBuiltins
 
 struct MutableQRCode: View {
     @Binding var uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+    @State private var image: UIImage?
 
     var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
-            .id("simplex-qrcode-view-for-\(uri)")
+        ZStack {
+            if let image = image {
+                qrCodeImage(image)
+            }
+        }
+        .onAppear {
+            image = generateImage(uri)
+        }
+        .onChange(of: uri) { _ in
+            image = generateImage(uri)
+        }
     }
 }
 
-struct SimpleXLinkQRCode: View {
-    let uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-    var onShare: (() -> Void)? = nil
-
-    var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor, onShare: onShare)
-    }
-}
-
-func simplexChatLink(_ uri: String) -> String {
-    uri.starts(with: "simplex:/")
-    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
-    : uri
-}
-
 struct QRCode: View {
     let uri: String
     var withLogo: Bool = true
     var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-    var onShare: (() -> Void)? = nil
     @State private var image: UIImage? = nil
-    @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var makeScreenshotBinding: () -> Void = {}
 
     var body: some View {
         ZStack {
@@ -64,20 +54,18 @@ struct QRCode: View {
                     }
                 }
                 .onAppear {
-                    makeScreenshotFunc = {
+                    makeScreenshotBinding = {
                         let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                        onShare?()
-                    }
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
                 }
                 .frame(width: geo.size.width, height: geo.size.height)
             }
         }
-        .onTapGesture(perform: makeScreenshotFunc)
+        .onTapGesture(perform: makeScreenshotBinding)
         .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
+            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
+
     }
 }
 
@@ -89,13 +77,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String) -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)
     if let outputImage = filter.outputImage,
        let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
+        return UIImage(cgImage: cgImage)
     }
     return nil
 }