Merge remote-tracking branch 'upstream/main'

prepare 2.34.0

.github/copilot-instructions.md

@@ -0,0 +1,175 @@
+# 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:** 35 (Android 15)
+- **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/androidTest/` - Instrumented tests (UI tests, 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)
+- `scripts/` - Build and helper scripts
+- `docs/` - Documentation
+- `fastlane/` - App store metadata and screenshots
+
+## Build Instructions
+
+### Prerequisites
+
+1. **Initialize submodules:**
+   ```bash
+   git submodule update --init --recursive
+   ```
+
+2. **Build native libraries:**
+   ```bash
+   scripts/ndk-make.sh
+   ```
+   Note: First run may take significant time as it builds for all architectures (armeabi-v7a, arm64-v8a, x86, x86_64)
+
+3. **Build APK:**
+   ```bash
+   ./gradlew assembleDebug
+   ```
+
+### 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`
+
+## Testing
+
+### Running Unit Tests
+
+```bash
+./gradlew test
+```
+
+### 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
+
+2. **Run tests:**
+   ```bash
+   ./gradlew connectedAndroidTest
+   ```
+
+### 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)
+
+### 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
+```
+
+## 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
+- `CONTRIBUTING.md` - Contribution guidelines
+- `BUILDING.md` - Detailed build setup
+- `RELEASE.md` - Release process
+- `proguard-rules.pro` - ProGuard configuration
+- `google-services.json` - Firebase configuration (gplay flavor)
+
+## 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

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           ./gradlew assembleGplayRelease
           mv build/outputs/apk/gplay/release/*universal* build/outputs/apk/foss/release/ArcaneChat-gplay.apk
 
-      - name: Release
+      - name: Release on GitHub
         uses: softprops/action-gh-release@v1
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
@@ -68,3 +68,14 @@ jobs:
           prerelease: ${{ contains(github.event.ref, '-beta') }}
           fail_on_unmatched_files: true
           files: build/outputs/apk/foss/release/*.apk
+
+      - name: Release on ZapStore
+        run: |
+          export CHECKSUM=6e2c7cf6da53c3f1a78b523a6aacd6316dce3d74ace6f859c2676729ee439990
+          curl -sL https://cdn.zapstore.dev/$CHECKSUM -o zapstore
+          if echo "$CHECKSUM zapstore" | sha256sum -c --status; then
+            chmod +x zapstore
+            SIGN_WITH=${{ secrets.NOSTR_KEY }} ./zapstore publish --indexer-mode
+          else
+            echo "ERROR: checksum doesn't match!"
+          fi

BUILDING.md

@@ -22,24 +22,12 @@ subproject _deltachat-core-rust_:
 
 ## Generate JSON-RPC bindings
 
-To generate the JSON-RPC bindings (ex. `chat.delta.rpc.*` package)
-install the [dcrpcgen tool](https://github.com/chatmail/dcrpcgen)
-then generate the `schema.json` file:
+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:
 
 ```
-# install deltachat-rpc-server program:
-cargo install --path ./jni/deltachat-core-rust/deltachat-rpc-server
-# check the version of core matches:
-deltachat-rpc-server --version
-# generate the schema:
-deltachat-rpc-server --openrpc > schema.json
-```
-
-then pass the schema file to the `dcrpcgen` tool to generate the
-code:
-
-```
-dcrpcgen java --schema schema.json -o ./src/main/java/
+./scripts/generate-rpc-bindings.sh
 ```
 
 ## Build Using Nix

CHANGELOG-upstream.md

@@ -1,5 +1,62 @@
 # Delta Chat Android Changelog
 
+## 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
 

RELEASE.md

@@ -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:
@@ -21,12 +23,19 @@ a) Update `CHANGELOG.md`
       as `update to core 1.2.3` or `using core 1.2.3`
 
 
-2. update translations and local help:
+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
    ```
 
+### Prepare release
+
 the following steps are done in a PR called `prep-VERSION` (no leading "v"):
 
 3. Update `CHANGELOG.md`:
@@ -109,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>:

build.gradle

@@ -21,7 +21,7 @@ android {
     }
     namespace "org.thoughtcrime.securesms"
     flavorDimensions "none"
-    compileSdk 35
+    compileSdk 36
 
     // Set NDK version to strip native libraries.
     // Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
@@ -33,14 +33,14 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000730
-        versionName "2.22.0"
+        versionCode 30000735
+        versionName "2.34.0"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true
 
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
 
         vectorDrawables.useSupportLibrary = true
 
@@ -130,7 +130,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,9 +146,10 @@ 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'
         }
     }
 
@@ -208,6 +211,7 @@ dependencies {
     implementation "io.noties.markwon:inline-parser:$markwon_version"
     implementation 'com.airbnb.android:lottie:4.2.2' // Lottie animations support.
 
+    implementation 'androidx.concurrent:concurrent-futures:1.3.0'
     implementation 'androidx.sharetarget:sharetarget:1.2.0'
     implementation 'androidx.webkit:webkit:1.14.0'
     implementation 'androidx.multidex:multidex:2.0.1'

fastlane/metadata/android/en-US/full_description.txt

@@ -23,17 +23,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>

fastlane/metadata/android/ru-RU/full_description.txt

@@ -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>

fastlane/metadata/android/ru-RU/short_description.txt

@@ -0,0 +1 @@
+⚡ Быстрые зашифрованные чаты для семьи 🎉

fastlane/metadata/android/ru-RU/title.txt

@@ -0,0 +1 @@
+ArcaneChat

flake.lock

@@ -138,11 +138,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1756197489,
-        "narHash": "sha256-S16rPaBH1TnMbDyL5NlGSJcYd7wPlOEWTStdBDL7BHw=",
+        "lastModified": 1763347184,
+        "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8ec04f46f1edeeed3f870da62191745b93975da7",
+        "rev": "08895cce80433978d5bfd668efa41c5e24578cbd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -18,7 +18,7 @@
             build-tools-35-0-0
             cmdline-tools-latest
             platform-tools
-            platforms-android-35
+            platforms-android-36
             ndk-27-2-12479018
           ]);
         rust-version = pkgs.lib.removeSuffix "\n"
@@ -27,10 +27,11 @@
       {
         formatter = pkgs.nixpkgs-fmt;
 
-        devShells.default = pkgs.mkShell {
+        devShells.default = pkgs.mkShell rec {
           ANDROID_SDK_ROOT = "${android-sdk}/share/android-sdk";
           ANDROID_NDK_ROOT =
             "${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

jni/dc_wrapper.c

@@ -231,6 +231,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 +542,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;
 }
@@ -1261,11 +1267,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_isSendingLocations(JNIEnv *env, jobject obj)
 {

makefile

@@ -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

proguard-rules.pro

@@ -5,7 +5,6 @@
 -keep class chat.delta.rpc.** { * ; }
 -keepattributes *Annotation*,EnclosingMethod,Signature
 -keepnames class com.fasterxml.jackson.** { *; }
-#-dontwarn com.fasterxml.jackson.databind.**
 
 # bug with video recoder
 -keep class com.coremedia.iso.** { *; }

scripts/create-local-help.sh

@@ -1 +1,2 @@
+rm src/main/assets/help/*.png
 ../deltachat-pages/tools/create-local-help.py ../deltachat-pages/result src/main/assets/help

scripts/rust-toolchain

@@ -1 +1 @@
-1.86.0
+1.91.1

scripts/update-rpc-bindings.sh

@@ -0,0 +1,11 @@
+#!/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/

src/androidTest/java/com/b44t/messenger/uitests/offline/ForwardingTest.java

@@ -54,7 +54,7 @@ public class ForwardingTest {
     // 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

src/androidTest/java/com/b44t/messenger/uitests/offline/SharingTest.java

@@ -52,7 +52,7 @@ public class SharingTest {
 
   @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

src/androidTest/java/com/b44t/messenger/uitests/online/OnboardingTest.java

@@ -41,7 +41,7 @@ public class OnboardingTest {
     }
     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());

src/foss/AndroidManifest.xml

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

src/gplay/AndroidManifest.xml

@@ -10,6 +10,11 @@
   <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
 
   <application>
+    <service
+        android:name=".connect.KeepAliveService"
+        android:foregroundServiceType="dataSync"
+        android:enabled="true" />
+
     <service
         android:name=".notifications.FcmReceiveService"
         android:foregroundServiceType="dataSync"

src/gplay/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java

@@ -62,7 +62,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
 
       prefixedToken = addPrefix(rawToken);
       Log.i(TAG, "FCM token: " + prefixedToken);
-      ApplicationContext.dcAccounts.setPushDeviceToken(prefixedToken);
+      ApplicationContext.getDcAccounts().setPushDeviceToken(prefixedToken);
       triedRegistering = true;
     });
   }
@@ -104,6 +104,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);
   }
 }

src/main/AndroidManifest.xml

@@ -13,7 +13,6 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
     <!-- dangerous permissions - we need to as the user with a PermissionsRequest -->
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
@@ -55,6 +54,7 @@
                  android:requestLegacyExternalStorage="true"
                  tools:targetApi="TIRAMISU"
                  android:hasFragileUserData="true"
+                 android:enableOnBackInvokedCallback="false"
         >
 
     <!-- android car support, see https://developer.android.com/training/auto/start/,
@@ -233,25 +233,17 @@
               android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".RegistrationActivity"
+    <activity android:name=".relay.EditRelayActivity"
               android:launchMode="singleTask"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="true">
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-
-            <!-- this scheme is used as the redirect_url for getOauth2Url()
-            and should be whitelisted by the supported oauth2 services -->
-            <data android:scheme="chat.delta" android:path="/${applicationId}/auth" tools:ignore="AppLinkUrlError"/>
-            <data android:scheme="chat.delta" android:path="/auth" tools:ignore="AppLinkUrlError"/>
-
-
-        </intent-filter>
     </activity>
 
+    <activity android:name=".relay.RelayListActivity"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".proxy.ProxySettingsActivity"
               android:label="@string/proxy_settings"
               android:windowSoftInputMode="stateHidden"
@@ -399,11 +391,6 @@
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
     </activity>
 
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true" />
-
     <service
         android:name=".geolocation.LocationBackgroundService"
         android:foregroundServiceType="location" />
@@ -416,17 +403,6 @@
         android:name=".service.FetchForegroundService"
         android:foregroundServiceType="dataSync" />
 
-    <service
-        android:name=".service.IPCAddAccountsService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true"
-        android:exported="true"
-        >
-        <intent-filter>
-            <action android:name="chat.delta.addaccount" />
-        </intent-filter>
-    </service>
-
     <receiver android:name=".notifications.MarkReadReceiver"
               android:enabled="true"
               android:exported="false">

src/main/java/chat/delta/rpc/BaseTransport.java

@@ -94,7 +94,7 @@ public abstract class BaseTransport implements Rpc.Transport {
     }
 
     if (response.error != null) {
-      future.setException(new RpcException(response.error.toString()));
+      future.setException(new RpcException(response.error.message));
     } else if (response.result != null) {
       future.set(response.result);
     } else {
@@ -115,10 +115,15 @@ public abstract class BaseTransport implements Rpc.Transport {
     }
   }
 
+  private static class RpcError {
+    public int code;
+    public String message;
+  }
+
   private static class Response {
     public String jsonrpc;
     public int id;
     public JsonNode result;
-    public JsonNode error;
+    public RpcError error;
   }
 }

src/main/java/chat/delta/rpc/types/Account.java

@@ -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;
+  }
+
+}

src/main/java/chat/delta/rpc/types/BasicChat.java

@@ -0,0 +1,35 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+/**
+ * cheaper version of fullchat, omits: - contacts - 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;
+}

src/main/java/chat/delta/rpc/types/CallInfo.java

@@ -2,7 +2,7 @@
 package chat.delta.rpc.types;
 
 public class CallInfo {
-  /* True if SDP offer has a video. */
+  /** True if SDP offer has a video. */
   public Boolean hasVideo;
   /**
    * SDP offer.

src/main/java/chat/delta/rpc/types/CallState.java

@@ -19,21 +19,21 @@ public abstract class CallState {
   public static class Alerting extends CallState {
   }
 
-/* Active call. */
+/** Active call. */
   public static class Active extends CallState {
   }
 
-/* Completed call that was once active and then was terminated for any reason. */
+/** Completed call that was once active and then was terminated for any reason. */
   public static class Completed extends CallState {
-    /* Call duration in seconds. */
+    /** 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. */
+/** 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. */
+/** 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 {
   }
 

src/main/java/chat/delta/rpc/types/ChatListItemFetchResult.java

@@ -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;
+  }
+
+}

src/main/java/chat/delta/rpc/types/ChatType.java

@@ -0,0 +1,10 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum ChatType {
+  Single,
+  Group,
+  Mailinglist,
+  OutBroadcast,
+  InBroadcast,
+}

src/main/java/chat/delta/rpc/types/ChatVisibility.java

@@ -0,0 +1,8 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum ChatVisibility {
+  Normal,
+  Archived,
+  Pinned,
+}

src/main/java/chat/delta/rpc/types/Contact.java

@@ -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 and address of the contact formatted by `name_and_addr`/`nameAndAddr`. 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;
+}

src/main/java/chat/delta/rpc/types/DownloadState.java

@@ -0,0 +1,10 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum DownloadState {
+  Done,
+  Available,
+  Failure,
+  Undecipherable,
+  InProgress,
+}

src/main/java/chat/delta/rpc/types/EnteredCertificateChecks.java

@@ -2,12 +2,12 @@
 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` 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. */
+  /** 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. */
+  /** Accept certificates that are expired, self-signed or otherwise not valid for the server hostname. */
   acceptInvalidCertificates,
 }

src/main/java/chat/delta/rpc/types/EnteredLoginParam.java

@@ -7,27 +7,27 @@ package chat.delta.rpc.types;
  * Usually it will be enough to only set `addr` and `password`, and all the other settings will be autoconfigured.
  */
 public class EnteredLoginParam {
-  /* Email address. */
+  /** Email address. */
   public String addr;
-  /* TLS options: whether to allow invalid certificates and/or invalid hostnames. Default: Automatic */
+  /** 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. */
+  /** Imap server port. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer imapPort;
-  /* Imap socket security. */
+  /** Imap socket security. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Socket imapSecurity;
-  /* Imap server hostname or IP address. */
+  /** Imap server hostname or IP address. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String imapServer;
-  /* Imap username. */
+  /** 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 */
+  /** 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. */
+  /** Password. */
   public String password;
   /**
    * SMTP Password.
@@ -36,16 +36,16 @@ public class EnteredLoginParam {
    */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpPassword;
-  /* SMTP server port. */
+  /** SMTP server port. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer smtpPort;
-  /* SMTP socket security. */
+  /** SMTP socket security. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Socket smtpSecurity;
-  /* SMTP server hostname or IP address. */
+  /** SMTP server hostname or IP address. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpServer;
-  /* SMTP username. */
+  /** SMTP username. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String smtpUser;
 }

src/main/java/chat/delta/rpc/types/EphemeralTimer.java

@@ -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;
+  }
+
+}

src/main/java/chat/delta/rpc/types/Event.java

@@ -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;
+}

src/main/java/chat/delta/rpc/types/EventType.java

@@ -0,0 +1,420 @@
+/* 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 = EventType.Info.class, name="Info"), @Type(value = EventType.SmtpConnected.class, name="SmtpConnected"), @Type(value = EventType.ImapConnected.class, name="ImapConnected"), @Type(value = EventType.SmtpMessageSent.class, name="SmtpMessageSent"), @Type(value = EventType.ImapMessageDeleted.class, name="ImapMessageDeleted"), @Type(value = EventType.ImapMessageMoved.class, name="ImapMessageMoved"), @Type(value = EventType.ImapInboxIdle.class, name="ImapInboxIdle"), @Type(value = EventType.NewBlobFile.class, name="NewBlobFile"), @Type(value = EventType.DeletedBlobFile.class, name="DeletedBlobFile"), @Type(value = EventType.Warning.class, name="Warning"), @Type(value = EventType.Error.class, name="Error"), @Type(value = EventType.ErrorSelfNotInGroup.class, name="ErrorSelfNotInGroup"), @Type(value = EventType.MsgsChanged.class, name="MsgsChanged"), @Type(value = EventType.ReactionsChanged.class, name="ReactionsChanged"), @Type(value = EventType.IncomingReaction.class, name="IncomingReaction"), @Type(value = EventType.IncomingWebxdcNotify.class, name="IncomingWebxdcNotify"), @Type(value = EventType.IncomingMsg.class, name="IncomingMsg"), @Type(value = EventType.IncomingMsgBunch.class, name="IncomingMsgBunch"), @Type(value = EventType.MsgsNoticed.class, name="MsgsNoticed"), @Type(value = EventType.MsgDelivered.class, name="MsgDelivered"), @Type(value = EventType.MsgFailed.class, name="MsgFailed"), @Type(value = EventType.MsgRead.class, name="MsgRead"), @Type(value = EventType.MsgDeleted.class, name="MsgDeleted"), @Type(value = EventType.ChatModified.class, name="ChatModified"), @Type(value = EventType.ChatEphemeralTimerModified.class, name="ChatEphemeralTimerModified"), @Type(value = EventType.ChatDeleted.class, name="ChatDeleted"), @Type(value = EventType.ContactsChanged.class, name="ContactsChanged"), @Type(value = EventType.LocationChanged.class, name="LocationChanged"), @Type(value = EventType.ConfigureProgress.class, name="ConfigureProgress"), @Type(value = EventType.ImexProgress.class, name="ImexProgress"), @Type(value = EventType.ImexFileWritten.class, name="ImexFileWritten"), @Type(value = EventType.SecurejoinInviterProgress.class, name="SecurejoinInviterProgress"), @Type(value = EventType.SecurejoinJoinerProgress.class, name="SecurejoinJoinerProgress"), @Type(value = EventType.ConnectivityChanged.class, name="ConnectivityChanged"), @Type(value = EventType.SelfavatarChanged.class, name="SelfavatarChanged"), @Type(value = EventType.ConfigSynced.class, name="ConfigSynced"), @Type(value = EventType.WebxdcStatusUpdate.class, name="WebxdcStatusUpdate"), @Type(value = EventType.WebxdcRealtimeData.class, name="WebxdcRealtimeData"), @Type(value = EventType.WebxdcRealtimeAdvertisementReceived.class, name="WebxdcRealtimeAdvertisementReceived"), @Type(value = EventType.WebxdcInstanceDeleted.class, name="WebxdcInstanceDeleted"), @Type(value = EventType.AccountsBackgroundFetchDone.class, name="AccountsBackgroundFetchDone"), @Type(value = EventType.ChatlistChanged.class, name="ChatlistChanged"), @Type(value = EventType.ChatlistItemChanged.class, name="ChatlistItemChanged"), @Type(value = EventType.AccountsChanged.class, name="AccountsChanged"), @Type(value = EventType.AccountsItemChanged.class, name="AccountsItemChanged"), @Type(value = EventType.EventChannelOverflow.class, name="EventChannelOverflow"), @Type(value = EventType.IncomingCall.class, name="IncomingCall"), @Type(value = EventType.IncomingCallAccepted.class, name="IncomingCallAccepted"), @Type(value = EventType.OutgoingCallAccepted.class, name="OutgoingCallAccepted"), @Type(value = EventType.CallEnded.class, name="CallEnded"), @Type(value = EventType.TransportsModified.class, name="TransportsModified")})
+public abstract class EventType {
+
+/**
+ * The library-user may write an informational string to the log.
+ * <p>
+ * This event should *not* be reported to the end-user using a popup or something like that.
+ */
+  public static class Info extends EventType {
+    public String msg;
+  }
+
+/** Emitted when SMTP connection is established and login was successful. */
+  public static class SmtpConnected extends EventType {
+    public String msg;
+  }
+
+/** Emitted when IMAP connection is established and login was successful. */
+  public static class ImapConnected extends EventType {
+    public String msg;
+  }
+
+/** Emitted when a message was successfully sent to the SMTP server. */
+  public static class SmtpMessageSent extends EventType {
+    public String msg;
+  }
+
+/** Emitted when an IMAP message has been marked as deleted */
+  public static class ImapMessageDeleted extends EventType {
+    public String msg;
+  }
+
+/** Emitted when an IMAP message has been moved */
+  public static class ImapMessageMoved extends EventType {
+    public String msg;
+  }
+
+/** Emitted before going into IDLE on the Inbox folder. */
+  public static class ImapInboxIdle extends EventType {
+  }
+
+/** Emitted when an new file in the $BLOBDIR was created */
+  public static class NewBlobFile extends EventType {
+    public String file;
+  }
+
+/** Emitted when an file in the $BLOBDIR was deleted */
+  public static class DeletedBlobFile extends EventType {
+    public String file;
+  }
+
+/**
+ * The library-user should write a warning string to the log.
+ * <p>
+ * This event should *not* be reported to the end-user using a popup or something like that.
+ */
+  public static class Warning extends EventType {
+    public String msg;
+  }
+
+/**
+ * The library-user should report an error to the end-user.
+ * <p>
+ * As most things are asynchronous, things may go wrong at any time and the user should not be disturbed by a dialog or so.  Instead, use a bubble or so.
+ * <p>
+ * However, for ongoing processes (eg. configure()) or for functions that are expected to fail (eg. autocryptContinueKeyTransfer()) it might be better to delay showing these events until the function has really failed (returned false). It should be sufficient to report only the *last* error in a message box then.
+ */
+  public static class Error extends EventType {
+    public String msg;
+  }
+
+/** An action cannot be performed because the user is not in the group. Reported eg. after a call to setChatName(), setChatProfileImage(), addContactToChat(), removeContactFromChat(), and messages sending functions. */
+  public static class ErrorSelfNotInGroup extends EventType {
+    public String msg;
+  }
+
+/** Messages or chats changed.  One or more messages or chats changed for various reasons in the database: - Messages sent, received or removed - Chats created, deleted or archived - A draft has been set */
+  public static class MsgsChanged extends EventType {
+    /** Set if only a single chat is affected by the changes, otherwise 0. */
+    public Integer chatId;
+    /** Set if only a single message is affected by the changes, otherwise 0. */
+    public Integer msgId;
+  }
+
+/** Reactions for the message changed. */
+  public static class ReactionsChanged extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chatId;
+    /** ID of the contact whose reaction set is changed. */
+    public Integer contactId;
+    /** ID of the message for which reactions were changed. */
+    public Integer msgId;
+  }
+
+/**
+ * A reaction to one's own sent message received. Typically, the UI will show a notification for that.
+ * <p>
+ * In addition to this event, ReactionsChanged is emitted.
+ */
+  public static class IncomingReaction extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chatId;
+    /** ID of the contact whose reaction set is changed. */
+    public Integer contactId;
+    /** ID of the message for which reactions were changed. */
+    public Integer msgId;
+    /** The reaction. */
+    public String reaction;
+  }
+
+/** Incoming webxdc info or summary update, should be notified. */
+  public static class IncomingWebxdcNotify extends EventType {
+    /** ID of the chat. */
+    public Integer chatId;
+    /** ID of the contact sending. */
+    public Integer contactId;
+    /** Link assigned to this notification, if any. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String href;
+    /** ID of the added info message or webxdc instance in case of summary change. */
+    public Integer msgId;
+    /** Text to notify. */
+    public String text;
+  }
+
+/**
+ * There is a fresh message. Typically, the user will show a notification when receiving this message.
+ * <p>
+ * There is no extra #DC_EVENT_MSGS_CHANGED event sent together with this event.
+ */
+  public static class IncomingMsg extends EventType {
+    /** ID of the chat where the message is assigned. */
+    public Integer chatId;
+    /** ID of the message. */
+    public Integer msgId;
+  }
+
+/** Downloading a bunch of messages just finished. This is an event to allow the UI to only show one notification per message bunch, instead of cluttering the user with many notifications. */
+  public static class IncomingMsgBunch extends EventType {
+  }
+
+/** Messages were seen or noticed. chat id is always set. */
+  public static class MsgsNoticed extends EventType {
+    public Integer chatId;
+  }
+
+/** A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to DC_STATE_OUT_DELIVERED, see `Message.state`. */
+  public static class MsgDelivered extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chatId;
+    /** ID of the message that was successfully sent. */
+    public Integer msgId;
+  }
+
+/** A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to DC_STATE_OUT_FAILED, see `Message.state`. */
+  public static class MsgFailed extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chatId;
+    /** ID of the message that could not be sent. */
+    public Integer msgId;
+  }
+
+/** A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to DC_STATE_OUT_MDN_RCVD, see `Message.state`. */
+  public static class MsgRead extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chatId;
+    /** ID of the message that was read. */
+    public Integer msgId;
+  }
+
+/**
+ * A single message was deleted.
+ * <p>
+ * This event means that the message will no longer appear in the messagelist. UI should remove the message from the messagelist in response to this event if the message is currently displayed.
+ * <p>
+ * The message may have been explicitly deleted by the user or expired. Internally the message may have been removed from the database, moved to the trash chat or hidden.
+ * <p>
+ * This event does not indicate the message deletion from the server.
+ */
+  public static class MsgDeleted extends EventType {
+    /** ID of the chat where the message was prior to deletion. Never 0. */
+    public Integer chatId;
+    /** ID of the deleted message. Never 0. */
+    public Integer msgId;
+  }
+
+/**
+ * Chat changed.  The name or the image of a chat group was changed or members were added or removed. See setChatName(), setChatProfileImage(), addContactToChat() and removeContactFromChat().
+ * <p>
+ * This event does not include ephemeral timer modification, which is a separate event.
+ */
+  public static class ChatModified extends EventType {
+    public Integer chatId;
+  }
+
+/** Chat ephemeral timer changed. */
+  public static class ChatEphemeralTimerModified extends EventType {
+    /** Chat ID. */
+    public Integer chatId;
+    /** New ephemeral timer value. */
+    public Integer timer;
+  }
+
+/** Chat deleted. */
+  public static class ChatDeleted extends EventType {
+    /** Chat ID. */
+    public Integer chat_id;
+  }
+
+/** Contact(s) created, renamed, blocked or deleted. */
+  public static class ContactsChanged extends EventType {
+    /** If set, this is the contact_id of an added contact that should be selected. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer contactId;
+  }
+
+/** Location of one or more contact has changed. */
+  public static class LocationChanged extends EventType {
+    /** contact_id of the contact for which the location has changed. If the locations of several contacts have been changed, this parameter is set to `None`. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer contactId;
+  }
+
+/** Inform about the configuration progress started by configure(). */
+  public static class ConfigureProgress extends EventType {
+    /** Progress comment or error, something to display to the user. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String comment;
+    /**
+     * Progress.
+     * <p>
+     * 0=error, 1-999=progress in permille, 1000=success and done
+     */
+    public Integer progress;
+  }
+
+/** Inform about the import/export progress started by imex(). */
+  public static class ImexProgress extends EventType {
+    /** 0=error, 1-999=progress in permille, 1000=success and done */
+    public Integer progress;
+  }
+
+/**
+ * A file has been exported. A file has been written by imex(). This event may be sent multiple times by a single call to imex().
+ * <p>
+ * A typical purpose for a handler of this event may be to make the file public to some system services.
+ * <p>
+ * @param data2 0
+ */
+  public static class ImexFileWritten extends EventType {
+    public String path;
+  }
+
+/**
+ * Progress event sent when SecureJoin protocol has finished from the view of the inviter (Alice, the person who shows the QR code).
+ * <p>
+ * These events are typically sent after a joiner has scanned the QR code generated by getChatSecurejoinQrCodeSvg().
+ */
+  public static class SecurejoinInviterProgress extends EventType {
+    /** ID of the chat in case of success. */
+    public Integer chatId;
+    /** The type of the joined chat. This can take the same values as `BasicChat.chatType` ([`crate::api::types::chat::BasicChat::chat_type`]). */
+    public ChatType chatType;
+    /** ID of the contact that wants to join. */
+    public Integer contactId;
+    /** Progress, always 1000. */
+    public Integer progress;
+  }
+
+/** Progress information of a secure-join handshake from the view of the joiner (Bob, the person who scans the QR code). The events are typically sent while secureJoin(), which may take some time, is executed. */
+  public static class SecurejoinJoinerProgress extends EventType {
+    /** ID of the inviting contact. */
+    public Integer contactId;
+    /** Progress as: 400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself." (Bob has verified alice and waits until Alice does the same for him) 1000=vg-member-added/vc-contact-confirm received */
+    public Integer progress;
+  }
+
+/** The connectivity to the server changed. This means that you should refresh the connectivity view and possibly the connectivtiy HTML; see getConnectivity() and getConnectivityHtml() for details. */
+  public static class ConnectivityChanged extends EventType {
+  }
+
+/** Deprecated by `ConfigSynced`. */
+  public static class SelfavatarChanged extends EventType {
+  }
+
+/** A multi-device synced config value changed. Maybe the app needs to refresh smth. For uniformity this is emitted on the source device too. The value isn't here, otherwise it would be logged which might not be good for privacy. */
+  public static class ConfigSynced extends EventType {
+    /** Configuration key. */
+    public String key;
+  }
+
+  public static class WebxdcStatusUpdate extends EventType {
+    /** Message ID. */
+    public Integer msgId;
+    /** Status update ID. */
+    public Integer statusUpdateSerial;
+  }
+
+/** Data received over an ephemeral peer channel. */
+  public static class WebxdcRealtimeData extends EventType {
+    /** Realtime data. */
+    public java.util.List<Integer> data;
+    /** Message ID. */
+    public Integer msgId;
+  }
+
+/** Advertisement received over an ephemeral peer channel. This can be used by bots to initiate peer-to-peer communication from their side. */
+  public static class WebxdcRealtimeAdvertisementReceived extends EventType {
+    /** Message ID of the webxdc instance. */
+    public Integer msgId;
+  }
+
+/** Inform that a message containing a webxdc instance has been deleted */
+  public static class WebxdcInstanceDeleted extends EventType {
+    /** ID of the deleted message. */
+    public Integer msgId;
+  }
+
+/**
+ * Tells that the Background fetch was completed (or timed out). This event acts as a marker, when you reach this event you can be sure that all events emitted during the background fetch were processed.
+ * <p>
+ * This event is only emitted by the account manager
+ */
+  public static class AccountsBackgroundFetchDone extends EventType {
+  }
+
+/**
+ * Inform that set of chats or the order of the chats in the chatlist has changed.
+ * <p>
+ * Sometimes this is emitted together with `UIChatlistItemChanged`.
+ */
+  public static class ChatlistChanged extends EventType {
+  }
+
+/** Inform that a single chat list item changed and needs to be rerendered. If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache. */
+  public static class ChatlistItemChanged extends EventType {
+    /** ID of the changed chat */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer chatId;
+  }
+
+/**
+ * Inform that the list of accounts has changed (an account removed or added or (not yet implemented) the account order changes)
+ * <p>
+ * This event is only emitted by the account manager
+ */
+  public static class AccountsChanged extends EventType {
+  }
+
+/**
+ * Inform that an account property that might be shown in the account list changed, namely: - is_configured (see is_configured()) - displayname - selfavatar - private_tag
+ * <p>
+ * This event is emitted from the account whose property changed.
+ */
+  public static class AccountsItemChanged extends EventType {
+  }
+
+/** Inform than some events have been skipped due to event channel overflow. */
+  public static class EventChannelOverflow extends EventType {
+    /** Number of events skipped. */
+    public Integer n;
+  }
+
+/** Incoming call. */
+  public static class IncomingCall extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chat_id;
+    /** True if incoming call is a video call. */
+    public Boolean has_video;
+    /** ID of the info message referring to the call. */
+    public Integer msg_id;
+    /** User-defined info as passed to place_outgoing_call() */
+    public String place_call_info;
+  }
+
+/** Incoming call accepted. This is esp. interesting to stop ringing on other devices. */
+  public static class IncomingCallAccepted extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chat_id;
+    /** ID of the info message referring to the call. */
+    public Integer msg_id;
+  }
+
+/** Outgoing call accepted. */
+  public static class OutgoingCallAccepted extends EventType {
+    /** User-defined info passed to dc_accept_incoming_call( */
+    public String accept_call_info;
+    /** ID of the chat which the message belongs to. */
+    public Integer chat_id;
+    /** ID of the info message referring to the call. */
+    public Integer msg_id;
+  }
+
+/** Call ended. */
+  public static class CallEnded extends EventType {
+    /** ID of the chat which the message belongs to. */
+    public Integer chat_id;
+    /** ID of the info message referring to the call. */
+    public Integer msg_id;
+  }
+
+/**
+ * One or more transports has changed.
+ * <p>
+ * This event is used for tests to detect when transport synchronization messages arrives. UIs don't need to use it, it is unlikely that user modifies transports on multiple devices simultaneously.
+ */
+  public static class TransportsModified extends EventType {
+  }
+
+}

src/main/java/chat/delta/rpc/types/FullChat.java

@@ -0,0 +1,42 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class FullChat {
+  public Boolean archived;
+  public Boolean canSend;
+  public ChatType chatType;
+  public String color;
+  public java.util.List<Integer> contactIds;
+  public java.util.List<Contact> contacts;
+  public Integer ephemeralTimer;
+  public Integer freshMessageCounter;
+  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;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String mailingListAddress;
+  public String name;
+  /** Contact IDs of the past chat members. */
+  public java.util.List<Integer> pastContactIds;
+  public Boolean pinned;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String profileImage;
+  /** Note that this is different from [`ChatListItem::is_self_in_group`](`crate::api::types::chat_list::ChatListItemFetchResult::ChatListItem::is_self_in_group`). This property should only be accessed when [`FullChat::chat_type`] is [`Chattype::Group`]. */
+  public Boolean selfInGroup;
+  public Boolean wasSeenRecently;
+}

src/main/java/chat/delta/rpc/types/HttpResponse.java

@@ -2,12 +2,12 @@
 package chat.delta.rpc.types;
 
 public class HttpResponse {
-  /* base64-encoded response body. */
+  /** base64-encoded response body. */
   public String blob;
-  /* Encoding, e.g. "utf-8". */
+  /** Encoding, e.g. "utf-8". */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String encoding;
-  /* MIME type, e.g. "text/plain" or "text/html". */
+  /** MIME type, e.g. "text/plain" or "text/html". */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String mimetype;
 }

src/main/java/chat/delta/rpc/types/Location.java

@@ -0,0 +1,16 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class Location {
+  public Float accuracy;
+  public Integer chatId;
+  public Integer contactId;
+  public Boolean isIndependent;
+  public Float latitude;
+  public Integer locationId;
+  public Float longitude;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String marker;
+  public Integer msgId;
+  public Integer timestamp;
+}

src/main/java/chat/delta/rpc/types/Message.java

@@ -0,0 +1,69 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class Message {
+  public Integer chatId;
+  public Integer dimensionsHeight;
+  public Integer dimensionsWidth;
+  public DownloadState downloadState;
+  public Integer duration;
+  /** An error text, if there is one. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String error;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String file;
+  public Integer fileBytes;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String fileMime;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String fileName;
+  public Integer fromId;
+  public Boolean hasDeviatingTimestamp;
+  public Boolean hasHtml;
+  /** Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
+  public Boolean hasLocation;
+  public Integer id;
+  /** if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer infoContactId;
+  /** True if the message was sent by a bot. */
+  public Boolean isBot;
+  public Boolean isEdited;
+  public Boolean isForwarded;
+  public Boolean isInfo;
+  public Boolean isSetupmessage;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer originalMsgId;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String overrideSenderName;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer parentId;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public MessageQuote quote;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Reactions reactions;
+  public Integer receivedTimestamp;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer savedMessageId;
+  public Contact sender;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String setupCodeBegin;
+  /**
+   * True if the message was correctly encrypted&signed, false otherwise. Historically, UIs showed a small padlock on the message then.
+   * <p>
+   * Today, the UIs should instead show a small email-icon on the message if `show_padlock` is `false`, and nothing if it is `true`.
+   */
+  public Boolean showPadlock;
+  public Integer sortTimestamp;
+  public Integer state;
+  public String subject;
+  /** when is_info is true this describes what type of system message it is */
+  public SystemMessageType systemMessageType;
+  public String text;
+  public Integer timestamp;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public VcardContact vcardContact;
+  public Viewtype viewType;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String webxdcHref;
+}

src/main/java/chat/delta/rpc/types/MessageData.java

@@ -0,0 +1,24 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class MessageData {
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String file;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String filename;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String html;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Pair<Float, Float> location;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String overrideSenderName;
+  /** Quoted message id. Takes preference over `quoted_text` (see below). */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer quotedMessageId;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String quotedText;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String text;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Viewtype viewtype;
+}

src/main/java/chat/delta/rpc/types/MessageInfo.java

@@ -0,0 +1,14 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class MessageInfo {
+  public EphemeralTimer ephemeralTimer;
+  /** When message is ephemeral this contains the timestamp of the message expiry */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public Integer ephemeralTimestamp;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String error;
+  public String hopInfo;
+  public String rfc724Mid;
+  public java.util.List<String> serverUrls;
+}

src/main/java/chat/delta/rpc/types/MessageListItem.java

@@ -0,0 +1,24 @@
+/* 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 = MessageListItem.Message.class, name="Message"), @Type(value = MessageListItem.DayMarker.class, name="DayMarker")})
+public abstract class MessageListItem {
+
+  public static class Message extends MessageListItem {
+    public Integer msg_id;
+  }
+
+/** Day marker, separating messages that correspond to different days according to local time. */
+  public static class DayMarker extends MessageListItem {
+    /** Marker timestamp, for day markers, in unix milliseconds */
+    public Integer timestamp;
+  }
+
+}

src/main/java/chat/delta/rpc/types/MessageLoadResult.java

@@ -0,0 +1,85 @@
+/* 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 = MessageLoadResult.Message.class, name="Message"), @Type(value = MessageLoadResult.LoadingError.class, name="LoadingError")})
+public abstract class MessageLoadResult {
+
+  public static class Message extends MessageLoadResult {
+    public Integer chatId;
+    public Integer dimensionsHeight;
+    public Integer dimensionsWidth;
+    public DownloadState downloadState;
+    public Integer duration;
+    /** An error text, if there is one. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String error;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String file;
+    public Integer fileBytes;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String fileMime;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String fileName;
+    public Integer fromId;
+    public Boolean hasDeviatingTimestamp;
+    public Boolean hasHtml;
+    /** Check if a message has a POI location bound to it. These locations are also returned by `get_locations` method. The UI may decide to display a special icon beside such messages. */
+    public Boolean hasLocation;
+    public Integer id;
+    /** if is_info is set, this refers to the contact profile that should be opened when the info message is tapped. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer infoContactId;
+    /** True if the message was sent by a bot. */
+    public Boolean isBot;
+    public Boolean isEdited;
+    public Boolean isForwarded;
+    public Boolean isInfo;
+    public Boolean isSetupmessage;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer originalMsgId;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String overrideSenderName;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer parentId;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public MessageQuote quote;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Reactions reactions;
+    public Integer receivedTimestamp;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer savedMessageId;
+    public Contact sender;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String setupCodeBegin;
+    /**
+     * True if the message was correctly encrypted&signed, false otherwise. Historically, UIs showed a small padlock on the message then.
+     * <p>
+     * Today, the UIs should instead show a small email-icon on the message if `show_padlock` is `false`, and nothing if it is `true`.
+     */
+    public Boolean showPadlock;
+    public Integer sortTimestamp;
+    public Integer state;
+    public String subject;
+    /** when is_info is true this describes what type of system message it is */
+    public SystemMessageType systemMessageType;
+    public String text;
+    public Integer timestamp;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public VcardContact vcardContact;
+    public Viewtype viewType;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String webxdcHref;
+  }
+
+  public static class LoadingError extends MessageLoadResult {
+    public String error;
+  }
+
+}

src/main/java/chat/delta/rpc/types/MessageNotificationInfo.java

@@ -0,0 +1,20 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class MessageNotificationInfo {
+  public Integer accountId;
+  public Integer chatId;
+  public String chatName;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String chatProfileImage;
+  public Integer id;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String image;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String imageMimeType;
+  /** also known as summary_text1 */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String summaryPrefix;
+  /** also known as summary_text2 */
+  public String summaryText;
+}

src/main/java/chat/delta/rpc/types/MessageQuote.java

@@ -0,0 +1,33 @@
+/* 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 = MessageQuote.JustText.class, name="JustText"), @Type(value = MessageQuote.WithMessage.class, name="WithMessage")})
+public abstract class MessageQuote {
+
+  public static class JustText extends MessageQuote {
+    public String text;
+  }
+
+  public static class WithMessage extends MessageQuote {
+    public String authorDisplayColor;
+    public String authorDisplayName;
+    /** The quoted message does not always belong to the same chat, e.g. when "Reply Privately" is used. */
+    public Integer chatId;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String image;
+    public Boolean isForwarded;
+    public Integer messageId;
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String overrideSenderName;
+    public String text;
+    public Viewtype viewType;
+  }
+
+}

src/main/java/chat/delta/rpc/types/MessageReadReceipt.java

@@ -0,0 +1,7 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class MessageReadReceipt {
+  public Integer contactId;
+  public Integer timestamp;
+}

src/main/java/chat/delta/rpc/types/MessageSearchResult.java

@@ -0,0 +1,22 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class MessageSearchResult {
+  public String authorColor;
+  public Integer authorId;
+  /** if sender name if overridden it will show it as ~alias */
+  public String authorName;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String authorProfileImage;
+  public String chatColor;
+  public Integer chatId;
+  public String chatName;
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String chatProfileImage;
+  public ChatType chatType;
+  public Integer id;
+  public Boolean isChatArchived;
+  public Boolean isChatContactRequest;
+  public String message;
+  public Integer timestamp;
+}

src/main/java/chat/delta/rpc/types/MuteDuration.java

@@ -0,0 +1,24 @@
+/* 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 = MuteDuration.NotMuted.class, name="NotMuted"), @Type(value = MuteDuration.Forever.class, name="Forever"), @Type(value = MuteDuration.Until.class, name="Until")})
+public abstract class MuteDuration {
+
+  public static class NotMuted extends MuteDuration {
+  }
+
+  public static class Forever extends MuteDuration {
+  }
+
+  public static class Until extends MuteDuration {
+    public Integer duration;
+  }
+
+}

src/main/java/chat/delta/rpc/types/NotifyState.java

@@ -0,0 +1,13 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum NotifyState {
+  /** Not subscribed to push notifications. */
+  NotConnected,
+
+  /** Subscribed to heartbeat push notifications. */
+  Heartbeat,
+
+  /** Subscribed to push notifications for new messages. */
+  Connected,
+}

src/main/java/chat/delta/rpc/types/Pair.java

@@ -0,0 +1,36 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class Pair<T1, T2> {
+  private final T1 v1;
+  private final T2 v2;
+
+  public Pair(T1 v1, T2 v2) {
+    this.v1 = v1;
+    this.v2 = v2;
+  }
+
+  public T1 first(){
+    return v1;
+  }
+
+  public T2 second(){
+    return v2;
+  }
+
+  public boolean equals(Object o) {
+    return o instanceof Pair &&
+      equal(((Pair) o).first(), first()) &&
+      equal(((Pair) o).second(), second());
+  }
+
+  public int hashCode() {
+    return first().hashCode() ^ second().hashCode();
+  }
+
+  private boolean equal(Object first, Object second) {
+    if (first == null && second == null) return true;
+    if (first == null || second == null) return false;
+    return first.equals(second);
+  }
+}

src/main/java/chat/delta/rpc/types/ProviderInfo.java

@@ -0,0 +1,10 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class ProviderInfo {
+  public String beforeLoginHint;
+  /** Unique ID, corresponding to provider database filename. */
+  public String id;
+  public String overviewPage;
+  public Integer status;
+}

src/main/java/chat/delta/rpc/types/Qr.java

@@ -0,0 +1,254 @@
+/* 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 = Qr.AskVerifyContact.class, name="AskVerifyContact"), @Type(value = Qr.AskVerifyGroup.class, name="AskVerifyGroup"), @Type(value = Qr.AskJoinBroadcast.class, name="AskJoinBroadcast"), @Type(value = Qr.FprOk.class, name="FprOk"), @Type(value = Qr.FprMismatch.class, name="FprMismatch"), @Type(value = Qr.FprWithoutAddr.class, name="FprWithoutAddr"), @Type(value = Qr.Account.class, name="Account"), @Type(value = Qr.Backup2.class, name="Backup2"), @Type(value = Qr.BackupTooNew.class, name="BackupTooNew"), @Type(value = Qr.WebrtcInstance.class, name="WebrtcInstance"), @Type(value = Qr.Proxy.class, name="Proxy"), @Type(value = Qr.Addr.class, name="Addr"), @Type(value = Qr.Url.class, name="Url"), @Type(value = Qr.Text.class, name="Text"), @Type(value = Qr.WithdrawVerifyContact.class, name="WithdrawVerifyContact"), @Type(value = Qr.WithdrawVerifyGroup.class, name="WithdrawVerifyGroup"), @Type(value = Qr.WithdrawJoinBroadcast.class, name="WithdrawJoinBroadcast"), @Type(value = Qr.ReviveVerifyContact.class, name="ReviveVerifyContact"), @Type(value = Qr.ReviveVerifyGroup.class, name="ReviveVerifyGroup"), @Type(value = Qr.ReviveJoinBroadcast.class, name="ReviveJoinBroadcast"), @Type(value = Qr.Login.class, name="Login")})
+public abstract class Qr {
+
+/**
+ * Ask the user whether to verify the contact.
+ * <p>
+ * If the user agrees, pass this QR code to [`crate::securejoin::join_securejoin`].
+ */
+  public static class AskVerifyContact extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** ID of the contact. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user whether to join the group. */
+  public static class AskVerifyGroup extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** ID of the contact. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Group ID. */
+    public String grpid;
+    /** Group name. */
+    public String grpname;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user whether to join the broadcast channel. */
+  public static class AskJoinBroadcast extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** ID of the contact who owns the broadcast channel and created the QR code. */
+    public Integer contact_id;
+    /** Fingerprint of the broadcast channel owner's key as scanned from the QR code. */
+    public String fingerprint;
+    /** A string of random characters, uniquely identifying this broadcast channel across all databases/clients. Called `grpid` for historic reasons: The id of multi-user chats is always called `grpid` in the database because groups were once the only multi-user chats. */
+    public String grpid;
+    /** Invite number. */
+    public String invitenumber;
+    /** The user-visible name of this broadcast channel */
+    public String name;
+  }
+
+/**
+ * Contact fingerprint is verified.
+ * <p>
+ * Ask the user if they want to start chatting.
+ */
+  public static class FprOk extends Qr {
+    /** Contact ID. */
+    public Integer contact_id;
+  }
+
+/** Scanned fingerprint does not match the last seen fingerprint. */
+  public static class FprMismatch extends Qr {
+    /** Contact ID. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public Integer contact_id;
+  }
+
+/** The scanned QR code contains a fingerprint but no e-mail address. */
+  public static class FprWithoutAddr extends Qr {
+    /** Key fingerprint. */
+    public String fingerprint;
+  }
+
+/** Ask the user if they want to create an account on the given domain. */
+  public static class Account extends Qr {
+    /** Server domain name. */
+    public String domain;
+  }
+
+/** Provides a backup that can be retrieved using iroh-net based backup transfer protocol. */
+  public static class Backup2 extends Qr {
+    /** Authentication token. */
+    public String auth_token;
+    /** Iroh node address. */
+    public String node_addr;
+  }
+
+  public static class BackupTooNew extends Qr {
+  }
+
+/** Ask the user if they want to use the given service for video chats. */
+  public static class WebrtcInstance extends Qr {
+    public String domain;
+    public String instance_pattern;
+  }
+
+/**
+ * Ask the user if they want to use the given proxy.
+ * <p>
+ * Note that HTTP(S) URLs without a path and query parameters are treated as HTTP(S) proxy URL. UI may want to still offer to open the URL in the browser if QR code contents starts with `http://` or `https://` and the QR code was not scanned from the proxy configuration screen.
+ */
+  public static class Proxy extends Qr {
+    /** Host extracted from the URL to display in the UI. */
+    public String host;
+    /** Port extracted from the URL to display in the UI. */
+    public Integer port;
+    /**
+     * Proxy URL.
+     * <p>
+     * This is the URL that is going to be added.
+     */
+    public String url;
+  }
+
+/**
+ * Contact address is scanned.
+ * <p>
+ * Optionally, a draft message could be provided. Ask the user if they want to start chatting.
+ */
+  public static class Addr extends Qr {
+    /** Contact ID. */
+    public Integer contact_id;
+    /** Draft message. */
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+    public String draft;
+  }
+
+/**
+ * URL scanned.
+ * <p>
+ * Ask the user if they want to open a browser or copy the URL to clipboard.
+ */
+  public static class Url extends Qr {
+    public String url;
+  }
+
+/**
+ * Text scanned.
+ * <p>
+ * Ask the user if they want to copy the text to clipboard.
+ */
+  public static class Text extends Qr {
+    public String text;
+  }
+
+/** Ask the user if they want to withdraw their own QR code. */
+  public static class WithdrawVerifyContact extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user if they want to withdraw their own group invite QR code. */
+  public static class WithdrawVerifyGroup extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Group ID. */
+    public String grpid;
+    /** Group name. */
+    public String grpname;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user if they want to withdraw their own broadcast channel invite QR code. */
+  public static class WithdrawJoinBroadcast extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. Always `ContactId::SELF`. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** ID, uniquely identifying this chat. Called grpid for historic reasons. */
+    public String grpid;
+    /** Invite number. */
+    public String invitenumber;
+    /** Broadcast name. */
+    public String name;
+  }
+
+/** Ask the user if they want to revive their own QR code. */
+  public static class ReviveVerifyContact extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user if they want to revive their own group invite QR code. */
+  public static class ReviveVerifyGroup extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Group ID. */
+    public String grpid;
+    /** Contact ID. */
+    public String grpname;
+    /** Invite number. */
+    public String invitenumber;
+  }
+
+/** Ask the user if they want to revive their own broadcast channel invite QR code. */
+  public static class ReviveJoinBroadcast extends Qr {
+    /** Authentication code. */
+    public String authcode;
+    /** Contact ID. Always `ContactId::SELF`. */
+    public Integer contact_id;
+    /** Fingerprint of the contact key as scanned from the QR code. */
+    public String fingerprint;
+    /** Globally unique chat ID. Called grpid for historic reasons. */
+    public String grpid;
+    /** Invite number. */
+    public String invitenumber;
+    /** Broadcast name. */
+    public String name;
+  }
+
+/**
+ * `dclogin:` scheme parameters.
+ * <p>
+ * Ask the user if they want to login with the email address.
+ */
+  public static class Login extends Qr {
+    public String address;
+  }
+
+}

src/main/java/chat/delta/rpc/types/Reaction.java

@@ -1,12 +1,12 @@
 /* Autogenerated file, do not edit manually */
 package chat.delta.rpc.types;
 
-/* A single reaction emoji. */
+/** A single reaction emoji. */
 public class Reaction {
-  /* Emoji frequency. */
+  /** Emoji frequency. */
   public Integer count;
-  /* Emoji. */
+  /** Emoji. */
   public String emoji;
-  /* True if we reacted with this emoji. */
+  /** True if we reacted with this emoji. */
   public Boolean isFromSelf;
 }

src/main/java/chat/delta/rpc/types/Reactions.java

@@ -1,10 +1,10 @@
 /* Autogenerated file, do not edit manually */
 package chat.delta.rpc.types;
 
-/* Structure representing all reactions to a particular message. */
+/** Structure representing all reactions to a particular message. */
 public class Reactions {
-  /* Unique reactions and their count, sorted in descending order. */
+  /** Unique reactions and their count, sorted in descending order. */
   public java.util.List<Reaction> reactions;
-  /* Map from a contact to it's reaction to message. */
+  /** Map from a contact to it's reaction to message. */
   public java.util.Map<String, java.util.List<String>> reactionsByContact;
 }

src/main/java/chat/delta/rpc/types/SecurejoinSource.java

@@ -0,0 +1,22 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum SecurejoinSource {
+  /** Because of some problem, it is unknown where the QR code came from. */
+  Unknown,
+
+  /** The user opened a link somewhere outside Delta Chat */
+  ExternalLink,
+
+  /** The user clicked on a link in a message inside Delta Chat */
+  InternalLink,
+
+  /** The user clicked "Paste from Clipboard" in the QR scan activity */
+  Clipboard,
+
+  /** The user clicked "Load QR code as image" in the QR scan activity */
+  ImageLoaded,
+
+  /** The user scanned a QR code */
+  Scan,
+}

src/main/java/chat/delta/rpc/types/SecurejoinUiPath.java

@@ -0,0 +1,13 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum SecurejoinUiPath {
+  /** The UI path is unknown, or the user didn't open the QR code screen at all. */
+  Unknown,
+
+  /** The user directly clicked on the QR icon in the main screen */
+  QrIcon,
+
+  /** The user first clicked on the `+` button in the main screen, and then on "New Contact" */
+  NewContact,
+}

src/main/java/chat/delta/rpc/types/Socket.java

@@ -2,15 +2,15 @@
 package chat.delta.rpc.types;
 
 public enum Socket {
-  /* Unspecified socket security, select automatically. */
+  /** Unspecified socket security, select automatically. */
   automatic,
 
-  /* TLS connection. */
+  /** TLS connection. */
   ssl,
 
-  /* STARTTLS connection. */
+  /** STARTTLS connection. */
   starttls,
 
-  /* No TLS, plaintext connection. */
+  /** No TLS, plaintext connection. */
   plain,
 }

src/main/java/chat/delta/rpc/types/SystemMessageType.java

@@ -0,0 +1,39 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum SystemMessageType {
+  Unknown,
+  GroupNameChanged,
+  GroupImageChanged,
+  MemberAddedToGroup,
+  MemberRemovedFromGroup,
+  AutocryptSetupMessage,
+  SecurejoinMessage,
+  LocationStreamingEnabled,
+  LocationOnly,
+  InvalidUnencryptedMail,
+  ChatE2ee,
+  ChatProtectionEnabled,
+  ChatProtectionDisabled,
+  WebxdcStatusUpdate,
+  CallAccepted,
+  CallEnded,
+
+  /** 1:1 chats info message telling that SecureJoin has started and the user should wait for it to complete. */
+  SecurejoinWait,
+
+  /** 1:1 chats info message telling that SecureJoin is still running, but the user may already send messages. */
+  SecurejoinWaitTimeout,
+
+  /** Chat ephemeral message timer is changed. */
+  EphemeralTimerChanged,
+
+  /** Self-sent-message that contains only json used for multi-device-sync; if possible, we attach that to other messages as for locations. */
+  MultiDeviceSync,
+
+  /** Webxdc info added with `info` set in `send_webxdc_status_update()`. */
+  WebxdcInfoMessage,
+
+  /** This message contains a users iroh node address. */
+  IrohNodeAddr,
+}

src/main/java/chat/delta/rpc/types/VcardContact.java

@@ -2,19 +2,19 @@
 package chat.delta.rpc.types;
 
 public class VcardContact {
-  /* Email address. */
+  /** Email address. */
   public String addr;
-  /* Contact color as hex string. */
+  /** Contact color as hex string. */
   public String color;
-  /* The contact's name, or the email address if no name was given. */
+  /** The contact's name, or the email address if no name was given. */
   public String displayName;
-  /* Public PGP key in Base64. */
+  /** Public PGP key in Base64. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String key;
-  /* Profile image in Base64. */
+  /** Profile image in Base64. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public String profileImage;
-  /* Last update timestamp. */
+  /** Last update timestamp. */
   @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
   public Integer timestamp;
 }

src/main/java/chat/delta/rpc/types/Viewtype.java

@@ -0,0 +1,43 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public enum Viewtype {
+  Unknown,
+
+  /** Text message. */
+  Text,
+
+  /** Image message. If the image is an animated GIF, the type `Viewtype.Gif` should be used. */
+  Image,
+
+  /** Animated GIF message. */
+  Gif,
+
+  /**
+   * Message containing a sticker, similar to image. NB: When sending, the message viewtype may be changed to `Image` by some heuristics like checking for transparent pixels. Use `Message::force_sticker()` to disable them.
+   * <p>
+   * If possible, the ui should display the image without borders in a transparent way. A click on a sticker will offer to install the sticker set in some future.
+   */
+  Sticker,
+
+  /** Message containing an Audio file. */
+  Audio,
+
+  /** A voice message that was directly recorded by the user. For all other audio messages, the type `Viewtype.Audio` should be used. */
+  Voice,
+
+  /** Video messages. */
+  Video,
+
+  /** Message containing any file, eg. a PDF. */
+  File,
+
+  /** Message is a call. */
+  Call,
+
+  /** Message is an webxdc instance. */
+  Webxdc,
+
+  /** Message containing shared contacts represented as a vCard (virtual contact file) with email addresses and possibly other fields. Use `parse_vcard()` to retrieve them. */
+  Vcard,
+}

src/main/java/chat/delta/rpc/types/WebxdcMessageInfo.java

@@ -0,0 +1,36 @@
+/* Autogenerated file, do not edit manually */
+package chat.delta.rpc.types;
+
+public class WebxdcMessageInfo {
+  /** if the Webxdc represents a document, then this is the name of the document */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String document;
+  /**
+   * App icon file name. Defaults to an standard icon if nothing is set in the manifest.
+   * <p>
+   * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
+   * <p>
+   * App icons should should be square, the implementations will add round corners etc. as needed.
+   */
+  public String icon;
+  /** True if full internet access should be granted to the app. */
+  public Boolean internetAccess;
+  /**
+   * The name of the app.
+   * <p>
+   * Defaults to the filename if not set in the manifest.
+   */
+  public String name;
+  /** Address to be used for `window.webxdc.selfAddr` in JS land. */
+  public String selfAddr;
+  /** Milliseconds to wait before calling `sendUpdate()` again since the last call. Should be exposed to `window.sendUpdateInterval` in JS land. */
+  public Integer sendUpdateInterval;
+  /** Maximum number of bytes accepted for a serialized update object. Should be exposed to `window.sendUpdateMaxSize` in JS land. */
+  public Integer sendUpdateMaxSize;
+  /** URL where the source code of the Webxdc and other information can be found; defaults to an empty string. Implementations may offer an menu or a button to open this URL. */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String sourceCodeUrl;
+  /** short string describing the state of the app, sth. as "2 votes", "Highscore: 123", can be changed by the apps */
+  @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SET)
+  public String summary;
+}

src/main/java/com/b44t/messenger/DcAccounts.java

@@ -34,6 +34,7 @@ public class DcAccounts {
     public native void            maybeNetwork         ();
     public native void            setPushDeviceToken   (String token);
     public native boolean         backgroundFetch      (int timeoutSeconds);
+    public native void            stopBackgroundFetch  ();
 
     public native int             migrateAccount       (String dbfile);
     public native boolean         removeAccount        (int accountId);

src/main/java/com/b44t/messenger/DcChat.java

@@ -44,7 +44,6 @@ public class DcChat {
     public native boolean isSelfTalk        ();
     public native boolean isDeviceTalk      ();
     public native boolean canSend           ();
-    public native boolean isProtected       ();
     public native boolean isSendingLocations();
     public native boolean isMuted           ();
     public native boolean isContactRequest  ();

src/main/java/com/b44t/messenger/DcContext.java

@@ -53,6 +53,7 @@ public class DcContext {
 
     public final static int DC_QR_ASK_VERIFYCONTACT = 200;
     public final static int DC_QR_ASK_VERIFYGROUP   = 202;
+    public final static int DC_QR_ASK_JOIN_BROADCAST= 204;
     public final static int DC_QR_FPR_OK            = 210;
     public final static int DC_QR_FPR_MISMATCH      = 220;
     public final static int DC_QR_FPR_WITHOUT_ADDR  = 230;
@@ -67,13 +68,12 @@ public class DcContext {
     public final static int DC_QR_ERROR             = 400;
     public final static int DC_QR_WITHDRAW_VERIFYCONTACT = 500;
     public final static int DC_QR_WITHDRAW_VERIFYGROUP   = 502;
+    public final static int DC_QR_WITHDRAW_JOINBROADCAST = 504;
     public final static int DC_QR_REVIVE_VERIFYCONTACT   = 510;
     public final static int DC_QR_REVIVE_VERIFYGROUP     = 512;
+    public final static int DC_QR_REVIVE_JOINBROADCAST   = 514;
     public final static int DC_QR_LOGIN             = 520;
 
-    public final static int DC_LP_AUTH_OAUTH2          =     0x2;
-    public final static int DC_LP_AUTH_NORMAL          =     0x4;
-
     public final static int DC_SOCKET_AUTO     = 0;
     public final static int DC_SOCKET_SSL      = 1;
     public final static int DC_SOCKET_STARTTLS = 2;
@@ -147,7 +147,6 @@ public class DcContext {
     public native String       getInfo              ();
     public native int          getConnectivity      ();
     public native String       getConnectivityHtml  ();
-    public native String       getOauth2Url         (String addr, String redirectUrl);
     public native String       initiateKeyTransfer  ();
     public native void         imex                 (int what, String dir);
     public native String       imexHasBackup        (String dir);
@@ -171,7 +170,7 @@ public class DcContext {
     public native void         setChatVisibility    (int chat_id, int visibility);
     public native int          getChatIdByContactId (int contact_id);
     public native int          createChatByContactId(int contact_id);
-    public native int          createGroupChat      (boolean verified, String name);
+    public native int          createGroupChat      (String name);
     public native int          createBroadcastList  ();
     public native boolean      isContactInChat      (int chat_id, int contact_id);
     public native int          addContactToChat     (int chat_id, int contact_id);
@@ -261,15 +260,6 @@ public class DcContext {
       setConfigInt("is_muted", muted? 1 : 0);
     }
 
-    public boolean isGmailOauth2Addr(String addr) {
-      final String oauth2url = getOauth2Url(addr, "chat.delta:/foo");
-      return isGmailOauth2Url(oauth2url);
-    }
-
-    public boolean isGmailOauth2Url(String oauth2url) {
-      return oauth2url.startsWith("https://accounts.google.com/");
-    }
-
     public void restartIo() {
       if (!isEnabled()) return;
       stopIo();

src/main/java/org/thoughtcrime/securesms/AllMediaActivity.java

@@ -68,8 +68,8 @@ public class AllMediaActivity extends PassphraseRequiredActionBarActivity
   protected void onCreate(Bundle bundle, boolean ready) {
     tabs.add(new TabData(R.string.webxdc_apps, DcMsg.DC_MSG_WEBXDC, 0, 0));
     tabs.add(new TabData(R.string.tab_gallery, DcMsg.DC_MSG_IMAGE, DcMsg.DC_MSG_GIF, DcMsg.DC_MSG_VIDEO));
-    tabs.add(new TabData(R.string.files, DcMsg.DC_MSG_FILE, 0, 0));
     tabs.add(new TabData(R.string.audio, DcMsg.DC_MSG_AUDIO, DcMsg.DC_MSG_VOICE, 0));
+    tabs.add(new TabData(R.string.files, DcMsg.DC_MSG_FILE, 0, 0));
 
     setContentView(R.layout.all_media_activity);
 

src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java

@@ -70,6 +70,9 @@ public class AllMediaDocumentsFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_documents);
     this.gridManager  = new StickyHeaderGridLayoutManager(1);
 
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
+
     this.recyclerView.setAdapter(new AllMediaDocumentsAdapter(getContext(),
         new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),
         this));

src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java

@@ -66,6 +66,9 @@ public class AllMediaGalleryFragment
     this.noMedia      = ViewUtil.findById(view, R.id.no_images);
     this.gridManager  = new StickyHeaderGridLayoutManager(getCols());
 
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(recyclerView, true, false, true, true);
+
     this.recyclerView.setAdapter(new AllMediaGalleryAdapter(getContext(),
                                                          GlideApp.with(this),
                                                          new BucketedThreadMediaLoader.BucketedThreadMedia(getContext()),

src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -12,6 +12,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.NotificationManagerCompat;
 import androidx.multidex.MultiDexApplication;
 import androidx.work.Constraints;
 import androidx.work.ExistingPeriodicWorkPolicy;
@@ -44,6 +45,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.webxdc.WebxdcGarbageCollectionWorker;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -55,10 +57,13 @@ import chat.delta.rpc.RpcException;
 
 public class ApplicationContext extends MultiDexApplication {
   private static final String TAG = ApplicationContext.class.getSimpleName();
+  private static final Object initLock = new Object();
+  private static volatile boolean isInitialized = false;
+
+  private static DcAccounts      dcAccounts;
+  private Rpc                    rpc;
+  private DcContext              dcContext;
 
-  public static DcAccounts      dcAccounts;
-  public Rpc                    rpc;
-  public DcContext              dcContext;
   public DcLocationManager      dcLocationManager;
   public DcEventCenter          eventCenter;
   public NotificationCenter     notificationCenter;
@@ -73,6 +78,57 @@ public class ApplicationContext extends MultiDexApplication {
     return (ApplicationContext)context.getApplicationContext();
   }
 
+  private static void ensureInitialized() {
+    synchronized (initLock) {
+      while (!isInitialized) {
+        try {
+          initLock.wait();
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          throw new RuntimeException("Interrupted while waiting for initialization", e);
+        }
+      }
+    }
+  }
+
+  /**
+   * Get DcAccounts instance, waiting for initialization if necessary.
+   * This method is thread-safe and will block until initialization is complete.
+   */
+  public static DcAccounts getDcAccounts() {
+    ensureInitialized();
+    return dcAccounts;
+  }
+
+  /**
+   * Get Rpc instance, waiting for initialization if necessary.
+   * This method is thread-safe and will block until initialization is complete.
+   */
+  public Rpc getRpc() {
+    ensureInitialized();
+    return rpc;
+  }
+
+  /**
+   * Get DcContext instance, waiting for initialization if necessary.
+   * This method is thread-safe and will block until initialization is complete.
+   */
+  public DcContext getDcContext() {
+    ensureInitialized();
+    return dcContext;
+  }
+
+  /**
+   * Set DcContext instance. This should only be called by AccountManager when switching accounts,
+   * which only happens after initial initialization is complete.
+   * This method is thread-safe but does NOT trigger initialization or notify waiting threads.
+   */
+  public void setDcContext(DcContext dcContext) {
+    synchronized (initLock) {
+      this.dcContext = dcContext;
+    }
+  }
+
   @Override
   public void onCreate() {
     super.onCreate();
@@ -108,50 +164,87 @@ public class ApplicationContext extends MultiDexApplication {
 
     System.loadLibrary("native-utils");
 
-    dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
-    rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
-    AccountManager.getInstance().migrateToDcAccounts(this);
-    int[] allAccounts = dcAccounts.getAll();
-    for (int accountId : allAccounts) {
-      DcContext ac = dcAccounts.getAccount(accountId);
-      if (!ac.isOpen()) {
+    // Initialize DcAccounts in background to avoid ANR during SQL migrations
+    Util.runOnBackground(() -> {
+      synchronized (initLock) {
         try {
-          DatabaseSecret secret = DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
-          boolean res = ac.open(secret.asString());
-          if (res) Log.i(TAG, "Successfully opened account " + accountId + ", path: " + ac.getBlobdir());
-          else Log.e(TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
+          dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath());
+          Log.i(TAG, "DcAccounts created");
+          rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance()));
+          Log.i(TAG, "Rpc created");
+          AccountManager.getInstance().migrateToDcAccounts(this);
+
+          int[] allAccounts = dcAccounts.getAll();
+          Log.i(TAG, "Number of profiles: " + allAccounts.length);
+          for (int accountId : allAccounts) {
+            DcContext ac = dcAccounts.getAccount(accountId);
+            if (!ac.isOpen()) {
+              try {
+                DatabaseSecret secret = DatabaseSecretProvider.getOrCreateDatabaseSecret(this, accountId);
+                boolean res = ac.open(secret.asString());
+                if (res) Log.i(TAG, "Successfully opened account " + accountId + ", path: " + ac.getBlobdir());
+                else Log.e(TAG, "Error opening account " + accountId + ", path: " + ac.getBlobdir());
+              } catch (Exception e) {
+                Log.e(TAG, "Failed to open account " + accountId + ", path: " + ac.getBlobdir() + ": " + e);
+                e.printStackTrace();
+              }
+            }
+
+            // 2025.11.12: this is needed until core starts ignoring "delete_server_after" for chatmail
+            if (ac.isChatmail()) {
+              ac.setConfig("delete_server_after", null); // reset
+            }
+          }
+          if (allAccounts.length == 0) {
+            try {
+              rpc.addAccount();
+            } catch (RpcException e) {
+              e.printStackTrace();
+            }
+          }
+          dcContext = dcAccounts.getSelectedAccount();
+          notificationCenter = new NotificationCenter(this);
+          eventCenter = new DcEventCenter(this);
+
+          // Mark as initialized before starting threads that depend on it
+          isInitialized = true;
+          initLock.notifyAll();
+          Log.i(TAG, "DcAccounts initialization complete");
+
+          dcLocationManager = new DcLocationManager(this); // depends on dcContext
+
+          new Thread(() -> {
+              Log.i(TAG, "Starting event loop");
+              DcEventEmitter emitter = dcAccounts.getEventEmitter();
+              Log.i(TAG, "DcEventEmitter obtained");
+              while (true) {
+                DcEvent event = emitter.getNextEvent();
+                if (event==null) {
+                  break;
+                }
+                eventCenter.handleEvent(event);
+              }
+              Log.i("DeltaChat", "shutting down event handler");
+          }, "eventThread").start();
+
+          // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
+          DcHelper.setStockTranslations(this);
+
+          dcAccounts.startIo();
         } catch (Exception e) {
-          Log.e(TAG, "Failed to open account " + accountId + ", path: " + ac.getBlobdir() + ": " + e);
-          e.printStackTrace();
+          Log.e(TAG, "Fatal error during DcAccounts initialization", e);
+          // Mark as initialized even on error to avoid deadlock
+          isInitialized = true;
+          initLock.notifyAll();
+          throw new RuntimeException("Failed to initialize DcAccounts", e);
         }
       }
-    }
-    if (allAccounts.length == 0) {
-      try {
-        rpc.addAccount();
-      } catch (RpcException e) {
-        e.printStackTrace();
-      }
-    }
-    dcContext = dcAccounts.getSelectedAccount();
-    notificationCenter = new NotificationCenter(this);
-    eventCenter = new DcEventCenter(this);
-    new Thread(() -> {
-      DcEventEmitter emitter = dcAccounts.getEventEmitter();
-      while (true) {
-        DcEvent event = emitter.getNextEvent();
-        if (event==null) {
-          break;
-        }
-        eventCenter.handleEvent(event);
-      }
-      Log.i("DeltaChat", "shutting down event handler");
-    }, "eventThread").start();
+    });
 
-    // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
-    DcHelper.setStockTranslations(this);
-
-    dcAccounts.startIo();
+    // October-2025 migration: delete deprecated "permanent channel" id
+    NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+    notificationManager.deleteNotificationChannel("dc_foreground_notification_ch");
+    // end October-2025 migration
 
     new ForegroundDetector(ApplicationContext.getInstance(this));
 
@@ -162,7 +255,7 @@ public class ApplicationContext extends MultiDexApplication {
         @Override
         public void onAvailable(@NonNull android.net.Network network) {
           Log.i("DeltaChat", "++++++++++++++++++ NetworkCallback.onAvailable() #" + debugOnAvailableCount++);
-          dcAccounts.maybeNetwork();
+          getDcAccounts().maybeNetwork();
         }
 
         @Override
@@ -191,7 +284,6 @@ public class ApplicationContext extends MultiDexApplication {
     initializeJobManager();
     InChatSounds.getInstance(this);
 
-    dcLocationManager = new DcLocationManager(this);
     DynamicTheme.setDefaultDayNightMode(this);
 
     IntentFilter filter = new IntentFilter(Intent.ACTION_LOCALE_CHANGED);
@@ -228,6 +320,20 @@ public class ApplicationContext extends MultiDexApplication {
               ExistingPeriodicWorkPolicy.KEEP,
               fetchWorkRequest);
     }
+
+    PeriodicWorkRequest webxdcGarbageCollectionRequest = new PeriodicWorkRequest.Builder(
+            WebxdcGarbageCollectionWorker.class,
+            PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS,
+            TimeUnit.MILLISECONDS,
+            PeriodicWorkRequest.MIN_PERIODIC_FLEX_MILLIS,
+            TimeUnit.MILLISECONDS)
+            .build();
+    WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "WebxdcGarbageCollectionWorker",
+            ExistingPeriodicWorkPolicy.KEEP,
+            webxdcGarbageCollectionRequest);
+
+    Log.i("DeltaChat", "+++++++++++ ApplicationContext.onCreate() finished ++++++++++");
   }
 
   public JobManager getJobManager() {

src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.ScreenLockUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * The Activity for application preference display and management.
@@ -79,7 +80,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
 
     //noinspection ConstantConditions
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
+
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(findViewById(R.id.fragment));
 
     if (icicle == null) {
       initFragment(R.id.fragment, new ApplicationPreferenceFragment());

src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -17,6 +18,7 @@ import androidx.fragment.app.Fragment;
 
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.lang.reflect.Field;
 
@@ -33,9 +35,24 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     onPreCreate();
-    EdgeToEdge.enable(this);  // docs says to use: WindowCompat.enableEdgeToEdge(getWindow()); but it is not available
     super.onCreate(savedInstanceState);
-    WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView()).setAppearanceLightStatusBars(false); // force white text in status bar
+
+    // Only enable Edge-to-Edge if it is well supported
+    if (ViewUtil.isEdgeToEdgeSupported()) {
+      // docs says to use: WindowCompat.enableEdgeToEdge(getWindow());
+      // but it actually makes things worse, the next takes care of setting the 3-buttons navigation bar background
+      EdgeToEdge.enable(this);
+
+      // force white text in status bar so it visible over background color
+      WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView()).setAppearanceLightStatusBars(false);
+    }
+  }
+
+  @Override
+  protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+    super.onPostCreate(savedInstanceState);
+    // Apply adjustments to the toolbar for edge-to-edge display
+    ViewUtil.adjustToolbarForE2E(this);
   }
 
   @Override