--wip-- [skip ci]

.github/dependabot.yml

@@ -7,10 +7,3 @@ updates:
     commit-message:
       prefix: "chore(cargo)"
     open-pull-requests-limit: 50
-
-  # Keep GitHub Actions up to date.
-  # <https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot>
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.80.1
+      RUSTUP_TOOLCHAIN: 1.77.1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,18 +40,6 @@ jobs:
       - name: Check
         run: cargo check --workspace --all-targets --all-features
 
-  npm_constants:
-    name: Check if node constants are up to date
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - name: Rebuild constants
-        run: npm run build:core:constants
-      - name: Check that constants are not changed
-        run: git diff --exit-code
-
   cargo_deny:
     name: cargo deny
     runs-on: ubuntu-latest
@@ -59,7 +47,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: false
-      - uses: EmbarkStudios/cargo-deny-action@v2
+      - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           arguments: --all-features --workspace
           command: check
@@ -95,11 +83,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.80.1
+            rust: 1.77.1
           - os: windows-latest
-            rust: 1.80.1
+            rust: 1.77.1
           - os: macos-latest
-            rust: 1.80.1
+            rust: 1.77.1
 
           # Minimum Supported Rust Version = 1.77.0
           - os: ubuntu-latest

.github/workflows/deltachat-rpc-server.yml

@@ -266,141 +266,3 @@ jobs:
       - name: Publish deltachat-rpc-client to PyPI
         if: github.event_name == 'release'
         uses: pypa/gh-action-pypi-publish@release/v1
-
-  publish_npm_package:
-    name: Build & Publish npm prebuilds and deltachat-rpc-server
-    needs: ["build_linux", "build_windows", "build_macos"]
-    runs-on: "ubuntu-latest"
-    permissions:
-      id-token: write
-
-      # Needed to publish the binaries to the release.
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Download Linux aarch64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-linux
-          path: deltachat-rpc-server-aarch64-linux.d
-
-      - name: Download Linux armv7l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv7l-linux
-          path: deltachat-rpc-server-armv7l-linux.d
-
-      - name: Download Linux armv6l binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armv6l-linux
-          path: deltachat-rpc-server-armv6l-linux.d
-
-      - name: Download Linux i686 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-i686-linux
-          path: deltachat-rpc-server-i686-linux.d
-
-      - name: Download Linux x86_64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-linux
-          path: deltachat-rpc-server-x86_64-linux.d
-
-      - name: Download Win32 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win32
-          path: deltachat-rpc-server-win32.d
-
-      - name: Download Win64 binary
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-win64
-          path: deltachat-rpc-server-win64.d
-
-      - name: Download macOS binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-macos
-          path: deltachat-rpc-server-x86_64-macos.d
-
-      - name: Download macOS binary for aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-aarch64-macos
-          path: deltachat-rpc-server-aarch64-macos.d
-
-      - name: Download Android binary for arm64-v8a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-arm64-v8a-android
-          path: deltachat-rpc-server-arm64-v8a-android.d
-
-      - name: Download Android binary for armeabi-v7a
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-armeabi-v7a-android
-          path: deltachat-rpc-server-armeabi-v7a-android.d
-
-      - name: make npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        run: |
-          cd deltachat-rpc-server/npm-package
-
-          python --version
-
-          python scripts/pack_binary_for_platform.py aarch64-unknown-linux-musl     ../../deltachat-rpc-server-aarch64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-unknown-linux-musleabihf ../../deltachat-rpc-server-armv7l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py arm-unknown-linux-musleabihf   ../../deltachat-rpc-server-armv6l-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py i686-unknown-linux-musl        ../../deltachat-rpc-server-i686-linux.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py x86_64-unknown-linux-musl      ../../deltachat-rpc-server-x86_64-linux.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py i686-pc-windows-gnu            ../../deltachat-rpc-server-win32.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-pc-windows-gnu          ../../deltachat-rpc-server-win64.d/deltachat-rpc-server.exe 
-          python scripts/pack_binary_for_platform.py x86_64-apple-darwin            ../../deltachat-rpc-server-x86_64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-apple-darwin           ../../deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server 
-          python scripts/pack_binary_for_platform.py aarch64-linux-android          ../../deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server
-          python scripts/pack_binary_for_platform.py armv7-linux-androideabi        ../../deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server
-
-          ls -lah platform_package
-
-          for platform in ./platform_package/*; do npm pack "$platform"; done
-          npm pack    
-          ls -lah
-
-      - name: Upload to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: deltachat-rpc-server-npm-package
-          path: deltachat-rpc-server/npm-package/*.tgz
-          if-no-files-found: error
-
-      - name: Upload npm packets to the GitHub release
-        if: github.event_name == 'release'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        run: |
-          gh release upload ${{ github.ref_name }} \
-            --repo ${{ github.repository }} \
-            deltachat-rpc-server/npm-package/*.tgz
-
-      # Configure Node.js for publishing.
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Publish npm packets for prebuilds and `@deltachat/stdio-rpc-server`
-        if: github.event_name == 'release'
-        working-directory: deltachat-rpc-server/npm-package
-        run: |
-          ls -lah platform_package
-          for platform in *.tgz; do npm publish --provenance "$platform" --access public; done
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/dependabot.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.2.0
+        uses: dependabot/fetch-metadata@v1.1.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR

.github/workflows/jsonrpc-client-npm-package.yml

@@ -1,38 +1,82 @@
-name: "Publish @deltachat/jsonrpc-client"
+name: "jsonrpc js client build"
 on:
-  workflow_dispatch:
-  release:
-    types: [published]
+  pull_request:
+  push:
+    tags:
+      - "*"
+      - "!py-*"
 
 jobs:
   pack-module:
-    name: "Publish @deltachat/jsonrpc-client"
+    name: "Package @deltachat/jsonrpc-client and upload to download.delta.chat"
     runs-on: ubuntu-20.04
-    permissions:
-      id-token: write
-      contents: read
     steps:
+      - name: Install tree
+        run: sudo apt install tree
       - uses: actions/checkout@v4
         with:
           show-progress: false
-
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
-          registry-url: "https://registry.npmjs.org"
-
+          node-version: "18"
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+        continue-on-error: true
+      - name: Get Pull Request ID
+        id: prepare
+        run: |
+          tag=${{ steps.tag.outputs.tag }}
+          if [ -z "$tag" ]; then
+            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
+          else
+            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
+            echo "No preview will be uploaded this time, but the $tag release"
+          fi
+      - name: System info
+        run: |
+          npm --version
+          node --version
+          echo $DELTACHAT_JSONRPC_TAR_GZ
       - name: Install dependencies without running scripts
         working-directory: deltachat-jsonrpc/typescript
         run: npm install --ignore-scripts
-
       - name: Package
+        shell: bash
         working-directory: deltachat-jsonrpc/typescript
         run: |
           npm run build
           npm pack .
-
-      - name: Publish
-        working-directory: deltachat-jsonrpc/typescript
-        run: npm publish --provenance deltachat-jsonrpc-client-* --access public
+          ls -lah
+          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
+      - name: Upload Prebuild
+        uses: actions/upload-artifact@v4
+        with:
+          name: deltachat-jsonrpc-client.tgz
+          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
+      # Upload to download.delta.chat/node/preview/
+      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
+        if: ${{ ! steps.tag.outputs.tag }}
+        id: upload-preview
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
+        continue-on-error: true
+      - name: Post links to details
+        if: steps.upload-preview.outcome == 'success'
+        run: node ./node/scripts/postLinksToDetails.js
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
+      # Upload to download.delta.chat/node/
+      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
+        if: ${{ steps.tag.outputs.tag }}
+        id: upload
+        shell: bash
+        run: |
+          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
+          chmod 600 __TEMP_INPUT_KEY_FILE
+          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/node-docs.yml

@@ -31,7 +31,7 @@ jobs:
           mv docs js
 
       - name: Upload
-        uses: horochx/deploy-via-scp@1.1.0
+        uses: horochx/deploy-via-scp@v1.0.1
         with:
           user: ${{ secrets.USERNAME }}
           key: ${{ secrets.KEY }}

.github/workflows/upload-docs.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - build_jsonrpc_docs_ci
 
 jobs:
   build-rs:
@@ -18,11 +17,13 @@ jobs:
         run: |
           cargo doc --package deltachat --no-deps --document-private-items
       - name: Upload to rs.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/target/doc "${{ secrets.USERNAME }}@rs.delta.chat:/var/www/html/rs/"
+        uses: up9cloud/action-rsync@v1.3
+        env:
+          USER: ${{ secrets.USERNAME }}
+          KEY: ${{ secrets.KEY }}
+          HOST: "delta.chat"
+          SOURCE: "target/doc"
+          TARGET: "/var/www/html/rs/"
 
   build-python:
     runs-on: ubuntu-latest
@@ -61,31 +62,3 @@ jobs:
           echo "${{ secrets.CODESPEAK_KEY }}" > "$HOME/.ssh/key"
           chmod 600 "$HOME/.ssh/key"
           rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/result/html/ "delta@c.delta.chat:/home/delta/build-c/master"
-
-  build-ts:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./deltachat-jsonrpc/typescript
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-          fetch-depth: 0 # Fetch history to calculate VCS version number.
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-      - name: npm install
-        run: npm install
-      - name: npm run build
-        run: npm run build
-      - name: Run docs script
-        run: npm run docs
-      - name: Upload to js.jsonrpc.delta.chat
-        run: |
-          mkdir -p "$HOME/.ssh"
-          echo "${{ secrets.KEY }}" > "$HOME/.ssh/key"
-          chmod 600 "$HOME/.ssh/key"
-          rsync -avzh -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.USERNAME }}@js.jsonrpc.delta.chat:/var/www/html/js-jsonrpc/"

.gitignore

@@ -33,7 +33,7 @@ deltachat-ffi/xml
 
 coverage/
 .DS_Store
-.vscode
+.vscode/launch.json
 python/accounts.txt
 python/all-testaccounts.txt
 tmp/
@@ -50,4 +50,4 @@ result
 
 # direnv
 .envrc
-.direnv
+.direnv

CHANGELOG.md

@@ -1,899 +1,5 @@
 # Changelog
 
-## [1.142.11] - 2024-08-30
-
-### Fixes
-
-- Set backward verification when observing vc-contact-confirm or `vg-member-added` ([#5930](https://github.com/deltachat/deltachat-core-rust/pull/5930)).
-
-## [1.142.10] - 2024-08-26
-
-### Fixes
-
-- Only include one From: header in securejoin messages ([#5917](https://github.com/deltachat/deltachat-core-rust/pull/5917)).
-
-## [1.142.9] - 2024-08-24
-
-### Fixes
-
-- Fix reading of multiline SMTP greetings ([#5911](https://github.com/deltachat/deltachat-core-rust/pull/5911)).
-
-### Features / Changes
-
-- Update preloaded DNS cache.
-
-## [1.142.8] - 2024-08-21
-
-### Fixes
-
-- Do not panic on unknown CertificateChecks values.
-
-## [1.142.7] - 2024-08-17
-
-### Fixes
-
-- Do not save "Automatic" into configured_imap_certificate_checks. **This fixes regression introduced in core 1.142.4. Versions 1.142.4..1.142.6 should not be used in releases.**
-- Create a group unblocked for bot even if 1:1 chat is blocked ([#5514](https://github.com/deltachat/deltachat-core-rust/pull/5514)).
-- Update rpgp from 0.13.1 to 0.13.2 to fix "unable to decrypt" errors when sending messages to old Delta Chat clients and using Ed25519 keys to encrypt.
-- Do not request ALPN on standard ports and when using STARTTLS.
-
-### Features / Changes
-
-- jsonrpc: Add ContactObject::e2ee_avail.
-
-### Tests
-
-- Protected group for bot is auto-accepted.
-
-## [1.142.6] - 2024-08-15
-
-### Fixes
-
-- Default to strict TLS checks if not configured.
-
-### Miscellaneous Tasks
-
-- deltachat-rpc-client: Fix ruff 0.6.0 warnings.
-
-## [1.142.5] - 2024-08-14
-
-### Fixes
-
-- Still try to create "INBOX.DeltaChat" if couldn't create "DeltaChat" ([#5870](https://github.com/deltachat/deltachat-core-rust/pull/5870)).
-- `store_seen_flags_on_imap`: Skip to next messages if couldn't select folder ([#5870](https://github.com/deltachat/deltachat-core-rust/pull/5870)).
-- Increase timeout for QR generation to 60s ([#5882](https://github.com/deltachat/deltachat-core-rust/pull/5882)).
-
-### Documentation
-
-- Document new `mdns_enabled` behavior (bots do not send MDNs by default).
-
-### CI
-
-- Configure Dependabot to update GitHub Actions.
-
-### Miscellaneous Tasks
-
-- cargo: Bump regex from 1.10.5 to 1.10.6.
-- cargo: Bump serde from 1.0.204 to 1.0.205.
-- deps: Bump horochx/deploy-via-scp from 1.0.1 to 1.1.0.
-- deps: Bump dependabot/fetch-metadata from 1.1.1 to 2.2.0.
-- deps: Bump actions/setup-node from 2 to 4.
-- Update provider database.
-
-## [1.142.4] - 2024-08-09
-
-### Build system
-
-- Downgrade Tokio to 1.38 to fix Android compilation.
-- Use `--locked` with `cargo install`.
-
-### Features / Changes
-
-- Add Config::FixIsChatmail.
-- Always move outgoing auto-generated messages to the mvbox.
-- Disable requesting MDNs for bots by default.
-- Allow using OAuth 2 with SOCKS5.
-- Allow autoconfig when SOCKS5 is enabled.
-- Update provider database.
-- cargo: Update iroh from 0.21 to 0.22 ([#5860](https://github.com/deltachat/deltachat-core-rust/pull/5860)).
-
-### CI
-
-- Update Rust to 1.80.1.
-- Update EmbarkStudios/cargo-deny-action.
-
-### Documentation
-
-- Point to active Header Protection draft
-
-### Refactor
-
-- Derive `Default` for `CertificateChecks`.
-- Merge imap_certificate_checks and smtp_certificate_checks.
-- Remove param_addr_urlencoded argument from get_autoconfig().
-- Pass address to moz_autoconfigure() instead of LoginParam.
-
-## [1.142.3] - 2024-08-04
-
-### Build system
-
-- cargo: Update rusqlite and libsqlite3-sys.
-- Fix cargo warnings about default-features
-- Do not disable "vendored" feature in the workspace.
-- cargo: Bump quick-xml from 0.35.0 to 0.36.1.
-- cargo: Bump uuid from 1.9.1 to 1.10.0.
-- cargo: Bump tokio from 1.38.0 to 1.39.2.
-- cargo: Bump env_logger from 0.11.3 to 0.11.5.
-- Remove sha2 dependency.
-- Remove `backtrace` dependency.
-- Remove direct "quinn" dependency.
-
-## [1.142.2] - 2024-08-02
-
-### Features / Changes
-
-- Try only the full email address if username is unspecified.
-- Sort DNS results by successful connection timestamp ([#5818](https://github.com/deltachat/deltachat-core-rust/pull/5818)).
-
-### Fixes
-
-- Await the tasks after aborting them.
-- Do not reset is_chatmail config on failed reconfiguration.
-- Fix compilation on iOS.
-- Reset configured_provider on reconfiguration.
-
-### Refactor
-
-- Don't update message state to `OutMdnRcvd` anymore.
-
-### Build system
-
-- Use workspace dependencies to make cargo-deny 0.15.1 happy.
-- cargo: Update bytemuck from 0.14.3 to 0.16.3.
-- cargo: Bump toml from 0.8.14 to 0.8.15.
-- cargo: Bump serde_json from 1.0.120 to 1.0.122.
-- cargo: Bump human-panic from 2.0.0 to 2.0.1.
-- cargo: Bump thiserror from 1.0.61 to 1.0.63.
-- cargo: Bump syn from 2.0.68 to 2.0.72.
-- cargo: Bump quoted_printable from 0.5.0 to 0.5.1.
-- cargo: Bump serde from 1.0.203 to 1.0.204.
-
-## [1.142.1] - 2024-07-30
-
-### Features / Changes
-
-- Do not reveal sender's language in read receipts ([#5802](https://github.com/deltachat/deltachat-core-rust/pull/5802)).
-- Try next DNS resolution result if TLS setup fails.
-- Report first error instead of the last on connection failure.
-
-### Fixes
-
-- smtp: Use DNS cache for implicit TLS connections.
-- Imex::import_backup: Unpack all blobs before importing a db ([#4307](https://github.com/deltachat/deltachat-core-rust/pull/4307)).
-- Import_backup_stream: Fix progress stucking at 0.
-- Sql::import: Detach backup db if any step of the import fails.
-- Imex::import_backup: Ignore errors from delete_and_reset_all_device_msgs().
-- Explicitly close the database on account removal.
-
-### Miscellaneous Tasks
-
-- cargo: Update time from 0.3.34 to 0.3.36.
-- cargo: Update iroh from 0.20.0 to 0.21.0.
-
-### Refactor
-
-- Add net/dns submodule.
-- Pass single ALPN around instead of ALPN list.
-- Replace {IMAP,SMTP,HTTP}_TIMEOUT with a single constant.
-- smtp: Unify SMTP connection setup between TLS and STARTTLS.
-- imap: Unify IMAP connection setup in Client::connect().
-- Move DNS resolution into IMAP and SMTP connect code.
-
-### CI
-
-- Update Rust to 1.80.0.
-
-## [1.142.0] - 2024-07-23
-
-### API-Changes
-
-- deltachat-jsonrpc: Add `pinned` property to `FullChat` and `BasicChat`.
-- deltachat-jsonrpc: Allow to set message quote text without referencing quoted message ([#5695](https://github.com/deltachat/deltachat-core-rust/pull/5695)).
-
-### Features / Changes
-
-- cargo: Update iroh from 0.17 to 0.20.
-- iroh: Pass direct addresses from Endpoint to Gossip.
-- New BACKUP2 transfer protocol.
-- Use `[...]` instead of `...` for protected subject.
-- Add email address and fingerprint to exported key file names ([#5694](https://github.com/deltachat/deltachat-core-rust/pull/5694)).
-- Request `imap` ALPN for IMAP TLS connections and `smtp` ALPN for SMTP TLS connections.
-- Limit the size of aggregated WebXDC update to 100 KiB ([#4825](https://github.com/deltachat/deltachat-core-rust/pull/4825)).
-- Don't create ad-hoc group on a member removal message ([#5618](https://github.com/deltachat/deltachat-core-rust/pull/5618)).
-- Don't unarchive a group on a member removal except SELF ([#5618](https://github.com/deltachat/deltachat-core-rust/pull/5618)).
-- Use custom DNS resolver for HTTP(S).
-- Promote fallback DNS results to cached on successful use.
-- Set summary thumbnail path for WebXDCs to "webxdc-icon://last-msg-id" ([#5782](https://github.com/deltachat/deltachat-core-rust/pull/5782)).
-- Do not show the address in invite QR code SVG.
-- Report better error from DcKey::from_asc() ([#5539](https://github.com/deltachat/deltachat-core-rust/pull/5539)).
-- Contact::create_ex: Don't send sync message if nothing changed ([#5705](https://github.com/deltachat/deltachat-core-rust/pull/5705)).
-
-### Fixes
-
-- `Message::set_quote`: Don't forget to remove `Param::ProtectQuote`.
-- Randomize avatar blob filenames to work around caching.
-- Correct copy-pasted DCACCOUNT parsing errors message.
-- Call `send_sync_msg()` only from the SMTP loop ([#5780](https://github.com/deltachat/deltachat-core-rust/pull/5780)).
-- Emit MsgsChanged if the number of unnoticed archived chats could decrease ([#5768](https://github.com/deltachat/deltachat-core-rust/pull/5768)).
-- Reject message with forged From even if no valid signatures are found.
-
-### Refactor
-
-- Move key transfer into its own submodule.
-- Move TempPathGuard into `tools` and use instead of `DeleteOnDrop`.
-- Return error from export_backup() without logging.
-- Reduce boilerplate for migration version increment.
-
-### Tests
-
-- Add test for `get_http_response` JSON-RPC call.
-
-### Build system
-
-- node: Pin node-gyp to version 10.1.
-
-### Miscellaneous Tasks
-
-- cargo: Update hashlink to remove allocator-api2 dependency.
-- cargo: Update openssl to v0.10.66.
-- deps: Bump openssl from 0.10.60 to 0.10.66 in /fuzz.
-- cargo: Update `image` crate to 0.25.2.
-
-## [1.141.2] - 2024-07-09
-
-### Features / Changes
-
-- Add `is_muted` config option.
-- Parse vcards exported by protonmail ([#5723](https://github.com/deltachat/deltachat-core-rust/pull/5723)).
-- Disable sending sync messages for bots ([#5705](https://github.com/deltachat/deltachat-core-rust/pull/5705)).
-
-### Fixes
-
-- Don't fail if going to send plaintext, but some peerstate is missing.
-- Correctly sanitize input everywhere ([#5697](https://github.com/deltachat/deltachat-core-rust/pull/5697)).
-- Do not try to register non-iOS tokens for heartbeats.
-- imap: Reset new_mail if folder is ignored.
-- Use and prefer Date from signed message part ([#5716](https://github.com/deltachat/deltachat-core-rust/pull/5716)).
-- Distinguish between database errors and no gossip topic.
-- MimeFactory::verified: Return true for self-chat.
-
-### Refactor
-
-- `MimeFactory::is_e2ee_guaranteed()`: always respect `Param::ForcePlaintext`.
-- Protect from reusing migration versions ([#5719](https://github.com/deltachat/deltachat-core-rust/pull/5719)).
-- Move `quota_needs_update` calculation to a separate function ([#5683](https://github.com/deltachat/deltachat-core-rust/pull/5683)).
-
-### Documentation
-
-- Document vCards in the specification ([#5724](https://github.com/deltachat/deltachat-core-rust/pull/5724))
-
-### Miscellaneous Tasks
-
-- cargo: Bump toml from 0.8.13 to 0.8.14.
-- cargo: Bump serde_json from 1.0.117 to 1.0.120.
-- cargo: Bump syn from 2.0.66 to 2.0.68.
-- cargo: Bump async-broadcast from 0.7.0 to 0.7.1.
-- cargo: Bump url from 2.5.0 to 2.5.2.
-- cargo: Bump log from 0.4.21 to 0.4.22.
-- cargo: Bump regex from 1.10.4 to 1.10.5.
-- cargo: Bump proptest from 1.4.0 to 1.5.0.
-- cargo: Bump uuid from 1.8.0 to 1.9.1.
-- cargo: Bump backtrace from 0.3.72 to 0.3.73.
-- cargo: Bump quick-xml from 0.31.0 to 0.35.0.
-- cargo: Update yerpc to 0.6.2.
-- cargo: Update rPGP from 0.11 to 0.13.
-
-## [1.141.1] - 2024-06-27
-
-### Fixes
-
-- Update quota if it's stale, not fresh ([#5683](https://github.com/deltachat/deltachat-core-rust/pull/5683)).
-- sql: Assign migration adding msgs.deleted a new number.
-
-### Refactor
-
-- mimefactory: Factor out header confidentiality policy ([#5715](https://github.com/deltachat/deltachat-core-rust/pull/5715)).
-- Improve logging during SMTP/IMAP configuration.
-
-## [1.141.0] - 2024-06-24
-
-### API-Changes
-
-- deltachat-jsonrpc: Add `get_chat_securejoin_qr_code()`.
-- api!(deltachat-rpc-client): make {Account,Chat}.get_qr_code() return no SVG
-  This is a breaking change, old method is renamed into `get_qr_code_svg()`.
-
-### Features / Changes
-
-- Prefer references to fully downloaded messages for chat assignment ([#5645](https://github.com/deltachat/deltachat-core-rust/pull/5645)).
-- Protect From name for verified chats and To names for encrypted chats ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-- Display vCard contact name in the message summary.
-- Case-insensitive search for non-ASCII messages ([#5052](https://github.com/deltachat/deltachat-core-rust/pull/5052)).
-- Remove subject prefix from ad-hoc group names ([#5385](https://github.com/deltachat/deltachat-core-rust/pull/5385)).
-- Replace "Unnamed group" with "👥📧" to avoid translation.
-- Sync `Config::MvboxMove` across devices ([#5680](https://github.com/deltachat/deltachat-core-rust/pull/5680)).
-- Don't reveal profile data to a not yet verified contact ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-- Don't reveal profile data in MDNs ([#5166](https://github.com/deltachat/deltachat-core-rust/pull/5166)).
-
-### Fixes
-
-- Fetch existing messages for bots as `InFresh` ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Keep tombstones for two days before deleting ([#3685](https://github.com/deltachat/deltachat-core-rust/pull/3685)).
-- Housekeeping: Delete MDNs and webxdc status updates for tombstones.
-- Delete user-deleted messages on the server even if they show up on IMAP later.
-- Do not send sync messages if bcc_self is disabled.
-- Don't generate Config sync messages for unconfigured accounts.
-- Do not require the Message to render MDN.
-
-### CI
-
-- Update Rust to 1.79.0.
-
-### Documentation
-
-- Remove outdated documentation comment from `send_smtp_messages`.
-- Remove misleading configuration comment.
-
-### Miscellaneous Tasks
-
-- Update curve25519-dalek 4.1.x and suppress 3.2.0 warning.
-- Update provider database.
-
-### Refactor
-
-- Deduplicate dependency versions ([#5691](https://github.com/deltachat/deltachat-core-rust/pull/5691)).
-- Store public key instead of secret key for peer channels.
-
-### Tests
-
-- Image drafted as Viewtype::File is sent as is.
-- python: Set delete_server_after=1 ("delete immediately") for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- deltachat-rpc-client: Test that webxdc realtime data is not reordered on the sender.
-- python: Wait for bot's DC_EVENT_IMAP_INBOX_IDLE before sending messages to it ([#5699](https://github.com/deltachat/deltachat-core-rust/pull/5699)).
-
-## [1.140.2] - 2024-06-07
-
-### API-Changes
-
-- jsonrpc: Add set_draft_vcard(.., msg_id, contacts).
-
-### Fixes
-
-- Allow fetch_existing_msgs for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Remove group member locally even if send_msg() fails ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-- Revert member addition if the corresponding message couldn't be sent ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-- @deltachat/stdio-rpc-server: Make local non-symlinked installation possible by using absolute paths for local dev version ([#5679](https://github.com/deltachat/deltachat-core-rust/pull/5679)).
-
-### Miscellaneous Tasks
-
-- cargo: Bump schemars from 0.8.19 to 0.8.21.
-- cargo: Bump backtrace from 0.3.71 to 0.3.72.
-
-### Refactor
-
-- @deltachat/stdio-rpc-server: Use old school require instead of the experimental json import ([#5628](https://github.com/deltachat/deltachat-core-rust/pull/5628)).
-
-### Tests
-
-- Set fetch_existing_msgs for bots ([#4976](https://github.com/deltachat/deltachat-core-rust/pull/4976)).
-- Don't leave protected group if some member's key is missing ([#5508](https://github.com/deltachat/deltachat-core-rust/pull/5508)).
-
-## [1.140.1] - 2024-06-05
-
-### Fixes
-
-- Retry sending MDNs on temporary error.
-- Set Config::IsChatmail in configure().
-- Do not miss new messages while expunging the folder.
-- Log messages with `info!` instead of `println!`.
-
-### Documentation
-
-- imap: Document why CLOSE is faster than EXPUNGE.
-
-### Refactor
-
-- imap: Make select_folder() accept non-optional folder.
-- Improve SMTP logs and errors.
-- Remove unused `select_folder::Error` variants.
-
-### Tests
-
-- deltachat-rpc-client: reenable `log_cli`.
-
-## [1.140.0] - 2024-06-04
-
-### Features / Changes
-
-- Remove limit on number of email recipients for chatmail clients ([#5598](https://github.com/deltachat/deltachat-core-rust/pull/5598)).
-- Add config option to enable iroh ([#5607](https://github.com/deltachat/deltachat-core-rust/pull/5607)).
-- Map `*.wav` to Viewtype::Audio ([#5633](https://github.com/deltachat/deltachat-core-rust/pull/5633)).
-- Add a db index for reactions by msg_id ([#5507](https://github.com/deltachat/deltachat-core-rust/pull/5507)).
-
-### Fixes
-
-- Set Param::Bot for messages on the sender side as well ([#5615](https://github.com/deltachat/deltachat-core-rust/pull/5615)).
-- AEAP: Remove old peerstate verified_key instead of removing the whole peerstate ([#5535](https://github.com/deltachat/deltachat-core-rust/pull/5535)).
-- Allow creation of groups by outgoing messages without recipients.
-- Prefer `Chat-Group-ID` over references for new groups.
-- Do not fail to send images with wrong extensions.
-
-### Build system
-
-- Unpin OpenSSL version and update to OpenSSL 3.3.0.
-
-### CI
-
-- Remove cargo-nextest bug workaround.
-
-### Documentation
-
-- Add vCard as supported standard.
-- Create_group() does not find chats, only creates them.
-- Fix a typo in test_partial_group_consistency().
-
-### Refactor
-
-- Factor create_adhoc_group() call out of create_group().
-- Put duplicate code into `lookup_chat_or_create_adhoc_group`.
-
-### Tests
-
-- Fix logging of TestContext created using TestContext::new_alice().
-- Refactor `test_alias_*` into 8 separate tests.
-
-## [1.139.6] - 2024-05-25
-
-### Build system
-
-- Update `iroh` to the git version.
-- nix: Add iroh-base output hash.
-- Upgrade iroh to 0.17.0.
-
-### Fixes
-
-- @deltachat/stdio-rpc-server: Do not set RUST_LOG to "info" by default.
-- Acquire write lock on iroh_channels before checking for subscribe_loop.
-
-### Miscellaneous Tasks
-
-- Fix python lint.
-- cargo-deny: Remove unused entry from deny.toml.
-
-### Refactor
-
-- Log IMAP connection type on connection failure.
-
-### Tests
-
-- Viewtype::File attachments are sent unchanged and preserve extensions.
-- deltachat-rpc-client: Add realtime channel tests.
-- deltachat-rpc-client: Regression test for double gossip subscription.
-
-## [1.139.5] - 2024-05-23
-
-### API-Changes
-
-- deltachat-ffi: Make WebXdcRealtimeData data usable in CFFI.
-- Add event channel overflow event.
-- deltachat-rpc-client: Add EventType.WEBXDC_REALTIME_DATA constant.
-- deltachat-rpc-client: Add Message.send_webxdc_realtime_advertisement().
-- deltachat-rpc-client: Add Message.send_webxdc_realtime_data().
-
-### Features / Changes
-
-- deltachat-repl: Add start-realtime and send-realtime commands.
-
-### Fixes
-
-- peer_channels: Connect to peers that advertise to you.
-- Don't recode images in `Viewtype::File` messages ([#5617](https://github.com/deltachat/deltachat-core-rust/pull/5617)).
-
-### Tests
-
-- peer_channels: Add test_parallel_connect().
-- "SecureJoin wait" state and info messages.
-
-## [1.139.4] - 2024-05-21
-
-### Features / Changes
-
-- Scale up contact origins to OutgoingTo when sending a message.
-- Add import_vcard() ([#5202](https://github.com/deltachat/deltachat-core-rust/pull/5202)).
-
-### Fixes
-
-- Do not log warning if iroh relay metadata is NIL.
-- contact-tools: Parse_vcard: Support `\r\n` newlines.
-- Make_vcard: Add authname and key for ContactId::SELF.
-
-### Other
-
-- nix: Add nextest ([#5610](https://github.com/deltachat/deltachat-core-rust/pull/5610)).
-
-## [1.139.3] - 2024-05-20
-
-### API-Changes
-
-- [**breaking**] @deltachat/stdio-rpc-server: change api: don't search in path unless `options.takeVersionFromPATH` is set to `true`
-- @deltachat/stdio-rpc-server: remove `DELTA_CHAT_SKIP_PATH` environment variable
-- @deltachat/stdio-rpc-server: remove version check / search for dc rpc server in $PATH
-- @deltachat/stdio-rpc-server: remove `options.skipSearchInPath`
-- @deltachat/stdio-rpc-server: add `options.takeVersionFromPATH`
-- deltachat-rpc-client: Add Account.wait_for_incoming_msg().
-
-### Features / Changes
-
-- Replace env_logger with tracing_subscriber.
-
-### Fixes
-
-- Ignore event channel overflows.
-- mimeparser: Take the last header of multiple ones with the same name.
-- Db migration version 59, it contained an sql syntax error.
-- Sql syntax error in db migration 27.
-- Log/print exit error of deltachat-rpc-server ([#5601](https://github.com/deltachat/deltachat-core-rust/pull/5601)).
-- @deltachat/stdio-rpc-server: set default options for `startDeltaChat`.
-- Always convert absolute paths to relative in accounts.toml.
-
-### Refactor
-
-- receive_imf: Do not check for ContactId::UNDEFINED.
-- receive_imf: Remove unnecessary check for is_mdn.
-- receive_imf: Only call create_or_lookup_group() with allow_creation=true.
-- Use let..else in create_or_lookup_group().
-- Stop trying to extract chat ID from Message-IDs.
-- Do not try to lookup group in create_or_lookup_group().
-
-## [1.139.2] - 2024-05-18
-
-### Build system
-
-- Add repository URL to @deltachat/jsonrpc-client.
-
-## [1.139.1] - 2024-05-18
-
-### CI
-
-- Set `--access public` when publishing to npm.
-
-## [1.139.0] - 2024-05-18
-
-### Features / Changes
-
-- Ephemeral peer channels ([#5346](https://github.com/deltachat/deltachat-core-rust/pull/5346)).
-
-### Fixes
-
-- Save override sender displayname for outgoing messages.
-- Do not mark the message as seen if it has `location.kml`.
-- @deltachat/stdio-rpc-server: fix version check when deltachat-rpc-server is found in path ([#5579](https://github.com/deltachat/deltachat-core-rust/pull/5579)).
-- @deltachat/stdio-rpc-server: fix local desktop development ([#5583](https://github.com/deltachat/deltachat-core-rust/pull/5583)).
-- @deltachat/stdio-rpc-server: rename `shutdown` method to `close` and add `muteStdErr` option to mute the stderr output ([#5588](https://github.com/deltachat/deltachat-core-rust/pull/5588))
-- @deltachat/stdio-rpc-server: fix `convert_platform.py`: 32bit `i32` -> `ia32` ([#5589](https://github.com/deltachat/deltachat-core-rust/pull/5589))
-- @deltachat/stdio-rpc-server: fix example ([#5580](https://github.com/deltachat/deltachat-core-rust/pull/5580))
-
-### API-Changes
-
-- deltachat-jsonrpc: Return vcard contact directly in MessageObject.
-- deltachat-jsonrpc: Add api `migrate_account` and `get_blob_dir` ([#5584](https://github.com/deltachat/deltachat-core-rust/pull/5584)).
-- deltachat-rpc-client: Add ViewType.VCARD constant.
-- deltachat-rpc-client: Add Contact.make_vcard().
-- deltachat-rpc-client: Add Chat.send_contact().
-
-### CI
-
-- Publish @deltachat/jsonrpc-client directly to npm.
-- Check that constants are always up-to-date.
-
-### Build system
-
-- nix: Add git-cliff to flake.
-- nix: Use rust-analyzer nightly
-
-### Miscellaneous Tasks
-
-- cargo: Downgrade libc from 0.2.154 to 0.2.153.
-
-### Tests
-
-- deltachat-rpc-client: Test sending vCard.
-
-## [1.138.5] - 2024-05-16
-
-### API-Changes
-
-- jsonrpc: Add parse_vcard() ([#5202](https://github.com/deltachat/deltachat-core-rust/pull/5202)).
-- Add Viewtype::Vcard ([#5202](https://github.com/deltachat/deltachat-core-rust/pull/5202)).
-- Add make_vcard() ([#5203](https://github.com/deltachat/deltachat-core-rust/pull/5203)).
-
-### Build system
-
-- Add repository URL to deltachat-rpc-server packages.
-
-### Fixes
-
-- Parsing vCards with avatars exported by Android's "Contacts" app.
-
-### Miscellaneous Tasks
-
-- Rebuild node constants.
-
-### Refactor
-
-- contact-tools: VcardContact: rename display_name to authname.
-- VcardContact: Change timestamp type to i64.
-
-## [1.138.4] - 2024-05-15
-
-### CI
-
-- Run actions/setup-node before npm publish.
-
-## [1.138.3] - 2024-05-15
-
-### CI
-
-- Give CI job permission to publish binaries to the release.
-
-## [1.138.2] - 2024-05-15
-
-### API-Changes
-
-- deltachat-rpc-client: Add CONFIG_SYNCED constant.
-
-### CI
-
-- Add npm token to publish deltachat-rpc-server packages.
-
-### Features / Changes
-
-- Reset more settings when configuring a chatmail account.
-
-### Tests
-
-- Set configuration after configure() finishes.
-
-## [1.138.1] - 2024-05-14
-
-### Features / Changes
-
-- Detect XCHATMAIL capability and expose it as `is_chatmail` config.
-
-### Fixes
-
-- Never treat message with Chat-Group-ID as a private reply.
-- Always prefer Chat-Group-ID over In-Reply-To and References.
-- Ignore parent message if message references itself.
-
-### CI
-
-- Set RUSTUP_WINDOWS_PATH_ADD_BIN to work around `nextest` issue <https://github.com/nextest-rs/nextest/issues/1493>.
-- deltachat-rpc-server: Fix upload of npm packages to github releases ([#5564](https://github.com/deltachat/deltachat-core-rust/pull/5564)).
-
-### Refactor
-
-- Add MimeMessage.get_chat_group_id().
-- Make MimeMessage.get_header() return Option<&str>.
-- sql: Make open flags immutable.
-- Resultify token::lookup_or_new().
-
-### Miscellaneous Tasks
-
-- cargo: Bump parking_lot from 0.12.1 to 0.12.2.
-- cargo: Bump libc from 0.2.153 to 0.2.154.
-- cargo: Bump hickory-resolver from 0.24.0 to 0.24.1.
-- cargo: Bump serde_json from 1.0.115 to 1.0.116.
-- cargo: Bump human-panic from 1.2.3 to 2.0.0.
-- cargo: Bump brotli from 5.0.0 to 6.0.0.
-
-## [1.138.0] - 2024-05-13
-
-### API-Changes
-
-- Add dc_msg_save_file() which saves file copy at the provided path ([#4309](https://github.com/deltachat/deltachat-core-rust/pull/4309)).
-- Api!(jsonrpc): replace EphemeralTimer tag "variant" with "kind"
-
-### CI
-
-- Use rsync instead of 3rd party github action.
-- Replace `black` with `ruff format`.
-- Update Rust to 1.78.0.
-
-### Documentation
-
-- Fix references in Message.set_location() documentation.
-- Remove Doxygen markup from Message.has_location().
-- Add `location` module documentation.
-
-### Features / Changes
-
-- Delete expired path locations in ephemeral loop.
-- Delete orphaned POI locations during housekeeping.
-- Parsing vCards for contacts sharing ([#5482](https://github.com/deltachat/deltachat-core-rust/pull/5482)).
-- contact-tools: Support parsing profile images from "PHOTO:data:image/jpeg;base64,...".
-- contact-tools: Add make_vcard().
-- Do not add location markers to messages with non-POI location.
-- Make one-to-one chats read-only the first seconds of a SecureJoin ([#5512](https://github.com/deltachat/deltachat-core-rust/pull/5512)).
-
-### Fixes
-
-- Message::set_file_from_bytes(): Set Param::Filename.
-- Do not fail to send encrypted quotes to unencrypted chats.
-- Never prepend subject to message text when bot receives it.
-- Interrupt location loop when new location is stored.
-- Correct message viewtype before recoding image blob ([#5496](https://github.com/deltachat/deltachat-core-rust/pull/5496)).
-- Delete POI location when disappearing message expires.
-- Delete non-POI locations after `delete_device_after`, not immediately.
-- Update special chats icons even if they are blocked ([#5509](https://github.com/deltachat/deltachat-core-rust/pull/5509)).
-- Use ChatIdBlocked::lookup_by_contact() instead of ChatId's method when applicable.
-
-### Miscellaneous Tasks
-
-- cargo: Bump quote from 1.0.35 to 1.0.36.
-- cargo: Bump base64 from 0.22.0 to 0.22.1.
-- cargo: Bump serde from 1.0.197 to 1.0.200.
-- cargo: Bump async-channel from 2.2.0 to 2.2.1.
-- cargo: Bump thiserror from 1.0.58 to 1.0.59.
-- cargo: Bump anyhow from 1.0.81 to 1.0.82.
-- cargo: Bump chrono from 0.4.37 to 0.4.38.
-- cargo: Bump imap-proto from 0.16.4 to 0.16.5.
-- cargo: Bump syn from 2.0.57 to 2.0.60.
-- cargo: Bump mailparse from 0.14.1 to 0.15.0.
-- cargo: Bump schemars from 0.8.16 to 0.8.19.
-
-### Other
-
-- Build ts docs with ci + nix.
-- Push docs to delta.chat instead of codespeak
-- Implement jsonrpc-docs build in github action
-- Rm unneeded rust install from ts docs ci
-- Correct folder for js.jsonrpc docs
-- Add npm install to upload-docs.yml
-- Add : to upload-docs.yml
-- Upload-docs npm run => npm run build
-- Rm leading slash
-- Rm npm install
-- Merge pull request #5515 from deltachat/dependabot/cargo/quote-1.0.36
-- Merge pull request #5522 from deltachat/dependabot/cargo/chrono-0.4.38
-- Merge pull request #5523 from deltachat/dependabot/cargo/mailparse-0.15.0
-- Add webxdc internal integration commands in jsonrpc ([#5541](https://github.com/deltachat/deltachat-core-rust/pull/5541))
-- Limit quote replies ([#5543](https://github.com/deltachat/deltachat-core-rust/pull/5543))
-- Stdio jsonrpc server npm package ([#5332](https://github.com/deltachat/deltachat-core-rust/pull/5332))
-
-### Refactor
-
-- python: Fix ruff 0.4.2 warnings.
-- Move `delete_poi_location` to location module and document it.
-- Remove allow_keychange.
-
-### Tests
-
-- Explain test_was_seen_recently false-positive and give workaround instructions ([#5474](https://github.com/deltachat/deltachat-core-rust/pull/5474)).
-- Test that member is added even if "Member added" is lost.
-- Test that POIs are deleted when ephemeral message expires.
-- Test ts build on branch
-
-
-## [1.137.4] - 2024-04-24
-
-### API-Changes
-
-- [**breaking**] Remove `Stream` implementation for `EventEmitter`.
-- Experimental Webxdc Integration API, Maps Integration ([#5461](https://github.com/deltachat/deltachat-core-rust/pull/5461)).
-
-### Features / Changes
-
-- Add progressive backoff for failing IMAP connection attempts ([#5443](https://github.com/deltachat/deltachat-core-rust/pull/5443)).
-- Replace event channel with broadcast channel.
-- Mark contact request messages as seen on IMAP.
-
-### Fixes
-
-- Convert images to RGB8 (without alpha) before encoding into JPEG to fix sending of large RGBA images.
-- Don't set `is_bot` for webxdc status updates ([#5445](https://github.com/deltachat/deltachat-core-rust/pull/5445)).
-- Do not fail if Autocrypt Setup Message has no encryption preference to fix key transfer from K-9 Mail to Delta Chat.
-- Use only CRLF in Autocrypt Setup Message.
-- python: Use cached message object if `dc_get_msg()` returns `NULL`.
-- python: `Message::is_outgoing`: Don't reload message from db.
-- python: `_map_ffi_event`: Always check if `get_message_by_id()` returned None.
-- node: Undefine `NAPI_EXPERIMENTAL` to fix build with new clang.
-
-### Build system
-
-- nix: Add `imap-tools` as `deltachat-rpc-client` dependency.
-- nix: Add `./deltachat-contact-tools` to sources.
-- nix: Update nix flake.
-- deps: Update rustls to 0.21.11.
-
-### Documentation
-
-- Update references to SecureJoin protocols.
-- Fix broken references in documentation comments.
-
-### Refactor
-
-- imap: remove `RwLock` from `ratelimit`.
-- deltachat-ffi: Remove unused `ResultNullableExt`.
-- Remove duplicate clippy exceptions.
-- Group `use` at the top of the test modules.
-
-## [1.137.3] - 2024-04-16
-
-### API-Changes
-
-- [**breaking**] Remove reactions ffi; all implementations use jsonrpc.
-- Don't load trashed messages with `Message::load_from_db`.
-- Add `ChatListChanged` and `ChatListItemChanged` events ([#4476](https://github.com/deltachat/deltachat-core-rust/pull/4476)).
-- deltachat-rpc-client: Add `check_qr` and `set_config_from_qr` APIs.
-- deltachat-rpc-client: Add `Account.create_chat()`.
-- deltachat-rpc-client: Add `Message.wait_until_delivered()`.
-- deltachat-rpc-client: Add `Chat.send_file()`.
-- deltachat-rpc-client: Add `Account.wait_for_reactions_changed()`.
-- deltachat-rpc-client: Return Message from `Message.send_reaction()`.
-- deltachat-rpc-client: Add `Account.bring_online()`.
-- deltachat-rpc-client: Add `ACFactory.get_accepted_chat()`.
-
-### Features / Changes
-
-- Port `direct_imap.py` into deltachat-rpc-client.
-
-### Fixes
-
-- Do not emit `MSGS_CHANGED` event for outgoing hidden messages.
-- `Message::get_summary()` must not return reaction summary.
-- Fix emitting `ContactsChanged` events on "recently seen" status change ([#5377](https://github.com/deltachat/deltachat-core-rust/pull/5377)).
-- deltachat-jsonrpc: block in `inner_get_backup_qr`.
-- Add tolerance to `MemberListTimestamp` ([#5366](https://github.com/deltachat/deltachat-core-rust/pull/5366)).
-- Keep webxdc instance for `delete_device_after` period after a status update ([#5365](https://github.com/deltachat/deltachat-core-rust/pull/5365)).
-- Don't try to do `fetch_move_delete()` if Trash is needed but not yet configured.
-- Assign messages to chats based on not fully downloaded references.
-- Do not create ad-hoc groups from partial downloads.
-- deltachat-rpc-client: construct Thread with `target` keyword argument.
-- Format error context in `Message::load_from_db`.
-
-### Build system
-
-- cmake: adapt target install path if env var `CARGO_BUILD_TARGET` is set.
-- nix: Use stable Rust in flake.nix devshell.
-
-### CI
-
-- Use cargo-nextest instead of cargo-test.
-- Run doc tests with cargo test --workspace --doc ([#5459](https://github.com/deltachat/deltachat-core-rust/pull/5459)).
-- Typos in CI files ([#5453](https://github.com/deltachat/deltachat-core-rust/pull/5453)).
-
-### Documentation
-
-- Add <https://deps.rs> badge.
-- Add 'Ubuntu Touch' to the list of 'frontend projects'
-
-### Refactor
-
-- Do not ignore `Contact::get_by_id` errors in `get_encrinfo`.
-- deltachat-rpc-client: Use `list`, `set` and `tuple` instead of `typing`.
-- Use `clone_from()` ([#5451](https://github.com/deltachat/deltachat-core-rust/pull/5451)).
-- Do not check for `is_trash()` in `get_last_reaction_if_newer_than()`.
-- Split off functional contact tools into its own crate ([#5444](https://github.com/deltachat/deltachat-core-rust/pull/5444))
-- Fix nightly clippy warnings.
-
-### Tests
-
-- Test withdrawing group join QR codes.
-- `display_chat()`: Don't add day markers.
-- Move reaction tests to JSON-RPC.
-- node: Increase 'static tests' timeout to 5 minutes.
-
 ## [1.137.2] - 2024-04-05
 
 ### API-Changes
@@ -4766,36 +3872,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.137.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.136.6...v1.137.0
 [1.137.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.0...v1.137.1
 [1.137.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.1...v1.137.2
-[1.137.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.2...v1.137.3
-[1.137.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.3...v1.137.4
-[1.138.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.137.4...v1.138.0
-[1.138.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.0...v1.138.1
-[1.138.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.1...v1.138.2
-[1.138.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.2...v1.138.3
-[1.138.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.3...v1.138.4
-[1.138.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.4...v1.138.5
-[1.139.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.138.5...v1.139.0
-[1.139.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.0...v1.139.1
-[1.139.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.1...v1.139.2
-[1.139.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.2...v1.139.3
-[1.139.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.3...v1.139.4
-[1.139.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.4...v1.139.5
-[1.139.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.5...v1.139.6
-[1.140.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.6...v1.140.0
-[1.140.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.0...v1.140.1
-[1.140.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.1...v1.140.2
-[1.141.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.140.2...v1.141.0
-[1.141.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.0...v1.141.1
-[1.141.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.1...v1.141.2
-[1.142.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.2...v1.142.0
-[1.142.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.0...v1.142.1
-[1.142.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.1...v1.142.2
-[1.142.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.2...v1.142.3
-[1.142.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.3...v1.142.4
-[1.142.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.4...v1.142.5
-[1.142.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.5...v1.142.6
-[1.142.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.6...v1.142.7
-[1.142.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.7...v1.142.8
-[1.142.9]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.8...v1.142.9
-[1.142.10]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.9..v1.142.10
-[1.142.11]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.10..v1.142.11

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.142.11"
+version = "1.137.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -34,83 +34,93 @@ strip = true
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 deltachat-time = { path = "./deltachat-time" }
-deltachat-contact-tools = { workspace = true }
+deltachat-contact-tools = { path = "./deltachat-contact-tools" }
 format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }
 
 anyhow = { workspace = true }
-async-broadcast = "0.7.1"
-async-channel = { workspace = true }
+async-channel = "2.0.0"
 async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
-base64 = { workspace = true }
-brotli = { version = "6", default-features=false, features = ["std"] }
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
+backtrace = "0.3"
+base64 = "0.22"
+brotli = { version = "5", default-features=false, features = ["std"] }
+chrono = { workspace = true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
 fast-socks5 = "0.9"
 fd-lock = "4"
-futures = { workspace = true }
-futures-lite = { workspace = true }
+futures = "0.3"
+futures-lite = "2.3.0"
 hex = "0.4.0"
 hickory-resolver = "0.24"
 humansize = "2"
 image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
-iroh-net = { version = "0.22.0", default-features = false }
-iroh-gossip = { version = "0.22.0", default-features = false, features = ["net"] }
+iroh = { version = "0.4.2", default-features = false }
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-libc = { workspace = true }
-mailparse = "0.15"
+libc = "0.2"
+mailparse = "0.14"
 mime = "0.3.17"
 num_cpus = "1.16"
 num-derive = "0.4"
-num-traits = { workspace = true }
+num-traits = "0.2"
 once_cell = { workspace = true }
 percent-encoding = "2.3"
 parking_lot = "0.12"
-pgp = { version = "0.13.2", default-features = false }
+pgp = { version = "0.11", default-features = false }
+pin-project = "1"
+pretty_env_logger = { version = "0.5", optional = true }
 qrcodegen = "1.7.0"
-quick-xml = "0.36"
+quick-xml = "0.31"
 quoted_printable = "0.5"
-rand = { workspace = true }
+rand = "0.8"
 regex = { workspace = true }
-reqwest = { version = "0.12.5", features = ["json"] }
+reqwest = { version = "0.12.2", features = ["json"] }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-sanitize-filename = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
+sanitize-filename = "0.5"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
+sha2 = "0.10"
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
 tagger = "4.3.4"
 textwrap = "0.16.1"
-thiserror = { workspace = true }
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
+thiserror = "1"
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.15", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = { workspace = true }
+tokio-util = "0.7.9"
 toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 
+# Pin OpenSSL to 3.1 releases.
+# OpenSSL 3.2 has a regression tracked at <https://github.com/openssl/openssl/issues/23376>
+# which results in broken `deltachat-rpc-server` binaries when cross-compiled using Zig toolchain.
+# See <https://github.com/deltachat/deltachat-core-rust/issues/5206> for Delta Chat issue.
+# According to <https://www.openssl.org/policies/releasestrat.html>
+# 3.1 branch will be supported until 2025-03-14.
+openssl-src = "~300.1"
+
 [dev-dependencies]
-ansi_term = { workspace = true }
-anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
+ansi_term = "0.12.0"
+anyhow = { version = "1", features = ["backtrace"] } # Enable `backtrace` feature in tests.
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-futures-lite = { workspace = true }
-log = { workspace = true }
+futures-lite = "2.3.0"
+log = "0.4"
+pretty_env_logger = "0.5"
 proptest = { version = "1", default-features = false, features = ["std"] }
-tempfile = { workspace = true }
+tempfile = "3"
 testdir = "0.9.0"
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.37.0", features = ["parking_lot", "rt-multi-thread", "macros"] }
 pretty_assertions = "1.3.0"
 
 [workspace]
@@ -156,38 +166,10 @@ harness = false
 
 [workspace.dependencies]
 anyhow = "1"
-ansi_term = "0.12.1"
-async-channel = "2.3.1"
-base64 = "0.22"
-chrono = { version = "0.4.38", default-features = false }
-deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc" }
-deltachat = { path = "." }
-futures = "0.3.30"
-futures-lite = "2.3.0"
-libc = "0.2"
-log = "0.4"
-num-traits = "0.2"
 once_cell = "1.18.0"
-rand = "0.8"
 regex = "1.10"
-rusqlite = "0.32"
-sanitize-filename = "0.5"
-serde_json = "1"
-serde = "1.0"
-tempfile = "3.10.1"
-thiserror = "1"
-
-# 1.38 is the latest version before `mio` dependency update
-# that broke compilation with Android NDK r23c and r24.
-# Version 1.39.0 cannot be compiled using these NDKs,
-# see issue <https://github.com/tokio-rs/tokio/issues/6748>
-# for details.
-tokio = "~1.38.1"
-
-tokio-util = "0.7.11"
-tracing-subscriber = "0.3"
-yerpc = "0.6.2"
+rusqlite = "0.31"
+chrono = { version = "0.4.37", default-features=false, features = ["clock", "std"] }
 
 [features]
 default = ["vendored"]
@@ -197,6 +179,3 @@ vendored = [
   "rusqlite/bundled-sqlcipher-vendored-openssl",
   "reqwest/native-tls-vendored"
 ]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

README.md

@@ -30,13 +30,13 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ cargo run --locked -p deltachat-repl -- ~/deltachat-db
+$ cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
 Optionally, install `deltachat-repl` binary with
 ```
-$ cargo install --locked --path deltachat-repl/
+$ cargo install --path deltachat-repl/
 ```
 and run as
 ```

RELEASE.md

@@ -4,18 +4,21 @@ For example, to release version 1.116.0 of the core, do the following steps.
 
 1. Resolve all [blocker issues](https://github.com/deltachat/deltachat-core-rust/labels/blocker).
 
-2. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
+2. Run `npm run build:core:constants` in the root of the repository
+   and commit generated `node/constants.js`, `node/events.js` and `node/lib/constants.js`.
 
-3. add a link to compare previous with current version to the end of CHANGELOG.md:
+3. Update the changelog: `git cliff --unreleased --tag 1.116.0 --prepend CHANGELOG.md` or `git cliff -u -t 1.116.0 -p CHANGELOG.md`.
+
+4. add a link to compare previous with current version to the end of CHANGELOG.md:
   `[1.116.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.2...v1.116.0`
 
-4. Update the version by running `scripts/set_core_version.py 1.116.0`.
+5. Update the version by running `scripts/set_core_version.py 1.116.0`.
 
-5. Commit the changes as `chore(release): prepare for 1.116.0`.
+6. Commit the changes as `chore(release): prepare for 1.116.0`.
    Optionally, use a separate branch like `prep-1.116.0` for this commit and open a PR for review.
 
-6. Tag the release: `git tag -a v1.116.0`.
+7. Tag the release: `git tag -a v1.116.0`.
 
-7. Push the release tag: `git push origin v1.116.0`.
+8. Push the release tag: `git push origin v1.116.0`.
 
-8. Create a GitHub release: `gh release create v1.116.0 -n ''`.
+9. Create a GitHub release: `gh release create v1.116.0 -n ''`.

benches/contacts.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;

benches/create_account.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::PathBuf;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/get_chat_msgs.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/get_chatlist.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/receive_emails.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::PathBuf;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/search_msgs.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};

benches/send_events.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use deltachat::context::Context;

deltachat-contact-tools/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.0.0" # No semver-stable versioning
 edition = "2021"
 description = "Contact-related tools, like parsing vcards and sanitizing name and address. Meant for internal use in the deltachat crate."
 license = "MPL-2.0"
+# TODO maybe it should be called "deltachat-text-utils" or similar?
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -12,7 +13,8 @@ anyhow = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true } # Needed in order to `impl rusqlite::types::ToSql for EmailAddress`. Could easily be put behind a feature.
-chrono = { workspace = true, features = ["alloc", "clock", "std"] }
+chrono = { workspace = true }
+ical = { version = "0.11.0", default-features = false, features = ["vcard"] }
 
 [dev-dependencies]
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.

deltachat-contact-tools/src/lib.rs

@@ -22,8 +22,7 @@
     clippy::bool_assert_comparison,
     clippy::manual_split_once,
     clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    clippy::manual_range_contains
+    clippy::bool_to_int_with_if
 )]
 
 use std::fmt;
@@ -32,198 +31,77 @@ use std::ops::Deref;
 use anyhow::bail;
 use anyhow::Context as _;
 use anyhow::Result;
-use chrono::{DateTime, NaiveDateTime};
+use chrono::DateTime;
 use once_cell::sync::Lazy;
 use regex::Regex;
 
-#[derive(Debug)]
-/// A Contact, as represented in a VCard.
-pub struct VcardContact {
-    /// The email address, vcard property `email`
-    pub addr: String,
-    /// This must be the name authorized by the contact itself, not a locally given name. Vcard
-    /// property `fn`. Can be empty, one should use `display_name()` to obtain the display name.
-    pub authname: String,
-    /// The contact's public PGP key in Base64, vcard property `key`
-    pub key: Option<String>,
-    /// The contact's profile image (=avatar) in Base64, vcard property `photo`
-    pub profile_image: Option<String>,
-    /// The timestamp when the vcard was created / last updated, vcard property `rev`
-    pub timestamp: Result<i64>,
+// TODOs to clean up:
+// - Check if sanitizing is done correctly everywhere
+// - Apply lints everywhere (https://doc.rust-lang.org/cargo/reference/workspaces.html#the-lints-table)
+
+#[derive(Debug, Default)]
+pub struct Contact {
+    addr: String,
+    display_name: String,
+    key: String,
+    profile_photo: String,
+    timestamp: u64,
 }
 
-impl VcardContact {
-    /// Returns the contact's display name.
-    pub fn display_name(&self) -> &str {
-        match self.authname.is_empty() {
-            false => &self.authname,
-            true => &self.addr,
-        }
-    }
-}
+pub fn parse_vcard(vcard: String) -> Result<Vec<Contact>> {
+    let reader = ical::VcardParser::new(vcard.as_bytes());
 
-/// Returns a vCard containing given contacts.
-///
-/// Calling [`parse_vcard()`] on the returned result is a reverse operation.
-pub fn make_vcard(contacts: &[VcardContact]) -> String {
-    fn format_timestamp(c: &VcardContact) -> Option<String> {
-        let timestamp = *c.timestamp.as_ref().ok()?;
-        let datetime = DateTime::from_timestamp(timestamp, 0)?;
-        Some(datetime.format("%Y%m%dT%H%M%SZ").to_string())
-    }
-
-    let mut res = "".to_string();
-    for c in contacts {
-        let addr = &c.addr;
-        let display_name = c.display_name();
-        res += &format!(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:{addr}\n\
-             FN:{display_name}\n"
-        );
-        if let Some(key) = &c.key {
-            res += &format!("KEY:data:application/pgp-keys;base64,{key}\n");
-        }
-        if let Some(profile_image) = &c.profile_image {
-            res += &format!("PHOTO:data:image/jpeg;base64,{profile_image}\n");
-        }
-        if let Some(timestamp) = format_timestamp(c) {
-            res += &format!("REV:{timestamp}\n");
-        }
-        res += "END:VCARD\n";
-    }
-    res
-}
-
-/// Parses `VcardContact`s from a given `&str`.
-pub fn parse_vcard(vcard: &str) -> Vec<VcardContact> {
-    fn remove_prefix<'a>(s: &'a str, prefix: &str) -> Option<&'a str> {
-        let start_of_s = s.get(..prefix.len())?;
-
-        if start_of_s.eq_ignore_ascii_case(prefix) {
-            s.get(prefix.len()..)
-        } else {
-            None
-        }
-    }
-    fn vcard_property<'a>(s: &'a str, property: &str) -> Option<&'a str> {
-        let remainder = remove_prefix(s, property)?;
-        // If `s` is `EMAIL;TYPE=work:alice@example.com` and `property` is `EMAIL`,
-        // then `remainder` is now `;TYPE=work:alice@example.com`
-
-        // Note: This doesn't handle the case where there are quotes around a colon,
-        // like `NAME;Foo="Some quoted text: that contains a colon":value`.
-        // This could be improved in the future, but for now, the parsing is good enough.
-        let (params, value) = remainder.split_once(':')?;
-        // In the example from above, `params` is now `;TYPE=work`
-        // and `value` is now `alice@example.com`
-
-        if params
-            .chars()
-            .next()
-            .filter(|c| !c.is_ascii_punctuation() || *c == '_')
-            .is_some()
-        {
-            // `s` started with `property`, but the next character after it was not punctuation,
-            // so this line's property is actually something else
-            return None;
-        }
-        Some(value)
-    }
-    fn parse_datetime(datetime: &str) -> Result<i64> {
-        // According to https://www.rfc-editor.org/rfc/rfc6350#section-4.3.5, the timestamp
-        // is in ISO.8601.2004 format. DateTime::parse_from_rfc3339() apparently parses
-        // ISO.8601, but fails to parse any of the examples given.
-        // So, instead just parse using a format string.
-
-        // Parses 19961022T140000Z, 19961022T140000-05, or 19961022T140000-0500.
-        let timestamp = match DateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S%#z") {
-            Ok(datetime) => datetime.timestamp(),
-            // Parses 19961022T140000.
-            Err(e) => match NaiveDateTime::parse_from_str(datetime, "%Y%m%dT%H%M%S") {
-                Ok(datetime) => datetime
-                    .and_local_timezone(chrono::offset::Local)
-                    .single()
-                    .context("Could not apply local timezone to parsed date and time")?
-                    .timestamp(),
-                Err(_) => return Err(e.into()),
-            },
-        };
-        Ok(timestamp)
-    }
-
-    // Remove line folding, see https://datatracker.ietf.org/doc/html/rfc6350#section-3.2
-    static NEWLINE_AND_SPACE_OR_TAB: Lazy<Regex> = Lazy::new(|| Regex::new("\r?\n[\t ]").unwrap());
-    let unfolded_lines = NEWLINE_AND_SPACE_OR_TAB.replace_all(vcard, "");
-
-    let mut lines = unfolded_lines.lines().peekable();
     let mut contacts = Vec::new();
-
-    while lines.peek().is_some() {
-        // Skip to the start of the vcard:
-        for line in lines.by_ref() {
-            if line.eq_ignore_ascii_case("BEGIN:VCARD") {
-                break;
-            }
-        }
+    for vcard_contact in reader {
+        let vcard_contact = vcard_contact?; // TODO should just continue with the next contact
+        let mut new_contact = Contact::default();
 
         let mut display_name = None;
         let mut addr = None;
         let mut key = None;
         let mut photo = None;
-        let mut datetime = None;
+        let mut timestamp = None;
 
-        for mut line in lines.by_ref() {
-            if let Some(remainder) = remove_prefix(line, "item1.") {
-                // Remove the group name, if the group is called "item1".
-                // If necessary, we can improve this to also remove groups that are called something different that "item1".
-                //
-                // Search "group name" at https://datatracker.ietf.org/doc/html/rfc6350 for more infos.
-                line = remainder;
-            }
-
-            if let Some(email) = vcard_property(line, "email") {
-                addr.get_or_insert(email);
-            } else if let Some(name) = vcard_property(line, "fn") {
-                display_name.get_or_insert(name);
-            } else if let Some(k) = remove_prefix(line, "KEY;PGP;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "KEY;TYPE=PGP;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "KEY:data:application/pgp-keys;base64,"))
-                .or_else(|| remove_prefix(line, "KEY;PREF=1:data:application/pgp-keys;base64,"))
-            {
-                key.get_or_insert(k);
-            } else if let Some(p) = remove_prefix(line, "PHOTO;JPEG;ENCODING=BASE64:")
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=b:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=b;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;ENCODING=BASE64;TYPE=JPEG:"))
-                .or_else(|| remove_prefix(line, "PHOTO;TYPE=JPEG;ENCODING=BASE64:"))
-                .or_else(|| remove_prefix(line, "PHOTO:data:image/jpeg;base64,"))
-            {
-                photo.get_or_insert(p);
-            } else if let Some(rev) = vcard_property(line, "rev") {
-                datetime.get_or_insert(rev);
-            } else if line.eq_ignore_ascii_case("END:VCARD") {
-                break;
+        for property in vcard_contact.properties {
+            match &*property.name.to_lowercase() {
+                "email" => addr = addr.or(property.value),
+                "fn" => display_name = display_name.or(property.value),
+                "key" => key = key.or(dbg!(property).value), // TODO hmmm, the ical crate can apparently only parse version 3.0
+                "photo" => photo = photo.or(property.value),
+                "rev" => {
+                    timestamp = timestamp.or(property.value);
+                }
+                _ => {}
             }
         }
 
-        let (authname, addr) =
-            sanitize_name_and_addr(display_name.unwrap_or(""), addr.unwrap_or(""));
+        let (display_name, addr) =
+            sanitize_name_and_addr(&display_name.unwrap_or_default(), &addr.unwrap_or_default());
+        new_contact.display_name = display_name;
+        new_contact.addr = addr;
 
-        contacts.push(VcardContact {
-            authname,
-            addr,
-            key: key.map(|s| s.to_string()),
-            profile_image: photo.map(|s| s.to_string()),
-            timestamp: datetime
-                .context("No timestamp in vcard")
-                .and_then(parse_datetime),
-        });
+        if let Some(key) = key {
+            if let Some(base64_key) = key
+                .strip_prefix("PGP;ENCODING=BASE64:")
+                .or(key.strip_prefix("TYPE=PGP;ENCODING=b:"))
+                .or(key.strip_prefix("data:application/pgp-keys;base64,"))
+            {
+                new_contact.key = base64_key.to_string();
+            }
+        }
+
+        if let Some(photo) = photo {
+            if let Some(base64_photo) = photo
+                .strip_prefix("PGP;ENCODING=BASE64:")
+                .or(photo.strip_prefix("TYPE=PGP;ENCODING=b:"))
+                .or(photo.strip_prefix("data:application/pgp-keys;base64,"))
+            {}
+        }
+
+        contacts.push(new_contact);
     }
 
-    contacts
+    Ok(contacts)
 }
 
 /// Valid contact address.
@@ -271,27 +149,27 @@ impl rusqlite::types::ToSql for ContactAddress {
     }
 }
 
-/// Takes a name and an address and sanitizes them:
-/// - Extracts a name from the addr if the addr is in form "Alice <alice@example.org>"
-/// - Removes special characters from the name, see [`sanitize_name()`]
-/// - Removes the name if it is equal to the address by setting it to ""
+/// Make the name and address
 pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     static ADDR_WITH_NAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("(.*)<(.*)>").unwrap());
     let (name, addr) = if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
         (
             if name.is_empty() {
-                captures.get(1).map_or("", |m| m.as_str())
+                strip_rtlo_characters(captures.get(1).map_or("", |m| m.as_str()))
             } else {
-                name
+                strip_rtlo_characters(name)
             },
             captures
                 .get(2)
                 .map_or("".to_string(), |m| m.as_str().to_string()),
         )
     } else {
-        (name, addr.to_string())
+        (
+            strip_rtlo_characters(&normalize_name(name)),
+            addr.to_string(),
+        )
     };
-    let mut name = sanitize_name(name);
+    let mut name = normalize_name(&name);
 
     // If the 'display name' is just the address, remove it:
     // Otherwise, the contact would sometimes be shown as "alice@example.com (alice@example.com)" (see `get_name_n_addr()`).
@@ -303,77 +181,31 @@ pub fn sanitize_name_and_addr(name: &str, addr: &str) -> (String, String) {
     (name, addr)
 }
 
-/// Sanitizes a name.
+/// Normalize a name.
 ///
-/// - Removes newlines and trims the string
-/// - Removes quotes (come from some bad MUA implementations)
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_name(name: &str) -> String {
-    let name = sanitize_single_line(name);
-
-    match name.as_bytes() {
-        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => name
-            .get(1..name.len() - 1)
-            .map_or("".to_string(), |s| s.trim().to_string()),
-        _ => name.to_string(),
+/// - Remove quotes (come from some bad MUA implementations)
+/// - Trims the resulting string
+///
+/// Typically, this function is not needed as it is called implicitly by `Contact::add_address_book`.
+pub fn normalize_name(full_name: &str) -> String {
+    let full_name = full_name.trim();
+    if full_name.is_empty() {
+        return full_name.into();
     }
-}
 
-/// Sanitizes user input
-///
-/// - Removes newlines and trims the string
-/// - Removes potentially-malicious bidi characters
-pub fn sanitize_single_line(input: &str) -> String {
-    sanitize_bidi_characters(input.replace(['\n', '\r'], " ").trim())
+    match full_name.as_bytes() {
+        [b'\'', .., b'\''] | [b'\"', .., b'\"'] | [b'<', .., b'>'] => full_name
+            .get(1..full_name.len() - 1)
+            .map_or("".to_string(), |s| s.trim().to_string()),
+        _ => full_name.to_string(),
+    }
 }
 
 const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}'];
-const ISOLATE_CHARACTERS: [char; 3] = ['\u{2066}', '\u{2067}', '\u{2068}'];
-const POP_ISOLATE_CHARACTER: char = '\u{2069}';
-/// Some control unicode characters can influence whether adjacent text is shown from
-/// left to right or from right to left.
-///
-/// Since user input is not supposed to influence how adjacent text looks,
-/// this function removes some of these characters.
-///
-/// Also see https://github.com/deltachat/deltachat-core-rust/issues/3479.
-pub fn sanitize_bidi_characters(input_str: &str) -> String {
-    // RTLO_CHARACTERS are apparently rarely used in practice.
-    // They can impact all following text, so, better remove them all:
-    let input_str = input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "");
-
-    // If the ISOLATE characters are not ended with a POP DIRECTIONAL ISOLATE character,
-    // we regard the input as potentially malicious and simply remove all ISOLATE characters.
-    // See https://en.wikipedia.org/wiki/Bidirectional_text#Unicode_bidi_support
-    // and https://www.w3.org/International/questions/qa-bidi-unicode-controls.en
-    // for an explanation about ISOLATE characters.
-    fn isolate_characters_are_valid(input_str: &str) -> bool {
-        let mut isolate_character_nesting: i32 = 0;
-        for char in input_str.chars() {
-            if ISOLATE_CHARACTERS.contains(&char) {
-                isolate_character_nesting += 1;
-            } else if char == POP_ISOLATE_CHARACTER {
-                isolate_character_nesting -= 1;
-            }
-
-            // According to Wikipedia, 125 levels are allowed:
-            // https://en.wikipedia.org/wiki/Unicode_control_characters
-            // (although, in practice, we could also significantly lower this number)
-            if isolate_character_nesting < 0 || isolate_character_nesting > 125 {
-                return false;
-            }
-        }
-        isolate_character_nesting == 0
-    }
-
-    if isolate_characters_are_valid(&input_str) {
-        input_str
-    } else {
-        input_str.replace(
-            |char| ISOLATE_CHARACTERS.contains(&char) || POP_ISOLATE_CHARACTER == char,
-            "",
-        )
-    }
+/// This method strips all occurrences of the RTLO Unicode character.
+/// [Why is this needed](https://github.com/deltachat/deltachat-core-rust/issues/3479)?
+pub fn strip_rtlo_characters(input_str: &str) -> String {
+    input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "")
 }
 
 /// Returns false if addr is an invalid address, otherwise true.
@@ -478,12 +310,10 @@ impl rusqlite::types::ToSql for EmailAddress {
 
 #[cfg(test)]
 mod tests {
-    use chrono::TimeZone;
-
     use super::*;
 
     #[test]
-    fn test_vcard_thunderbird() {
+    fn test_thunderbird() {
         let contacts = parse_vcard(
             "BEGIN:VCARD
 VERSION:4.0
@@ -497,26 +327,26 @@ FN:'bobzzz@freenet.de'
 EMAIL;PREF=1:bobzzz@freenet.de
 UID:cac4fef4-6351-4854-bbe4-9b6df857eaed
 END:VCARD
-",
-        );
+"
+            .to_string(),
+        )
+        .unwrap();
 
         assert_eq!(contacts[0].addr, "alice.mueller@posteo.de".to_string());
-        assert_eq!(contacts[0].authname, "Alice Mueller".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
-        assert!(contacts[0].timestamp.is_err());
+        assert_eq!(contacts[0].display_name, "Alice Mueller".to_string());
+        assert_eq!(contacts[0].key, "".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());
 
         assert_eq!(contacts[1].addr, "bobzzz@freenet.de".to_string());
-        assert_eq!(contacts[1].authname, "".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
-        assert!(contacts[1].timestamp.is_err());
+        assert_eq!(contacts[1].display_name, "".to_string());
+        assert_eq!(contacts[1].key, "".to_string());
+        assert_eq!(contacts[1].profile_photo, "".to_string());
 
         assert_eq!(contacts.len(), 2);
     }
 
     #[test]
-    fn test_vcard_simple_example() {
+    fn test_simple_example() {
         let contacts = parse_vcard(
             "BEGIN:VCARD
 VERSION:4.0
@@ -527,75 +357,20 @@ EMAIL;TYPE=work:alice@example.com
 KEY;TYPE=PGP;ENCODING=b:[base64-data]
 REV:20240418T184242Z
 
-END:VCARD",
-        );
+END:VCARD"
+                .to_string(),
+        )
+        .unwrap();
 
         assert_eq!(contacts[0].addr, "alice@example.com".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(contacts[0].key, Some("[base64-data]".to_string()));
-        assert_eq!(contacts[0].profile_image, None);
-        assert_eq!(*contacts[0].timestamp.as_ref().unwrap(), 1713465762);
+        assert_eq!(contacts[0].display_name, "Alice Wonderland".to_string());
+        assert_eq!(contacts[0].key, "[base64-data]".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());
+        assert_eq!(contacts[0].timestamp, 1713465762); // I did not check whether this timestamp is correct
 
         assert_eq!(contacts.len(), 1);
     }
 
-    #[test]
-    fn test_make_and_parse_vcard() {
-        let contacts = [
-            VcardContact {
-                addr: "alice@example.org".to_string(),
-                authname: "Alice Wonderland".to_string(),
-                key: Some("[base64-data]".to_string()),
-                profile_image: Some("image in Base64".to_string()),
-                timestamp: Ok(1713465762),
-            },
-            VcardContact {
-                addr: "bob@example.com".to_string(),
-                authname: "".to_string(),
-                key: None,
-                profile_image: None,
-                timestamp: Ok(0),
-            },
-        ];
-        let items = [
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:alice@example.org\n\
-             FN:Alice Wonderland\n\
-             KEY:data:application/pgp-keys;base64,[base64-data]\n\
-             PHOTO:data:image/jpeg;base64,image in Base64\n\
-             REV:20240418T184242Z\n\
-             END:VCARD\n",
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             EMAIL:bob@example.com\n\
-             FN:bob@example.com\n\
-             REV:19700101T000000Z\n\
-             END:VCARD\n",
-        ];
-        let mut expected = "".to_string();
-        for len in 0..=contacts.len() {
-            let contacts = &contacts[0..len];
-            let vcard = make_vcard(contacts);
-            if len > 0 {
-                expected += items[len - 1];
-            }
-            assert_eq!(vcard, expected);
-            let parsed = parse_vcard(&vcard);
-            assert_eq!(parsed.len(), contacts.len());
-            for i in 0..parsed.len() {
-                assert_eq!(parsed[i].addr, contacts[i].addr);
-                assert_eq!(parsed[i].authname, contacts[i].authname);
-                assert_eq!(parsed[i].key, contacts[i].key);
-                assert_eq!(parsed[i].profile_image, contacts[i].profile_image);
-                assert_eq!(
-                    parsed[i].timestamp.as_ref().unwrap(),
-                    contacts[i].timestamp.as_ref().unwrap()
-                );
-            }
-        }
-    }
-
     #[test]
     fn test_contact_address() -> Result<()> {
         let alice_addr = "alice@example.org";
@@ -643,7 +418,7 @@ END:VCARD",
     }
 
     #[test]
-    fn test_vcard_android() {
+    fn test_android_contact_export() {
         let contacts = parse_vcard(
             "BEGIN:VCARD
 VERSION:2.1
@@ -658,153 +433,21 @@ N:;Alice;;;
 FN:Alice
 EMAIL;HOME:alice@example.org
 END:VCARD
-",
-        );
+"
+            .to_string(),
+        )
+        .unwrap();
 
         assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Bob".to_string());
-        assert_eq!(contacts[0].key, None);
-        assert_eq!(contacts[0].profile_image, None);
+        assert_eq!(contacts[0].display_name, "Bob".to_string());
+        assert_eq!(contacts[0].key, "".to_string());
+        assert_eq!(contacts[0].profile_photo, "".to_string());
 
         assert_eq!(contacts[1].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[1].authname, "Alice".to_string());
-        assert_eq!(contacts[1].key, None);
-        assert_eq!(contacts[1].profile_image, None);
+        assert_eq!(contacts[1].display_name, "Alice".to_string());
+        assert_eq!(contacts[1].key, "".to_string());
+        assert_eq!(contacts[1].profile_photo, "".to_string());
 
         assert_eq!(contacts.len(), 2);
     }
-
-    #[test]
-    fn test_vcard_local_datetime() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD\n\
-             VERSION:4.0\n\
-             FN:Alice Wonderland\n\
-             EMAIL;TYPE=work:alice@example.org\n\
-             REV:20240418T184242\n\
-             END:VCARD",
-        );
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(contacts[0].addr, "alice@example.org".to_string());
-        assert_eq!(contacts[0].authname, "Alice Wonderland".to_string());
-        assert_eq!(
-            *contacts[0].timestamp.as_ref().unwrap(),
-            chrono::offset::Local
-                .with_ymd_and_hms(2024, 4, 18, 18, 42, 42)
-                .unwrap()
-                .timestamp()
-        );
-    }
-
-    #[test]
-    fn test_vcard_with_base64_avatar() {
-        // This is not an actual base64-encoded avatar, it's just to test the parsing.
-        // This one is Android-like.
-        let vcard0 = "BEGIN:VCARD
-VERSION:2.1
-N:;Bob;;;
-FN:Bob
-EMAIL;HOME:bob@example.org
-PHOTO;ENCODING=BASE64;JPEG:/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEU
- AAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAA
- L8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==
-
-END:VCARD
-";
-        // This one is DOS-like.
-        let vcard1 = vcard0.replace('\n', "\r\n");
-        for vcard in [vcard0, vcard1.as_str()] {
-            let contacts = parse_vcard(vcard);
-            assert_eq!(contacts.len(), 1);
-            assert_eq!(contacts[0].addr, "bob@example.org".to_string());
-            assert_eq!(contacts[0].authname, "Bob".to_string());
-            assert_eq!(contacts[0].key, None);
-            assert_eq!(contacts[0].profile_image.as_deref().unwrap(), "/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAL8bRuAJYoZUYrI4ZY3VWwxw4Ay28AAGBISScmf/2Q==");
-        }
-    }
-
-    #[test]
-    fn test_protonmail_vcard() {
-        let contacts = parse_vcard(
-            "BEGIN:VCARD
-VERSION:4.0
-FN;PREF=1:Alice Wonderland
-UID:proton-web-03747582-328d-38dc-5ddd-000000000000
-ITEM1.EMAIL;PREF=1:alice@example.org
-ITEM1.KEY;PREF=1:data:application/pgp-keys;base64,aaaaaaaaaaaaaaaaaaaaaaaaa
- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ITEM1.KEY;PREF=2:data:application/pgp-keys;base64,bbbbbbbbbbbbbbbbbbbbbbbbb
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-ITEM1.X-PM-ENCRYPT:true
-ITEM1.X-PM-SIGN:true
-END:VCARD",
-        );
-
-        assert_eq!(contacts.len(), 1);
-        assert_eq!(&contacts[0].addr, "alice@example.org");
-        assert_eq!(&contacts[0].authname, "Alice Wonderland");
-        assert_eq!(contacts[0].key.as_ref().unwrap(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-        assert!(contacts[0].timestamp.is_err());
-        assert_eq!(contacts[0].profile_image, None);
-    }
-
-    #[test]
-    fn test_sanitize_name() {
-        assert_eq!(&sanitize_name(" hello world   "), "hello world");
-        assert_eq!(&sanitize_name("<"), "<");
-        assert_eq!(&sanitize_name(">"), ">");
-        assert_eq!(&sanitize_name("'"), "'");
-        assert_eq!(&sanitize_name("\""), "\"");
-    }
-
-    #[test]
-    fn test_sanitize_single_line() {
-        assert_eq!(sanitize_single_line("Hi\naiae "), "Hi aiae");
-        assert_eq!(sanitize_single_line("\r\nahte\n\r"), "ahte");
-    }
-
-    #[test]
-    fn test_sanitize_bidi_characters() {
-        // Legit inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat\u{2069}"),
-            "Tes\u{2067}ting Delta Chat\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"),
-            "Tes\u{2067}ting \u{2068} Delta Chat\u{2069}\u{2069}"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"),
-            "Tes\u{2067}ting\u{2069} Delta Chat\u{2067}\u{2069}"
-        );
-
-        // Potentially-malicious inputs:
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{202C}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Testing Delta Chat\u{2069}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2067}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2069}ting Delta Chat\u{2067}"),
-            "Testing Delta Chat"
-        );
-
-        assert_eq!(
-            &sanitize_bidi_characters("Tes\u{2068}ting Delta Chat"),
-            "Testing Delta Chat"
-        );
-    }
 }

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.142.11"
+version = "1.137.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -14,21 +14,21 @@ name = "deltachat"
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
-deltachat = { workspace = true, default-features = false }
-deltachat-jsonrpc = { workspace = true, optional = true }
-libc = { workspace = true }
-human-panic = { version = "2", default-features = false }
-num-traits = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
-thiserror = { workspace = true }
-rand = { workspace = true }
-once_cell = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose"] }
+deltachat = { path = "../", default-features = false }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
+libc = "0.2"
+human-panic = { version = "1", default-features = false }
+num-traits = "0.2"
+serde_json = "1.0"
+tokio = { version = "1.37.0", features = ["rt-multi-thread"] }
+anyhow = "1"
+thiserror = "1"
+rand = "0.8"
+once_cell = "1.18.0"
+yerpc = { version = "0.5.1", features = ["anyhow_expose"] }
 
 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
+vendored = ["deltachat/vendored"]
 jsonrpc = ["dep:deltachat-jsonrpc"]
 

deltachat-ffi/deltachat.h

@@ -362,12 +362,8 @@ uint32_t        dc_get_id                    (dc_context_t* context);
  *     Must be freed using dc_event_emitter_unref() after usage.
  *
  * Note: Use only one event emitter per context.
- * The result of having multiple event emitters is unspecified.
- * Currently events are broadcasted to all existing event emitters,
- * but previous versions delivered events to only one event emitter
- * and this behavior may change again in the future.
- * Events emitted before creation of event emitter
- * may or may not be available to event emitter.
+ * Having more than one event emitter running at the same time on the same context
+ * will result in events being randomly delivered to one of the emitters.
  */
 dc_event_emitter_t* dc_get_event_emitter(dc_context_t* context);
 
@@ -409,7 +405,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `socks5_user` = SOCKS5 proxy username
  * - `socks5_password` = SOCKS5 proxy password
  * - `imap_certificate_checks` = how to check IMAP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
- * - `smtp_certificate_checks` = deprecated option, should be set to the same value as `imap_certificate_checks` but ignored by the new core
+ * - `smtp_certificate_checks` = how to check SMTP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
  * - `displayname`  = Own name to use when sending messages. MUAs are allowed to spread this way e.g. using CC, defaults to empty
  * - `selfstatus`   = Own status to display, e.g. in e-mail footers, defaults to empty
  * - `selfavatar`   = File containing avatar. Will immediately be copied to the 
@@ -420,8 +416,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    and also recoded to a reasonable size.
  * - `e2ee_enabled` = 0=no end-to-end-encryption, 1=prefer end-to-end-encryption (default)
  * - `mdns_enabled` = 0=do not send or request read receipts,
- *                    1=send and request read receipts
- *                    default=send and request read receipts, only send but not reuqest if `bot` is set
+ *                    1=send and request read receipts (default)
  * - `bcc_self`     = 0=do not send a copy of outgoing messages to self (default),
  *                    1=send a copy of outgoing messages to self.
  *                    Sending messages to self is needed for a proper multi-account setup,
@@ -482,9 +477,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `bot`          = Set to "1" if this is a bot.
  *                    Prevents adding the "Device messages" and "Saved messages" chats,
  *                    adds Auto-Submitted header to outgoing messages,
- *                    accepts contact requests automatically (calling dc_accept_chat() is not needed),
- *                    does not cut large incoming text messages,
- *                    handles existing messages the same way as new ones if `fetch_existing_msgs=1`.
+ *                    accepts contact requests automatically (calling dc_accept_chat() is not needed for bots)
+ *                    and does not cut large incoming text messages.
  * - `last_msg_id` = database ID of the last message processed by the bot.
  *                   This ID and IDs below it are guaranteed not to be returned
  *                   by dc_get_next_msgs() and dc_wait_next_msgs().
@@ -495,8 +489,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                   For most bots calling `dc_markseen_msgs()` is the
  *                   recommended way to update this value
  *                   even for self-sent messages.
- * - `fetch_existing_msgs` = 0=do not fetch existing messages on configure (default),
- *                    1=fetch most recent existing messages on configure.
+ * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
+ *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
  * - `disable_idle` = 1=disable IMAP IDLE even if the server supports it,
  *                    0=use IMAP IDLE if the server supports it.
@@ -519,20 +513,11 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    0=Nothing else happens when the key changes.
  *                    1=After the key changed, `dc_chat_can_send()` returns false and `dc_chat_is_protection_broken()` returns true
  *                    until `dc_accept_chat()` is called.
- * - `is_chatmail` = 1 if the the server is a chatmail server, 0 otherwise.
- * - `is_muted`     = Whether a context is muted by the user.
- *                    Muted contexts should not sound, vibrate or show notifications.
- *                    In contrast to `dc_set_chat_mute_duration()`,
- *                    fresh message and badge counters are not changed by this setting,
- *                    but should be tuned down where appropriate.
  * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
  *                    The prefix should be followed by the system and maybe subsystem,
  *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
  *                    These keys go to backups and allow easy per-account settings when using @ref dc_accounts_t,
  *                    however, are not handled by the core otherwise.
- * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled.
- *                               0 = WebXDC realtime API is disabled and behaves as noop (default).
- *                               1 = WebXDC realtime API is enabled.
  *
  * If you want to retrieve a value, use dc_get_config().
  *
@@ -1193,65 +1178,6 @@ int dc_send_webxdc_status_update (dc_context_t* context, uint32_t msg_id, const
  */
 char* dc_get_webxdc_status_updates (dc_context_t* context, uint32_t msg_id, uint32_t serial);
 
-
-/**
- * Set Webxdc file as integration.
- * see dc_init_webxdc_integration() for more details about Webxdc integrations.
- *
- * @warning This is an experimental API which may change in the future
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param file The .xdc file to use as Webxdc integration.
- */
-void             dc_set_webxdc_integration (dc_context_t* context, const char* file);
-
-
-/**
- * Init a Webxdc integration.
- *
- * A Webxdc integration is
- * a Webxdc showing a map, getting locations via setUpdateListener(), setting POIs via sendUpdate();
- * core takes eg. care of feeding locations to the Webxdc or sending the data out.
- *
- * @warning This is an experimental API, esp. support of integration types (eg. image editor, tools) is left out for simplicity
- *
- * Currently, Webxdc integrations are .xdc files shipped together with the main app.
- * Before dc_init_webxdc_integration() can be called,
- * UI has to call dc_set_webxdc_integration() to define a .xdc file to be used as integration.
- *
- * dc_init_webxdc_integration() returns a Webxdc message ID that
- * UI can open and use mostly as usual.
- *
- * Concrete behaviour and status updates depend on the integration, driven by UI needs.
- *
- * There is no need to de-initialize the integration,
- * however, unless documented otherwise,
- * the integration is valid only as long as not re-initialized
- * In other words, UI must not have a Webxdc with the same integration open twice.
- *
- * Example:
- *
- * ~~~
- * // Define a .xdc file to be used as maps integration
- * dc_set_webxdc_integration(context, path_to_maps_xdc);
- *
- * // Integrate the map to a chat, the map will show locations for this chat then:
- * uint32_t webxdc_instance = dc_init_webxdc_integration(context, any_chat_id);
- *
- * // Or use the Webxdc as a global map, showing locations of all chats:
- * uint32_t webxdc_instance = dc_init_webxdc_integration(context, 0);
- * ~~~
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param chat_id The chat to get the integration for.
- * @return ID of the message that refers to the Webxdc instance.
- *     UI can open a Webxdc as usual with this instance.
- */
-uint32_t        dc_init_webxdc_integration    (dc_context_t* context, uint32_t chat_id);
-
-
 /**
  * Save a draft for a chat in the database.
  *
@@ -2505,7 +2431,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_WITHOUT_ADDR       230 // test1=formatted fingerprint
 #define         DC_QR_ACCOUNT                250 // text1=domain
 #define         DC_QR_BACKUP                 251
-#define         DC_QR_BACKUP2                252
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
@@ -2552,7 +2477,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
  * - DC_QR_BACKUP:
- * - DC_QR_BACKUP2:
  *   ask the user if they want to set up a new device.
  *   If so, pass the qr-code to dc_receive_backup().
  *
@@ -2621,7 +2545,7 @@ dc_lot_t*       dc_check_qr                  (dc_context_t* context, const char*
  *     the Verified-Group-Invite protocol is offered in the QR code;
  *     works for protected groups as well as for normal groups.
  *     If set to 0, the Setup-Contact protocol is offered in the QR code.
- *     See https://securejoin.delta.chat/
+ *     See https://securejoin.readthedocs.io/en/latest/new.html
  *     for details about both protocols.
  * @return The text that should go to the QR code,
  *     On errors, an empty QR code is returned, NULL is never returned.
@@ -2657,7 +2581,8 @@ char*           dc_get_securejoin_qr_svg         (dc_context_t* context, uint32_
  *
  * Subsequent calls of dc_join_securejoin() will abort previous, unfinished handshakes.
  *
- * See https://securejoin.delta.chat/ for details about both protocols.
+ * See https://securejoin.readthedocs.io/en/latest/new.html
+ * for details about both protocols.
  *
  * @memberof dc_context_t
  * @param context The context object.
@@ -4118,19 +4043,6 @@ char*           dc_msg_get_subject            (const dc_msg_t* msg);
 char*           dc_msg_get_file               (const dc_msg_t* msg);
 
 
-/**
- * Save file copy at the user-provided path.
- *
- * Fails if file already exists at the provided path.
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @param path Destination file path with filename and extension.
- * @return 0 on failure, 1 on success.
- */
-int             dc_msg_save_file              (const dc_msg_t* msg, const char* path);
-
-
 /**
  * Get an original attachment filename, with extension but without the path. To get the full path,
  * use dc_msg_get_file().
@@ -4195,6 +4107,7 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
  *   true if the Webxdc should get full internet access, including Webrtc.
  *   currently, this is only true for encrypted Webxdc's in the self chat
  *   that have requested internet access in the manifest.
+ *   this is useful for development and maybe for internal integrations at some point.
  *
  * @memberof dc_msg_t
  * @param msg The webxdc instance.
@@ -4403,9 +4316,9 @@ int             dc_msg_has_deviating_timestamp(const dc_msg_t* msg);
 
 
 /**
- * Check if a message has a POI location bound to it.
- * These locations are also returned by dc_get_locations()
- * The UI may decide to display a special icon beside such messages.
+ * Check if a message has a location bound to it.
+ * These messages are also returned by dc_get_locations()
+ * and the UI may decide to display a special icon beside such messages,
  *
  * @memberof dc_msg_t
  * @param msg The message object.
@@ -5492,11 +5405,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
  */
 #define DC_MSG_WEBXDC    80
 
-/**
- * Message containing shared contacts represented as a vCard (virtual contact file)
- * with email addresses and possibly other fields.
- */
-#define DC_MSG_VCARD     90
 
 /**
  * @}
@@ -6296,18 +6204,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121
 
-/**
- * Data received over an ephemeral peer channel.
- *
- * @param data1 (int) msg_id
- * @param data2 (int) + (char*) binary data.
- *     length is returned as integer with dc_event_get_data2_int()
- *     and binary data is returned as dc_event_get_data2_str().
- *     Binary data must be passed to dc_str_unref() afterwards.
- */
-
-#define DC_EVENT_WEBXDC_REALTIME_DATA             2150
-
 /**
  * Tells that the Background fetch was completed (or timed out).
  *
@@ -6336,14 +6232,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_CHATLIST_ITEM_CHANGED         2301
 
-
-/**
- * Inform that some events have been skipped due to event channel overflow.
- *
- * @param data1 (int) number of events that have been skipped
- */
-#define DC_EVENT_CHANNEL_OVERFLOW              2400
-
 /**
  * @}
  */
@@ -6651,16 +6539,12 @@ void dc_event_unref(dc_event_t* event);
 /// "Message opened"
 ///
 /// Used in subjects of outgoing read receipts.
-///
-/// @deprecated Deprecated 2024-07-26
 #define DC_STR_READRCPT                   31
 
 /// "The message '%1$s' you sent was displayed on the screen of the recipient."
 ///
 /// Used as message text of outgoing read receipts.
 /// - %1$s will be replaced by the subject of the displayed message
-///
-/// @deprecated Deprecated 2024-06-23
 #define DC_STR_READRCPT_MAILBODY          32
 
 /// @deprecated Deprecated, this string is no longer needed.
@@ -7369,19 +7253,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used in summaries.
 #define DC_STR_REACTED_BY 177
 
-/// "Establishing guaranteed end-to-end encryption, please wait…"
-///
-/// Used as info message.
-#define DC_STR_SECUREJOIN_WAIT 190
-
-/// "Could not yet establish guaranteed end-to-end encryption, but you may already send a message."
-///
-/// Used as info message.
-#define DC_STR_SECUREJOIN_WAIT_TIMEOUT 191
-
-/// "Contact". Deprecated, currently unused.
-#define DC_STR_CONTACT 200
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -1,9 +1,10 @@
-#![recursion_limit = "256"]
 #![warn(unused, clippy::all)]
 #![allow(
     non_camel_case_types,
     non_snake_case,
     non_upper_case_globals,
+    non_upper_case_globals,
+    non_camel_case_types,
     clippy::missing_safety_doc,
     clippy::expect_fun_call
 )]
@@ -562,11 +563,9 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::ConfigSynced { .. } => 2111,
         EventType::WebxdcStatusUpdate { .. } => 2120,
         EventType::WebxdcInstanceDeleted { .. } => 2121,
-        EventType::WebxdcRealtimeData { .. } => 2150,
         EventType::AccountsBackgroundFetchDone => 2200,
         EventType::ChatlistChanged => 2300,
         EventType::ChatlistItemChanged { .. } => 2301,
-        EventType::EventChannelOverflow { .. } => 2400,
     }
 }
 
@@ -619,13 +618,11 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::SecurejoinJoinerProgress { contact_id, .. } => {
             contact_id.to_u32() as libc::c_int
         }
-        EventType::WebxdcRealtimeData { msg_id, .. }
-        | EventType::WebxdcStatusUpdate { msg_id, .. }
-        | EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
         EventType::ChatlistItemChanged { chat_id } => {
             chat_id.unwrap_or_default().to_u32() as libc::c_int
         }
-        EventType::EventChannelOverflow { n } => *n as libc::c_int,
     }
 }
 
@@ -664,9 +661,8 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::AccountsBackgroundFetchDone
         | EventType::ChatlistChanged
         | EventType::ChatlistItemChanged { .. }
-        | EventType::ConfigSynced { .. }
-        | EventType::ChatModified(_)
-        | EventType::EventChannelOverflow { .. } => 0,
+        | EventType::ConfigSynced { .. } => 0,
+        EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
@@ -681,7 +677,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
             status_update_serial,
             ..
         } => status_update_serial.to_u32() as libc::c_int,
-        EventType::WebxdcRealtimeData { data, .. } => data.len() as libc::c_int,
     }
 }
 
@@ -732,8 +727,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::ChatEphemeralTimerModified { .. }
         | EventType::IncomingMsgBunch { .. }
         | EventType::ChatlistItemChanged { .. }
-        | EventType::ChatlistChanged
-        | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
+        | EventType::ChatlistChanged => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
                 comment.to_c_string().unwrap_or_default().into_raw()
@@ -749,11 +743,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = key.to_string().to_c_string().unwrap_or_default();
             data2.into_raw()
         }
-        EventType::WebxdcRealtimeData { data, .. } => {
-            let ptr = libc::malloc(data.len());
-            libc::memcpy(ptr, data.as_ptr() as *mut libc::c_void, data.len());
-            ptr as *mut libc::c_char
-        }
     }
 }
 
@@ -1076,43 +1065,6 @@ pub unsafe extern "C" fn dc_get_webxdc_status_updates(
     .strdup()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_set_webxdc_integration(
-    context: *mut dc_context_t,
-    file: *const libc::c_char,
-) {
-    if context.is_null() || file.is_null() {
-        eprintln!("ignoring careless call to dc_set_webxdc_integration()");
-        return;
-    }
-    let ctx = &*context;
-    block_on(ctx.set_webxdc_integration(&to_string_lossy(file)))
-        .log_err(ctx)
-        .unwrap_or_default();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_init_webxdc_integration(
-    context: *mut dc_context_t,
-    chat_id: u32,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_init_webxdc_integration()");
-        return 0;
-    }
-    let ctx = &*context;
-    let chat_id = if chat_id == 0 {
-        None
-    } else {
-        Some(ChatId::new(chat_id))
-    };
-
-    block_on(ctx.init_webxdc_integration(chat_id))
-        .log_err(ctx)
-        .map(|msg_id| msg_id.map(|id| id.to_u32()).unwrap_or_default())
-        .unwrap_or(0)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_draft(
     context: *mut dc_context_t,
@@ -2058,7 +2010,7 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                     );
                     message::Message::default()
                 } else {
-                    warn!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
+                    error!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
                     return ptr::null_mut();
                 }
             }
@@ -3381,34 +3333,6 @@ pub unsafe extern "C" fn dc_msg_get_file(msg: *mut dc_msg_t) -> *mut libc::c_cha
         .unwrap_or_else(|| "".strdup())
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_save_file(
-    msg: *mut dc_msg_t,
-    path: *const libc::c_char,
-) -> libc::c_int {
-    if msg.is_null() || path.is_null() {
-        eprintln!("ignoring careless call to dc_msg_save_file()");
-        return 0;
-    }
-    let ffi_msg = &*msg;
-    let ctx = &*ffi_msg.context;
-    let path = to_string_lossy(path);
-    let r = block_on(
-        ffi_msg
-            .message
-            .save_file(ctx, &std::path::PathBuf::from(path)),
-    );
-    match r {
-        Ok(()) => 1,
-        Err(_) => {
-            r.context("Failed to save file from message")
-                .log_err(ctx)
-                .unwrap_or_default();
-            0
-        }
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_get_filename(msg: *mut dc_msg_t) -> *mut libc::c_char {
     if msg.is_null() {
@@ -4364,7 +4288,7 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid
     let ctx = &*ffi_provider.context;
     let provider = &mut ffi_provider.provider;
     block_on(provider)
-        .context("Failed to await backup provider")
+        .context("Failed to await BackupProvider")
         .log_err(ctx)
         .set_last_error(ctx)
         .ok();
@@ -4418,7 +4342,7 @@ trait ResultExt<T, E> {
     /// Like `log_err()`, but:
     /// - returns the default value instead of an Err value.
     /// - emits an error instead of a warning for an [Err] result. This means
-    ///   that the error will be shown to the user in a small pop-up.
+    /// that the error will be shown to the user in a small pop-up.
     fn unwrap_or_log_default(self, context: &context::Context, message: &str) -> T;
 }
 
@@ -4484,6 +4408,19 @@ where
     }
 }
 
+trait ResultNullableExt<T> {
+    fn into_raw(self) -> *mut T;
+}
+
+impl<T, E> ResultNullableExt<T> for Result<T, E> {
+    fn into_raw(self) -> *mut T {
+        match self {
+            Ok(t) => Box::into_raw(Box::new(t)),
+            Err(_) => ptr::null_mut(),
+        }
+    }
+}
+
 fn convert_and_prune_message_ids(msg_ids: *const u32, msg_cnt: libc::c_int) -> Vec<MsgId> {
     let ids = unsafe { std::slice::from_raw_parts(msg_ids, msg_cnt as usize) };
     let msg_ids: Vec<MsgId> = ids
@@ -4963,9 +4900,7 @@ mod jsonrpc {
         }
 
         let account_manager = &*account_manager;
-        let cmd_api = block_on(deltachat_jsonrpc::api::CommandApi::from_arc(
-            account_manager.inner.clone(),
-        ));
+        let cmd_api = deltachat_jsonrpc::api::CommandApi::from_arc(account_manager.inner.clone());
 
         let (request_handle, receiver) = RpcClient::new();
         let handle = RpcSession::new(request_handle, cmd_api);

deltachat-ffi/src/lot.rs

@@ -50,7 +50,6 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
                 Qr::Backup { .. } => None,
-                Qr::Backup2 { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
                 Qr::Addr { draft, .. } => draft.as_deref(),
                 Qr::Url { url } => Some(url),
@@ -103,7 +102,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
                 Qr::Backup { .. } => LotState::QrBackup,
-                Qr::Backup2 { .. } => LotState::QrBackup2,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
@@ -129,7 +127,6 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::Backup { .. } => Default::default(),
-                Qr::Backup2 { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
@@ -180,8 +177,6 @@ pub enum LotState {
 
     QrBackup = 251,
 
-    QrBackup2 = 252,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.142.11"
+version = "1.137.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -13,30 +13,29 @@ path = "src/webserver.rs"
 required-features = ["webserver"]
 
 [dependencies]
-anyhow = { workspace = true }
-deltachat = { workspace = true }
-deltachat-contact-tools = { workspace = true }
-num-traits = { workspace = true }
-schemars = "0.8.21"
-serde = { workspace = true, features = ["derive"] }
-tempfile = { workspace = true }
-log = { workspace = true }
-async-channel = { workspace = true }
-futures = { workspace = true }
-serde_json = { workspace = true }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+anyhow = "1"
+deltachat = { path = ".." }
+num-traits = "0.2"
+schemars = "0.8.13"
+serde = { version = "1.0", features = ["derive"] }
+tempfile = "3.10.1"
+log = "0.4"
+async-channel = { version = "2.0.0" }
+futures = { version = "0.3.30" }
+serde_json = "1"
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 typescript-type-def = { version = "0.5.8", features = ["json_value"] }
-tokio = { workspace = true }
-sanitize-filename = { workspace = true }
+tokio = { version = "1.37.0" }
+sanitize-filename = "0.5"
 walkdir = "2.5.0"
-base64 = { workspace = true }
+base64 = "0.22"
 
 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.5", optional = true }
+env_logger = { version = "0.11.3", optional = true }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.37.0", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api.rs

@@ -1,6 +1,4 @@
 use std::collections::BTreeMap;
-use std::path::Path;
-use std::str;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{collections::HashMap, str::FromStr};
@@ -18,14 +16,12 @@ use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
+use deltachat::imex;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
     self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
-use deltachat::peer_channels::{
-    leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
-};
 use deltachat::provider::get_provider_info;
 use deltachat::qr::{self, Qr};
 use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
@@ -33,8 +29,6 @@ use deltachat::reaction::{get_msg_reactions, send_reaction};
 use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
-use deltachat::EventEmitter;
-use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
@@ -46,7 +40,7 @@ pub mod types;
 use num_traits::FromPrimitive;
 use types::account::Account;
 use types::chat::FullChat;
-use types::contact::{ContactObject, VcardContact};
+use types::contact::ContactObject;
 use types::events::Event;
 use types::http::HttpResponse;
 use types::message::{MessageData, MessageObject, MessageReadReceipt};
@@ -87,30 +81,21 @@ impl Default for AccountState {
 pub struct CommandApi {
     pub(crate) accounts: Arc<RwLock<Accounts>>,
 
-    /// Receiver side of the event channel.
-    ///
-    /// Events from it can be received by calling `get_next_event` method.
-    event_emitter: Arc<EventEmitter>,
-
     states: Arc<Mutex<BTreeMap<u32, AccountState>>>,
 }
 
 impl CommandApi {
     pub fn new(accounts: Accounts) -> Self {
-        let event_emitter = Arc::new(accounts.get_event_emitter());
         CommandApi {
             accounts: Arc::new(RwLock::new(accounts)),
-            event_emitter,
             states: Arc::new(Mutex::new(BTreeMap::new())),
         }
     }
 
     #[allow(dead_code)]
-    pub async fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        let event_emitter = Arc::new(accounts.read().await.get_event_emitter());
+    pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
         CommandApi {
             accounts,
-            event_emitter,
             states: Arc::new(Mutex::new(BTreeMap::new())),
         }
     }
@@ -173,7 +158,8 @@ impl CommandApi {
 
     /// Get the next event.
     async fn get_next_event(&self) -> Result<Event> {
-        self.event_emitter
+        let event_emitter = self.accounts.read().await.get_event_emitter();
+        event_emitter
             .recv()
             .await
             .map(|event| event.into())
@@ -188,16 +174,6 @@ impl CommandApi {
         self.accounts.write().await.add_account().await
     }
 
-    /// Imports/migrated an existing account from a database path into this account manager.
-    /// Returns the ID of new account.
-    async fn migrate_account(&self, path_to_db: String) -> Result<u32> {
-        self.accounts
-            .write()
-            .await
-            .migrate_account(std::path::PathBuf::from(path_to_db))
-            .await
-    }
-
     async fn remove_account(&self, account_id: u32) -> Result<()> {
         self.accounts
             .write()
@@ -342,11 +318,6 @@ impl CommandApi {
         ctx.get_info().await
     }
 
-    async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
-    }
-
     async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
         Ok(ctx.draft_self_report().await?.to_u32())
@@ -707,22 +678,7 @@ impl CommandApi {
         ChatId::new(chat_id).get_encryption_info(&ctx).await
     }
 
-    /// Get QR code text that will offer a [SecureJoin](https://securejoin.delta.chat/) invitation.
-    ///
-    /// If `chat_id` is a group chat ID, SecureJoin QR code for the group is returned.
-    /// If `chat_id` is unset, setup contact QR code is returned.
-    async fn get_chat_securejoin_qr_code(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        Ok(qr)
-    }
-
-    /// Get QR code (text and SVG) that will offer a Setup-Contact or Verified-Group invitation.
+    /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
     /// The QR code is compatible to the OPENPGP4FPR format
     /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
     ///
@@ -734,7 +690,8 @@ impl CommandApi {
     ///     the Verified-Group-Invite protocol is offered in the QR code;
     ///     works for protected groups as well as for normal groups.
     ///     If not set, the Setup-Contact protocol is offered in the QR code.
-    ///     See https://securejoin.delta.chat/ for details about both protocols.
+    ///     See https://securejoin.readthedocs.io/en/latest/new.html
+    ///     for details about both protocols.
     ///
     /// return format: `[code, svg]`
     async fn get_chat_securejoin_qr_code_svg(
@@ -744,9 +701,10 @@ impl CommandApi {
     ) -> Result<(String, String)> {
         let ctx = self.get_context(account_id).await?;
         let chat = chat_id.map(ChatId::new);
-        let qr = securejoin::get_securejoin_qr(&ctx, chat).await?;
-        let svg = get_securejoin_qr_svg(&ctx, chat).await?;
-        Ok((qr, svg))
+        Ok((
+            securejoin::get_securejoin_qr(&ctx, chat).await?,
+            get_securejoin_qr_svg(&ctx, chat).await?,
+        ))
     }
 
     /// Continue a Setup-Contact or Verified-Group-Invite protocol
@@ -761,7 +719,8 @@ impl CommandApi {
     ///
     /// Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
     ///
-    /// See https://securejoin.delta.chat/ for details about both protocols.
+    /// See https://securejoin.readthedocs.io/en/latest/new.html
+    /// for details about both protocols.
     ///
     /// **qr**: The text of the scanned QR code. Typically, the same string as given
     ///     to `check_qr()`.
@@ -1459,51 +1418,6 @@ impl CommandApi {
         Ok(contact_id.map(|id| id.to_u32()))
     }
 
-    /// Parses a vCard file located at the given path. Returns contacts in their original order.
-    async fn parse_vcard(&self, path: String) -> Result<Vec<VcardContact>> {
-        let vcard = fs::read(Path::new(&path)).await?;
-        let vcard = str::from_utf8(&vcard)?;
-        Ok(deltachat_contact_tools::parse_vcard(vcard)
-            .into_iter()
-            .map(|c| c.into())
-            .collect())
-    }
-
-    /// Imports contacts from a vCard file located at the given path.
-    ///
-    /// Returns the ids of created/modified contacts in the order they appear in the vCard.
-    async fn import_vcard(&self, account_id: u32, path: String) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let vcard = tokio::fs::read(Path::new(&path)).await?;
-        let vcard = str::from_utf8(&vcard)?;
-        Ok(deltachat::contact::import_vcard(&ctx, vcard)
-            .await?
-            .into_iter()
-            .map(|c| c.to_u32())
-            .collect())
-    }
-
-    /// Returns a vCard containing contacts with the given ids.
-    async fn make_vcard(&self, account_id: u32, contacts: Vec<u32>) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts: Vec<_> = contacts.iter().map(|&c| ContactId::new(c)).collect();
-        deltachat::contact::make_vcard(&ctx, &contacts).await
-    }
-
-    /// Sets vCard containing the given contacts to the message draft.
-    async fn set_draft_vcard(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        contacts: Vec<u32>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts: Vec<_> = contacts.iter().map(|&c| ContactId::new(c)).collect();
-        let mut msg = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
-        msg.make_vcard(&ctx, &contacts).await?;
-        msg.get_chat_id().set_draft(&ctx, Some(&mut msg)).await
-    }
-
     // ---------------------------------------------
     //                   chat
     // ---------------------------------------------
@@ -1672,10 +1586,10 @@ impl CommandApi {
     ///
     /// This call will block until the QR code is ready,
     /// even if there is no concurrent call to [`CommandApi::provide_backup`],
-    /// but will fail after 60 seconds to avoid deadlocks.
+    /// but will fail after 10 seconds to avoid deadlocks.
     async fn get_backup_qr(&self, account_id: u32) -> Result<String> {
         let qr = tokio::time::timeout(
-            Duration::from_secs(60),
+            Duration::from_secs(10),
             self.inner_get_backup_qr(account_id),
         )
         .await
@@ -1691,13 +1605,13 @@ impl CommandApi {
     ///
     /// This call will block until the QR code is ready,
     /// even if there is no concurrent call to [`CommandApi::provide_backup`],
-    /// but will fail after 60 seconds to avoid deadlocks.
+    /// but will fail after 10 seconds to avoid deadlocks.
     ///
     /// Returns the QR code rendered as an SVG image.
     async fn get_backup_qr_svg(&self, account_id: u32) -> Result<String> {
         let ctx = self.get_context(account_id).await?;
         let qr = tokio::time::timeout(
-            Duration::from_secs(60),
+            Duration::from_secs(10),
             self.inner_get_backup_qr(account_id),
         )
         .await
@@ -1808,37 +1722,6 @@ impl CommandApi {
             .await
     }
 
-    async fn send_webxdc_realtime_data(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        data: Vec<u8>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        send_webxdc_realtime_data(&ctx, MsgId::new(instance_msg_id), data).await
-    }
-
-    async fn send_webxdc_realtime_advertisement(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let fut = send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?;
-        if let Some(fut) = fut {
-            tokio::spawn(async move {
-                fut.await.ok();
-                info!(ctx, "send_webxdc_realtime_advertisement done")
-            });
-        }
-        Ok(())
-    }
-
-    async fn leave_webxdc_realtime(&self, account_id: u32, instance_message_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        leave_webxdc_realtime(&ctx, MsgId::new(instance_message_id)).await
-    }
-
     async fn get_webxdc_status_updates(
         &self,
         account_id: u32,
@@ -1880,29 +1763,6 @@ impl CommandApi {
         Ok(general_purpose::STANDARD_NO_PAD.encode(blob))
     }
 
-    /// Sets Webxdc file as integration.
-    /// `file` is the .xdc to use as Webxdc integration.
-    async fn set_webxdc_integration(&self, account_id: u32, file_path: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.set_webxdc_integration(&file_path).await
-    }
-
-    /// Returns Webxdc instance used for optional integrations.
-    /// UI can open the Webxdc as usual.
-    /// Returns `None` if there is no integration; the caller can add one using `set_webxdc_integration` then.
-    /// `integrate_for` is the chat to get the integration for.
-    async fn init_webxdc_integration(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-    ) -> Result<Option<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ctx
-            .init_webxdc_integration(chat_id.map(ChatId::new))
-            .await?
-            .map(|msg_id| msg_id.to_u32()))
-    }
-
     /// Makes an HTTP GET request and returns a response.
     ///
     /// `url` is the HTTP or HTTPS URL.
@@ -2011,15 +1871,6 @@ impl CommandApi {
         Ok(can_send)
     }
 
-    /// Saves a file copy at the user-provided path.
-    ///
-    /// Fails if file already exists at the provided path.
-    async fn save_msg_file(&self, account_id: u32, msg_id: u32, path: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(msg_id)).await?;
-        message.save_file(&ctx, Path::new(&path)).await
-    }
-
     // ---------------------------------------------
     //           functions for the composer
     //    the composer is the message input field
@@ -2092,21 +1943,19 @@ impl CommandApi {
         );
         let destination_path = account_folder.join("stickers").join(collection);
         fs::create_dir_all(&destination_path).await?;
-        let file = message.get_filename().context("no file?")?;
-        message
-            .save_file(
-                &ctx,
-                &destination_path.join(format!(
-                    "{}.{}",
-                    msg_id,
-                    Path::new(&file)
-                        .extension()
-                        .unwrap_or_default()
-                        .to_str()
-                        .unwrap_or_default()
-                )),
-            )
-            .await?;
+        let file = message.get_file(&ctx).context("no file")?;
+        fs::copy(
+            &file,
+            destination_path.join(format!(
+                "{}.{}",
+                msg_id,
+                file.extension()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+            )),
+        )
+        .await?;
         Ok(())
     }
 

deltachat-jsonrpc/src/api/types/chat.rs

@@ -32,7 +32,6 @@ pub struct FullChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
     chat_type: u32,
     is_unpromoted: bool,
@@ -105,7 +104,6 @@ impl FullChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
@@ -155,7 +153,6 @@ pub struct BasicChat {
     is_protected: bool,
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
-    pinned: bool,
     chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
@@ -183,7 +180,6 @@ impl BasicChat {
             is_protected: chat.is_protected(),
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
-            pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),

deltachat-jsonrpc/src/api/types/contact.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use deltachat::color;
 use deltachat::context::Context;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
@@ -19,7 +18,6 @@ pub struct ContactObject {
     profile_image: Option<String>, // BLOBS
     name_and_addr: String,
     is_blocked: bool,
-    e2ee_avail: bool,
 
     /// True if the contact can be added to verified groups.
     ///
@@ -80,7 +78,6 @@ impl ContactObject {
             profile_image, //BLOBS
             name_and_addr: contact.get_name_n_addr(),
             is_blocked: contact.is_blocked(),
-            e2ee_avail: contact.e2ee_avail(context).await?,
             is_verified,
             is_profile_verified,
             verifier_id,
@@ -90,35 +87,3 @@ impl ContactObject {
         })
     }
 }
-
-#[derive(Clone, Serialize, TypeDef, schemars::JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct VcardContact {
-    /// Email address.
-    addr: String,
-    /// The contact's name, or the email address if no name was given.
-    display_name: String,
-    /// Public PGP key in Base64.
-    key: Option<String>,
-    /// Profile image in Base64.
-    profile_image: Option<String>,
-    /// Contact color as hex string.
-    color: String,
-    /// Last update timestamp.
-    timestamp: Option<i64>,
-}
-
-impl From<deltachat_contact_tools::VcardContact> for VcardContact {
-    fn from(vc: deltachat_contact_tools::VcardContact) -> Self {
-        let display_name = vc.display_name().to_string();
-        let color = color::str_to_color(&vc.addr.to_lowercase());
-        Self {
-            addr: vc.addr,
-            display_name,
-            key: vc.key,
-            profile_image: vc.profile_image,
-            color: color_int_to_hex_string(color),
-            timestamp: vc.timestamp.ok(),
-        }
-    }
-}

deltachat-jsonrpc/src/api/types/events.rs

@@ -240,10 +240,6 @@ pub enum EventType {
         status_update_serial: u32,
     },
 
-    /// Data received over an ephemeral peer channel.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeData { msg_id: u32, data: Vec<u8> },
-
     /// Inform that a message containing a webxdc instance has been deleted
     #[serde(rename_all = "camelCase")]
     WebxdcInstanceDeleted { msg_id: u32 },
@@ -263,9 +259,6 @@ pub enum EventType {
     /// 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.
     #[serde(rename_all = "camelCase")]
     ChatlistItemChanged { chat_id: Option<u32> },
-
-    /// Inform than some events have been skipped due to event channel overflow.
-    EventChannelOverflow { n: u64 },
 }
 
 impl From<CoreEventType> for EventType {
@@ -369,10 +362,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 status_update_serial: status_update_serial.to_u32(),
             },
-            CoreEventType::WebxdcRealtimeData { msg_id, data } => WebxdcRealtimeData {
-                msg_id: msg_id.to_u32(),
-                data,
-            },
             CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                 msg_id: msg_id.to_u32(),
             },
@@ -381,7 +370,6 @@ impl From<CoreEventType> for EventType {
                 chat_id: chat_id.map(|id| id.to_u32()),
             },
             CoreEventType::ChatlistChanged => ChatlistChanged,
-            CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
         }
     }
 }

deltachat-jsonrpc/src/api/types/message.rs

@@ -1,4 +1,3 @@
-use crate::api::VcardContact;
 use anyhow::{Context as _, Result};
 use deltachat::chat::Chat;
 use deltachat::chat::ChatItem;
@@ -36,10 +35,6 @@ pub struct MessageObject {
     parent_id: Option<u32>,
 
     text: String,
-
-    /// 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.
     has_location: bool,
     has_html: bool,
     view_type: MessageViewtype,
@@ -88,8 +83,6 @@ pub struct MessageObject {
     download_state: DownloadState,
 
     reactions: Option<JSONRPCReactions>,
-
-    vcard_contact: Option<VcardContact>,
 }
 
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
@@ -176,13 +169,6 @@ impl MessageObject {
             Some(reactions.into())
         };
 
-        let vcard_contacts: Vec<VcardContact> = message
-            .vcard_contacts(context)
-            .await?
-            .into_iter()
-            .map(Into::into)
-            .collect();
-
         Ok(MessageObject {
             id: msg_id.to_u32(),
             chat_id: message.get_chat_id().to_u32(),
@@ -242,8 +228,6 @@ impl MessageObject {
             download_state,
 
             reactions,
-
-            vcard_contact: vcard_contacts.first().cloned(),
         })
     }
 }
@@ -286,11 +270,6 @@ pub enum MessageViewtype {
 
     /// 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,
 }
 
 impl From<Viewtype> for MessageViewtype {
@@ -307,7 +286,6 @@ impl From<Viewtype> for MessageViewtype {
             Viewtype::File => MessageViewtype::File,
             Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
             Viewtype::Webxdc => MessageViewtype::Webxdc,
-            Viewtype::Vcard => MessageViewtype::Vcard,
         }
     }
 }
@@ -326,7 +304,6 @@ impl From<MessageViewtype> for Viewtype {
             MessageViewtype::File => Viewtype::File,
             MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
             MessageViewtype::Webxdc => Viewtype::Webxdc,
-            MessageViewtype::Vcard => Viewtype::Vcard,
         }
     }
 }
@@ -365,14 +342,6 @@ pub enum SystemMessageType {
     LocationOnly,
     InvalidUnencryptedMail,
 
-    /// 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,
 
@@ -391,9 +360,6 @@ pub enum SystemMessageType {
 
     /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
     WebxdcInfoMessage,
-
-    /// This message contains a users iroh node address.
-    IrohNodeAddr,
 }
 
 impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
@@ -416,9 +382,6 @@ impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
             SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
             SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
             SystemMessage::InvalidUnencryptedMail => SystemMessageType::InvalidUnencryptedMail,
-            SystemMessage::IrohNodeAddr => SystemMessageType::IrohNodeAddr,
-            SystemMessage::SecurejoinWait => SystemMessageType::SecurejoinWait,
-            SystemMessage::SecurejoinWaitTimeout => SystemMessageType::SecurejoinWaitTimeout,
         }
     }
 }
@@ -577,9 +540,7 @@ pub struct MessageData {
     pub file: Option<String>,
     pub location: Option<(f64, f64)>,
     pub override_sender_name: Option<String>,
-    /// Quoted message id. Takes preference over `quoted_text` (see below).
     pub quoted_message_id: Option<u32>,
-    pub quoted_text: Option<String>,
 }
 
 impl MessageData {
@@ -615,9 +576,6 @@ impl MessageData {
                     ),
                 )
                 .await?;
-        } else if let Some(text) = self.quoted_text {
-            let protect = false;
-            message.set_quote_text(Some((text, protect)));
         }
         Ok(message)
     }
@@ -673,7 +631,7 @@ impl MessageInfo {
 #[derive(
     Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize, TypeDef, schemars::JsonSchema,
 )]
-#[serde(rename_all = "camelCase", tag = "kind")]
+#[serde(rename_all = "camelCase", tag = "variant")]
 pub enum EphemeralTimer {
     /// Timer is disabled.
     Disabled,

deltachat-jsonrpc/src/api/types/qr.rs

@@ -35,11 +35,6 @@ pub enum QrObject {
     Backup {
         ticket: String,
     },
-    Backup2 {
-        auth_token: String,
-
-        node_addr: String,
-    },
     WebrtcInstance {
         domain: String,
         instance_pattern: String,
@@ -137,14 +132,6 @@ impl From<Qr> for QrObject {
             Qr::Backup { ticket } => QrObject::Backup {
                 ticket: ticket.to_string(),
             },
-            Qr::Backup2 {
-                ref node_addr,
-                auth_token,
-            } => QrObject::Backup2 {
-                node_addr: serde_json::to_string(node_addr).unwrap_or_default(),
-
-                auth_token,
-            },
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,

deltachat-jsonrpc/src/lib.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 pub mod api;
 pub use yerpc;
 

deltachat-jsonrpc/src/webserver.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 use std::net::SocketAddr;
 use std::path::PathBuf;
 

deltachat-jsonrpc/typescript/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.6.2"
+    "yerpc": "^0.4.3"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -25,17 +25,12 @@
   "exports": {
     ".": {
       "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs",
-      "types": "./dist/deltachat.d.ts"
+      "require": "./dist/deltachat.cjs"
     }
   },
   "license": "MPL-2.0",
   "main": "dist/deltachat.js",
   "name": "@deltachat/jsonrpc-client",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/deltachat/deltachat-core-rust.git"
-  },
   "scripts": {
     "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
     "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
@@ -58,5 +53,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.142.11"
+  "version": "1.137.2"
 }

deltachat-repl/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "deltachat-repl"
-version = "1.142.11"
+version = "1.137.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
-ansi_term = { workspace = true }
-anyhow = { workspace = true }
-deltachat = { workspace = true, features = ["internals"]}
+ansi_term = "0.12.1"
+anyhow = "1"
+deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = { workspace = true }
-rusqlite = { workspace = true }
+log = "0.4.21"
+pretty_env_logger = "0.5"
+rusqlite = "0.31"
 rustyline = "14"
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+tokio = { version = "1.37.0", features = ["fs", "rt-multi-thread", "macros"] }
 
 [features]
 default = ["vendored"]

deltachat-repl/src/cmdline.rs

@@ -19,7 +19,6 @@ use deltachat::location;
 use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::mimeparser::SystemMessage;
-use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::reaction::send_reaction;
@@ -339,6 +338,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  receive-backup <qr>\n\
                  export-keys\n\
                  import-keys\n\
+                 export-setup\n\
                  poke [<eml-file>|<folder>|<addr> <key-file>]\n\
                  reset <flags>\n\
                  stop\n\
@@ -503,6 +503,17 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "import-keys" => {
             imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
         }
+        "export-setup" => {
+            let setup_code = create_setup_code(&context);
+            let file_name = blobdir.join("autocrypt-setup-message.html");
+            let file_content = render_setup_file(&context, &setup_code).await?;
+            fs::write(&file_name, file_content).await?;
+            println!(
+                "Setup message written to: {}\nSetup code: {}",
+                file_name.display(),
+                &setup_code,
+            );
+        }
         "poke" => {
             ensure!(poke_spec(&context, Some(arg1)).await, "Poke failed");
         }
@@ -631,30 +642,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             println!("{cnt} chats");
             println!("{time_needed:?} to create this list");
         }
-        "start-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            let res = send_webxdc_realtime_advertisement(&context, msg_id).await?;
-
-            if let Some(res) = res {
-                println!("waiting for peer channel join");
-                res.await?;
-            }
-            println!("joined peer channel");
-        }
-        "send-realtime" => {
-            if arg1.is_empty() {
-                bail!("missing msgid");
-            }
-            if arg2.is_empty() {
-                bail!("no message");
-            }
-            let msg_id = MsgId::new(arg1.parse()?);
-            send_webxdc_realtime_data(&context, msg_id, arg2.as_bytes().to_vec()).await?;
-            println!("sent realtime message");
-        }
         "chat" => {
             if sel_chat.is_none() && arg1.is_empty() {
                 bail!("Argument [chat-id] is missing.");

deltachat-repl/src/main.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 //! This is a CLI program and a little testing frame.  This file must not be
 //! included when using Delta Chat Core as a library.
 //!
@@ -32,7 +31,6 @@ use rustyline::{
 };
 use tokio::fs;
 use tokio::runtime::Handle;
-use tracing_subscriber::EnvFilter;
 
 mod cmdline;
 use self::cmdline::*;
@@ -152,7 +150,7 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 13] = [
+const IMEX_COMMANDS: [&str; 14] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
@@ -163,6 +161,7 @@ const IMEX_COMMANDS: [&str; 13] = [
     "receive-backup",
     "export-keys",
     "import-keys",
+    "export-setup",
     "poke",
     "reset",
     "stop",
@@ -483,10 +482,9 @@ async fn handle_cmd(
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    tracing_subscriber::fmt()
-        .with_env_filter(
-            EnvFilter::from_default_env().add_directive("deltachat_repl=info".parse()?),
-        )
+    pretty_env_logger::formatted_timed_builder()
+        .parse_default_env()
+        .filter_module("deltachat_repl", log::LevelFilter::Info)
         .init();
 
     let args = std::env::args().collect();

deltachat-rpc-client/examples/echobot.py

@@ -4,7 +4,6 @@
 it will echo back any text send to it, it also will print to console all Delta Chat core events.
 Pass --help to the CLI to see available options.
 """
-
 from deltachat_rpc_client import events, run_bot_cli
 
 hooks = events.HookCollection()

deltachat-rpc-client/examples/echobot_advanced.py

@@ -3,7 +3,6 @@
 
 it will echo back any message that has non-empty text and also supports the /help command.
 """
-
 import logging
 import sys
 from threading import Thread

deltachat-rpc-client/examples/echobot_no_hooks.py

@@ -2,7 +2,6 @@
 """
 Example echo bot without using hooks
 """
-
 import logging
 import sys
 

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.142.11"
+version = "1.137.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -37,7 +37,7 @@ deltachat_rpc_client = [
 line-length = 120
 
 [tool.ruff]
-lint.select = [
+select = [
   "E", "W", # pycodestyle
   "F", # Pyflakes
   "N", # pep8-naming

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -244,22 +244,18 @@ class Account:
         The function returns immediately and the handshake runs in background, sending
         and receiving several messages.
         Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-        See https://securejoin.delta.chat/ for protocol details.
+        See https://securejoin.readthedocs.io/en/latest/new.html for protocol details.
 
         :param qrdata: The text of the scanned QR code.
         """
         return Chat(self, self._rpc.secure_join(self.id, qrdata))
 
-    def get_qr_code(self) -> str:
-        """Get Setup-Contact QR Code text.
+    def get_qr_code(self) -> tuple[str, str]:
+        """Get Setup-Contact QR Code text and SVG data.
 
-        This data needs to be transferred to another Delta Chat account
+        this data needs to be transferred to another Delta Chat account
         in a second channel, typically used by mobiles with QRcode-show + scan UX.
         """
-        return self._rpc.get_chat_securejoin_qr_code(self.id, None)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
-        """Get Setup-Contact QR code text and SVG."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.id, None)
 
     def get_message_by_id(self, msg_id: int) -> Message:
@@ -301,12 +297,6 @@ class Account:
             if event.kind == EventType.INCOMING_MSG:
                 return event
 
-    def wait_for_incoming_msg(self):
-        """Wait for incoming message and return it.
-
-        Consumes all events before the next incoming message event."""
-        return self.get_message_by_id(self.wait_for_incoming_msg_event().msg_id)
-
     def wait_for_securejoin_inviter_success(self):
         while True:
             event = self.wait_for_event()

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import calendar
 from dataclasses import dataclass
-from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Optional, Union
 
 from ._utils import AttrDict
@@ -96,11 +95,7 @@ class Chat:
         """Return encryption info for this chat."""
         return self._rpc.get_chat_encryption_info(self.account.id, self.id)
 
-    def get_qr_code(self) -> str:
-        """Get Join-Group QR code text."""
-        return self._rpc.get_chat_securejoin_qr_code(self.account.id, self.id)
-
-    def get_qr_code_svg(self) -> tuple[str, str]:
+    def get_qr_code(self) -> tuple[str, str]:
         """Get Join-Group QR code text and SVG data."""
         return self._rpc.get_chat_securejoin_qr_code_svg(self.account.id, self.id)
 
@@ -270,11 +265,3 @@ class Chat:
             location["message"] = Message(self.account, location.msg_id)
             locations.append(location)
         return locations
-
-    def send_contact(self, contact: Contact):
-        """Send contact to the chat."""
-        vcard = contact.make_vcard()
-        with NamedTemporaryFile(suffix=".vcard") as f:
-            f.write(vcard.encode())
-            f.flush()
-            self._rpc.send_msg(self.account.id, self.id, {"viewtype": ViewType.VCARD, "file": f.name})

deltachat-rpc-client/src/deltachat_rpc_client/const.py

@@ -61,8 +61,6 @@ class EventType(str, Enum):
     WEBXDC_INSTANCE_DELETED = "WebxdcInstanceDeleted"
     CHATLIST_CHANGED = "ChatlistChanged"
     CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
-    CONFIG_SYNCED = "ConfigSynced"
-    WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
 
 
 class ChatId(IntEnum):
@@ -115,7 +113,6 @@ class ViewType(str, Enum):
     FILE = "File"
     VIDEOCHAT_INVITATION = "VideochatInvitation"
     WEBXDC = "Webxdc"
-    VCARD = "Vcard"
 
 
 class SystemMessageType(str, Enum):

deltachat-rpc-client/src/deltachat_rpc_client/contact.py

@@ -60,6 +60,3 @@ class Contact:
             self.account,
             self._rpc.create_chat_by_contact_id(self.account.id, self.id),
         )
-
-    def make_vcard(self) -> str:
-        return self._rpc.make_vcard(self.account.id, [self.id])

deltachat-rpc-client/src/deltachat_rpc_client/message.py

@@ -2,7 +2,7 @@ import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union
 
-from ._utils import AttrDict, futuremethod
+from ._utils import AttrDict
 from .const import EventType
 from .contact import Contact
 
@@ -70,11 +70,3 @@ class Message:
             event = self.account.wait_for_event()
             if event.kind == EventType.MSG_DELIVERED and event.msg_id == self.id:
                 break
-
-    @futuremethod
-    def send_webxdc_realtime_advertisement(self):
-        yield self._rpc.send_webxdc_realtime_advertisement.future(self.account.id, self.id)
-
-    @futuremethod
-    def send_webxdc_realtime_data(self, data) -> None:
-        yield self._rpc.send_webxdc_realtime_data.future(self.account.id, self.id, list(data))

deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py

@@ -114,13 +114,13 @@ class ACFactory:
         return to_client.run_until(lambda e: e.kind == EventType.INCOMING_MSG)
 
 
-@pytest.fixture
+@pytest.fixture()
 def rpc(tmp_path) -> AsyncGenerator:
     rpc_server = Rpc(accounts_dir=str(tmp_path / "accounts"))
     with rpc_server:
         yield rpc_server
 
 
-@pytest.fixture
+@pytest.fixture()
 def acfactory(rpc) -> AsyncGenerator:
     return ACFactory(DeltaChat(rpc))

deltachat-rpc-client/tests/test_chatlist_events.py

@@ -126,7 +126,8 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
 
     alice.set_config("download_limit", "1")
 
-    msg = bob.wait_for_incoming_msg()
+    event = bob.wait_for_incoming_msg_event()
+    msg = bob.get_message_by_id(event.msg_id)
     chat_id = msg.get_snapshot().chat_id
     msg.get_snapshot().chat.accept()
     bob.get_chat_by_id(chat_id).send_message(
@@ -134,15 +135,13 @@ def test_download_on_demand(acfactory: ACFactory) -> None:
         html=base64.b64encode(os.urandom(300000)).decode("utf-8"),
     )
 
-    message = alice.wait_for_incoming_msg()
-    snapshot = message.get_snapshot()
-    assert snapshot.download_state == const.DownloadState.AVAILABLE
+    msg_id = alice.wait_for_incoming_msg_event().msg_id
+
+    assert alice.get_message_by_id(msg_id).get_snapshot().download_state == const.DownloadState.AVAILABLE
 
     alice.clear_all_events()
-
-    snapshot = message.get_snapshot()
-    chat_id = snapshot.chat_id
-    alice._rpc.download_full_message(alice.id, message.id)
+    chat_id = alice.get_message_by_id(msg_id).get_snapshot().chat_id
+    alice._rpc.download_full_message(alice.id, msg_id)
 
     wait_for_chatlist_specific_item(alice, chat_id)
 
@@ -178,7 +177,8 @@ def test_imap_sync_seen_msgs(acfactory: ACFactory) -> None:
 
     alice_chat_bob.send_text("hello")
 
-    msg = bob.wait_for_incoming_msg()
+    event = bob.wait_for_incoming_msg_event()
+    msg = bob.get_message_by_id(event.msg_id)
     bob_chat_id = msg.get_snapshot().chat_id
     msg.get_snapshot().chat.accept()
 
@@ -189,7 +189,8 @@ def test_imap_sync_seen_msgs(acfactory: ACFactory) -> None:
     # make sure alice_second_device already received the message
     alice_second_device.wait_for_incoming_msg_event()
 
-    msg = alice.wait_for_incoming_msg()
+    event = alice.wait_for_incoming_msg_event()
+    msg = alice.get_message_by_id(event.msg_id)
     alice_second_device.clear_all_events()
     msg.mark_seen()
 
@@ -210,7 +211,6 @@ def test_multidevice_sync_chat(acfactory: ACFactory) -> None:
     alice_second_device.clear_all_events()
     alice_chat_bob.pin()
     wait_for_chatlist_specific_item(alice_second_device, alice_chat_bob.id)
-    assert alice_second_device.get_chat_by_id(alice_chat_bob.id).get_basic_snapshot().pinned
 
     alice_second_device.clear_all_events()
     alice_chat_bob.mute()

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -1,210 +0,0 @@
-#!/usr/bin/env python3
-"""
-Testing webxdc iroh connectivity
-
-If you want to debug iroh at rust-trace/log level set
-
-    RUST_LOG=iroh_net=trace,iroh_gossip=trace
-"""
-
-import sys
-import threading
-import time
-
-import pytest
-
-from deltachat_rpc_client import EventType
-
-
-@pytest.fixture
-def path_to_webxdc(request):
-    p = request.path.parent.parent.parent.joinpath("test-data/webxdc/chess.xdc")
-    assert p.exists()
-    return str(p)
-
-
-def log(msg):
-    print()
-    print("*" * 80 + "\n" + msg + "\n", file=sys.stderr)
-    print()
-
-
-def setup_realtime_webxdc(ac1, ac2, path_to_webxdc):
-    assert ac1.get_config("webxdc_realtime_enabled") == "1"
-    assert ac2.get_config("webxdc_realtime_enabled") == "1"
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac2.create_chat(ac1)
-
-    # share a webxdc app between ac1 and ac2
-    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="play", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
-    assert ac2_webxdc_msg.get_snapshot().text == "play"
-
-    # send iroh announcements simultaneously
-    log("sending ac1 -> ac2 realtime advertisement and additional message")
-    ac1_webxdc_msg.send_webxdc_realtime_advertisement()
-
-    log("sending ac2 -> ac1 realtime advertisement and additional message")
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-
-    return ac1_webxdc_msg, ac2_webxdc_msg
-
-
-def setup_thread_send_realtime_data(msg, data):
-    def thread_run():
-        for _i in range(10):
-            msg.send_webxdc_realtime_data(data)
-            time.sleep(1)
-
-    threading.Thread(target=thread_run, daemon=True).start()
-
-
-def wait_receive_realtime_data(msg_data_list):
-    account = msg_data_list[0][0].account
-    msg_data_list = msg_data_list[:]
-
-    log(f"account {account.id}: waiting for realtime data {msg_data_list}")
-    while msg_data_list:
-        event = account.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            for i, (msg, data) in enumerate(msg_data_list):
-                if msg.id == event.msg_id:
-                    assert list(data) == event.data
-                    log(f"msg {msg.id}: got correct realtime data {data}")
-                    del msg_data_list[i]
-                    break
-
-
-def test_realtime_sequentially(acfactory, path_to_webxdc):
-    """Test two peers trying to establish connection sequentially."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-    ac1.create_chat(ac2)
-    ac2.create_chat(ac1)
-
-    # share a webxdc app between ac1 and ac2
-    ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
-    snapshot = ac2_webxdc_msg.get_snapshot()
-    assert snapshot.text == "play"
-
-    # send iroh announcements sequentially
-    log("sending ac1 -> ac2 realtime advertisement and additional message")
-    ac1_webxdc_msg.send_webxdc_realtime_advertisement()
-    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1")
-
-    log("waiting for incoming message on ac2")
-    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping1"
-
-    log("sending ac2 -> ac1 realtime advertisement and additional message")
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2")
-
-    log("waiting for incoming message on ac1")
-    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "ping2"
-
-    log("sending realtime data ac1 -> ac2")
-    ac1_webxdc_msg.send_webxdc_realtime_data(b"foo")
-
-    log("ac2: waiting for realtime data")
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == list(b"foo")
-            break
-
-
-def test_realtime_simultaneously(acfactory, path_to_webxdc):
-    """Test two peers trying to establish connection simultaneously."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-
-    setup_thread_send_realtime_data(ac1_webxdc_msg, [10])
-    wait_receive_realtime_data([(ac2_webxdc_msg, [10])])
-
-
-def test_two_parallel_realtime_simultaneously(acfactory, path_to_webxdc):
-    """Test two peers trying to establish connection simultaneously."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-    ac1_webxdc_msg2, ac2_webxdc_msg2 = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-
-    setup_thread_send_realtime_data(ac1_webxdc_msg, [10])
-    setup_thread_send_realtime_data(ac1_webxdc_msg2, [20])
-    setup_thread_send_realtime_data(ac2_webxdc_msg, [30])
-    setup_thread_send_realtime_data(ac2_webxdc_msg2, [40])
-
-    wait_receive_realtime_data([(ac1_webxdc_msg, [30]), (ac1_webxdc_msg2, [40])])
-    wait_receive_realtime_data([(ac2_webxdc_msg, [10]), (ac2_webxdc_msg2, [20])])
-
-
-def test_no_duplicate_messages(acfactory, path_to_webxdc):
-    """Test that messages are received only once."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_ac2_chat = ac1.create_chat(ac2)
-
-    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="webxdc", file=path_to_webxdc)
-
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
-    ac2_webxdc_msg.get_snapshot().chat.accept()
-    assert ac2_webxdc_msg.get_snapshot().text == "webxdc"
-
-    # Issue a "send" call in parallel with sending advertisement.
-    # Previously due to a bug this caused subscribing to the channel twice.
-    ac2_webxdc_msg.send_webxdc_realtime_data.future(b"foobar")
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-
-    def thread_run():
-        for i in range(10):
-            data = str(i).encode()
-            ac1_webxdc_msg.send_webxdc_realtime_data(data)
-            time.sleep(1)
-
-    threading.Thread(target=thread_run, daemon=True).start()
-
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            n = int(bytes(event.data).decode())
-            break
-
-    while 1:
-        event = ac2.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert int(bytes(event.data).decode()) > n
-            break
-
-
-def test_no_reordering(acfactory, path_to_webxdc):
-    """Test that sending a lot of realtime messages does not result in reordering."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
-
-    setup_thread_send_realtime_data(ac1_webxdc_msg, b"hello")
-    wait_receive_realtime_data([(ac2_webxdc_msg, b"hello")])
-
-    for i in range(200):
-        ac1_webxdc_msg.send_webxdc_realtime_data([i])
-
-    for i in range(200):
-        while 1:
-            event = ac2.wait_for_event()
-            if event.kind == EventType.WEBXDC_REALTIME_DATA and bytes(event.data) != b"hello":
-                if event.data[0] == i:
-                    break
-                pytest.fail("Reordering detected")

deltachat-rpc-client/tests/test_securejoin.py

@@ -1,14 +1,13 @@
 import logging
 
 import pytest
-
 from deltachat_rpc_client import Chat, EventType, SpecialContactId
 
 
 def test_qr_setup_contact(acfactory, tmp_path) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
 
     alice.wait_for_securejoin_inviter_success()
@@ -31,52 +30,23 @@ def test_qr_setup_contact(acfactory, tmp_path) -> None:
     bob2.export_self_keys(tmp_path)
 
     logging.info("Bob imports a key")
-    bob.import_self_keys(tmp_path)
+    bob.import_self_keys(tmp_path / "private-key-default.asc")
 
     assert bob.get_config("key_id") == "2"
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert not bob_contact_alice_snapshot.is_verified
 
 
-def test_qr_setup_contact_svg(acfactory) -> None:
-    alice = acfactory.new_configured_account()
-    _, _, domain = alice.get_config("addr").rpartition("@")
-
-    _qr_code, svg = alice.get_qr_code_svg()
-
-    # Test that email address is in SVG
-    # when we have no display name.
-    # Check only the domain name, because
-    # long address may be split over multiple lines
-    # and not matched.
-    assert domain in svg
-
-    alice.set_config("displayname", "Alice")
-
-    # Test that display name is used
-    # in SVG and no address is visible.
-    _qr_code, svg = alice.get_qr_code_svg()
-    assert domain not in svg
-    assert "Alice" in svg
-
-
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect, tmp_path):
+def test_qr_securejoin(acfactory, protect):
     alice, bob = acfactory.get_online_accounts(2)
 
-    # Setup second device for Alice
-    # to test observing securejoin protocol.
-    alice.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.import_backup(files[0])
-
     logging.info("Alice creates a verified group")
     alice_chat = alice.create_group("Verified group", protect=protect)
     assert alice_chat.get_basic_snapshot().is_protected == protect
 
     logging.info("Bob joins verified group")
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
 
     # Check that at least some of the handshake messages are deleted.
@@ -104,14 +74,6 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
-    # Start second Alice device.
-    # Alice observes securejoin protocol and verifies Bob on second device.
-    alice2.start_io()
-    alice2.wait_for_securejoin_inviter_success()
-    alice2_contact_bob = alice2.get_contact_by_addr(bob.get_config("addr"))
-    alice2_contact_bob_snapshot = alice2_contact_bob.get_snapshot()
-    assert alice2_contact_bob_snapshot.is_verified
-
 
 def test_qr_securejoin_contact_request(acfactory) -> None:
     """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
@@ -129,7 +91,7 @@ def test_qr_securejoin_contact_request(acfactory) -> None:
 
     alice_chat = alice.create_group("Verified group", protect=True)
     logging.info("Bob joins verified group")
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
     while True:
         event = bob.wait_for_event()
@@ -144,7 +106,7 @@ def test_qr_readreceipt(acfactory) -> None:
     alice, bob, charlie = acfactory.get_online_accounts(3)
 
     logging.info("Bob and Charlie setup contact with Alice")
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
 
     bob.secure_join(qr_code)
     charlie.secure_join(qr_code)
@@ -206,13 +168,13 @@ def test_setup_contact_resetup(acfactory) -> None:
     """Tests that setup contact works after Alice resets the device and changes the key."""
     alice, bob = acfactory.get_online_accounts(2)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     alice = acfactory.resetup_account(alice)
 
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -226,7 +188,7 @@ def test_verified_group_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -243,7 +205,7 @@ def test_verified_group_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -290,7 +252,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     assert chat.get_basic_snapshot().is_protected
 
     logging.info("ac2 joins verified group")
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -307,7 +269,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     ac2 = acfactory.resetup_account(ac2)
 
     logging.info("ac2 reverifies with ac3")
-    qr_code = ac3.get_qr_code()
+    qr_code, _svg = ac3.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -374,7 +336,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
     ac1, ac2, ac3, ac4 = acfactory.get_online_accounts(4)
 
     logging.info("ac3: verify with ac2")
-    qr_code = ac2.get_qr_code()
+    qr_code, _svg = ac2.get_qr_code()
     ac3.secure_join(qr_code)
     ac2.wait_for_securejoin_inviter_success()
 
@@ -384,7 +346,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
 
     logging.info("ac1: create verified group that ac2 fully joins")
     ch1 = ac1.create_group("Group", protect=True)
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
 
@@ -397,7 +359,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac1: let ac2 join again but shutoff ac1 in the middle of securejoin")
-    qr_code = ch1.get_qr_code()
+    qr_code, _svg = ch1.get_qr_code()
     ac2.secure_join(qr_code)
     ac1.remove()
     logging.info("ac2 now has pending bobstate but ac1 is shutoff")
@@ -419,7 +381,7 @@ def test_qr_join_chat_with_pending_bobstate_issue4894(acfactory):
             break
 
     logging.info("ac3: create a join-code for group VG and let ac4 join, check that ac2 got it")
-    qr_code = vg.get_qr_code()
+    qr_code, _svg = vg.get_qr_code()
     ac4.secure_join(qr_code)
     ac3.wait_for_securejoin_inviter_success()
     while 1:
@@ -440,7 +402,7 @@ def test_qr_new_group_unblocked(acfactory):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
     ac1_chat = ac1.create_group("Group for joining", protect=True)
-    qr_code = ac1_chat.get_qr_code()
+    qr_code, _svg = ac1_chat.get_qr_code()
     ac2.secure_join(qr_code)
 
     ac1.wait_for_securejoin_inviter_success()
@@ -463,7 +425,7 @@ def test_aeap_flow_verified(acfactory):
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
     assert chat.get_basic_snapshot().is_protected
-    qr_code = chat.get_qr_code()
+    qr_code, _svg = chat.get_qr_code()
     logging.info("ac2: start QR-code based join-group protocol")
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
@@ -502,12 +464,12 @@ def test_gossip_verification(acfactory) -> None:
     alice, bob, carol = acfactory.get_online_accounts(3)
 
     # Bob verifies Alice.
-    qr_code = alice.get_qr_code()
+    qr_code, _svg = alice.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
     # Bob verifies Carol.
-    qr_code = carol.get_qr_code()
+    qr_code, _svg = carol.get_qr_code()
     bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 
@@ -558,16 +520,16 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     ac3_chat = ac3.create_group("Verified group", protect=True)
 
     # ac1 joins ac3 group.
-    ac3_qr_code = ac3_chat.get_qr_code()
+    ac3_qr_code, _svg = ac3_chat.get_qr_code()
     ac1.secure_join(ac3_qr_code)
     ac1.wait_for_securejoin_joiner_success()
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    ac1_qr_code = snapshot.chat.get_qr_code()
+    ac1_qr_code, _svg = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
-    qr_code = ac1.get_qr_code()
+    qr_code, _svg = ac1.get_qr_code()
     ac2.secure_join(qr_code)
     ac2.wait_for_securejoin_joiner_success()
 
@@ -627,7 +589,7 @@ def test_withdraw_securejoin_qr(acfactory):
     assert alice_chat.get_basic_snapshot().is_protected
     logging.info("Bob joins verified group")
 
-    qr_code = alice_chat.get_qr_code()
+    qr_code, _svg = alice_chat.get_qr_code()
     bob_chat = bob.secure_join(qr_code)
     bob.wait_for_securejoin_joiner_success()
 

deltachat-rpc-client/tests/test_something.py

@@ -1,17 +1,14 @@
-import base64
 import concurrent.futures
 import json
 import logging
 import os
-import socket
 import subprocess
 import time
 from unittest.mock import MagicMock
 
 import pytest
-
 from deltachat_rpc_client import Contact, EventType, Message, events
-from deltachat_rpc_client.const import DownloadState, MessageState
+from deltachat_rpc_client.const import DownloadState
 from deltachat_rpc_client.direct_imap import DirectImap
 from deltachat_rpc_client.rpc import JsonRpcError
 
@@ -71,18 +68,6 @@ def test_configure_starttls(acfactory) -> None:
     assert account.is_configured()
 
 
-def test_configure_ip(acfactory) -> None:
-    account = acfactory.new_preconfigured_account()
-
-    domain = account.get_config("addr").rsplit("@")[-1]
-    ip_address = socket.gethostbyname(domain)
-
-    # This should fail TLS check.
-    account.set_config("mail_server", ip_address)
-    with pytest.raises(JsonRpcError):
-        account.configure()
-
-
 def test_account(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
@@ -118,12 +103,12 @@ def test_account(acfactory) -> None:
     assert alice.get_chatlist(snapshot=True)
     assert alice.get_qr_code()
     assert alice.get_fresh_messages()
+    assert alice.get_next_messages()
 
     # Test sending empty message.
     assert len(bob.wait_next_messages()) == 0
     alice_chat_bob.send_text("")
     messages = bob.wait_next_messages()
-    assert bob.get_next_messages() == messages
     assert len(messages) == 1
     message = messages[0]
     snapshot = message.get_snapshot()
@@ -523,8 +508,8 @@ def test_reactions_for_a_reordering_move(acfactory):
     """
     (ac1,) = acfactory.get_online_accounts(1)
     ac2 = acfactory.new_preconfigured_account()
-    ac2.configure()
     ac2.set_config("mvbox_move", "1")
+    ac2.configure()
     ac2.bring_online()
     chat1 = acfactory.get_accepted_chat(ac1, ac2)
     ac2.stop_io()
@@ -599,60 +584,3 @@ def test_download_limit_chat_assignment(acfactory, tmp_path, n_accounts):
             #
             # Message may be a private reply, so we assign it to 1:1 chat with Alice.
             assert snapshot.chat == bob_chat_alice
-
-
-def test_markseen_contact_request(acfactory, tmp_path):
-    """
-    Test that seen status is synchronized for contact request messages
-    even though read receipt is not sent.
-    """
-    alice, bob = acfactory.get_online_accounts(2)
-
-    # Bob sets up a second device.
-    bob.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    bob2 = acfactory.get_unconfigured_account()
-    bob2.import_backup(files[0])
-    bob2.start_io()
-
-    alice_chat_bob = alice.create_chat(bob)
-    alice_chat_bob.send_text("Hello Bob!")
-
-    message = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id)
-    message2 = bob2.get_message_by_id(bob2.wait_for_incoming_msg_event().msg_id)
-    assert message2.get_snapshot().state == MessageState.IN_FRESH
-
-    message.mark_seen()
-    while True:
-        event = bob2.wait_for_event()
-        if event.kind == EventType.MSGS_NOTICED:
-            break
-    assert message2.get_snapshot().state == MessageState.IN_SEEN
-
-
-def test_get_http_response(acfactory):
-    alice = acfactory.new_configured_account()
-    http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
-    assert http_response["mimetype"] == "text/html"
-    assert b"<title>Example Domain</title>" in base64.b64decode((http_response["blob"] + "==").encode())
-
-
-def test_configured_imap_certificate_checks(acfactory):
-    alice = acfactory.new_configured_account()
-    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")
-
-    # Certificate checks should be configured (not None)
-    assert configured_certificate_checks
-
-    # 0 is the value old Delta Chat core versions used
-    # to mean user entered "imap_certificate_checks=0" (Automatic)
-    # and configuration failed to use strict TLS checks
-    # so it switched strict TLS checks off.
-    #
-    # New versions of Delta Chat are not disabling TLS checks
-    # unless users explicitly disables them
-    # or provider database says provider has invalid certificates.
-    #
-    # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
-    # This test is a regression test to prevent this happening again.
-    assert configured_certificate_checks != "0"

deltachat-rpc-client/tests/test_vcard.py

@@ -1,15 +0,0 @@
-def test_vcard(acfactory) -> None:
-    alice, bob = acfactory.get_online_accounts(2)
-
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
-    alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")
-
-    alice_chat_bob = alice_contact_bob.create_chat()
-    alice_chat_bob.send_contact(alice_contact_charlie)
-
-    event = bob.wait_for_incoming_msg_event()
-    message = bob.get_message_by_id(event.msg_id)
-    snapshot = message.get_snapshot()
-    assert snapshot.vcard_contact
-    assert snapshot.vcard_contact.addr == "charlie@example.org"

deltachat-rpc-client/tox.ini

@@ -22,8 +22,9 @@ skipsdist = True
 skip_install = True
 deps =
     ruff
+    black
 commands =
-    ruff format --quiet --diff src/ examples/ tests/
+    black --quiet --check --diff src/ examples/ tests/
     ruff check src/ examples/ tests/
 
 [pytest]

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.142.11"
+version = "1.137.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -10,18 +10,18 @@ keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
 
 [dependencies]
-deltachat-jsonrpc = { workspace = true }
-deltachat = { workspace = true }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc", default-features = false }
+deltachat = { path = "..", default-features = false }
 
-anyhow = { workspace = true }
-futures-lite = { workspace = true }
-log = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["io-std"] }
-tokio-util = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
+anyhow = "1"
+env_logger = { version = "0.11.3" }
+futures-lite = "2.3.0"
+log = "0.4"
+serde_json = "1"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.37.0", features = ["io-std"] }
+tokio-util = "0.7.9"
+yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
 
 [features]
 default = ["vendored"]

deltachat-rpc-server/npm-package/.gitignore

@@ -1,3 +0,0 @@
-platform_package
-*.tgz
-package-lock.json

deltachat-rpc-server/npm-package/.npmignore

@@ -1,3 +0,0 @@
-platform_package/*
-scripts/
-*.tgz

deltachat-rpc-server/npm-package/README.md

@@ -1,78 +0,0 @@
-## npm package for deltachat-rpc-server
-
-This is the successor of `deltachat-node`,
-it does not use NAPI bindings but instead uses stdio executables
-to let you talk to core over jsonrpc over stdio.
-This simplifies cross-compilation and even reduces binary size (no CFFI layer and no NAPI layer).
-
-## Usage
-
-> The **minimum** nodejs version for this package is `16`
-
-```
-npm i @deltachat/stdio-rpc-server @deltachat/jsonrpc-client
-```
-
-```js
-import { startDeltaChat } from "@deltachat/stdio-rpc-server";
-import { C } from "@deltachat/jsonrpc-client";
-
-async function main() {
-    const dc = await startDeltaChat("deltachat-data");
-    console.log(await dc.rpc.getSystemInfo());
-    dc.close()
-}
-main()
-```
-
-For a more complete example refer to https://github.com/deltachat-bot/echo/pull/69/files (TODO change link when pr is merged).
-
-## How to use on an unsupported platform
-
-<!-- todo instructions, will uses an env var for pointing to `deltachat-rpc-server` binary -->
-
-<!-- todo copy parts from https://github.com/deltachat/deltachat-desktop/blob/7045c6f549e4b9d5caa0709d5bd314bbd9fd53db/docs/UPDATE_CORE.md -->
-
-## How does it work when you install it
-
-NPM automatically installs platform dependent optional dependencies when `os` and `cpu` fields are set correctly.
-
-references:
-
-- https://napi.rs/docs/deep-dive/release#3-the-native-addon-for-different-platforms-is-distributed-through-different-npm-packages, [webarchive version](https://web.archive.org/web/20240309234250/https://napi.rs/docs/deep-dive/release#3-the-native-addon-for-different-platforms-is-distributed-through-different-npm-packages)
-- https://docs.npmjs.com/cli/v6/configuring-npm/package-json#cpu
-- https://docs.npmjs.com/cli/v6/configuring-npm/package-json#os
-
-When you import this package it searches for the rpc server in the following locations and order:
-
-1. `DELTA_CHAT_RPC_SERVER` environment variable
-2. use the PATH when `{takeVersionFromPATH: true}` is supplied in the options. 
-3. prebuilds in npm packages
-
-so by default it uses the prebuilds.
-
-## How do you built this package in CI
-
-- To build platform packages, run the `build_platform_package.py` script:
-  ```
-  python3 build_platform_package.py <cargo-target>
-  # example
-  python3 build_platform_package.py x86_64-apple-darwin
-  ```
-- Then pass it as an artifact to the last CI action that publishes the main package.
-- upload all packages from `deltachat-rpc-server/npm-package/platform_package`.
-- then publish `deltachat-rpc-server/npm-package`,
-  - this will run `update_optional_dependencies_and_version.js` (in the `prepack` script),
-    which puts all platform packages into `optionalDependencies` and updates the `version` in `package.json`
-
-## How to build a version you can use localy on your host machine for development
-
-You can not install the npm packet from the previous section locally, unless you have a local npm registry set up where you upload it too. This is why we have seperate scripts for making it work for local installation.
-
-- If you just need your host platform run `python scripts/make_local_dev_version.py`
-- note: this clears the `platform_package` folder
-- (advanced) If you need more than one platform for local install you can just run `node scripts/update_optional_dependencies_and_version.js` after building multiple plaftorms with `build_platform_package.py`
-
-## Thanks to nlnet
-
-The initial work on this package was funded by nlnet as part of the [Delta Tauri](https://nlnet.nl/project/DeltaTauri/) Project.

deltachat-rpc-server/npm-package/index.d.ts

@@ -1,42 +0,0 @@
-import { StdioDeltaChat } from "@deltachat/jsonrpc-client";
-
-export interface SearchOptions {
-  /** whether take deltachat-rpc-server inside of $PATH*/
-  takeVersionFromPATH: boolean;
-
-  /** whether to disable the DELTA_CHAT_RPC_SERVER environment variable */
-  disableEnvPath: boolean;
-}
-
-/**
- * 
- * @returns absolute path to deltachat-rpc-server binary
- * @throws when it is not found
- */
-export function getRPCServerPath(
-  options?: Partial<SearchOptions>
-): Promise<string>;
-
-
-
-export type DeltaChatOverJsonRpcServer = StdioDeltaChat & {
-    readonly pathToServerBinary: string;
-};
-
-export interface StartOptions {
-  /** whether to disable outputting stderr to the parent process's stderr */
-  muteStdErr: boolean;
-}
-
-/**
- * 
- * @param directory directory for accounts folder
- * @param options 
- */
-export function startDeltaChat(directory: string, options?: Partial<SearchOptions & StartOptions> ): Promise<DeltaChatOverJsonRpcServer>
-
-
-export namespace FnTypes {
-    export type getRPCServerPath = typeof getRPCServerPath
-    export type startDeltaChat = typeof startDeltaChat
-}

deltachat-rpc-server/npm-package/index.js

@@ -1,108 +0,0 @@
-//@ts-check
-import { spawn } from "node:child_process";
-import { stat } from "node:fs/promises";
-import os from "node:os";
-import process from "node:process";
-import { ENV_VAR_NAME, PATH_EXECUTABLE_NAME } from "./src/const.js";
-import {
-  ENV_VAR_LOCATION_NOT_FOUND,
-  FAILED_TO_START_SERVER_EXECUTABLE,
-  NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR,
-  NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR,
-} from "./src/errors.js";
-
-import { createRequire } from "node:module";
-
-function findRPCServerInNodeModules() {
-  const arch = os.arch();
-  const operating_system = process.platform;
-  const package_name = `@deltachat/stdio-rpc-server-${operating_system}-${arch}`;
-  try {
-    const { resolve } = createRequire(import.meta.url);
-    return resolve(package_name);
-  } catch (error) {
-    console.debug("findRpcServerInNodeModules", error);
-    const require = createRequire(import.meta.url);
-    if (
-      Object.keys(require("./package.json").optionalDependencies).includes(
-        package_name
-      )
-    ) {
-      throw new Error(NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name));
-    } else {
-      throw new Error(NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR());
-    }
-  }
-}
-
-/** @type {import("./index").FnTypes.getRPCServerPath} */
-export async function getRPCServerPath(options = {}) {
-  const { takeVersionFromPATH, disableEnvPath } = {
-    takeVersionFromPATH: false,
-    disableEnvPath: false,
-    ...options,
-  };
-  // 1. check if it is set as env var
-  if (process.env[ENV_VAR_NAME] && !disableEnvPath) {
-    try {
-      if (!(await stat(process.env[ENV_VAR_NAME])).isFile()) {
-        throw new Error(
-          `expected ${ENV_VAR_NAME} to point to the deltachat-rpc-server executable`
-        );
-      }
-    } catch (error) {
-      throw new Error(ENV_VAR_LOCATION_NOT_FOUND());
-    }
-    return process.env[ENV_VAR_NAME];
-  }
-
-  // 2. check if PATH should be used
-  if (takeVersionFromPATH) {
-    return PATH_EXECUTABLE_NAME;
-  }
-  // 3. check for prebuilds
-
-  return findRPCServerInNodeModules();
-}
-
-import { StdioDeltaChat } from "@deltachat/jsonrpc-client";
-
-/** @type {import("./index").FnTypes.startDeltaChat} */
-export async function startDeltaChat(directory, options = {}) {
-  const pathToServerBinary = await getRPCServerPath(options);
-  const server = spawn(pathToServerBinary, {
-    env: {
-      RUST_LOG: process.env.RUST_LOG,
-      DC_ACCOUNTS_PATH: directory,
-    },
-    stdio: ["pipe", "pipe", options.muteStdErr ? "ignore" : "inherit"],
-  });
-
-  server.on("error", (err) => {
-    throw new Error(FAILED_TO_START_SERVER_EXECUTABLE(pathToServerBinary, err));
-  });
-  let shouldClose = false;
-
-  server.on("exit", () => {
-    if (shouldClose) {
-      return;
-    }
-    throw new Error("Server quit");
-  });
-
-  /** @type {import('./index').DeltaChatOverJsonRpcServer} */
-  //@ts-expect-error
-  const dc = new StdioDeltaChat(server.stdin, server.stdout, true);
-
-  dc.close = () => {
-    shouldClose = true;
-    if (!server.kill()) {
-      console.log("server termination failed");
-    }
-  };
-
-  //@ts-expect-error
-  dc.pathToServerBinary = pathToServerBinary;
-
-  return dc;
-}

deltachat-rpc-server/npm-package/package.json

@@ -1,19 +0,0 @@
-{
-  "license": "MPL-2.0",
-  "main": "index.js",
-  "name": "@deltachat/stdio-rpc-server",
-  "optionalDependencies": {},
-  "peerDependencies": {
-    "@deltachat/jsonrpc-client": "*"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/deltachat/deltachat-core-rust.git"
-  },
-  "scripts": {
-    "prepack": "node scripts/update_optional_dependencies_and_version.js"
-  },
-  "type": "module",
-  "types": "index.d.ts",
-  "version": "1.142.11"
-}

deltachat-rpc-server/npm-package/scripts/build_platform_package.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir
-from shutil import copy
-from src.make_package import write_package_json
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-if len(argv) < 2:
-    print("First argument should be target architecture as required by cargo")
-    exit(1)
-
-target = argv[1].strip()
-
-subprocess.run(
-    ["cargo", "build", "--release", "-p", "deltachat-rpc-server", "--target", target],
-    check=True,
-)
-
-newpath = "platform_package"
-if not path.exists(newpath):
-    makedirs(newpath)
-
-# make new folder
-
-platform_path = "platform_package/" + target
-if not path.exists(platform_path):
-    makedirs(platform_path)
-
-# copy binary it over
-
-
-def binary_path(binary_name):
-    return "../../target/" + target + "/release/" + binary_name
-
-
-my_binary_name = "deltachat-rpc-server"
-
-if not path.isfile(binary_path("deltachat-rpc-server")):
-    my_binary_name = "deltachat-rpc-server.exe"
-    if not path.isfile(binary_path("deltachat-rpc-server.exe")):
-        print("Did not find the build")
-        exit(1)
-
-my_binary_path = binary_path(my_binary_name)
-
-copy(my_binary_path, platform_path + "/" + my_binary_name)
-
-# make a package.json for it
-
-write_package_json(platform_path, target, my_binary_name)

deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py

@@ -1,34 +0,0 @@
-# This script is for making a version of the npm packet that you can install locally
-
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir
-import re
-import json
-import tomllib
-from shutil import copy, rmtree
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-# get host target with "rustc -vV"
-output = subprocess.run(["rustc", "-vV"], capture_output=True)
-host_target = re.search('host: ([-\\w]*)', output.stdout.decode("utf-8")).group(1)
-print("host target to build for is:", host_target)
-
-# clean platform_package folder
-newpath = r'platform_package' 
-if not path.exists(newpath):
-    makedirs(newpath)
-else:
-    rmtree(path.join(path.dirname(path.abspath(__file__)), "../platform_package/"))
-    makedirs(newpath)
-
-# run build_platform_package.py with the host's target to build it
-subprocess.run(["python", "scripts/build_platform_package.py", host_target], capture_output=False, check=True)
-
-# run update_optional_dependencies_and_version.js to adjust the package / make it installable locally
-subprocess.run(["node", "scripts/update_optional_dependencies_and_version.js", "--local"], capture_output=False, check=True)
-
-# typescript / npm local package installing/linking needs that this package has it's own node_modules folder
-subprocess.run(["npm", "i"], capture_output=False, check=True)

deltachat-rpc-server/npm-package/scripts/pack_binary_for_platform.py

@@ -1,46 +0,0 @@
-import subprocess
-from sys import argv
-from os import path, makedirs, chdir, chmod, stat
-import json
-from shutil import copy
-from src.make_package import write_package_json
-
-# ensure correct working directory
-chdir(path.join(path.dirname(path.abspath(__file__)), "../"))
-
-if len(argv) < 3:
-    print("First argument should be target architecture as required by cargo")
-    print("Second argument should be the location of th built binary (binary_path)")
-    exit(1)
-
-target = argv[1].strip()
-binary_path = argv[2].strip()
-
-output = subprocess.run(["rustc","--print","target-list"], capture_output=True, check=True)
-available_targets = output.stdout.decode("utf-8")
-
-if available_targets.find(target) == -1:
-    print("target", target, "is not known / not valid")
-    exit(1)
-
-
-newpath = r'platform_package' 
-if not path.exists(newpath):
-    makedirs(newpath)
-
-# make new folder
-
-platform_path = 'platform_package/' + target
-if not path.exists(platform_path):
-    makedirs(platform_path)
-
-# copy binary it over
-
-my_binary_name = path.basename(binary_path)
-new_binary_path = platform_path + "/" + my_binary_name
-copy(binary_path, new_binary_path)
-chmod(new_binary_path, 0o555) # everyone can read & execute, nobody can write
-
-# make a package.json for it
-
-write_package_json(platform_path, target, my_binary_name)

deltachat-rpc-server/npm-package/scripts/src/convert_platform.py

@@ -1,21 +0,0 @@
-def convert_cpu_arch_to_npm_cpu_arch(arch):
-    if arch == "x86_64":
-        return "x64"
-    if arch == "i686":
-        return "ia32"
-    if arch == "aarch64":
-        return "arm64"
-    if arch == "armv7" or arch == "arm":
-        return "arm"
-    print("architecture might not be known by nodejs, please make sure it can be returned by 'process.arch':", arch)
-    return arch
-
-def convert_os_to_npm_os(os):
-    if os == "windows":
-        return "win32"
-    if os == "darwin" or os == "linux":
-        return os
-    if os.startswith("android"):
-        return "android"
-    print("architecture might not be known by nodejs, please make sure it can be returned by 'process.platform':", os)
-    return os

deltachat-rpc-server/npm-package/scripts/src/make_package.py

@@ -1,34 +0,0 @@
-import tomllib
-import json
-
-from .convert_platform import convert_cpu_arch_to_npm_cpu_arch, convert_os_to_npm_os
-
-def write_package_json(platform_path, rust_target, my_binary_name):
-    if len(rust_target.split("-")) == 3:
-        [cpu_arch, vendor, os] = rust_target.split("-")
-    else:
-        [cpu_arch, vendor, os, _env] = rust_target.split("-")
-
-    # read version
-    tomlfile = open("../../Cargo.toml", 'rb')
-    version = tomllib.load(tomlfile)['package']['version']
-
-    package_json = {
-        "name": "@deltachat/stdio-rpc-server-"
-        + convert_os_to_npm_os(os)
-        + "-"
-        + convert_cpu_arch_to_npm_cpu_arch(cpu_arch),
-        "version": version,
-        "os": [convert_os_to_npm_os(os)],
-        "cpu": [convert_cpu_arch_to_npm_cpu_arch(cpu_arch)],
-        "main": my_binary_name,
-        "license": "MPL-2.0",
-        "repository": {
-            "type": "git",
-            "url": "https://github.com/deltachat/deltachat-core-rust.git",
-        },
-    }
-
-    file = open(platform_path + "/package.json", 'w')
-    file.write(json.dumps(package_json, indent=4))
-

deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js

@@ -1,64 +0,0 @@
-import fs from "node:fs/promises";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const expected_cwd = join(dirname(fileURLToPath(import.meta.url)), "..");
-
-if (process.cwd() !== expected_cwd) {
-  console.error(
-    "CWD missmatch: this script needs to be run from " + expected_cwd,
-    { actual: process.cwd(), expected: expected_cwd }
-  );
-  process.exit(1);
-}
-
-// whether to use local paths instead of npm registry version number for the prebuilds in optionalDependencies
-// useful for local development
-const is_local = process.argv.includes("--local");
-
-const package_json = JSON.parse(await fs.readFile("./package.json", "utf8"));
-
-const cargo_toml = await fs.readFile("../Cargo.toml", "utf8");
-const version = cargo_toml
-  .split("\n")
-  .find((line) => line.includes("version"))
-  .split('"')[1];
-
-const platform_packages_dir = "./platform_package";
-
-const platform_package_names = await Promise.all(
-  (await fs.readdir(platform_packages_dir)).map(async (name) => {
-    const p = JSON.parse(
-      await fs.readFile(
-        join(platform_packages_dir, name, "package.json"),
-        "utf8"
-      )
-    );
-    if (p.version !== version) {
-      console.error(
-        name,
-        "has a different version than the version of the rpc server.",
-        { rpc_server: version, platform_package: p.version }
-      );
-      throw new Error("version missmatch");
-    }
-    return { folder_name: name, package_name: p.name };
-  })
-);
-
-package_json.version = version;
-package_json.optionalDependencies = {};
-for (const { folder_name, package_name } of platform_package_names) {
-  package_json.optionalDependencies[package_name] = is_local
-    ? `file:${expected_cwd}/platform_package/${folder_name}` // npm seems to work better with an absolute path here
-    : version;
-}
-
-if (is_local) {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] =
-    `file:${join(expected_cwd, "/../../deltachat-jsonrpc/typescript")}`;
-} else {
-  package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*";
-}
-
-await fs.writeFile("./package.json", JSON.stringify(package_json, null, 4));

deltachat-rpc-server/npm-package/src/const.js

@@ -1,5 +0,0 @@
-//@ts-check
-
-export const PATH_EXECUTABLE_NAME = 'deltachat-rpc-server'
-
-export const ENV_VAR_NAME = "DELTA_CHAT_RPC_SERVER"

deltachat-rpc-server/npm-package/src/errors.js

@@ -1,41 +0,0 @@
-//@ts-check
-import { ENV_VAR_NAME } from "./const.js";
-
-const cargoInstallCommand =
-  "cargo install --git https://github.com/deltachat/deltachat-core-rust deltachat-rpc-server";
-
-export function NPM_NOT_FOUND_SUPPORTED_PLATFORM_ERROR(package_name) {
-  return `deltachat-rpc-server not found:
-
-- Install it with "npm i ${package_name}"
-- or download/compile deltachat-rpc-server for your platform and
- - either put it into your PATH (for example with "${cargoInstallCommand}")
- - or set the "${ENV_VAR_NAME}" env var to the path to deltachat-rpc-server"`;
-}
-
-export function NPM_NOT_FOUND_UNSUPPORTED_PLATFORM_ERROR() {
-  return `deltachat-rpc-server not found:
-
-Unfortunately no prebuild is available for your system, so you need to provide deltachat-rpc-server yourself.
-
-- Download or Compile deltachat-rpc-server for your platform and
- - either put it into your PATH (for example with "${cargoInstallCommand}")
- - or set the "${ENV_VAR_NAME}" env var to the path to deltachat-rpc-server"`;
-}
-
-export function ENV_VAR_LOCATION_NOT_FOUND(error) {
-  return `deltachat-rpc-server not found in ${ENV_VAR_NAME}:
-
-    Error: ${error}
-
-    Content of ${ENV_VAR_NAME}: "${process.env[ENV_VAR_NAME]}"`;
-}
-
-export function FAILED_TO_START_SERVER_EXECUTABLE(pathToServerBinary, error) {
-  return `Failed to start server executable at '${pathToServerBinary}',
-
-  Error: ${error}
-
-Make sure the deltachat-rpc-server binary exists at this location 
-and you can start it with \`${pathToServerBinary} --version\``;
-}

deltachat-rpc-server/src/main.rs

@@ -1,4 +1,3 @@
-#![recursion_limit = "256"]
 //! Delta Chat core RPC server.
 //!
 //! It speaks JSON Lines over stdio.
@@ -11,7 +10,6 @@ use deltachat::constants::DC_VERSION_STR;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
 use tokio::io::{self, AsyncBufReadExt, BufReader};
-use tracing_subscriber::EnvFilter;
 use yerpc::RpcServer as _;
 
 #[cfg(target_family = "unix")]
@@ -29,9 +27,6 @@ async fn main() {
     // "For technical reasons, stdin is implemented by using an ordinary blocking read on a separate
     // thread, and it is impossible to cancel that read. This can make shutdown of the runtime hang
     // until the user presses enter."
-    if let Err(error) = &r {
-        log::error!("Fatal error: {error:#}.")
-    }
     std::process::exit(if r.is_ok() { 0 } else { 1 });
 }
 
@@ -64,13 +59,7 @@ async fn main_impl() -> Result<()> {
     #[cfg(target_family = "unix")]
     let mut sigterm = signal_unix::signal(signal_unix::SignalKind::terminate())?;
 
-    // Logs from `log` crate and traces from `tracing` crate
-    // are configurable with `RUST_LOG` environment variable
-    // and go to stderr to avoid interferring with JSON-RPC using stdout.
-    tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        .with_writer(std::io::stderr)
-        .init();
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
 
     let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
     log::info!("Starting with accounts directory `{}`.", path);
@@ -79,7 +68,7 @@ async fn main_impl() -> Result<()> {
 
     log::info!("Creating JSON-RPC API.");
     let accounts = Arc::new(RwLock::new(accounts));
-    let state = CommandApi::from_arc(accounts.clone()).await;
+    let state = CommandApi::from_arc(accounts.clone());
 
     let (client, mut out_receiver) = RpcClient::new();
     let session = RpcSession::new(client.clone(), state.clone());

deny.toml

@@ -15,10 +15,6 @@ ignore = [
 
     # Unmaintained encoding
     "RUSTSEC-2021-0153",
-
-    # Problem in curve25519-dalek 3.2.0 used by iroh 0.4.
-    # curve25519-dalek 4.1.3 has the problem fixed.
-    "RUSTSEC-2024-0344",
 ]
 
 [bans]
@@ -27,9 +23,6 @@ ignore = [
 # when upgrading.
 # Please keep this list alphabetically sorted.
 skip = [
-     { name = "asn1-rs-derive", version = "0.4.0" },
-     { name = "asn1-rs-impl", version = "0.1.0" },
-     { name = "asn1-rs", version = "0.5.2" },
      { name = "async-channel", version = "1.9.0" },
      { name = "base16ct", version = "0.1.1" },
      { name = "base64", version = "<0.21" },
@@ -41,77 +34,46 @@ skip = [
      { name = "darling_core", version = "<0.14" },
      { name = "darling_macro", version = "<0.14" },
      { name = "darling", version = "<0.14" },
-     { name = "der_derive", version = "0.6.1" },
-     { name = "derive_more", version = "0.99.17" },
-     { name = "der-parser", version = "8.2.0" },
      { name = "der", version = "0.6.1" },
      { name = "digest", version = "<0.10" },
-     { name = "dlopen2", version = "0.4.1" },
      { name = "ed25519-dalek", version = "1.0.1" },
      { name = "ed25519", version = "1.5.3" },
+     { name = "env_logger", version = "0.10.2" },
      { name = "event-listener", version = "2.5.3" },
-     { name = "event-listener", version = "4.0.3" },
-     { name = "fastrand", version = "1.9.0" },
-     { name = "futures-lite", version = "1.13.0" },
      { name = "getrandom", version = "<0.2" },
-     { name = "h2", version = "0.3.26" },
-     { name = "http-body", version = "0.4.6" },
-     { name = "http", version = "0.2.12" },
-     { name = "hyper", version = "0.14.28" },
      { name = "idna", version = "0.4.0" },
-     { name = "netlink-packet-core", version = "0.5.0" },
-     { name = "netlink-packet-route", version = "0.15.0" },
-     { name = "nix", version = "0.26.4" },
-     { name = "oid-registry", version = "0.6.1" },
      { name = "pem-rfc7468", version = "0.6.0" },
-     { name = "pem", version = "1.1.1" },
      { name = "pkcs8", version = "0.9.0" },
      { name = "quick-error", version = "<2.0" },
      { name = "rand_chacha", version = "<0.3" },
      { name = "rand_core", version = "<0.6" },
      { name = "rand", version = "<0.8" },
-     { name = "rcgen", version = "<0.12.1" },
      { name = "redox_syscall", version = "0.3.5" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
      { name = "ring", version = "0.16.20" },
-     { name = "rustls-pemfile", version = "1.0.4" },
-     { name = "rustls", version = "0.21.11" },
-     { name = "rustls-webpki", version = "0.101.7" },
      { name = "sec1", version = "0.3.0" },
      { name = "sha2", version = "<0.10" },
      { name = "signature", version = "1.6.4" },
      { name = "spin", version = "<0.9.6" },
      { name = "spki", version = "0.6.0" },
-     { name = "ssh-encoding", version = "0.1.0" },
-     { name = "ssh-key", version = "0.5.1" },
-     { name = "strsim", version = "0.10.0" },
      { name = "sync_wrapper", version = "0.1.2" },
-     { name = "synstructure", version = "0.12.6" },
      { name = "syn", version = "1.0.109" },
-     { name = "system-configuration-sys", version = "0.5.0" },
-     { name = "system-configuration", version = "0.5.1" },
      { name = "time", version = "<0.3" },
-     { name = "tokio-rustls", version = "0.24.1" },
      { name = "toml_edit", version = "0.21.1" },
      { name = "untrusted", version = "0.7.1" },
      { name = "wasi", version = "<0.11" },
-     { name = "webpki-roots", version ="0.25.4" },
      { name = "windows_aarch64_gnullvm", version = "<0.52" },
      { name = "windows_aarch64_msvc", version = "<0.52" },
-     { name = "windows-core", version = "<0.54.0" },
      { name = "windows_i686_gnu", version = "<0.52" },
      { name = "windows_i686_msvc", version = "<0.52" },
      { name = "windows-sys", version = "<0.52" },
      { name = "windows-targets", version = "<0.52" },
      { name = "windows", version = "0.32.0" },
-     { name = "windows", version = "<0.54.0" },
      { name = "windows_x86_64_gnullvm", version = "<0.52" },
      { name = "windows_x86_64_gnu", version = "<0.52" },
      { name = "windows_x86_64_msvc", version = "<0.52" },
      { name = "winnow", version = "0.5.40" },
-     { name = "winreg", version = "0.50.0" },
-     { name = "x509-parser", version = "<0.16.0" },
 ]
 
 

flake.lock

@@ -7,11 +7,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1712088936,
-        "narHash": "sha256-mVjeSWQiR/t4UZ9fUawY9OEPAhY1R3meYG+0oh8DUBs=",
+        "lastModified": 1710633978,
+        "narHash": "sha256-yemnwSvW7cdWtXGpivFA5jDO35rGPs6fqxlQ4l6ODXs=",
         "owner": "tadfisher",
         "repo": "android-nixpkgs",
-        "rev": "2d8181caef279f19c4a33dc694723f89ffc195d4",
+        "rev": "e91fb3d8517538e5ad9b422c9a4f604b56008a9e",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711099426,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "lastModified": 1708939976,
+        "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1714112748,
-        "narHash": "sha256-jq6Cpf/pQH85p+uTwPPrGG8Ky/zUOTwMJ7mcqc5M4So=",
+        "lastModified": 1710742993,
+        "narHash": "sha256-W0PQCe0bW3hKF5lHawXrKynBcdSP18Qa4sb8DcUfOqI=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "3ae4b908a795b6a3824d401a0702e11a7157d7e1",
+        "rev": "6f2fec850f569d61562d3a47dc263f19e9c7d825",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1713520724,
-        "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
+        "lastModified": 1698420672,
+        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
+        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "lastModified": 1709237383,
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1713895582,
-        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
+        "lastModified": 1710631334,
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,12 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1711668574,
-        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
-        "path": "/nix/store/9fpv0kjq9a80isa1wkkvrdqsh9dpcn05-source",
-        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
-        "type": "path"
+        "lastModified": 1710765496,
+        "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
+        "type": "github"
       },
       "original": {
         "id": "nixpkgs",
@@ -195,11 +196,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1714076141,
-        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
+        "lastModified": 1710631334,
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
         "type": "github"
       },
       "original": {
@@ -222,11 +223,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1714031783,
-        "narHash": "sha256-xS/niQsq1CQPOe4M4jvVPO2cnXS/EIeRG5gIopUbk+Q=",
+        "lastModified": 1710708100,
+        "narHash": "sha256-Jd6pmXlwKk5uYcjyO/8BfbUVmx8g31Qfk7auI2IG66A=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "56bee2ddafa6177b19c631eedc88d43366553223",
+        "rev": "b6d1887bc4f9543b6c6bf098179a62446f34a6c3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -35,7 +35,6 @@
             ./CMakeLists.txt
             ./CONTRIBUTING.md
             ./deltachat_derive
-            ./deltachat-contact-tools
             ./deltachat-ffi
             ./deltachat-jsonrpc
             ./deltachat-ratelimit
@@ -483,7 +482,6 @@
                 format = "pyproject";
                 propagatedBuildInputs = [
                   pkgs.python3Packages.setuptools
-                  pkgs.python3Packages.imap-tools
                 ];
               };
 
@@ -525,26 +523,15 @@
               };
           };
 
-        devShells.default = let 
-          pkgs = import nixpkgs {
-            system = system;
-            overlays = [ fenix.overlays.default ];
-          };
-          in pkgs.mkShell {
-
+        devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [
-            (fenix.packages.${system}.complete.withComponents [
-              "cargo"
-              "clippy"
-              "rust-src"
-              "rustc"
-              "rustfmt"
-            ])
+            cargo
+            clippy
+            rustc
+            rustfmt
+            rust-analyzer
             cargo-deny
-            rust-analyzer-nightly
-            cargo-nextest
             perl # needed to build vendored OpenSSL
-            git-cliff
           ];
         };
       }

node/constants.js

@@ -30,7 +30,6 @@ module.exports = {
   DC_DOWNLOAD_IN_PROGRESS: 1000,
   DC_DOWNLOAD_UNDECIPHERABLE: 30,
   DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE: 2200,
-  DC_EVENT_CHANNEL_OVERFLOW: 2400,
   DC_EVENT_CHATLIST_CHANGED: 2300,
   DC_EVENT_CHATLIST_ITEM_CHANGED: 2301,
   DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
@@ -67,7 +66,6 @@ module.exports = {
   DC_EVENT_SMTP_MESSAGE_SENT: 103,
   DC_EVENT_WARNING: 300,
   DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
-  DC_EVENT_WEBXDC_REALTIME_DATA: 2150,
   DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
   DC_GCL_ADD_ALLDONE_HINT: 4,
   DC_GCL_ADD_SELF: 2,
@@ -112,7 +110,6 @@ module.exports = {
   DC_MSG_IMAGE: 20,
   DC_MSG_STICKER: 23,
   DC_MSG_TEXT: 10,
-  DC_MSG_VCARD: 90,
   DC_MSG_VIDEO: 50,
   DC_MSG_VIDEOCHAT_INVITATION: 70,
   DC_MSG_VOICE: 41,
@@ -128,7 +125,6 @@ module.exports = {
   DC_QR_ASK_VERIFYCONTACT: 200,
   DC_QR_ASK_VERIFYGROUP: 202,
   DC_QR_BACKUP: 251,
-  DC_QR_BACKUP2: 252,
   DC_QR_ERROR: 400,
   DC_QR_FPR_MISMATCH: 220,
   DC_QR_FPR_OK: 210,
@@ -177,7 +173,6 @@ module.exports = {
   DC_STR_CONFIGURATION_FAILED: 84,
   DC_STR_CONNECTED: 107,
   DC_STR_CONNTECTING: 108,
-  DC_STR_CONTACT: 200,
   DC_STR_CONTACT_NOT_VERIFIED: 36,
   DC_STR_CONTACT_SETUP_CHANGED: 37,
   DC_STR_CONTACT_VERIFIED: 35,
@@ -271,8 +266,6 @@ module.exports = {
   DC_STR_REMOVE_MEMBER_BY_YOU: 130,
   DC_STR_REPLY_NOUN: 90,
   DC_STR_SAVED_MESSAGES: 69,
-  DC_STR_SECUREJOIN_WAIT: 190,
-  DC_STR_SECUREJOIN_WAIT_TIMEOUT: 191,
   DC_STR_SECURE_JOIN_GROUP_QR_DESC: 120,
   DC_STR_SECURE_JOIN_REPLIES: 118,
   DC_STR_SECURE_JOIN_STARTED: 117,

node/events.js

@@ -37,9 +37,7 @@ module.exports = {
   2111: 'DC_EVENT_CONFIG_SYNCED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
   2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
   2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
   2300: 'DC_EVENT_CHATLIST_CHANGED',
-  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
-  2400: 'DC_EVENT_CHANNEL_OVERFLOW'
+  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED'
 }

node/lib/constants.ts

@@ -30,7 +30,6 @@ export enum C {
   DC_DOWNLOAD_IN_PROGRESS = 1000,
   DC_DOWNLOAD_UNDECIPHERABLE = 30,
   DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200,
-  DC_EVENT_CHANNEL_OVERFLOW = 2400,
   DC_EVENT_CHATLIST_CHANGED = 2300,
   DC_EVENT_CHATLIST_ITEM_CHANGED = 2301,
   DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
@@ -67,7 +66,6 @@ export enum C {
   DC_EVENT_SMTP_MESSAGE_SENT = 103,
   DC_EVENT_WARNING = 300,
   DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
-  DC_EVENT_WEBXDC_REALTIME_DATA = 2150,
   DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
   DC_GCL_ADD_ALLDONE_HINT = 4,
   DC_GCL_ADD_SELF = 2,
@@ -112,7 +110,6 @@ export enum C {
   DC_MSG_IMAGE = 20,
   DC_MSG_STICKER = 23,
   DC_MSG_TEXT = 10,
-  DC_MSG_VCARD = 90,
   DC_MSG_VIDEO = 50,
   DC_MSG_VIDEOCHAT_INVITATION = 70,
   DC_MSG_VOICE = 41,
@@ -128,7 +125,6 @@ export enum C {
   DC_QR_ASK_VERIFYCONTACT = 200,
   DC_QR_ASK_VERIFYGROUP = 202,
   DC_QR_BACKUP = 251,
-  DC_QR_BACKUP2 = 252,
   DC_QR_ERROR = 400,
   DC_QR_FPR_MISMATCH = 220,
   DC_QR_FPR_OK = 210,
@@ -177,7 +173,6 @@ export enum C {
   DC_STR_CONFIGURATION_FAILED = 84,
   DC_STR_CONNECTED = 107,
   DC_STR_CONNTECTING = 108,
-  DC_STR_CONTACT = 200,
   DC_STR_CONTACT_NOT_VERIFIED = 36,
   DC_STR_CONTACT_SETUP_CHANGED = 37,
   DC_STR_CONTACT_VERIFIED = 35,
@@ -271,8 +266,6 @@ export enum C {
   DC_STR_REMOVE_MEMBER_BY_YOU = 130,
   DC_STR_REPLY_NOUN = 90,
   DC_STR_SAVED_MESSAGES = 69,
-  DC_STR_SECUREJOIN_WAIT = 190,
-  DC_STR_SECUREJOIN_WAIT_TIMEOUT = 191,
   DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
   DC_STR_SECURE_JOIN_REPLIES = 118,
   DC_STR_SECURE_JOIN_STARTED = 117,
@@ -341,9 +334,7 @@ export const EventId2EventName: { [key: number]: string } = {
   2111: 'DC_EVENT_CONFIG_SYNCED',
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
   2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
-  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
   2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
   2300: 'DC_EVENT_CHATLIST_CHANGED',
   2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
-  2400: 'DC_EVENT_CHANNEL_OVERFLOW',
 }

node/src/module.c

@@ -1,4 +1,5 @@
 #define NAPI_VERSION 4
+#define NAPI_EXPERIMENTAL
 
 #include <stdlib.h>
 #include <stdio.h>

package.json

@@ -11,7 +11,7 @@
     "chai": "~4.3.10",
     "chai-as-promised": "^7.1.1",
     "mocha": "^8.2.1",
-    "node-gyp": "~10.1.0",
+    "node-gyp": "^10.0.0",
     "prebuildify": "^5.0.1",
     "prebuildify-ci": "^1.0.5",
     "prettier": "^3.0.3",
@@ -55,5 +55,5 @@
     "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.142.11"
+  "version": "1.137.2"
 }

python/examples/test_examples.py

@@ -44,6 +44,11 @@ def test_group_tracking_plugin(acfactory, lp):
 
     ac1, ac2 = acfactory.get_online_accounts(2)
 
+    botproc.fnmatch_lines(
+        """
+        *ac_configure_completed*
+    """,
+    )
     ac1.add_account_plugin(FFIEventLogger(ac1))
     ac2.add_account_plugin(FFIEventLogger(ac2))
 

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "1.142.11"
+version = "1.137.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
@@ -46,7 +46,7 @@ deltachat = [
 line-length = 120
 
 [tool.ruff]
-lint.select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP004", "UP010", "UP031", "UP032", "ANN204"]
+select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP004", "UP010", "UP031", "UP032", "ANN204"]
 line-length = 120
 
 [tool.isort]

python/src/deltachat/events.py

@@ -328,12 +328,10 @@ class EventThread(threading.Thread):
         elif name == "DC_EVENT_REACTIONS_CHANGED":
             assert ffi_event.data1 > 0
             msg = account.get_message_by_id(ffi_event.data2)
-            if msg is not None:
-                yield "ac_reactions_changed", {"message": msg}
+            yield "ac_reactions_changed", {"message": msg}
         elif name == "DC_EVENT_MSG_DELIVERED":
             msg = account.get_message_by_id(ffi_event.data2)
-            if msg is not None:
-                yield "ac_message_delivered", {"message": msg}
+            yield "ac_message_delivered", {"message": msg}
         elif name == "DC_EVENT_CHAT_MODIFIED":
             chat = account.get_chat_by_id(ffi_event.data1)
             yield "ac_chat_modified", {"chat": chat}

python/src/deltachat/message.py

@@ -364,9 +364,6 @@ class Message:
         else:
             # load message from db to get a fresh/current state
             dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-            # Message could be trashed, use the cached object if so.
-            if dc_msg == ffi.NULL:
-                dc_msg = self._dc_msg
         return lib.dc_msg_get_state(dc_msg)
 
     def is_in_fresh(self):
@@ -395,7 +392,7 @@ class Message:
 
     def is_outgoing(self):
         """Return True if Message is outgoing."""
-        return lib.dc_msg_get_state(self._dc_msg) in (
+        return self._msgstate in (
             const.DC_STATE_OUT_PREPARING,
             const.DC_STATE_OUT_PENDING,
             const.DC_STATE_OUT_FAILED,
@@ -487,9 +484,6 @@ class Message:
 
         # load message from db to get a fresh/current state
         dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-        # Message could be trashed, use the cached object if so.
-        if dc_msg == ffi.NULL:
-            dc_msg = self._dc_msg
         return lib.dc_msg_get_download_state(dc_msg)
 
     def download_full(self) -> None:

python/src/deltachat/testplugin.py

@@ -275,7 +275,6 @@ class ACSetup:
     def __init__(self, testprocess, init_time) -> None:
         self._configured_events = Queue()
         self._account2state: Dict[Account, str] = {}
-        self._account2config: Dict[Account, Dict[str, str]] = {}
         self._imap_cleaned: Set[str] = set()
         self.testprocess = testprocess
         self.init_time = init_time
@@ -337,8 +336,6 @@ class ACSetup:
         if not success:
             pytest.fail(f"configuring online account {acc} failed: {comment}")
         self._account2state[acc] = self.CONFIGURED
-        if acc in self._account2config:
-            acc.update_config(self._account2config[acc])
         return acc
 
     def _onconfigure_start_io(self, acc):
@@ -526,7 +523,6 @@ class ACFactory:
         configdict.setdefault("sentbox_watch", False)
         configdict.setdefault("sync_msgs", False)
         ac.update_config(configdict)
-        self._acsetup._account2config[ac] = configdict
         self._preconfigure_key(ac, configdict["addr"])
         return ac
 
@@ -552,15 +548,6 @@ class ACFactory:
 
         bot_cfg = self.get_next_liveconfig()
         bot_ac = self.prepare_account_from_liveconfig(bot_cfg)
-        self._acsetup.start_configure(bot_ac)
-        self.wait_configured(bot_ac)
-        bot_ac.start_io()
-        # Wait for DC_EVENT_IMAP_INBOX_IDLE so that all emails appeared in the bot's Inbox later are
-        # considered new and not existing ones, and thus processed by the bot.
-        print(bot_ac._logid, "waiting for inbox IDLE to become ready")
-        bot_ac._evtracker.wait_idle_inbox_ready()
-        bot_ac.stop_io()
-        self._acsetup._account2state[bot_ac] = self._acsetup.IDLEREADY
 
         # Forget ac as it will be opened by the bot subprocess
         # but keep something in the list to not confuse account generation

python/tests/stress_test_db.py

@@ -18,14 +18,14 @@ def test_db_busy_error(acfactory):
 
     # make a number of accounts
     accounts = acfactory.get_many_online_accounts(3)
-    log(f"created {len(accounts)} accounts")
+    log("created %s accounts" % len(accounts))
 
     # put a bigfile into each account
     for acc in accounts:
         acc.bigfile = os.path.join(acc.get_blobdir(), "bigfile")
         with open(acc.bigfile, "wb") as f:
             f.write(b"01234567890" * 1000_000)
-    log(f"created {len(accounts)} bigfiles")
+    log("created %s bigfiles" % len(accounts))
 
     contact_addrs = [acc.get_self_contact().addr for acc in accounts]
     chat = accounts[0].create_group_chat("stress-group")

python/tests/test_0_complex_or_slow.py

@@ -1,5 +1,4 @@
 import sys
-import time
 
 import pytest
 import deltachat as dc
@@ -676,17 +675,3 @@ def test_verified_group_vs_delete_server_after(acfactory, tmp_path, lp):
     assert msg_in.chat == chat2_offl
     assert msg_in.get_sender_contact().addr == ac2.get_config("addr")
     assert ac2_offl_ac1_contact.is_verified()
-
-
-def test_deleted_msgs_dont_reappear(acfactory):
-    ac1 = acfactory.new_online_configuring_account()
-    acfactory.bring_accounts_online()
-    ac1.set_config("bcc_self", "1")
-    chat = ac1.get_self_contact().create_chat()
-    msg = chat.send_text("hello")
-    ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-    ac1.delete_messages([msg])
-    ac1._evtracker.get_matching("DC_EVENT_MSG_DELETED")
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-    time.sleep(5)
-    assert len(chat.get_messages()) == 0

python/tests/test_1_online.py

@@ -484,16 +484,6 @@ def test_move_works_on_self_sent(acfactory):
     ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
 
 
-def test_move_sync_msgs(acfactory):
-    ac1 = acfactory.new_online_configuring_account(bcc_self=True, sync_msgs=True, fix_is_chatmail=True)
-    acfactory.bring_accounts_online()
-
-    ac1.set_config("displayname", "Alice")
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-    ac1.set_config("displayname", "Bob")
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-
-
 def test_forward_messages(acfactory, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
     chat = ac1.create_chat(ac2)
@@ -1353,6 +1343,7 @@ def test_quote_encrypted(acfactory, lp):
 
     for quoted_msg in msg1, msg3:
         # Save the draft with a quote.
+        # It should be encrypted if quoted message is encrypted.
         msg_draft = Message.new_empty(ac1, "text")
         msg_draft.set_text("message reply")
         msg_draft.quote = quoted_msg
@@ -1366,14 +1357,10 @@ def test_quote_encrypted(acfactory, lp):
         chat.set_draft(None)
         assert chat.get_draft() is None
 
-        # Quote should be replaced with "..." if quoted message is encrypted.
         msg_in = ac2._evtracker.wait_next_incoming_message()
         assert msg_in.text == "message reply"
-        assert not msg_in.is_encrypted()
-        if quoted_msg.is_encrypted():
-            assert msg_in.quoted_text == "..."
-        else:
-            assert msg_in.quoted_text == quoted_msg.text
+        assert msg_in.quoted_text == quoted_msg.text
+        assert msg_in.is_encrypted() == quoted_msg.is_encrypted()
 
 
 def test_quote_attachment(tmp_path, acfactory, lp):
@@ -1572,6 +1559,8 @@ def test_import_export_online_all(acfactory, tmp_path, data, lp):
 
         # check progress events for import
         assert imex_tracker.wait_progress(1, progress_upper_limit=249)
+        assert imex_tracker.wait_progress(500, progress_upper_limit=749)
+        assert imex_tracker.wait_progress(750, progress_upper_limit=999)
         assert imex_tracker.wait_progress(1000)
 
     assert_account_is_proper(ac1)
@@ -2044,15 +2033,14 @@ def test_send_receive_locations(acfactory, lp):
     assert chat1.is_sending_locations()
     ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
 
-    # Wait for "enabled location streaming" message.
-    ac2._evtracker.wait_next_incoming_message()
-
-    # First location is sent immediately as a location-only message.
     ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
     ac1._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
+    chat1.send_text("🍞")
     ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
 
     lp.sec("ac2: wait for incoming location message")
+
+    # currently core emits location changed before event_incoming message
     ac2._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
 
     locations = chat2.get_locations()
@@ -2061,7 +2049,7 @@ def test_send_receive_locations(acfactory, lp):
     assert locations[0].longitude == 3.0
     assert locations[0].accuracy == 0.5
     assert locations[0].timestamp > now
-    assert locations[0].marker is None
+    assert locations[0].marker == "🍞"
 
     contact = ac2.create_contact(ac1)
     locations2 = chat2.get_locations(contact=contact)

python/tox.ini

@@ -41,11 +41,12 @@ skipsdist = True
 skip_install = True
 deps =
     ruff
+    black
     # pygments required by rst-lint
     pygments
     restructuredtext_lint 
 commands =
-    ruff format --quiet --diff setup.py src/deltachat examples/ tests/
+    black --quiet --check --diff setup.py src/deltachat examples/ tests/
     ruff check src/deltachat tests/ examples/
     rst-lint --encoding 'utf-8' README.rst
 
@@ -61,8 +62,7 @@ commands =
 [testenv:doc]
 changedir=doc
 deps =
-# Pinned version, workaround for <https://github.com/breathe-doc/breathe/issues/981>
-    sphinx<7.3
+    sphinx
     breathe
     sphinx_rtd_theme
 commands =

release-date.in

@@ -1 +1 @@
-2024-08-30
+2024-04-05

scripts/coredeps/install-rust.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.80.1
+RUST_VERSION=1.77.1
 
 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

scripts/create-provider-data-rs.py

@@ -149,7 +149,7 @@ def process_data(data, file):
     oauth2 = "Some(Oauth2Authorizer::" + camel(oauth2) + ")" if oauth2 != "" else "None"
 
     provider = ""
-    before_login_hint = cleanstr(data.get("before_login_hint", "") or "")
+    before_login_hint = cleanstr(data.get("before_login_hint", ""))
     after_login_hint = cleanstr(data.get("after_login_hint", ""))
     if (not has_imap and not has_smtp) or (has_imap and has_smtp):
         provider += (

scripts/make-rpc-testenv.sh

@@ -3,4 +3,4 @@ set -euo pipefail
 
 tox -c deltachat-rpc-client -e py --devenv venv
 venv/bin/pip install --upgrade pip
-cargo install --locked --path deltachat-rpc-server/ --root "$PWD/venv" --debug
+cargo install --path deltachat-rpc-server/ --root "$PWD/venv" --debug

scripts/run-rpc-test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -euo pipefail
-cargo install --locked --path deltachat-rpc-server/ --root "$PWD/venv" --debug
+cargo install --path deltachat-rpc-server/ --root "$PWD/venv" --debug
 PATH="$PWD/venv/bin:$PATH" tox -c deltachat-rpc-client

scripts/set_core_version.py

@@ -66,11 +66,7 @@ def main():
     parser = ArgumentParser(prog="set_core_version")
     parser.add_argument("newversion")
 
-    json_list = [
-        "package.json",
-        "deltachat-jsonrpc/typescript/package.json",
-        "deltachat-rpc-server/npm-package/package.json",
-    ]
+    json_list = ["package.json", "deltachat-jsonrpc/typescript/package.json"]
     toml_list = [
         "Cargo.toml",
         "deltachat-ffi/Cargo.toml",

scripts/update-provider-database.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 export TZ=UTC
 
 # Provider database revision.
-REV=05c1b2029da74718e4bdc3799a46e29c4f794dc7
+REV=2f3db24107e4802c2df0aa0a40f0e144006c0a9b
 
 CORE_ROOT="$PWD"
 TMP="$(mktemp -d)"

spec.md

@@ -1,6 +1,6 @@
 # chat-mail specification
 
-Version: 0.35.0
+Version: 0.34.0
 Status:  In-progress 
 Format:  [Semantic Line Breaks](https://sembr.org/)
 
@@ -22,13 +22,7 @@ to implement typical messenger functions.
 - [Locations](#locations)
     - [User locations](#user-locations)
     - [Points of interest](#points-of-interest)
-- [Stickers](#stickers)
-- [Voice messages](#voice-messages)
-- [Reactions](#reactions)
-- [Attaching a contact to a message](#attaching-a-contact-to-a-message)
-- [Transitioning to a new e-mail address (AEAP)](#transitioning-to-a-new-e-mail-address-aeap)
 - [Miscellaneous](#miscellaneous)
-    - [Sync messages](#sync-messages)
 
 
 # Encryption
@@ -467,58 +461,6 @@ As an extension to RFC 9078, it is allowed to send empty reaction message,
 in which case all previously sent reactions are retracted.
 
 
-# Attaching a contact to a message
-
-Messengers MAY allow the user to attach a contact to a message
-in order to share it with the chat partner.
-The contact MUST be sent as a [vCard](https://datatracker.ietf.org/doc/html/rfc6350).
-
-The vCard MUST contain `EMAIL`,
-`FN` (display name),
-and `VERSION` (which version of the vCard standard you're using).
-If available, it SHOULD contain
-`REV` (current timestamp),
-`PHOTO` (avatar), and
-`KEY` (OpenPGP public key,
-in binary format,
-encoded with vanilla base64;
-note that this is different from the OpenPGP 'ASCII Armor' format).
-
-Example vCard:
-
-```
-BEGIN:VCARD
-VERSION:4.0
-EMAIL:alice@example.org
-FN:Alice Wonderland
-KEY:data:application/pgp-keys;base64,[Base64-data]
-PHOTO:data:image/jpeg;base64,[image in Base64]
-REV:20240418T184242Z
-END:VCARD
-```
-
-It is fine if messengers do include a full vCard parser
-and e.g. simply search for the line starting with `EMAIL`
-in order to get the email address.
-
-
-# Transitioning to a new e-mail address (AEAP)
-
-When receiving a message:
-- If the key exists, but belongs to another address
-- AND there is a `Chat-Version` header
-- AND the message is signed correctly
-- AND the From address is (also) in the encrypted (and therefore signed) headers 
-- AND the message timestamp is newer than the contact's `lastseen`
-  (to prevent changing the address back when messages arrive out of order)
-  (this condition is not that important
-  since we will have eventual consistency even without it):
-
-  Replace the contact in _all_ groups,
-  possibly deduplicate the members list,
-  and add a system message to all of these chats.
-
-
 # Miscellaneous
 
 Messengers SHOULD use the header `In-Reply-To` as usual.
@@ -542,4 +484,21 @@ We define the effective date of a message
 as the sending time of the message as indicated by its Date header,
 or the time of first receipt if that date is in the future or unavailable.
 
+
+# Transitioning to a new e-mail address (AEAP)
+
+When receiving a message:
+- If the key exists, but belongs to another address
+- AND there is a `Chat-Version` header
+- AND the message is signed correctly
+- AND the From address is (also) in the encrypted (and therefore signed) headers 
+- AND the message timestamp is newer than the contact's `lastseen`
+  (to prevent changing the address back when messages arrive out of order)
+  (this condition is not that important
+  since we will have eventual consistency even without it):
+
+  Replace the contact in _all_ groups,
+  possibly deduplicate the members list,
+  and add a system message to all of these chats.
+
 Copyright © 2017-2021 Delta Chat contributors.

src/accounts.rs

@@ -166,19 +166,6 @@ impl Accounts {
             .remove(&id)
             .with_context(|| format!("no account with id {id}"))?;
         ctx.stop_io().await;
-
-        // Explicitly close the database
-        // to make sure the database file is closed
-        // and can be removed on Windows.
-        // If some spawned task tries to use the database afterwards,
-        // it will fail.
-        //
-        // Previously `stop_io()` aborted the tasks without awaiting them
-        // and this resulted in keeping `Context` clones inside
-        // `Future`s that were not dropped. This bug is fixed now,
-        // but explicitly closing the database ensures that file is freed
-        // even if not all `Context` references are dropped.
-        ctx.sql.close().await;
         drop(ctx);
 
         if let Some(cfg) = self.config.get_account(id) {
@@ -498,6 +485,10 @@ impl Config {
 
     /// Read a configuration from the given file into memory.
     pub async fn from_file(file: PathBuf, writable: bool) -> Result<Self> {
+        let dir = file
+            .parent()
+            .context("Cannot get config file directory")?
+            .to_path_buf();
         let mut config = Self::new_nosync(file, writable).await?;
         let bytes = fs::read(&config.file)
             .await
@@ -509,13 +500,9 @@ impl Config {
         // Convert them to relative paths.
         let mut modified = false;
         for account in &mut config.inner.accounts {
-            if account.dir.is_absolute() {
-                if let Some(old_path_parent) = account.dir.parent() {
-                    if let Ok(new_path) = account.dir.strip_prefix(old_path_parent) {
-                        account.dir = new_path.to_path_buf();
-                        modified = true;
-                    }
-                }
+            if let Ok(new_dir) = account.dir.strip_prefix(&dir) {
+                account.dir = new_dir.to_path_buf();
+                modified = true;
             }
         }
         if modified && writable {

src/authres.rs

@@ -14,6 +14,7 @@ use once_cell::sync::Lazy;
 use crate::config::Config;
 use crate::context::Context;
 use crate::headerdef::HeaderDef;
+use crate::tools::time;
 
 /// `authres` is short for the Authentication-Results header, defined in
 /// <https://datatracker.ietf.org/doc/html/rfc8601>, which contains info
@@ -28,28 +29,45 @@ pub(crate) async fn handle_authres(
     context: &Context,
     mail: &ParsedMail<'_>,
     from: &str,
+    message_time: i64,
 ) -> Result<DkimResults> {
     let from_domain = match EmailAddress::new(from) {
         Ok(email) => email.domain,
         Err(e) => {
+            // This email is invalid, but don't return an error, we still want to
+            // add a stub to the database so that it's not downloaded again
             return Err(anyhow::format_err!("invalid email {}: {:#}", from, e));
         }
     };
 
     let authres = parse_authres_headers(&mail.get_headers(), &from_domain);
     update_authservid_candidates(context, &authres).await?;
-    compute_dkim_results(context, authres).await
+    compute_dkim_results(context, authres, &from_domain, message_time).await
 }
 
 #[derive(Debug)]
 pub(crate) struct DkimResults {
     /// Whether DKIM passed for this particular e-mail.
     pub dkim_passed: bool,
+    /// Whether DKIM is known to work for e-mails coming from the sender's domain,
+    /// i.e. whether we expect DKIM to work.
+    pub dkim_should_work: bool,
+    /// Whether changing the public Autocrypt key should be allowed.
+    /// This is false if we expected DKIM to work (dkim_works=true),
+    /// but it failed now (dkim_passed=false).
+    pub allow_keychange: bool,
 }
 
 impl fmt::Display for DkimResults {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "DKIM Results: Passed={}", self.dkim_passed)?;
+        write!(
+            fmt,
+            "DKIM Results: Passed={}, Works={}, Allow_Keychange={}",
+            self.dkim_passed, self.dkim_should_work, self.allow_keychange
+        )?;
+        if !self.allow_keychange {
+            write!(fmt, " KEYCHANGES NOT ALLOWED!!!!")?;
+        }
         Ok(())
     }
 }
@@ -200,6 +218,10 @@ async fn update_authservid_candidates(
         context
             .set_config_internal(Config::AuthservIdCandidates, Some(&new_config))
             .await?;
+        // Updating the authservid candidates may mean that we now consider
+        // emails as "failed" which "passed" previously, so we need to
+        // reset our expectation which DKIMs work.
+        clear_dkim_works(context).await?
     }
     Ok(())
 }
@@ -216,6 +238,8 @@ async fn update_authservid_candidates(
 async fn compute_dkim_results(
     context: &Context,
     mut authres: ParsedAuthresHeaders,
+    from_domain: &str,
+    message_time: i64,
 ) -> Result<DkimResults> {
     let mut dkim_passed = false;
 
@@ -248,7 +272,71 @@ async fn compute_dkim_results(
         }
     }
 
-    Ok(DkimResults { dkim_passed })
+    let last_working_timestamp = dkim_works_timestamp(context, from_domain).await?;
+    let mut dkim_should_work = dkim_should_work(last_working_timestamp)?;
+    if message_time > last_working_timestamp && dkim_passed {
+        set_dkim_works_timestamp(context, from_domain, message_time).await?;
+        dkim_should_work = true;
+    }
+
+    Ok(DkimResults {
+        dkim_passed,
+        dkim_should_work,
+        allow_keychange: dkim_passed || !dkim_should_work,
+    })
+}
+
+/// Whether DKIM in emails from this domain should be considered to work.
+fn dkim_should_work(last_working_timestamp: i64) -> Result<bool> {
+    // When we get an email with valid DKIM-Authentication-Results,
+    // then we assume that DKIM works for 30 days from this time on.
+    let should_work_until = last_working_timestamp + 3600 * 24 * 30;
+
+    let dkim_ever_worked = last_working_timestamp > 0;
+
+    // We're using time() here and not the time when the message
+    // claims to have been sent (passed around as `message_time`)
+    // because otherwise an attacker could just put a time way
+    // in the future into the `Date` header and then we would
+    // assume that DKIM doesn't have to be valid anymore.
+    let dkim_should_work_now = should_work_until > time();
+    Ok(dkim_ever_worked && dkim_should_work_now)
+}
+
+async fn dkim_works_timestamp(context: &Context, from_domain: &str) -> Result<i64, anyhow::Error> {
+    let last_working_timestamp: i64 = context
+        .sql
+        .query_get_value(
+            "SELECT dkim_works FROM sending_domains WHERE domain=?",
+            (from_domain,),
+        )
+        .await?
+        .unwrap_or(0);
+    Ok(last_working_timestamp)
+}
+
+async fn set_dkim_works_timestamp(
+    context: &Context,
+    from_domain: &str,
+    timestamp: i64,
+) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "INSERT INTO sending_domains (domain, dkim_works) VALUES (?,?)
+                ON CONFLICT(domain) DO UPDATE SET dkim_works=excluded.dkim_works",
+            (from_domain, timestamp),
+        )
+        .await?;
+    Ok(())
+}
+
+async fn clear_dkim_works(context: &Context) -> Result<()> {
+    context
+        .sql
+        .execute("DELETE FROM sending_domains", ())
+        .await?;
+    Ok(())
 }
 
 fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str> {
@@ -261,12 +349,19 @@ fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str>
 #[cfg(test)]
 mod tests {
     #![allow(clippy::indexing_slicing)]
+    use std::time::Duration;
+
     use tokio::fs;
     use tokio::io::AsyncReadExt;
 
     use super::*;
+    use crate::aheader::EncryptPreference;
+    use crate::e2ee;
     use crate::mimeparser;
     use crate::peerstate::Peerstate;
+    use crate::securejoin::get_securejoin_qr;
+    use crate::securejoin::join_securejoin;
+    use crate::test_utils;
     use crate::test_utils::TestContext;
     use crate::test_utils::TestContextManager;
     use crate::tools;
@@ -479,8 +574,33 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
                 let mail = mailparse::parse_mail(&bytes)?;
                 let from = &mimeparser::get_from(&mail.headers).unwrap().addr;
 
-                let res = handle_authres(&t, &mail, from).await?;
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                assert!(res.allow_keychange);
+            }
+
+            for entry in &dir {
+                let mut file = fs::File::open(entry.path()).await?;
+                bytes.clear();
+                file.read_to_end(&mut bytes).await.unwrap();
+
+                let mail = mailparse::parse_mail(&bytes)?;
+                let from = &mimeparser::get_from(&mail.headers).unwrap().addr;
+
+                let res = handle_authres(&t, &mail, from, time()).await?;
+                if !res.allow_keychange {
+                    println!(
+                        "!!!!!! FAILURE Receiving {:?}, keychange is not allowed !!!!!!",
+                        entry.path()
+                    );
+                    test_failed = true;
+                }
+
                 let from_domain = EmailAddress::new(from).unwrap().domain;
+                assert_eq!(
+                    res.dkim_should_work,
+                    dkim_should_work(dkim_works_timestamp(&t, &from_domain).await?)?
+                );
+                assert_eq!(res.dkim_passed, res.dkim_should_work);
 
                 // delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail
                 let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de")
@@ -493,8 +613,9 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
                 if res.dkim_passed != expected_result {
                     if authres_parsing_works {
                         println!(
-                            "!!!!!! FAILURE Receiving {:?} wrong result: !!!!!!",
+                            "!!!!!! FAILURE Receiving {:?}, order {:#?} wrong result: !!!!!!",
                             entry.path(),
+                            dir.iter().map(|e| e.file_name()).collect::<Vec<_>>()
                         );
                         test_failed = true;
                     }
@@ -517,7 +638,116 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
         let bytes = b"From: invalid@from.com
 Authentication-Results: dkim=";
         let mail = mailparse::parse_mail(bytes).unwrap();
-        handle_authres(&t, &mail, "invalid@rom.com").await.unwrap();
+        handle_authres(&t, &mail, "invalid@rom.com", time())
+            .await
+            .unwrap();
+    }
+
+    #[ignore = "Disallowing keychanges is disabled for now"]
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_handle_authres_fails() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = tcm.alice().await;
+        let bob = tcm.bob().await;
+
+        // Bob sends Alice a message, so she gets his key
+        tcm.send_recv_accept(&bob, &alice, "Hi").await;
+
+        // We don't need bob anymore, let's make sure it's not accidentally used
+        drop(bob);
+
+        // Assume Alice receives an email from bob@example.net with
+        // correct DKIM -> `set_dkim_works()` was called
+        set_dkim_works_timestamp(&alice, "example.net", time()).await?;
+        // And Alice knows her server's authserv-id
+        alice
+            .set_config(Config::AuthservIdCandidates, Some("example.org"))
+            .await?;
+
+        tcm.section("An attacker, bob2, sends a from-forged email to Alice!");
+
+        // Sleep to make sure key reset is ignored because of DKIM failure
+        // and not because reordering is suspected.
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
+        let bob2 = tcm.unconfigured().await;
+        bob2.configure_addr("bob@example.net").await;
+        e2ee::ensure_secret_key_exists(&bob2).await?;
+
+        let chat = bob2.create_chat(&alice).await;
+        let mut sent = bob2
+            .send_text(chat.id, "Please send me lots of money")
+            .await;
+
+        sent.payload
+            .insert_str(0, "Authentication-Results: example.org; dkim=fail\n");
+
+        let received = alice.recv_msg(&sent).await;
+
+        // Assert that the error tells the user about the problem
+        assert!(received.error.unwrap().contains("DKIM failed"));
+
+        let bob_state = Peerstate::from_addr(&alice, "bob@example.net")
+            .await?
+            .unwrap();
+
+        // Encryption preference is still mutual.
+        assert_eq!(bob_state.prefer_encrypt, EncryptPreference::Mutual);
+
+        // Also check that the keypair was not changed
+        assert_eq!(
+            bob_state.public_key.unwrap(),
+            test_utils::bob_keypair().public
+        );
+
+        // Since Alice didn't change the key, Bob can't read her message
+        let received = tcm
+            .try_send_recv(&alice, &bob2, "My credit card number is 1234")
+            .await;
+        assert!(!received.text.contains("1234"));
+        assert!(received.error.is_some());
+
+        tcm.section("Turns out bob2 wasn't an attacker at all, Bob just has a new phone and DKIM just stopped working.");
+        tcm.section("To fix the key problems, Bob scans Alice's QR code.");
+
+        let qr = get_securejoin_qr(&alice.ctx, None).await.unwrap();
+        join_securejoin(&bob2.ctx, &qr).await.unwrap();
+
+        loop {
+            if let Some(mut sent) = bob2.pop_sent_msg_opt(Duration::ZERO).await {
+                sent.payload
+                    .insert_str(0, "Authentication-Results: example.org; dkim=fail\n");
+                alice.recv_msg(&sent).await;
+            } else if let Some(sent) = alice.pop_sent_msg_opt(Duration::ZERO).await {
+                bob2.recv_msg(&sent).await;
+            } else {
+                break;
+            }
+        }
+
+        // Unfortunately, securejoin currently doesn't work with authres-checking,
+        // so these checks would fail:
+
+        // let contact_bob = alice.add_or_lookup_contact(&bob2).await;
+        // assert_eq!(
+        //     contact_bob.is_verified(&alice.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // let contact_alice = bob2.add_or_lookup_contact(&alice).await;
+        // assert_eq!(
+        //     contact_alice.is_verified(&bob2.ctx).await.unwrap(),
+        //     VerifiedStatus::BidirectVerified
+        // );
+
+        // // Bob can read Alice's messages again
+        // let received = tcm
+        //     .try_send_recv(&alice, &bob2, "Can you read this again?")
+        //     .await;
+        // assert_eq!(received.text.as_ref().unwrap(), "Can you read this again?");
+        // assert!(received.error.is_none());
+
+        Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -566,7 +796,10 @@ Authentication-Results: dkim=";
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;
 
-        // Bob knows his server's authserv-id
+        // Assume Bob received an email from something@example.net with
+        // correct DKIM -> `set_dkim_works()` was called
+        set_dkim_works_timestamp(&bob, "example.org", time()).await?;
+        // And Bob knows his server's authserv-id
         bob.set_config(Config::AuthservIdCandidates, Some("example.net"))
             .await?;
 
@@ -588,13 +821,15 @@ Authentication-Results: dkim=";
             .insert_str(0, "Authentication-Results: example.net; dkim=fail\n");
         let rcvd = bob.recv_msg(&sent).await;
 
+        // Disallowing keychanges is disabled for now:
+        // assert!(rcvd.error.unwrap().contains("DKIM failed"));
         // The message info should contain a warning:
         assert!(rcvd
             .id
             .get_info(&bob)
             .await
             .unwrap()
-            .contains("DKIM Results: Passed=false"));
+            .contains("KEYCHANGES NOT ALLOWED"));
 
         Ok(())
     }

src/blob.rs

@@ -3,7 +3,7 @@
 use core::cmp::max;
 use std::ffi::OsStr;
 use std::fmt;
-use std::io::{Cursor, Seek};
+use std::io::Cursor;
 use std::iter::FusedIterator;
 use std::mem;
 use std::path::{Path, PathBuf};
@@ -12,7 +12,6 @@ use anyhow::{format_err, Context as _, Result};
 use base64::Engine as _;
 use futures::StreamExt;
 use image::codecs::jpeg::JpegEncoder;
-use image::ImageReader;
 use image::{DynamicImage, GenericImage, GenericImageView, ImageFormat, Pixel, Rgba};
 use num_traits::FromPrimitive;
 use tokio::io::AsyncWriteExt;
@@ -427,25 +426,9 @@ impl<'a> BlobObject<'a> {
         let mut no_exif = false;
         let no_exif_ref = &mut no_exif;
         let res = tokio::task::block_in_place(move || {
-            let mut file = std::fs::File::open(self.to_abs_path())?;
-            let (nr_bytes, exif) = image_metadata(&file)?;
+            let (nr_bytes, exif) = self.metadata()?;
             *no_exif_ref = exif.is_none();
-            // It's strange that BufReader modifies a file position while it takes a non-mut
-            // reference. Ok, just rewind it.
-            file.rewind()?;
-            let imgreader = ImageReader::new(std::io::BufReader::new(&file)).with_guessed_format();
-            let imgreader = match imgreader {
-                Ok(ir) => ir,
-                _ => {
-                    file.rewind()?;
-                    ImageReader::with_format(
-                        std::io::BufReader::new(&file),
-                        ImageFormat::from_path(&blob_abs)?,
-                    )
-                }
-            };
-            let fmt = imgreader.format().context("No format??")?;
-            let mut img = imgreader.decode().context("image decode failure")?;
+            let mut img = image::open(&blob_abs).context("image decode failure")?;
             let orientation = exif.as_ref().map(|exif| exif_orientation(exif, context));
             let mut encoded = Vec::new();
             let mut changed_name = None;
@@ -474,9 +457,10 @@ impl<'a> BlobObject<'a> {
             let exceeds_max_bytes = nr_bytes > max_bytes as u64;
 
             let jpeg_quality = 75;
+            let fmt = ImageFormat::from_path(&blob_abs);
             let ofmt = match fmt {
-                ImageFormat::Png if !exceeds_max_bytes => ImageOutputFormat::Png,
-                ImageFormat::Jpeg => {
+                Ok(ImageFormat::Png) if !exceeds_max_bytes => ImageOutputFormat::Png,
+                Ok(ImageFormat::Jpeg) => {
                     add_white_bg = false;
                     ImageOutputFormat::Jpeg {
                         quality: jpeg_quality,
@@ -513,7 +497,7 @@ impl<'a> BlobObject<'a> {
                     img_wh = max(img.width(), img.height());
                     // PNGs and WebPs may be huge because of animation, which is lost by the `image`
                     // crate when recoding, so don't scale them down.
-                    if matches!(fmt, ImageFormat::Jpeg) || !encoded.is_empty() {
+                    if matches!(fmt, Ok(ImageFormat::Jpeg)) || !encoded.is_empty() {
                         img_wh = img_wh * 2 / 3;
                     }
                 }
@@ -554,7 +538,7 @@ impl<'a> BlobObject<'a> {
 
             if do_scale || exif.is_some() {
                 // The file format is JPEG/PNG now, we may have to change the file extension
-                if !matches!(fmt, ImageFormat::Jpeg)
+                if !matches!(fmt, Ok(ImageFormat::Jpeg))
                     && matches!(ofmt, ImageOutputFormat::Jpeg { .. })
                 {
                     blob_abs = blob_abs.with_extension("jpg");
@@ -591,14 +575,15 @@ impl<'a> BlobObject<'a> {
             }
         }
     }
-}
 
-/// Returns image file size and Exif.
-pub fn image_metadata(file: &std::fs::File) -> Result<(u64, Option<exif::Exif>)> {
-    let len = file.metadata()?.len();
-    let mut bufreader = std::io::BufReader::new(file);
-    let exif = exif::Reader::new().read_from_container(&mut bufreader).ok();
-    Ok((len, exif))
+    /// Returns image file size and Exif.
+    pub fn metadata(&self) -> Result<(u64, Option<exif::Exif>)> {
+        let file = std::fs::File::open(self.to_abs_path())?;
+        let len = file.metadata()?.len();
+        let mut bufreader = std::io::BufReader::new(&file);
+        let exif = exif::Reader::new().read_from_container(&mut bufreader).ok();
+        Ok((len, exif))
+    }
 }
 
 fn exif_orientation(exif: &exif::Exif, context: &Context) -> i32 {
@@ -713,10 +698,7 @@ fn encode_img(
         ImageOutputFormat::Png => img.write_to(&mut buf, ImageFormat::Png)?,
         ImageOutputFormat::Jpeg { quality } => {
             let encoder = JpegEncoder::new_with_quality(&mut buf, quality);
-            // Convert image into RGB8 to avoid the error
-            // "The encoder or decoder for Jpeg does not support the color type Rgba8"
-            // (<https://github.com/image-rs/image/issues/2211>).
-            img.clone().into_rgb8().write_with_encoder(encoder)?;
+            img.write_with_encoder(encoder)?;
         }
     }
     Ok(())
@@ -1101,34 +1083,32 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_recode_image_1() {
         let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1000,
-            original_height: 1000,
-            compressed_width: 1000,
-            compressed_height: 1000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1000,
+            1000,
+            0,
+            1000,
+            1000,
+        )
         .await
         .unwrap();
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1000,
-            original_height: 1000,
-            compressed_width: 1000,
-            compressed_height: 1000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1000,
+            1000,
+            0,
+            1000,
+            1000,
+        )
         .await
         .unwrap();
     }
@@ -1137,20 +1117,18 @@ mod tests {
     async fn test_recode_image_2() {
         // The "-rotated" files are rotated by 270 degrees using the Exif metadata
         let bytes = include_bytes!("../test-data/image/rectangle2000x1800-rotated.jpg");
-        let img_rotated = SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        let img_rotated = send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 2000,
-            original_height: 1800,
-            orientation: 270,
-            compressed_width: 1800,
-            compressed_height: 2000,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            2000,
+            1800,
+            270,
+            1800,
+            2000,
+        )
         .await
         .unwrap();
         assert_correct_rotation(&img_rotated);
@@ -1159,18 +1137,18 @@ mod tests {
         img_rotated.write_to(&mut buf, ImageFormat::Jpeg).unwrap();
         let bytes = buf.into_inner();
 
-        let img_rotated = SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
-            bytes: &bytes,
-            extension: "jpg",
-            original_width: 1800,
-            original_height: 2000,
-            compressed_width: 1800,
-            compressed_height: 2000,
-            ..Default::default()
-        }
-        .test()
+        let img_rotated = send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
+            &bytes,
+            "jpg",
+            false, // no Exif
+            1800,
+            2000,
+            0,
+            1800,
+            2000,
+        )
         .await
         .unwrap();
         assert_correct_rotation(&img_rotated);
@@ -1180,102 +1158,49 @@ mod tests {
     async fn test_recode_image_balanced_png() {
         let bytes = include_bytes!("../test-data/image/screenshot.png");
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
         .await
         .unwrap();
 
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("1"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::WORSE_IMAGE_SIZE,
-            compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
-        .await
-        .unwrap();
-
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::File,
-            media_quality_config: "1",
-            bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
-        .await
-        .unwrap();
-
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::File,
-            media_quality_config: "1",
-            bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            set_draft: true,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            constants::WORSE_IMAGE_SIZE,
+            constants::WORSE_IMAGE_SIZE * 1080 / 1920,
+        )
         .await
         .unwrap();
 
         // This will be sent as Image, see [`BlobObject::maybe_sticker`] for explanation.
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Sticker,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Sticker,
+            Some("0"),
             bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: 1920,
-            compressed_height: 1080,
-            ..Default::default()
-        }
-        .test()
-        .await
-        .unwrap();
-    }
-
-    /// Tests that RGBA PNG can be recoded into JPEG
-    /// by dropping alpha channel.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_recode_image_rgba_png_to_jpeg() {
-        let bytes = include_bytes!("../test-data/image/screenshot-rgba.png");
-
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "1",
-            bytes,
-            extension: "png",
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::WORSE_IMAGE_SIZE,
-            compressed_height: constants::WORSE_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
         .await
         .unwrap();
     }
@@ -1283,19 +1208,18 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_recode_image_huge_jpg() {
         let bytes = include_bytes!("../test-data/image/screenshot.jpg");
-        SendImageCheckMediaquality {
-            viewtype: Viewtype::Image,
-            media_quality_config: "0",
+        send_image_check_mediaquality(
+            Viewtype::Image,
+            Some("0"),
             bytes,
-            extension: "jpg",
-            has_exif: true,
-            original_width: 1920,
-            original_height: 1080,
-            compressed_width: constants::BALANCED_IMAGE_SIZE,
-            compressed_height: constants::BALANCED_IMAGE_SIZE * 1080 / 1920,
-            ..Default::default()
-        }
-        .test()
+            "jpg",
+            true, // has Exif
+            1920,
+            1080,
+            0,
+            constants::BALANCED_IMAGE_SIZE,
+            constants::BALANCED_IMAGE_SIZE * 1080 / 1920,
+        )
         .await
         .unwrap();
     }
@@ -1317,128 +1241,65 @@ mod tests {
         assert_eq!(luma, 0);
     }
 
-    #[derive(Default)]
-    struct SendImageCheckMediaquality<'a> {
-        pub(crate) viewtype: Viewtype,
-        pub(crate) media_quality_config: &'a str,
-        pub(crate) bytes: &'a [u8],
-        pub(crate) extension: &'a str,
-        pub(crate) has_exif: bool,
-        pub(crate) original_width: u32,
-        pub(crate) original_height: u32,
-        pub(crate) orientation: i32,
-        pub(crate) compressed_width: u32,
-        pub(crate) compressed_height: u32,
-        pub(crate) set_draft: bool,
-    }
-
-    impl SendImageCheckMediaquality<'_> {
-        pub(crate) async fn test(self) -> anyhow::Result<DynamicImage> {
-            let viewtype = self.viewtype;
-            let media_quality_config = self.media_quality_config;
-            let bytes = self.bytes;
-            let extension = self.extension;
-            let has_exif = self.has_exif;
-            let original_width = self.original_width;
-            let original_height = self.original_height;
-            let orientation = self.orientation;
-            let compressed_width = self.compressed_width;
-            let compressed_height = self.compressed_height;
-            let set_draft = self.set_draft;
-
-            let alice = TestContext::new_alice().await;
-            let bob = TestContext::new_bob().await;
-            alice
-                .set_config(Config::MediaQuality, Some(media_quality_config))
-                .await?;
-            let file = alice.get_blobdir().join("file").with_extension(extension);
-
-            fs::write(&file, &bytes)
-                .await
-                .context("failed to write file")?;
-            check_image_size(&file, original_width, original_height);
-
-            let (_, exif) = image_metadata(&std::fs::File::open(&file)?)?;
-            if has_exif {
-                let exif = exif.unwrap();
-                assert_eq!(exif_orientation(&exif, &alice), orientation);
-            } else {
-                assert!(exif.is_none());
-            }
-
-            let mut msg = Message::new(viewtype);
-            msg.set_file(file.to_str().unwrap(), None);
-            let chat = alice.create_chat(&bob).await;
-            if set_draft {
-                chat.id.set_draft(&alice, Some(&mut msg)).await.unwrap();
-                msg = chat.id.get_draft(&alice).await.unwrap().unwrap();
-                assert_eq!(msg.get_viewtype(), Viewtype::File);
-            }
-            let sent = alice.send_msg(chat.id, &mut msg).await;
-            let alice_msg = alice.get_last_msg().await;
-            assert_eq!(alice_msg.get_width() as u32, compressed_width);
-            assert_eq!(alice_msg.get_height() as u32, compressed_height);
-            let file_saved = alice
-                .get_blobdir()
-                .join("saved-".to_string() + &alice_msg.get_filename().unwrap());
-            alice_msg.save_file(&alice, &file_saved).await?;
-            check_image_size(file_saved, compressed_width, compressed_height);
-
-            let bob_msg = bob.recv_msg(&sent).await;
-            assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
-            assert_eq!(bob_msg.get_width() as u32, compressed_width);
-            assert_eq!(bob_msg.get_height() as u32, compressed_height);
-            let file_saved = bob
-                .get_blobdir()
-                .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
-            bob_msg.save_file(&bob, &file_saved).await?;
-            if viewtype == Viewtype::File {
-                assert_eq!(file_saved.extension().unwrap(), extension);
-                let bytes1 = fs::read(&file_saved).await?;
-                assert_eq!(&bytes1, bytes);
-            }
-
-            let (_, exif) = image_metadata(&std::fs::File::open(&file_saved)?)?;
-            assert!(exif.is_none());
-
-            let img = check_image_size(file_saved, compressed_width, compressed_height);
-            Ok(img)
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_big_gif_as_image() -> Result<()> {
-        let bytes = include_bytes!("../test-data/image/screenshot.gif");
-        let (width, height) = (1920u32, 1080u32);
+    #[allow(clippy::too_many_arguments)]
+    async fn send_image_check_mediaquality(
+        viewtype: Viewtype,
+        media_quality_config: Option<&str>,
+        bytes: &[u8],
+        extension: &str,
+        has_exif: bool,
+        original_width: u32,
+        original_height: u32,
+        orientation: i32,
+        compressed_width: u32,
+        compressed_height: u32,
+    ) -> anyhow::Result<DynamicImage> {
         let alice = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
         alice
-            .set_config(
-                Config::MediaQuality,
-                Some(&(MediaQuality::Worse as i32).to_string()),
-            )
+            .set_config(Config::MediaQuality, media_quality_config)
             .await?;
-        let file = alice.get_blobdir().join("file").with_extension("gif");
+        let file = alice.get_blobdir().join("file").with_extension(extension);
+
         fs::write(&file, &bytes)
             .await
             .context("failed to write file")?;
-        let mut msg = Message::new(Viewtype::Image);
+        check_image_size(&file, original_width, original_height);
+
+        let blob = BlobObject::new_from_path(&alice, &file).await?;
+        let (_, exif) = blob.metadata()?;
+        if has_exif {
+            let exif = exif.unwrap();
+            assert_eq!(exif_orientation(&exif, &alice), orientation);
+        } else {
+            assert!(exif.is_none());
+        }
+
+        let mut msg = Message::new(viewtype);
         msg.set_file(file.to_str().unwrap(), None);
         let chat = alice.create_chat(&bob).await;
         let sent = alice.send_msg(chat.id, &mut msg).await;
+        let alice_msg = alice.get_last_msg().await;
+        assert_eq!(alice_msg.get_width() as u32, compressed_width);
+        assert_eq!(alice_msg.get_height() as u32, compressed_height);
+        check_image_size(
+            alice_msg.get_file(&alice).unwrap(),
+            compressed_width,
+            compressed_height,
+        );
+
         let bob_msg = bob.recv_msg(&sent).await;
-        // DC must detect the image as GIF and send it w/o reencoding.
-        assert_eq!(bob_msg.get_viewtype(), Viewtype::Gif);
-        assert_eq!(bob_msg.get_width() as u32, width);
-        assert_eq!(bob_msg.get_height() as u32, height);
-        let file_saved = bob
-            .get_blobdir()
-            .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
-        bob_msg.save_file(&bob, &file_saved).await?;
-        let (file_size, _) = image_metadata(&std::fs::File::open(&file_saved)?)?;
-        assert_eq!(file_size, bytes.len() as u64);
-        check_image_size(file_saved, width, height);
-        Ok(())
+        assert_eq!(bob_msg.get_viewtype(), Viewtype::Image);
+        assert_eq!(bob_msg.get_width() as u32, compressed_width);
+        assert_eq!(bob_msg.get_height() as u32, compressed_height);
+        let file = bob_msg.get_file(&bob).unwrap();
+
+        let blob = BlobObject::new_from_path(&bob, &file).await?;
+        let (_, exif) = blob.metadata()?;
+        assert!(exif.is_none());
+
+        let img = check_image_size(file, compressed_width, compressed_height);
+        Ok(img)
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]