Add simple C binding for iOS and Android projects (#120)

* Dev: add simple C binding for iOS and Android projects

* System: add ci script

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @epoberezkin @efim-poberezkin

.github/FUNDING.yml

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

.github/changelog_conf.json

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

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - stable
+      - v5
     tags:
       - "v*"
   pull_request:
@@ -32,7 +32,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           body: ${{ steps.build_changelog.outputs.changelog }}
-          prerelease: true
           files: |
             LICENSE
           fail_on_unmatched_files: true
@@ -50,15 +49,24 @@ jobs:
         include:
           - os: ubuntu-20.04
             cache_path: ~/.stack
+            stack_args: "--test"
+            artifact_rel_path: /bin/simplex-chat
             asset_name: simplex-chat-ubuntu-20_04-x86-64
           - os: ubuntu-18.04
             cache_path: ~/.stack
+            stack_args: "--test"
+            artifact_rel_path: /bin/simplex-chat
             asset_name: simplex-chat-ubuntu-18_04-x86-64
           - os: macos-latest
             cache_path: ~/.stack
+            stack_args: "--test"
+            artifact_rel_path: /bin/simplex-chat
             asset_name: simplex-chat-macos-x86-64
+          # TODO enable tests for windows once fixed (remove stack_args altogether)
           - os: windows-latest
             cache_path: C:/sr
+            stack_args: ""
+            artifact_rel_path: /bin/simplex-chat.exe
             asset_name: simplex-chat-windows-x86-64
     steps:
       - name: Clone project
@@ -67,7 +75,7 @@ jobs:
       - name: Setup Stack
         uses: haskell/actions/setup@v1
         with:
-          ghc-version: '8.10.7'
+          ghc-version: '8.8.4'
           enable-stack: true
           stack-version: 'latest'
 
@@ -77,51 +85,18 @@ jobs:
           path: ${{ matrix.cache_path }}
           key: ${{ matrix.os }}-${{ hashFiles('stack.yaml') }}
 
-      # / Unix
-
-      - name: Unix build
-        id: unix_build
-        if: matrix.os != 'windows-latest'
-        shell: bash
+      - name: Build & test
+        id: build_test
+        working-directory: ./haskell
         run: |
-          stack build --test
-          echo "::set-output name=local_install_root::$(stack path --local-install-root)"
+          stack build ${{ matrix.stack_args }}
+          echo "::set-output name=LOCAL_INSTALL_ROOT::$(stack path --local-install-root)"
 
-      - name: Unix upload binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+      - name: Upload binaries to release
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_build.outputs.local_install_root }}/bin/simplex-chat
+          file: ${{ steps.build_test.outputs.LOCAL_INSTALL_ROOT }}${{ matrix.artifact_rel_path }}
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
-
-      # Unix /
-
-      # / Windows
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
-      # * So we're running a separate set of actions for Windows build
-
-      # TODO run tests on Windows
-      - name: Windows build
-        id: windows_build
-        if: matrix.os == 'windows-latest'
-        shell: cmd
-        run: |
-          stack build
-          stack path --local-install-root > tmp_file
-          set /p local_install_root= < tmp_file
-          echo ::set-output name=local_install_root::%local_install_root%
-
-      - name: Windows upload binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_build.outputs.local_install_root }}\bin\simplex-chat.exe
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
-      # Windows /

.github/workflows/chat-lib-tests.yml

@@ -0,0 +1,17 @@
+name: Chat Lib Tests
+
+on: [push]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-18.04
+    
+    steps:
+      - uses: actions/checkout@v1
+      - name: Test
+        run: cd packages/chat; 
+          cmake . -Bbuild; 
+          cd build;  
+          cmake --build .; 
+          ctest --verbose

.github/workflows/cla.yml

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

.gitignore

@@ -40,6 +40,7 @@ cabal.project.local
 cabal.project.local~
 .HTF/
 .ghc.environment.*
+*.cabal
 stack.yaml.lock
 
 # Idris
@@ -48,3 +49,9 @@ stack.yaml.lock
 # chat database
 *.db
 *.db.bak
+packages/android/.idea
+packages/chat/.idea
+packages/chat/build
+packages/chat/Testing
+packages/ios/SimpleX Chat.xcodeproj/project.xcworkspace/xcuserdata
+packages/ios/SimpleX Chat.xcodeproj/xcuserdata

README.md

@@ -1,28 +1,19 @@
-<img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
+<img align="right" src="images/logo.svg" alt="SimpleX logo" height="90">
 
-# SimpleX Chat
+# SimpleX chat
 
-SimpleX - the most private and secure open-source chat and applications platform - now with double-ratchet E2E encryption.
+## Private, secure, decentralized
 
 [![GitHub build](https://github.com/simplex-chat/simplex-chat/workflows/build/badge.svg)](https://github.com/simplex-chat/simplex-chat/actions?query=workflow%3Abuild)
-[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
 [![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
-[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/simplexchat)
-[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 
-SimpleX Chat is a terminal (command line) UI using [SimpleXMQ](https://github.com/simplex-chat/simplexmq) message broker.
+> **NEW in v0.4: [groups](#groups) and [sending files](#sending-files)!**
 
-See [SimpleX overview](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information on platform objectives and technical design.
+The motivation for SimpleX chat is [presented here](./simplex.md).
 
-**v1.0.0 is released: [read announcement here](https://github.com/simplex-chat/simplex-chat/blob/master/blog/20220112-simplex-chat-v1-released.md)**
+SimpleX chat prototype is a thin terminal UI on top of [SimpleXMQ](https://github.com/simplex-chat/simplexmq) message broker that uses [SMP protocols](https://github.com/simplex-chat/simplexmq/blob/master/protocol).
 
-### :zap: Quick installation
-
-```sh
-curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash
-```
-
-Once the chat client is installed, simply run `simplex-chat` from your terminal.
+See [simplex.chat](https://simplex.chat) website for chat demo and the explanations of the system and how SMP protocol works.
 
 ![simplex-chat](./images/connection.gif)
 
@@ -31,10 +22,8 @@ Once the chat client is installed, simply run `simplex-chat` from your terminal.
 - [Disclaimer](#disclaimer)
 - [Network topology](#network-topology)
 - [Terminal chat features](#terminal-chat-features)
-- [Installation](#🚀-installation)
+- [Installation](#installation)
   - [Download chat client](#download-chat-client)
-    - [Linux and MacOS](#linux-and-macos)
-    - [Windows](#windows)
   - [Build from source](#build-from-source)
     - [Using Docker](#using-docker)
     - [Using Haskell stack](#using-haskell-stack)
@@ -43,26 +32,25 @@ Once the chat client is installed, simply run `simplex-chat` from your terminal.
   - [How to use SimpleX chat](#how-to-use-simplex-chat)
   - [Groups](#groups)
   - [Sending files](#sending-files)
-  - [User contact addresses](#user-contact-addresses)
   - [Access chat history](#access-chat-history)
-- [Roadmap](#Roadmap)
+- [Future roadmap](#future-roadmap)
 - [License](#license)
 
 ## Disclaimer
 
-SimpleX Chat implements a new network topology for asynchronous communication combining the advantages and avoiding the disadvantages of federated and P2P networks.
+This is WIP implementation of SimpleX chat that implements a new network topology for asynchronous communication combining the advantages and avoiding the disadvantages of federated and P2P networks.
 
-[SimpleXMQ security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) had many improvements in v1.0.0; the implementation has not been audited yet.
+If you expect a software being reliable most of the time and doing something useful, then this is probably not ready for you yet. We do use it for terminal chat though, and it seems to work most of the time - we would really appreciate if you try it and give us your feedback.
 
-We use SimpleX Chat all the time, but you may find some bugs. We would really appreciate if you use it and let us know anything that needs to be fixed or improved.
+**Please note:** The main differentiation of SimpleX network is the approach to internet message routing rather than encryption; for that reason no sufficient attention was paid to either TCP transport level encryption or to E2E encryption protocols - they are implemented in an ad hoc way based on RSA and AES algorithms. See [SMP protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#appendix-a) on TCP transport encryption protocol (AEAD-GCM scheme, with an AES key negotiation based on RSA key hash known to the client in advance) and [this section](https://github.com/simplex-chat/simplexmq/blob/master/rfcs/2021-01-26-crypto.md#e2e-encryption) on E2E encryption protocol (an ad hoc hybrid scheme a la PGP). These protocols will change in a consumer ready version to something more robust.
 
 ## Network topology
 
-SimpleX is a client-server network that uses redundant, disposable nodes to asynchronously pass messages via message queues, providing receiver and sender anonymity.
+SimpleX is a decentralized client-server network that uses redundant, disposable nodes to asynchronously pass the messages via message queues, providing receiver and sender anonymity.
 
 Unlike P2P networks, all messages are passed through one or several (for redundancy) servers, that do not even need to have persistence (in fact, the current [SMP server implementation](https://github.com/simplex-chat/simplexmq#smp-server) uses in-memory message storage, persisting only the queue records) - it provides better metadata protection than P2P designs, as no global participant ID is required, and avoids many [problems of P2P networks](https://github.com/simplex-chat/simplex-chat/blob/master/simplex.md#comparison-with-p2p-messaging-protocols).
 
-Unlike federated networks, the participating server nodes **do not have records of the users**, **do not communicate with each other**, **do not store messages** after they are delivered to the recipients, and there is no way to discover the full list of participating servers. SimpleX network avoids the problem of metadata visibility that federated networks have and better protects the network, as servers do not communicate with each other. Each server node provides unidirectional "dumb pipes" to the users, that do authorization without authentication, having no knowledge of the the users or their contacts. Each queue is assigned two Ed448 keys - one for receiver and one for sender - and each queue access is authorized with a signature created using a respective key's private counterpart.
+Unlike federated networks, the participating server nodes do NOT have records of the users, do NOT communicate with each other, do NOT store messages after they are delivered to the recipients, and there is no way to discover the full list of participating servers - it avoids the problem of metadata visibility that federated networks suffer from and better protects the network, as servers do not communicate with each other. Each server node provides unidirectional "dumb pipes" to the users, that do authorization without authentication, having no knowledge of the the users or their contacts. Each queue is assigned two RSA keys - one for receiver and one for sender - and each queue access is authorized with a signature created using a respective key's private counterpart.
 
 The routing of messages relies on the knowledge of client devices how user contacts and groups map at any given moment of time to these disposable queues on server nodes.
 
@@ -71,49 +59,31 @@ The routing of messages relies on the knowledge of client devices how user conta
 - 1-to-1 chat with multiple people in the same terminal window.
 - Group messaging.
 - Sending files to contacts and groups.
-- User contact addresses - establish connections via multiple-use contact links.
-- Messages persisted in a local SQLite database.
 - Auto-populated recipient name - just type your messages to reply to the sender once the connection is established.
 - Demo SMP servers available and pre-configured in the app - or you can [deploy your own server](https://github.com/simplex-chat/simplexmq#using-smp-server-and-smp-agent).
 - No global identity or any names visible to the server(s), ensuring full privacy of your contacts and conversations.
-- Two layers of E2E encryption (double-ratchet for duplex connections, using X3DH key agreement with ephemeral Curve448 keys, and NaCl crypto_box for SMP queues, using Curve25519 keys) and out-of-band passing of recipient keys (see [How to use SimpleX chat](#how-to-use-simplex-chat)).
+- E2E encryption, with RSA public key that has to be passed out-of-band (see [How to use SimpleX chat](#how-to-use-simplex-chat)).
+- Message signing and verification with automatically generated RSA keys.
 - Message integrity validation (via including the digests of the previous messages).
-- Authentication of each command/message by SMP servers with automatically generated Ed448 keys.
-- TLS 1.3 transport encryption.
-- Additional encryption of messages from SMP server to recipient to reduce traffic correlation.
+- Authentication of each command/message by SMP servers with automatically generated RSA key pairs.
+- TCP transport encryption using SMP transport protocol.
 
-Public keys involved in key exchange are not used as identity, they are randomly generated for each contact.
+RSA keys are not used as identity, they are randomly generated for each contact.
 
-See [Encryption Primitives Used](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md#encryption-primitives-used) for technical details.
-
-<a name="🚀-installation"></a>
-
-## 🚀 Installation
+## Installation
 
 ### Download chat client
 
+Download the chat binary for your system from the [latest stable release](https://github.com/simplex-chat/simplex-chat/releases) and make it executable as shown below.
+
 #### Linux and MacOS
 
-To **install** or **update** `simplex-chat`, you should run the install script. To do that, use the following cURL or Wget command:
-
-```sh
-curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash
-```
-
-```sh
-wget -qO- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash
-```
-
-Once the chat client downloads, you can run it with `simplex-chat` command in your terminal.
-
-Alternatively, you can manually download the chat binary for your system from the [latest stable release](https://github.com/simplex-chat/simplex-chat/releases) and make it executable as shown below.
-
 ```sh
 chmod +x <binary>
 mv <binary> ~/.local/bin/simplex-chat
 ```
 
-(or any other preferred location on `PATH`).
+(or any other preferred location on PATH).
 
 On MacOS you also need to [allow Gatekeeper to run it](https://support.apple.com/en-us/HT202491).
 
@@ -125,8 +95,6 @@ move <binary> %APPDATA%/local/bin/simplex-chat.exe
 
 ### Build from source
 
-> **Please note:** to build the app use source code from [stable branch](https://github.com/simplex-chat/simplex-chat/tree/stable).
-
 #### Using Docker
 
 On Linux, you can build the chat executable using [docker build with custom output](https://docs.docker.com/engine/reference/commandline/build/#custom-build-outputs):
@@ -134,11 +102,10 @@ On Linux, you can build the chat executable using [docker build with custom outp
 ```shell
 $ git clone git@github.com:simplex-chat/simplex-chat.git
 $ cd simplex-chat
-$ git checkout stable
 $ DOCKER_BUILDKIT=1 docker build --output ~/.local/bin .
 ```
 
-> **Please note:** If you encounter `` version `GLIBC_2.28' not found `` error, rebuild it with `haskell:8.10.4-stretch` base image (change it in your local [Dockerfile](Dockerfile)).
+> **Please note:** If you encounter ``version `GLIBC_2.28' not found`` error, rebuild it with `haskell:8.8.4-stretch` base image (change it in your local [Dockerfile](Dockerfile)).
 
 #### Using Haskell stack
 
@@ -153,7 +120,6 @@ and build the project:
 ```shell
 $ git clone git@github.com:simplex-chat/simplex-chat.git
 $ cd simplex-chat
-$ git checkout stable
 $ stack install
 ```
 
@@ -163,7 +129,7 @@ $ stack install
 
 To start the chat client, run `simplex-chat` from the terminal.
 
-By default, app data directory is created in the home directory (`~/.simplex`, or `%APPDATA%/simplex` on Windows), and two SQLite database files `simplex_v1_chat.db` and `simplex_v1_agent.db` are initialized in it.
+By default, app data directory is created in the home directory (`~/.simplex`, or `%APPDATA%/simplex` on Windows), and two SQLite database files `simplex.chat.db` and `simplex.agent.db` are initialized in it.
 
 To specify a different file path prefix for the database files use `-d` command line option:
 
@@ -171,17 +137,17 @@ To specify a different file path prefix for the database files use `-d` command
 $ simplex-chat -d alice
 ```
 
-Running above, for example, would create `alice_v1_chat.db` and `alice_v1_agent.db` database files in current directory.
+Running above, for example, would create `alice.chat.db` and `alice.agent.db` database files in current directory.
 
-Three default SMP servers are hosted on Linode - they are [pre-configured in the app](https://github.com/simplex-chat/simplex-chat/blob/master/src/Simplex/Chat/Options.hs#L42).
+Default SMP servers are hosted on Linode (London, UK and Fremont, CA) - they are [pre-configured in the app](https://github.com/simplex-chat/simplex-chat/blob/master/src/Simplex/Chat/Options.hs#L40). Base-64 encoded string after server host is the transport key digest.
 
 If you deployed your own SMP server(s) you can configure client via `-s` option:
 
 ```shell
-$ simplex-chat -s smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=@smp.example.com
+$ simplex-chat -s smp.example.com:5223#KXNE1m2E1m0lm92WGKet9CL6+lO742Vy5G6nsrkvgs8=
 ```
 
-Base64url encoded string preceding the server address is the server's offline certificate fingerprint which is validated by client during TLS handshake.
+The base-64 encoded string in server address is the digest of RSA transport handshake key that the server will generate on the first run and output its digest.
 
 You can still talk to people using default or any other server - it only affects the location of the message queue when you initiate the connection (and the reply queue can be on another server, as set by the other party's client).
 
@@ -189,9 +155,9 @@ Run `simplex-chat -h` to see all available options.
 
 ### How to use SimpleX chat
 
-Once you have started the chat, you will be prompted to specify your "display name" and an optional "full name" to create a local chat profile. Your display name is an alias for your contacts to refer to you by - it is not unique and does not serve as a global identity. If some of your contacts chose the same display name, the chat client adds a numeric suffix to their local display name.
+Once you have started the chat, you will be prompted to specify your "display name" and an optional "full name" to create a local chat profile. Your display name is an alias for your contacts to refer to you by - it is not unique and does not serve as a global identity. In case different contacts chose the same display name, the chat client adds a numeric suffix to their local display names.
 
-The diagram below shows how to connect and message a contact:
+This diagram shows how to connect and message a contact:
 
 <div align="center">
   <img align="center" src="images/how-to-use-simplex.svg">
@@ -201,7 +167,7 @@ Once you've set up your local profile, enter `/c` (for `/connect`) to create a n
 
 You are able to create multiple invitations by entering `/connect` multiple times and sending these invitations to the corresponding contacts you'd like to connect with.
 
-The invitation can only be used once and even if this is intercepted, the attacker would not be able to use it to send you the messages via this queue once your contact confirms that the connection is established. See agent protocol for explanation of [invitation format](https://github.com/simplex-chat/simplexmq/blob/master/protocol/agent-protocol.md#connection-request).
+The invitation has the format `smp::<server>::<queue_id>::<rsa_public_key_for_this_queue_only>`. The invitation can only be used once and even if this is intercepted, the attacker would not be able to use it to send you the messages via this queue once your contact confirms that the connection is established.
 
 The contact who received the invitation should enter `/c <invitation>` to accept the connection. This establishes the connection, and both parties are notified.
 
@@ -211,7 +177,7 @@ Use `/help` in chat to see the list of available commands.
 
 ### Groups
 
-To create a group use `/g <group>`, then add contacts to it with `/a <group> <name>`. You can then send messages to the group by entering  `#<group> <message>`. Use `/help groups` for other commands.
+To create a group use `/g <group>`, then add contacts to it with `/a <group> <name>`and send messages with `#<group> <message>`. Use `/help groups` for other commands.
 
 ![simplex-chat](./images/groups.gif)
 
@@ -225,62 +191,39 @@ You can send a file to your contact with `/f @<contact> <file_path>` - the recip
 
 You can send files to a group with `/f #<group> <file_path>`.
 
-### User contact addresses
-
-As an alternative to one-time invitation links, you can create a long-term address with `/ad` (for `/address`). The created address can then be shared via any channel, and used by other users as a link to make a contact request with `/c <user_contact_address>`.
-
-You can accept or reject incoming requests with `/ac <name>` and `/rc <name>` commands.
-
-User address is "long-term" in a sense that it is a multiple-use connection link - it can be used until it is deleted by the user, in which case all established connections would still remain active (unlike how it works with email, when changing the address results in people not being able to message you).
-
-Use `/help address` for other commands.
-
-![simplex-chat](./images/user-addresses.gif)
-
 ### Access chat history
 
-SimpleX chat stores all your contacts and conversations in a local SQLite database, making it private and portable by design, owned and controlled by user.
+> 🚧 **Section currently out of date - will be updated soon** 🏗
 
-You can view and search your chat history by querying your database. Run the below script to create message views in your database.
+SimpleX chat stores all your contacts and conversations in a local database file, making it private and portable by design, fully owned and controlled by you.
 
-```sh
-curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/message_views.sql | sqlite3 ~/.simplex/simplex_v1_chat.db
+You can search your chat history via SQLite database file:
+
+```
+sqlite3 ~/.simplex/smp-chat.db
 ```
 
-Open SQLite Command Line Shell:
+Now you can query `messages` table, for example:
 
-```sh
-sqlite3 ~/.simplex/simplex_v1_chat.db
+```sql
+select * from messages
+where conn_alias = cast('alice' as blob)
+  and body like '%cats%'
+order by internal_id desc;
 ```
 
-See [Message queries](./message_queries.md) for examples.
-
 > **Please note:** SQLite foreign key constraints are disabled by default, and must be **[enabled separately for each database connection](https://sqlite.org/foreignkeys.html#fk_enable)**. The latter can be achieved by running `PRAGMA foreign_keys = ON;` command on an open database connection. By running data altering queries without enabling foreign keys prior to that, you may risk putting your database in an inconsistent state.
 
-**Convenience queries**
-
-Get all messages from today (`chat_dt` is in UTC):
-
-```sql
-select * from all_messages_plain where date(chat_dt) > date('now', '-1 day') order by chat_dt;
-```
-
-Get overnight messages in the morning:
-
-```sql
-select * from all_messages_plain where chat_dt > datetime('now', '-15 hours') order by chat_dt;
-```
-
-## Roadmap
+## Future roadmap
 
 1. Mobile and desktop apps (in progress).
 2. SMP protocol improvements:
-   - SMP queue redundancy and rotation.
-   - Message delivery confirmation.
-   - Support multiple devices.
+    - SMP queue redundancy and rotation.
+    - Message delivery confirmation.
+    - Support multiple devices.
 3. Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
-   - keep all your contacts and groups even if you lose the domain.
-   - the server doesn't have information about your contacts and groups.
+    - keep all your contacts and groups even if you lose the domain.
+    - the server doesn't have information about your contacts and groups.
 4. Media server to optimize sending large files to groups.
 5. Channels server for large groups and broadcast channels.
 

apps/android/.idea/.name

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

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

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

apps/android/.idea/gradle.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

apps/android/.idea/misc.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2328125" />
-        <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2328125" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.22010869565217392" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

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

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="chat.simplex.app">
-
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-  <application
-    android:allowBackup="true"
-    android:icon="@mipmap/ic_launcher"
-    android:label="@string/app_name"
-    android:roundIcon="@mipmap/ic_launcher_round"
-    android:supportsRtl="true"
-    android:theme="@style/Theme.SimpleX">
-    <activity
-      android:name=".MainActivity"
-      android:exported="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-
-</manifest>

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

@@ -1,72 +0,0 @@
-#include <jni.h>
-
-// from the RTS
-void hs_init(int * argc, char **argv[]);
-
-// from android-support
-void setLineBuffering(void);
-int pipe_std_to_socket(const char * name);
-
-JNIEXPORT jint JNICALL
-Java_chat_simplex_app_MainActivityKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
-    const char *name = (*env)->GetStringUTFChars(env, socket_name, JNI_FALSE);
-    int ret = pipe_std_to_socket(name);
-    (*env)->ReleaseStringUTFChars(env, socket_name, name);
-    return ret;
-}
-
-JNIEXPORT void JNICALL
-Java_chat_simplex_app_MainActivityKt_initHS(__unused JNIEnv *env, __unused jclass clazz) {
-    hs_init(NULL, NULL);
-    setLineBuffering();
-}
-
-// from simplex-chat
-typedef void* chat_store;
-typedef void* controller;
-
-extern chat_store chat_init_store(const char * path);
-extern char *chat_get_user(chat_store store);
-extern char *chat_create_user(chat_store store, const char *data);
-extern controller chat_start(chat_store store);
-extern char *chat_send_cmd(controller ctl, const char *cmd);
-extern char *chat_recv_msg(controller ctl);
-
-JNIEXPORT jlong JNICALL
-Java_chat_simplex_app_MainActivityKt_chatInit(JNIEnv *env, __unused jclass clazz, jstring datadir) {
-    const char *_data = (*env)->GetStringUTFChars(env, datadir, JNI_FALSE);
-    jlong res = (jlong)chat_init_store(_data);
-    (*env)->ReleaseStringUTFChars(env, datadir, _data);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_MainActivityKt_chatGetUser(JNIEnv *env, __unused jclass clazz, jlong controller) {
-    return (*env)->NewStringUTF(env, chat_get_user((void*)controller));
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_MainActivityKt_chatCreateUser(JNIEnv *env, __unused jclass clazz, jlong controller, jstring data) {
-    const char *_data = (*env)->GetStringUTFChars(env, data, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_create_user((void*)controller, _data));
-    (*env)->ReleaseStringUTFChars(env, data, _data);
-    return res;
-}
-
-JNIEXPORT jlong JNICALL
-Java_chat_simplex_app_MainActivityKt_chatStart(JNIEnv *env, jclass clazz, jlong controller) {
-    return (jlong)chat_start((void*)controller);
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_MainActivityKt_chatSendCmd(JNIEnv *env, __unused jclass clazz, jlong controller, jstring msg) {
-    const char *_msg = (*env)->GetStringUTFChars(env, msg, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_send_cmd((void*)controller, _msg));
-    (*env)->ReleaseStringUTFChars(env, msg, _msg);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_MainActivityKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
-    return (*env)->NewStringUTF(env, chat_recv_msg((void*)controller));
-}

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

@@ -1,123 +0,0 @@
-package chat.simplex.app
-
-import android.net.LocalServerSocket
-import android.os.Bundle
-import android.util.Log
-import android.view.inputmethod.EditorInfo
-import android.widget.ScrollView
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatEditText
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.lang.ref.WeakReference
-import java.util.*
-import java.util.concurrent.Semaphore
-import kotlin.concurrent.thread
-
-// ghc's rts
-external fun initHS()
-// android-support
-external fun pipeStdOutToSocket(socketName: String) : Int
-
-// simplex-chat
-typealias Store = Long
-typealias Controller = Long
-external fun chatInit(filesDir: String): Store
-external fun chatGetUser(controller: Store) : String
-external fun chatCreateUser(controller: Store, data: String) : String
-external fun chatStart(controller: Store) : Controller
-external fun chatSendCmd(controller: Controller, msg: String) : String
-external fun chatRecvMsg(controller: Controller) : String
-
-class MainActivity : AppCompatActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    weakActivity = WeakReference(this)
-
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_main)
-
-    val store : Store = chatInit(this.applicationContext.filesDir.toString())
-    // create user if needed
-    if(chatGetUser(store) == "{}") {
-      chatCreateUser(store, """
-                    {"displayName": "test", "fullName": "android test"}
-                    """.trimIndent())
-    }
-    Log.d("SIMPLEX (user)", chatGetUser(store))
-
-    val controller = chatStart(store)
-
-    val cmdinput = this.findViewById<AppCompatEditText>(R.id.cmdInput)
-
-    cmdinput.setOnEditorActionListener { _, actionId, _ ->
-      when (actionId) {
-        EditorInfo.IME_ACTION_SEND -> {
-          Log.d("SIMPLEX SEND", chatSendCmd(controller, cmdinput.text.toString()))
-          cmdinput.text?.clear()
-          true
-        }
-        else -> false
-      }
-    }
-
-    thread(name="receiver") {
-      val chatlog = FifoQueue<String>(500)
-      while(true) {
-        val msg = chatRecvMsg(controller)
-        Log.d("SIMPLEX RECV", msg)
-        chatlog.add(msg)
-        val currentText = chatlog.joinToString("\n")
-        weakActivity.get()?.runOnUiThread {
-          val log = weakActivity.get()?.findViewById<TextView>(R.id.chatlog)
-          val scroll = weakActivity.get()?.findViewById<ScrollView>(R.id.scroller)
-          log?.text = currentText
-          scroll?.scrollTo(0, scroll.getChildAt(0).height)
-        }
-      }
-    }
-  }
-
-  companion object {
-    lateinit var weakActivity : WeakReference<MainActivity>
-    init {
-      val socketName = "local.socket.address.listen.native.cmd2"
-
-      val s = Semaphore(0)
-      thread(name="stdout/stderr pipe") {
-        Log.d("SIMPLEX", "starting server")
-        val server = LocalServerSocket(socketName)
-        Log.d("SIMPLEX", "started server")
-        s.release()
-        val receiver = server.accept()
-        Log.d("SIMPLEX", "started receiver")
-        val logbuffer = FifoQueue<String>(500)
-        if (receiver != null) {
-          val inStream = receiver.inputStream
-          val inStreamReader = InputStreamReader(inStream)
-          val input = BufferedReader(inStreamReader)
-
-          while(true) {
-            val line = input.readLine() ?: break
-            Log.d("SIMPLEX (stdout/stderr)", line)
-            logbuffer.add(line)
-          }
-        }
-      }
-
-      System.loadLibrary("app-lib")
-
-      s.acquire()
-      pipeStdOutToSocket(socketName)
-
-      initHS()
-    }
-  }
-}
-
-class FifoQueue<E>(private var capacity: Int) : LinkedList<E>() {
-  override fun add(element: E): Boolean {
-    if(size > capacity) removeFirst()
-    return super.add(element)
-  }
-}

apps/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:aapt="http://schemas.android.com/aapt"
-  android:width="108dp"
-  android:height="108dp"
-  android:viewportWidth="108"
-  android:viewportHeight="108">
-  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-        android:endX="85.84757"
-        android:endY="92.4963"
-        android:startX="42.9492"
-        android:startY="49.59793"
-        android:type="linear">
-        <item
-          android:color="#44000000"
-          android:offset="0.0" />
-        <item
-          android:color="#00000000"
-          android:offset="1.0" />
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-    android:fillColor="#FFFFFF"
-    android:fillType="nonZero"
-    android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-    android:strokeWidth="1"
-    android:strokeColor="#00000000" />
-</vector>

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

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

apps/android/app/src/main/res/layout/activity_main.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  tools:context=".MainActivity">
-
-  <EditText
-    android:id="@+id/cmdInput"
-    android:layout_width="0dp"
-    android:layout_height="48dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginBottom="16dp"
-    android:autofillHints=""
-    android:ems="10"
-    android:imeOptions="actionSend"
-    android:inputType="textPersonName"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:ignore="SpeakableTextPresentCheck" />
-
-  <ScrollView
-    android:id="@+id/scroller"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginTop="16dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginBottom="16dp"
-    app:layout_constraintBottom_toTopOf="@+id/cmdInput"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/chatlog"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    </LinearLayout>
-  </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>

apps/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background" />
-  <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

apps/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background" />
-  <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

apps/android/app/src/main/res/values-night/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!-- Base application theme. -->
-  <style name="Theme.SimpleX" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-    <!-- Primary brand color. -->
-    <item name="colorPrimary">@color/purple_200</item>
-    <item name="colorPrimaryVariant">@color/purple_700</item>
-    <item name="colorOnPrimary">@color/black</item>
-    <!-- Secondary brand color. -->
-    <item name="colorSecondary">@color/teal_200</item>
-    <item name="colorSecondaryVariant">@color/teal_200</item>
-    <item name="colorOnSecondary">@color/black</item>
-    <!-- Status bar color. -->
-    <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-    <!-- Customize your theme here. -->
-  </style>
-</resources>

apps/android/app/src/main/res/values/colors.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="purple_200">#FFBB86FC</color>
-  <color name="purple_500">#FF6200EE</color>
-  <color name="purple_700">#FF3700B3</color>
-  <color name="teal_200">#FF03DAC5</color>
-  <color name="teal_700">#FF018786</color>
-  <color name="black">#FF000000</color>
-  <color name="white">#FFFFFFFF</color>
-</resources>

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

@@ -1,3 +0,0 @@
-<resources>
-  <string name="app_name">SimpleX</string>
-</resources>

apps/android/app/src/main/res/values/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!-- Base application theme. -->
-  <style name="Theme.SimpleX" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-    <!-- Primary brand color. -->
-    <item name="colorPrimary">@color/purple_500</item>
-    <item name="colorPrimaryVariant">@color/purple_700</item>
-    <item name="colorOnPrimary">@color/white</item>
-    <!-- Secondary brand color. -->
-    <item name="colorSecondary">@color/teal_200</item>
-    <item name="colorSecondaryVariant">@color/teal_700</item>
-    <item name="colorOnSecondary">@color/black</item>
-    <!-- Status bar color. -->
-    <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-    <!-- Customize your theme here. -->
-  </style>
-</resources>

apps/ios/.gitignore

@@ -1,67 +0,0 @@
-## User settings
-xcuserdata/
-
-## Obj-C/Swift specific
-*.hmap
-
-## App packaging
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-# *.xcodeproj
-#
-# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
-# hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
-
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# Accio dependency management
-Dependencies/
-.accio/
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo.
-# Instead, use fastlane to re-generate the screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
-
-Libraries/

apps/ios/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.533",
-          "red" : "0.000"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "localizable" : true
-  }
-}

apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,172 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Icon-App-20x20@2x-1.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29@1x.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-20x20@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29@1x-1.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-76x76@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

apps/ios/Shared/Assets.xcassets/github.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "github32px.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "github64px.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "github64px-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

apps/ios/Shared/Assets.xcassets/logo.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "logo-2.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "logo-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "logo.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

apps/ios/Shared/ContentView.swift

@@ -1,52 +0,0 @@
-//
-//  ContentView.swift
-//  Shared
-//
-//  Created by Evgeny Poberezkin on 17/01/2022.
-//
-
-import SwiftUI
-
-struct ContentView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var showNotificationAlert = false
-
-    var body: some View {
-        if let user = chatModel.currentUser {
-            ChatListView(user: user)
-                .onAppear {
-                    do {
-                        try apiStartChat()
-                        chatModel.chats = try apiGetChats()
-                    } catch {
-                        fatalError("Failed to start or load chats: \(error)")
-                    }
-                    ChatReceiver.shared.start()
-                    NtfManager.shared.requestAuthorization(onDeny: {
-                        showNotificationAlert = true
-                    })
-                }
-                .alert(isPresented : $showNotificationAlert){
-                     Alert(
-                        title: Text("Notification are disabled!"),
-                         message: Text("Please open settings to enable"),
-                         primaryButton: .default(Text("Open Settings")) {
-                             DispatchQueue.main.async {
-                                 UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
-                             }
-                         },
-                         secondaryButton: .cancel()
-                     )
-                }
-        } else {
-            WelcomeView()
-        }
-    }
-}
-
-
-//struct ContentView_Previews: PreviewProvider {
-//    static var previews: some View {
-//        ContentView(text: "Hello!")
-//    }
-//}

apps/ios/Shared/Model/BGManager.swift

@@ -1,80 +0,0 @@
-//
-//  BGManager.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 08/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import BackgroundTasks
-
-private let receiveTaskId = "chat.simplex.app.receive"
-
-// TCP timeout + 2 sec
-private let waitForMessages: TimeInterval = 6
-
-private let bgRefreshInterval: TimeInterval = 450
-
-class BGManager {
-    static let shared = BGManager()
-    var chatReceiver: ChatReceiver?
-    var bgTimer: Timer?
-    var completed = false
-
-    func register() {
-        logger.debug("BGManager.register")
-        BGTaskScheduler.shared.register(forTaskWithIdentifier: receiveTaskId, using: nil) { task in
-            self.handleRefresh(task as! BGAppRefreshTask)
-        }
-    }
-
-    func schedule() {
-        logger.debug("BGManager.schedule")
-        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
-        do {
-            try BGTaskScheduler.shared.submit(request)
-        } catch {
-            logger.error("BGManager.schedule error: \(error.localizedDescription)")
-        }
-    }
-
-    private func handleRefresh(_ task: BGAppRefreshTask) {
-        logger.debug("BGManager.handleRefresh")
-        schedule()
-        self.completed = false
-
-        let completeTask: (String) -> Void = { reason in
-            logger.debug("BGManager.handleRefresh completeTask: \(reason)")
-            if !self.completed {
-                self.completed = true
-                self.chatReceiver?.stop()
-                self.chatReceiver = nil
-                self.bgTimer?.invalidate()
-                self.bgTimer = nil
-                task.setTaskCompleted(success: true)
-            }
-        }
-
-        task.expirationHandler = { completeTask("expirationHandler") }
-        DispatchQueue.main.async {
-            initializeChat()
-            if ChatModel.shared.currentUser == nil {
-                completeTask("no current user")
-                return
-            }
-            logger.debug("BGManager.handleRefresh: starting chat")
-            let cr = ChatReceiver()
-            self.chatReceiver = cr
-            cr.start()
-            RunLoop.current.add(Timer(timeInterval: 2, repeats: true) { timer in
-                logger.debug("BGManager.handleRefresh: timer")
-                self.bgTimer = timer
-                if cr.lastMsgTime.distance(to: Date.now) >= waitForMessages {
-                    completeTask("timer (no messages after \(waitForMessages) seconds)")
-                }
-            }, forMode: .default)
-        }
-    }
-}

apps/ios/Shared/Model/ChatModel.swift

@@ -1,541 +0,0 @@
-//
-//  ChatModel.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 22/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import Combine
-import SwiftUI
-
-final class ChatModel: ObservableObject {
-    @Published var currentUser: User?
-    // list of chat "previews"
-    @Published var chats: [Chat] = []
-    // current chat
-    @Published var chatId: String?
-    @Published var chatItems: [ChatItem] = []
-    // items in the terminal view
-    @Published var terminalItems: [TerminalItem] = []
-    @Published var userAddress: String?
-    @Published var appOpenUrl: URL?
-    @Published var connectViaUrl = false
-    static let shared = ChatModel()
-
-    func hasChat(_ id: String) -> Bool {
-        chats.first(where: { $0.id == id }) != nil
-    }
-
-    func getChat(_ id: String) -> Chat? {
-        chats.first(where: { $0.id == id })
-    }
-
-    private func getChatIndex(_ id: String) -> Int? {
-        chats.firstIndex(where: { $0.id == id })
-    }
-
-    func addChat(_ chat: Chat) {
-        withAnimation {
-            chats.insert(chat, at: 0)
-        }
-    }
-
-    func updateChatInfo(_ cInfo: ChatInfo) {
-        if let ix = getChatIndex(cInfo.id) {
-            chats[ix].chatInfo = cInfo
-        }
-    }
-
-    func updateContact(_ contact: Contact) {
-        let cInfo = ChatInfo.direct(contact: contact)
-        if hasChat(contact.id) {
-            updateChatInfo(cInfo)
-        } else {
-            addChat(Chat(chatInfo: cInfo, chatItems: []))
-        }
-    }
-
-    func updateNetworkStatus(_ contact: Contact, _ status: Chat.NetworkStatus) {
-        if let ix = getChatIndex(contact.id) {
-            chats[ix].serverInfo.networkStatus = status
-        }
-    }
-
-    func replaceChat(_ id: String, _ chat: Chat) {
-        if let ix = chats.firstIndex(where: { $0.id == id }) {
-            chats[ix] = chat
-        } else {
-            // invalid state, correcting
-            chats.insert(chat, at: 0)
-        }
-    }
-
-    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        if let ix = chats.firstIndex(where: { $0.id == cInfo.id }) {
-            chats[ix].chatItems = [cItem]
-            if ix > 0 {
-                if chatId == nil {
-                    withAnimation { popChat(ix) }
-                } else {
-                    DispatchQueue.main.async { self.popChat(ix) }
-                }
-            }
-        }
-        if chatId == cInfo.id {
-            withAnimation { chatItems.append(cItem) }
-        }
-    }
-
-    private func popChat(_ ix: Int) {
-        let chat = chats.remove(at: ix)
-        chats.insert(chat, at: 0)
-    }
-
-    func removeChat(_ id: String) {
-        withAnimation {
-            chats.removeAll(where: { $0.id == id })
-        }
-    }
-}
-
-struct User: Decodable, NamedChat {
-    var userId: Int64
-    var userContactId: Int64
-    var localDisplayName: ContactName
-    var profile: Profile
-    var activeUser: Bool
-
-//    internal init(userId: Int64, userContactId: Int64, localDisplayName: ContactName, profile: Profile, activeUser: Bool) {
-//        self.userId = userId
-//        self.userContactId = userContactId
-//        self.localDisplayName = localDisplayName
-//        self.profile = profile
-//        self.activeUser = activeUser
-//    }
-
-    var displayName: String { get { profile.displayName } }
-
-    var fullName: String { get { profile.fullName } }
-
-    static let sampleData = User(
-        userId: 1,
-        userContactId: 1,
-        localDisplayName: "alice",
-        profile: Profile.sampleData,
-        activeUser: true
-    )
-}
-
-typealias ContactName = String
-
-typealias GroupName = String
-
-struct Profile: Codable, NamedChat {
-    var displayName: String
-    var fullName: String
-
-    static let sampleData = Profile(
-        displayName: "alice",
-        fullName: "Alice"
-    )
-}
-
-enum ChatType: String {
-    case direct = "@"
-    case group = "#"
-    case contactRequest = "<@"
-}
-
-protocol NamedChat {
-    var displayName: String { get }
-    var fullName: String { get }
-}
-
-extension NamedChat {
-    var chatViewName: String {
-        get { displayName + (fullName == "" || fullName == displayName ? "" : " / \(fullName)") }
-    }
-}
-
-typealias ChatId = String
-
-enum ChatInfo: Identifiable, Decodable, NamedChat {
-    case direct(contact: Contact)
-    case group(groupInfo: GroupInfo)
-    case contactRequest(contactRequest: UserContactRequest)
-    
-    var localDisplayName: String {
-        get {
-            switch self {
-            case let .direct(contact): return contact.localDisplayName
-            case let .group(groupInfo): return groupInfo.localDisplayName
-            case let .contactRequest(contactRequest): return contactRequest.localDisplayName
-            }
-        }
-    }
-
-    var displayName: String {
-        get {
-            switch self {
-            case let .direct(contact): return contact.displayName
-            case let .group(groupInfo): return groupInfo.displayName
-            case let .contactRequest(contactRequest): return contactRequest.displayName
-            }
-        }
-    }
-
-    var fullName: String {
-        get {
-            switch self {
-            case let .direct(contact): return contact.fullName
-            case let .group(groupInfo): return groupInfo.fullName
-            case let .contactRequest(contactRequest): return contactRequest.fullName
-            }
-        }
-    }
-
-    var id: ChatId {
-        get {
-            switch self {
-            case let .direct(contact): return contact.id
-            case let .group(groupInfo): return groupInfo.id
-            case let .contactRequest(contactRequest): return contactRequest.id
-            }
-        }
-    }
-
-    var chatType: ChatType {
-        get {
-            switch self {
-            case .direct: return .direct
-            case .group: return .group
-            case .contactRequest: return .contactRequest
-            }
-        }
-    }
-    
-    var apiId: Int64 {
-        get {
-            switch self {
-            case let .direct(contact): return contact.apiId
-            case let .group(groupInfo): return groupInfo.apiId
-            case let .contactRequest(contactRequest): return contactRequest.apiId
-            }
-        }
-    }
-
-    var createdAt: Date {
-        switch self {
-        case let .direct(contact): return contact.createdAt
-        case let .group(groupInfo): return groupInfo.createdAt
-        case let .contactRequest(contactRequest): return contactRequest.createdAt
-        }
-    }
-
-    struct SampleData {
-        var direct: ChatInfo
-        var group: ChatInfo
-        var contactRequest: ChatInfo
-    }
-
-    static var sampleData: ChatInfo.SampleData = SampleData(
-        direct: ChatInfo.direct(contact: Contact.sampleData),
-        group: ChatInfo.group(groupInfo: GroupInfo.sampleData),
-        contactRequest: ChatInfo.contactRequest(contactRequest: UserContactRequest.sampleData)
-    )
-}
-
-final class Chat: ObservableObject, Identifiable {
-    @Published var chatInfo: ChatInfo
-    @Published var chatItems: [ChatItem]
-    @Published var serverInfo = ServerInfo(networkStatus: .unknown)
-
-    struct ServerInfo: Decodable {
-        var networkStatus: NetworkStatus
-    }
-
-    enum NetworkStatus: Decodable, Equatable {
-        case unknown
-        case connected
-        case disconnected
-        case error(String)
-
-        var statusString: String {
-            get {
-                switch self {
-                case .connected: return "Server connected"
-                case let .error(err): return "Connecting server… (error: \(err))"
-                default: return "Connecting server…"
-                }
-            }
-        }
-
-        var statusExplanation: String {
-            get {
-                switch self {
-                case .connected: return "You are connected to the server you use to receve messages from this contact."
-                case let .error(err): return "Trying to connect to the server you use to receve messages from this contact (error: \(err))."
-                default: return "Trying to connect to the server you use to receve messages from this contact."
-                }
-            }
-        }
-
-        var imageName: String {
-            get {
-                switch self {
-                case .unknown: return "circle.dotted"
-                case .connected: return "circle.fill"
-                case .disconnected: return "ellipsis.circle.fill"
-                case .error: return "exclamationmark.circle.fill"
-                }
-            }
-        }
-    }
-
-    init(_ cData: ChatData) {
-        self.chatInfo = cData.chatInfo
-        self.chatItems = cData.chatItems
-    }
-
-    init(chatInfo: ChatInfo, chatItems: [ChatItem] = []) {
-        self.chatInfo = chatInfo
-        self.chatItems = chatItems
-    }
-
-    var id: ChatId { get { chatInfo.id } }
-}
-
-struct ChatData: Decodable, Identifiable {
-    var chatInfo: ChatInfo
-    var chatItems: [ChatItem]
-
-    var id: ChatId { get { chatInfo.id } }
-}
-
-struct Contact: Identifiable, Decodable, NamedChat {
-    var contactId: Int64
-    var localDisplayName: ContactName
-    var profile: Profile
-    var activeConn: Connection
-    var viaGroup: Int64?
-    var createdAt: Date
-
-    var id: ChatId { get { "@\(contactId)" } }
-    var apiId: Int64 { get { contactId } }
-    var ready: Bool { get { activeConn.connStatus == "ready" || activeConn.connStatus == "snd-ready" } }
-    var displayName: String { get { profile.displayName } }
-    var fullName: String { get { profile.fullName } }
-
-    static let sampleData = Contact(
-        contactId: 1,
-        localDisplayName: "alice",
-        profile: Profile.sampleData,
-        activeConn: Connection.sampleData,
-        createdAt: .now
-    )
-}
-
-struct Connection: Decodable {
-    var connStatus: String
-
-    static let sampleData = Connection(connStatus: "ready")
-}
-
-struct UserContactRequest: Decodable, NamedChat {
-    var contactRequestId: Int64
-    var localDisplayName: ContactName
-    var profile: Profile
-    var createdAt: Date
-
-    var id: ChatId { get { "<@\(contactRequestId)" } }
-    var apiId: Int64 { get { contactRequestId } }
-    var displayName: String { get { profile.displayName } }
-    var fullName: String { get { profile.fullName } }
-
-    static let sampleData = UserContactRequest(
-        contactRequestId: 1,
-        localDisplayName: "alice",
-        profile: Profile.sampleData,
-        createdAt: .now
-    )
-}
-
-struct GroupInfo: Identifiable, Decodable, NamedChat {
-    var groupId: Int64
-    var localDisplayName: GroupName
-    var groupProfile: GroupProfile
-    var createdAt: Date
-    
-    var id: ChatId { get { "#\(groupId)" } }
-    var apiId: Int64 { get { groupId } }
-    var displayName: String { get { groupProfile.displayName } }
-    var fullName: String { get { groupProfile.fullName } }
-
-    static let sampleData = GroupInfo(
-        groupId: 1,
-        localDisplayName: "team",
-        groupProfile: GroupProfile.sampleData,
-        createdAt: .now
-    )
-}
-
-struct GroupProfile: Codable, NamedChat {
-    var displayName: String
-    var fullName: String
-
-    static let sampleData = GroupProfile(
-        displayName: "team",
-        fullName: "My Team"
-    )
-}
-
-struct GroupMember: Decodable {
-    var groupMemberId: Int64
-    var memberId: String
-//    var memberRole: GroupMemberRole
-//    var memberCategory: GroupMemberCategory
-//    var memberStatus: GroupMemberStatus
-//    var invitedBy: InvitedBy
-    var localDisplayName: ContactName
-    var memberProfile: Profile
-    var memberContactId: Int64?
-//    var activeConn: Connection?
-
-    static let sampleData = GroupMember(
-        groupMemberId: 1,
-        memberId: "abcd",
-        localDisplayName: "alice",
-        memberProfile: Profile.sampleData,
-        memberContactId: 1
-    )
-}
-
-struct AChatItem: Decodable {
-    var chatInfo: ChatInfo
-    var chatItem: ChatItem
-}
-
-struct ChatItem: Identifiable, Decodable {
-    var chatDir: CIDirection
-    var meta: CIMeta
-    var content: CIContent
-    
-    var id: Int64 { get { meta.itemId } }
-
-    static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String) -> ChatItem {
-        ChatItem(
-           chatDir: dir,
-           meta: CIMeta.getSample(id, ts, text),
-           content: .sndMsgContent(msgContent: .text(text))
-       )
-    }
-}
-
-enum CIDirection: Decodable {
-    case directSnd
-    case directRcv
-    case groupSnd
-    case groupRcv(groupMember: GroupMember)
-
-    var sent: Bool {
-        get {
-            switch self {
-            case .directSnd: return true
-            case .directRcv: return false
-            case .groupSnd: return true
-            case .groupRcv: return false
-            }
-        }
-    }
-}
-
-struct CIMeta: Decodable {
-    var itemId: Int64
-    var itemTs: Date
-    var itemText: String
-    var createdAt: Date
-
-    static func getSample(_ id: Int64, _ ts: Date, _ text: String) -> CIMeta {
-        CIMeta(
-            itemId: id,
-            itemTs: ts,
-            itemText: text,
-            createdAt: ts
-        )
-    }
-}
-
-enum CIStatus: Decodable {
-    case sndNew
-    case sndSent
-    case sndErrorAuth
-    case sndError(agentErrorType: AgentErrorType)
-    case rcvNew
-    case rcvRead
-}
-
-enum CIContent: Decodable {
-    case sndMsgContent(msgContent: MsgContent)
-    case rcvMsgContent(msgContent: MsgContent)
-    // files etc.
-
-    var text: String {
-        get {
-            switch self {
-            case let .sndMsgContent(mc): return mc.text
-            case let .rcvMsgContent(mc): return mc.text
-            }
-        }
-    }
-}
-
-enum MsgContent {
-    case text(String)
-    case unknown(type: String, text: String)
-    case invalid(error: String)
-
-    var text: String {
-        get {
-            switch self {
-            case let .text(text): return text
-            case let .unknown(_, text): return text
-            case .invalid:  return "invalid"
-            }
-        }
-    }
-
-    var cmdString: String {
-        get {
-            switch self {
-            case let .text(text): return "text \(text)"
-            default: return ""
-            }
-        }
-    }
-
-    enum CodingKeys: String, CodingKey {
-        case type
-        case text
-    }
-}
-
-extension MsgContent: Decodable {
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        do {
-            let type = try container.decode(String.self, forKey: CodingKeys.type)
-            switch type {
-            case "text":
-                let text = try container.decode(String.self, forKey: CodingKeys.text)
-                self = .text(text)
-            default:
-                let text = try? container.decode(String.self, forKey: CodingKeys.text)
-                self = .unknown(type: type, text: text ?? "unknown message format")
-            }
-        } catch {
-            self = .invalid(error: String(describing: error))
-        }
-    }
-}

apps/ios/Shared/Model/JSON.swift

@@ -1,38 +0,0 @@
-//
-//  JSON.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-
-func getJSONDecoder() -> JSONDecoder {
-    let jd = JSONDecoder()
-    let fracSeconds = getDateFormatter("yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ")
-    let noFracSeconds = getDateFormatter("yyyy-MM-dd'T'HH:mm:ssZZZZZ")
-    jd.dateDecodingStrategy = .custom { decoder in
-        let container = try decoder.singleValueContainer()
-        let string = try container.decode(String.self)
-        if let date = fracSeconds.date(from: string) ?? noFracSeconds.date(from: string) {
-            return date
-        }
-        throw DecodingError.dataCorruptedError(in: container, debugDescription: "Invalid date: \(string)")
-    }
-    return jd
-}
-
-func getJSONEncoder() -> JSONEncoder {
-    let je = JSONEncoder()
-    je.dateEncodingStrategy = .iso8601
-    return je
-}
-
-private func getDateFormatter(_ format: String) -> DateFormatter {
-    let df = DateFormatter()
-    df.locale = Locale(identifier: "en_US_POSIX")
-    df.dateFormat = format
-    df.timeZone = TimeZone(secondsFromGMT: 0)
-    return df
-}

apps/ios/Shared/Model/NtfManager.swift

@@ -1,199 +0,0 @@
-//
-//  NtfManager.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 08/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import UserNotifications
-import UIKit
-
-let ntfActionAccept = "NTF_ACT_ACCEPT"
-
-let ntfCategoryContactRequest = "NTF_CAT_CONTACT_REQUEST"
-let ntfCategoryContactConnected = "NTF_CAT_CONTACT_CONNECTED"
-let ntfCategoryMessageReceived = "NTF_CAT_MESSAGE_RECEIVED"
-
-let appNotificationId = "chat.simplex.app.notification"
-
-private let ntfTimeInterval: TimeInterval = 1
-
-class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
-    static let shared = NtfManager()
-
-    private var granted = false
-    private var prevNtfTime: Dictionary<ChatId, Date> = [:]
-
-
-    // Handle notification when app is in background
-    func userNotificationCenter(_ center: UNUserNotificationCenter,
-                                didReceive response: UNNotificationResponse,
-                                withCompletionHandler handler: () -> Void) {
-        logger.debug("NtfManager.userNotificationCenter: didReceive")
-        let content = response.notification.request.content
-        let chatModel = ChatModel.shared
-        if content.categoryIdentifier == ntfCategoryContactRequest && response.actionIdentifier == ntfActionAccept,
-           let chatId = content.userInfo["chatId"] as? String,
-           case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-            acceptContactRequest(contactRequest)
-        } else {
-            chatModel.chatId = content.targetContentIdentifier
-        }
-        handler()
-    }
-
-    // Handle notification when the app is in foreground
-    func userNotificationCenter(_ center: UNUserNotificationCenter,
-                                willPresent notification: UNNotification,
-                                withCompletionHandler handler: (UNNotificationPresentationOptions) -> Void) {
-        logger.debug("NtfManager.userNotificationCenter: willPresent")
-        handler(presentationOptions(notification.request.content))
-    }
-
-    private func presentationOptions(_ content: UNNotificationContent) -> UNNotificationPresentationOptions {
-        let model = ChatModel.shared
-        if UIApplication.shared.applicationState == .active {
-            switch content.categoryIdentifier {
-            case ntfCategoryContactRequest:
-                return [.sound, .banner, .list]
-            case ntfCategoryContactConnected:
-                return model.chatId == nil ? [.sound, .list] : [.sound, .banner, .list]
-            case ntfCategoryMessageReceived:
-                if model.chatId == nil {
-                    // in the chat list
-                    return recentInTheSameChat(content) ? [] : [.sound, .list]
-                } else if model.chatId == content.targetContentIdentifier {
-                    // in the current chat
-                    return recentInTheSameChat(content) ? [] : [.sound, .list]
-                } else {
-                    // in another chat
-                    return recentInTheSameChat(content) ? [.banner, .list] : [.sound, .banner, .list]
-                }
-            default: return [.sound, .banner, .list]
-            }
-        } else {
-            return [.sound, .banner, .list]
-        }
-    }
-
-    private func recentInTheSameChat(_ content: UNNotificationContent) -> Bool {
-        let now = Date.now
-        if let chatId = content.targetContentIdentifier {
-            var res: Bool = false
-            if let t = prevNtfTime[chatId] { res = t.distance(to: now) < 30 }
-            prevNtfTime[chatId] = now
-            return res
-        }
-        return false
-    }
-
-    func registerCategories() {
-        logger.debug("NtfManager.registerCategories")
-        UNUserNotificationCenter.current().setNotificationCategories([
-            UNNotificationCategory(
-                identifier: ntfCategoryContactRequest,
-                actions: [UNNotificationAction(
-                    identifier: ntfActionAccept,
-                    title: "Accept"
-                )],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: "New contact request"
-            ),
-            UNNotificationCategory(
-                identifier: ntfCategoryContactConnected,
-                actions: [],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: "Contact is connected"
-            ),
-            UNNotificationCategory(
-                identifier: ntfCategoryMessageReceived,
-                actions: [],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: "New message"
-            )
-        ])
-    }
-
-    func requestAuthorization(onDeny handler: (()-> Void)? = nil) {
-        logger.debug("NtfManager.requestAuthorization")
-        let center = UNUserNotificationCenter.current()
-        center.getNotificationSettings { settings in
-            switch settings.authorizationStatus {
-            case .denied:
-                if let handler = handler { handler() }
-                return
-            case .authorized:
-                self.granted = true
-            default:
-                center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
-                    if let error = error {
-                        logger.error("NtfManager.requestAuthorization error \(error.localizedDescription)")
-                    } else {
-                        self.granted = granted
-                    }
-                }
-            }
-        }
-        center.delegate = self
-    }
-
-    func notifyContactRequest(_ contactRequest: UserContactRequest) {
-        logger.debug("NtfManager.notifyContactRequest")
-        addNotification(
-            categoryIdentifier: ntfCategoryContactRequest,
-            title: "\(contactRequest.displayName) wants to connect!",
-            body: "Accept contact request from \(contactRequest.chatViewName)?",
-            targetContentIdentifier: nil,
-            userInfo: ["chatId": contactRequest.id, "contactRequestId": contactRequest.apiId]
-        )
-    }
-
-    func notifyContactConnected(_ contact: Contact) {
-        logger.debug("NtfManager.notifyContactConnected")
-        addNotification(
-            categoryIdentifier: ntfCategoryContactConnected,
-            title: "\(contact.displayName) is connected!",
-            body: "You can now send messages to \(contact.chatViewName)",
-            targetContentIdentifier: contact.id
-//            userInfo: ["chatId": contact.id, "contactId": contact.apiId]
-        )
-    }
-
-    func notifyMessageReceived(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        logger.debug("NtfManager.notifyMessageReceived")
-        addNotification(
-            categoryIdentifier: ntfCategoryMessageReceived,
-            title: "\(cInfo.chatViewName):",
-            body: cItem.content.text,
-            targetContentIdentifier: cInfo.id
-//            userInfo: ["chatId": cInfo.id, "chatItemId": cItem.id]
-        )
-    }
-
-    private func addNotification(categoryIdentifier: String, title: String, subtitle: String? = nil, body: String? = nil,
-                                 targetContentIdentifier: String? = nil, userInfo: [AnyHashable : Any] = [:]) {
-        if !granted { return }
-        let content = UNMutableNotificationContent()
-        content.categoryIdentifier = categoryIdentifier
-        content.title = title
-        if let s = subtitle { content.subtitle = s }
-        if let s = body { content.body = s }
-        content.targetContentIdentifier = targetContentIdentifier
-        content.userInfo = userInfo
-        content.sound = .default
-//        content.interruptionLevel = .active
-//        content.relevanceScore = 0.5 // 0-1
-        let trigger = UNTimeIntervalNotificationTrigger(timeInterval: ntfTimeInterval, repeats: false)
-        let request = UNNotificationRequest(identifier: appNotificationId, content: content, trigger: trigger)
-        UNUserNotificationCenter.current().add(request) { error in
-            if let error = error { logger.error("addNotification error: \(error.localizedDescription)") }
-        }
-    }
-
-    func removeNotifications(_ ids : [String]){
-        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: ids)
-        UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: ids)
-    }
-}

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -1,630 +0,0 @@
-//
-//  ChatAPI.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 27/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import UIKit
-import Dispatch
-import BackgroundTasks
-
-private var chatController: chat_ctrl?
-private let jsonDecoder = getJSONDecoder()
-private let jsonEncoder = getJSONEncoder()
-
-enum ChatCommand {
-    case showActiveUser
-    case createActiveUser(profile: Profile)
-    case startChat
-    case apiGetChats
-    case apiGetChat(type: ChatType, id: Int64)
-    case apiSendMessage(type: ChatType, id: Int64, msg: MsgContent)
-    case addContact
-    case connect(connReq: String)
-    case apiDeleteChat(type: ChatType, id: Int64)
-    case updateProfile(profile: Profile)
-    case createMyAddress
-    case deleteMyAddress
-    case showMyAddress
-    case apiAcceptContact(contactReqId: Int64)
-    case apiRejectContact(contactReqId: Int64)
-    case string(String)
-
-    var cmdString: String {
-        get {
-            switch self {
-            case .showActiveUser: return "/u"
-            case let .createActiveUser(profile): return "/u \(profile.displayName) \(profile.fullName)"
-            case .startChat: return "/_start"
-            case .apiGetChats: return "/_get chats"
-            case let .apiGetChat(type, id): return "/_get chat \(type.rawValue)\(id) count=500"
-            case let .apiSendMessage(type, id, mc): return "/_send \(type.rawValue)\(id) \(mc.cmdString)"
-            case .addContact: return "/connect"
-            case let .connect(connReq): return "/connect \(connReq)"
-            case let .apiDeleteChat(type, id): return "/_delete \(type.rawValue)\(id)"
-            case let .updateProfile(profile): return "/profile \(profile.displayName) \(profile.fullName)"
-            case .createMyAddress: return "/address"
-            case .deleteMyAddress: return "/delete_address"
-            case .showMyAddress: return "/show_address"
-            case let .apiAcceptContact(contactReqId): return "/_accept \(contactReqId)"
-            case let .apiRejectContact(contactReqId): return "/_reject \(contactReqId)"
-            case let .string(str): return str
-            }
-        }
-    }
-}
-
-struct APIResponse: Decodable {
-    var resp: ChatResponse
-}
-
-enum ChatResponse: Decodable, Error {
-    case response(type: String, json: String)
-    case activeUser(user: User)
-    case chatStarted
-    case apiChats(chats: [ChatData])
-    case apiChat(chat: ChatData)
-    case invitation(connReqInvitation: String)
-    case sentConfirmation
-    case sentInvitation
-    case contactDeleted(contact: Contact)
-    case userProfileNoChange
-    case userProfileUpdated(fromProfile: Profile, toProfile: Profile)
-    case userContactLink(connReqContact: String)
-    case userContactLinkCreated(connReqContact: String)
-    case userContactLinkDeleted
-    case contactConnected(contact: Contact)
-    case receivedContactRequest(contactRequest: UserContactRequest)
-    case acceptingContactRequest(contact: Contact)
-    case contactRequestRejected
-    case contactUpdated(toContact: Contact)
-    case contactSubscribed(contact: Contact)
-    case contactDisconnected(contact: Contact)
-    case contactSubError(contact: Contact, chatError: ChatError)
-    case groupSubscribed(groupInfo: GroupInfo)
-    case groupEmpty(groupInfo: GroupInfo)
-    case userContactLinkSubscribed
-    case newChatItem(chatItem: AChatItem)
-    case chatCmdError(chatError: ChatError)
-    case chatError(chatError: ChatError)
-
-    var responseType: String {
-        get {
-            switch self {
-            case let .response(type, _): return "* \(type)"
-            case .activeUser: return "activeUser"
-            case .chatStarted: return "chatStarted"
-            case .apiChats: return "apiChats"
-            case .apiChat: return "apiChat"
-            case .invitation: return "invitation"
-            case .sentConfirmation: return "sentConfirmation"
-            case .sentInvitation: return "sentInvitation"
-            case .contactDeleted: return "contactDeleted"
-            case .userProfileNoChange: return "userProfileNoChange"
-            case .userProfileUpdated: return "userProfileNoChange"
-            case .userContactLink: return "userContactLink"
-            case .userContactLinkCreated: return "userContactLinkCreated"
-            case .userContactLinkDeleted: return "userContactLinkDeleted"
-            case .contactConnected: return "contactConnected"
-            case .receivedContactRequest: return "receivedContactRequest"
-            case .acceptingContactRequest: return "acceptingContactRequest"
-            case .contactRequestRejected: return "contactRequestRejected"
-            case .contactUpdated: return "contactUpdated"
-            case .contactSubscribed: return "contactSubscribed"
-            case .contactDisconnected: return "contactDisconnected"
-            case .contactSubError: return "contactSubError"
-            case .groupSubscribed: return "groupSubscribed"
-            case .groupEmpty: return "groupEmpty"
-            case .userContactLinkSubscribed: return "userContactLinkSubscribed"
-            case .newChatItem: return "newChatItem"
-            case .chatCmdError: return "chatCmdError"
-            case .chatError: return "chatError"
-            }
-        }
-    }
-    
-    var details: String {
-        get {
-            switch self {
-            case let .response(_, json): return json
-            case let .activeUser(user): return String(describing: user)
-            case .chatStarted: return noDetails
-            case let .apiChats(chats): return String(describing: chats)
-            case let .apiChat(chat): return String(describing: chat)
-            case let .invitation(connReqInvitation): return connReqInvitation
-            case .sentConfirmation: return noDetails
-            case .sentInvitation: return noDetails
-            case let .contactDeleted(contact): return String(describing: contact)
-            case .userProfileNoChange: return noDetails
-            case let .userProfileUpdated(_, toProfile): return String(describing: toProfile)
-            case let .userContactLink(connReq): return connReq
-            case let .userContactLinkCreated(connReq): return connReq
-            case .userContactLinkDeleted: return noDetails
-            case let .contactConnected(contact): return String(describing: contact)
-            case let .receivedContactRequest(contactRequest): return String(describing: contactRequest)
-            case let .acceptingContactRequest(contact): return String(describing: contact)
-            case .contactRequestRejected: return noDetails
-            case let .contactUpdated(toContact): return String(describing: toContact)
-            case let .contactSubscribed(contact): return String(describing: contact)
-            case let .contactDisconnected(contact): return String(describing: contact)
-            case let .contactSubError(contact, chatError): return "contact:\n\(String(describing: contact))\nerror:\n\(String(describing: chatError))"
-            case let .groupSubscribed(groupInfo): return String(describing: groupInfo)
-            case let .groupEmpty(groupInfo): return String(describing: groupInfo)
-            case .userContactLinkSubscribed: return noDetails
-            case let .newChatItem(chatItem): return String(describing: chatItem)
-            case let .chatCmdError(chatError): return String(describing: chatError)
-            case let .chatError(chatError): return String(describing: chatError)
-            }
-        }
-    }
-
-    private var noDetails: String { get { "\(responseType): no details" } }
-}
-
-enum TerminalItem: Identifiable {
-    case cmd(Date, ChatCommand)
-    case resp(Date, ChatResponse)
-
-    var id: Date {
-        get {
-            switch self {
-            case let .cmd(id, _): return id
-            case let .resp(id, _): return id
-            }
-        }
-    }
-
-    var label: String {
-        get {
-            switch self {
-            case let .cmd(_, cmd): return "> \(cmd.cmdString.prefix(30))"
-            case let .resp(_, resp): return "< \(resp.responseType)"
-            }
-        }
-    }
-
-    var details: String {
-        get {
-            switch self {
-            case let .cmd(_, cmd): return cmd.cmdString
-            case let .resp(_, resp): return resp.details
-            }
-        }
-    }
-}
-
-func chatSendCmd(_ cmd: ChatCommand) throws -> ChatResponse {
-    var c = cmd.cmdString.cString(using: .utf8)!
-    let resp = chatResponse(chat_send_cmd(getChatCtrl(), &c)!)
-    DispatchQueue.main.async {
-        ChatModel.shared.terminalItems.append(.cmd(.now, cmd))
-        ChatModel.shared.terminalItems.append(.resp(.now, resp))
-    }
-    return resp
-}
-
-func chatRecvMsg() throws -> ChatResponse {
-    chatResponse(chat_recv_msg(getChatCtrl())!)
-}
-
-func apiGetActiveUser() throws -> User? {
-    let _ = getChatCtrl()
-    let r = try chatSendCmd(.showActiveUser)
-    switch r {
-    case let .activeUser(user): return user
-    case .chatCmdError(.error(.noActiveUser)): return nil
-    default: throw r
-    }
-}
-
-func apiCreateActiveUser(_ p: Profile) throws -> User {
-    let r = try chatSendCmd(.createActiveUser(profile: p))
-    if case let .activeUser(user) = r { return user }
-    throw r
-}
-
-func apiStartChat() throws {
-    let r = try chatSendCmd(.startChat)
-    if case .chatStarted = r { return }
-    throw r
-}
-
-func apiGetChats() throws -> [Chat] {
-    let r = try chatSendCmd(.apiGetChats)
-    if case let .apiChats(chats) = r { return chats.map { Chat.init($0) } }
-    throw r
-}
-
-func apiGetChat(type: ChatType, id: Int64) throws -> Chat {
-    let r = try chatSendCmd(.apiGetChat(type: type, id: id))
-    if case let .apiChat(chat) = r { return Chat.init(chat) }
-    throw r
-}
-
-func apiSendMessage(type: ChatType, id: Int64, msg: MsgContent) throws -> ChatItem {
-    let r = try chatSendCmd(.apiSendMessage(type: type, id: id, msg: msg))
-    if case let .newChatItem(aChatItem) = r { return aChatItem.chatItem }
-    throw r
-}
-
-func apiAddContact() throws -> String {
-    let r = try chatSendCmd(.addContact)
-    if case let .invitation(connReqInvitation) = r { return connReqInvitation }
-    throw r
-}
-
-func apiConnect(connReq: String) throws {
-    let r = try chatSendCmd(.connect(connReq: connReq))
-    switch r {
-    case .sentConfirmation: return
-    case .sentInvitation: return
-    default: throw r
-    }
-}
-
-func apiDeleteChat(type: ChatType, id: Int64) throws {
-    let r = try chatSendCmd(.apiDeleteChat(type: type, id: id))
-    if case .contactDeleted = r { return }
-    throw r
-}
-
-func apiUpdateProfile(profile: Profile) throws -> Profile? {
-    let r = try chatSendCmd(.updateProfile(profile: profile))
-    switch r {
-    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(_, toProfile): return toProfile
-    default: throw r
-    }
-}
-
-func apiCreateUserAddress() throws -> String {
-    let r = try chatSendCmd(.createMyAddress)
-    if case let .userContactLinkCreated(connReq) = r { return connReq }
-    throw r
-}
-
-func apiDeleteUserAddress() throws {
-    let r = try chatSendCmd(.deleteMyAddress)
-    if case .userContactLinkDeleted = r { return }
-    throw r
-}
-
-func apiGetUserAddress() throws -> String? {
-    let r = try chatSendCmd(.showMyAddress)
-    switch r {
-    case let .userContactLink(connReq):
-        return connReq
-    case .chatCmdError(chatError: .errorStore(storeError: .userContactLinkNotFound)):
-        return nil
-    default: throw r
-    }
-}
-
-func apiAcceptContactRequest(contactReqId: Int64) throws -> Contact {
-    let r = try chatSendCmd(.apiAcceptContact(contactReqId: contactReqId))
-    if case let .acceptingContactRequest(contact) = r { return contact }
-    throw r
-}
-
-func apiRejectContactRequest(contactReqId: Int64) throws {
-    let r = try chatSendCmd(.apiRejectContact(contactReqId: contactReqId))
-    if case .contactRequestRejected = r { return }
-    throw r
-}
-
-func acceptContactRequest(_ contactRequest: UserContactRequest) {
-    do {
-        let contact = try apiAcceptContactRequest(contactReqId: contactRequest.apiId)
-        let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
-        ChatModel.shared.replaceChat(contactRequest.id, chat)
-    } catch let error {
-        logger.error("acceptContactRequest error: \(error.localizedDescription)")
-    }
-}
-
-func rejectContactRequest(_ contactRequest: UserContactRequest) {
-    do {
-        try apiRejectContactRequest(contactReqId: contactRequest.apiId)
-        ChatModel.shared.removeChat(contactRequest.id)
-    } catch let error {
-        logger.error("rejectContactRequest: \(error.localizedDescription)")
-    }
-}
-
-func initializeChat() {
-    do {
-        ChatModel.shared.currentUser = try apiGetActiveUser()
-    } catch {
-        fatalError("Failed to initialize chat controller or database: \(error)")
-    }
-}
-
-class ChatReceiver {
-    private var receiveLoop: DispatchWorkItem?
-    private var receiveMessages = true
-    private var _lastMsgTime = Date.now
-
-    static let shared = ChatReceiver()
-
-    var lastMsgTime: Date { get { _lastMsgTime } }
-
-    func start() {
-        logger.debug("ChatReceiver.start")
-        receiveMessages = true
-        _lastMsgTime = .now
-        if receiveLoop != nil { return }
-        let loop = DispatchWorkItem(qos: .default, flags: []) {
-            while self.receiveMessages {
-                do {
-                    processReceivedMsg(try chatRecvMsg())
-                    self._lastMsgTime = .now
-                } catch {
-                    logger.error("ChatReceiver.start chatRecvMsg error: \(error.localizedDescription)")
-                }
-            }
-        }
-        receiveLoop = loop
-        DispatchQueue.global().async(execute: loop)
-    }
-
-    func stop() {
-        logger.debug("ChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-    }
-}
-
-func processReceivedMsg(_ res: ChatResponse) {
-    let chatModel = ChatModel.shared
-    DispatchQueue.main.async {
-        chatModel.terminalItems.append(.resp(.now, res))
-        logger.debug("processReceivedMsg: \(res.responseType)")
-        switch res {
-        case let .contactConnected(contact):
-            chatModel.updateContact(contact)
-            chatModel.updateNetworkStatus(contact, .connected)
-            NtfManager.shared.notifyContactConnected(contact)
-        case let .receivedContactRequest(contactRequest):
-            chatModel.addChat(Chat(
-                chatInfo: ChatInfo.contactRequest(contactRequest: contactRequest),
-                chatItems: []
-            ))
-            NtfManager.shared.notifyContactRequest(contactRequest)
-        case let .contactUpdated(toContact):
-            let cInfo = ChatInfo.direct(contact: toContact)
-            if chatModel.hasChat(toContact.id) {
-                chatModel.updateChatInfo(cInfo)
-            }
-        case let .contactSubscribed(contact):
-            chatModel.updateContact(contact)
-            chatModel.updateNetworkStatus(contact, .connected)
-        case let .contactDisconnected(contact):
-            chatModel.updateContact(contact)
-            chatModel.updateNetworkStatus(contact, .disconnected)
-        case let .contactSubError(contact, chatError):
-            chatModel.updateContact(contact)
-            var err: String
-            switch chatError {
-            case .errorAgent(agentError: .BROKER(brokerErr: .NETWORK)): err = "network"
-            case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
-            default: err = String(describing: chatError)
-            }
-            chatModel.updateNetworkStatus(contact, .error(err))
-        case let .newChatItem(aChatItem):
-            let cInfo = aChatItem.chatInfo
-            let cItem = aChatItem.chatItem
-            chatModel.addChatItem(cInfo, cItem)
-            NtfManager.shared.notifyMessageReceived(cInfo, cItem)
-        default:
-            logger.debug("unsupported event: \(res.responseType)")
-        }
-    }
-}
-
-private struct UserResponse: Decodable {
-    var user: User?
-    var error: String?
-}
-
-private func chatResponse(_ cjson: UnsafePointer<CChar>) -> ChatResponse {
-    let s = String.init(cString: cjson)
-    let d = s.data(using: .utf8)!
-// TODO is there a way to do it without copying the data? e.g:
-//    let p = UnsafeMutableRawPointer.init(mutating: UnsafeRawPointer(cjson))
-//    let d = Data.init(bytesNoCopy: p, count: strlen(cjson), deallocator: .free)
-
-// TODO some mechanism to update model without passing it - maybe Publisher / Subscriber?
-
-    do {
-        let r = try jsonDecoder.decode(APIResponse.self, from: d)
-        return r.resp
-    } catch {
-        logger.error("chatResponse jsonDecoder.decode error: \(error.localizedDescription)")
-    }
-        
-    var type: String?
-    var json: String?
-    if let j = try? JSONSerialization.jsonObject(with: d) as? NSDictionary {
-        if let j1 = j["resp"] as? NSDictionary, j1.count == 1 {
-            type = j1.allKeys[0] as? String
-        }
-        json = prettyJSON(j)
-    }
-    return ChatResponse.response(type: type ?? "invalid", json: json ?? s)
-}
-
-func prettyJSON(_ obj: NSDictionary) -> String? {
-    if let d = try? JSONSerialization.data(withJSONObject: obj, options: .prettyPrinted) {
-        return String(decoding: d, as: UTF8.self)
-    }
-    return nil
-}
-
-private func getChatCtrl() -> chat_ctrl {
-    if let controller = chatController { return controller }
-    let dataDir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.path + "/mobile_v1"
-    var cstr = dataDir.cString(using: .utf8)!
-    chatController = chat_init(&cstr)
-    return chatController!
-}
-
-private func decodeCJSON<T: Decodable>(_ cjson: UnsafePointer<CChar>) -> T? {
-    let s = String.init(cString: cjson)
-    let d = s.data(using: .utf8)!
-//    let p = UnsafeMutableRawPointer.init(mutating: UnsafeRawPointer(cjson))
-//    let d = Data.init(bytesNoCopy: p, count: strlen(cjson), deallocator: .free)
-    return try? jsonDecoder.decode(T.self, from: d)
-}
-
-private func getJSONObject(_ cjson: UnsafePointer<CChar>) -> NSDictionary? {
-    let s = String.init(cString: cjson)
-    let d = s.data(using: .utf8)!
-    return try? JSONSerialization.jsonObject(with: d) as? NSDictionary
-}
-
-private func encodeCJSON<T: Encodable>(_ value: T) -> [CChar] {
-    let data = try! jsonEncoder.encode(value)
-    let str = String(decoding: data, as: UTF8.self)
-    return str.cString(using: .utf8)!
-}
-
-enum ChatError: Decodable {
-    case error(errorType: ChatErrorType)
-    case errorAgent(agentError: AgentErrorType)
-    case errorStore(storeError: StoreError)
-}
-
-enum ChatErrorType: Decodable {
-    case noActiveUser
-    case activeUserExists
-    case chatNotStarted
-    case invalidConnReq
-    case invalidChatMessage(message: String)
-    case contactGroups(contact: Contact, groupNames: [GroupName])
-    case groupUserRole
-    case groupContactRole(contactName: ContactName)
-    case groupDuplicateMember(contactName: ContactName)
-    case groupDuplicateMemberId
-    case groupNotJoined(groupInfo: GroupInfo)
-    case groupMemberNotActive
-    case groupMemberUserRemoved
-    case groupMemberNotFound(contactName: ContactName)
-    case groupMemberIntroNotFound(contactName: ContactName)
-    case groupCantResendInvitation(groupInfo: GroupInfo, contactName: ContactName)
-    case groupInternal(message: String)
-    case fileNotFound(message: String)
-    case fileAlreadyReceiving(message: String)
-    case fileAlreadyExists(filePath: String)
-    case fileRead(filePath: String, message: String)
-    case fileWrite(filePath: String, message: String)
-    case fileSend(fileId: Int64, agentError: String)
-    case fileRcvChunk(message: String)
-    case fileInternal(message: String)
-    case agentVersion
-    case commandError(message: String)
-}
-
-enum StoreError: Decodable {
-    case duplicateName
-    case contactNotFound(contactId: Int64)
-    case contactNotFoundByName(contactName: ContactName)
-    case contactNotReady(contactName: ContactName)
-    case duplicateContactLink
-    case userContactLinkNotFound
-    case contactRequestNotFound(contactRequestId: Int64)
-    case contactRequestNotFoundByName(contactName: ContactName)
-    case groupNotFound(groupId: Int64)
-    case groupNotFoundByName(groupName: GroupName)
-    case groupWithoutUser
-    case duplicateGroupMember
-    case groupAlreadyJoined
-    case groupInvitationNotFound
-    case sndFileNotFound(fileId: Int64)
-    case sndFileInvalid(fileId: Int64)
-    case rcvFileNotFound(fileId: Int64)
-    case fileNotFound(fileId: Int64)
-    case rcvFileInvalid(fileId: Int64)
-    case connectionNotFound(agentConnId: String)
-    case introNotFound
-    case uniqueID
-    case internalError(message: String)
-    case noMsgDelivery(connId: Int64, agentMsgId: String)
-    case badChatItem(itemId: Int64)
-    case chatItemNotFound(itemId: Int64)
-}
-
-enum AgentErrorType: Decodable {
-    case CMD(cmdErr: CommandErrorType)
-    case CONN(connErr: ConnectionErrorType)
-    case SMP(smpErr: SMPErrorType)
-    case BROKER(brokerErr: BrokerErrorType)
-    case AGENT(agentErr: SMPAgentError)
-    case INTERNAL(internalErr: String)
-}
-
-enum CommandErrorType: Decodable {
-    case PROHIBITED
-    case SYNTAX
-    case NO_CONN
-    case SIZE
-    case LARGE
-}
-
-enum ConnectionErrorType: Decodable {
-    case NOT_FOUND
-    case DUPLICATE
-    case SIMPLEX
-    case NOT_ACCEPTED
-    case NOT_AVAILABLE
-}
-
-enum BrokerErrorType: Decodable {
-    case RESPONSE(smpErr: SMPErrorType)
-    case UNEXPECTED
-    case NETWORK
-    case TRANSPORT(transportErr: SMPTransportError)
-    case TIMEOUT
-}
-
-enum SMPErrorType: Decodable {
-    case BLOCK
-    case SESSION
-    case CMD(cmdErr: SMPCommandError)
-    case AUTH
-    case QUOTA
-    case NO_MSG
-    case LARGE_MSG
-    case INTERNAL
-}
-
-enum SMPCommandError: Decodable {
-    case UNKNOWN
-    case SYNTAX
-    case NO_AUTH
-    case HAS_AUTH
-    case NO_QUEUE
-}
-
-enum SMPTransportError: Decodable {
-    case TEBadBlock
-    case TELargeMsg
-    case TEBadSession
-    case TEHandshake(handshakeErr: SMPHandshakeError)
-}
-
-enum SMPHandshakeError: Decodable {
-    case PARSE
-    case VERSION
-    case IDENTITY
-}
-
-enum SMPAgentError: Decodable {
-    case A_MESSAGE
-    case A_PROHIBITED
-    case A_VERSION
-    case A_ENCRYPTION
-}

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

@@ -1,32 +0,0 @@
-import Foundation
-
-var greeting = "Hello, playground"
-
-let jsonEncoder = JSONEncoder()
-
-//jsonDecoder.decode(Test.self, from: "{\"name\":\"hello\",\"id\":1}".data(using: .utf8)!)
-
-
-var a = [1, 2, 3]
-
-a.removeAll(where: { $0 == 1} )
-
-print(a)
-
-let input = "This is a test with the привет 🙂 URL https://www.hackingwithswift.com to be detected."
-let detector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-let matches = detector.matches(in: input, options: [], range: NSRange(location: 0, length: input.count))
-
-print(matches)
-
-for match in matches {
-    guard let range = Range(match.range, in: input) else { continue }
-    let url = input[range]
-    print(url)
-}
-
-let r = try! NSRegularExpression(pattern: "^\\+?[0-9\\.\\(\\)\\-]{7,20}$")
-
-print(r.firstMatch(in: "+44(0)7448-736-790", options: [], range: NSRange(location: 0, length: "+44(0)7448-736-790".count)) == nil)
-
-let action: NtfAction? = NtfAction(rawValue: "NTF_ACT_ACCEPT")

apps/ios/Shared/MyPlayground.playground/contents.xcplayground

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' buildActiveScheme='true' importAppTypes='true'>
-    <timeline fileName='timeline.xctimeline'/>
-</playground>

apps/ios/Shared/MyPlayground.playground/timeline.xctimeline

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Timeline
-   version = "3.0">
-   <TimelineItems>
-      <LoggerValueHistoryTimelineItem
-         documentLocation = "file:///Users/evgeny/opensource/simplex-chat/simplex-chat/apps/ios/Shared/MyPlayground.playground#CharacterRangeLen=88&amp;CharacterRangeLoc=91&amp;EndingColumnNumber=0&amp;EndingLineNumber=7&amp;StartingColumnNumber=3&amp;StartingLineNumber=6&amp;Timestamp=666087303.155273"
-         selectedRepresentationIndex = "0"
-         shouldTrackSuperviewWidth = "NO">
-      </LoggerValueHistoryTimelineItem>
-   </TimelineItems>
-</Timeline>

apps/ios/Shared/SimpleX (iOS)-Bridging-Header.h

@@ -1,11 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
-extern void hs_init(int argc, char **argv[]);
-
-typedef void* chat_ctrl;
-
-extern chat_ctrl chat_init(char *path);
-extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctl);

apps/ios/Shared/SimpleX (macOS)-Bridging-Header.h

@@ -1,11 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
-extern void hs_init(int argc, char **argv[]);
-
-typedef void* chat_ctrl;
-
-extern chat_ctrl chat_init(char *path);
-extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctl);

apps/ios/Shared/SimpleXApp.swift

@@ -1,43 +0,0 @@
-//
-//  SimpleXApp.swift
-//  Shared
-//
-//  Created by Evgeny Poberezkin on 17/01/2022.
-//
-
-import SwiftUI
-import OSLog
-
-let logger = Logger()
-
-@main
-struct SimpleXApp: App {
-    @StateObject private var chatModel = ChatModel.shared
-    @Environment(\.scenePhase) var scenePhase
-
-    init() {
-        hs_init(0, nil)
-        BGManager.shared.register()
-        NtfManager.shared.registerCategories()
-    }
-
-    var body: some Scene {
-        return WindowGroup {
-            ContentView()
-                .environmentObject(chatModel)
-                .onOpenURL { url in
-                    logger.debug("ContentView.onOpenURL: \(url)")
-                    chatModel.appOpenUrl = url
-                    chatModel.connectViaUrl = true
-                }
-                .onAppear() {
-                    initializeChat()
-                }
-                .onChange(of: scenePhase) { phase in
-                    if phase == .background {
-                        BGManager.shared.schedule()
-                    }
-                }
-        }
-    }
-}

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

@@ -1,97 +0,0 @@
-//
-//  ChatInfoView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 05/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatInfoView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var chat: Chat
-    @Binding var showChatInfo: Bool
-    @State private var showDeleteContactAlert = false
-    @State private var alertContact: Contact?
-    @State private var showNetworkStatusInfo = false
-
-    var body: some View {
-        VStack{
-            ChatInfoImage(chat: chat)
-                .frame(width: 192, height: 192)
-                .padding(.top, 48)
-                .padding()
-            Text(chat.chatInfo.localDisplayName).font(.largeTitle)
-                .padding(.bottom, 2)
-            Text(chat.chatInfo.fullName).font(.title)
-                .padding(.bottom)
-
-            if case let .direct(contact) = chat.chatInfo {
-                VStack {
-                    HStack {
-                        Button {
-                            showNetworkStatusInfo.toggle()
-                        } label: {
-                            serverImage()
-                            Text(chat.serverInfo.networkStatus.statusString)
-                                .foregroundColor(.primary)
-                        }
-                    }
-                    if showNetworkStatusInfo {
-                        Text(chat.serverInfo.networkStatus.statusExplanation)
-                            .font(.subheadline)
-                            .multilineTextAlignment(.center)
-                            .padding(.horizontal, 64)
-                            .padding(.vertical, 8)
-                    }
-
-                    Spacer()
-                    Button(role: .destructive) {
-                        alertContact = contact
-                        showDeleteContactAlert = true
-                    } label: {
-                        Label("Delete contact", systemImage: "trash")
-                    }
-                    .padding()
-                    .alert(isPresented: $showDeleteContactAlert) {
-                        deleteContactAlert(alertContact!)
-                    }
-                }
-            }
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-    }
-
-    func serverImage() -> some View {
-        let status = chat.serverInfo.networkStatus
-        return Image(systemName: status.imageName)
-            .foregroundColor(status == .connected ? .green : .secondary)
-    }
-
-    private func deleteContactAlert(_ contact: Contact) -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted"),
-            primaryButton: .destructive(Text("Delete")) {
-                do {
-                    try apiDeleteChat(type: .direct, id: contact.apiId)
-                    chatModel.removeChat(contact.id)
-                    showChatInfo = false
-                } catch let error {
-                    logger.error("ChatInfoView.deleteContactAlert apiDeleteChat error: \(error.localizedDescription)")
-                }
-                alertContact = nil
-            }, secondaryButton: .cancel() {
-                alertContact = nil
-            }
-        )
-    }
-}
-
-struct ChatInfoView_Previews: PreviewProvider {
-    static var previews: some View {
-        @State var showChatInfo = true
-        return ChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []), showChatInfo: $showChatInfo)
-    }
-}

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

@@ -1,43 +0,0 @@
-//
-//  EmojiItemView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 04/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct EmojiItemView: View {
-    var chatItem: ChatItem
-
-    var body: some View {
-        let sent = chatItem.chatDir.sent
-
-        VStack {
-            Text(chatItem.content.text.trimmingCharacters(in: .whitespaces))
-                .font(emojiFont)
-                .padding(.top, 8)
-                .padding(.horizontal, 6)
-                .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
-            Text(getDateFormatter().string(from: chatItem.meta.itemTs))
-                .font(.caption)
-                .foregroundColor(.secondary)
-                .padding(.bottom, 8)
-                .padding(.horizontal, 12)
-                .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
-        }
-        .padding(.horizontal)
-        .frame(maxWidth: .infinity, alignment: sent ? .trailing : .leading)
-    }
-}
-
-struct EmojiItemView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
-            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
-        }
-        .previewLayout(.fixed(width: 360, height: 70))
-    }
-}

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

@@ -1,144 +0,0 @@
-//
-//  TextItemView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 04/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-private let emailRegex = try! NSRegularExpression(pattern: "^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$", options: .caseInsensitive)
-
-private let phoneRegex = try! NSRegularExpression(pattern: "^\\+?[0-9\\.\\(\\)\\-]{7,20}$")
-
-private let sentColorLigth = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.12)
-private let sentColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.17)
-private let linkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
-
-struct TextItemView: View {
-    @Environment(\.colorScheme) var colorScheme
-    var chatItem: ChatItem
-    var width: CGFloat
-    private let codeFont = Font.custom("Courier", size: UIFont.preferredFont(forTextStyle: .body).pointSize)
-
-    var body: some View {
-        let sent = chatItem.chatDir.sent
-//        let minWidth = min(200, width)
-        let maxWidth = width * 0.78
-        let meta = getDateFormatter().string(from: chatItem.meta.itemTs)
-
-        return ZStack(alignment: .bottomTrailing) {
-            (messageText(chatItem) + reserveSpaceForMeta(meta))
-                .padding(.top, 6)
-                .padding(.bottom, 7)
-                .padding(.horizontal, 12)
-                .frame(minWidth: 0, alignment: .leading)
-//                .foregroundColor(sent ? .white : .primary)
-                .textSelection(.enabled)
-
-            Text(meta)
-                .font(.caption)
-                .foregroundColor(.secondary)
-//                .foregroundColor(sent ? Color(uiColor: .secondarySystemBackground) : .secondary)
-                .padding(.bottom, 4)
-                .padding(.horizontal, 12)
-        }
-//        .background(sent ? .blue : Color(uiColor: .tertiarySystemGroupedBackground))
-        .background(
-            sent
-            ? (colorScheme == .light ? sentColorLigth : sentColorDark)
-            : Color(uiColor: .tertiarySystemGroupedBackground)
-        )
-        .cornerRadius(18)
-        .padding(.horizontal)
-        .frame(
-            maxWidth: maxWidth,
-            maxHeight: .infinity,
-            alignment: sent ? .trailing : .leading
-        )
-    }
-
-    private func messageText(_ chatItem: ChatItem) -> Text {
-        let s = chatItem.content.text
-        var res: Text
-        if s == "" {
-            res = Text("")
-        } else {
-            let parts = s.split(separator: " ")
-            res = wordToText(parts[0])
-            var i = 1
-            while i < parts.count {
-                res = res + Text(" ") + wordToText(parts[i])
-                i = i + 1
-            }
-        }
-        if case let .groupRcv(groupMember) = chatItem.chatDir {
-            let member = Text(groupMember.memberProfile.displayName).font(.headline)
-            return member + Text(": ") + res
-        } else {
-            return res
-        }
-    }
-
-    private func reserveSpaceForMeta(_ meta: String) -> Text {
-        Text(AttributedString("   \(meta)", attributes: AttributeContainer([
-            .font: UIFont.preferredFont(forTextStyle: .caption1) as Any,
-            .foregroundColor: UIColor.clear as Any,
-        ])))
-    }
-
-    private func wordToText(_ s: String.SubSequence) -> Text {
-        let str = String(s)
-        switch true {
-        case s.starts(with: "http://") || s.starts(with: "https://"):
-            return linkText(str, prefix: "")
-        case match(str, emailRegex):
-            return linkText(str, prefix: "mailto:")
-        case match(str, phoneRegex):
-            return linkText(str, prefix: "tel:")
-        default:
-            if (s.count > 1) {
-                switch true {
-                case s.first == "*" && s.last == "*": return mdText(s).bold()
-                case s.first == "_" && s.last == "_": return mdText(s).italic()
-                case s.first == "+" && s.last == "+": return mdText(s).underline()
-                case s.first == "~" && s.last == "~": return mdText(s).strikethrough()
-                default: return Text(s)
-                }
-            } else {
-                return Text(s)
-            }
-        }
-    }
-
-    private func match(_ s: String, _ regex: NSRegularExpression) -> Bool {
-        regex.firstMatch(in: s, options: [], range: NSRange(location: 0, length: s.count)) != nil
-    }
-
-    private func linkText(_ s: String, prefix: String) -> Text {
-        Text(AttributedString(s, attributes: AttributeContainer([
-            .link: NSURL(string: prefix + s) as Any,
-            .foregroundColor: linkColor as Any
-        ]))).underline()
-    }
-
-    private func mdText(_ s: String.SubSequence) -> Text {
-        Text(s[s.index(s.startIndex, offsetBy: 1)..<s.index(s.endIndex, offsetBy: -1)])
-    }
-}
-
-struct TextItemView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group{
-            TextItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), width: 360)
-            TextItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "chaT@simplex.chat"), width: 360)
-        }
-        .previewLayout(.fixed(width: 360, height: 70))
-    }
-}

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

@@ -1,45 +0,0 @@
-//
-//  ChatItemView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 30/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-private var dateFormatter: DateFormatter?
-
-struct ChatItemView: View {
-    var chatItem: ChatItem
-    var width: CGFloat
-
-    var body: some View {
-        if (isShortEmoji(chatItem.content.text)) {
-            EmojiItemView(chatItem: chatItem)
-        } else {
-            TextItemView(chatItem: chatItem, width: width)
-        }
-    }
-}
-
-func getDateFormatter() -> DateFormatter {
-    if let df = dateFormatter { return df }
-    let df = DateFormatter()
-    df.dateFormat = "HH:mm"
-    dateFormatter = df
-    return df
-}
-
-struct ChatItemView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group{
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), width: 360)
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), width: 360)
-        }
-        .previewLayout(.fixed(width: 360, height: 70))
-    }
-}

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

@@ -1,136 +0,0 @@
-//
-//  ChatView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 27/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-private let chatImageColorLight = Color(red: 0.9, green: 0.9, blue: 0.9)
-private let chatImageColorDark = Color(red: 0.2, green: 0.2, blue: 0.2                                                     )
-
-struct ChatView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
-    @State private var inProgress: Bool = false
-    @FocusState private var keyboardVisible: Bool
-    @State private var showChatInfo = false
-
-    var body: some View {
-        let cInfo = chat.chatInfo
-
-        return VStack {
-            GeometryReader { g in
-                ScrollViewReader { proxy in
-                    ScrollView {
-                        VStack(spacing: 5)  {
-                            ForEach(chatModel.chatItems, id: \.id) {
-                                ChatItemView(chatItem: $0, width: g.size.width)
-                                    .frame(minWidth: 0, maxWidth: .infinity, alignment: $0.chatDir.sent ? .trailing : .leading)
-                            }
-                            .onAppear { scrollToBottom(proxy) }
-                            .onChange(of: chatModel.chatItems.count) { _ in scrollToBottom(proxy) }
-                            .onChange(of: keyboardVisible) { _ in
-                                if keyboardVisible {
-                                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-                                        scrollToBottom(proxy, animation: .easeInOut(duration: 1))
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    .coordinateSpace(name: "scrollView")
-                    .onTapGesture {
-                        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
-                    }
-                }
-            }
-
-            Spacer(minLength: 0)
-
-            SendMessageView(
-                sendMessage: sendMessage,
-                inProgress: inProgress,
-                keyboardVisible: $keyboardVisible
-            )
-        }
-        .navigationTitle(cInfo.chatViewName)
-        .navigationBarTitleDisplayMode(.inline)
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                Button { chatModel.chatId = nil } label: {
-                    HStack(spacing: 4) {
-                        Image(systemName: "chevron.backward")
-                        Text("Chats")
-                    }
-                }
-            }
-            ToolbarItem(placement: .principal) {
-                Button {
-                    showChatInfo = true
-                } label: {
-                    HStack {
-                        ChatInfoImage(
-                            chat: chat,
-                            color: colorScheme == .dark
-                                    ? chatImageColorDark
-                                    : chatImageColorLight
-                        )
-                        .frame(width: 32, height: 32)
-                        .padding(.trailing, 4)
-                        VStack {
-                            Text(cInfo.displayName).font(.headline)
-                            if cInfo.fullName != "" && cInfo.displayName != cInfo.fullName {
-                                Text(cInfo.fullName).font(.subheadline)
-                            }
-                        }
-                    }
-                    .foregroundColor(.primary)
-                }
-                .sheet(isPresented: $showChatInfo) {
-                    ChatInfoView(chat: chat, showChatInfo: $showChatInfo)
-                }
-            }
-        }
-        .navigationBarBackButtonHidden(true)
-    }
-
-    func scrollToBottom(_ proxy: ScrollViewProxy, animation: Animation = .default) {
-        if let id = chatModel.chatItems.last?.id {
-            withAnimation(animation) {
-                proxy.scrollTo(id, anchor: .bottom)
-            }
-        }
-    }
-
-    func sendMessage(_ msg: String) {
-        do {
-            let chatItem = try apiSendMessage(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, msg: .text(msg))
-            chatModel.addChatItem(chat.chatInfo, chatItem)
-        } catch {
-            logger.error("ChatView.sendMessage apiSendMessage error: \(error.localizedDescription)")
-        }
-    }
-}
-
-struct ChatView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.chatId = "@1"
-        chatModel.chatItems = [
-            ChatItem.getSample(1, .directSnd, .now, "hello"),
-            ChatItem.getSample(2, .directRcv, .now, "hi"),
-            ChatItem.getSample(3, .directRcv, .now, "hi there"),
-            ChatItem.getSample(4, .directRcv, .now, "hello again"),
-            ChatItem.getSample(5, .directSnd, .now, "hi there!!!"),
-            ChatItem.getSample(6, .directSnd, .now, "how are you?"),
-            ChatItem.getSample(7, .directSnd, .now, "👍👍👍👍"),
-            ChatItem.getSample(8, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 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.")
-        ]
-        return ChatView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
-            .environmentObject(chatModel)
-    }
-}

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

@@ -1,30 +0,0 @@
-//
-//  Emoji.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 04/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-
-private func isSimpleEmoji(_ c: Character) -> Bool {
-    guard let firstScalar = c.unicodeScalars.first else { return false }
-    return firstScalar.properties.isEmoji && firstScalar.value > 0x238C
-}
-
-private func isCombinedIntoEmoji(_ c: Character) -> Bool {
-    c.unicodeScalars.count > 1 && c.unicodeScalars.first?.properties.isEmoji ?? false
-}
-
-func isEmoji(_ c: Character) -> Bool {
-    isSimpleEmoji(c) || isCombinedIntoEmoji(c)
-}
-
-func isShortEmoji(_ str: String) -> Bool {
-    let s = str.trimmingCharacters(in: .whitespaces)
-    return s.count > 0 && s.count <= 4 && s.allSatisfy(isEmoji)
-}
-
-let emojiFont = Font.custom("Emoji", size: 48, relativeTo: .largeTitle)

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

@@ -1,95 +0,0 @@
-//
-//  SendMessageView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct SendMessageView: View {
-    var sendMessage: (String) -> Void
-    var inProgress: Bool = false
-    @State private var message: String = "" //Lorem ipsum dolor sit amet, consectetur" // adipiscing elit, sed do eiusmod tempor incididunt ut labor7 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."
-    @Namespace var namespace
-    @FocusState.Binding var keyboardVisible: Bool
-    @State private var teHeight: CGFloat = 42
-    @State private var teFont: Font = .body
-    var maxHeight: CGFloat = 360
-    var minHeight: CGFloat = 37
-
-    var body: some View {
-        ZStack {
-            HStack(alignment: .bottom) {
-                ZStack(alignment: .leading) {
-                    Text(message)
-                        .font(teFont)
-                        .foregroundColor(.clear)
-                        .padding(.horizontal, 10)
-                        .padding(.vertical, 8)
-                        .matchedGeometryEffect(id: "te", in: namespace)
-                        .background(GeometryReader(content: updateHeight))
-                    TextEditor(text: $message)
-                        .onSubmit(submit)
-                        .focused($keyboardVisible)
-                        .font(teFont)
-                        .textInputAutocapitalization(.sentences)
-                        .padding(.horizontal, 5)
-                        .allowsTightening(false)
-                        .frame(height: teHeight)
-                }
-
-                if (inProgress) {
-                    ProgressView()
-                        .scaleEffect(1.4)
-                        .frame(width: 31, height: 31, alignment: .center)
-                        .padding([.bottom, .trailing], 3)
-                } else {
-                    Button(action: submit) {
-                        Image(systemName: "arrow.up.circle.fill")
-                            .resizable()
-                            .foregroundColor(.accentColor)
-                    }
-                    .disabled(message.isEmpty)
-                    .frame(width: 29, height: 29)
-                    .padding([.bottom, .trailing], 4)
-                }
-            }
-
-            RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
-                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                .frame(height: teHeight)
-        }
-        .padding(.horizontal, 12)
-        .padding(.vertical, 8)
-    }
-
-    func submit() {
-        sendMessage(message)
-        message = ""
-    }
-
-    func updateHeight(_ g: GeometryProxy) -> Color {
-        DispatchQueue.main.async {
-            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
-            teFont = isShortEmoji(message) ? emojiFont : .body
-        }
-        return Color.clear
-    }
-}
-
-struct SendMessageView_Previews: PreviewProvider {
-    static var previews: some View {
-        @FocusState var keyboardVisible: Bool
-
-        return VStack {
-            Text("")
-            Spacer(minLength: 0)
-            SendMessageView(
-                sendMessage: { print ($0) },
-                keyboardVisible: $keyboardVisible
-            )
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-//
-//  ChatHelp.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 10/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatHelp: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var showSettings: Bool
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 10) {
-            Text("Thank you for installing SimpleX Chat!")
-
-            HStack(spacing: 4) {
-                Text("You can")
-                Button("connect to SimpleX team.") {
-                    showSettings = false
-                    DispatchQueue.main.async {
-                        UIApplication.shared.open(simplexTeamURL)
-                    }
-                }
-            }
-
-            VStack(alignment: .leading, spacing: 10) {
-                Text("To start a new chat")
-                    .font(.title2)
-                    .fontWeight(.bold)
-
-                HStack(spacing: 8) {
-                    Text("Tap button ")
-                    NewChatButton()
-                    Text("above, then:")
-                }
-
-                Text("**Add new contact**: to create your one-time QR Code for your contact.")
-                Text("**Scan QR code**: to connect to your contact who shows QR code to you.")
-            }
-            .padding(.top, 24)
-
-            VStack(alignment: .leading, spacing: 10) {
-                Text("To connect via link")
-                    .font(.title2)
-                    .fontWeight(.bold)
-
-                Text("If you received SimpleX Chat invitation link you can open it in your browser:")
-
-                Text("💻 desktop: scan displayed QR code from the app, via **Scan QR code**.")
-                Text("📱 mobile: tap **Open in mobile app**, then tap **Connect** in the app.")
-            }
-            .padding(.top, 24)
-        }
-        .padding()
-    }
-}
-
-struct ChatHelp_Previews: PreviewProvider {
-    static var previews: some View {
-        @State var showSettings = false
-        return ChatHelp(showSettings: $showSettings)
-    }
-}

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

@@ -1,173 +0,0 @@
-//
-//  ChatListNavLink.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 01/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatListNavLink: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State var chat: Chat
-
-    @State private var showDeleteContactAlert = false
-    @State private var showDeleteGroupAlert = false
-    @State private var showContactRequestAlert = false
-    @State private var showContactRequestDialog = false
-    @State private var alertContact: Contact?
-    @State private var alertGroupInfo: GroupInfo?
-    @State private var alertContactRequest: UserContactRequest?
-
-    var body: some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            contactNavLink(contact)
-        case let .group(groupInfo):
-            groupNavLink(groupInfo)
-        case let .contactRequest(cReq):
-            contactRequestNavLink(cReq)
-        }
-    }
-
-    private func chatView() -> some View {
-        ChatView(chat: chat)
-        .onAppear {
-            do {
-                let cInfo = chat.chatInfo
-                let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId)
-                chatModel.updateChatInfo(chat.chatInfo)
-                chatModel.chatItems = chat.chatItems
-            } catch {
-                logger.error("ChatListNavLink.chatView apiGetChatItems error: \(error.localizedDescription)")
-            }
-        }
-    }
-
-    private func contactNavLink(_ contact: Contact) -> some View {
-        NavigationLink(
-            tag: chat.chatInfo.id,
-            selection: $chatModel.chatId,
-            destination: { chatView() },
-            label: { ChatPreviewView(chat: chat) }
-        )
-        .disabled(!contact.ready)
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button(role: .destructive) {
-                alertContact = contact
-                showDeleteContactAlert = true
-            } label: {
-                Label("Delete", systemImage: "trash")
-            }
-        }
-        .alert(isPresented: $showDeleteContactAlert) {
-            deleteContactAlert(alertContact!)
-        }
-        .frame(height: 80)
-    }
-
-    private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
-        NavigationLink(
-            tag: chat.chatInfo.id,
-            selection: $chatModel.chatId,
-            destination: { chatView() },
-            label: { ChatPreviewView(chat: chat) }
-        )
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button(role: .destructive) {
-                alertGroupInfo = groupInfo
-                showDeleteGroupAlert = true
-            } label: {
-                Label("Delete", systemImage: "trash")
-            }
-        }
-        .alert(isPresented: $showDeleteGroupAlert) {
-            deleteGroupAlert(alertGroupInfo!)
-        }
-        .frame(height: 80)
-    }
-
-    private func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
-        ContactRequestView(contactRequest: contactRequest)
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button { acceptContactRequest(contactRequest) }
-                label: { Label("Accept", systemImage: "checkmark") }
-                .tint(.blue)
-            Button(role: .destructive) {
-                alertContactRequest = contactRequest
-                showContactRequestAlert = true
-            } label: {
-                Label("Reject", systemImage: "multiply")
-            }
-        }
-        .alert(isPresented: $showContactRequestAlert) {
-            contactRequestAlert(alertContactRequest!)
-        }
-        .frame(height: 80)
-        .onTapGesture { showContactRequestDialog = true }
-        .confirmationDialog("Connection request", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
-            Button("Accept contact") { acceptContactRequest(contactRequest) }
-            Button("Reject contact (sender NOT notified)") { rejectContactRequest(contactRequest) }
-        }
-    }
-
-    private func deleteContactAlert(_ contact: Contact) -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted"),
-            primaryButton: .destructive(Text("Delete")) {
-                do {
-                    try apiDeleteChat(type: .direct, id: contact.apiId)
-                    chatModel.removeChat(contact.id)
-                } catch let error {
-                    logger.error("ChatListNavLink.deleteContactAlert apiDeleteChat error: \(error.localizedDescription)")
-                }
-                alertContact = nil
-            }, secondaryButton: .cancel() {
-                alertContact = nil
-            }
-        )
-    }
-
-    private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
-        Alert(
-            title: Text("Delete group"),
-            message: Text("Group deletion is not supported")
-        )
-    }
-
-    private func contactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
-        Alert(
-            title: Text("Reject contact request"),
-            message: Text("The sender will NOT be notified"),
-            primaryButton: .destructive(Text("Reject")) {
-                rejectContactRequest(contactRequest)
-                alertContactRequest = nil
-            }, secondaryButton: .cancel {
-                alertContactRequest = nil
-            }
-        )
-    }
-}
-
-struct ChatListNavLink_Previews: PreviewProvider {
-    static var previews: some View {
-        @State var chatId: String? = "@1"
-        return Group {
-            ChatListNavLink(chat: Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ))
-            ChatListNavLink(chat: Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ))
-            ChatListNavLink(chat: Chat(
-                chatInfo: ChatInfo.sampleData.contactRequest,
-                chatItems: []
-            ))
-        }
-        .previewLayout(.fixed(width: 360, height: 80))
-    }
-}

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

@@ -1,119 +0,0 @@
-//
-//  ChatListView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 27/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatListView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var connectAlert = false
-    @State private var connectError: Error?
-    // not really used in this view
-    @State private var showSettings = false
-
-    var user: User
-
-    var body: some View {
-        NavigationView {
-            List {
-                if chatModel.chats.isEmpty {
-                    VStack(alignment: .leading) {
-                        ChatHelp(showSettings: $showSettings)
-                        HStack {
-                            Text("This text is available in settings")
-                            SettingsButton()
-                        }
-                        .padding(.leading)
-                    }
-                }
-                ForEach(chatModel.chats) { chat in
-                    ChatListNavLink(chat: chat)
-                }
-            }
-            .offset(x: -8)
-            .listStyle(.plain)
-            .navigationTitle(chatModel.chats.isEmpty ? "Welcome \(user.displayName)!" : "Your chats")
-            .toolbar {
-                ToolbarItem(placement: .navigationBarLeading) {
-                    SettingsButton()
-                }
-                ToolbarItem(placement: .navigationBarTrailing) {
-                    NewChatButton()
-                }
-            }
-            .alert(isPresented: $chatModel.connectViaUrl) { connectViaUrlAlert() }
-        }
-        .navigationViewStyle(.stack)
-        .alert(isPresented: $connectAlert) { connectionErrorAlert() }
-    }
-
-    private func connectViaUrlAlert() -> Alert {
-        logger.debug("ChatListView.connectViaUrlAlert")
-        if let url = chatModel.appOpenUrl {
-            var path = url.path
-            logger.debug("ChatListView.connectViaUrlAlert path: \(path)")
-            if (path == "/contact" || path == "/invitation") {
-                path.removeFirst()
-                let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                return Alert(
-                    title: Text("Connect via \(path) link?"),
-                    message: Text("Your profile will be sent to the contact that you received this link from: \(link)"),
-                    primaryButton: .default(Text("Connect")) {
-                        do {
-                            try apiConnect(connReq: link)
-                        } catch {
-                            connectAlert = true
-                            connectError = error
-                            logger.debug("ChatListView.connectViaUrlAlert: apiConnect error: \(error.localizedDescription)")
-                        }
-                        chatModel.appOpenUrl = nil
-                    }, secondaryButton: .cancel() {
-                        chatModel.appOpenUrl = nil
-                    }
-                )
-            } else {
-                return Alert(title: Text("Error: URL is invalid"))
-            }
-        } else {
-            return Alert(title: Text("Error: URL not available"))
-        }
-    }
-
-    private func connectionErrorAlert() -> Alert {
-        Alert(
-            title: Text("Connection error"),
-            message: Text(connectError?.localizedDescription ?? "")
-        )
-    }
-}
-
-struct ChatListView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.chats = [
-            Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ),
-            Chat(
-                chatInfo: ChatInfo.sampleData.group,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 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.")]
-            ),
-            Chat(
-                chatInfo: ChatInfo.sampleData.contactRequest,
-                chatItems: []
-            )
-
-        ]
-        return Group {
-            ChatListView(user: User.sampleData)
-                .environmentObject(chatModel)
-            ChatListView(user: User.sampleData)
-                .environmentObject(ChatModel())
-        }
-    }
-}

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

@@ -1,91 +0,0 @@
-//
-//  ChatNavLabel.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 28/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatPreviewView: View {
-    @ObservedObject var chat: Chat
-    @Environment(\.colorScheme) var colorScheme
-    var darkGreen = Color(red: 0, green: 0.5, blue: 0)
-
-    var body: some View {
-        let cItem = chat.chatItems.last
-        return HStack(spacing: 8) {
-            ZStack(alignment: .bottomLeading) {
-                ChatInfoImage(chat: chat)
-                    .frame(width: 63, height: 63)
-                if case .direct = chat.chatInfo,
-                   chat.serverInfo.networkStatus == .connected {
-                    Image(systemName: "circle.fill")
-                        .resizable()
-                        .foregroundColor(colorScheme == .dark ? darkGreen : .green)
-                        .frame(width: 5, height: 5)
-                        .padding([.bottom, .leading], 1)
-                }
-            }
-            .padding(.leading, 4)
-
-            VStack(spacing: 0) {
-                HStack(alignment: .top) {
-                    Text(chat.chatInfo.chatViewName)
-                        .font(.title3)
-                        .fontWeight(.bold)
-                        .frame(maxHeight: .infinity, alignment: .topLeading)
-                    Spacer()
-                    Text(getDateFormatter().string(from: cItem?.meta.itemTs ?? chat.chatInfo.createdAt))
-                        .font(.subheadline)
-                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(.secondary)
-                }
-                .padding(.top, 4)
-                .padding(.horizontal, 8)
-
-                if let cItem = cItem {
-                    Text(chatItemText(cItem))
-                        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44, alignment: .topLeading)
-                        .padding([.leading, .trailing], 8)
-                        .padding(.bottom, 4)
-                }
-                else if case let .direct(contact) = chat.chatInfo, !contact.ready {
-                    Text("Connecting...")
-                        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44, alignment: .topLeading)
-                        .padding([.leading, .trailing], 8)
-                        .padding(.bottom, 4)
-                }
-            }
-        }
-    }
-
-    private func chatItemText(_ cItem: ChatItem) -> String {
-        let t = cItem.content.text
-        if case let .groupRcv(groupMember) = cItem.chatDir {
-            return groupMember.memberProfile.displayName + ": " +  t
-        }
-        return t
-    }
-}
-
-struct ChatPreviewView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group {
-            ChatPreviewView(chat: Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: []
-            ))
-            ChatPreviewView(chat: Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ))
-            ChatPreviewView(chat: Chat(
-                chatInfo: ChatInfo.sampleData.group,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 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.")]
-            ))
-        }
-        .previewLayout(.fixed(width: 360, height: 78))
-    }
-}

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

@@ -1,53 +0,0 @@
-//
-//  ContactRequestView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 02/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ContactRequestView: View {
-    var contactRequest: UserContactRequest
-
-    var body: some View {
-        return HStack(spacing: 8) {
-            Image(systemName: "person.crop.circle.fill")
-                .resizable()
-                .foregroundColor(Color(uiColor: .secondarySystemBackground))
-                .frame(width: 63, height: 63)
-                .padding(.leading, 4)
-            VStack(alignment: .leading, spacing: 4) {
-                HStack(alignment: .top) {
-                    Text(ChatInfo.contactRequest(contactRequest: contactRequest).chatViewName)
-                        .font(.title3)
-                        .fontWeight(.bold)
-                        .foregroundColor(.blue)
-                        .padding(.leading, 8)
-                        .padding(.top, 4)
-                        .frame(maxHeight: .infinity, alignment: .topLeading)
-                    Spacer()
-                    Text(getDateFormatter().string(from: contactRequest.createdAt))
-                        .font(.subheadline)
-                        .padding(.trailing, 28)
-                        .padding(.top, 4)
-                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(.secondary)
-                }
-                Text("wants to connect to you!")
-                    .frame(minHeight: 44, maxHeight: 44, alignment: .topLeading)
-                    .padding([.leading, .trailing], 8)
-                    .padding(.bottom, 4)
-                    .padding(.top, 1)
-            }
-        }
-    }
-}
-
-struct ContactRequestView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContactRequestView(contactRequest: UserContactRequest.sampleData)
-            .previewLayout(.fixed(width: 360, height: 80))
-    }
-}

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

@@ -1,37 +0,0 @@
-//
-//  ChatInfoImage.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 05/02/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ChatInfoImage: View {
-    @ObservedObject var chat: Chat
-    var color = Color(uiColor: .tertiarySystemGroupedBackground)
-
-    var body: some View {
-        var iconName: String
-        switch chat.chatInfo {
-        case .direct: iconName = "person.crop.circle.fill"
-        case .group: iconName = "person.2.circle.fill"
-        default: iconName = "circle.fill"
-        }
-
-        return Image(systemName: iconName)
-            .resizable()
-            .foregroundColor(color)
-    }
-}
-
-struct ChatInfoImage_Previews: PreviewProvider {
-    static var previews: some View {
-        ChatInfoImage(
-            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/NewChat/AddContactView.swift

@@ -1,43 +0,0 @@
-//
-//  AddContactView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import CoreImage.CIFilterBuiltins
-
-struct AddContactView: View {
-    var connReqInvitation: String
-    @State private var shareInvitation = false
-
-    var body: some View {
-        VStack {
-            Text("Add contact")
-                .font(.title)
-                .padding(.bottom)
-            Text("Show QR code to your contact\nto scan from the app")
-                .font(.title2)
-                .multilineTextAlignment(.center)
-            QRCode(uri: connReqInvitation)
-                .padding()
-            Text("If you can't show QR code, you can share the invitation link via any channel")
-                .font(.subheadline)
-                .multilineTextAlignment(.center)
-                .padding(.horizontal)
-            Button { shareInvitation = true } label: {
-                Label("Share", systemImage: "square.and.arrow.up")
-            }
-            .padding()
-            .shareSheet(isPresented: $shareInvitation, items: [connReqInvitation])
-        }
-    }
-}
-
-struct AddContactView_Previews: PreviewProvider {
-    static var previews: some View {
-        AddContactView(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/ConnectContactView.swift

@@ -1,54 +0,0 @@
-//
-//  ConnectContactView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import CodeScanner
-
-struct ConnectContactView: View {
-    var completed: ((Error?) -> Void)
-
-    var body: some View {
-        VStack {
-            Text("Scan QR code")
-                .font(.title)
-                .padding(.bottom)
-            Text("Your chat profile will be sent to your contact.")
-                .font(.title2)
-                .multilineTextAlignment(.center)
-                .padding()
-            ZStack {
-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .border(.gray)
-            }
-            .padding(13.0)
-        }
-    }
-
-    func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            do {
-                try apiConnect(connReq: r.string)
-                completed(nil)
-            } catch {
-                logger.error("ConnectContactView.processQRCode apiConnect error: \(error.localizedDescription)")
-                completed(error)
-            }
-        case let .failure(e):
-            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
-            completed(e)
-        }
-    }
-}
-
-struct ConnectContactView_Previews: PreviewProvider {
-    static var previews: some View {
-        return ConnectContactView(completed: {_ in })
-    }
-}

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

@@ -1,21 +0,0 @@
-//
-//  CreateGroupView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct CreateGroupView: View {
-    var body: some View {
-        Text("CreateGroupView")
-    }
-}
-
-struct CreateGroupView_Previews: PreviewProvider {
-    static var previews: some View {
-        CreateGroupView()
-    }
-}

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

@@ -1,80 +0,0 @@
-//
-//  NewChatButton.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct NewChatButton: View {
-    @State private var showAddChat = false
-    @State private var addContact = false
-    @State private var addContactAlert = false
-    @State private var addContactError: Error?
-    @State private var connReqInvitation: String = ""
-    @State private var connectContact = false
-    @State private var connectAlert = false
-    @State private var connectError: Error?
-    @State private var createGroup = false
-
-    var body: some View {
-        Button { showAddChat = true } label: {
-            Image(systemName: "person.crop.circle.badge.plus")
-        }
-        .confirmationDialog("Start new chat", isPresented: $showAddChat, titleVisibility: .visible) {
-            Button("Add contact") { addContactAction() }
-            Button("Scan QR code") { connectContact = true }
-            Button("Create group") { createGroup = true }
-                .disabled(true)
-        }
-        .sheet(isPresented: $addContact, content: {
-            AddContactView(connReqInvitation: connReqInvitation)
-        })
-        .alert(isPresented: $addContactAlert) {
-            connectionError(addContactError)
-        }
-        .sheet(isPresented: $connectContact, content: {
-            connectContactSheet()
-        })
-        .alert(isPresented: $connectAlert) {
-            connectionError(connectError)
-        }
-        .sheet(isPresented: $createGroup, content: { CreateGroupView() })
-    }
-
-    func addContactAction() {
-        do {
-            connReqInvitation = try apiAddContact()
-            addContact = true
-        } catch {
-            addContactAlert = true
-            addContactError = error
-            logger.error("NewChatButton.addContactAction apiAddContact error: \(error.localizedDescription)")
-        }
-    }
-
-    func connectContactSheet() -> some View {
-        ConnectContactView(completed: { err in
-            connectContact = false
-            if err != nil {
-                connectAlert = true
-                connectError = err
-            }
-        })
-    }
-
-    func connectionError(_ error: Error?) -> Alert {
-        Alert(
-            title: Text("Connection error"),
-            message: Text(error?.localizedDescription ?? "")
-        )
-    }
-}
-
-struct NewChatButton_Previews: PreviewProvider {
-    static var previews: some View {
-        NewChatButton()
-    }
-}

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

@@ -1,51 +0,0 @@
-//
-//  QRCode.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 30/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import CoreImage.CIFilterBuiltins
-
-struct QRCode: View {
-    let uri: String
-    @State private var image: UIImage?
-
-    var body: some View {
-        ZStack {
-            if let image = image {
-                Image(uiImage: image)
-                    .resizable()
-                    .interpolation(.none)
-                    .aspectRatio(1, contentMode: .fit)
-                    .textSelection(.enabled)
-            }
-        }
-        .onAppear {
-            generateImage()
-        }
-    }
-
-    private func generateImage() {
-        guard image == nil else { return }
-
-        let context = CIContext()
-        let filter = CIFilter.qrCodeGenerator()
-        filter.message = Data(uri.utf8)
-
-        guard
-            let outputImage = filter.outputImage,
-            let cgImage = context.createCGImage(outputImage, from: outputImage.extent)
-        else { return }
-
-        self.image = UIImage(cgImage: cgImage)
-    }
-}
-
-struct QRCode_Previews: PreviewProvider {
-    static var previews: some View {
-        QRCode(uri: "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/ShareSheet.swift

@@ -1,40 +0,0 @@
-//
-//  ShareSheet.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 30/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-extension UIApplication {
-    static let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first
-    static let keyWindowScene = shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
-}
-
-extension View {
-    func shareSheet(isPresented: Binding<Bool>, items: [Any]) -> some View {
-        guard isPresented.wrappedValue else { return self }
-        let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
-        let presentedViewController = UIApplication.keyWindow?.rootViewController?.presentedViewController ?? UIApplication.keyWindow?.rootViewController
-        activityViewController.completionWithItemsHandler = { _, _, _, _ in isPresented.wrappedValue = false }
-        presentedViewController?.present(activityViewController, animated: true)
-        return self
-    }
-}
-
-struct ShareSheetTest: View {
-    @State private var isPresentingShareSheet = false
-
-    var body: some View {
-        Button("Show Share Sheet") { isPresentingShareSheet = true }
-            .shareSheet(isPresented: $isPresentingShareSheet, items: ["Share me!"])
-    }
-}
-
-struct ShareSheetTest_Previews: PreviewProvider {
-    static var previews: some View {
-        ShareSheetTest()
-    }
-}

apps/ios/Shared/Views/TerminalView.swift

@@ -1,97 +0,0 @@
-//
-//  TerminalView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 27/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct TerminalView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State var inProgress: Bool = false
-    @FocusState private var keyboardVisible: Bool
-
-    var body: some View {
-        VStack {
-            ScrollViewReader { proxy in
-                ScrollView {
-                    LazyVStack {
-                        ForEach(chatModel.terminalItems) { item in
-                            NavigationLink {
-                                ScrollView {
-                                    Text(item.details)
-                                        .textSelection(.enabled)
-                                        .padding()
-                                }
-                            } label: {
-                                HStack {
-                                    Text(item.id.formatted(date: .omitted, time: .standard))
-                                    Text(item.label)
-                                        .frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
-                                }
-                                .padding(.horizontal)
-                            }
-                        }
-                        .onAppear { scrollToBottom(proxy) }
-                        .onChange(of: chatModel.terminalItems.count) { _ in scrollToBottom(proxy) }
-                        .onChange(of: keyboardVisible) { _ in
-                            if keyboardVisible {
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-                                    scrollToBottom(proxy, animation: .easeInOut(duration: 1))
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Spacer()
-
-                SendMessageView(
-                    sendMessage: sendMessage,
-                    inProgress: inProgress,
-                    keyboardVisible: $keyboardVisible
-                )
-            }
-        }
-        .navigationViewStyle(.stack)
-        .navigationTitle("Chat console")
-    }
-
-    func scrollToBottom(_ proxy: ScrollViewProxy, animation: Animation = .default) {
-        if let id = chatModel.terminalItems.last?.id {
-            withAnimation(animation) {
-                proxy.scrollTo(id, anchor: .bottom)
-            }
-        }
-    }
-    
-    func sendMessage(_ cmdStr: String) {
-        let cmd = ChatCommand.string(cmdStr)
-        DispatchQueue.global().async {
-            inProgress = true
-            do {
-                let _ = try chatSendCmd(cmd)
-            } catch {
-                logger.error("TerminalView.sendMessage chatSendCmd error: \(error.localizedDescription)")
-            }
-            inProgress = false
-        }
-    }
-}
-
-struct TerminalView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.terminalItems = [
-            .resp(.now, ChatResponse.response(type: "contactSubscribed", json: "{}")),
-            .resp(.now, ChatResponse.response(type: "newChatItem", json: "{}"))
-        ]
-        return NavigationView {
-            TerminalView()
-                .environmentObject(chatModel)
-        }
-
-    }
-}

apps/ios/Shared/Views/UserSettings/SettingsButton.swift

@@ -1,36 +0,0 @@
-//
-//  SettingsButton.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct SettingsButton: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var showSettings = false
-
-    var body: some View {
-        Button { showSettings = true } label: {
-            Image(systemName: "gearshape")
-        }
-        .sheet(isPresented: $showSettings, content: {
-            SettingsView(showSettings: $showSettings)
-                .onAppear {
-                    do {
-                        chatModel.userAddress = try apiGetUserAddress()
-                    } catch {
-                        logger.error("SettingsButton apiGetUserAddress error: \(error.localizedDescription)")
-                    }
-                }
-        })
-    }
-}
-
-struct SettingsButton_Previews: PreviewProvider {
-    static var previews: some View {
-        SettingsButton()
-    }
-}

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -1,124 +0,0 @@
-//
-//  SettingsView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-let simplexTeamURL = URL(string: "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")!
-
-struct SettingsView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var showSettings: Bool
-
-    var body: some View {
-        let user: User = chatModel.currentUser!
-
-        return NavigationView {
-            List {
-                Section("You") {
-                    NavigationLink {
-                        UserProfile()
-                            .navigationTitle("Your chat profile")
-                    } label: {
-                        HStack {
-                            Image(systemName: "person.crop.circle")
-                                .padding(.trailing, 8)
-                            VStack(alignment: .leading) {
-                                Text(user.profile.displayName)
-                                    .fontWeight(.bold)
-                                    .font(.title2)
-                                Text(user.profile.fullName)
-                            }
-                        }
-                    }
-                    NavigationLink {
-                        UserAddress()
-                            .navigationTitle("Your chat address")
-                    } label: {
-                        HStack {
-                            Image(systemName: "qrcode")
-                                .padding(.trailing, 8)
-                            Text("Your SimpleX contact address")
-                        }
-                    }
-                }
-
-                Section("Help") {
-                    NavigationLink {
-                        VStack(alignment: .leading, spacing: 10) {
-                            Text("Welcome \(user.displayName)!")
-                                .font(.largeTitle)
-                                .padding(.leading)
-                            Divider()
-                            ChatHelp(showSettings: $showSettings)
-                        }
-                        .frame(maxHeight: .infinity, alignment: .top)
-                    } label: {
-                        HStack {
-                            Image(systemName: "questionmark.circle")
-                                .padding(.trailing, 8)
-                            Text("How to use SimpleX Chat")
-                        }
-                    }
-                    HStack {
-                        Image(systemName: "number")
-                            .padding(.trailing, 8)
-                        Button {
-                            showSettings = false
-                            DispatchQueue.main.async {
-                                UIApplication.shared.open(simplexTeamURL)
-                            }
-                        } label: {
-                            Text("Get help & advice via chat")
-                        }
-                    }
-                    HStack {
-                        Image(systemName: "envelope")
-                            .padding(.trailing, 4)
-                        Text("[Ask questions via email](mailto:chat@simplex.chat)")
-                    }
-                }
-
-                Section("Develop") {
-                    NavigationLink {
-                        TerminalView()
-                    } label: {
-                        HStack {
-                            Image(systemName: "terminal")
-                                .frame(maxWidth: 24)
-                                .padding(.trailing, 8)
-                            Text("Chat console")
-                        }
-                    }
-                    HStack {
-                        Image("github")
-                            .resizable()
-                            .frame(width: 24, height: 24)
-                            .padding(.trailing, 8)
-                        Text("Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)")
-                    }
-                }
-
-//                Section("Your SimpleX servers") {
-//
-//                }
-            }
-            .navigationTitle("Your settings")
-        }
-    }
-}
-
-struct SettingsView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.currentUser = User.sampleData
-        @State var showSettings = false
-
-        return SettingsView(showSettings: $showSettings)
-            .environmentObject(chatModel)
-    }
-}

apps/ios/Shared/Views/UserSettings/UserAddress.swift

@@ -1,73 +0,0 @@
-//
-//  UserAddress.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct UserAddress: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var shareAddressLink = false
-    @State private var deleteAddressAlert = false
-
-    var body: some View {
-        VStack (alignment: .leading) {
-            Text("You can share your address as a link or as a QR code - anybody will be able to connect to you, and if you later delete it - you won't lose your contacts.")
-                .padding(.bottom)
-            if let userAdress = chatModel.userAddress {
-                QRCode(uri: userAdress)
-                HStack {
-                    Button { shareAddressLink = true } label: {
-                        Label("Share link", systemImage: "square.and.arrow.up")
-                    }
-                    .padding()
-                    .shareSheet(isPresented: $shareAddressLink, items: [userAdress])
-
-                    Button { deleteAddressAlert = true } label: {
-                        Label("Delete address", systemImage: "trash")
-                    }
-                    .padding()
-                    .alert(isPresented: $deleteAddressAlert) {
-                        Alert(
-                            title: Text("Delete address?"),
-                            message: Text("All your contacts will remain connected"),
-                            primaryButton: .destructive(Text("Delete")) {
-                                do {
-                                    try apiDeleteUserAddress()
-                                    chatModel.userAddress = nil
-                                } catch let error {
-                                    logger.error("UserAddress apiDeleteUserAddress: \(error.localizedDescription)")
-                                }
-                            }, secondaryButton: .cancel()
-                        )
-                    }
-                    .shareSheet(isPresented: $shareAddressLink, items: [userAdress])
-                }
-                .frame(maxWidth: .infinity)
-            } else {
-                Button {
-                    do {
-                        chatModel.userAddress = try apiCreateUserAddress()
-                    } catch let error {
-                        logger.error("UserAddress apiCreateUserAddress: \(error.localizedDescription)")
-                    }
-                } label: { Label("Create address", systemImage: "qrcode") }
-                .frame(maxWidth: .infinity)
-            }
-        }
-        .padding()
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-}
-
-struct UserAddress_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.userAddress = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-        return UserAddress()
-            .environmentObject(chatModel)
-    }
-}

apps/ios/Shared/Views/UserSettings/UserProfile.swift

@@ -1,84 +0,0 @@
-//
-//  UserProfile.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct UserProfile: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var profile = Profile(displayName: "", fullName: "")
-    @State private var editProfile: Bool = false
-
-    var body: some View {
-        let user: User = chatModel.currentUser!
-
-        return VStack(alignment: .leading) {
-            Text("Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile.")
-                .padding(.bottom)
-            if editProfile {
-                VStack(alignment: .leading) {
-                    TextField("Display name", text: $profile.displayName)
-                        .textInputAutocapitalization(.never)
-                        .disableAutocorrection(true)
-                        .padding(.bottom)
-                    TextField("Full name (optional)", text: $profile.fullName)
-                        .textInputAutocapitalization(.never)
-                        .disableAutocorrection(true)
-                        .padding(.bottom)
-                    HStack(spacing: 20) {
-                        Button("Cancel") { editProfile = false }
-                        Button("Save (and notify contacts)") { saveProfile() }
-                    }
-                }
-                .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
-            } else {
-                VStack(alignment: .leading) {
-                    HStack {
-                        Text("Display name:")
-                        Text(user.profile.displayName)
-                            .fontWeight(.bold)
-                    }
-                    .padding(.bottom)
-                    HStack {
-                        Text("Full name:")
-                        Text(user.profile.fullName)
-                            .fontWeight(.bold)
-                    }
-                    .padding(.bottom)
-                    Button("Edit") {
-                        profile = user.profile
-                        editProfile = true
-                    }
-                }
-                .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
-            }
-        }
-        .padding()
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    func saveProfile() {
-        do {
-            if let newProfile = try apiUpdateProfile(profile: profile) {
-                chatModel.currentUser?.profile = newProfile
-                profile = newProfile
-            }
-        } catch {
-            logger.error("UserProfile apiUpdateProfile error: \(error.localizedDescription)")
-        }
-        editProfile = false
-    }
-}
-
-struct UserProfile_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.currentUser = User.sampleData
-        return UserProfile()
-            .environmentObject(chatModel)
-    }
-}

apps/ios/Shared/Views/WelcomeView.swift

@@ -1,65 +0,0 @@
-//
-//  WelcomeView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 18/01/2022.
-//
-
-import SwiftUI
-
-struct WelcomeView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @State var displayName: String = ""
-    @State var fullName: String = ""
-
-    var body: some View {
-        GeometryReader { g in
-            VStack(alignment: .leading) {
-                Image("logo")
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-                    .frame(width: g.size.width * 0.7)
-                    .padding(.vertical)
-                Text("You control your chat!")
-                    .font(.title)
-                    .padding(.bottom)
-                Text("The messaging and application platform protecting your privacy and security.")
-                    .padding(.bottom, 8)
-                Text("We don't store any of your contacts or messages (once delivered) on the servers.")
-                    .padding(.bottom, 24)
-                Text("Create profile")
-                    .font(.largeTitle)
-                    .padding(.bottom)
-                Text("Your profile is stored on your device and shared only with your contacts.")
-                    .padding(.bottom)
-                TextField("Display name", text: $displayName)
-                    .textInputAutocapitalization(.never)
-                    .disableAutocorrection(true)
-                    .padding(.bottom)
-                TextField("Full name (optional)", text: $fullName)
-                    .textInputAutocapitalization(.never)
-                    .disableAutocorrection(true)
-                    .padding(.bottom)
-                Button("Create") {
-                    let profile = Profile(
-                        displayName: displayName,
-                        fullName: fullName
-                    )
-                    do {
-                        let user = try apiCreateActiveUser(profile)
-                        chatModel.currentUser = user
-                    } catch {
-                        fatalError("Failed to create user: \(error)")
-                    }
-                }
-            }
-        }
-        .padding()
-    }
-}
-
-struct WelcomeView_Previews: PreviewProvider {
-    static var previews: some View {
-        WelcomeView()
-    }
-}

apps/ios/Shared/dummy.m

@@ -1,8 +0,0 @@
-//
-//  dummy.m
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 22/01/2022.
-//
-
-#import <Foundation/Foundation.h>

apps/ios/SimpleX (iOS).entitlements

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:simplex.chat</string>
-		<string>applinks:www.simplex.chat</string>
-		<string>applinks:simplex.chat?mode=developer</string>
-	</array>
-</dict>
-</plist>

apps/ios/SimpleX--iOS--Info.plist

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BGTaskSchedulerPermittedIdentifiers</key>
-	<array>
-		<string>chat.simplex.app.receive</string>
-	</array>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>chat.simplex.app</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>simplex</string>
-			</array>
-		</dict>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-	</array>
-</dict>
-</plist>

apps/ios/SimpleX--macOS--Info.plist

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict/>
-</plist>

apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,16 +0,0 @@
-{
-  "object": {
-    "pins": [
-      {
-        "package": "CodeScanner",
-        "repositoryURL": "https://github.com/twostraws/CodeScanner",
-        "state": {
-          "branch": null,
-          "revision": "c27a66149b7483fe42e2ec6aad61d5c3fffe522d",
-          "version": "2.1.1"
-        }
-      }
-    ]
-  },
-  "version": 1
-}

apps/ios/Tests macOS/Tests_macOS.swift

@@ -1,42 +0,0 @@
-//
-//  Tests_macOS.swift
-//  Tests macOS
-//
-//  Created by Evgeny Poberezkin on 17/01/2022.
-//
-
-import XCTest
-
-class Tests_macOS: XCTestCase {
-
-    override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-
-        // In UI tests it is usually best to stop immediately when a failure occurs.
-        continueAfterFailure = false
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
-    }
-
-    override func tearDownWithError() throws {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() throws {
-        // UI tests must launch the application that they test.
-        let app = XCUIApplication()
-        app.launch()
-
-        // Use recording to get started writing UI tests.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-    func testLaunchPerformance() throws {
-        if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) {
-            // This measures how long it takes to launch your application.
-            measure(metrics: [XCTApplicationLaunchMetric()]) {
-                XCUIApplication().launch()
-            }
-        }
-    }
-}

apps/ios/Tests macOS/Tests_macOSLaunchTests.swift

@@ -1,32 +0,0 @@
-//
-//  Tests_macOSLaunchTests.swift
-//  Tests macOS
-//
-//  Created by Evgeny Poberezkin on 17/01/2022.
-//
-
-import XCTest
-
-class Tests_macOSLaunchTests: XCTestCase {
-
-    override class var runsForEachTargetApplicationUIConfiguration: Bool {
-        true
-    }
-
-    override func setUpWithError() throws {
-        continueAfterFailure = false
-    }
-
-    func testLaunch() throws {
-        let app = XCUIApplication()
-        app.launch()
-
-        // Insert steps here to perform after app launch but before taking a screenshot,
-        // such as logging into a test account or navigating somewhere in the app
-
-        let attachment = XCTAttachment(screenshot: app.screenshot())
-        attachment.name = "Launch Screen"
-        attachment.lifetime = .keepAlways
-        add(attachment)
-    }
-}

apps/ios/macOS/macOS.entitlements

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
-</dict>
-</plist>