Merge remote-tracking branch 'upstream/main'

Run nix flake update
This fixes some deprecation warnings. I used it to build the app after update, it still works.
2026-07-03 14:05:24 +02:00 · 2026-04-17 20:52:30 +02:00 · 2026-04-17 18:08:53 +00:00 · 2026-04-14 18:23:39 +02:00 · 2026-04-14 18:19:52 +02:00 · 2026-04-14 18:12:05 +02:00
1017 changed files with 72764 additions and 57908 deletions
@@ -0,0 +1,314 @@
+# GitHub Copilot Instructions for ArcaneChat Android
+
+## Project Overview
+
+ArcaneChat is a Delta Chat Android client built on top of the official Delta Chat client with several improvements. It is a messenger app that uses email infrastructure for secure communication.
+
+**Technology Stack:**
+- **Language:** Java (Java 8 compatibility)
+- **Build System:** Gradle with Android Gradle Plugin 8.11.1
+- **Min SDK:** 21 (Android 5.0)
+- **Target SDK:** 36 (Android 16)
+- **NDK Version:** 27.0.12077973
+- **Native Components:** Rust (deltachat-core-rust submodule)
+- **UI Framework:** Android SDK, Material Design Components
+- **Testing:** JUnit 4, Espresso, Mockito, PowerMock, AssertJ
+
+## Repository Structure
+
+- `src/main/` - Main application source code
+  - `src/main/java/org/thoughtcrime/securesms/` - Main UI components
+  - `src/main/java/com/b44t/messenger/` - Delta Chat core integration
+  - `src/main/java/chat/delta/rpc/` - JSON-RPC bindings (generated, don't edit manually)
+  - `src/main/res/` - Android resources (layouts, strings, drawables)
+- `src/androidTest/` - Instrumented tests (UI tests, benchmarks)
+  - `src/androidTest/java/com/b44t/messenger/uitests/` - UI tests
+  - `src/androidTest/java/com/b44t/messenger/uibenchmarks/` - Performance benchmarks
+- `src/gplay/` - Google Play flavor-specific code
+- `src/foss/` - F-Droid/FOSS flavor-specific code
+- `jni/deltachat-core-rust/` - Native Rust core library (submodule, **don't edit directly**)
+- `scripts/` - Build and helper scripts
+  - `scripts/ndk-make.sh` - Build native libraries
+  - `scripts/install-toolchains.sh` - Install Rust cross-compilation toolchains
+  - `scripts/generate-rpc-bindings.sh` - Generate JSON-RPC bindings
+- `docs/` - Documentation
+- `fastlane/` - App store metadata and screenshots
+- `.github/workflows/` - CI/CD workflows (GitHub Actions)
+
+## Build Instructions
+
+### Prerequisites
+
+1. **Initialize submodules:**
+   ```bash
+   git submodule update --init --recursive
+   ```
+   This MUST be done first before any build attempts.
+
+2. **Set up environment variables:**
+   ```bash
+   export ANDROID_NDK_ROOT=/path/to/ndk/27.0.12077973
+   export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+   ```
+   Note: Path format varies by OS (linux-x86_64, darwin-x86_64, etc.)
+
+3. **Install Rust toolchains:**
+   ```bash
+   scripts/install-toolchains.sh
+   ```
+   Required for building the native Rust components.
+
+4. **Build native libraries:**
+   ```bash
+   scripts/ndk-make.sh
+   ```
+   **IMPORTANT:** First run takes 30-60 minutes as it builds for all architectures (armeabi-v7a, arm64-v8a, x86, x86_64).
+   For faster development builds, build for a single architecture:
+   ```bash
+   scripts/ndk-make.sh armeabi-v7a
+   ```
+
+5. **Build APK:**
+   ```bash
+   ./gradlew assembleDebug
+   ```
+   Build time: ~2-5 minutes after native libraries are built.
+
+### Build Flavors
+
+- **gplay:** Google Play version with Firebase Cloud Messaging (applicationId: `com.github.arcanechat`)
+- **foss:** F-Droid version without proprietary services (applicationId: `chat.delta.lite`)
+
+### Build Outputs
+
+- Debug APKs: `build/outputs/apk/gplay/debug/` and `build/outputs/apk/fat/debug/`
+- Release APKs require signing configuration in `~/.gradle/gradle.properties`
+
+### Common Build Issues
+
+1. **Missing NDK or incorrect version:**
+   - Error: `ANDROID_NDK_ROOT not set` or native library missing
+   - Solution: Install NDK 27.0.12077973 and set ANDROID_NDK_ROOT environment variable
+
+2. **Submodules not initialized:**
+   - Error: Missing deltachat-core-rust files
+   - Solution: Run `git submodule update --init --recursive`
+
+3. **Gradle wrapper validation:**
+   - Always validate gradle wrapper before building: `./gradlew wrapper --gradle-version=current`
+   - Wrapper is validated in CI via `gradle/actions/wrapper-validation@v4`
+
+4. **Clean build issues:**
+   - If build fails, try: `./gradlew clean && scripts/ndk-make.sh && ./gradlew assembleDebug`
+   - Remove `build/` directory if clean doesn't work
+
+## Testing
+
+### Running Unit Tests
+
+```bash
+./gradlew test
+```
+Expected duration: 1-3 minutes
+
+### Running Instrumented Tests
+
+1. **Disable animations** on your device/emulator:
+   - Developer Options → Set "Window animation scale", "Transition animation scale", and "Animator duration scale" to 0x
+   - **CRITICAL:** Tests will fail if animations are enabled
+
+2. **Run tests:**
+   ```bash
+   ./gradlew connectedAndroidTest
+   ```
+   Expected duration: 10-30 minutes depending on device/emulator
+
+### Online Tests
+
+Some tests require real email credentials. Configure in `~/.gradle/gradle.properties`:
+```properties
+TEST_ADDR=youraccount@yourdomain.org
+TEST_MAIL_PW=yourpassword
+```
+
+### UI Tests and Benchmarks
+
+- Located in `src/androidTest/java/com/b44t/messenger/`
+- Test categories: `uitests/online/`, `uitests/offline/`, `uibenchmarks/`
+- Run via Android Studio: Run → Edit Configurations → Android Instrumented Test
+
+## Coding Conventions
+
+### General Guidelines
+
+1. **Embrace existing style:** Match the coding style of the file you're editing
+2. **Minimize changes:** Don't refactor or rename in the same PR as bug fixes/features
+3. **Readable over paradigmatic:** Favor readability over strict Java patterns
+4. **Avoid premature optimization:** Keep things simple and on point
+5. **No excessive abstraction:** Avoid unnecessary factories, one-liner functions, or abstraction layers
+6. **Comments:** Only add comments if they match existing style or explain complex logic
+
+### Architecture
+
+- **UI/Model Separation:** Delta Chat Core (Rust) handles the model layer
+- **High-level interface:** Core provides data in UI-ready form; avoid additional transformations in UI layer
+- **Direct approach:** Prefer direct implementation over excessive class hierarchies
+
+### Key Principles
+
+- Work hard to avoid options and up-front choices
+- Avoid speaking about keys/encryption in primary UI
+- App must work offline and with poor network
+- Users don't read much text
+- Consistency matters
+- Primary UI should only show highly useful features
+
+## Common Development Tasks
+
+### Adding New Features
+
+1. Consider the UX philosophy (minimal options, offline-first, simplicity)
+2. Check if core library changes are needed before implementing in UI
+3. Match existing code style in modified files
+4. Add instrumented tests for UI changes when appropriate
+5. Update relevant documentation
+
+### Modifying Core Integration
+
+- Core library is in `jni/deltachat-core-rust/` submodule
+- Java bindings are in `src/main/java/com/b44t/messenger/Dc*.java`
+- JSON-RPC bindings in `chat.delta.rpc.*` package (generated via dcrpcgen)
+
+### Generating JSON-RPC Bindings
+
+To regenerate JSON-RPC bindings after core changes:
+```bash
+./scripts/generate-rpc-bindings.sh
+```
+**Note:** Requires Rust tooling and [dcrpcgen tool](https://github.com/chatmail/dcrpcgen) installed
+
+### Working with Translations
+
+- Translations managed via Transifex (not in repository)
+- English source strings: `res/values/strings.xml`
+- Don't mix string changes with refactoring
+
+### Debugging Native Code
+
+Decode crash symbols:
+```bash
+$ANDROID_NDK_ROOT/ndk-stack --sym obj/local/armeabi-v7a --dump crash.txt > decoded.txt
+```
+
+## Validation and Quality Checks
+
+### Pre-commit Checks
+
+Before committing changes, always run:
+
+1. **Gradle wrapper validation:**
+   ```bash
+   ./gradlew wrapper --gradle-version=current
+   ```
+
+2. **Build verification:**
+   ```bash
+   ./gradlew assembleDebug
+   ```
+
+3. **Unit tests:**
+   ```bash
+   ./gradlew test
+   ```
+
+4. **Code style:** Match existing code style in modified files (no automatic formatter configured)
+
+### When to Rebuild Native Libraries
+
+Rebuild native libraries (`scripts/ndk-make.sh`) when:
+- Updating deltachat-core-rust submodule
+- Modifying anything in `jni/` directory
+- Changing NDK version
+- After `git clean -fdx` or fresh clone
+
+**DO NOT** rebuild native libraries for:
+- Pure Java/Kotlin code changes
+- Resource file changes
+- Gradle configuration changes (unless changing native library linking)
+- Documentation updates
+
+## WebXDC Support
+
+ArcaneChat has extended WebXDC support:
+- `window.webxdc.arcanechat` - Version detection
+- `sendToChat()` - Extra properties: `subject`, `html`, `type` (sticker/image/audio/video/file)
+- External link support in apps
+- `manifest.toml` - `orientation` field for landscape mode
+
+## Important Files
+
+- `build.gradle` - Main build configuration (Android Gradle Plugin 8.11.1, Java 8 compatibility)
+- `CONTRIBUTING.md` - Contribution guidelines
+- `BUILDING.md` - Detailed build setup instructions
+- `RELEASE.md` - Release process
+- `proguard-rules.pro` - ProGuard configuration (enabled for both debug and release)
+- `google-services.json` - Firebase configuration (gplay flavor only)
+- `settings.gradle` - Gradle settings
+- `.github/workflows/` - CI/CD configuration
+
+## Dependencies and Constraints
+
+- **Java Version:** Java 8 compatibility (do not use Java 9+ features)
+- **Gradle:** Use wrapper (`./gradlew`) to ensure correct Gradle version
+- **NDK:** Must use version 27.0.12077973 (specified in build.gradle)
+- **Min SDK:** 21 (Android 5.0) - code must be compatible
+- **Target SDK:** 36 (Android 16) - test on this API level when possible
+- **ProGuard:** Always enabled - ensure ProGuard rules are correct for new dependencies
+- **Multi-dex:** Enabled - app exceeds 65k method limit
+
+## Package Structure
+
+- `org.thoughtcrime.securesms.*` - Main UI components (legacy namespace from Signal)
+- `com.b44t.messenger.*` - Delta Chat core integration
+- `chat.delta.rpc.*` - JSON-RPC bindings (generated)
+
+## Notes for AI Assistants
+
+- This is a fork of Delta Chat Android with ArcaneChat-specific improvements
+- Maintain compatibility with Delta Chat core library
+- Test on both gplay and foss flavors when making changes
+- Native library must be rebuilt after core changes
+- ProGuard is enabled in both debug and release builds
+- Multi-dex is enabled due to app size
+
+## CI/CD Workflows
+
+### Preview APK Workflow (.github/workflows/preview-apk.yml)
+
+Runs on every pull request to build and upload a preview APK:
+
+1. **Setup steps:**
+   - Checks out repository with submodules
+   - Validates Fastlane metadata
+   - Sets up Rust cache (working-directory: jni/deltachat-core-rust)
+   - Sets up Java 17 (Temurin distribution)
+   - Sets up Android SDK
+   - Caches Gradle dependencies
+   - Sets up NDK r27
+
+2. **Build process:**
+   ```bash
+   scripts/install-toolchains.sh && scripts/ndk-make.sh armeabi-v7a
+   ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
+   ```
+   Note: Builds only armeabi-v7a for faster CI builds
+
+3. **Output:** Uploads APK artifact to GitHub Actions
+
+### Important CI Considerations
+
+- Always validate Gradle wrapper before committing changes
+- Fastlane metadata must be valid (validated in CI)
+- Use `--no-daemon` flag for Gradle in CI environments
+- CI builds use FOSS flavor to avoid Google Services dependencies
+- Expected CI build time: 15-25 minutes for full workflow
@@ -0,0 +1,22 @@
+version: 2
+mergeable:
+  - when: pull_request.*
+    name: "Changelog check"
+    validate:
+      - do: or
+        validate:
+        - do: description
+          must_include:
+            regex: '#skip-changelog'
+        - do: and
+          validate:
+            - do: dependent
+              changed:
+                file: '**/*.java'
+                required: ['CHANGELOG.md']
+    fail:
+      - do: checks
+        status: 'action_required'
+        payload:
+          title: CHANGELOG.md might need an update
+          summary: "Please update CHANGELOG.md or add #skip-changelog to the description"
@@ -7,7 +7,7 @@ on:
 jobs:
  artifacts-url-comments:
    name: add artifact links to pull request
-    runs-on: windows-2019
+    runs-on: ubuntu-latest
    if: ${{ github.event.workflow_run.conclusion == 'success' }}
    steps:
      - name: add artifact links to pull request
@@ -0,0 +1,50 @@
+name: Core Cache
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'jni/deltachat-core-rust'
+      - 'jni/Android.mk'
+      - 'jni/Application.mk'
+      - 'jni/dc_wrapper.c'
+      - 'scripts/ndk-make.sh'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - uses: android-actions/setup-android@v3
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r27
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: jni/deltachat-core-rust
+
+      - name: Get deltachat-core-rust submodule hash
+        id: core-hash
+        run: echo "hash=$(git rev-parse HEAD:jni/deltachat-core-rust)" >> $GITHUB_OUTPUT
+
+      - name: Cache compiled core
+        id: cache-core
+        uses: actions/cache@v4
+        with:
+          path: |
+            jni/arm64-v8a
+            libs/arm64-v8a
+          key: core-arm64-v8a-${{ steps.core-hash.outputs.hash }}-${{ hashFiles('jni/Android.mk', 'jni/Application.mk', 'jni/dc_wrapper.c', 'scripts/ndk-make.sh') }}-ndk-r27
+
+      - name: Compile core
+        if: steps.cache-core.outputs.cache-hit != 'true'
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
+          scripts/install-toolchains.sh && scripts/ndk-make.sh arm64-v8a
@@ -0,0 +1,35 @@
+name: Code Format
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  spotless:
+    name: Check code format (Spotless)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: temurin
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Check formatting
+        run: ./gradlew spotlessCheck
@@ -2,29 +2,28 @@ name: Upload Preview APK

 on: pull_request

+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
  build:
    name: Upload Preview APK
    runs-on: ubuntu-latest
    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
        with:
          submodules: recursive
+
      - name: Validate Fastlane Metadata
        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
-      - uses: Swatinem/rust-cache@v2
-        with:
-          working-directory: jni/deltachat-core-rust
-      - uses: actions/setup-java@v3
+
+      - uses: actions/setup-java@v5
        with:
          java-version: 17
          distribution: 'temurin'
-      - uses: android-actions/setup-android@v3
-      - uses: actions/cache@v3
+
+      - uses: actions/cache@v4
        with:
          path: |
            ~/.gradle/caches
@@ -32,23 +31,43 @@ jobs:
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
          restore-keys: |
            ${{ runner.os }}-gradle-
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - uses: android-actions/setup-android@v3
      - uses: nttld/setup-ndk@v1
        id: setup-ndk
        with:
          ndk-version: r27

+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: jni/deltachat-core-rust
+
+      - name: Get deltachat-core-rust submodule hash
+        id: core-hash
+        run: echo "hash=$(git rev-parse HEAD:jni/deltachat-core-rust)" >> $GITHUB_OUTPUT
+
+      - name: Restore compiled core
+        id: core-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            jni/arm64-v8a
+            libs/arm64-v8a
+          key: core-arm64-v8a-${{ steps.core-hash.outputs.hash }}-${{ hashFiles('jni/Android.mk', 'jni/Application.mk', 'jni/dc_wrapper.c', 'scripts/ndk-make.sh') }}-ndk-r27
+
      - name: Compile core
+        if: steps.core-cache.outputs.cache-hit != 'true'
        env:
          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
        run: |
          export PATH="${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
-          scripts/install-toolchains.sh && scripts/ndk-make.sh armeabi-v7a
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+          scripts/install-toolchains.sh && scripts/ndk-make.sh arm64-v8a

      - name: Build APK
-        run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug
+        run: ./gradlew --no-daemon -PABI_FILTER=arm64-v8a assembleFossDebug

      - name: Upload APK
        uses: actions/upload-artifact@v4
@@ -59,12 +59,16 @@ jobs:
          rm build/outputs/apk/foss/release/*universal*
          ./gradlew assembleGplayRelease
          mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
+          mv build/outputs/mapping/fossRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-foss.txt
+          mv build/outputs/mapping/gplayRelease/mapping.txt build/outputs/mapping/fossRelease/mapping-gplay.txt

-      - name: Release
+      - name: Release on GitHub
        uses: softprops/action-gh-release@v1
        with:
          token: "${{ secrets.GITHUB_TOKEN }}"
          body: '[<img src="store/get-it-on-gplay.png" alt="Get it on Google Play" height="48">](https://play.google.com/store/apps/details?id=com.github.arcanechat) [<img src="store/get-it-on-fdroid.png" alt="Get it on F-Droid" height="48">](https://f-droid.org/packages/chat.delta.lite) [<img src="store/get-it-on-github.png" alt="Get it on GitHub" height="48">](https://github.com/ArcaneChat/android/releases/latest/download/ArcaneChat-gplay.apk)'
          prerelease: ${{ contains(github.event.ref, '-beta') }}
          fail_on_unmatched_files: true
-          files: build/outputs/apk/foss/release/*.apk
+          files: |
+            build/outputs/apk/foss/release/*.apk
+            build/outputs/mapping/fossRelease/mapping-*.txt
@@ -0,0 +1,245 @@
+# Building and Testing
+
+This document describes how to set up the build environment,
+build and test the app. Before diving into developing, please
+first read [CONTRIBUTING.md](./CONTRIBUTING.md) for general
+contribution hints and conventions.
+
+Please follow all steps precisely.
+If you run into troubles,
+ask on one of the [communication channels](https://delta.chat/contribute) for help
+
+
+## Check Out Repository
+
+When checking out _deltachat-android_, make sure also to check out the
+subproject _deltachat-core-rust_:
+
+- When using Git, you can do this initially by
+  `$ git clone --recursive https://github.com/deltachat/deltachat-android`
+  or later by `git submodule update --init --recursive`. If you do this in your
+  home directory, this results in the folder `~/deltachat-android` which is just fine.
+
+## Generate JSON-RPC bindings
+
+To generate/update the JSON-RPC bindings (ex. `chat.delta.rpc.*` package)
+install Rust tooling (read sections below) and the [dcrpcgen tool](https://github.com/chatmail/dcrpcgen)
+then generate the code running the script:
+
+```
+./scripts/update-rpc-bindings.sh
+```
+
+## Build Using Nix
+
+The repository contains [Nix](https://nixos.org/) development environment
+described in `flake.nix` file.
+If you don't have Nix installed,
+the easiest way is to follow the [Lix installation instructions](https://lix.systems/install/)
+as this results in a setup with [Flakes](https://nixos.wiki/wiki/Flakes) feature enabled out of the box
+and can be cleanly uninstalled with `/nix/nix-installer uninstall` once you don't need it anymore.
+
+Once you have Nix with Flakes feature set up start the development environment shell:
+```
+nix develop
+```
+Nix development environment contains Rust with cross-compilation toolchains and Android SDK.
+
+To [build an APK](https://developer.android.com/studio/build/building-cmdline) run the following 2 steps.
+Note that the first step may take some time to build for all architectures. You can optionally read 
+[the first comment block in the `ndk-make.sh` script](https://github.com/deltachat/deltachat-android/blob/master/scripts/ndk-make.sh) 
+for pointers on how to build for a specific architecture.
+```
+$ scripts/ndk-make.sh
+$ ./gradlew assembleDebug
+```
+
+Resulting APK files can be found in
+`build/outputs/apk/gplay/debug/` and
+`build/outputs/apk/fat/debug/`.
+
+## Build Using Dockerfile
+
+Another way to build APK is to use provided `Dockerfile`
+with [Docker](https://www.docker.com/) or [Podman](https://podman.io/).
+Podman is a drop-in replacement for Docker that does not require root privileges.
+
+If you don't have Docker or Podman setup yet, read [how to setup Podman](#setup-podman)
+below. If you don't want to use Docker or Podman, read [how to manually install the
+build environment](#install-build-environment).
+
+First, build the image `deltachat-android` by running
+```
+podman build --build-arg UID=$(id -u) --build-arg GID=$(id -g) . -t deltachat-android
+```
+or
+```
+docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g) . -t deltachat-android
+```
+
+Then, run the image:
+```
+podman run --userns=keep-id -it --name deltachat -v $(pwd):/home/app:z -w /home/app localhost/deltachat-android
+```
+or
+```
+docker run -it --name deltachat -v $(pwd):/home/app:z -w /home/app localhost/deltachat-android
+```
+
+You can leave the container with Ctrl+D or by typing `exit` and re-enter it with 
+`docker start -ia deltachat` or `podman start -ia deltachat`.
+
+Within the container, install toolchains and build the native library:
+```
+deltachat@6012dcb974fe:/home/app$ scripts/install-toolchains.sh
+deltachat@6012dcb974fe:/home/app$ scripts/ndk-make.sh
+```
+
+Then, [build an APK](https://developer.android.com/studio/build/building-cmdline):
+```
+deltachat@6012dcb974fe:/home/app$ ./gradlew assembleDebug
+```
+
+### Troubleshooting
+
+- Executing `./gradlew assembleDebug` inside the container fails with `The SDK directory '/home/user/Android/Sdk' does not exist.`:
+
+  The problem is that Android Studio (outside the container) automatically creates a file `local.properties` with a content like `sdk.dir=/home/username/Android/Sdk`,
+  so, Gradle-inside-the-container looks for the Sdk at `/home/username/Android/Sdk`, where it can't find it.
+  You could:
+  - either: remove the file or just the line starting with `sdk.dir`
+  - or: run `./gradlew assembleDebug` from outside the container (however, there may be incompatibility issues if different versions are installed inside and outside the container)
+
+- Running the image fails with `ERRO[0000] The storage 'driver' option must be set in /etc/containers/storage.conf, guarantee proper operation.`:
+
+  In /etc/containers/storage.conf, replace the line: `driver = ""` with: `driver = "overlay"`.
+  You can also set the `driver` option to something else, you just need to set it to _something_.
+  [Read about possible options here](https://github.com/containers/storage/blob/master/docs/containers-storage.conf.5.md#storage-table).
+
+## <a name="setup-podman"></a>Setup Podman
+
+These instructions were only tested on a Manjaro machine so far. If anything doesn't work, please open an issue.
+
+First, [Install Podman](https://podman.io/getting-started/installation).
+
+Then, if you want to run Podman without root, run:
+```
+sudo touch /etc/subgid
+sudo touch /etc/subuid
+sudo usermod --add-subuids 165536-231072 --add-subgids 165536-231072 yourusername
+```
+(replace `yourusername` with your username).
+See https://wiki.archlinux.org/index.php/Podman#Rootless_Podman for more information.
+
+## <a name="install-build-environment"></a>Install Build Environment (without Docker or Podman)
+
+To setup build environment manually:
+- _Either_, in Android Studio, go to "Tools / SDK Manager / SDK Tools", enable "Show Package Details",
+  select "CMake" and the desired NDK (install the same NDK version as the [Dockerfile](https://github.com/deltachat/deltachat-android/blob/master/Dockerfile)), hit "Apply".
+- _Or_ read [Dockerfile](https://github.com/deltachat/deltachat-android/blob/master/Dockerfile) and mimic what it does.
+
+Then, in both cases, install Rust using [rustup](https://rustup.rs/)
+and Rust toolchains for cross-compilation by executing `scripts/install-toolchains.sh`.
+
+Then, configure `ANDROID_NDK_ROOT` environment variable to point to the Android NDK
+installation directory e.g. by adding this to your `.bashrc`:
+
+```bash
+export ANDROID_NDK_ROOT=${HOME}/Android/Sdk/ndk/[version] # (or wherever your NDK is) Note that there is no `/` at the end!
+export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+```
+
+After that, call `scripts/ndk-make.sh` in the root directory to build core-rust.
+Afterwards run the project in Android Studio. The project requires API 25.
+
+With chance, that's it :) - if not, read on how to set up a proper development
+environment.
+
+
+## Install Development Environment
+
+1. Some libs required by Android Studio may be missing on 64 bit Linux machines
+   [Source](https://developer.android.com/studio/install.html)], so for Ubuntu execute
+   `$ sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2-1.0:i386`
+   and for Fedora execute
+   `$ sudo yum install zlib.i686 ncurses-libs.i686 bzip2-libs.i686`.
+
+2. Download Android Studio from <https://developer.android.com> (android-studio-ide-...-linux.zip)
+   and unpack the archive which contains a single folder called `android-studio`;
+   move this folder e.g. to `~/android-studio`.
+
+3. To launch Android Studio for the first time, open a terminal, navigate to
+   `~/android-studio/bin`, execute `./studio.sh` and use all the standard values
+   from the wizard.
+
+4. Android Studio now asks you if you want to open an existing project;
+   choose `~/deltachat-android` as created in the "Build" chapter (Android Studio starts to
+   build the project, however, there are some steps missing before this will
+   succeed).
+
+5. If components are missing, click on the corresponding error
+   message and install eg. required SDKs and the "Build-Tools" (you should
+   also find the option at "Tools / Android / SDK Manager / SDK Platforms").
+   Now the build should succeed - but the app still misses the native part.
+
+6. Download Android NDK from
+   [NDK Archives](https://developer.android.com/ndk/downloads)
+   and extract the archive containing a single folder
+   called something like `android-ndk-r23b-linux`; move this folder e.g. to `~/android-ndk`.
+
+7. Export the folder path to your environment as `ANDROID_NDK_ROOT` and add it to `PATH`.
+   You can achieve this e.g. by adding this to your `.bashrc`
+   ```bash
+   export ANDROID_NDK_ROOT=${HOME}/android-ndk
+   export PATH=${PATH}:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/:${ANDROID_NDK_ROOT}
+   ```
+
+## Run UI Tests and Benchmarks
+
+- You don't necessarily need a dedicated testing device.
+  Backup your current account first, maybe there are some bugs in switching accounts.
+
+- You can run benchmarks on either an emulated device or a real device.
+  You need at least Android 9. For better benchmark results,
+  you should run the benchmark on a real device and make sure that the core is compiled in release mode.
+
+- Disable animations on your device, otherwise the test may fail:
+  at "Developer options"
+  set all of "Window animation scale", "Transition animation scale" and "Animator duration scale" to 0x
+
+- In Android Studio: "File" / "Sync project with gradle files"
+
+- In Android Studio: "Run" / "Edit configurations" / "+" / "Android Instrumented test":
+  Either select a specific class or select "All in Module" / "OK" /
+  Select your configuration in the toolbar / Click on the green "run" button in the toolbar to run the tests
+
+### Get the benchmark results
+
+When the benchmark is done, you will get a result like
+`MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: 11635,11207,11363,11352,11279,11183,11137,11145,11032,11057`.
+You can paste `11635,11207,11363,11352,11279,11183,11137,11145,11032,11057`
+into a cell in a LibreOffice spreadsheet, do "Data" / "Text to columns",
+choose `,` as a separator, hit "OK", and create a diagram.
+
+### Run online tests
+
+For some tests, you need to provide the credentials to an actual email account.
+You have 2 ways to do this:
+
+1. (Recommended): Put them into the file ~/.gradle/gradle.properties (create it if it doesn't exist):
+   ```
+   TEST_ADDR=youraccount@yourdomain.org
+   TEST_MAIL_PW=youpassword
+   ```
+
+2. Or set them via environment variables.
+
+## Decoding Symbols in Crash Reports
+
+```
+$ANDROID_NDK_ROOT/ndk-stack --sym obj/local/armeabi-v7a --dump crash.txt > decoded.txt
+```
+
+`obj/local/armeabi-v7a` is the extracted path from `deltachat-gplay-release-X.X.X.apk-symbols.zip` file from https://download.delta.chat/android/symbols/
+
+Replace `armeabi-v7a` by the correct architecture the logs come from (can be guessed by trial and error)
@@ -1,5 +1,286 @@
 # Delta Chat Android Changelog

+## Unreleased
+
+* Better incoming call system integration
+* Calls are not experimental anymore and don't need to be manually enabled
+
+## v2.49.0
+2026-04
+
+* Fix file sharing to certain apps (e.g. Material Files, etc.)
+* Fix problem with calls when microphone permission is not granted
+* Fix taking pictures and videos in devices with SD cards
+* Fix flipped orientation for some images
+* Fix: avoid empty contact request chats when using invite links in a multi-device setup
+* Remove proxy toggle from profile editing to avoid confusion
+* Updated translations
+* Update to core 2.49.0
+
+## v2.48.0
+2026-03
+
+* Add a warning when editing relays
+* Fix message reordering problems in multi-relay setups
+* Some more bug fixes and updated translations
+* Update to core 2.48.0
+
+## v2.47.0
+2026-03
+
+* Allow to set chat description
+* Unified date display in call bubbles
+* Explain at "Settings / Chats / Outgoing Media Quality" how to send original quality
+* Add a basic sticker picker
+* Leave groups and channels before deletion
+* Further minimize metadata in messages and while getting in contact.
+* Increase resilience of multi-relay usage: if on relay goes down, messages are still received in the others.
+* Allow to hide a relay from contacts instead of removing, allowing smoother relay changes
+* HTML emails: allow to review and copy links before opening them
+* Mark call message as seen when accepting/declining a call
+* Fix: keep original sent timestamp for resent messages
+* Fix: make clicking on broadcast member-added messages work always
+* Fix: remove notification when a message is deleted by sender
+* Fix: avoid "reply privately" not quoting the selected message sometimes
+* Fix: properly hide the calls button
+* Some more bug fixes and updated translations
+* Update to core 2.47.0
+
+## v2.43.0
+2026-02
+
+* Improve switch speed when changing profiles
+* Allow to switch profile when sharing or forwarding
+* Display message views count for channel owners
+* Don't notify notification-to-all from in-chat apps if the chat is muted
+* Allow to see inbox quota for all relays in connectivity screen
+* Truncate file names in the middle, not at the end; important information are more often at the end
+* Remove email address from user profile
+* Mark external links with " ↗" to make them clear
+* Make QR code larger on "Add Second Device" screen
+* Add indication for blocked contacts in user profile
+* Allow to start calls with video disabled
+* Show hint for empty contact search results
+* Add background playing for voice messages and other audio files
+* Allow scanning Invitation Code when creating a new profile
+* Add context menu in long-pressing relays items instead of showing buttons
+* Enhanced video player UI
+* Fix: Show dialog if pasted QR codes are invalid
+* Fix: Refresh chat list when returning from conversation if selected profile changed
+* Fix: Update menu when using "select all" in contact selection
+* Fix: Avoid empty profiles after using "add as second device" from welcome screen
+* Fix: Remove from group deselected members in the contact selection list
+* Fix multi-device seen messages synchronization when using multiple relays
+* Fix mailto handling
+* Fix layout problems inside in-chat apps
+* Fix real-time for in-chat apps that need it
+* Avoid crash when the app is minimized with profile switcher or reactions dialogs open
+* Remove "trash icon" option from contact selection list when adding members to group
+* Update to core 2.43.0
+
+## v2.35.0
+2026-01
+
+* Protect profile deletion and relays management with system lock/pin
+* Fix: Remove address from profile switcher
+* Fix: Avoid crash if the system doesn't allow to start foreground service
+* Remove deprecated "real-time apps" switch
+* Update to core 2.35.0
+
+## v2.34.0
+2025-12
+
+* Allow to add relay from clipboard or image if camera permission is not granted
+* Avoid crash in the "View Log" screen
+* Update to core 2.34.0
+
+## v2.33.1
+2025-12
+
+* Target Android 16
+* Change color of links in text messages
+* Improve edge-to-edge support
+* Add the option (opt-in) to send anonymous statistics to Delta Chat's developers
+* Metadata protection: protect message recipients
+* Allow to withdraw channel invite links and QR codes
+* Allow to open externally links clicked inside in-chat apps
+* Do not show "1 member" when the process of joining the group is not finished
+* Make search case-insensitive for non-ASCII chat and contact names
+* Improve handling of video recoding
+* Send .webm videos as file, they are not supported by all platforms
+* Tweak advanced section and wording of some advanced options
+* Fix: avoid crash in push notifications handling
+* Fix: avoid freezing in background
+* Fix: clean up web storage of deleted in-chat apps
+* Fix: avoid crash when exporting some files with wrong image MIME type
+* Expose new "Multi-device mode" option instead of "Delete from server" for chatmail profiles
+* Opened in-chat apps got a 'About Apps' menu item
+* Avoid gray avatar on profile creation
+* Avoid last item in chat list being covered by the floating button
+* Add disk usage statistics to log
+* New experimental feature: several addresses per profile
+* Update to core 2.33.0
+
+## v2.25.0
+2025-11
+
+* Make it possible to invite members into a channel via a QR code,
+  and make channels more secure
+* metadata protection: protect Date header
+* metadata protection: protect Autocrypt header
+* better multi-device: synchronize group creation across devices
+* data saving: do not send Autocrypt header in read receipts
+* improve onboarding speed
+* allow to save to storage files shared from inside in-chat apps
+* reduce app size
+* don't show badge counter in app icon for the permanent background notification
+* fix sorting of old media in gallery
+* fix text direction in "x members" subtitle for RTL languages
+* fix group invite QR screen's layout
+* tweak text hints in advanced classic e-mail configuration
+* remove deprecated "companion app" code
+* remove deprecated "Watch Sent Folder" preference
+* remove deprecated "send self-report" preference
+* don't show email address in shared vcard
+* update to core 2.25.0
+
+## v2.22.0
+2025-10
+
+* target Android 15
+* improve readability of info messages in dark mode
+* drop too short disappearing messages options
+* fix Direct Share shortcuts
+* fix: don't show error message when cancelling profile creation
+* enable permanent notification by default if push notifications are not available
+* hide "clone chat" and member list for incoming channels
+* show warning if background notifications will be unreliable
+* warn if the app has not been updated after 6 months instead of 1 year
+* avoid "unknown sender for this chat" error
+* properly display "Messages are end-to-end encrypted." in all encrypted groups
+* show dialog if user has permanently denied camera permission and tries to take picture for group avatar
+* several small fixes and improvements
+* add experimental built-in calls
+* update to core 2.22.0
+
+## v2.11.0
+2025-08
+
+* add "After 1 year" option to disappearing messages
+* improve image quality when setting group avatars
+* add Estonian translation, update other translations
+* allow to clone email chats
+* fix some small bugs
+* update to core 2.11.0
+
+## v2.10.0
+2025-08
+
+* fix "Archived" item's layout in chat-list
+* don't enlarge "Saved Messages" and "Devices Messages" avatars on click
+* share email address for email contacts instead of vCard
+* open existing encrypted chat when opening a mailto link or clicking an email address in a message bubble
+* update to core 2.10.0
+
+## v2.9.0
+2025-07
+
+* hide contact email addresses in search results
+* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
+* don't enlarge email chats avatar placeholder
+* improve message date/status footer layout, also in RTL languages
+* display correct text when receiving a "Disappearing messages enabled" system message
+* Update to core 2.9.0
+
+## v2.8.0
+2025-07
+
+* Profiles focus on recognizing contacts
+* See the number of media directly in the profile, no need to tap around
+* Clearer app lists by removing redundant "App" subtitle
+* New button for quick access to the apps sent in current chat
+* New icon for the in-chat apps button
+* Improve hint for app drafts
+* Add Text-To-Speech (TTS) support for in-chat apps
+* New icon for the QR icon
+* Start rebuilding the experimental broadcast lists
+  into proper channels - note that this is work-in-progress
+* Improved separation between unencrypted chats/contacts and encrypted ones, avoiding mixing of encrypted and unencrypted messages in the same chat
+* Removed padlocks, as encrypted is the default "normal" state. Instead, unencrypted email is marked with a small email / letter  (✉️) icon
+* Classic email chats/threads get a big email / letter icon making it easy to recognize
+* After some time, add a device message asking to donate. Can't wait? Donate today at https://delta.chat/donate
+* Allow to sort profiles up in the profile switcher
+* Add new option to create unencrypted email thread
+* Green checkmarks are removed where they mostly refer to guaranteed encryption, which is the default now. They are still used for profile's "Introduced by"
+* Update to core 2.8.0
+
+## v1.58.4
+2025-05
+
+* make in-chat apps properly work when they are not sent yet, in draft mode
+* better avatar quality
+* some more bug fixes and updated translations
+* update to core 1.159.5
+
+## v1.58.3
+2025-05
+
+* fix: webxdc.selfName uses the name otherwise displayed
+* fix potential crash on startup
+* add donation link to app settings
+* update to core 1.159.3
+
+## v1.58.2
+2025-04
+
+* fix draft writing area disappearing for some chats
+* update to core 1.159.2
+
+## v1.58.1
+2025-04
+
+* tapping info messages with contacts open the contact's profile
+* hide superfluous "Show Classic E-mails" advanced setting for chatmail
+* show profile bio/status under name in main settings screen
+* remove mostly non-telling transport addresses when referring to a contact;
+  the contact's profile gives a much better overview
+* Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
+* don't display email address in contact list and member list for contacts with green-checkmark
+* avoid crash in Notifications preferences if ringtone title can't be read
+* don't display forwarded messages as "edited" if original message was edited
+* support importing contact from ProtonMail vCard attachments received in chats
+* send encrypted in the experimental broadcast lists feature
+* wait for QR scan (or invite link click) process to complete before allowing to send messages
+* show connectivity status dot when profile is connecting or not connected
+* never send Autocrypt-Gossip in broadcast lists.
+* update to core 1.159.1
+
+## v1.56.1
+2025-03
+
+* ignore click in info-messages from deleted in-chat apps
+* data saving: do not send messages to the server if user is the only member of the chat in single-device usage
+* protect metadata: encrypt message's sent date
+* do not fail to send messages in groups if some encryption keys are missing
+* synchronize contact name changes across devices
+* fix changing group names that was not working in some situations
+* fix: do not show outdated message text in "Message Info" of an edited message
+* some more small bug fixes and updated translations
+* update to core 1.158.0
+
+## v1.56.0
+2025-03
+
+* allow to edit messages
+* allow to delete messages for everyone
+* add mute option "8 hours"
+* add menu option to easily save/unsave selected message
+* improve deletion confirmation for "Device Messages"
+* remove dangerous encryption options
+* always paste as plain text in message draft area
+* some small bug fixes and updated translations
+* update to core 1.157.2
+
 ## v1.54.4
 2025-03

@@ -45,7 +45,7 @@ Some rough ideas, that may be helpful when thinking about how to enhance things:

 ## Contributing Code

-The [README](./README.md) explains in detail how to set up the build environment.
+The [BUILDING.md](./BUILDING.md) file explains in detail how to set up the build environment.
 Please follow all steps precisely.
 If you run into troubles,
 ask on one of the [communication channels](https://delta.chat/contribute) for help.
@@ -73,18 +73,15 @@ esp. before/after screenshots.

 ### Coding Conventions

-Source files are partly derived from different other open source projects
-and may follow different coding styles and conventions.
-
-If you do a PR fixing a bug or adding a feature,
-please embrace the coding convention you see in the corresponding files,
-so that the result fits well together.
-
-Do not refactor or rename things in the same PR
-to make the diff small and the PR easy to review.
-
 Project language is Java.

+Code formatting is enforced via [Spotless](https://github.com/diffplug/spotless) Gradle plugin.
+Auto-format all files by running `./gradlew spotlessApply` before opening a PR.
+CI will fail if files are not formatted correctly so make sure to run the formatter before pushing.
+
+If you do a PR fixing a bug or adding a feature, do not refactor or rename things in the same PR
+to make the diff small and the PR easy to review.
+
 By using [Delta Chat Core](https://github.com/deltachat/deltachat-core-rust)
 there is already a strong separation between "UI" and "Model".
 Further separations and abstraction layers are often not helpful
@@ -15,7 +15,6 @@ This app has some extended support for WebXDC apps:

 - `window.webxdc.arcanechat` a string with the ArcaneChat version and can be used by app developers
  to detect when they can use the ArcaneChat-specific features.
- `window.webxdc.isCommunity` true if the current account is a community account
 - `sendToChat()`: extra property `subject` can be set to a text string to set message/email's subject.
 - `sendToChat()`: extra property `html` can be set to a string of html markup to set the HTML part of the email/message.
 - `sendToChat()`: the file object parameter also accepts a `type` field that can be one of:
@@ -31,4 +30,4 @@ This app has some extended support for WebXDC apps:

 This app is based on the [official Delta Chat client](https://github.com/deltachat/deltachat-android) with several improvements.

-This app uses a [modified](https://github.com/ArcaneChat/core) version of the [Delta Chat Core Library](https://github.com/deltachat/deltachat-core-rust).
+This app uses a [modified](https://github.com/ArcaneChat/core) version of the [Chatmail Core Library](https://github.com/chatmail/core).
@@ -3,6 +3,8 @@

 ## Generate APKs

+### Update core and translations
+
 on the command-line, in a PR called "update-core-and-stuff-DATE":

 1. update core:
@@ -13,25 +15,31 @@ on the command-line, in a PR called "update-core-and-stuff-DATE":
   ./scripts/ndk-make.sh
   ```

-2. update translations and local help:
+a) Update `CHANGELOG.md`
+      from <https://github.com/chatmail/core/blob/main/CHANGELOG.md>,
+      do not just copy and avoid technical terms.
+      The changelog is for the end user and shall show impacts form that angle.
+      Add used core version to end of changelog entry
+      as `update to core 1.2.3` or `using core 1.2.3`
+
+
+2. update JSON-RPC bindings:
+   ```
+   ./scripts/update-rpc-bindings.sh
+   ```
+
+3. update translations and local help:
   ```
   ./scripts/tx-pull-translations.sh
   ./scripts/create-local-help.sh  # requires deltachat-pages checked out at ../deltachat-pages
   ```

-the "update-core-and-stuff-DATE" PR can be merged without review
-(as everything was already reviewed in their repos).
+### Prepare release

 the following steps are done in a PR called `prep-VERSION` (no leading "v"):

-3. a) update `CHANGELOG.md`
-      from <https://github.com/chatmail/core/blob/main/CHANGELOG.md>
-      and <https://github.com/deltachat/deltachat-android/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc>.
-      do not just copy and avoid technical terms.
-      the changelog is for the end user and shall show impacts form that angle.
-   b) update changelog date as `YYYY-MM`
-   c) add used core version to end of changelog entry
-      as `update to core 1.2.3` or `using core 1.2.3`
+3. Update `CHANGELOG.md`:
+   Rename header with version number and add date as `YYYY-MM`

   in case previous entries of the changelog refer to betas or to not officially released versions,
   the entries can be summarized.
@@ -110,17 +118,6 @@ This may take some days.
 	c) tap "Publish release"


-## Release on Amazon Appstore
-
-on <https://developer.amazon.com/dashboard>:
-
-12. a) click "App List", for "Delta Chat", select "Add upcoming version" on the left
-    b) at "Step 1 / Existing file(s)" hit "Replace", upload the APK from above
-    c) on the "Step 1" page, add "Release notes" from CHANGELOG.md, hit "Next"
-    d) on "Step 2" and "Step 3" pages, hit "Next"
-    e) on "Step 4" page: "Submit app"
-
-
 ## Release on Huawei AppGallery

 on <https://developer.huawei.com/consumer/en/appgallery>:
@@ -131,7 +128,7 @@ on <https://developer.huawei.com/consumer/en/appgallery>:
    d) Hit "Submit"; on the next page, confirm version and language


-## Releases on Apklis, Passkoocheh
+## Releases on other stores (ex. Passkoocheh)

 These stores are not under our control.
 On important updates **ping store maintainers** and ask to update.
@@ -1,6 +1,7 @@
 plugins {
-    id 'com.android.application' version '8.5.2'
+    id 'com.android.application' version '8.11.1'
    id 'com.google.gms.google-services' version '4.4.1'
+    id 'com.diffplug.spotless' version '8.3.0'
 }

 repositories {
@@ -21,7 +22,7 @@ android {
    }
    namespace "org.thoughtcrime.securesms"
    flavorDimensions "none"
-    compileSdk 34
+    compileSdk 36

    // Set NDK version to strip native libraries.
    // Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
@@ -33,14 +34,14 @@ android {
    useLibrary 'org.apache.http.legacy'

    defaultConfig {
-        versionCode 30000715
-        versionName "1.54.5"
+        versionCode 30000742
+        versionName "2.49.0"

        applicationId "chat.delta.lite"
        multiDexEnabled true

        minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 36

        vectorDrawables.useSupportLibrary = true

@@ -72,10 +73,20 @@ android {
    packagingOptions {
        jniLibs {
            doNotStrip '**/*.so'
-            keepDebugSymbols += ['*/mips/*.so', '*/mips64/*.so']
+            keepDebugSymbols += [
+                '*/mips/*.so',
+                '*/mips64/*.so'
+            ]
        }
        resources {
-            excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE']
+            excludes += [
+                'LICENSE.txt',
+                'LICENSE',
+                'NOTICE',
+                'asm-license.txt',
+                'META-INF/LICENSE',
+                'META-INF/NOTICE'
+            ]
        }
    }

@@ -130,7 +141,9 @@ android {

    buildTypes {
        debug {
-            minifyEnabled false
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            testProguardFiles 'test-proguard-rules.pro'
            applicationIdSuffix ".beta"
        }
        release {
@@ -144,21 +157,22 @@ android {
            // nb: it is highly recommended to use the same settings in debug+release -
            // otherwise problems might be noticed delayed only
            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            testProguardFiles 'test-proguard-rules.pro'
            productFlavors.foss.signingConfig signingConfigs.releaseFdroid
            productFlavors.gplay.signingConfig signingConfigs.releaseApk
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }

    if(!project.hasProperty("ABI_FILTER")) {
-      splits {
-        abi {
-            enable true
-            reset()
-            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            universalApk true
+        splits {
+            abi {
+                enable true
+                reset()
+                include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+                universalApk true
+            }
        }
-      }
    }

    project.ext.versionCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
@@ -166,16 +180,16 @@ android {
    android.applicationVariants.all { variant ->
        variant.outputs.all { output ->
            output.outputFileName = output.outputFileName
-                .replace("android", "ArcaneChat")
-                .replace("-release", "")
-                .replace(".apk", "-${variant.versionName}.apk")
+                    .replace("android", "ArcaneChat")
+                    .replace("-release", "")
+                    .replace(".apk", "-${variant.versionName}.apk")
            if(project.hasProperty("ABI_FILTER")) {
-              output.versionCodeOverride =
-                variant.versionCode * 10 + project.ext.versionCodes.get(ABI_FILTER)
+                output.versionCodeOverride =
+                        variant.versionCode * 10 + project.ext.versionCodes.get(ABI_FILTER)
            } else {
-              output.versionCodeOverride =
-                variant.versionCode * 10 + project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 4)
-           }
+                output.versionCodeOverride =
+                        variant.versionCode * 10 + project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 4)
+            }
        }
    }

@@ -196,7 +210,31 @@ android {
        renderScript true
        aidl true
    }
+}

+spotless {
+    java {
+        target 'src/*/java/**/*.java'
+        targetExclude 'src/main/java/chat/delta/**' // ignore auto-generated code
+        googleJavaFormat()  // Google style = 2-space indent, matches Android Studio defaults
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    format 'xml', {
+        target 'src/*/res/**/*.xml', 'src/*/AndroidManifest.xml'
+        targetExclude 'src/*/res/values*/strings.xml' // line-break changes invalidate translations
+        eclipseWtp('xml').configFile('spotless/eclipse-wtp-xml.prefs')
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    groovyGradle {
+        target '*.gradle'
+        greclipse()
+        leadingTabsToSpaces(4)
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
 }

 final def  markwon_version =  '4.6.2'
@@ -208,10 +246,18 @@ dependencies {
    implementation "io.noties.markwon:inline-parser:$markwon_version"
    implementation 'com.airbnb.android:lottie:4.2.2' // Lottie animations support.

+    def media3_version = "1.8.0"   // 1.9.0 need minSdkVersion 23
+
+    implementation 'androidx.concurrent:concurrent-futures:1.3.0'
+    implementation 'androidx.core:core:1.17.0'
+    implementation 'androidx.core:core-telecom:1.0.1'
+    implementation 'im.conversations.webrtc:webrtc-android:129.0.0'
+    // For Kotlin->Java interpolation
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.4'
    implementation 'androidx.sharetarget:sharetarget:1.2.0'
-    implementation 'androidx.webkit:webkit:1.12.1'
+    implementation 'androidx.webkit:webkit:1.14.0'
    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
    implementation 'com.google.android.material:material:1.12.0'
    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
    implementation ('androidx.preference:preference:1.2.1') {
@@ -219,7 +265,7 @@ dependencies {
        exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
    }
    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.3.7'
+    implementation 'androidx.exifinterface:exifinterface:1.4.1'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
    implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
@@ -227,58 +273,57 @@ dependencies {
    implementation 'androidx.work:work-runtime:2.9.1'
    implementation 'androidx.emoji2:emoji2-emojipicker:1.5.0'
    implementation 'com.google.guava:guava:31.1-android'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // plays video and audio
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1' // FIXME: exoplayer dependencies kept for Video, but we shall migrate them at some point
    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'
+    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation "androidx.media3:media3-session:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
    implementation 'com.google.zxing:core:3.3.0' // fixed version to support SDK<24
    implementation ('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false } // QR Code scanner
    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' // used as JSON library
-    implementation 'com.google.code.gson:gson:2.12.1' // used as JSON library.
-    implementation "me.leolin:ShortcutBadger:1.1.16" // display messagecount on the home screen icon.
-    implementation 'com.jpardogo.materialtabstrip:library:1.0.9' // used in the emoji selector for the tab selection.
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3' // does the zooming on photos / media
-    implementation 'com.github.penfeizhou.android.animation:awebp:3.0.2' // animated webp support.
+    implementation 'com.github.Baseflow:PhotoView:2.3.0' // does the zooming on photos / media
    implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
    annotationProcessor 'androidx.annotation:annotation:1.9.1'
-    implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
-    implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
+    implementation 'com.makeramen:roundedimageview:2.3.0' // crops the avatars to circles
    implementation 'com.github.amulyakhare:TextDrawable:558677ea31'  // number of unread messages,
    // the one-letter circle for the contacts (when there is not avatar) and a white background.
    implementation 'com.googlecode.mp4parser:isoparser:1.0.6' // MP4 recoding; upgrading eg. to 1.1.22 breaks recoding, however, i have not investigated further, just reset to 1.0.6
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { // for the zooming on photos / media
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0') {
+        // for the zooming on photos / media
        exclude group: 'com.android.support', module: 'support-annotations'
    }
-    implementation 'com.annimon:stream:1.1.8' // brings future java streams api to SDK Version < 24

    // Replacement for ContentResolver
    // that protects against the Surreptitious Sharing attack.
    // <https://github.com/cketti/SafeContentResolver>
    implementation 'de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0'

-    gplayImplementation('com.google.firebase:firebase-messaging:24.1.0') { // for PUSH notifications
+    gplayImplementation('com.google.firebase:firebase-messaging:24.1.2') {
+        // for PUSH notifications, don't upgrade: v25.0.0 requires minSdk>=23
        exclude group: 'com.google.firebase', module: 'firebase-core'
        exclude group: 'com.google.firebase', module: 'firebase-analytics'
        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
    }

    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.assertj:assertj-core:1.7.1'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
+    testImplementation 'org.assertj:assertj-core:3.27.3'
+    testImplementation 'org.mockito:mockito-core:5.18.0'
+    testImplementation 'org.powermock:powermock-api-mockito:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9'
+    testImplementation 'org.powermock:powermock-classloading-xstream:2.0.9'

-    androidTestImplementation 'androidx.test:runner:1.6.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
-    androidTestImplementation 'androidx.test:rules:1.6.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:runner:1.7.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.7.0'
+    androidTestImplementation 'androidx.test:rules:1.7.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
    androidTestImplementation 'com.android.support:support-annotations:28.0.0'

-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
+    androidTestImplementation ('org.assertj:assertj-core:3.27.3') {
        exclude group: 'org.hamcrest', module: 'hamcrest-core'
    }
 }
@@ -1,12 +1,14 @@
 ArcaneChat is a decentralized and secure instant messenger that is easy to use for friends and family.

-• Anonymous. Instant onboarding without a phone number, e-mail or other private data.
+• Private. Instant on-boarding without a phone number or other private data.
+
+• Friends & Family: Only chat with people you know. Unknown users cannot message or follow you without mutual consent.

 • Flexible. Supports multiple chat profiles and is easy to setup on multiple devices.

 • Extensible. Use mini-apps in chats like shopping lists, calendars or games.

-• Reliable. Works under bad and adverserial network conditions.
+• Reliable. Works under bad and adversarial network conditions.

 • Secure. Audited End-to-End encryption safe against network and server attacks.

@@ -23,17 +25,14 @@ ArcaneChat is a Delta Chat client and was created with a focus on usability, goo
 <li>Multiple color themes/skins</li>
 <li>It is possible to disable profiles to completely disconnect them saving data/bandwidth</li>
 <li>You can easily see the connection status of all your profiles in the profile switcher</li>
-<li>A videochat instance is set by default</li>
 <li>Extra option to share location for 12 hours</li>
 <li>Clicking on a message with a POI location, will open the POI on the map</li>
 <li>Last-seen status of contacts is shown in your contact list, like in WhatsApp, Telegram, etc.</li>
 <li>Videos are played in loop, useful for short GIF videos</li>
-<li>Verified icon is shown in the chat list for the "Device Messages" chat</li>
+<li>Verified icon is shown in the chat list for the "Device Messages" and "Saved Messages" chat to avoid fishing attempts by scammer pretending to be the official chats</li>
 <li>Voice messages have more aggressive compression in "worse quality" mode to save data plan</li>
 <li>Automatic download of messages limited to 640KB by default</li>
 <li>Profile's display name is always shown in the app's title bar instead of the name of the app</li>
-<li>Your avatar is visible to other users in Mailing Lists</li>
-<li>Can be selected as app to open .xdc files</li>
 <li>For mini-apps developers: there are some extra features in the WebXDC API, check https://github.com/ArcaneChat/android/#webxdc</li>
 <li>Better settings organization with additional "Privacy" section</li>
 </ul>
@@ -0,0 +1,36 @@
+ArcaneChat — децентрализованный и защищённый мессенджер, удобный для друзей и семьи.
+
+• Анонимность. Мгновенный вход без номера телефона, e-mail или других личных данных.
+
+• Гибкость. Поддерживает несколько профилей чатов и легко настраивается на нескольких устройствах.
+
+• Расширяемость. В чатах можно использовать мини-приложения: списки покупок, календари или игры.
+
+• Надёжность. Работает даже при плохом соединении и в сложных сетевых условиях.
+
+• Безопасность. Проверенное сквозное шифрование, защищённое от сетевых и серверных атак.
+
+• Самостоятельность. Может работать с вашим собственным e-mail-адресом или сервером.
+
+ArcaneChat — клиент Delta Chat, разработанный с акцентом на удобство, качественный UX и экономию трафика. Также приложение часто экспериментирует с новыми функциями, которые со временем могут быть добавлены в официальный клиент Delta Chat.
+
+<b>Основные отличия от официального клиента Delta Chat:</b>
+
+<ul>
+<li>Поддержка некоторых стилей markdown в текстовых сообщениях (жирный, курсив, зачёркнутый и т.д.)</li>
+<li>Поддержка отображения анимированных стикеров Telegram (.tgs-файлы)</li>
+<li>Поддержка предпросмотра SVG-изображений</li>
+<li>Несколько цветовых тем/скинов</li>
+<li>Возможность отключать профили, полностью отключая им доступ в сеть для экономии трафика</li>
+<li>На панели переключения профилей видно состояние подключения каждого профиля</li>
+<li>Дополнительная опция для обмена местоположением на 12 часов</li>
+<li>Нажатие на сообщение с POI открывает его на карте</li>
+<li>Статус «был(а) в сети» отображается в списке контактов, как в WhatsApp, Telegram и т.д.</li>
+<li>Видео воспроизводятся по кругу — удобно для коротких GIF-видео</li>
+<li>У чата «Device Messages» в списке чатов отображается значок подтверждения</li>
+<li>В режиме «низкое качество» голосовые сообщения сжимаются сильнее для экономии трафика</li>
+<li>Автоматическая загрузка сообщений по умолчанию ограничена 640KB</li>
+<li>Отображаемое имя профиля всегда видно в заголовке приложения вместо названия приложения</li>
+<li>Для разработчиков мини-приложений: доступны дополнительные возможности WebXDC API, см. https://github.com/ArcaneChat/android/#webxdc</li>
+<li>Более удобная организация настроек с дополнительным разделом «Privacy»</li>
+</ul>
@@ -0,0 +1 @@
+⚡ Быстрые зашифрованные чаты для семьи 🎉
@@ -0,0 +1 @@
+ArcaneChat
@@ -7,11 +7,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1733948466,
-        "narHash": "sha256-o/uq/tU458Ykudi8Zk3sRga5iazkuSczt9wDOCUDOSU=",
+        "lastModified": 1775939535,
+        "narHash": "sha256-Zq1U7Vhw5ctvhJQy+3ShqIv7Mplf3XkgJY+QJnhfUGQ=",
        "owner": "tadfisher",
        "repo": "android-nixpkgs",
-        "rev": "0bf99ffaea6a7c0948ae10cf2e40c2905e4e4d6b",
+        "rev": "d2e16192309bf3101e4998ffa62e914819dee077",
        "type": "github"
      },
      "original": {
@@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "lastModified": 1768818222,
+        "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
        "type": "github"
      },
      "original": {
@@ -79,11 +79,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1733759999,
-        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1733749988,
-        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
+        "lastModified": 1775823930,
+        "narHash": "sha256-ALT447J7FcxP/97J01A/gp/hgdO5lXRsm+zLMt+gIjc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
+        "rev": "8c11f88bb9573a10a7d6bf87161ef08455ac70b9",
        "type": "github"
      },
      "original": {
@@ -111,11 +111,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
        "type": "github"
      },
      "original": {
@@ -138,11 +138,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1733970833,
-        "narHash": "sha256-sPEKtSaZk2CtfF9cdhtbY93S6qGq+d2PKI1fcoDfDaI=",
+        "lastModified": 1775877051,
+        "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "f7f4c59ccdf1bec3f1547d27398e9589aa94e3e8",
+        "rev": "08b4f3633471874c8894632ade1b78d75dbda002",
        "type": "github"
      },
      "original": {
@@ -15,19 +15,23 @@
        pkgs = import nixpkgs { inherit system overlays; };
        android-sdk = android.sdk.${system} (sdkPkgs:
          with sdkPkgs; [
-            build-tools-34-0-0
+            build-tools-35-0-0
            cmdline-tools-latest
            platform-tools
-            platforms-android-34
-            ndk-27-0-11902837
+            platforms-android-36
+            ndk-27-2-12479018
          ]);
        rust-version = pkgs.lib.removeSuffix "\n"
          (builtins.readFile ./scripts/rust-toolchain);
-      in {
-        devShells.default = pkgs.mkShell {
+      in
+      {
+        formatter = pkgs.nixpkgs-fmt;
+
+        devShells.default = pkgs.mkShell rec {
          ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
          ANDROID_NDK_ROOT =
-            "${android-sdk}/share/android-sdk/ndk/27.0.11902837";
+            "${android-sdk}/share/android-sdk/ndk/27.2.12479018";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/35.0.0/aapt2";
          buildInputs = [
            android-sdk
            pkgs.openjdk17
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -153,6 +153,42 @@ static uint32_t* jintArray2uint32Pointer(JNIEnv* env, jintArray ja, int* ret_icn
 }


+/************************************************************
+ * DcEventChannel
+ ************************************************************/
+
+static dc_event_channel_t* get_dc_event_channel(JNIEnv *env, jobject obj)
+{
+    static jfieldID fid = 0;
+    if (fid==0) {
+        jclass cls = (*env)->GetObjectClass(env, obj);
+        fid = (*env)->GetFieldID(env, cls, "eventChannelCPtr", "J" /*Signature, J=long*/);
+    }
+    if (fid) {
+        return (dc_event_channel_t*)(*env)->GetLongField(env, obj, fid);
+    }
+    return NULL;
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcEventChannel_createEventChannelCPtr(JNIEnv *env, jobject obj)
+{
+    return (jlong)dc_event_channel_new();
+}
+
+
+JNIEXPORT void Java_com_b44t_messenger_DcEventChannel_unrefEventChannelCPtr(JNIEnv *env, jobject obj)
+{
+    dc_event_channel_unref(get_dc_event_channel(env, obj));
+}
+
+
+JNIEXPORT jlong Java_com_b44t_messenger_DcEventChannel_getEventEmitterCPtr(JNIEnv *env, jobject obj)
+{
+    return (jlong)dc_event_channel_get_event_emitter(get_dc_event_channel(env, obj));
+}
+
+
 /*******************************************************************************
 * DcAccounts
 ******************************************************************************/
@@ -172,11 +208,11 @@ static dc_accounts_t* get_dc_accounts(JNIEnv *env, jobject obj)
 }


-JNIEXPORT jlong Java_com_b44t_messenger_DcAccounts_createAccountsCPtr(JNIEnv *env, jobject obj, jstring dir)
+JNIEXPORT jlong Java_com_b44t_messenger_DcAccounts_createAccountsCPtr(JNIEnv *env, jobject obj, jstring dir, jobject chanObj)
 {
    CHAR_REF(dir);
        int writable = 1;
-        jlong accountsCPtr = (jlong)dc_accounts_new(dirPtr, writable);
+        jlong accountsCPtr = (jlong)dc_accounts_new_with_event_channel(dirPtr, writable, get_dc_event_channel(env, chanObj));
    CHAR_UNREF(dir);
    return accountsCPtr;
 }
@@ -231,6 +267,12 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcAccounts_backgroundFetch(JNIEnv *en
 }


+JNIEXPORT void Java_com_b44t_messenger_DcAccounts_stopBackgroundFetch(JNIEnv *env, jobject obj)
+{
+    dc_accounts_stop_background_fetch(get_dc_accounts(env, obj));
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_migrateAccount(JNIEnv *env, jobject obj, jstring dbfile)
 {
    CHAR_REF(dbfile);
@@ -536,10 +578,10 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_createChatByContactId(JNIEnv *e
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcContext_createGroupChat(JNIEnv *env, jobject obj, jboolean verified, jstring name)
+JNIEXPORT jint Java_com_b44t_messenger_DcContext_createGroupChat(JNIEnv *env, jobject obj, jstring name)
 {
    CHAR_REF(name);
-        jint ret = (jint)dc_create_group_chat(get_dc_context(env, obj), verified, namePtr);
+        jint ret = (jint)dc_create_group_chat(get_dc_context(env, obj), 0, namePtr);
    CHAR_UNREF(name);
    return ret;
 }
@@ -735,12 +777,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendTextMsg(JNIEnv *env, jobjec
 }


-JNIEXPORT jint Java_com_b44t_messenger_DcContext_sendVideochatInvitation(JNIEnv *env, jobject obj, jint chat_id)
-{
-    return (jint)dc_send_videochat_invitation(get_dc_context(env, obj), chat_id);
-}
-
-
 JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_sendWebxdcStatusUpdate(JNIEnv *env, jobject obj, jint msg_id, jstring payload)
 {
    CHAR_REF(payload);
@@ -910,27 +946,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContext_getContactEncrInfo(JNIEnv *e
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcContext_initiateKeyTransfer(JNIEnv *env, jobject obj)
-{
-    jstring setup_code = NULL;
-    char* temp = dc_initiate_key_transfer(get_dc_context(env, obj));
-    if (temp) {
-        setup_code = JSTRING_NEW(temp);
-        dc_str_unref(temp);
-    }
-    return setup_code;
-}
-
-
-JNIEXPORT jboolean Java_com_b44t_messenger_DcContext_continueKeyTransfer(JNIEnv *env, jobject obj, jint msg_id, jstring setupCode)
-{
-    CHAR_REF(setupCode);
-        jboolean ret = dc_continue_key_transfer(get_dc_context(env, obj), msg_id, setupCodePtr);
-    CHAR_UNREF(setupCode);
-    return ret;
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcContext_imex(JNIEnv *env, jobject obj, jint what, jstring dir)
 {
    CHAR_REF(dir);
@@ -1246,6 +1261,12 @@ JNIEXPORT jint Java_com_b44t_messenger_DcChat_getColor(JNIEnv *env, jobject obj)
 }


+JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isEncrypted(JNIEnv *env, jobject obj)
+{
+    return dc_chat_is_encrypted(get_dc_chat(env, obj))!=0;
+}
+
+
 JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isUnpromoted(JNIEnv *env, jobject obj)
 {
    return dc_chat_is_unpromoted(get_dc_chat(env, obj))!=0;
@@ -1270,16 +1291,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_canSend(JNIEnv *env, jobject o
 }


-JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isProtected(JNIEnv *env, jobject obj)
-{
-    return dc_chat_is_protected(get_dc_chat(env, obj))!=0;
-}
-
-JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isProtectionBroken(JNIEnv *env, jobject obj)
-{
-    return dc_chat_is_protection_broken(get_dc_chat(env, obj))!=0;
-}
-

 JNIEXPORT jboolean Java_com_b44t_messenger_DcChat_isSendingLocations(JNIEnv *env, jobject obj)
 {
@@ -1382,11 +1393,6 @@ JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getId(JNIEnv *env, jobject obj)
    return dc_msg_get_id(get_dc_msg(env, obj));
 }

-JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getSenderColor(JNIEnv *env, jobject obj)
-{
-  return dc_msg_get_sender_color(get_dc_msg(env, obj));
-}
-
 JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getText(JNIEnv *env, jobject obj)
 {
    char* temp = dc_msg_get_text(get_dc_msg(env, obj));
@@ -1441,6 +1447,12 @@ JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getInfoType(JNIEnv *env, jobject ob
 }


+JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getInfoContactId(JNIEnv *env, jobject obj)
+{
+    return dc_msg_get_info_contact_id(get_dc_msg(env, obj));
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getState(JNIEnv *env, jobject obj)
 {
    return dc_msg_get_state(get_dc_msg(env, obj));
@@ -1600,42 +1612,12 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isInfo(JNIEnv *env, jobject obj
 }


-JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_isSetupMessage(JNIEnv *env, jobject obj)
-{
-    return dc_msg_is_setupmessage(get_dc_msg(env, obj));
-}
-
-
 JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_hasHtml(JNIEnv *env, jobject obj)
 {
    return dc_msg_has_html(get_dc_msg(env, obj))!=0;
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getSetupCodeBegin(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_msg_get_setupcodebegin(get_dc_msg(env, obj));
-        jstring ret =  JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
-JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getVideochatUrl(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_msg_get_videochat_url(get_dc_msg(env, obj));
-        jstring ret =  JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
-JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getVideochatType(JNIEnv *env, jobject obj)
-{
-    return (jint)dc_msg_get_videochat_type(get_dc_msg(env, obj));
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_setSubject(JNIEnv *env, jobject obj, jstring text)
 {
    CHAR_REF(text);
@@ -1823,15 +1805,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getAddr(JNIEnv *env, jobject
 }


-JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getNameNAddr(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_contact_get_name_n_addr(get_dc_contact(env, obj));
-        jstring ret = JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
 JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getProfileImage(JNIEnv *env, jobject obj)
 {
    char* temp = dc_contact_get_profile_image(get_dc_contact(env, obj));
@@ -1879,6 +1852,12 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isVerified(JNIEnv *env, job
 }


+JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isKeyContact(JNIEnv *env, jobject obj)
+{
+    return dc_contact_is_key_contact(get_dc_contact(env, obj))==1;
+}
+
+
 JNIEXPORT jint Java_com_b44t_messenger_DcContact_getVerifierId(JNIEnv *env, jobject obj)
 {
    return dc_contact_get_verifier_id(get_dc_contact(env, obj));
@@ -1993,7 +1972,7 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQr(JNIEnv *env, jo

 JNIEXPORT jstring Java_com_b44t_messenger_DcBackupProvider_getQrSvg(JNIEnv *env, jobject obj)
 {
-    char* temp = dc_backup_provider_get_qr_svg(get_dc_backup_provider(env, obj));
+    char* temp = dc_create_qr_svg(dc_backup_provider_get_qr(get_dc_backup_provider(env, obj)));
        jstring ret = JSTRING_NEW(temp);
    dc_str_unref(temp);
    return ret;
@@ -0,0 +1,83 @@
+.PHONY: apk
+apk:
+	./scripts/rebrand.sh
+	./gradlew --offline assembleGplayRelease
+	./scripts/undo_rebrand.sh
+
+.PHONY: aab
+aab:
+	./scripts/rebrand.sh
+	sed -i 's/signingConfigs.releaseApk/signingConfigs.releaseBundle/g' build.gradle
+	./gradlew --offline bundleGplayRelease
+	sed -i 's/signingConfigs.releaseBundle/signingConfigs.releaseApk/g' build.gradle
+	./scripts/undo_rebrand.sh
+
+.PHONY: foss
+foss:
+	./scripts/rebrand.sh
+	./gradlew --offline assembleFossRelease
+	./scripts/undo_rebrand.sh
+
+.PHONY: install
+install:
+	adb -d install -r build/outputs/apk/gplay/release/*universal*.apk
+
+.PHONY: emulator-install
+emulator-install:
+	adb install -r build/outputs/apk/gplay/release/*universal*.apk
+
+.PHONY: fetch
+fetch:
+	git fetch upstream
+
+.PHONY: clean
+clean:
+	./gradlew --offline clean
+
+
+# CORE:
+
+.PHONY: fetch-core
+fetch-core:
+	cd ../core && git fetch upstream
+
+.PHONY: core
+core:
+	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
+	./scripts/ndk-make.sh; true
+	./scripts/undo_rebrand.sh
+	mv jni/deltachat-core-rust ../core
+	mkdir jni/deltachat-core-rust
+
+.PHONY: core-fast
+core-fast:
+	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
+	./scripts/ndk-make.sh arm64-v8a; true
+	./scripts/undo_rebrand.sh
+	mv jni/deltachat-core-rust ../core
+	mkdir jni/deltachat-core-rust
+
+.PHONY: core-v7
+core-v7:
+	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
+	./scripts/ndk-make.sh armeabi-v7a; true
+	./scripts/undo_rebrand.sh
+	mv jni/deltachat-core-rust ../core
+	mkdir jni/deltachat-core-rust
+
+.PHONY: core-x86
+core-x86:
+	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
+	./scripts/ndk-make.sh x86; true
+	./scripts/undo_rebrand.sh
+	mv jni/deltachat-core-rust ../core
+	mkdir jni/deltachat-core-rust
+
+.PHONY: link
+link:
+	rmdir jni/deltachat-core-rust; mv ../core jni/deltachat-core-rust; true
+
+.PHONY: unlink
+unlink:
+	mv jni/deltachat-core-rust ../core
+	mkdir jni/deltachat-core-rust
@@ -1 +0,0 @@
-Schreibe Nachrichten mit E-Mails. Retro, Offen. Privatsphäre im Design.
@@ -1,12 +0,0 @@
-Delta Chat é um aplicativo de mensagens que é completamente compatível com a infraestrutura de email já existente.
-Assim, com o Delta Chat você tem a facilidade de muitos aplicativos de mensagens com o alcance de email. Além disso, você é independente de outras companhias e sercviços -- já que suas informações e dados não estão relacionadas com o Delta Chat, você não vai nem adicionar novas permissões aqui.
-Resumo de alguns recursos:
-* Seguro com criptografia de ponta a ponta, com suporte ao novo padrão  <a href="https://autocrypt.org">Autocrypt</a> 
-* Rápido usando Push-IMAP
-* Maior base de usuários -- destinatários que não estiverem usando Delta Chat podem ser alcançados também
-* Compatívle -- não apenas consigo mesmo
-* Interface de usuário elegante e simples
-* Sistema distribuído
-* Sem spam -- apenas mensages de usuários conhecidos são mostradas por padrão
-* Confiável -- pode até ser usado para mensagens comerciais
-* Completamente OpenSource e baseado em padrões
@@ -1,15 +1,10 @@
 # native methods
 -keep class com.b44t.messenger.** { * ; }

-# Gson uses generic type information stored in a class file when working with
-# fields. Proguard removes such information by default, keep it.
-keepattributes Signature
-# This is also needed for R8 in compat mode since multiple
-# optimizations will remove the generic signature such as class
-# merging and argument removal. See:
-# https://r8.googlesource.com/r8/+/refs/heads/main/compatibility-faq.md#troubleshooting-gson-gson
-keep class com.google.gson.reflect.TypeToken { *; }
-keep class * extends com.google.gson.reflect.TypeToken
+# Keep metadata needed by the JSON parser
+-keep class chat.delta.rpc.** { * ; }
+-keepattributes *Annotation*,EnclosingMethod,Signature
+-keepnames class com.fasterxml.jackson.** { *; }

 # bug with video recoder
 -keep class com.coremedia.iso.** { *; }
@@ -18,3 +13,8 @@
 -keep class org.thoughtcrime.securesms.crypto.KeyStoreHelper* { *; }

 -dontwarn com.google.firebase.analytics.connector.AnalyticsConnector
+
+# Keep WebRTC classes
+-keep class org.webrtc.** { *; }
+-keepclassmembers class org.webrtc.** { *; }
+-keepattributes InnerClasses
@@ -1 +1,2 @@
+rm src/main/assets/help/*.png
 ../deltachat-pages/tools/create-local-help.py ../deltachat-pages/result src/main/assets/help
@@ -11,13 +11,13 @@ echo "==================== ANDROID USAGE ===================="
 grep --exclude={*.apk,*.a,*.o,*.so,strings.xml,*symbols.zip} --exclude-dir={.git,.gradle,obj,release,.idea,build,deltachat-core-rust} -ri $TEXT .

 echo "==================== IOS USAGE ===================="
-grep --exclude=*.strings --exclude-dir={.git,libraries,Pods,deltachat-ios.xcodeproj,deltachat-ios.xcworkspace} -ri $TEXT ../deltachat-ios/
+grep --exclude=*.strings* --exclude-dir={.git,libraries,Pods,deltachat-ios.xcodeproj,deltachat-ios.xcworkspace} -ri $TEXT ../deltachat-ios/

 echo "==================== DESKTOP USAGE ===================="
 grep --exclude-dir={.cache,.git,html-dist,node_modules,_locales} -ri $TEXT ../deltachat-desktop/

 echo "==================== JSONRPC USAGE ===================="
-grep  --exclude-dir={.git} -ri $TEXT ../deltachat-core-rust/deltachat-jsonrpc
+grep  --exclude-dir={.git} -ri $TEXT ../chatmail/core/deltachat-jsonrpc

 echo "==================== UBUNTU TOUCH USAGE ===================="
 grep  --exclude-dir={.git} -ri $TEXT ../deltatouch/
@@ -53,7 +53,6 @@ fi
 # for reproducible build:
 export RUSTFLAGS="-C link-args=-Wl,--build-id=none --remap-path-prefix=$HOME/.cargo= --remap-path-prefix=$(realpath $(dirname $(dirname "$0")))="
 export SOURCE_DATE_EPOCH=1
-export CARGO_TARGET_DIR=/tmp/arcanechat-build
 # always use the same path to NDK:
 rm -f /tmp/android-ndk-root
 ln -s "$ANDROID_NDK_ROOT" /tmp/android-ndk-root
@@ -74,6 +73,10 @@ if test -z "$NDK_HOST_TAG"; then
    NDK_HOST_TAG="$KERNEL-$ARCH"
 fi

+if test -z "$CARGO_TARGET_DIR"; then
+    export CARGO_TARGET_DIR=/tmp/arcanechat-build
+fi
+
 TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
 export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang"
 export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang"
@@ -127,7 +130,7 @@ if test -z $1 || test $1 = armeabi-v7a; then
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
    cargo build $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi
-    cp $CARGO_TARGET_DIR/armv7-linux-androideabi/$RELEASE/libdeltachat.a $jnidir/armeabi-v7a
+    cp "$CARGO_TARGET_DIR/armv7-linux-androideabi/$RELEASE/libdeltachat.a" "$jnidir/armeabi-v7a"
 fi

 if test -z $1 || test $1 = arm64-v8a; then
@@ -136,7 +139,7 @@ if test -z $1 || test $1 = arm64-v8a; then
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
    cargo build $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi
-    cp $CARGO_TARGET_DIR/aarch64-linux-android/$RELEASE/libdeltachat.a $jnidir/arm64-v8a
+    cp "$CARGO_TARGET_DIR/aarch64-linux-android/$RELEASE/libdeltachat.a" "$jnidir/arm64-v8a"
 fi

 if test -z $1 || test $1 = x86; then
@@ -145,17 +148,17 @@ if test -z $1 || test $1 = x86; then
    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
    cargo build $RELEASEFLAG --target i686-linux-android -p deltachat_ffi
-    cp $CARGO_TARGET_DIR/i686-linux-android/$RELEASE/libdeltachat.a $jnidir/x86
+    cp "$CARGO_TARGET_DIR/i686-linux-android/$RELEASE/libdeltachat.a" "$jnidir/x86"
 fi

- if test -z $1 || test $1 = x86_64; then
-     echo "-- cross compiling to x86_64-linux-android (x86_64) --"
-     TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
-     TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
-     TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-     cargo build $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi
-     cp $CARGO_TARGET_DIR/x86_64-linux-android/$RELEASE/libdeltachat.a $jnidir/x86_64
- fi
+if test -z $1 || test $1 = x86_64; then
+    echo "-- cross compiling to x86_64-linux-android (x86_64) --"
+    TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
+    TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+    TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
+    cargo build $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi
+    cp "$CARGO_TARGET_DIR/x86_64-linux-android/$RELEASE/libdeltachat.a" "$jnidir/x86_64"
+fi

 echo -- ndk-build --

@@ -1,7 +1,9 @@
 #!/bin/sh

-# replace Delta Chat with ArcaneChat
 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/get.delta.chat/github.com\/ArcaneChat/g'
 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/Delta Chat/ArcaneChat/g'
+
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/get.delta.chat/github.com\/ArcaneChat/g'
+find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/delta.chat\/donate/arcanechat.me\/#contribute/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/Delta Chat/ArcaneChat/g'
+find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/❤️/💜/g'
@@ -1 +1 @@
-1.83.0
+1.91.1
@@ -2,6 +2,11 @@

 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/github.com\/ArcaneChat/get.delta.chat/g'
 find ./src/main/assets/help/ -type f -name '*.html' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
+
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/github.com\/ArcaneChat/get.delta.chat/g'
+find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/arcanechat.me\/#contribute/delta.chat\/donate/g'
 find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/ArcaneChat/Delta Chat/g'
+find ./src/ -type f -name 'strings.xml' | xargs sed -i 's/💜/❤️/g'
+
+# don't revert the app name
 sed -i 's/>Delta Chat</>ArcaneChat</g' ./src/main/res/values/strings.xml
@@ -0,0 +1,12 @@
+#!/bin/sh
+# you need to have dcrpcgen
+
+# generate schema.json
+ROOT_DIR=$PWD
+cd ./jni/deltachat-core-rust/deltachat-rpc-server
+cargo run -- --openrpc > "$ROOT_DIR/schema.json"
+cd "$ROOT_DIR"
+
+# generate code
+dcrpcgen java --schema schema.json -o ./src/main/java/
+rm schema.json
@@ -1,5 +1,6 @@
 pluginManagement {
    repositories {
+        gradlePluginPortal()
        google()
        mavenCentral()
    }
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+lineWidth=100
+splitMultiAttrs=true
+indentMultipleAttributes=true
+indentationChar=space
+indentationSize=4
+spaceBeforeEmptyCloseTag=true
@@ -11,7 +11,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.UiController;
@@ -19,7 +18,6 @@ import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.util.TreeIterables;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
-
 import org.hamcrest.Matcher;
 import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
@@ -60,10 +58,12 @@ public class TestUtils {
  }

  @NonNull
-  public static ActivityScenarioRule<ConversationListActivity> getOfflineActivityRule(boolean useExistingChats) {
+  public static ActivityScenarioRule<ConversationListActivity> getOfflineActivityRule(
+      boolean useExistingChats) {
    Intent intent =
-            Intent.makeMainActivity(
-                    new ComponentName(getInstrumentation().getTargetContext(), ConversationListActivity.class));
+        Intent.makeMainActivity(
+            new ComponentName(
+                getInstrumentation().getTargetContext(), ConversationListActivity.class));
    if (!useExistingChats) {
      createOfflineAccount();
    }
@@ -72,18 +72,22 @@ public class TestUtils {
  }

  @NonNull
-  public static <T extends Activity> ActivityScenarioRule<T> getOnlineActivityRule(Class<T> activityClass) {
+  public static <T extends Activity> ActivityScenarioRule<T> getOnlineActivityRule(
+      Class<T> activityClass) {
    Context context = getInstrumentation().getTargetContext();
    AccountManager.getInstance().beginAccountCreation(context);
    prepare();
-    return new ActivityScenarioRule<>(new Intent(getInstrumentation().getTargetContext(), activityClass));
+    return new ActivityScenarioRule<>(
+        new Intent(getInstrumentation().getTargetContext(), activityClass));
  }

  private static void prepare() {
-    Prefs.setBooleanPreference(getInstrumentation().getTargetContext(), Prefs.DOZE_ASKED_DIRECTLY, true);
+    Prefs.setBooleanPreference(
+        getInstrumentation().getTargetContext(), Prefs.DOZE_ASKED_DIRECTLY, true);
    if (!AccessibilityUtil.areAnimationsDisabled(getInstrumentation().getTargetContext())) {
-      throw new RuntimeException("To run the tests, disable animations at Developer options' " +
-              "-> 'Window/Transition/Animator animation scale' -> Set all 3 to 'off'");
+      throw new RuntimeException(
+          "To run the tests, disable animations at Developer options' "
+              + "-> 'Window/Transition/Animator animation scale' -> Set all 3 to 'off'");
    }
  }

@@ -116,26 +120,22 @@ public class TestUtils {
        }

        throw new NoMatchingViewException.Builder()
-                .withRootView(view)
-                .withViewMatcher(matcher)
-                .build();
+            .withRootView(view)
+            .withViewMatcher(matcher)
+            .build();
      }
    };
  }

  /**
-   * Perform action of implicitly waiting for a certain view.
-   * This differs from EspressoExtensions.searchFor in that,
-   * upon failure to locate an element, it will fetch a new root view
-   * in which to traverse searching for our @param match
+   * Perform action of implicitly waiting for a certain view. This differs from
+   * EspressoExtensions.searchFor in that, upon failure to locate an element, it will fetch a new
+   * root view in which to traverse searching for our @param match
   *
   * @param viewMatcher ViewMatcher used to find our view
   */
  public static ViewInteraction waitForView(
-          Matcher<View> viewMatcher,
-          int waitMillis,
-          int waitMillisPerTry
-  ) {
+      Matcher<View> viewMatcher, int waitMillis, int waitMillisPerTry) {

    // Derive the max tries
    int maxTries = (int) (waitMillis / waitMillisPerTry);
@@ -164,12 +164,11 @@ public class TestUtils {
  }

  /**
-   * Normally, you would do
-   * onView(withId(R.id.send_button)).perform(click());
-   * to send the draft message. However, in order to change the send button to the attach button
-   * while there is no draft, the send button is made invisible and the attach button is made
-   * visible instead. This confuses the test framework.<br/><br/>
-   *
+   * Normally, you would do onView(withId(R.id.send_button)).perform(click()); to send the draft
+   * message. However, in order to change the send button to the attach button while there is no
+   * draft, the send button is made invisible and the attach button is made visible instead. This
+   * confuses the test framework.<br>
+   * <br>
   * So, this is a workaround for pressing the send button.
   */
  public static void pressSend() {
@@ -10,14 +10,11 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;

 import android.util.Log;
-
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.TestUtils;
-
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -34,18 +31,19 @@ public class EnterChatsBenchmark {
  // ==============================================================================================
  // Set this to true if you already have at least 10 chats on your existing DeltaChat installation
  // and want to traverse through them instead of 10 newly created chats
-  private final static boolean USE_EXISTING_CHATS = false;
+  private static final boolean USE_EXISTING_CHATS = false;
  // ==============================================================================================
-  private final static int GO_THROUGH_ALL_CHATS_N_TIMES = 8;
+  private static final int GO_THROUGH_ALL_CHATS_N_TIMES = 8;

  // ==============================================================================================
  // PLEASE BACKUP YOUR ACCOUNT BEFORE RUNNING THIS!
  // ==============================================================================================

-  private final static String TAG = EnterChatsBenchmark.class.getSimpleName();
+  private static final String TAG = EnterChatsBenchmark.class.getSimpleName();

  @Rule
-  public ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(USE_EXISTING_CHATS);
+  public ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(USE_EXISTING_CHATS);

  @Test
  public void createAndEnter10FilledChats() {
@@ -55,7 +53,9 @@ public class EnterChatsBenchmark {
    for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
      times[i] = "" + timeGoToNChats(10); // 10 group chats were created
    }
-    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: " + String.join(",", times));
+    Log.i(
+        TAG,
+        "MEASURED RESULTS (Benchmark) - Going thorough all 10 chats: " + String.join(",", times));
  }

  @Test
@@ -66,13 +66,17 @@ public class EnterChatsBenchmark {
    for (int i = 0; i < GO_THROUGH_ALL_CHATS_N_TIMES; i++) {
      times[i] = "" + timeGoToNChats(1);
    }
-    Log.i(TAG, "MEASURED RESULTS (Benchmark) - Entering and leaving 1 empty chat: " + String.join(",", times));
+    Log.i(
+        TAG,
+        "MEASURED RESULTS (Benchmark) - Entering and leaving 1 empty chat: "
+            + String.join(",", times));
  }

  @Test
  public void enterFilledChat() {
    if (!USE_EXISTING_CHATS) {
-      createChatAndGoBack("Group #1", true, "Hello!", "Some links: https://testrun.org", "And a command: /help");
+      createChatAndGoBack(
+          "Group #1", true, "Hello!", "Some links: https://testrun.org", "And a command: /help");
    }

    String[] times = new String[50];
@@ -82,7 +86,18 @@ public class EnterChatsBenchmark {
      long end = System.currentTimeMillis();
      long diff = end - start;
      pressBack();
-      Log.i(TAG, "Measured (Benchmark) " + (i+1) + "/" + times.length + ": Entering 1 filled chat took " + diff + "ms " + "(going back took " + (System.currentTimeMillis() - end) + "ms)");
+      Log.i(
+          TAG,
+          "Measured (Benchmark) "
+              + (i + 1)
+              + "/"
+              + times.length
+              + ": Entering 1 filled chat took "
+              + diff
+              + "ms "
+              + "(going back took "
+              + (System.currentTimeMillis() - end)
+              + "ms)");

      times[i] = "" + diff;
    }
@@ -91,16 +106,37 @@ public class EnterChatsBenchmark {

  private void create10Chats(boolean fillWithMsgs) {
    if (!USE_EXISTING_CHATS) {
-      createChatAndGoBack("Group #1", fillWithMsgs, "Hello!", "Some links: https://testrun.org", "And a command: /help");
-      createChatAndGoBack("Group #2", fillWithMsgs, "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
-      createChatAndGoBack("Group #3", fillWithMsgs, repeat("Some string ", 600), repeat("Another string", 200), "Hi!!!");
+      createChatAndGoBack(
+          "Group #1",
+          fillWithMsgs,
+          "Hello!",
+          "Some links: https://testrun.org",
+          "And a command: /help");
+      createChatAndGoBack(
+          "Group #2", fillWithMsgs, "example.org, alice@example.org", "aaaaaaa", "bbbbbb");
+      createChatAndGoBack(
+          "Group #3",
+          fillWithMsgs,
+          repeat("Some string ", 600),
+          repeat("Another string", 200),
+          "Hi!!!");
      createChatAndGoBack("Group #4", fillWithMsgs, "xyzabc", "Hi!!!!", "Let's meet!");
-      createChatAndGoBack("Group #5", fillWithMsgs, repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
-      createChatAndGoBack("Group #6", fillWithMsgs, "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
-      createChatAndGoBack("Group #7", fillWithMsgs, repeat("abcdefg ", 500), repeat("xxxxx", 100), "yrrrrrrrrrrrrr");
-      createChatAndGoBack("Group #8", fillWithMsgs, "and a number: 037362/384756", "ccccc", "Nice!");
-      createChatAndGoBack("Group #9", fillWithMsgs, "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
-      createChatAndGoBack("Group #10", fillWithMsgs, repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
+      createChatAndGoBack(
+          "Group #5", fillWithMsgs, repeat("aaaa", 40), "bbbbbbbbbbbbbbbbbb", "ccccccccccccccc");
+      createChatAndGoBack(
+          "Group #6", fillWithMsgs, "aaaaaaaaaaa", repeat("Hi! ", 1000), "bbbbbbbbbb");
+      createChatAndGoBack(
+          "Group #7",
+          fillWithMsgs,
+          repeat("abcdefg ", 500),
+          repeat("xxxxx", 100),
+          "yrrrrrrrrrrrrr");
+      createChatAndGoBack(
+          "Group #8", fillWithMsgs, "and a number: 037362/384756", "ccccc", "Nice!");
+      createChatAndGoBack(
+          "Group #9", fillWithMsgs, "ddddddddddddddddd", "zuuuuuuuuuuuuuuuu", "ccccc");
+      createChatAndGoBack(
+          "Group #10", fillWithMsgs, repeat("xxxxxxyyyyy", 100), repeat("String!!", 10), "abcd");
    }
  }

@@ -130,10 +166,10 @@ public class EnterChatsBenchmark {
    onView(withContentDescription(R.string.group_create_button)).perform(click());

    if (fillWithMsgs) {
-      for (String t: texts) {
+      for (String t : texts) {
        sendText(t);
      }
-      for (String t: texts) {
+      for (String t : texts) {
        sendText(t);
      }
    }
@@ -14,11 +14,10 @@ import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.TestUtils;
-
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -29,8 +28,6 @@ import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.connect.DcHelper;

-import java.util.concurrent.TimeUnit;
-
@RunWith(AndroidJUnit4.class)
@LargeTest
 public class ForwardingTest {
@@ -43,7 +40,8 @@ public class ForwardingTest {
  }

  @Rule
-  public final ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(false);
+  public final ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(false);

  @Before
  public void createChats() {
@@ -51,10 +49,13 @@ public class ForwardingTest {
    dcContext.createChatByContactId(DcContact.DC_CONTACT_ID_SELF);
    // Disable bcc_self so that DC doesn't try to send messages to the server.
    // If we didn't do this, messages would stay in DC_STATE_OUT_PENDING forever.
-    // The thing is, DC_STATE_OUT_PENDING show a rotating circle animation, and Espresso doesn't work
+    // The thing is, DC_STATE_OUT_PENDING show a rotating circle animation, and Espresso doesn't
+    // work
    // with animations, and the tests would hang and never finish.
    dcContext.setConfig("bcc_self", "0");
-    activityRule.getScenario().onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat(false, "group"));
+    activityRule
+        .getScenario()
+        .onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat("group"));
  }

  @After
@@ -68,7 +69,8 @@ public class ForwardingTest {
    // The group is at position 0, self chat is at position 1, device talk is at position 2
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(2, click()));
    onView(withId(R.id.title)).check(matches(withText(R.string.device_talk)));
-    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(android.R.id.list))
+        .perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
    onView(withId(R.id.menu_context_forward)).perform(click());
    // Send it to self chat (which is sorted to the top because we're forwarding)
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
@@ -77,11 +79,13 @@ public class ForwardingTest {

    pressBack();

-    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+    onView(withId(R.id.toolbar_title))
+        .check(matches(withText(R.string.connectivity_not_connected)));
    // Self chat moved up because we sent a message there
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
    onView(withId(R.id.title)).check(matches(withText(R.string.saved_messages)));
-    onView(withId(android.R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
+    onView(withId(android.R.id.list))
+        .perform(RecyclerViewActions.actionOnItemAtPosition(0, longClick()));
    onView(withId(R.id.menu_context_forward)).perform(click());
    // Send it to the group
    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
@@ -89,6 +93,7 @@ public class ForwardingTest {
    onView(withId(R.id.title)).check(matches(withText("group")));

    pressBack();
-    onView(withId(R.id.toolbar_title)).check(matches(withText(R.string.connectivity_not_connected)));
+    onView(withId(R.id.toolbar_title))
+        .check(matches(withText(R.string.connectivity_not_connected)));
  }
 }
@@ -14,15 +14,13 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
-
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.TestUtils;
-
+import java.io.File;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -34,9 +32,6 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.ShareActivity;
 import org.thoughtcrime.securesms.connect.DcHelper;

-import java.io.File;
-
-
@RunWith(AndroidJUnit4.class)
@LargeTest
 public class SharingTest {
@@ -48,26 +43,34 @@ public class SharingTest {
  private static int createdSingleChatId;

  @Rule
-  public final ActivityScenarioRule<ConversationListActivity> activityRule = TestUtils.getOfflineActivityRule(false);
+  public final ActivityScenarioRule<ConversationListActivity> activityRule =
+      TestUtils.getOfflineActivityRule(false);

  @Before
  public void createGroup() {
-    activityRule.getScenario().onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat(false, "group"));
+    activityRule
+        .getScenario()
+        .onActivity(a -> createdGroupId = DcHelper.getContext(a).createGroupChat("group"));
  }

  @Before
  public void createSingleChat() {
-    activityRule.getScenario().onActivity(a -> {
-      int contactId = DcHelper.getContext(a).createContact("", "abc@example.org");
-      createdSingleChatId = DcHelper.getContext(a).createChatByContactId(contactId);
-    });
+    activityRule
+        .getScenario()
+        .onActivity(
+            a -> {
+              int contactId = DcHelper.getContext(a).createContact("", "abc@example.org");
+              createdSingleChatId = DcHelper.getContext(a).createChatByContactId(contactId);
+            });
  }

  @Test
  public void testNormalSharing() {
    Intent i = new Intent(Intent.ACTION_SEND);
    i.putExtra(Intent.EXTRA_TEXT, "Hello!");
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
@@ -77,9 +80,9 @@ public class SharingTest {
  }

  /**
-   * Test direct sharing from a screenshot.
-   * Also, this is the regression test for https://github.com/deltachat/deltachat-android/issues/2040
-   * where network changes during sharing lead to a bug
+   * Test direct sharing from a screenshot. Also, this is the regression test for
+   * https://github.com/deltachat/deltachat-android/issues/2040 where network changes during sharing
+   * lead to a bug
   */
  @Test
  public void testShareFromScreenshot() {
@@ -92,20 +95,25 @@ public class SharingTest {
        pngImage = file;
      }
    }
-    Uri uri = Uri.parse("content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
+    Uri uri =
+        Uri.parse(
+            "content://" + BuildConfig.APPLICATION_ID + ".attachments/" + Uri.encode(pngImage));
    DcHelper.sharedFiles.put(pngImage, "image/png");

    Intent i = new Intent(Intent.ACTION_SEND);
    i.setType("image/png");
    i.putExtra(Intent.EXTRA_SUBJECT, "Screenshot (Sep 27, 2021 00:00:00");
-    i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
+    i.setFlags(
+        Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
            | Intent.FLAG_ACTIVITY_FORWARD_RESULT
            | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP
            | Intent.FLAG_RECEIVER_FOREGROUND
            | Intent.FLAG_GRANT_READ_URI_PERMISSION);
    i.putExtra(Intent.EXTRA_STREAM, uri);
    i.putExtra(ShareActivity.EXTRA_CHAT_ID, createdGroupId);
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    TestUtils.waitForView(withId(R.id.send_button), 10000, 50);
@@ -121,16 +129,32 @@ public class SharingTest {
  }

  /**
-   * Tests https://github.com/deltachat/interface/blob/master/user-testing/mailto-links.md#mailto-links:
+   * Tests
+   * https://github.com/deltachat/interface/blob/master/user-testing/mailto-links.md#mailto-links:
   *
   * <ul dir="auto">
-   * <li><a href="mailto:abc@example.org">Just an email address</a> - should open a chat with <code>abc@example.org</code> (and maybe ask whether a chat should be created if it does not exist already)</li>
-   * <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris">email address with subject</a> - should open a chat with <code>abc@example.org</code> and fill <code>testing mailto uris</code>; as we created the chat in the previous step, it should not ask <code>Chat with …</code> but directly open the chat</li>
-   * <li><a href="mailto:abc@example.org?body=this%20is%20a%20test">email address with body</a> - should open a chat with <code>abc@example.org</code>, draft <code>this is a test</code></li>
-   * <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris&amp;body=this%20is%20a%20test">email address with subject and body</a> - should open a chat with <code>abc@example.org</code>, draft <code>testing mailto uris</code> &lt;newline&gt; <code>this is a test</code></li>
-   * <li><a href="mailto:%20info@example.org">HTML encoding</a> - should open a chat with <code>info@example.org</code></li>
-   * <li><a href="mailto:simplebot@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it">more HTML encoding</a> - should open a chat with <code>simplebot@example.org</code>, draft <code>!web https://duckduckgo.com/lite?q=duck%20it</code></li>
-   * <li><a href="mailto:?subject=bla&amp;body=blub">no email, just subject&amp;body</a> - this should let you choose a chat and create a draft <code>bla</code> &lt;newline&gt; <code>blub</code> there</li>
+   *   <li><a href="mailto:abc@example.org">Just an email address</a> - should open a chat with
+   *       <code>abc@example.org</code> (and maybe ask whether a chat should be created if it does
+   *       not exist already)
+   *   <li><a href="mailto:abc@example.org?subject=testing%20mailto%20uris">email address with
+   *       subject</a> - should open a chat with <code>abc@example.org</code> and fill <code>
+   *       testing mailto uris</code>; as we created the chat in the previous step, it should not
+   *       ask <code>Chat with …</code> but directly open the chat
+   *   <li><a href="mailto:abc@example.org?body=this%20is%20a%20test">email address with body</a> -
+   *       should open a chat with <code>abc@example.org</code>, draft <code>this is a test</code>
+   *   <li><a
+   *       href="mailto:abc@example.org?subject=testing%20mailto%20uris&amp;body=this%20is%20a%20test">email
+   *       address with subject and body</a> - should open a chat with <code>abc@example.org</code>,
+   *       draft <code>testing mailto uris</code> &lt;newline&gt; <code>this is a test</code>
+   *   <li><a href="mailto:%20info@example.org">HTML encoding</a> - should open a chat with <code>
+   *       info@example.org</code>
+   *   <li><a
+   *       href="mailto:simplebot@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it">more
+   *       HTML encoding</a> - should open a chat with <code>simplebot@example.org</code>, draft
+   *       <code>!web https://duckduckgo.com/lite?q=duck%20it</code>
+   *   <li><a href="mailto:?subject=bla&amp;body=blub">no email, just subject&amp;body</a> - this
+   *       should let you choose a chat and create a draft <code>bla</code> &lt;newline&gt; <code>
+   *       blub</code> there
   * </ul>
   */
  @Test
@@ -140,7 +164,8 @@ public class SharingTest {

    openLink("mailto:abc@example.org?subject=testing%20mailto%20uris");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("testing mailto uris")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("testing mailto uris")));

    openLink("mailto:abc@example.org?body=this%20is%20a%20test");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
@@ -148,17 +173,22 @@ public class SharingTest {

    openLink("mailto:abc@example.org?subject=testing%20mailto%20uris&body=this%20is%20a%20test");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("testing mailto uris\nthis is a test")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("testing mailto uris\nthis is a test")));

    openLink("mailto:%20abc@example.org");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));

-    openLink("mailto:abc@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it");
+    openLink(
+        "mailto:abc@example.org?body=!web%20https%3A%2F%2Fduckduckgo.com%2Flite%3Fq%3Dduck%2520it");
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("!web https://duckduckgo.com/lite?q=duck%20it")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("!web https://duckduckgo.com/lite?q=duck%20it")));

    openLink("mailto:?subject=bla&body=blub");
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
    onView(withId(R.id.subtitle)).check(matches(withText("abc@example.org")));
    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("bla\nblub")));
  }
@@ -170,49 +200,61 @@ public class SharingTest {
  }

  /**
+   *
+   *
   * <ul dir="auto">
-   * <li>Open Saved Messages chat (could be any other chat too)</li>
-   * <li>Go to another app and share some text to DC</li>
-   * <li>In DC select Saved Messages. Edit the shared text if you like. <em>Don't</em> hit the Send button.</li>
-   * <li>Leave DC</li>
-   * <li>Open DC again from the "Recent apps"</li>
-   * <li>Check that your draft is still there</li>
+   *   <li>Open Saved Messages chat (could be any other chat too)
+   *   <li>Go to another app and share some text to DC
+   *   <li>In DC select Saved Messages. Edit the shared text if you like. <em>Don't</em> hit the
+   *       Send button.
+   *   <li>Leave DC
+   *   <li>Open DC again from the "Recent apps"
+   *   <li>Check that your draft is still there
   * </ul>
   */
  @Test
  public void testOpenAgainFromRecents() {
    // Open a chat
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Share some text to DC
    Intent i = new Intent(Intent.ACTION_SEND);
    i.putExtra(Intent.EXTRA_TEXT, "Veeery important draft");
-    i.setComponent(new ComponentName(getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
+    i.setComponent(
+        new ComponentName(
+            getInstrumentation().getTargetContext().getApplicationContext(), ShareActivity.class));
    activityRule.getScenario().onActivity(a -> a.startActivity(i));

    // In DC, select the same chat you opened before
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Leave DC and go back to the previous activity
    pressBack();

    // Here, we can't exactly replicate the "steps to reproduce". Previously, the other activity
    // stayed open in the background, but since it doesn't anymore, we need to open it again:
-    onView(withId(R.id.list)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));
+    onView(withId(R.id.list))
+        .perform(
+            RecyclerViewActions.actionOnItem(hasDescendant(withText("abc@example.org")), click()));

    // Check that the draft is still there
    // Util.sleep(2000);  // Uncomment for debugging
-    onView(withHint(R.string.chat_input_placeholder)).check(matches(withText("Veeery important draft")));
+    onView(withHint(R.string.chat_input_placeholder))
+        .check(matches(withText("Veeery important draft")));
  }

  /**
   * Regression test:
   *
-   * If you save your contacts's emails in the contacts app of the phone, there are buttons to call
-   * them and also to write an email to them.
+   * <p>If you save your contacts's emails in the contacts app of the phone, there are buttons to
+   * call them and also to write an email to them.
   *
-   * If you click the email button, ArcaneChat opened but instead of opening a chat with that contact,
-   * the chat list was show and "share with" was displayed at the top
+   * <p>If you click the email button, Delta Chat opened but instead of opening a chat with that
+   * contact, the chat list was show and "share with" was displayed at the top
   */
  @Test
  public void testOpenChatFromContacts() {
@@ -1,6 +1,5 @@
 package com.b44t.messenger.uitests.online;

-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.replaceText;
@@ -11,13 +10,10 @@ import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;

 import android.text.TextUtils;
-
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-
 import com.b44t.messenger.TestUtils;
-
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,18 +26,20 @@ import org.thoughtcrime.securesms.WelcomeActivity;
@LargeTest
 public class OnboardingTest {
  @Rule
-  public ActivityScenarioRule<WelcomeActivity> activityRule = TestUtils.getOnlineActivityRule(WelcomeActivity.class);
+  public ActivityScenarioRule<WelcomeActivity> activityRule =
+      TestUtils.getOnlineActivityRule(WelcomeActivity.class);

  @Test
  public void testAccountCreation() {
    if (TextUtils.isEmpty(BuildConfig.TEST_ADDR) || TextUtils.isEmpty(BuildConfig.TEST_MAIL_PW)) {
-      throw new RuntimeException("You need to set TEST_ADDR and TEST_MAIL_PW; " +
-              "either in gradle.properties or via an environment variable. " +
-              "See README.md for more details.");
+      throw new RuntimeException(
+          "You need to set TEST_ADDR and TEST_MAIL_PW; "
+              + "either in gradle.properties or via an environment variable. "
+              + "See README.md for more details.");
    }
    onView(withText(R.string.scan_invitation_code)).check(matches(isClickable()));
    onView(withText(R.string.import_backup_title)).check(matches(isClickable()));
-    onView(withText(R.string.login_header)).perform(click());
+    onView(withText(R.string.manual_account_setup_option)).perform(click());
    onView(withHint(R.string.email_address)).perform(replaceText(BuildConfig.TEST_ADDR));
    onView(withHint(R.string.existing_password)).perform(replaceText(BuildConfig.TEST_MAIL_PW));
    onView(withContentDescription(R.string.ok)).perform(click());
@@ -0,0 +1,19 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="228"
+    android:viewportHeight="280">
+    <group
+        android:scaleX="0.35014287"
+        android:scaleY="0.43"
+        android:translateX="74.08372"
+        android:translateY="79.8">
+        <path
+            android:pathData="m10.03,234.14c0.3,-0.01 0.6,-0.02 0.9,-0.04 -0.07,-0.49 -0.14,-0.97 -0.2,-1.46 -0.15,-1.34 -0.26,-2.69 -0.25,-4.04 -0.02,-0.86 -0.05,-1.71 -0.07,-2.57 -0.09,-0.06 -0.18,-0.13 -0.27,-0.19 -0.02,-0.02 -0.04,-0.03 -0.07,-0.05zM44.87,232.95c11.71,-8.35 26.86,-14.79 46.21,-15.9 0,0 39.93,-0.27 47.91,-3.53 7.98,-3.26 68.68,-14.69 82.94,-98.43 14.26,-83.74 -1.06,-115.09 -1.06,-115.09 0,0 -21.14,55.68 -81.02,59.81 0,0 -14.5,1.03 -38.82,1.42 -24.32,0.39 -75.77,20.65 -90.55,85.62l-0.22,43.44c2.5,4.22 5.49,8.12 8.91,11.66 3.99,4.11 8.11,8.12 12.79,11.45 2.26,1.65 4.65,3.2 6.51,5.33 1.94,2.34 3.33,5 4.2,7.93 0.71,2.1 1.45,4.2 2.2,6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+        <path
+            android:pathData="m217.97,45.86c-0.3,0.01 -0.6,0.02 -0.9,0.04 0.07,0.49 0.14,0.97 0.2,1.46 0.15,1.34 0.26,2.69 0.25,4.04 0.02,0.86 0.05,1.71 0.07,2.57 0.09,0.06 0.18,0.13 0.27,0.19 0.02,0.02 0.04,0.03 0.07,0.05zM183.13,47.05c-11.71,8.35 -26.86,14.79 -46.21,15.9 0,0 -39.93,0.27 -47.91,3.53 -7.98,3.26 -68.68,14.69 -82.94,98.43 -14.26,83.74 1.06,115.09 1.06,115.09 0,0 21.14,-55.68 81.02,-59.81 0,0 14.5,-1.03 38.82,-1.42 24.32,-0.39 75.77,-20.65 90.55,-85.62l0.22,-43.44c-2.5,-4.22 -5.49,-8.12 -8.91,-11.66 -3.99,-4.11 -8.11,-8.12 -12.79,-11.45 -2.26,-1.65 -4.65,-3.2 -6.51,-5.33 -1.94,-2.34 -3.33,-5 -4.2,-7.93 -0.71,-2.1 -1.45,-4.2 -2.2,-6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+    </group>
+</vector>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="specialUse"
+            android:enabled="true" />
+    </application>
+
+</manifest>
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.notifications;

 import android.content.Context;
-
 import androidx.annotation.Nullable;

 /*
@@ -10,6 +9,11 @@ import androidx.annotation.Nullable;
 */
 public class FcmReceiveService {
  public static void register(Context context) {}
+
  public static void waitForRegisterFinished() {}
-  @Nullable public static String getToken() { return null; }
+
+  @Nullable
+  public static String getToken() {
+    return null;
+  }
 }
@@ -1,29 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">

-  <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
-  <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging"/>
+    <meta-data
+        android:name="firebase_analytics_collection_deactivated"
+        android:value="true" />
+    <meta-data
+        android:name="google_analytics_adid_collection_enabled"
+        android:value="false" />
+    <meta-data
+        android:name="firebase_messaging_auto_init_enabled"
+        android:value="false" />

-  <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-  <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-  <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="dataSync"
+            android:enabled="true" />

-  <application>
-    <service
-        android:name=".notifications.FcmReceiveService"
-        android:foregroundServiceType="dataSync"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT" />
-      </intent-filter>
-    </service>
+        <service
+            android:name=".notifications.FcmReceiveService"
+            android:foregroundServiceType="dataSync"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>

-    <provider
-        android:name="com.google.firebase.provider.FirebaseInitProvider"
-        android:authorities="${applicationId}.firebaseinitprovider"
-        tools:node="remove">
-    </provider>
-  </application>
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            tools:node="remove">
+        </provider>
+    </application>

 </manifest>
@@ -1,20 +1,16 @@
 package org.thoughtcrime.securesms.notifications;

 import android.content.Context;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
-
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.service.FetchForegroundService;
@@ -35,36 +31,38 @@ public class FcmReceiveService extends FirebaseMessagingService {
      return;
    }

-    Util.runOnAnyBackgroundThread(() -> {
-      final String rawToken;
+    Util.runOnAnyBackgroundThread(
+        () -> {
+          final String rawToken;

-      try {
-        synchronized (INIT_LOCK) {
-          if (!initialized) {
-            // manual init: read tokens from `./google-services.json`;
-            // automatic init disabled in AndroidManifest.xml to skip FCM code completely.
-            FirebaseApp.initializeApp(context);
+          try {
+            synchronized (INIT_LOCK) {
+              if (!initialized) {
+                // manual init: read tokens from `./google-services.json`;
+                // automatic init disabled in AndroidManifest.xml to skip FCM code completely.
+                FirebaseApp.initializeApp(context);
+              }
+              initialized = true;
+            }
+            rawToken = Tasks.await(FirebaseMessaging.getInstance().getToken());
+          } catch (Exception e) {
+            // we're here usually when FCM is not available and initializeApp() or getToken()
+            // failed.
+            Log.w(TAG, "cannot get FCM token for " + BuildConfig.APPLICATION_ID + ": " + e);
+            triedRegistering = true;
+            return;
+          }
+          if (TextUtils.isEmpty(rawToken)) {
+            Log.w(TAG, "got empty FCM token for " + BuildConfig.APPLICATION_ID);
+            triedRegistering = true;
+            return;
          }
-          initialized = true;
-        }
-        rawToken = Tasks.await(FirebaseMessaging.getInstance().getToken());
-      } catch (Exception e) {
-        // we're here usually when FCM is not available and initializeApp() or getToken() failed.
-        Log.w(TAG, "cannot get FCM token for " + BuildConfig.APPLICATION_ID + ": " + e);
-        triedRegistering = true;
-        return;
-      }
-      if (TextUtils.isEmpty(rawToken)) {
-        Log.w(TAG, "got empty FCM token for " + BuildConfig.APPLICATION_ID);
-        triedRegistering = true;
-        return;
-      }

-      prefixedToken = addPrefix(rawToken);
-      Log.i(TAG, "FCM token: " + prefixedToken);
-      ApplicationContext.dcAccounts.setPushDeviceToken(prefixedToken);
-      triedRegistering = true;
-    });
+          prefixedToken = addPrefix(rawToken);
+          Log.i(TAG, "FCM token: " + prefixedToken);
+          ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
+          triedRegistering = true;
+        });
  }

  // wait a until FCM registration got a token or not.
@@ -91,7 +89,20 @@ public class FcmReceiveService extends FirebaseMessagingService {
  @Override
  public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
    Log.i(TAG, "FCM push notification received");
-    FetchForegroundService.start(this);
+    // Note: The system can downgrade the high priority messages to normal priority
+    // if the app is not using the high priority messages for surfacing time sensitive
+    // content to the user. If the message's priority is downgraded, your app cannot
+    // start a foreground service and attempting to start one results in a
+    // ForegroundServiceStartNotAllowedException.
+    // So, it's recommended to check the result of RemoteMessage.getPriority() and
+    // confirm it's PRIORITY_HIGH() before attempting to start a foreground service.
+    // source:
+    // https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start
+    if (remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) {
+      FetchForegroundService.start(this);
+    } else {
+      FetchForegroundService.fetchSynchronously();
+    }
  }

  @Override
@@ -104,6 +115,6 @@ public class FcmReceiveService extends FirebaseMessagingService {
  public void onNewToken(@NonNull String rawToken) {
    prefixedToken = addPrefix(rawToken);
    Log.i(TAG, "new FCM token: " + prefixedToken);
-    ApplicationContext.dcAccounts.setPushDeviceToken(prefixedToken);
+    ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
  }
 }
@@ -6,6 +6,10 @@ a {
  text-decoration: none;
 }

+a[href^='http']::after {
+    content: " ↗";
+}
+
 h2, h3, h4 {
  margin-top: 2rem;
 }
@@ -0,0 +1,129 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc;
+
+import chat.delta.util.SettableFuture;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+
+/* Basic RPC Transport implementation */ 
+public abstract class BaseRpcTransport implements Rpc.RpcTransport {
+  private final Map<Integer, SettableFuture<JsonNode>> requestFutures = new ConcurrentHashMap<>();
+  private int requestId = 0;
+  private final ObjectMapper mapper = new ObjectMapper();
+  private Thread worker;
+
+  /* Send a Request as raw JSON String to the RPC server */
+  protected abstract void sendRequest(String jsonRequest);
+
+  /* Get next Response as raw JSON String from the RPC server */
+  protected abstract String getResponse();
+
+  public ObjectMapper getObjectMapper() {
+    return mapper;
+  }
+
+  public void call(String method, JsonNode... params) throws RpcException {
+    innerCall(method, params);
+  }
+
+  public <T> T callForResult(TypeReference<T> resultType, String method, JsonNode... params) throws RpcException {
+    try {
+      JsonNode node = innerCall(method, params);
+      if (node.isNull()) return null;
+      return mapper.readValue(node.traverse(), resultType);
+    } catch (IOException e) {
+      throw new RpcException(e.getMessage());
+    }
+  }
+
+  private JsonNode innerCall(String method, JsonNode... params) throws RpcException {
+    int id;
+    synchronized (this) {
+      id = ++requestId;
+      ensureWorkerThread();
+    }
+    try {
+      String jsonRequest = mapper.writeValueAsString(new Request(method, params, id));
+      SettableFuture<JsonNode> future = new SettableFuture<>();
+      requestFutures.put(id, future);
+      sendRequest(jsonRequest);
+      return future.get();
+    } catch (ExecutionException e) {
+      throw (RpcException)e.getCause();
+    } catch (InterruptedException e) {
+      throw new RpcException(e.getMessage());
+    } catch (JsonProcessingException e) {
+      throw new RpcException(e.getMessage());
+    }
+  }
+
+  private void ensureWorkerThread() {
+    if (worker != null) return;
+
+    worker = new Thread(() -> {
+        while (true) {
+          try {
+            processResponse();
+          } catch (JsonProcessingException e) {
+            e.printStackTrace();
+          }
+        }
+    }, "jsonrpcThread");
+    worker.start();
+  }
+
+  private void processResponse() throws JsonProcessingException {
+    String jsonResponse = getResponse();
+    Response response = mapper.readValue(jsonResponse, Response.class);
+
+    if (response.id == 0) { // Got JSON-RPC notification/event, ignore
+      return;
+    }
+
+    SettableFuture<JsonNode> future = requestFutures.remove(response.id);
+    if (future == null) { // Got a response with unknown ID, ignore
+      return;
+    }
+
+    if (response.error != null) {
+      future.setException(new RpcException(response.error.message));
+    } else if (response.result != null) {
+      future.set(response.result);
+    } else {
+      future.setException(new RpcException("Got JSON-RPC response without result or error: " + jsonResponse));
+    }
+  }
+
+  private static class Request {
+    private final String jsonrpc = "2.0";
+    public final String method;
+    public final JsonNode[] params;
+    public final int id;
+
+    public Request(String method, JsonNode[] params, int id) {
+      this.method = method;
+      this.params = params;
+      this.id = id;
+    }
+  }
+
+  private static class RpcError {
+    public int code;
+    public String message;
+  }
+
+  private static class Response {
+    public String jsonrpc;
+    public int id;
+    public JsonNode result;
+    public RpcError error;
+  }
+}
@@ -0,0 +1,8 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc;
+
+public class RpcException extends Exception {
+
+  public RpcException(String message) { super(message); }
+
+}
@@ -0,0 +1,32 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
+@JsonSubTypes({@Type(value = Account.Configured.class, name="Configured"), @Type(value = Account.Unconfigured.class, name="Unconfigured")})
+public abstract class Account {
+
+  public static class Configured extends Account {
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String addr;
+    public String color;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String displayName;
+    public Integer id;
+    /** Optional tag as "Work", "Family". Meant to help profile owner to differ between profiles with similar names. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String privateTag;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String profileImage;
+  }
+
+  public static class Unconfigured extends Account {
+    public Integer id;
+  }
+
+}
@@ -0,0 +1,35 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+/**
+ * cheaper version of fullchat, omits: - contact_ids - fresh_message_counter - ephemeral_timer - self_in_group - was_seen_recently - can_send
+ * <p>
+ * used when you only need the basic metadata of a chat like type, name, profile picture
+ */
+public class BasicChat {
+  public Boolean archived;
+  public ChatType chatType;
+  public String color;
+  public Integer id;
+  public Boolean isContactRequest;
+  public Boolean isDeviceChat;
+  /**
+   * True if the chat is encrypted. This means that all messages in the chat are encrypted, and all contacts in the chat are "key-contacts", i.e. identified by the PGP key fingerprint.
+   * <p>
+   * False if the chat is unencrypted. This means that all messages in the chat are unencrypted, and all contacts in the chat are "address-contacts", i.e. identified by the email address. The UI should mark this chat e.g. with a mail-letter icon.
+   * <p>
+   * Unencrypted groups are called "ad-hoc groups" and the user can't add/remove members, create a QR invite code, or set an avatar. These options should therefore be disabled in the UI.
+   * <p>
+   * Note that it can happen that an encrypted chat contains unencrypted messages that were received in core <= v1.159.* and vice versa.
+   * <p>
+   * See also `is_key_contact` on `Contact`.
+   */
+  public Boolean isEncrypted;
+  public Boolean isMuted;
+  public Boolean isSelfTalk;
+  public Boolean isUnpromoted;
+  public String name;
+  public Boolean pinned;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String profileImage;
+}
@@ -0,0 +1,19 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class CallInfo {
+  /** True if the call is started as a video call. */
+  public Boolean hasVideo;
+  /**
+   * SDP offer.
+   * <p>
+   * Can be used to manually answer the call even if incoming call event was missed.
+   */
+  public String sdpOffer;
+  /**
+   * Call state.
+   * <p>
+   * For example, if the call is accepted, active, canceled, declined etc.
+   */
+  public CallState state;
+}
@@ -0,0 +1,48 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
+@JsonSubTypes({@Type(value = CallState.Alerting.class, name="Alerting"), @Type(value = CallState.Active.class, name="Active"), @Type(value = CallState.Completed.class, name="Completed"), @Type(value = CallState.Missed.class, name="Missed"), @Type(value = CallState.Declined.class, name="Declined"), @Type(value = CallState.Canceled.class, name="Canceled")})
+public abstract class CallState {
+
+/**
+ * Fresh incoming or outgoing call that is still ringing.
+ * <p>
+ * There is no separate state for outgoing call that has been dialled but not ringing on the other side yet as we don't know whether the other side received our call.
+ */
+  public static class Alerting extends CallState {
+  }
+
+/** Active call. */
+  public static class Active extends CallState {
+  }
+
+/** Completed call that was once active and then was terminated for any reason. */
+  public static class Completed extends CallState {
+    /** Call duration in seconds. */
+    public Integer duration;
+  }
+
+/** Incoming call that was not picked up within a timeout or was explicitly ended by the caller before we picked up. */
+  public static class Missed extends CallState {
+  }
+
+/** Incoming call that was explicitly ended on our side before picking up or outgoing call that was declined before the timeout. */
+  public static class Declined extends CallState {
+  }
+
+/**
+ * Outgoing call that has been canceled on our side before receiving a response.
+ * <p>
+ * Incoming calls cannot be canceled, on the receiver side canceled calls usually result in missed calls.
+ */
+  public static class Canceled extends CallState {
+  }
+
+}
@@ -0,0 +1,71 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
+@JsonSubTypes({@Type(value = ChatListItemFetchResult.ChatListItem.class, name="ChatListItem"), @Type(value = ChatListItemFetchResult.ArchiveLink.class, name="ArchiveLink"), @Type(value = ChatListItemFetchResult.Error.class, name="Error")})
+public abstract class ChatListItemFetchResult {
+
+  public static class ChatListItem extends ChatListItemFetchResult {
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String avatarPath;
+    public ChatType chatType;
+    public String color;
+    /** contact id if this is a dm chat (for view profile entry in context menu) */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer dmChatContact;
+    public Integer freshMessageCounter;
+    public Integer id;
+    public Boolean isArchived;
+    public Boolean isContactRequest;
+    public Boolean isDeviceTalk;
+    /**
+     * True if the chat is encrypted. This means that all messages in the chat are encrypted, and all contacts in the chat are "key-contacts", i.e. identified by the PGP key fingerprint.
+     * <p>
+     * False if the chat is unencrypted. This means that all messages in the chat are unencrypted, and all contacts in the chat are "address-contacts", i.e. identified by the email address. The UI should mark this chat e.g. with a mail-letter icon.
+     * <p>
+     * Unencrypted groups are called "ad-hoc groups" and the user can't add/remove members, create a QR invite code, or set an avatar. These options should therefore be disabled in the UI.
+     * <p>
+     * Note that it can happen that an encrypted chat contains unencrypted messages that were received in core <= v1.159.* and vice versa.
+     * <p>
+     * See also `is_key_contact` on `Contact`.
+     */
+    public Boolean isEncrypted;
+    /** deprecated 2025-07, use chat_type instead */
+    public Boolean isGroup;
+    public Boolean isMuted;
+    public Boolean isPinned;
+    public Boolean isSelfInGroup;
+    public Boolean isSelfTalk;
+    public Boolean isSendingLocation;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer lastMessageId;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Viewtype lastMessageType;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer lastUpdated;
+    public String name;
+    /** showing preview if last chat message is image */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String summaryPreviewImage;
+    public Integer summaryStatus;
+    public String summaryText1;
+    public String summaryText2;
+    public Boolean wasSeenRecently;
+  }
+
+  public static class ArchiveLink extends ChatListItemFetchResult {
+    public Integer freshMessageCounter;
+  }
+
+  public static class Error extends ChatListItemFetchResult {
+    public String error;
+    public Integer id;
+  }
+
+}
@@ -0,0 +1,10 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum ChatType {
+  Single,
+  Group,
+  Mailinglist,
+  OutBroadcast,
+  InBroadcast,
+}
@@ -0,0 +1,8 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum ChatVisibility {
+  Normal,
+  Archived,
+  Pinned,
+}
@@ -0,0 +1,52 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class Contact {
+  public String address;
+  public String authName;
+  public String color;
+  public String displayName;
+  /**
+   * Is encryption available for this contact.
+   * <p>
+   * This can only be true for key-contacts. However, it is possible to have a key-contact for which encryption is not available because we don't have a key yet, e.g. if we just scanned the fingerprint from a QR code.
+   */
+  public Boolean e2eeAvail;
+  public Integer id;
+  public Boolean isBlocked;
+  /** If the contact is a bot. */
+  public Boolean isBot;
+  /** Is the contact a key contact. */
+  public Boolean isKeyContact;
+  /**
+   * True if the contact can be added to protected chats because SELF and contact have verified their fingerprints in both directions.
+   * <p>
+   * See [`Self::verifier_id`]/`Contact.verifierId` for a guidance how to display these information.
+   */
+  public Boolean isVerified;
+  /** the contact's last seen timestamp */
+  public Integer lastSeen;
+  public String name;
+  public String nameAndAddr;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String profileImage;
+  public String status;
+  /**
+   * The contact ID that verified a contact.
+   * <p>
+   * As verifier may be unknown, use [`Self::is_verified`]/`Contact.isVerified` to check if a contact can be added to a protected chat.
+   * <p>
+   * UI should display the information in the contact's profile as follows:
+   * <p>
+   * - If `verifierId` != 0, display text "Introduced by ..." with the name of the contact. Prefix the text by a green checkmark.
+   * <p>
+   * - If `verifierId` == 0 and `isVerified` != 0, display "Introduced" prefixed by a green checkmark.
+   * <p>
+   * - if `verifierId` == 0 and `isVerified` == 0, display nothing
+   * <p>
+   * This contains the contact ID of the verifier. If it is `DC_CONTACT_ID_SELF`, we verified the contact ourself. If it is None/Null, we don't have verifier information or the contact is not verified.
+   */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer verifierId;
+  public Boolean wasSeenRecently;
+}
@@ -0,0 +1,10 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum DownloadState {
+  Done,
+  Available,
+  Failure,
+  Undecipherable,
+  InProgress,
+}
@@ -0,0 +1,13 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum EnteredCertificateChecks {
+  /** `Automatic` means that provider database setting should be taken. If there is no provider database setting for certificate checks, check certificates strictly. */
+  automatic,
+
+  /** Ensure that TLS certificate is valid for the server hostname. */
+  strict,
+
+  /** Accept certificates that are expired, self-signed or otherwise not valid for the server hostname. */
+  acceptInvalidCertificates,
+}
@@ -0,0 +1,51 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+/**
+ * Login parameters entered by the user.
+ * <p>
+ * Usually it will be enough to only set `addr` and `password`, and all the other settings will be autoconfigured.
+ */
+public class EnteredLoginParam {
+  /** Email address. */
+  public String addr;
+  /** TLS options: whether to allow invalid certificates and/or invalid hostnames. Default: Automatic */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public EnteredCertificateChecks certificateChecks;
+  /** Imap server port. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer imapPort;
+  /** Imap socket security. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Socket imapSecurity;
+  /** Imap server hostname or IP address. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String imapServer;
+  /** Imap username. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String imapUser;
+  /** If true, login via OAUTH2 (not recommended anymore). Default: false */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Boolean oauth2;
+  /** Password. */
+  public String password;
+  /**
+   * SMTP Password.
+   * <p>
+   * Only needs to be specified if different than IMAP password.
+   */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String smtpPassword;
+  /** SMTP server port. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer smtpPort;
+  /** SMTP socket security. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Socket smtpSecurity;
+  /** SMTP server hostname or IP address. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String smtpServer;
+  /** SMTP username. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String smtpUser;
+}
@@ -0,0 +1,28 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
+@JsonSubTypes({@Type(value = EphemeralTimer.Disabled.class, name="Disabled"), @Type(value = EphemeralTimer.Enabled.class, name="Enabled")})
+public abstract class EphemeralTimer {
+
+/** Timer is disabled. */
+  public static class Disabled extends EphemeralTimer {
+  }
+
+/** Timer is enabled. */
+  public static class Enabled extends EphemeralTimer {
+    /**
+     * Timer duration in seconds.
+     * <p>
+     * The value cannot be 0.
+     */
+    public Integer duration;
+  }
+
+}
@@ -0,0 +1,9 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class Event {
+  /** Account ID. */
+  public Integer contextId;
+  /** Event payload. */
+  public EventType event;
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`⚡ Быстрые зашифрованные чаты для семьи 🎉`
				`@@ -1 +0,0 @@`
				`Schreibe Nachrichten mit E-Mails. Retro, Offen. Privatsphäre im Design.`
@@ -1 +1 @@
 .83.0
 .91.1