Update provider/data.rs from the deltachat-provider-db repo

.github/workflows/ci.yml

@@ -1,11 +1,5 @@
 name: Rust CI
 
-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   pull_request:
   push:
@@ -20,11 +14,11 @@ jobs:
     name: Rustfmt and Clippy
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.68.0
+      RUSTUP_TOOLCHAIN: 1.67.1
     steps:
       - uses: actions/checkout@v3
       - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
+        run: rustup toolchain install $RUSTUP_TOOLCHAIN --component rustfmt --component clippy
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v2
       - name: Run rustfmt
@@ -32,25 +26,6 @@ jobs:
       - name: Run clippy
         run: scripts/clippy.sh
 
-  cargo_deny:
-    name: cargo deny
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: EmbarkStudios/cargo-deny-action@v1
-        with:
-          arguments: --all-features --workspace
-          command: check
-          command-arguments: "-Dwarnings"
-
-  provider_database:
-    name: Check provider database
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check provider database
-        run: scripts/update-provider-database.sh
-
   docs:
     name: Rust doc comments
     runs-on: ubuntu-latest
@@ -72,29 +47,26 @@ jobs:
         include:
           # Currently used Rust version.
           - os: ubuntu-latest
-            rust: 1.68.0
+            rust: 1.64.0
             python: 3.9
           - os: windows-latest
-            rust: 1.68.0
+            rust: 1.64.0
             python: false # Python bindings compilation on Windows is not supported.
-          - os: macos-latest
-            rust: 1.68.0
-            python: 3.9
 
-          # Minimum Supported Rust Version = 1.64.0
+          # Minimum Supported Rust Version = 1.63.0
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.64.0
+            rust: 1.63.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@master
 
       - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
+        run: rustup toolchain install ${{ matrix.rust }}
       - run: rustup override set ${{ matrix.rust }}
 
       - name: Cache rust cargo artifacts

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

@@ -1,106 +0,0 @@
-# Manually triggered action to build deltachat-rpc-server binaries.
-
-name: Build deltachat-rpc-server binaries
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-jobs:
-  # Build a version statically linked against musl libc
-  # to avoid problems with glibc version incompatibility.
-  build_linux:
-    name: Cross-compile deltachat-rpc-server for x86_64, aarch64 and armv7 Linux
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build
-        run: sh scripts/zig-rpc-server.sh
-
-      - name: Upload x86_64 binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-x86_64
-          path: target/x86_64-unknown-linux-musl/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload aarch64 binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-aarch64
-          path: target/aarch64-unknown-linux-musl/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload armv7 binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-armv7
-          path: target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_windows:
-    name: Build deltachat-rpc-server for Windows
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: windows-latest
-            artifact: win32.exe
-            path: deltachat-rpc-server.exe
-            target: i686-pc-windows-msvc
-
-          - os: windows-latest
-            artifact: win64.exe
-            path: deltachat-rpc-server.exe
-            target: x86_64-pc-windows-msvc
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup rust target
-        run: rustup target add ${{ matrix.target }}
-
-      - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.target }} --features vendored
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-${{ matrix.artifact }}
-          path: target/${{ matrix.target}}/release/${{ matrix.path }}
-          if-no-files-found: error
-
-  publish:
-    name: Upload binaries to the release
-    needs: ["build_linux", "build_windows"]
-    permissions:
-      contents: write
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Download built binaries
-        uses: "actions/download-artifact@v3"
-
-      - name: Compose dist/ directory
-        run: |
-          mkdir dist
-          for x in x86_64 aarch64 armv7 win32.exe win64.exe; do
-            mv "deltachat-rpc-server-$x"/* "dist/deltachat-rpc-server-$x"
-          done
-
-      - name: List downloaded artifacts
-        run: ls -l dist/
-
-      - name: Upload binaries to the GitHub release
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        run: |
-          gh release upload ${{ github.ref_name }} \
-            --repo ${{ github.repository }} \
-            dist/*

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

@@ -22,7 +22,7 @@ jobs:
         id: tag
         uses: dawidd6/action-get-tag@v1
         continue-on-error: true
-      - name: Get Pull Request ID
+      - name: Get Pullrequest ID
         id: prepare
         run: |
           tag=${{ steps.tag.outputs.tag }}

.github/workflows/node-delete-preview.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get Pull Request ID
+      - name: Get Pullrequest ID
         id: getid
         run: |
           export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)

.github/workflows/node-package.yml

@@ -78,7 +78,7 @@ jobs:
         id: tag
         uses: dawidd6/action-get-tag@v1
         continue-on-error: true
-      - name: Get Pull Request ID
+      - name: Get Pullrequest ID
         id: prepare
         run: |
           tag=${{ steps.tag.outputs.tag }}

.github/workflows/node-tests.yml

@@ -1,16 +1,11 @@
 name: "node.js tests"
-
-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   pull_request:
   push:
     branches:
       - master
+      - staging
+      - trying
 
 jobs:
   tests:

.github/workflows/upload-docs.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build the documentation with cargo
         run: |
-          cargo doc --package deltachat --no-deps --document-private-items
+          cargo doc --package deltachat --no-deps
       - name: Upload to rs.delta.chat
         uses: up9cloud/action-rsync@v1.3
         env:

CHANGELOG.md

@@ -1,106 +1,6 @@
 # Changelog
 
-## [1.112.7] - 2023-04-17
-
-### Fixes
-
-- Updated `async-imap` to v0.8.0 to fix erroneous EOF detection in long IMAP responses.
-
-## [1.112.6] - 2023-04-04
-
-### Changes
-
-- Add a device message after backup transfer #4301
-
-### Fixed
-
-- Updated `iroh` from 0.4.0 to 0.4.1 to fix transfer of large accounts with many blob files.
-
-## [1.112.5] - 2023-04-02
-
-### Fixes
-
-- Run SQL database migrations after receiving a backup from the network. #4287
-
-## [1.112.4] - 2023-03-31
-
-### Fixes
-- Fix call to `auditwheel` in `scripts/run_all.sh`.
-
-## [1.112.3] - 2023-03-30
-
-### Fixes
-- `transfer::get_backup` now frees ongoing process when cancelled. #4249
-
-## [1.112.2] - 2023-03-30
-
-### Changes
-- Update iroh, remove `default-net` from `[patch.crates-io]` section.
-- transfer backup: Connect to multiple provider addresses concurrently.  This should speed up connection time significantly on the getter side.  #4240
-- Make sure BackupProvider is cancelled on drop (or `dc_backup_provider_unref`).  The BackupProvider will now always finish with an IMEX event of 1000 or 0, previously it would sometimes finished with 1000 (success) when it really was 0 (failure). #4242
-
-### Fixes
-- Do not return media from trashed messages in the "All media" view. #4247
-
-## [1.112.1] - 2023-03-27
-
-### Changes
-- Add support for `--version` argument to `deltachat-rpc-server`. #4224
-  It can be used to check the installed version without starting the server.
-
-### Fixes
-- deltachat-rpc-client: fix bug in `Chat.send_message()`: invalid `MessageData` field `quotedMsg` instead of `quotedMsgId`
-- `receive_imf`: Mark special messages as seen. Exactly: delivery reports, webxdc status updates. #4230
-
-
-## [1.112.0] - 2023-03-23
-
-### Changes
-- Increase MSRV to 1.64. #4167
-- Core takes care of stopping and re-starting IO itself where needed,
-  e.g. during backup creation.
-  It is no longer needed to call `dc_stop_io()`.
-  `dc_start_io()` can now be called at any time without harm. #4138
-- Pick up system's light/dark mode in generated message HTML. #4150
-- More accurate `maybe_add_bcc_self` device message text. #4175
-- "Full message view" not needed because of footers that go to contact status. #4151
-- Support non-persistent configuration with `DELTACHAT_*` env. #4154
-- Print deltachat-repl errors with causes. #4166
-
-### Fixes
-- Fix segmentation fault if `dc_context_unref()` is called during
-  background process spawned by `dc_configure()` or `dc_imex()`
-  or `dc_jsonrpc_instance_t` is unreferenced
-  during handling the JSON-RPC request. #4153
-- Delete expired messages using multiple SQL requests. #4158
-- Do not emit "Failed to run incremental vacuum" warnings on success. #4160
-- Ability to send backup over network and QR code to setup second device #4007
-- Disable buffering during STARTTLS setup. #4190
-- Add `DC_EVENT_IMAP_INBOX_IDLE` event to wait until the account
-  is ready for testing.
-  It is used to fix race condition between fetching
-  existing messages and starting the test. #4208
-
-
-## [1.111.0] - 2023-03-05
-
-### Changes
-- Make smeared timestamp generation non-async. #4075
-- Set minimum TLS version to 1.2. #4096
-- Run `cargo-deny` in CI. #4101
-- Check provider database with CI. #4099 
-- Switch to DEFERRED transactions #4100
-
-### Fixes
-- Do not block async task executor while decrypting the messages. #4079
-- Housekeeping: delete the blobs backup dir #4123
-
-### API-Changes
-- jsonrpc: add more advanced API to send a message. #4097
-- jsonrpc: add get webxdc blob API `getWebxdcBlob` #4070
-
-
-## 1.110.0
+## Unreleased
 
 ### Changes
 - use transaction in `Contact::add_or_lookup()` #4059
@@ -109,17 +9,12 @@
   This speeds up tests by 28%, real usage will have lower speedup. #4065
 - Use transaction in `update_blocked_mailinglist_contacts`. #4058
 - Remove `Sql.get_conn()` interface in favor of `.call()` and `.transaction()`. #4055
-- Updated provider database.
-- Disable DKIM-Checks again #4076
-- Switch from "X.Y.Z" and "py-X.Y.Z" to "vX.Y.Z" tags. #4089
-- mimeparser: handle headers from the signed part of unencrypted signed message #4013
 
 ### Fixes
 - Start SQL transactions with IMMEDIATE behaviour rather than default DEFERRED one. #4063
 - Fix a problem with Gmail where (auto-)deleted messages would get archived instead of deleted.
   Move them to the Trash folder for Gmail which auto-deletes trashed messages in 30 days #3972
 - Clear config cache after backup import. This bug sometimes resulted in the import to seemingly work at first. #4067
-- Update timestamps in `param` columns with transactions. #4083
 
 ### API-Changes
 
@@ -153,7 +48,6 @@
 - Prefer TLS over STARTTLS during autoconfiguration #4021
 - Use SOCKS5 configuration for HTTP requests #4017
 - Show non-deltachat emails by default for new installations #4019
-- Re-enabled SMTP pipelining after disabling it in #4006
 
 ### Fixes
 - Fix Securejoin for multiple devices on a joining side #3982
@@ -185,7 +79,7 @@
 
 ### Fixes
 - Securejoin: Fix adding and handling Autocrypt-Gossip headers #3914
-- fix verifier-by addr was empty string instead of None #3961
+- fix verifier-by addr was empty string intead of None #3961
 - Emit DC_EVENT_MSGS_CHANGED for DC_CHAT_ID_ARCHIVED_LINK when the number of archived chats with
   unread messages increases #3959
 - Fix Peerstate comparison #3962
@@ -286,7 +180,7 @@
 - jsonrpc: Add async Python client #3734
 
 ### Fixes
-- Make sure malformed messages will never block receiving further messages anymore #3771
+- Make sure malformed messsages will never block receiving further messages anymore #3771
 - strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
 - Assume all Thunderbird users prefer encryption #3774
 - refactor peerstate handling to ensure no duplicate peerstates #3776
@@ -438,7 +332,7 @@
   - `importBackup()`
   - `getMessageHtml()` #3671
   - `miscGetStickerFolder` and `miscGetStickers` #3672
-- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now preferred way of using the message list.
+- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now prefered way of using the message list.
 - jsonrpc: add type: #3641, #3645
   - `MessageSearchResult`
   - `Location`
@@ -464,7 +358,7 @@
 - jsonrpc js client:
   - Change package name from `deltachat-jsonrpc-client` to `@deltachat/jsonrpc-client`
   - remove relative file dependency to it from `deltachat-node` (because it did not work anyway and broke the nix build of desktop)
-  - ci: add github ci action to upload it to our download server automatically on release
+  - ci: add github ci action to upload it to our download server automaticaly on realease
 
 ## 1.95.0
 
@@ -541,7 +435,7 @@
 - Auto accept contact requests if `Config::Bot` is set for a client #3567 
 - Don't prepend the subject to chat messages in mailinglists
 - fix `set_core_version.py` script to also update version in `deltachat-jsonrpc/typescript/package.json` #3585
-- Reject webxdc-updates from contacts who are not group members #3568
+- Reject webxcd-updates from contacts who are not group members #3568
 
 
 ## 1.93.0
@@ -764,7 +658,7 @@
 
 ### Fixes
 - node: throw error when getting context with an invalid account id
-- node: throw error when instantiating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
+- node: throw error when instanciating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
 - use same contact-color if email address differ only in upper-/lowercase #3327
 - repair encrypted mails "mixed up" by Google Workspace "Append footer" function #3315
 
@@ -852,7 +746,7 @@
 - hopefully fix a bug where outgoing messages appear twice with Amazon SES #3077
 - do not delete messages without Message-IDs as duplicates #3095
 - assign replies from a different email address to the correct chat #3119
-- assign outgoing private replies to the correct chat #3177
+- assing outgoing private replies to the correct chat #3177
 - start ephemeral timer when seen status is synchronized via IMAP #3122
 - do not create empty contact requests with "setup changed" messages;
   instead, send a "setup changed" message into all chats we share with the peer #3187
@@ -905,7 +799,7 @@
 - don't watch Sent folder by default #3025
 - use webxdc app name in chatlist/quotes/replies etc. #3027
 - make it possible to cancel message sending by removing the message #3034,
-  this was previously removed in 1.71.0 #2939
+  this was previosuly removed in 1.71.0 #2939
 - synchronize Seen flags only on watched folders to speed up
   folder scanning #3041
 - remove direct dependency on `byteorder` crate #3031
@@ -2127,7 +2021,7 @@
 - #1043 avoid potential crashes in malformed From/Chat-Disposition... headers  
 
 - #1045 #1041 #1038 #1035 #1034 #1029 #1025 various cleanups and doc
-  improvements
+  improvments 
 
 ## 1.0.0-beta.16
 
@@ -2206,7 +2100,7 @@
 - trigger reconnect more often on imap error states.  Should fix an 
   issue observed when trying to empty a folder.  @hpk42
 
-- un-split qr tests: we fixed qr-securejoin protocol flakiness 
+- un-split qr tests: we fixed qr-securejoin protocol flakyness 
   last weeks. @hpk42
 
 ## 1.0.0-beta.10
@@ -2244,7 +2138,7 @@
 
 - fix moving self-sent messages, thanks @r10s, @flub, @hpk42
 
-- fix flakiness/sometimes-failing verified/join-protocols, 
+- fix flakyness/sometimes-failing verified/join-protocols, 
   thanks @flub, @r10s, @hpk42
 
 - fix reply-to-encrypted message to keep encryption 
@@ -2263,7 +2157,7 @@
 
 - fixes imap-protocol parsing bugs that lead to infinitely
   repeated crashing while trying to receive messages with
-  a subject that contained non-utf8. thanks @link2xt
+  a subjec that contained non-utf8. thanks @link2xt
 
 - fixed logic to find encryption subkey -- previously 
   delta chat would use the primary key for encryption
@@ -2371,13 +2265,3 @@
 For a full list of changes, please see our closed Pull Requests: 
 
 https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
-
-[1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0
-[1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0
-[1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1
-[1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2
-[1.112.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.2...v1.112.3
-[1.112.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.3...v1.112.4
-[1.112.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.4...v1.112.5
-[1.112.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.5...v1.112.6
-[1.112.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.6...v1.112.7

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.112.7"
+version = "1.109.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.64"
+rust-version = "1.63"
 
 [profile.dev]
 debug = 0
@@ -17,16 +17,11 @@ opt-level = 0
 # This does not apply to crates in the workspace.
 # <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
 [profile.dev.package."*"]
-opt-level = "z"
+opt-level = 3
 
 [profile.release]
 lto = true
 panic = 'abort'
-opt-level = "z"
-
-[patch.crates-io]
-quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
-quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
@@ -35,10 +30,10 @@ ratelimit = { path = "./deltachat-ratelimit" }
 
 anyhow = "1"
 async-channel = "1.8.0"
-async-imap = { version = "0.8.0", 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.11", default-features = false, features = ["deflate", "fs"] }
+async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
+async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.8", default-features = false, features = ["runtime-tokio"] }
+async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
 backtrace = "0.3"
 base64 = "0.21"
 bitflags = "1.3"
@@ -52,11 +47,11 @@ futures-lite = "1.12.0"
 hex = "0.4.0"
 humansize = "2"
 image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh = { version = "0.4.1", default-features = false }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
 mailparse = "0.14"
+native-tls = "0.2"
 num_cpus = "1.15"
 num-derive = "0.3"
 num-traits = "0.2"
@@ -83,11 +78,10 @@ strum_macros = "0.24"
 tagger = "4.3.4"
 textwrap = "0.16.0"
 thiserror = "1"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.11", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = "0.7.7"
+tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.7"
 trust-dns-resolver = "0.22"
 url = "2"
@@ -101,7 +95,6 @@ log = "0.4"
 pretty_env_logger = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-testdir = "0.7.2"
 tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 
 [workspace]

README.md

@@ -19,7 +19,7 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ RUST_LOG=deltachat_repl=info cargo run -p deltachat-repl -- ~/deltachat-db
+$ RUST_LOG=repl=info cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
@@ -113,7 +113,7 @@ $ cargo build -p deltachat_ffi --release
 
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
-- `RUST_LOG=deltachat_repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.
 
 ### Expensive tests
@@ -170,9 +170,7 @@ Language bindings are available for:
   - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
   - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
-- **Go**
-  - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]
-  - over cffi[^1]: \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
 - **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)
 

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.112.7"
+version = "1.109.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -17,17 +17,17 @@ crate-type = ["cdylib", "staticlib"]
 deltachat = { path = "../", default-features = false }
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
 libc = "0.2"
-human-panic = { version = "1", default-features = false }
+human-panic = "1"
 num-traits = "0.2"
 serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
-rand = "0.8"
+rand = "0.7"
 once_cell = "1.17.0"
 
 [features]
 default = ["vendored"]
 vendored = ["deltachat/vendored"]
-jsonrpc = ["dep:deltachat-jsonrpc"]
+jsonrpc = ["deltachat-jsonrpc"]
 

deltachat-ffi/Doxyfile.css

@@ -1,24 +1,14 @@
 
-:root {
-	--accent: hsl(0 0% 85%);
-}
-
-@media (prefers-color-scheme: dark) {
-	:root {
-		--accent: hsl(0 0% 25%);
-	}
-}
-
 /* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
 div.fragment {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	border: 0;
 	padding: 1em;
 	border-radius: 6px;
 }
 
 code {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	padding-left: .5em;
 	padding-right: .5em;
 	border-radius: 6px;

deltachat-ffi/deltachat.h

@@ -24,7 +24,6 @@ typedef struct _dc_provider  dc_provider_t;
 typedef struct _dc_event     dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
-typedef struct _dc_backup_provider dc_backup_provider_t;
 
 // Alias for backwards compatibility, use dc_event_emitter_t instead.
 typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
@@ -72,6 +71,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
  *
  * The example above uses "pthreads",
  * however, you can also use anything else for thread handling.
+ * All deltachat-core functions, unless stated otherwise, are thread-safe.
  *
  * Now you can **configure the context:**
  *
@@ -141,67 +141,6 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
  * ~~~
  *
  *
- * ## Thread safety
- *
- * All deltachat-core functions, unless stated otherwise, are thread-safe.
- * In particular, it is safe to pass the same dc_context_t pointer
- * to multiple functions running concurrently in different threads.
- *
- * All the functions are guaranteed not to use the reference passed to them
- * after returning. If the function spawns a long-running process,
- * such as dc_configure() or dc_imex(), it will ensure that the objects
- * passed to them are not deallocated as long as they are needed.
- * For example, it is safe to call dc_imex(context, ...) and
- * call dc_context_unref(context) immediately after return from dc_imex().
- * It is however **not safe** to call dc_context_unref(context) concurrently
- * until dc_imex() returns, because dc_imex() may have not increased
- * the reference count of dc_context_t yet.
- *
- * This means that the context may be still in use after
- * dc_context_unref() call.
- * For example, it is possible to start the import/export process,
- * call dc_context_unref(context) immediately after
- * and observe #DC_EVENT_IMEX_PROGRESS events via the event emitter.
- * Once dc_get_next_event() returns NULL,
- * it is safe to terminate the application.
- *
- * It is recommended to create dc_context_t in the main thread
- * and only call dc_context_unref() once other threads that may use it,
- * such as the event loop thread, are terminated.
- * Common mistake is to use dc_context_unref() as a way
- * to cause dc_get_next_event() return NULL and terminate event loop this way.
- * If event loop thread is inside a function taking dc_context_t
- * as an argument at the moment dc_context_unref() is called on the main thread,
- * the behavior is undefined.
- *
- * Recommended way to safely terminate event loop
- * and shutdown the application is
- * to use a boolean variable
- * indicating that the event loop should stop
- * and check it in the event loop thread
- * every time before calling dc_get_next_event().
- * To terminate the event loop, main thread should:
- * 1. Notify event loop that it should terminate by atomically setting the
- *    boolean flag in the memory shared between the main thread and event loop.
- * 2. Call dc_stop_io() or dc_accounts_stop_io(), depending
- *    on whether a single account or account manager is used.
- *    Stopping I/O is guaranteed to emit at least one event
- *    and interrupt the event loop even if it was blocked on dc_get_next_event().
- * 3. Wait until the event loop thread notices the flag,
- *    exits the event loop and terminates.
- * 4. Call dc_context_unref() or dc_accounts_unref().
- * 5. Keep calling dc_get_next_event() in a loop until it returns NULL,
- *    indicating that the contexts are deallocated.
- * 6. Terminate the application.
- *
- * When using C API via FFI in runtimes that use automatic memory management,
- * such as CPython, JVM or Node.js, take care to ensure the correct
- * shutdown order and avoid calling dc_context_unref() or dc_accounts_unref()
- * on the objects still in use in other threads,
- * e.g. by keeping a reference to the wrapper object.
- * The details depend on the runtime being used.
- *
- *
  * ## Class reference
  *
  * For a class reference, see the "Classes" link atop.
@@ -673,7 +612,7 @@ int             dc_all_work_done             (dc_context_t* context);
  * While dc_configure() returns immediately,
  * the started configuration-job may take a while.
  *
- * During configuration, #DC_EVENT_CONFIGURE_PROGRESS events are emitted;
+ * During configuration, #DC_EVENT_CONFIGURE_PROGRESS events are emmited;
  * they indicate a successful configuration as well as errors
  * and may be used to create a progress bar.
  *
@@ -930,7 +869,7 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The chat ID to send the message to.
  * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id and state of the object are set up,
+ *     On succcess, msg_id and state of the object are set up,
  *     The function does not take ownership of the object,
  *     so you have to free it using dc_msg_unref() as usual.
  * @return The ID of the message that is being prepared.
@@ -941,7 +880,7 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
 /**
  * Send a message defined by a dc_msg_t object to a chat.
  *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
+ * Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
  * However, this does not imply, the message really reached the recipient -
  * sending may be delayed e.g. due to network problems. However, from your
  * view, you're done with the message. Sooner or later it will find its way.
@@ -970,7 +909,7 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
  * @param chat_id The chat ID to send the message to.
  *     If dc_prepare_msg() was called before, this parameter can be 0.
  * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id of the object is set up,
+ *     On succcess, msg_id of the object is set up,
  *     The function does not take ownership of the object,
  *     so you have to free it using dc_msg_unref() as usual.
  * @return The ID of the message that is about to be sent. 0 in case of errors.
@@ -987,7 +926,7 @@ uint32_t        dc_send_msg                  (dc_context_t* context, uint32_t ch
  * @param chat_id The chat ID to send the message to.
  *     If dc_prepare_msg() was called before, this parameter can be 0.
  * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id of the object is set up,
+ *     On succcess, msg_id of the object is set up,
  *     The function does not take ownership of the object,
  *     so you have to free it using dc_msg_unref() as usual.
  * @return The ID of the message that is about to be sent. 0 in case of errors.
@@ -998,7 +937,7 @@ uint32_t        dc_send_msg_sync                  (dc_context_t* context, uint32
 /**
  * Send a simple text message a given chat.
  *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
+ * Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
  * However, this does not imply, the message really reached the recipient -
  * sending may be delayed e.g. due to network problems. However, from your
  * view, you're done with the message. Sooner or later it will find its way.
@@ -1207,7 +1146,7 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
  *     // not now and not when this code is executed again
  *     dc_add_device_msg(context, "update-123", NULL);
  * } else {
- *     // welcome message was not added now, this is an older installation,
+ *     // welcome message was not added now, this is an oder installation,
  *     // add a changelog
  *     dc_add_device_msg(context, "update-123", changelog_msg);
  * }
@@ -2161,7 +2100,8 @@ dc_contact_t*   dc_get_contact               (dc_context_t* context, uint32_t co
 
 /**
  * Import/export things.
- *
+ * During backup import/export IO must not be started,
+ * if needed stop IO using dc_accounts_stop_io() or dc_stop_io() first.
  * What to do is defined by the _what_ parameter which may be one of the following:
  *
  * - **DC_IMEX_EXPORT_BACKUP** (11) - Export a backup to the directory given as `param1`
@@ -2355,7 +2295,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_FPR_MISMATCH           220 // id=contact
 #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_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
@@ -2381,7 +2320,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask whether to verify the contact;
  *   if so, start the protocol with dc_join_securejoin().
  *
- * - DC_QR_ASK_VERIFYGROUP with dc_lot_t::text1=Group name:
+ * - DC_QR_ASK_VERIFYGROUP withdc_lot_t::text1=Group name:
  *   ask whether to join the group;
  *   if so, start the protocol with dc_join_securejoin().
  *
@@ -2401,10 +2340,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to create an account on the given domain,
  *   if so, call dc_set_config_from_qr() and then dc_configure().
  *
- * - DC_QR_BACKUP:
- *   ask the user if they want to set up a new device.
- *   If so, pass the qr-code to dc_receive_backup().
- *
  * - DC_QR_WEBRTC_INSTANCE with dc_lot_t::text1=domain:
  *   ask the user if they want to use the given service for video chats;
  *   if so, call dc_set_config_from_qr().
@@ -2695,123 +2630,6 @@ char* dc_get_last_error (dc_context_t* context);
 void dc_str_unref (char* str);
 
 
-/**
- * @class dc_backup_provider_t
- *
- * Set up another device.
- */
-
-/**
- * Creates an object for sending a backup to another device.
- *
- * The backup is sent to through a peer-to-peer channel which is bootstrapped
- * by a QR-code.  The backup contains the entire state of the account
- * including credentials.  This can be used to setup a new device.
- *
- * This is a blocking call as some preparations are made like e.g. exporting
- * the database.  Once this function returns, the backup is being offered to
- * remote devices.  To wait until one device received the backup, use
- * dc_backup_provider_wait().  Alternatively abort the operation using
- * dc_stop_ongoing_process().
- *
- * During execution of the job #DC_EVENT_IMEX_PROGRESS is sent out to indicate
- * state and progress.
- *
- * @memberof dc_backup_provider_t
- * @param context The context.
- * @return Opaque object for sending the backup.
- *    On errors, NULL is returned and dc_get_last_error() returns an error that
- *    should be shown to the user.
- */
-dc_backup_provider_t* dc_backup_provider_new (dc_context_t* context);
-
-
-/**
- * Returns the QR code text that will offer the backup to other devices.
- *
- * The QR code contains a ticket which will validate the backup and provide
- * authentication for both the provider and the recipient.
- *
- * The scanning device should call the scanned text to dc_check_qr().  If
- * dc_check_qr() returns DC_QR_BACKUP, the backup transfer can be started using
- * dc_get_backup().
- *
- * @memberof dc_backup_provider_t
- * @param backup_provider The backup provider object as created by
- *    dc_backup_provider_new().
- * @return The text that should be put in the QR code.
- *    On errors an empty string is returned, NULL is never returned.
- *    the returned string must be released using dc_str_unref() after usage.
- */
-char* dc_backup_provider_get_qr (const dc_backup_provider_t* backup_provider);
-
-
-/**
- * Returns the QR code SVG image that will offer the backup to other devices.
- *
- * This works like dc_backup_provider_qr() but returns the text of a rendered
- * SVG image containing the QR code.
- *
- * @memberof dc_backup_provider_t
- * @param backup_provider The backup provider object as created by
- *    dc_backup_provider_new().
- * @return The QR code rendered as SVG.
- *    On errors an empty string is returned, NULL is never returned.
- *    the returned string must be released using dc_str_unref() after usage.
- */
-char* dc_backup_provider_get_qr_svg (const dc_backup_provider_t* backup_provider);
-
-/**
- * Waits for the sending to finish.
- *
- * This is a blocking call and should only be called once.
- *
- * @memberof dc_backup_provider_t
- * @param backup_provider The backup provider object as created by
- *    dc_backup_provider_new().  If NULL is given nothing is done.
- */
-void dc_backup_provider_wait (dc_backup_provider_t* backup_provider);
-
-/**
- * Frees a dc_backup_provider_t object.
- *
- * If the provider has not yet finished, as indicated by
- * dc_backup_provider_wait() or the #DC_EVENT_IMEX_PROGRESS event with value
- * of 0 (failed) or 1000 (succeeded), this will also abort any in-progress
- * transfer.  If this aborts the provider a #DC_EVENT_IMEX_PROGRESS event with
- * value 0 (failed) will be emitted.
- *
- * @memberof dc_backup_provider_t
- * @param backup_provider The backup provider object as created by
- *    dc_backup_provider_new().
- */
-void dc_backup_provider_unref (dc_backup_provider_t* backup_provider);
-
-/**
- * Gets a backup offered by a dc_backup_provider_t object on another device.
- *
- * This function is called on a device that scanned the QR code offered by
- * dc_backup_sender_qr() or dc_backup_sender_qr_svg().  Typically this is a
- * different device than that which provides the backup.
- *
- * This call will block while the backup is being transferred and only
- * complete on success or failure.  Use dc_stop_ongoing_process() to abort it
- * early.
- *
- * During execution of the job #DC_EVENT_IMEX_PROGRESS is sent out to indicate
- * state and progress.  The process is finished when the event emits either 0
- * or 1000, 0 means it failed and 1000 means it succeeded.  These events are
- * for showing progress and informational only, success and failure is also
- * shown in the return code of this function.
- *
- * @memberof dc_context_t
- * @param context The context.
- * @param qr The qr code text, dc_check_qr() must have returned DC_QR_BACKUP
- *    on this text.
- * @return 0=failure, 1=success.
- */
-int dc_receive_backup (dc_context_t* context, const char* qr);
-
 /**
  * @class dc_accounts_t
  *
@@ -3366,7 +3184,7 @@ dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, siz
  * it takes the chat ID and the message ID as returned by dc_chatlist_get_chat_id() and dc_chatlist_get_msg_id()
  * as arguments. The chatlist object itself is not needed directly.
  *
- * This maybe useful if you convert the complete object into a different representation
+ * This maybe useful if you convert the complete object into a different represenation
  * as done e.g. in the node-bindings.
  * If you have access to the chatlist object in some way, using this function is not recommended,
  * use dc_chatlist_get_summary() in this case instead.
@@ -5771,14 +5589,6 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_IMAP_MESSAGE_MOVED   105
 
-/**
- * Emitted before going into IDLE on the Inbox folder.
- *
- * @param data1 0
- * @param data2 0
- */
-#define DC_EVENT_IMAP_INBOX_IDLE 106
-
 /**
  * Emitted when a new blob file was successfully written
  *
@@ -6531,7 +6341,7 @@ void dc_event_unref(dc_event_t* event);
 ///
 /// Used in status messages.
 ///
-/// @deprecated 2022-09-10
+/// @deperecated 2022-09-10
 #define DC_STR_EPHEMERAL_MINUTE           77
 
 /// "Message deletion timer is set to 1 hour."
@@ -6813,7 +6623,7 @@ void dc_event_unref(dc_event_t* event);
 
 /// "You changed your email address from %1$s to %2$s.
 /// If you now send a message to a group, contacts there will automatically
-/// replace the old with your new address.\n\n It's highly advised to set up 
+/// replace the old with your new address.\n\nIt's highly advised to set up 
 /// your old email provider to forward all emails to your new email address. 
 /// Otherwise you might miss messages of contacts who did not get your new 
 /// address yet." + the link to the AEAP blog post
@@ -7064,16 +6874,6 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by name and address of the contact.
 #define DC_STR_PROTECTION_DISABLED_BY_OTHER 161
 
-/// "Scan to set up second device for %1$s"
-///
-/// `%1$s` will be replaced by name and address of the account.
-#define DC_STR_BACKUP_TRANSFER_QR 162
-
-/// "Account transferred to your second device."
-///
-/// Used as a device message after a successful backup transfer.
-#define DC_STR_BACKUP_TRANSFER_MSG_BODY 163
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -28,10 +28,9 @@ use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, ContactId, Origin};
 use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
-use deltachat::imex::BackupProvider;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
 use deltachat::stock_str::StockStrings;
@@ -293,12 +292,12 @@ pub unsafe extern "C" fn dc_set_stock_translation(
             Some(id) => match ctx.set_stock_translation(id, msg).await {
                 Ok(()) => 1,
                 Err(err) => {
-                    warn!(ctx, "set_stock_translation failed: {err:#}");
+                    warn!(ctx, "set_stock_translation failed: {}", err);
                     0
                 }
             },
             None => {
-                warn!(ctx, "invalid stock message id {stock_id}");
+                warn!(ctx, "invalid stock message id {}", stock_id);
                 0
             }
         }
@@ -321,7 +320,7 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
         match qr::set_config_from_qr(ctx, &qr).await {
             Ok(()) => 1,
             Err(err) => {
-                error!(ctx, "Failed to create account from QR code: {err:#}");
+                error!(ctx, "Failed to create account from QR code: {}", err);
                 0
             }
         }
@@ -339,7 +338,7 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
         match ctx.get_info().await {
             Ok(info) => render_info(info).unwrap_or_default().strdup(),
             Err(err) => {
-                warn!(ctx, "failed to get info: {err:#}");
+                warn!(ctx, "failed to get info: {}", err);
                 "".strdup()
             }
         }
@@ -380,7 +379,7 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
         match ctx.get_connectivity_html().await {
             Ok(html) => html.strdup(),
             Err(err) => {
-                error!(ctx, "Failed to get connectivity html: {err:#}");
+                error!(ctx, "Failed to get connectivity html: {}", err);
                 "".strdup()
             }
         }
@@ -422,10 +421,6 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
     })
 }
 
-fn spawn_configure(ctx: Context) {
-    spawn(async move { ctx.configure().await.log_err(&ctx, "Configure failed") });
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_configure(context: *mut dc_context_t) {
     if context.is_null() {
@@ -434,7 +429,8 @@ pub unsafe extern "C" fn dc_configure(context: *mut dc_context_t) {
     }
 
     let ctx = &*context;
-    spawn_configure(ctx.clone());
+
+    spawn(async move { ctx.configure().await.log_err(ctx, "Configure failed") });
 }
 
 #[no_mangle]
@@ -500,7 +496,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::SmtpMessageSent(_) => 103,
         EventType::ImapMessageDeleted(_) => 104,
         EventType::ImapMessageMoved(_) => 105,
-        EventType::ImapInboxIdle => 106,
         EventType::NewBlobFile(_) => 150,
         EventType::DeletedBlobFile(_) => 151,
         EventType::Warning(_) => 300,
@@ -545,7 +540,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::SmtpMessageSent(_)
         | EventType::ImapMessageDeleted(_)
         | EventType::ImapMessageMoved(_)
-        | EventType::ImapInboxIdle
         | EventType::NewBlobFile(_)
         | EventType::DeletedBlobFile(_)
         | EventType::Warning(_)
@@ -596,7 +590,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::SmtpMessageSent(_)
         | EventType::ImapMessageDeleted(_)
         | EventType::ImapMessageMoved(_)
-        | EventType::ImapInboxIdle
         | EventType::NewBlobFile(_)
         | EventType::DeletedBlobFile(_)
         | EventType::Warning(_)
@@ -656,7 +649,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         EventType::MsgsChanged { .. }
         | EventType::ReactionsChanged { .. }
         | EventType::IncomingMsg { .. }
-        | EventType::ImapInboxIdle
         | EventType::MsgsNoticed(_)
         | EventType::MsgDelivered { .. }
         | EventType::MsgFailed { .. }
@@ -1145,7 +1137,7 @@ pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32)
             }
             Ok(None) => ptr::null_mut(),
             Err(err) => {
-                error!(ctx, "Failed to get draft for chat #{chat_id}: {err:#}");
+                error!(ctx, "Failed to get draft for chat #{}: {}", chat_id, err);
                 ptr::null_mut()
             }
         }
@@ -1735,7 +1727,7 @@ pub unsafe extern "C" fn dc_get_chat_encrinfo(
             .await
             .map(|s| s.strdup())
             .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
+                error!(ctx, "{}", e);
                 ptr::null_mut()
             })
     })
@@ -1898,7 +1890,7 @@ pub unsafe extern "C" fn dc_resend_msgs(
     let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
 
     if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
-        error!(ctx, "Resending failed: {err:#}");
+        error!(ctx, "Resending failed: {}", err);
         0
     } else {
         1
@@ -1939,11 +1931,14 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                     // C-core API returns empty messages, do the same
                     warn!(
                         ctx,
-                        "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
+                        "dc_get_msg called with special msg_id={}, returning empty msg", msg_id
                     );
                     message::Message::default()
                 } else {
-                    error!(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();
                 }
             }
@@ -2136,7 +2131,7 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
             .await
             .map(|s| s.strdup())
             .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
+                error!(ctx, "{}", e);
                 ptr::null_mut()
             })
     })
@@ -2158,7 +2153,7 @@ pub unsafe extern "C" fn dc_delete_contact(
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
             Err(err) => {
-                error!(ctx, "cannot delete contact: {err:#}");
+                error!(ctx, "cannot delete contact: {}", err);
                 0
             }
         }
@@ -2184,14 +2179,6 @@ pub unsafe extern "C" fn dc_get_contact(
     })
 }
 
-fn spawn_imex(ctx: Context, what: imex::ImexMode, param1: String, passphrase: Option<String>) {
-    spawn(async move {
-        imex::imex(&ctx, what, param1.as_ref(), passphrase)
-            .await
-            .log_err(&ctx, "IMEX failed")
-    });
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_imex(
     context: *mut dc_context_t,
@@ -2215,7 +2202,11 @@ pub unsafe extern "C" fn dc_imex(
     let ctx = &*context;
 
     if let Some(param1) = to_opt_string_lossy(param1) {
-        spawn_imex(ctx.clone(), what, param1, passphrase);
+        spawn(async move {
+            imex::imex(ctx, what, param1.as_ref(), passphrase)
+                .await
+                .log_err(ctx, "IMEX failed")
+        });
     } else {
         eprintln!("dc_imex called without a valid directory");
     }
@@ -2238,7 +2229,7 @@ pub unsafe extern "C" fn dc_imex_has_backup(
             Err(err) => {
                 // do not bubble up error to the user,
                 // the ui will expect that the file does not exist or cannot be accessed
-                warn!(ctx, "dc_imex_has_backup: {err:#}");
+                warn!(ctx, "dc_imex_has_backup: {}", err);
                 ptr::null_mut()
             }
         }
@@ -2257,7 +2248,7 @@ pub unsafe extern "C" fn dc_initiate_key_transfer(context: *mut dc_context_t) ->
         match imex::initiate_key_transfer(ctx).await {
             Ok(res) => res.strdup(),
             Err(err) => {
-                error!(ctx, "dc_initiate_key_transfer(): {err:#}");
+                error!(ctx, "dc_initiate_key_transfer(): {}", err);
                 ptr::null_mut()
             }
         }
@@ -2282,7 +2273,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
         {
             Ok(()) => 1,
             Err(err) => {
-                warn!(ctx, "dc_continue_key_transfer: {err:#}");
+                warn!(ctx, "dc_continue_key_transfer: {}", err);
                 0
             }
         }
@@ -2670,7 +2661,7 @@ pub unsafe fn dc_array_is_independent(
 ///
 /// This is the structure behind [dc_chatlist_t] which is the opaque
 /// structure representing a chatlist in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ChatlistWrapper {
@@ -2713,7 +2704,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
     match ffi_list.list.get_chat_id(index) {
         Ok(chat_id) => chat_id.to_u32(),
         Err(err) => {
-            warn!(ctx, "get_chat_id failed: {err:#}");
+            warn!(ctx, "get_chat_id failed: {}", err);
             0
         }
     }
@@ -2733,7 +2724,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
     match ffi_list.list.get_msg_id(index) {
         Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
         Err(err) => {
-            warn!(ctx, "get_msg_id failed: {err:#}");
+            warn!(ctx, "get_msg_id failed: {}", err);
             0
         }
     }
@@ -2814,7 +2805,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 ///
 /// This is the structure behind [dc_chat_t] which is the opaque
 /// structure representing a chat in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ChatWrapper {
@@ -2892,7 +2883,7 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
             Ok(Some(p)) => p.to_string_lossy().strdup(),
             Ok(None) => ptr::null_mut(),
             Err(err) => {
-                error!(ctx, "failed to get profile image: {err:#}");
+                error!(ctx, "failed to get profile image: {:?}", err);
                 ptr::null_mut()
             }
         }
@@ -3044,7 +3035,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
         let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
             Ok(chat) => chat,
             Err(err) => {
-                error!(ctx, "dc_get_chat_info_json() failed to load chat: {err:#}");
+                error!(ctx, "dc_get_chat_info_json() failed to load chat: {}", err);
                 return "".strdup();
             }
         };
@@ -3053,7 +3044,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
             Err(err) => {
                 error!(
                     ctx,
-                    "dc_get_chat_info_json() failed to get chat info: {err:#}"
+                    "dc_get_chat_info_json() failed to get chat info: {}", err
                 );
                 return "".strdup();
             }
@@ -3070,7 +3061,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
 ///
 /// This is the structure behind [dc_msg_t] which is the opaque
 /// structure representing a message in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct MessageWrapper {
@@ -3292,7 +3283,7 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc
         let info = match ffi_msg.message.get_webxdc_info(ctx).await {
             Ok(info) => info,
             Err(err) => {
-                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {err:#}");
+                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {}", err);
                 return "".strdup();
             }
         };
@@ -3823,7 +3814,7 @@ pub unsafe extern "C" fn dc_msg_force_plaintext(msg: *mut dc_msg_t) {
 ///
 /// This is the structure behind [dc_contact_t] which is the opaque
 /// structure representing a contact in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
 pub struct ContactWrapper {
@@ -4147,131 +4138,6 @@ pub unsafe extern "C" fn dc_str_unref(s: *mut libc::c_char) {
     libc::free(s as *mut _)
 }
 
-pub struct BackupProviderWrapper {
-    context: *const dc_context_t,
-    provider: BackupProvider,
-}
-
-pub type dc_backup_provider_t = BackupProviderWrapper;
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_provider_new(
-    context: *mut dc_context_t,
-) -> *mut dc_backup_provider_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_new()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-    block_on(BackupProvider::prepare(ctx))
-        .map(|provider| BackupProviderWrapper {
-            context: ctx,
-            provider,
-        })
-        .map(|ffi_provider| Box::into_raw(Box::new(ffi_provider)))
-        .log_err(ctx, "BackupProvider failed")
-        .context("BackupProvider failed")
-        .set_last_error(ctx)
-        .unwrap_or(ptr::null_mut())
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_provider_get_qr(
-    provider: *const dc_backup_provider_t,
-) -> *mut libc::c_char {
-    if provider.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_qr");
-        return "".strdup();
-    }
-    let ffi_provider = &*provider;
-    let ctx = &*ffi_provider.context;
-    deltachat::qr::format_backup(&ffi_provider.provider.qr())
-        .log_err(ctx, "BackupProvider get_qr failed")
-        .context("BackupProvider get_qr failed")
-        .set_last_error(ctx)
-        .unwrap_or_default()
-        .strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_provider_get_qr_svg(
-    provider: *const dc_backup_provider_t,
-) -> *mut libc::c_char {
-    if provider.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_qr_svg()");
-        return "".strdup();
-    }
-    let ffi_provider = &*provider;
-    let ctx = &*ffi_provider.context;
-    let provider = &ffi_provider.provider;
-    block_on(generate_backup_qr(ctx, &provider.qr()))
-        .log_err(ctx, "BackupProvider get_qr_svg failed")
-        .context("BackupProvider get_qr_svg failed")
-        .set_last_error(ctx)
-        .unwrap_or_default()
-        .strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provider_t) {
-    if provider.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_wait()");
-        return;
-    }
-    let ffi_provider = &mut *provider;
-    let ctx = &*ffi_provider.context;
-    let provider = &mut ffi_provider.provider;
-    block_on(provider)
-        .log_err(ctx, "Failed to await BackupProvider")
-        .context("Failed to await BackupProvider")
-        .set_last_error(ctx)
-        .ok();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_backup_provider_unref(provider: *mut dc_backup_provider_t) {
-    if provider.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_unref()");
-        return;
-    }
-    drop(Box::from_raw(provider));
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_receive_backup(
-    context: *mut dc_context_t,
-    qr: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_receive_backup()");
-        return 0;
-    }
-    let ctx = &*context;
-    let qr_text = to_string_lossy(qr);
-    receive_backup(ctx.clone(), qr_text)
-}
-
-// Because this is a long-running operation make sure we own the Context.  This stops a FFI
-// user from deallocating it by calling unref on the object while we are using it.
-fn receive_backup(ctx: Context, qr_text: String) -> libc::c_int {
-    let qr = match block_on(qr::check_qr(&ctx, &qr_text))
-        .log_err(&ctx, "Invalid QR code")
-        .context("Invalid QR code")
-        .set_last_error(&ctx)
-    {
-        Ok(qr) => qr,
-        Err(_) => return 0,
-    };
-    match block_on(imex::get_backup(&ctx, qr))
-        .log_err(&ctx, "Get backup failed")
-        .context("Get backup failed")
-        .set_last_error(&ctx)
-    {
-        Ok(_) => 1,
-        Err(_) => 0,
-    }
-}
-
 trait ResultExt<T, E> {
     /// Like `log_err()`, but:
     /// - returns the default value instead of an Err value.
@@ -4285,63 +4151,13 @@ impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
         match self {
             Ok(t) => t,
             Err(err) => {
-                error!(context, "{message}: {err:#}");
+                error!(context, "{}: {}", message, err);
                 Default::default()
             }
         }
     }
 }
 
-trait ResultLastError<T, E>
-where
-    E: std::fmt::Display,
-{
-    /// Sets this `Err` value using [`Context::set_last_error`].
-    ///
-    /// Normally each FFI-API *should* call this if it handles an error from the Rust API:
-    /// errors which need to be reported to users in response to an API call need to be
-    /// propagated up the Rust API and at the FFI boundary need to be stored into the "last
-    /// error" so the FFI users can retrieve an appropriate error message on failure.  Often
-    /// you will want to combine this with a call to [`LogExt::log_err`].
-    ///
-    /// Since historically calls to the `deltachat::log::error!()` macro were (and sometimes
-    /// still are) shown as error toasts to the user, this macro also calls
-    /// [`Context::set_last_error`].  It is preferable however to rely on normal error
-    /// propagation in Rust code however and only use this `ResultExt::set_last_error` call
-    /// in the FFI layer.
-    ///
-    /// # Example
-    ///
-    /// Fully handling an error in the FFI code looks like this currently:
-    ///
-    /// ```no_compile
-    /// some_dc_rust_api_call_returning_result()
-    ///     .log_err(&context, "My API call failed")
-    ///     .context("My API call failed")
-    ///     .set_last_error(&context)
-    ///     .unwrap_or_default()
-    /// ```
-    ///
-    /// As shows it is a shame the `.log_err()` call currently needs a message instead of
-    /// relying on an implicit call to the [`anyhow::Context`] call if needed.  This stems
-    /// from a time before we fully embraced anyhow.  Some day we'll also fix that.
-    ///
-    /// [`Context::set_last_error`]: context::Context::set_last_error
-    fn set_last_error(self, context: &context::Context) -> Result<T, E>;
-}
-
-impl<T, E> ResultLastError<T, E> for Result<T, E>
-where
-    E: std::fmt::Display,
-{
-    fn set_last_error(self, context: &context::Context) -> Result<T, E> {
-        if let Err(ref err) = self {
-            context.set_last_error(&format!("{err:#}"));
-        }
-        self
-    }
-}
-
 trait ResultNullableExt<T> {
     fn into_raw(self) -> *mut T;
 }
@@ -4791,22 +4607,33 @@ mod jsonrpc {
             return ptr::null_mut();
         }
 
-        let account_manager = &*account_manager;
-        let events = block_on(account_manager.read()).get_event_emitter();
-        let cmd_api = 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.clone(), cmd_api);
+        let request_handle2 = request_handle.clone();
+        let handle = RpcSession::new(request_handle, cmd_api);
 
-        let event_thread = spawn(async move {
-            while let Some(event) = events.recv().await {
-                let event = event_to_json_rpc_notification(event);
-                request_handle
-                    .send_notification("event", Some(event))
-                    .await?;
+        let events = block_on({
+            async {
+                let am = (*account_manager).inner.clone();
+                let ev = am.read().await.get_event_emitter();
+                drop(am);
+                ev
+            }
+        });
+
+        let event_thread = spawn({
+            async move {
+                while let Some(event) = events.recv().await {
+                    let event = event_to_json_rpc_notification(event);
+                    request_handle2
+                        .send_notification("event", Some(event))
+                        .await?;
+                }
+                let res: Result<(), anyhow::Error> = Ok(());
+                res
             }
-            let res: Result<(), anyhow::Error> = Ok(());
-            res
         });
 
         let instance = dc_jsonrpc_instance_t {
@@ -4828,12 +4655,6 @@ mod jsonrpc {
         drop(Box::from_raw(jsonrpc_instance));
     }
 
-    fn spawn_handle_jsonrpc_request(handle: RpcSession<CommandApi>, request: String) {
-        spawn(async move {
-            handle.handle_incoming(&request).await;
-        });
-    }
-
     #[no_mangle]
     pub unsafe extern "C" fn dc_jsonrpc_request(
         jsonrpc_instance: *mut dc_jsonrpc_instance_t,
@@ -4844,9 +4665,12 @@ mod jsonrpc {
             return;
         }
 
-        let handle = &(*jsonrpc_instance).handle;
+        let api = &*jsonrpc_instance;
+        let handle = &api.handle;
         let request = to_string_lossy(request);
-        spawn_handle_jsonrpc_request(handle.clone(), request);
+        spawn(async move {
+            handle.handle_incoming(&request).await;
+        });
     }
 
     #[no_mangle]

deltachat-ffi/src/lot.rs

@@ -14,8 +14,6 @@ use crate::summary::{Summary, SummaryPrefix};
 /// eg. by chatlist.get_summary() or dc_msg_get_summary().
 ///
 /// *Lot* is used in the meaning *heap* here.
-// The QR code grew too large.  So be it.
-#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum Lot {
     Summary(Summary),
@@ -49,7 +47,6 @@ impl Lot {
                 Qr::FprMismatch { .. } => None,
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
-                Qr::Backup { .. } => None,
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
                 Qr::Addr { draft, .. } => draft.as_deref(),
                 Qr::Url { url } => Some(url),
@@ -101,7 +98,6 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
-                Qr::Backup { .. } => LotState::QrBackup,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
@@ -126,7 +122,6 @@ impl Lot {
                 Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
-                Qr::Backup { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
@@ -175,8 +170,6 @@ pub enum LotState {
     /// text1=domain
     QrAccount = 250,
 
-    QrBackup = 251,
-
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.112.7"
+version = "1.109.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -21,15 +21,14 @@ log = "0.4"
 async-channel = { version = "1.8.0" }
 futures = { version = "0.3.26" }
 serde_json = "1.0.91"
-yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
+yerpc = { version = "^0.4.0", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.5", features = ["json_value"] }
 tokio = { version = "1.25.0" }
 sanitize-filename = "0.4"
 walkdir = "2.3.2"
-base64 = "0.21"
 
 # optional dependencies
-axum = { version = "0.6.11", optional = true, features = ["ws"] }
+axum = { version = "0.5.9", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }
 
 [dev-dependencies]
@@ -37,6 +36,5 @@ tokio = { version = "1.25.0", features = ["full", "rt-multi-thread"] }
 
 
 [features]
-default = ["vendored"]
-webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
-vendored = ["deltachat/vendored"]
+default = []
+webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]

deltachat-jsonrpc/README.md

@@ -35,7 +35,7 @@ The server can be configured with environment variables:
 |`DC_PORT`|`20808`|port to listen on|
 |`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
 
-If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
+If you are targetting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
 
 ```sh
 cross build --features=webserver --target armv7-linux-androideabi --release

deltachat-jsonrpc/src/api/events.rs

@@ -47,9 +47,6 @@ pub enum JSONRPCEventType {
         msg: String,
     },
 
-    /// Emitted before going into IDLE on the Inbox folder.
-    ImapInboxIdle,
-
     /// Emitted when an new file in the $BLOBDIR was created
     NewBlobFile {
         file: String,
@@ -296,7 +293,6 @@ impl From<EventType> for JSONRPCEventType {
             EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
             EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
             EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            EventType::ImapInboxIdle => ImapInboxIdle,
             EventType::NewBlobFile(file) => NewBlobFile { file },
             EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
             EventType::Warning(msg) => Warning { msg },

deltachat-jsonrpc/src/api/mod.rs

@@ -4,7 +4,6 @@ use std::{collections::HashMap, str::FromStr};
 
 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
-use deltachat::qr::Qr;
 use deltachat::{
     chat::{
         self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
@@ -23,15 +22,14 @@ use deltachat::{
     },
     provider::get_provider_info,
     qr,
-    qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg},
+    qr_code_generator::get_securejoin_qr_svg,
     reaction::send_reaction,
     securejoin,
     stock_str::StockMessage,
     webxdc::StatusUpdateSerial,
 };
 use sanitize_filename::is_sanitized;
-use tokio::fs;
-use tokio::sync::{watch, Mutex, RwLock};
+use tokio::{fs, sync::RwLock};
 use walkdir::WalkDir;
 use yerpc::rpc;
 
@@ -43,7 +41,6 @@ use types::account::Account;
 use types::chat::FullChat;
 use types::chat_list::ChatListEntry;
 use types::contact::ContactObject;
-use types::message::MessageData;
 use types::message::MessageObject;
 use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;
@@ -59,45 +56,21 @@ use self::types::{
 use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
 use crate::api::types::qr::QrObject;
 
-#[derive(Debug)]
-struct AccountState {
-    /// The Qr code for current [`CommandApi::provide_backup`] call.
-    ///
-    /// If there currently is a call to [`CommandApi::provide_backup`] this will be
-    /// `Pending` or `Ready`, otherwise `NoProvider`.
-    backup_provider_qr: watch::Sender<ProviderQr>,
-}
-
-impl Default for AccountState {
-    fn default() -> Self {
-        let (tx, _rx) = watch::channel(ProviderQr::NoProvider);
-        Self {
-            backup_provider_qr: tx,
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub struct CommandApi {
     pub(crate) accounts: Arc<RwLock<Accounts>>,
-
-    states: Arc<Mutex<BTreeMap<u32, AccountState>>>,
 }
 
 impl CommandApi {
     pub fn new(accounts: Accounts) -> Self {
         CommandApi {
             accounts: Arc::new(RwLock::new(accounts)),
-            states: Arc::new(Mutex::new(BTreeMap::new())),
         }
     }
 
     #[allow(dead_code)]
     pub fn from_arc(accounts: Arc<RwLock<Accounts>>) -> Self {
-        CommandApi {
-            accounts,
-            states: Arc::new(Mutex::new(BTreeMap::new())),
-        }
+        CommandApi { accounts }
     }
 
     async fn get_context(&self, id: u32) -> Result<deltachat::context::Context> {
@@ -109,38 +82,6 @@ impl CommandApi {
             .ok_or_else(|| anyhow!("account with id {} not found", id))?;
         Ok(sc)
     }
-
-    async fn with_state<F, T>(&self, id: u32, with_state: F) -> T
-    where
-        F: FnOnce(&AccountState) -> T,
-    {
-        let mut states = self.states.lock().await;
-        let state = states.entry(id).or_insert_with(Default::default);
-        with_state(state)
-    }
-
-    async fn inner_get_backup_qr(&self, account_id: u32) -> Result<Qr> {
-        let mut receiver = self
-            .with_state(account_id, |state| state.backup_provider_qr.subscribe())
-            .await;
-
-        let val: ProviderQr = receiver.borrow_and_update().clone();
-        match val {
-            ProviderQr::NoProvider => bail!("No backup being provided"),
-            ProviderQr::Pending => loop {
-                if receiver.changed().await.is_err() {
-                    bail!("No backup being provided (account state dropped)");
-                }
-                let val: ProviderQr = receiver.borrow().clone();
-                match val {
-                    ProviderQr::NoProvider => bail!("No backup being provided"),
-                    ProviderQr::Pending => continue,
-                    ProviderQr::Ready(qr) => break Ok(qr),
-                };
-            },
-            ProviderQr::Ready(qr) => Ok(qr),
-        }
-    }
 }
 
 #[rpc(all_positional, ts_outdir = "typescript/generated")]
@@ -173,13 +114,7 @@ impl CommandApi {
     }
 
     async fn remove_account(&self, account_id: u32) -> Result<()> {
-        self.accounts
-            .write()
-            .await
-            .remove_account(account_id)
-            .await?;
-        self.states.lock().await.remove(&account_id);
-        Ok(())
+        self.accounts.write().await.remove_account(account_id).await
     }
 
     async fn get_all_account_ids(&self) -> Vec<u32> {
@@ -1389,13 +1324,16 @@ impl CommandApi {
         passphrase: Option<String>,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        imex::imex(
+        ctx.stop_io().await;
+        let result = imex::imex(
             &ctx,
             imex::ImexMode::ExportBackup,
             destination.as_ref(),
             passphrase,
         )
-        .await
+        .await;
+        ctx.start_io().await;
+        result
     }
 
     async fn import_backup(
@@ -1414,75 +1352,6 @@ impl CommandApi {
         .await
     }
 
-    /// Offers a backup for remote devices to retrieve.
-    ///
-    /// Can be cancelled by stopping the ongoing process.  Success or failure can be tracked
-    /// via the `ImexProgress` event which should either reach `1000` for success or `0` for
-    /// failure.
-    ///
-    /// This **stops IO** while it is running.
-    ///
-    /// Returns once a remote device has retrieved the backup, or is cancelled.
-    async fn provide_backup(&self, account_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        self.with_state(account_id, |state| {
-            state.backup_provider_qr.send_replace(ProviderQr::Pending);
-        })
-        .await;
-
-        let provider = imex::BackupProvider::prepare(&ctx).await?;
-        self.with_state(account_id, |state| {
-            state
-                .backup_provider_qr
-                .send_replace(ProviderQr::Ready(provider.qr()));
-        })
-        .await;
-
-        provider.await
-    }
-
-    /// Returns the text of the QR code for the running [`CommandApi::provide_backup`].
-    ///
-    /// This QR code text can be used in [`CommandApi::get_backup`] on a second device to
-    /// retrieve the backup and setup this second device.
-    ///
-    /// This call will fail if there is currently no concurrent call to
-    /// [`CommandApi::provide_backup`].  This call may block if the QR code is not yet
-    /// ready.
-    async fn get_backup_qr(&self, account_id: u32) -> Result<String> {
-        let qr = self.inner_get_backup_qr(account_id).await?;
-        qr::format_backup(&qr)
-    }
-
-    /// Returns the rendered QR code for the running [`CommandApi::provide_backup`].
-    ///
-    /// This QR code can be used in [`CommandApi::get_backup`] on a second device to
-    /// retrieve the backup and setup this second device.
-    ///
-    /// This call will fail if there is currently no concurrent call to
-    /// [`CommandApi::provide_backup`].  This call may block if the QR code is not yet
-    /// ready.
-    ///
-    /// 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 = self.inner_get_backup_qr(account_id).await?;
-        generate_backup_qr(&ctx, &qr).await
-    }
-
-    /// Gets a backup from a remote provider.
-    ///
-    /// This retrieves the backup from a remote device over the network and imports it into
-    /// the current device.
-    ///
-    /// Can be cancelled by stopping the ongoing process.
-    async fn get_backup(&self, account_id: u32, qr_text: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let qr = qr::check_qr(&ctx, &qr_text).await?;
-        imex::get_backup(&ctx, qr).await?;
-        Ok(())
-    }
-
     // ---------------------------------------------
     //                connectivity
     // ---------------------------------------------
@@ -1593,23 +1462,6 @@ impl CommandApi {
         WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
     }
 
-    /// Get blob encoded as base64 from a webxdc message
-    ///
-    /// path is the path of the file within webxdc archive
-    async fn get_webxdc_blob(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        path: String,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
-        let blob = message.get_webxdc_blob(&ctx, &path).await?;
-
-        use base64::{engine::general_purpose, Engine as _};
-        Ok(general_purpose::STANDARD_NO_PAD.encode(blob))
-    }
-
     /// Forward messages to another chat.
     ///
     /// All types of messages can be forwarded,
@@ -1659,48 +1511,6 @@ impl CommandApi {
         Ok(message_id.to_u32())
     }
 
-    async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let mut message = Message::new(if let Some(viewtype) = data.viewtype {
-            viewtype.into()
-        } else if data.file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        if data.text.is_some() {
-            message.set_text(data.text);
-        }
-        if data.html.is_some() {
-            message.set_html(data.html);
-        }
-        if data.override_sender_name.is_some() {
-            message.set_override_sender_name(data.override_sender_name);
-        }
-        if let Some(file) = data.file {
-            message.set_file(file, None);
-        }
-        if let Some((latitude, longitude)) = data.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = data.quoted_message_id {
-            message
-                .set_quote(
-                    &ctx,
-                    Some(
-                        &Message::load_from_db(&ctx, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-        let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await?
-            .to_u32();
-        Ok(msg_id)
-    }
-
     // ---------------------------------------------
     //           functions for the composer
     //    the composer is the message input field
@@ -1970,15 +1780,3 @@ async fn get_config(
             .await
     }
 }
-
-/// Whether a QR code for a BackupProvider is currently available.
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug)]
-enum ProviderQr {
-    /// There is no provider, asking for a QR is an error.
-    NoProvider,
-    /// There is a provider, the QR code is pending.
-    Pending,
-    /// There is a provider and QR code.
-    Ready(Qr),
-}

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

@@ -502,15 +502,3 @@ impl From<ChatItem> for JSONRPCMessageListItem {
         }
     }
 }
-
-#[derive(Deserialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageData {
-    pub text: Option<String>,
-    pub html: Option<String>,
-    pub viewtype: Option<MessageViewtype>,
-    pub file: Option<String>,
-    pub location: Option<(f64, f64)>,
-    pub override_sender_name: Option<String>,
-    pub quoted_message_id: Option<u32>,
-}

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

@@ -8,7 +8,7 @@ use typescript_type_def::TypeDef;
 pub struct ProviderInfo {
     pub before_login_hint: String,
     pub overview_page: String,
-    pub status: u32, // in reality this is an enum, but for simplicity and because it gets converted into a number anyway, we use an u32 here.
+    pub status: u32, // in reality this is an enum, but for simlicity and because it gets converted into a number anyway, we use an u32 here.
 }
 
 impl ProviderInfo {

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

@@ -32,9 +32,6 @@ pub enum QrObject {
     Account {
         domain: String,
     },
-    Backup {
-        ticket: String,
-    },
     WebrtcInstance {
         domain: String,
         instance_pattern: String,
@@ -129,9 +126,6 @@ impl From<Qr> for QrObject {
             }
             Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
             Qr::Account { domain } => QrObject::Account { domain },
-            Qr::Backup { ticket } => QrObject::Backup {
-                ticket: ticket.to_string(),
-            },
             Qr::WebrtcInstance {
                 domain,
                 instance_pattern,

deltachat-jsonrpc/typescript/.npmignore

@@ -4,9 +4,3 @@ docs
 coverage
 yarn*
 package-lock.json
-.prettierignore
-example.html
-report_api_coverage.mjs
-scripts
-dist/example
-dist/test

deltachat-jsonrpc/typescript/example/node-add-account.js

@@ -14,7 +14,7 @@ async function run() {
     throw new Error(
       "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
     );
-  console.log(`creating account for ${email}`);
+  console.log(`creating acccount for ${email}`);
   const id = await delta.rpc.addAccount();
   console.log(`created account id ${id}`);
   await delta.rpc.setConfig(id, "addr", email);

deltachat-jsonrpc/typescript/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "@deltachat/tiny-emitter": "3.0.0",
     "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.4.3"
+    "yerpc": "^0.3.3"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -26,8 +26,8 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs"
+      "require": "./dist/deltachat.cjs",
+      "import": "./dist/deltachat.js"
     }
   },
   "license": "MPL-2.0",
@@ -36,8 +36,8 @@
   "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",
-    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
     "build:tsc": "tsc",
+    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
     "docs": "typedoc --out docs deltachat.ts",
     "example": "run-s build example:build example:start",
     "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
@@ -55,5 +55,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.112.7"
-}
+  "version": "1.109.0"
+}

deltachat-jsonrpc/typescript/report_api_coverage.mjs

@@ -1,5 +1,5 @@
 import { readFileSync } from "fs";
-// only checks for the coverage of the api functions in bindings.ts for now
+// only checks for the coverge of the api functions in bindings.ts for now
 const generatedFile = "typescript/generated/client.ts";
 const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =

deltachat-jsonrpc/typescript/test/basic.ts

@@ -53,7 +53,7 @@ describe("basic tests", () => {
     ]);
   });
 
-  describe("account management", () => {
+  describe("account managment", () => {
     it("should create account", async () => {
       const res = await dc.rpc.addAccount();
       assert((await dc.rpc.getAllAccountIds()).length === 1);
@@ -73,7 +73,7 @@ describe("basic tests", () => {
     });
   });
 
-  describe("contact management", function () {
+  describe("contact managment", function () {
     let accountId: number;
     before(async () => {
       accountId = await dc.rpc.addAccount();
@@ -103,7 +103,7 @@ describe("basic tests", () => {
       accountId = await dc.rpc.addAccount();
     });
 
-    it("set and retrieve", async function () {
+    it("set and retrive", async function () {
       await dc.rpc.setConfig(accountId, "addr", "valid@email");
       assert((await dc.rpc.getConfig(accountId, "addr")) == "valid@email");
     });
@@ -115,11 +115,11 @@ describe("basic tests", () => {
       await expect(dc.rpc.getConfig(accountId, "invalid_key")).to.be.eventually
         .rejected;
     });
-    it("set and retrieve ui.*", async function () {
+    it("set and retrive ui.*", async function () {
       await dc.rpc.setConfig(accountId, "ui.chat_bg", "color:red");
       assert((await dc.rpc.getConfig(accountId, "ui.chat_bg")) == "color:red");
     });
-    it("set and retrieve (batch)", async function () {
+    it("set and retrive (batch)", async function () {
       const config = { addr: "valid@email", mail_pw: "1234" };
       await dc.rpc.batchSetConfig(accountId, config);
       const retrieved = await dc.rpc.batchGetConfig(
@@ -128,7 +128,7 @@ describe("basic tests", () => {
       );
       expect(retrieved).to.deep.equal(config);
     });
-    it("set and retrieve ui.* (batch)", async function () {
+    it("set and retrive ui.* (batch)", async function () {
       const config = {
         "ui.chat_bg": "color:green",
         "ui.enter_key_sends": "true",
@@ -140,7 +140,7 @@ describe("basic tests", () => {
       );
       expect(retrieved).to.deep.equal(config);
     });
-    it("set and retrieve mixed(ui and core) (batch)", async function () {
+    it("set and retrive mixed(ui and core) (batch)", async function () {
       const config = {
         "ui.chat_bg": "color:yellow",
         "ui.enter_key_sends": "false",

deltachat-jsonrpc/typescript/test/online.ts

@@ -22,7 +22,7 @@ describe("online tests", function () {
         process.exit(1);
       }
       console.log(
-        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests"
+        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests"
       );
       this.skip();
     }
@@ -36,7 +36,7 @@ describe("online tests", function () {
     account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account1 || !account1.email || !account1.password) {
       console.log(
-        "We didn't got back an account from the api, skip integration tests"
+        "We didn't got back an account from the api, skip intergration tests"
       );
       this.skip();
     }
@@ -44,7 +44,7 @@ describe("online tests", function () {
     account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
     if (!account2 || !account2.email || !account2.password) {
       console.log(
-        "We didn't got back an account2 from the api, skip integration tests"
+        "We didn't got back an account2 from the api, skip intergration tests"
       );
       this.skip();
     }
@@ -74,7 +74,7 @@ describe("online tests", function () {
     accountsConfigured = true;
   });
 
-  it("send and receive text message", async function () {
+  it("send and recieve text message", async function () {
     if (!accountsConfigured) {
       this.skip();
     }
@@ -106,7 +106,7 @@ describe("online tests", function () {
     expect(message.text).equal("Hello");
   });
 
-  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
+  it("send and recieve text message roundtrip, encrypted on answer onwards", async function () {
     if (!accountsConfigured) {
       this.skip();
     }

deltachat-repl/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.112.7"
-license = "MPL-2.0"
+version = "1.109.0"
 edition = "2021"
 
 [dependencies]
@@ -12,7 +11,7 @@ dirs = "4"
 log = "0.4.16"
 pretty_env_logger = "0.4"
 rusqlite = "0.28"
-rustyline = "11"
+rustyline = "10"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 
 [features]

deltachat-repl/src/cmdline.rs

@@ -29,13 +29,13 @@ use tokio::fs;
 
 /// Reset database tables.
 /// Argument is a bitmask, executing single or multiple actions in one call.
-/// e.g. bitmask 7 triggers actions defined with bits 1, 2 and 4.
+/// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
 async fn reset_tables(context: &Context, bits: i32) {
     println!("Resetting tables ({bits})...");
     if 0 != bits & 1 {
         context
             .sql()
-            .execute("DELETE FROM jobs;", ())
+            .execute("DELETE FROM jobs;", paramsv![])
             .await
             .unwrap();
         println!("(1) Jobs reset.");
@@ -43,7 +43,7 @@ async fn reset_tables(context: &Context, bits: i32) {
     if 0 != bits & 2 {
         context
             .sql()
-            .execute("DELETE FROM acpeerstates;", ())
+            .execute("DELETE FROM acpeerstates;", paramsv![])
             .await
             .unwrap();
         println!("(2) Peerstates reset.");
@@ -51,7 +51,7 @@ async fn reset_tables(context: &Context, bits: i32) {
     if 0 != bits & 4 {
         context
             .sql()
-            .execute("DELETE FROM keypairs;", ())
+            .execute("DELETE FROM keypairs;", paramsv![])
             .await
             .unwrap();
         println!("(4) Private keypairs reset.");
@@ -59,36 +59,36 @@ async fn reset_tables(context: &Context, bits: i32) {
     if 0 != bits & 8 {
         context
             .sql()
-            .execute("DELETE FROM contacts WHERE id>9;", ())
+            .execute("DELETE FROM contacts WHERE id>9;", paramsv![])
             .await
             .unwrap();
         context
             .sql()
-            .execute("DELETE FROM chats WHERE id>9;", ())
+            .execute("DELETE FROM chats WHERE id>9;", paramsv![])
             .await
             .unwrap();
         context
             .sql()
-            .execute("DELETE FROM chats_contacts;", ())
+            .execute("DELETE FROM chats_contacts;", paramsv![])
             .await
             .unwrap();
         context
             .sql()
-            .execute("DELETE FROM msgs WHERE id>9;", ())
+            .execute("DELETE FROM msgs WHERE id>9;", paramsv![])
             .await
             .unwrap();
         context
             .sql()
             .execute(
                 "DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';",
-                (),
+                paramsv![],
             )
             .await
             .unwrap();
         context.sql().config_cache().write().await.clear();
         context
             .sql()
-            .execute("DELETE FROM leftgrps;", ())
+            .execute("DELETE FROM leftgrps;", paramsv![])
             .await
             .unwrap();
         println!("(8) Rest but server config reset.");
@@ -336,8 +336,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  has-backup\n\
                  export-backup\n\
                  import-backup <backup-file>\n\
-                 send-backup\n\
-                 receive-backup <qr>\n\
                  export-keys\n\
                  import-keys\n\
                  export-setup\n\
@@ -488,17 +486,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             )
             .await?;
         }
-        "send-backup" => {
-            let provider = BackupProvider::prepare(&context).await?;
-            let qr = provider.qr();
-            println!("QR code: {}", format_backup(&qr)?);
-            provider.await?;
-        }
-        "receive-backup" => {
-            ensure!(!arg1.is_empty(), "Argument <qr> is missing.");
-            let qr = check_qr(&context, arg1).await?;
-            deltachat::imex::get_backup(&context, qr).await?;
-        }
         "export-keys" => {
             let dir = dirs::home_dir().unwrap_or_default();
             imex(&context, ImexMode::ExportSelfKeys, dir.as_ref(), None).await?;
@@ -882,7 +869,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             if continue_streaming {
                 println!("Success, streaming should be continued.");
             } else {
-                println!("Success, streaming can be stopped.");
+                println!("Success, streaming can be stoppped.");
             }
         }
         "dellocations" => {

deltachat-repl/src/main.rs

@@ -152,15 +152,13 @@ impl Completer for DcHelper {
     }
 }
 
-const IMEX_COMMANDS: [&str; 14] = [
+const IMEX_COMMANDS: [&str; 12] = [
     "initiate-key-transfer",
     "get-setupcodebegin",
     "continue-key-transfer",
     "has-backup",
     "export-backup",
     "import-backup",
-    "send-backup",
-    "receive-backup",
     "export-keys",
     "import-keys",
     "export-setup",
@@ -352,8 +350,8 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
             match readline {
                 Ok(line) => {
                     // TODO: ignore "set mail_pw"
-                    rl.add_history_entry(line.as_str())?;
-                    let should_continue = Handle::current().block_on(async {
+                    rl.add_history_entry(line.as_str());
+                    let contine = Handle::current().block_on(async {
                         match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
                             Ok(ExitResult::Continue) => true,
                             Ok(ExitResult::Exit) => {
@@ -361,13 +359,13 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                                 false
                             }
                             Err(err) => {
-                                println!("Error: {err:#}");
+                                println!("Error: {err}");
                                 true
                             }
                         }
                     });
 
-                    if !should_continue {
+                    if !contine {
                         break;
                     }
                 }
@@ -376,7 +374,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                     break;
                 }
                 Err(err) => {
-                    println!("Error: {err:#}");
+                    println!("Error: {err}");
                     break;
                 }
             }

deltachat-rpc-client/pyproject.toml

@@ -21,9 +21,6 @@ deltachat_rpc_client = [
 [project.entry-points.pytest11]
 "deltachat_rpc_client.pytestplugin" = "deltachat_rpc_client.pytestplugin"
 
-[tool.setuptools_scm]
-root = ".."
-
 [tool.black]
 line-length = 120
 

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

@@ -27,7 +27,7 @@ def _to_attrdict(obj):
 
 
 class AttrDict(dict):
-    """Dictionary that allows accessing values using the "dot notation" as attributes."""
+    """Dictionary that allows accessing values usin the "dot notation" as attributes."""
 
     def __init__(self, *args, **kwargs) -> None:
         super().__init__({_camel_to_snake(key): _to_attrdict(value) for key, value in dict(*args, **kwargs).items()})

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

@@ -158,7 +158,7 @@ class Account:
         :param contact: if a contact is specified only chats including this contact are returned.
         :param archived_only: if True only archived chats are returned.
         :param for_forwarding: if True the chat list is sorted with "Saved messages" at the top
-                               and without "Device chat" and contact requests.
+                               and withot "Device chat" and contact requests.
         :param no_specials: if True archive link is not added to the list.
         :param alldone_hint: if True the "all done hint" special chat will be added to the list
                              as needed.

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

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
 
 from ._utils import AttrDict
-from .const import ChatVisibility, ViewType
+from .const import ChatVisibility
 from .contact import Contact
 from .message import Message
 
@@ -108,27 +108,15 @@ class Chat:
     async def send_message(
         self,
         text: Optional[str] = None,
-        html: Optional[str] = None,
-        viewtype: Optional[ViewType] = None,
         file: Optional[str] = None,
         location: Optional[Tuple[float, float]] = None,
-        override_sender_name: Optional[str] = None,
         quoted_msg: Optional[Union[int, Message]] = None,
     ) -> Message:
         """Send a message and return the resulting Message instance."""
         if isinstance(quoted_msg, Message):
             quoted_msg = quoted_msg.id
 
-        draft = {
-            "text": text,
-            "html": html,
-            "viewtype": viewtype,
-            "file": file,
-            "location": location,
-            "overrideSenderName": override_sender_name,
-            "quotedMessageId": quoted_msg,
-        }
-        msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
+        msg_id, _ = await self._rpc.misc_send_msg(self.account.id, self.id, text, file, location, quoted_msg)
         return Message(self.account, msg_id)
 
     async def send_text(self, text: str) -> Message:
@@ -194,23 +182,19 @@ class Chat:
         """Add contacts to this group."""
         for cnt in contact:
             if isinstance(cnt, str):
-                contact_id = (await self.account.create_contact(cnt)).id
+                cnt = (await self.account.create_contact(cnt)).id
             elif not isinstance(cnt, int):
-                contact_id = cnt.id
-            else:
-                contact_id = cnt
-            await self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
+                cnt = cnt.id
+            await self._rpc.add_contact_to_chat(self.account.id, self.id, cnt)
 
     async def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
         """Remove members from this group."""
         for cnt in contact:
             if isinstance(cnt, str):
-                contact_id = (await self.account.create_contact(cnt)).id
+                cnt = (await self.account.create_contact(cnt)).id
             elif not isinstance(cnt, int):
-                contact_id = cnt.id
-            else:
-                contact_id = cnt
-            await self._rpc.remove_contact_from_chat(self.account.id, self.id, contact_id)
+                cnt = cnt.id
+            await self._rpc.remove_contact_from_chat(self.account.id, self.id, cnt)
 
     async def get_contacts(self) -> List[Contact]:
         """Get the contacts belonging to this chat.
@@ -246,9 +230,9 @@ class Chat:
         locations = []
         contacts: Dict[int, Contact] = {}
         for loc in result:
-            location = AttrDict(loc)
-            location["chat"] = self
-            location["contact"] = contacts.setdefault(location.contact_id, Contact(self.account, location.contact_id))
-            location["message"] = Message(self.account, location.msg_id)
-            locations.append(location)
+            loc = AttrDict(loc)
+            loc["chat"] = self
+            loc["contact"] = contacts.setdefault(loc.contact_id, Contact(self.account, loc.contact_id))
+            loc["message"] = Message(self.account, loc.msg_id)
+            locations.append(loc)
         return locations

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

@@ -31,7 +31,6 @@ class EventType(str, Enum):
     SMTP_MESSAGE_SENT = "SmtpMessageSent"
     IMAP_MESSAGE_DELETED = "ImapMessageDeleted"
     IMAP_MESSAGE_MOVED = "ImapMessageMoved"
-    IMAP_INBOX_IDLE = "ImapInboxIdle"
     NEW_BLOB_FILE = "NewBlobFile"
     DELETED_BLOB_FILE = "DeletedBlobFile"
     WARNING = "Warning"

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

@@ -55,11 +55,6 @@ class ACFactory:
     async def get_online_account(self) -> Account:
         account = await self.new_configured_account()
         await account.start_io()
-        while True:
-            event = await account.wait_for_event()
-            print(event)
-            if event.type == EventType.IMAP_INBOX_IDLE:
-                break
         return account
 
     async def get_online_accounts(self, num: int) -> List[Account]:

deltachat-rpc-client/tox.ini

@@ -15,7 +15,6 @@ passenv =
 deps =
     pytest
     pytest-asyncio
-    pytest-timeout
     aiohttp
     aiodns
 
@@ -23,11 +22,8 @@ deps =
 skipsdist = True
 skip_install = True
 deps =
-    ruff
+    ruff==0.0.247
     black
 commands =
-    black --quiet --check --diff src/ examples/ tests/
+    black --check --diff src/ examples/ tests/
     ruff src/ examples/ tests/
-
-[pytest]
-timeout = 60

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.112.7"
+version = "1.109.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -9,9 +9,11 @@ license = "MPL-2.0"
 keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]
 
+[[bin]]
+name = "deltachat-rpc-server"
+
 [dependencies]
-deltachat-jsonrpc = { path = "../deltachat-jsonrpc", default-features = false }
-deltachat = { path = "..", default-features = false }
+deltachat-jsonrpc = { path = "../deltachat-jsonrpc" }
 
 anyhow = "1"
 env_logger = { version = "0.10.0" }
@@ -21,7 +23,3 @@ serde_json = "1.0.91"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.25.0", features = ["io-std"] }
 yerpc = { version = "0.4.0", features = ["anyhow_expose"] }
-
-[features]
-default = ["vendored"]
-vendored = ["deltachat-jsonrpc/vendored"]

deltachat-rpc-server/README.md

@@ -5,13 +5,10 @@ over standard I/O.
 
 ## Install
 
-To download binary pre-builds check the [releases page](https://github.com/deltachat/deltachat-core-rust/releases).
-Rename the downloaded binary to `deltachat-rpc-server` and add it to your `PATH`.
-
-To install from source run:
+To install run:
 
 ```sh
-cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server
+cargo install --path ../deltachat-rpc-server
 ```
 
 The `deltachat-rpc-server` executable will be installed into `$HOME/.cargo/bin` that should be available

deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs

@@ -1,11 +1,9 @@
-use std::env;
 ///! Delta Chat core RPC server.
 ///!
 ///! It speaks JSON Lines over stdio.
 use std::path::PathBuf;
 
-use anyhow::{anyhow, Context as _, Result};
-use deltachat::constants::DC_VERSION_STR;
+use anyhow::Result;
 use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
@@ -15,23 +13,6 @@ use yerpc::{RpcClient, RpcSession};
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
-    let mut args = env::args_os();
-    let _program_name = args.next().context("no command line arguments found")?;
-    if let Some(first_arg) = args.next() {
-        if first_arg.to_str() == Some("--version") {
-            if let Some(arg) = args.next() {
-                return Err(anyhow!("Unrecognized argument {:?}", arg));
-            }
-            eprintln!("{}", &*DC_VERSION_STR);
-            return Ok(());
-        } else {
-            return Err(anyhow!("Unrecognized option {:?}", first_arg));
-        }
-    }
-    if let Some(arg) = args.next() {
-        return Err(anyhow!("Unrecognized argument {:?}", arg));
-    }
-
     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());

deltachat_derive/src/lib.rs

@@ -5,7 +5,7 @@ use quote::quote;
 
 use crate::proc_macro::TokenStream;
 
-// For now, assume (not check) that these macros are applied to enum without
+// For now, assume (not check) that these macroses are applied to enum without
 // data.  If this assumption is violated, compiler error will point to
 // generated code, which is not very user-friendly.
 

deny.toml

@@ -1,78 +0,0 @@
-[advisories]
-unmaintained = "allow"
-ignore = [
-    "RUSTSEC-2020-0071",
-
-    # Only affects windows if using non-default allocator (and unmaintained).
-    "RUSTSEC-2021-0145",
-]
-
-[bans]
-# Accept some duplicate versions, ideally we work towards this list
-# becoming empty.  Adding versions forces us to revisit this at least
-# when upgrading.
-# Please keep this list alphabetically sorted.
-skip = [
-     { name = "base64", version = "<0.21" },
-     { name = "block-buffer", version = "<0.10" },
-     { name = "clap", version = "3.2.23" },
-     { name = "clap_lex", version = "0.2.4" },
-     { name = "convert_case", version = "0.4.0" },
-     { name = "darling", version = "<0.14" },
-     { name = "darling_core", version = "<0.14" },
-     { name = "darling_macro", version = "<0.14" },
-     { name = "digest", version = "<0.10" },
-     { name = "env_logger", version = "<0.10" },
-     { name = "getrandom", version = "<0.2" },
-     { name = "hermit-abi", version = "<0.3" },
-     { name = "humantime", version = "<2.1" },
-     { name = "idna", version = "<0.3" },
-     { name = "nom", version = "<7.1" },
-     { name = "quick-error", version = "<2.0" },
-     { name = "rand", version = "<0.8" },
-     { name = "rand_chacha", version = "<0.3" },
-     { name = "rand_core", version = "<0.6" },
-     { name = "sha2", version = "<0.10" },
-     { name = "spin", version = "<0.9.6" },
-     { name = "time", version = "<0.3" },
-     { name = "version_check", version = "<0.9" },
-     { name = "wasi", version = "<0.11" },
-     { name = "windows-sys", version = "<0.45" },
-     { name = "windows_aarch64_msvc", version = "<0.42" },
-     { name = "windows_i686_gnu", version = "<0.42" },
-     { name = "windows_i686_msvc", version = "<0.42" },
-     { name = "windows_x86_64_gnu", version = "<0.42" },
-     { name = "windows_x86_64_msvc", version = "<0.42" },
-]
-
-
-[licenses]
-allow = [
-    "0BSD",
-    "Apache-2.0",
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "BSL-1.0", # Boost Software License 1.0
-    "CC0-1.0",
-    "ISC",
-    "MIT",
-    "MPL-2.0",
-    "OpenSSL",
-    "Unicode-DFS-2016",
-    "Zlib",
-]
-
-[[licenses.clarify]]
-name = "ring"
-expression = "MIT AND ISC AND OpenSSL"
-license-files = [
-      { path = "LICENSE", hash = 0xbd0eed23 },
-]
-
-[sources.allow-org]
-# Organisations which we allow git sources from.
-github = [
-       "async-email",
-       "deltachat",
-       "quinn-rs",
-]

draft/aeap-mvp.md

@@ -66,13 +66,13 @@ Note that usually a mail is signed by a key that has a UID matching the from add
 
 #### Upsides:
 - With this approach, it's easy to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
-- Faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.
+- Faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.
 
 ### Alternatives and old discussions/plans:
 
 - Change the contact instead of rewriting the group member lists. This seems to call for more trouble since we will end up with multiple contacts having the same email address.
 
-- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the necessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.
+- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the neccessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.
 
 - The condition for a transition temporarily was:
 
@@ -107,7 +107,7 @@ The most obvious alternative would be to create a new contact with the new addre
 
 #### Upsides:
 - With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
-- (Also, less important: Slightly faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
+- (Also, less important: Slightly faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
 - It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.)
 
 [full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161)
@@ -124,4 +124,4 @@ Other
 Notes during implementing
 ========================
 
-- As far as I understand the code, unencrypted messages are unsigned. So, the transition only works if both sides have the other side's key.
+- As far as I understand the code, unencrypted messages are unsigned. So, the transition only works if both sides have the other side's key.

draft/msgwork_new_imap_jobs.rst

@@ -62,5 +62,5 @@ Notes/Questions:
 
   and design such that we can cover all imap flags.
 
-- It might not be necessary to keep needs_send_mdn state in this table
+- It might not be neccessary to keep needs_send_mdn state in this table
   if this can be decided rather when we succeed with mark_seen/mark_delete.

node/README.md

@@ -124,7 +124,7 @@ $ npm run test
 ```
 
 (when using [fnm](https://github.com/Schniz/fnm) instead of nvm, you can select the architecture)
-If your node and electron are already build for arm64 you can also try building for arm:
+If your node and electron are already build for arm64 you can also try bulding for arm:
 
 ```
 $ fnm install 16 --arch arm64
@@ -182,7 +182,7 @@ this example can also be found in the examples folder [examples/send_message.js]
 
 ### Generating Docs
 
-We are currently migrating to automatically generated documentation.
+We are curently migrating to automaticaly generated documentation.
 You can find the old documentation at [old_docs](./old_docs).
 
 to generate the documentation, run:

node/constants.js

@@ -37,7 +37,6 @@ module.exports = {
   DC_EVENT_ERROR: 400,
   DC_EVENT_ERROR_SELF_NOT_IN_GROUP: 410,
   DC_EVENT_IMAP_CONNECTED: 102,
-  DC_EVENT_IMAP_INBOX_IDLE: 106,
   DC_EVENT_IMAP_MESSAGE_DELETED: 104,
   DC_EVENT_IMAP_MESSAGE_MOVED: 105,
   DC_EVENT_IMEX_FILE_WRITTEN: 2052,
@@ -113,7 +112,6 @@ module.exports = {
   DC_QR_ADDR: 320,
   DC_QR_ASK_VERIFYCONTACT: 200,
   DC_QR_ASK_VERIFYGROUP: 202,
-  DC_QR_BACKUP: 251,
   DC_QR_ERROR: 400,
   DC_QR_FPR_MISMATCH: 220,
   DC_QR_FPR_OK: 210,
@@ -151,7 +149,6 @@ module.exports = {
   DC_STR_AEAP_EXPLANATION_AND_LINK: 123,
   DC_STR_ARCHIVEDCHATS: 40,
   DC_STR_AUDIO: 11,
-  DC_STR_BACKUP_TRANSFER_QR: 162,
   DC_STR_BAD_TIME_MSG_BODY: 85,
   DC_STR_BROADCAST_LIST: 115,
   DC_STR_CANNOT_LOGIN: 60,

node/events.js

@@ -8,7 +8,6 @@ module.exports = {
   103: 'DC_EVENT_SMTP_MESSAGE_SENT',
   104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
   105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  106: 'DC_EVENT_IMAP_INBOX_IDLE',
   150: 'DC_EVENT_NEW_BLOB_FILE',
   151: 'DC_EVENT_DELETED_BLOB_FILE',
   300: 'DC_EVENT_WARNING',

node/lib/binding.ts

@@ -2,7 +2,7 @@ import { join } from 'path'
 
 /**
  * bindings are not typed yet.
- * if the available function names are required they can be found inside of `../src/module.c`
+ * if the availible function names are required they can be found inside of `../src/module.c`
  */
 export const bindings: any = require('node-gyp-build')(join(__dirname, '../'))
 

node/lib/constants.ts

@@ -37,7 +37,6 @@ export enum C {
   DC_EVENT_ERROR = 400,
   DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410,
   DC_EVENT_IMAP_CONNECTED = 102,
-  DC_EVENT_IMAP_INBOX_IDLE = 106,
   DC_EVENT_IMAP_MESSAGE_DELETED = 104,
   DC_EVENT_IMAP_MESSAGE_MOVED = 105,
   DC_EVENT_IMEX_FILE_WRITTEN = 2052,
@@ -113,7 +112,6 @@ export enum C {
   DC_QR_ADDR = 320,
   DC_QR_ASK_VERIFYCONTACT = 200,
   DC_QR_ASK_VERIFYGROUP = 202,
-  DC_QR_BACKUP = 251,
   DC_QR_ERROR = 400,
   DC_QR_FPR_MISMATCH = 220,
   DC_QR_FPR_OK = 210,
@@ -151,7 +149,6 @@ export enum C {
   DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
   DC_STR_ARCHIVEDCHATS = 40,
   DC_STR_AUDIO = 11,
-  DC_STR_BACKUP_TRANSFER_QR = 162,
   DC_STR_BAD_TIME_MSG_BODY = 85,
   DC_STR_BROADCAST_LIST = 115,
   DC_STR_CANNOT_LOGIN = 60,
@@ -292,7 +289,6 @@ export const EventId2EventName: { [key: number]: string } = {
   103: 'DC_EVENT_SMTP_MESSAGE_SENT',
   104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
   105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  106: 'DC_EVENT_IMAP_INBOX_IDLE',
   150: 'DC_EVENT_NEW_BLOB_FILE',
   151: 'DC_EVENT_DELETED_BLOB_FILE',
   300: 'DC_EVENT_WARNING',

node/lib/context.ts

@@ -543,7 +543,7 @@ export class Context extends EventEmitter {
 
   /**
    *
-   * @deprecated please use `AccountManager.getSystemInfo()` instead
+   * @deprectated please use `AccountManager.getSystemInfo()` instead
    */
   static getSystemInfo() {
     return AccountManager.getSystemInfo()
@@ -818,7 +818,7 @@ export class Context extends EventEmitter {
    *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
    *     0 for "all up to now".
    * @return Array of locations, NULL is never returned.
-   *     The array is sorted descending;
+   *     The array is sorted decending;
    *     the first entry in the array is the location with the newest timestamp.
    *
    * Examples:

node/lib/deltachat.ts

@@ -217,7 +217,7 @@ export class AccountManager extends EventEmitter {
   /** get information about the provider
    *
    * This function creates a temporary context to be standalone,
-   * if possible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
+   * if posible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
    * @deprecated
    */
   static getProviderFromEmail(email: string) {

node/test/test.js

@@ -769,7 +769,7 @@ describe('Integration tests', function () {
   this.beforeAll(async function () {
     if (!process.env.DCC_NEW_TMP_EMAIL) {
       console.log(
-        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests'
+        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests'
       )
       this.skip()
     }
@@ -777,7 +777,7 @@ describe('Integration tests', function () {
     account = await createTempUser(process.env.DCC_NEW_TMP_EMAIL)
     if (!account || !account.email || !account.password) {
       console.log(
-        "We didn't got back an account from the api, skip integration tests"
+        "We didn't got back an account from the api, skip intergration tests"
       )
       this.skip()
     }

package.json

@@ -60,5 +60,5 @@
     "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.112.7"
+  "version": "1.109.0"
 }

python/CHANGELOG

@@ -64,7 +64,7 @@
 - use new experimental full-Rust Delta Chat core
 - support Autocrypt Setup Messages 
 - remove synchronous events 
-- use CircleCI for continuous integration and packaging of Linux wheels
+- use CircleCI for continous integration and packaging of Linux wheels
 - use docker image for building wheels
 - fix code documentation links 
 

python/pyproject.toml

@@ -21,7 +21,6 @@ classifiers = [
 dependencies = [
     "cffi>=1.0.0",
     "imap-tools",
-    "importlib_metadata;python_version<'3.8'",
     "pluggy",
     "requests",
 ]
@@ -44,14 +43,14 @@ deltachat = [
 
 [tool.setuptools_scm]
 root = ".."
-tag_regex = '^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
-git_describe_command = "git describe --dirty --tags --long --match v*.*"
+tag_regex = '^(?P<prefix>py-)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
+git_describe_command = "git describe --dirty --tags --long --match py-*.*"
 
 [tool.black]
 line-length = 120
 
 [tool.ruff]
-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"]
 line-length = 120
 
 [tool.isort]

python/src/deltachat/__init__.py

@@ -1,9 +1,6 @@
 import sys
 
-if sys.version_info >= (3, 8):
-    from importlib.metadata import PackageNotFoundError, version
-else:
-    from importlib_metadata import PackageNotFoundError, version
+from pkg_resources import DistributionNotFound, get_distribution
 
 from . import capi, events, hookspec  # noqa
 from .account import Account, get_core_info  # noqa
@@ -14,8 +11,8 @@ from .hookspec import account_hookimpl, global_hookimpl  # noqa
 from .message import Message  # noqa
 
 try:
-    __version__ = version(__name__)
-except PackageNotFoundError:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
     # package is not installed
     __version__ = "0.0.0.dev0-unknown"
 

python/src/deltachat/account.py

@@ -121,7 +121,7 @@ class Account:
         """re-enable logging."""
         self._logging = True
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         return f"<Account path={self.db_path}>"
 
     # def __del__(self):
@@ -159,7 +159,7 @@ class Account:
         """set stock translation string.
 
         :param id: id of stock string (const.DC_STR_*)
-        :param value: string to set as new translation
+        :param value: string to set as new transalation
         :returns: None
         """
         bytestring = string.encode("utf8")
@@ -284,9 +284,9 @@ class Account:
         :returns: :class:`deltachat.contact.Contact` instance.
         """
         (name, addr) = self.get_contact_addr_and_name(obj, name)
-        name_c = as_dc_charpointer(name)
-        addr_c = as_dc_charpointer(addr)
-        contact_id = lib.dc_create_contact(self._dc_context, name_c, addr_c)
+        name = as_dc_charpointer(name)
+        addr = as_dc_charpointer(addr)
+        contact_id = lib.dc_create_contact(self._dc_context, name, addr)
         return Contact(self, contact_id)
 
     def get_contact(self, obj) -> Optional[Contact]:
@@ -363,12 +363,12 @@ class Account:
         :returns: list of :class:`deltachat.contact.Contact` objects.
         """
         flags = 0
-        query_c = as_dc_charpointer(query)
+        query = as_dc_charpointer(query)
         if only_verified:
             flags |= const.DC_GCL_VERIFIED_ONLY
         if with_self:
             flags |= const.DC_GCL_ADD_SELF
-        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query_c), lib.dc_array_unref)
+        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query), lib.dc_array_unref)
         return list(iter_array(dc_array, lambda x: Contact(self, x)))
 
     def get_fresh_messages(self) -> Generator[Message, None, None]:
@@ -628,7 +628,7 @@ class Account:
             configtracker = self.configure()
             configtracker.wait_finish()
 
-        # start IO threads and configure if necessary
+        # start IO threads and configure if neccessary
         self.start_io()
 
     def add_account_plugin(self, plugin, name=None):
@@ -767,7 +767,7 @@ class Account:
 
 
 class ScannedQRCode:
-    def __init__(self, dc_lot) -> None:
+    def __init__(self, dc_lot):
         self._dc_lot = dc_lot
 
     def is_ask_verifycontact(self):

python/src/deltachat/chat.py

@@ -24,7 +24,7 @@ class Chat:
     You obtain instances of it through :class:`deltachat.account.Account`.
     """
 
-    def __init__(self, account, id: int) -> None:
+    def __init__(self, account, id) -> None:
         from .account import Account
 
         assert isinstance(account, Account), repr(account)
@@ -162,8 +162,8 @@ class Chat:
         :param name: as a unicode string.
         :returns: True on success, False otherwise
         """
-        name_c = as_dc_charpointer(name)
-        return bool(lib.dc_set_chat_name(self.account._dc_context, self.id, name_c))
+        name = as_dc_charpointer(name)
+        return bool(lib.dc_set_chat_name(self.account._dc_context, self.id, name))
 
     def get_color(self):
         """return the color of the chat.
@@ -532,13 +532,13 @@ class Chat:
 
     # ------  location streaming API ------------------------------
 
-    def is_sending_locations(self) -> bool:
+    def is_sending_locations(self):
         """return True if this chat has location-sending enabled currently.
         :returns: True if location sending is enabled.
         """
-        return bool(lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id))
+        return lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id)
 
-    def enable_sending_locations(self, seconds) -> None:
+    def enable_sending_locations(self, seconds):
         """enable sending locations for this chat.
 
         all subsequent messages will carry a location with them.
@@ -572,7 +572,7 @@ class Chat:
 
 
 class Location:
-    def __init__(self, latitude, longitude, accuracy, timestamp, marker) -> None:
+    def __init__(self, latitude, longitude, accuracy, timestamp, marker):
         assert isinstance(timestamp, datetime)
         self.latitude = latitude
         self.longitude = longitude
@@ -580,5 +580,5 @@ class Location:
         self.timestamp = timestamp
         self.marker = marker
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other):
         return self.__dict__ == other.__dict__

python/src/deltachat/contact.py

@@ -15,7 +15,7 @@ class Contact:
     You obtain instances of it through :class:`deltachat.account.Account`.
     """
 
-    def __init__(self, account, id) -> None:
+    def __init__(self, account, id):
         from .account import Account
 
         assert isinstance(account, Account), repr(account)
@@ -27,10 +27,10 @@ class Contact:
             return False
         return self.account._dc_context == other.account._dc_context and self.id == other.id
 
-    def __ne__(self, other) -> bool:
+    def __ne__(self, other):
         return not self == other
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         return f"<Contact id={self.id} addr={self.addr} dc_context={self.account._dc_context}>"
 
     @property

python/src/deltachat/direct_imap.py

@@ -191,7 +191,7 @@ class DirectImap:
 
 
 class IdleManager:
-    def __init__(self, direct_imap) -> None:
+    def __init__(self, direct_imap):
         self.direct_imap = direct_imap
         self.log = direct_imap.account.log
         # fetch latest messages before starting idle so that it only

python/src/deltachat/events.py

@@ -25,12 +25,12 @@ def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
 
 
 class FFIEvent:
-    def __init__(self, name: str, data1, data2) -> None:
+    def __init__(self, name: str, data1, data2):
         self.name = name
         self.data1 = data1
         self.data2 = data2
 
-    def __str__(self) -> str:
+    def __str__(self):
         if self.name == "DC_EVENT_INFO":
             return f"INFO {self.data2}"
         if self.name == "DC_EVENT_WARNING":
@@ -84,10 +84,7 @@ class FFIEventLogger:
 
 
 class FFIEventTracker:
-    account: Account
-    _event_queue: Queue
-
-    def __init__(self, account: Account, timeout=None) -> None:
+    def __init__(self, account, timeout=None):
         self.account = account
         self._timeout = timeout
         self._event_queue = Queue()
@@ -190,7 +187,7 @@ class FFIEventTracker:
         - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
         - therefore no DC_EVENT_INCOMING_MSG is sent
         """
-        self.get_matching("DC_EVENT_IMAP_INBOX_IDLE")
+        self.get_info_contains("INBOX: Idle entering")
 
     def wait_next_incoming_message(self):
         """wait for and return next incoming message."""

python/src/deltachat/message.py

@@ -19,7 +19,7 @@ class Message:
     :class:`deltachat.chat.Chat`.
     """
 
-    def __init__(self, account, dc_msg) -> None:
+    def __init__(self, account, dc_msg):
         self.account = account
         assert isinstance(self.account._dc_context, ffi.CData)
         assert isinstance(dc_msg, ffi.CData)
@@ -33,7 +33,7 @@ class Message:
             return False
         return self.account == other.account and self.id == other.id
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         c = self.get_sender_contact()
         typ = "outgoing" if self.is_outgoing() else "incoming"
         return (

python/src/deltachat/reactions.py

@@ -10,14 +10,14 @@ class Reactions:
     You obtain instances of it through :class:`deltachat.message.Message`.
     """
 
-    def __init__(self, account, dc_reactions) -> None:
+    def __init__(self, account, dc_reactions):
         assert isinstance(account._dc_context, ffi.CData)
         assert isinstance(dc_reactions, ffi.CData)
         assert dc_reactions != ffi.NULL
         self.account = account
         self._dc_reactions = dc_reactions
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         return f"<Reactions dc_reactions={self._dc_reactions}>"
 
     @classmethod

python/src/deltachat/testplugin.py

@@ -9,7 +9,7 @@ import threading
 import time
 import weakref
 from queue import Queue
-from typing import Callable, List, Optional, Dict, Set
+from typing import Callable, List, Optional
 
 import pytest
 import requests
@@ -60,13 +60,13 @@ def pytest_configure(config):
 
     # Make sure we don't get garbled output because threads keep running
     # collect all ever created accounts in a weakref-set (so we don't
-    # keep objects unnecessarily alive) and enable/disable logging
+    # keep objects unneccessarily alive) and enable/disable logging
     # for each pytest test phase # (setup/call/teardown).
     # Additionally make the acfactory use a logging/no-logging default.
 
     class LoggingAspect:
-        def __init__(self) -> None:
-            self._accounts: weakref.WeakSet = weakref.WeakSet()
+        def __init__(self):
+            self._accounts = weakref.WeakSet()
 
         @deltachat.global_hookimpl
         def dc_account_init(self, account):
@@ -129,7 +129,7 @@ def pytest_report_header(config, startdir):
     if cfg:
         if "?" in cfg:
             url, token = cfg.split("?", 1)
-            summary.append(f"Liveconfig provider: {url}?<token omitted>")
+            summary.append(f"Liveconfig provider: {url}?<token ommitted>")
         else:
             summary.append(f"Liveconfig file: {cfg}")
     return summary
@@ -143,12 +143,10 @@ def testprocess(request):
 class TestProcess:
     """A pytest session-scoped instance to help with managing "live" account configurations."""
 
-    _addr2files: Dict[str, Dict[pathlib.Path, bytes]]
-
-    def __init__(self, pytestconfig) -> None:
+    def __init__(self, pytestconfig):
         self.pytestconfig = pytestconfig
         self._addr2files = {}
-        self._configlist: List[Dict[str, str]] = []
+        self._configlist = []
 
     def get_liveconfig_producer(self):
         """provide live account configs, cached on a per-test-process scope
@@ -279,10 +277,10 @@ class ACSetup:
 
     _configured_events: Queue
 
-    def __init__(self, testprocess, init_time) -> None:
+    def __init__(self, testprocess, init_time):
         self._configured_events = Queue()
-        self._account2state: Dict[Account, str] = {}
-        self._imap_cleaned: Set[str] = set()
+        self._account2state = {}
+        self._imap_cleaned = set()
         self.testprocess = testprocess
         self.init_time = init_time
 

python/src/deltachat/tracker.py

@@ -1,25 +1,19 @@
 from queue import Queue
 from threading import Event
-from typing import List, TYPE_CHECKING
 
 from .hookspec import Global, account_hookimpl
 
-if TYPE_CHECKING:
-    from .events import FFIEvent
-
 
 class ImexFailed(RuntimeError):
     """Exception for signalling that import/export operations failed."""
 
 
 class ImexTracker:
-    _imex_events: Queue
-
-    def __init__(self) -> None:
+    def __init__(self):
         self._imex_events = Queue()
 
     @account_hookimpl
-    def ac_process_ffi_event(self, ffi_event: "FFIEvent") -> None:
+    def ac_process_ffi_event(self, ffi_event):
         if ffi_event.name == "DC_EVENT_IMEX_PROGRESS":
             self._imex_events.put(ffi_event.data1)
         elif ffi_event.name == "DC_EVENT_IMEX_FILE_WRITTEN":
@@ -56,13 +50,7 @@ class ConfigureFailed(RuntimeError):
 class ConfigureTracker:
     ConfigureFailed = ConfigureFailed
 
-    _configure_events: Queue
-    _smtp_finished: Event
-    _imap_finished: Event
-    _ffi_events: List["FFIEvent"]
-    _progress: Queue
-
-    def __init__(self, account) -> None:
+    def __init__(self, account):
         self.account = account
         self._configure_events = Queue()
         self._smtp_finished = Event()
@@ -72,7 +60,7 @@ class ConfigureTracker:
         self._gm = Global._get_plugin_manager()
 
     @account_hookimpl
-    def ac_process_ffi_event(self, ffi_event: "FFIEvent") -> None:
+    def ac_process_ffi_event(self, ffi_event):
         self._ffi_events.append(ffi_event)
         if ffi_event.name == "DC_EVENT_SMTP_CONNECTED":
             self._smtp_finished.set()

python/tests/auditwheels.py

@@ -0,0 +1,19 @@
+import os
+import subprocess
+import sys
+
+if __name__ == "__main__":
+    assert len(sys.argv) == 2
+    workspacedir = sys.argv[1]
+    for relpath in os.listdir(workspacedir):
+        if relpath.startswith("deltachat"):
+            p = os.path.join(workspacedir, relpath)
+            subprocess.check_call(
+                [
+                    "auditwheel",
+                    "repair",
+                    p,
+                    "-w",
+                    workspacedir,
+                ],
+            )

python/tests/stress_test_db.py

@@ -77,7 +77,7 @@ class ReportType:
 
 
 class AutoReplier:
-    def __init__(self, account, log, num_send, num_bigfiles, report_func) -> None:
+    def __init__(self, account, log, num_send, num_bigfiles, report_func):
         self.account = account
         self._log = log
         self.report_func = report_func
@@ -90,7 +90,7 @@ class AutoReplier:
         self._thread.setDaemon(True)
         self._thread.start()
 
-    def log(self, message) -> None:
+    def log(self, message):
         self._log(f"{self.addr} {message}")
 
     def thread_stats(self):

python/tests/test_0_complex_or_slow.py

@@ -220,16 +220,16 @@ def test_fetch_existing(acfactory, lp, mvbox_move):
     acfactory.bring_accounts_online()
     assert_folders_configured(ac1)
 
-    lp.sec("send out message with bcc to ourselves")
-    ac1.set_config("bcc_self", "1")
-    chat = acfactory.get_accepted_chat(ac1, ac2)
-    chat.send_text("message text")
+    assert ac1.direct_imap.select_config_folder("mvbox" if mvbox_move else "inbox")
+    with ac1.direct_imap.idle() as idle1:
+        lp.sec("send out message with bcc to ourselves")
+        ac1.set_config("bcc_self", "1")
+        chat = acfactory.get_accepted_chat(ac1, ac2)
+        chat.send_text("message text")
+        assert_folders_configured(ac1)
 
-    lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
-    if mvbox_move:
-        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
-    else:
-        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+        lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
+        assert idle1.wait_for_seen()
     assert_folders_configured(ac1)
 
     lp.sec("create a cloned ac1 and fetch contact history during configure")
@@ -271,12 +271,12 @@ def test_fetch_existing_msgs_group_and_single(acfactory, lp):
     ac1._evtracker.wait_next_incoming_message()
 
     lp.sec("send out message with bcc to ourselves")
-    ac1.set_config("bcc_self", "1")
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
-
-    # wait until the bcc_self message arrives
-    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+    with ac1.direct_imap.idle() as idle1:
+        ac1.set_config("bcc_self", "1")
+        ac1_ac2_chat = ac1.create_chat(ac2)
+        ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
+        # wait until the bcc_self message arrives
+        assert idle1.wait_for_seen()
 
     lp.sec("Clone online account and let it fetch the existing messages")
     ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)

python/tests/test_1_online.py

@@ -72,19 +72,6 @@ def test_configure_canceled(acfactory):
         pass
 
 
-def test_configure_unref(tmpdir):
-    """Test that removing the last reference to the context during ongoing configuration
-    does not result in use-after-free."""
-    from deltachat.capi import ffi, lib
-
-    path = tmpdir.mkdir("test_configure_unref").join("dc.db").strpath
-    dc_context = lib.dc_context_new(ffi.NULL, path.encode("utf8"), ffi.NULL)
-    lib.dc_set_config(dc_context, "addr".encode("utf8"), "foo@x.testrun.org".encode("utf8"))
-    lib.dc_set_config(dc_context, "mail_pw".encode("utf8"), "abc".encode("utf8"))
-    lib.dc_configure(dc_context)
-    lib.dc_context_unref(dc_context)
-
-
 def test_export_import_self_keys(acfactory, tmpdir, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
 
@@ -134,27 +121,22 @@ def test_one_account_send_bcc_setting(acfactory, lp):
     ac1.set_config("bcc_self", "1")
 
     lp.sec("send out message with bcc to ourselves")
-    msg_out = chat.send_text("message2")
+    with ac1.direct_imap.idle() as idle1:
+        msg_out = chat.send_text("message2")
 
-    # wait for send out (BCC)
-    ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-    assert ac1.get_config("bcc_self") == "1"
+        # wait for send out (BCC)
+        ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert ac1.get_config("bcc_self") == "1"
 
-    # Second client receives only second message, but not the first.
+        # now make sure we are sending message to ourselves too
+        assert self_addr in ev.data2
+        assert other_addr in ev.data2
+        assert idle1.wait_for_seen()
+
+    # Second client receives only second message, but not the first
     ev_msg = ac1_clone._evtracker.wait_next_messages_changed()
     assert ev_msg.text == msg_out.text
 
-    # now make sure we are sending message to ourselves too
-    assert self_addr in ev.data2
-    assert other_addr in ev.data2
-
-    # BCC-self messages are marked as seen by the sender device.
-    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
-
-    # Check that the message is marked as seen on IMAP.
-    ac1.direct_imap.select_folder("Inbox")
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-
 
 def test_send_file_twice_unicode_filename_mangling(tmpdir, acfactory, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
@@ -222,13 +204,13 @@ def test_html_message(acfactory, lp):
     lp.sec("ac1: prepare and send text message to ac2")
     msg1 = chat.send_text("message0")
     assert not msg1.has_html()
-    assert not msg1.html
+    assert msg1.html == ""
 
     lp.sec("wait for ac2 to receive message")
     msg2 = ac2._evtracker.wait_next_incoming_message()
     assert msg2.text == "message0"
     assert not msg2.has_html()
-    assert not msg2.html
+    assert msg2.html == ""
 
     lp.sec("ac1: prepare and send HTML+text message to ac2")
     msg1 = Message.new_empty(ac1, "text")
@@ -319,9 +301,6 @@ def test_webxdc_message(acfactory, data, lp):
     assert msg2.text == "message1"
     assert msg2.is_webxdc()
     assert msg2.filename
-    ac2._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
-    ac2.direct_imap.select_folder("Inbox")
-    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1
 
 
 def test_mvbox_sentbox_threads(acfactory, lp):
@@ -521,22 +500,22 @@ def test_send_and_receive_message_markseen(acfactory, lp):
     msg4 = ac2._evtracker.wait_next_incoming_message()
 
     lp.sec("mark messages as seen on ac2, wait for changes on ac1")
-    ac2.mark_seen_messages([msg2, msg4])
-    ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
-    assert msg2.chat.id == msg4.chat.id
-    assert ev.data1 == msg2.chat.id
-    assert ev.data2 == 0
-    ac2._evtracker.get_info_contains("Marked messages .* in folder INBOX as seen.")
+    with ac1.direct_imap.idle() as idle1:
+        with ac2.direct_imap.idle() as idle2:
+            ac2.mark_seen_messages([msg2, msg4])
+            ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+            assert msg2.chat.id == msg4.chat.id
+            assert ev.data1 == msg2.chat.id
+            assert ev.data2 == 0
+            idle2.wait_for_seen()
 
-    lp.step("1")
-    for _i in range(2):
-        ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
-        assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
-    lp.step("2")
-
-    # Check that ac1 marks the read receipt as read.
-    ac1._evtracker.get_info_contains("Marked messages .* in folder INBOX as seen.")
+        lp.step("1")
+        for _i in range(2):
+            ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
+            assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
+            assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
+        lp.step("2")
+        idle1.wait_for_seen()  # Check that ac1 marks the read receipt as read
 
     assert msg1.is_out_mdn_received()
     assert msg3.is_out_mdn_received()
@@ -621,24 +600,18 @@ def test_markseen_message_and_mdn(acfactory, mvbox_move):
     # Do not send BCC to self, we only want to test MDN on ac1.
     ac1.set_config("bcc_self", "0")
 
-    acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
-    msg = ac2._evtracker.wait_next_incoming_message()
-
-    ac2.mark_seen_messages([msg])
-
     folder = "mvbox" if mvbox_move else "inbox"
-    for ac in [ac1, ac2]:
-        if mvbox_move:
-            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
-        else:
-            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
     ac1.direct_imap.select_config_folder(folder)
     ac2.direct_imap.select_config_folder(folder)
+    with ac1.direct_imap.idle() as idle1:
+        with ac2.direct_imap.idle() as idle2:
+            acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
+            msg = ac2._evtracker.wait_next_incoming_message()
 
-    # Check that the mdn is marked as seen
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-    # Check original message is marked as seen
-    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1
+            ac2.mark_seen_messages([msg])
+
+            idle2.wait_for_seen()  # Check original message is marked as seen
+            idle1.wait_for_seen()  # Check that the mdn is marked as seen
 
 
 def test_reply_privately(acfactory):
@@ -692,24 +665,23 @@ def test_mdn_asymmetric(acfactory, lp):
 
     assert len(msg.chat.get_messages()) == 1
 
-    lp.sec("ac2: mark incoming message as seen")
-    ac2.mark_seen_messages([msg])
+    ac1.direct_imap.select_config_folder("mvbox")
+    with ac1.direct_imap.idle() as idle1:
+        lp.sec("ac2: mark incoming message as seen")
+        ac2.mark_seen_messages([msg])
 
-    lp.sec("ac1: waiting for incoming activity")
-    # MDN should be moved even though MDNs are already disabled
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+        lp.sec("ac1: waiting for incoming activity")
+        # MDN should be moved even though MDNs are already disabled
+        ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
 
-    assert len(chat.get_messages()) == 1
+        assert len(chat.get_messages()) == 1
 
-    # Wait for the message to be marked as seen on IMAP.
-    ac1._evtracker.get_info_contains("Marked messages 1 in folder DeltaChat as seen.")
+        # Wait for the message to be marked as seen on IMAP.
+        assert idle1.wait_for_seen()
 
     # MDN is received even though MDNs are already disabled
     assert msg_out.is_out_mdn_received()
 
-    ac1.direct_imap.select_config_folder("mvbox")
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-
 
 def test_send_and_receive_will_encrypt_decrypt(acfactory, lp):
     ac1, ac2 = acfactory.get_online_accounts(2)
@@ -1512,7 +1484,7 @@ def test_import_export_online_all(acfactory, tmpdir, data, lp):
 
 def test_ac_setup_message(acfactory, lp):
     # note that the receiving account needs to be configured and running
-    # before the setup message is send. DC does not read old messages
+    # before ther setup message is send. DC does not read old messages
     # as of Jul2019
     ac1 = acfactory.new_online_configuring_account()
     ac2 = acfactory.new_online_configuring_account(cloned_from=ac1)
@@ -1632,7 +1604,7 @@ def test_add_remove_member_remote_events(acfactory, lp):
     in_list = queue.Queue()
 
     class EventHolder:
-        def __init__(self, **kwargs) -> None:
+        def __init__(self, **kwargs):
             self.__dict__.update(kwargs)
 
     class InPlugin:
@@ -2015,16 +1987,13 @@ def test_delete_multiple_messages(acfactory, lp):
     lp.sec("ac2: deleting all messages except third")
     assert len(to_delete) == len(texts) - 1
     ac2.delete_messages(to_delete)
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+
+    ac2._evtracker.get_info_contains("close/expunge succeeded")
 
     lp.sec("ac2: test that only one message is left")
-    while 1:
-        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-        ac2._evtracker.get_info_contains("close/expunge succeeded")
-        ac2.direct_imap.select_config_folder("inbox")
-        nr_msgs = len(ac2.direct_imap.get_all_messages())
-        assert nr_msgs > 0
-        if nr_msgs == 1:
-            break
+    ac2.direct_imap.select_config_folder("inbox")
+    assert len(ac2.direct_imap.get_all_messages()) == 1
 
 
 def test_trash_multiple_messages(acfactory, lp):
@@ -2048,15 +2017,11 @@ def test_trash_multiple_messages(acfactory, lp):
     lp.sec("ac2: deleting all messages except second")
     assert len(to_delete) == len(texts) - 1
     ac2.delete_messages(to_delete)
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
 
     lp.sec("ac2: test that only one message is left")
-    while 1:
-        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-        ac2.direct_imap.select_config_folder("inbox")
-        nr_msgs = len(ac2.direct_imap.get_all_messages())
-        assert nr_msgs > 0
-        if nr_msgs == 1:
-            break
+    ac2.direct_imap.select_config_folder("inbox")
+    assert len(ac2.direct_imap.get_all_messages()) == 1
 
 
 def test_configure_error_msgs_wrong_pw(acfactory):
@@ -2165,7 +2130,7 @@ def test_status(acfactory):
     chat12.send_text("hello")
     msg = ac2._evtracker.wait_next_incoming_message()
     assert msg.text == "hello"
-    assert not msg.get_sender_contact().status
+    assert msg.get_sender_contact().status == ""
 
 
 def test_group_quote(acfactory, lp):

python/tests/test_3_offline.py

@@ -295,8 +295,8 @@ class TestOfflineChat:
         assert d["archived"] == chat.is_archived()
         # assert d["param"] == chat.param
         assert d["color"] == chat.get_color()
-        assert not d["profile_image"] if chat.get_profile_image() is None else chat.get_profile_image()
-        assert not d["draft"] if chat.get_draft() is None else chat.get_draft()
+        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
+        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()
 
     def test_group_chat_creation_with_translation(self, ac1):
         ac1.set_stock_translation(const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")

python/tests/test_4_lowlevel.py

@@ -151,7 +151,7 @@ def test_markseen_invalid_message_ids(acfactory):
     ac1 = acfactory.get_pseudo_configured_account()
     contact1 = ac1.create_contact("some1@example.com", name="some1")
     chat = contact1.create_chat()
-    chat.send_text("one message")
+    chat.send_text("one messae")
     ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
     msg_ids = [9]
     lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))

python/tox.ini

@@ -33,6 +33,18 @@ passenv =
     CARGO_TARGET_DIR
     RUSTC_WRAPPER
 
+[testenv:auditwheels]
+skipsdist = True
+deps = auditwheel
+passenv =
+    DCC_RS_DEV
+    DCC_RS_TARGET
+    AUDITWHEEL_ARCH
+    AUDITWHEEL_PLAT
+    AUDITWHEEL_POLICY
+commands = 
+    python tests/auditwheels.py {toxworkdir}/wheelhouse
+
 [testenv:lint]
 skipsdist = True
 skip_install = True
@@ -43,7 +55,7 @@ deps =
     pygments
     restructuredtext_lint 
 commands =
-    black --quiet --check --diff setup.py install_python_bindings.py src/deltachat examples/ tests/
+    black --check --diff setup.py install_python_bindings.py src/deltachat examples/ tests/
     ruff src/deltachat tests/ examples/
     rst-lint --encoding 'utf-8' README.rst
 

scripts/README.md

@@ -8,8 +8,6 @@ and an own build machine.
 
 - `clippy.sh` runs `cargo clippy` for all Rust code in the project.
 
-- `deny.sh` runs `cargo deny` for all Rust code in the project.
-
 - `../.github/workflows` contains jobs run by GitHub Actions.
 
 - `remote_tests_python.sh` rsyncs to a build machine and runs
@@ -22,10 +20,6 @@ and an own build machine.
 
 - `run_all.sh` builds Python wheels
 
-- `zig-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Zig toolchain statically linked against musl libc.
-
-- `android-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Android NDK.
-
 ## Triggering runs on the build machine locally (fast!)
 
 There is experimental support for triggering a remote Python or Rust test run 

scripts/clippy.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 # Run clippy for all Rust code in the project.
-cargo clippy --workspace --all-targets --all-features -- -D warnings
+cargo clippy --workspace --tests --examples --benches -- -D warnings

scripts/codespell.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-codespell \
-  --skip './test-data,./.git,node_modules,.mypy_cache,./src/provider/data.rs,.tox,site-packages,target,Cargo.lock,*.js.map,package-lock.json,./proptest-regressions' \
-  --ignore-words-list crate,keypair,keypairs,iif

scripts/concourse/docs_wheels.yml

@@ -1,370 +1,370 @@
 resources:
-  - name: deltachat-core-rust
-    type: git
-    icon: github
-    source:
-      branch: master
-      uri: https://github.com/deltachat/deltachat-core-rust.git
+- name: deltachat-core-rust
+  type: git
+  icon: github
+  source:
+    branch: master
+    uri: https://github.com/deltachat/deltachat-core-rust.git
 
-  - name: deltachat-core-rust-release
-    type: git
-    icon: github
-    source:
-      branch: master
-      uri: https://github.com/deltachat/deltachat-core-rust.git
-      tag_filter: "v*"
+- name: deltachat-core-rust-release
+  type: git
+  icon: github
+  source:
+    branch: master
+    uri: https://github.com/deltachat/deltachat-core-rust.git
+    tag_filter: "py-*"
 
 jobs:
-  - name: doxygen
-    plan:
-      - get: deltachat-core-rust
-        trigger: true
+- name: doxygen
+  plan:
+  - get: deltachat-core-rust
+    trigger: true
 
-      # Build Doxygen documentation
-      - task: build-doxygen
-        config:
-          inputs:
-            - name: deltachat-core-rust
-          outputs:
-            - name: c-docs
-          image_resource:
-            source:
-              repository: alpine
-            type: registry-image
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache doxygen git
-                cd deltachat-core-rust
-                scripts/run-doxygen.sh
-                cd ..
-                cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/
+  # Build Doxygen documentation
+  - task: build-doxygen
+    config:
+      inputs:
+        - name: deltachat-core-rust
+      outputs:
+        - name: c-docs
+      image_resource:
+        source:
+          repository: alpine
+        type: registry-image
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache doxygen git
+          cd deltachat-core-rust
+          scripts/run-doxygen.sh
+          cd ..
+          cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/
 
-      - task: upload-c-docs
-        config:
-          inputs:
-            - name: c-docs
-          image_resource:
-            type: registry-image
-            source:
-              repository: alpine
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache rsync openssh-client
-                mkdir -p ~/.ssh
-                chmod 700 ~/.ssh
-                echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
-                chmod 600 ~/.ssh/id_ed25519
-                rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete c-docs/html/ delta@c.delta.chat:build-c/master
+  - task: upload-c-docs
+    config:
+      inputs:
+        - name: c-docs
+      image_resource:
+        type: registry-image
+        source:
+          repository: alpine
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache rsync openssh-client
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete c-docs/html/ delta@c.delta.chat:build-c/master
 
-  - name: python-x86_64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-x86_64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true
 
-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_x86_64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_x86_64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build
 
-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-docs
-              path: ./python/doc/_build/
-            # Binary wheels
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-docs
+          path: ./python/doc/_build/
+        # Binary wheels
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh
 
-      # Upload python docs to py.delta.chat
-      - task: upload-py-docs
-        config:
-          inputs:
-            - name: py-docs
-          image_resource:
-            type: registry-image
-            source:
-              repository: alpine
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache rsync openssh-client
-                mkdir -p ~/.ssh
-                chmod 700 ~/.ssh
-                echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
-                chmod 600 ~/.ssh/id_ed25519
-                rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete py-docs/html/ delta@py.delta.chat:build/master
+  # Upload python docs to py.delta.chat
+  - task: upload-py-docs
+    config:
+      inputs:
+        - name: py-docs
+      image_resource:
+        type: registry-image
+        source:
+          repository: alpine
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache rsync openssh-client
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete py-docs/html/ delta@py.delta.chat:build/master
 
-      # Upload x86_64 wheels and source packages
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*manylinux201*
+  # Upload x86_64 wheels and source packages
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*manylinux201*
 
-  - name: python-aarch64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-aarch64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true
 
-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_aarch64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_aarch64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build
 
-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh
 
-      # Upload aarch64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*manylinux201*
+  # Upload aarch64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*manylinux201*
 
-  - name: python-musl-x86_64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-musl-x86_64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true
 
-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_x86_64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_x86_64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build
 
-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh
 
-      # Upload musl x86_64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*musllinux_1_1_x86_64*
+  # Upload musl x86_64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*musllinux_1_1_x86_64*
 
-  - name: python-musl-aarch64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-musl-aarch64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true
 
-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_aarch64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_aarch64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build
 
-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh
 
-      # Upload musl aarch64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*musllinux_1_1_aarch64*
+  # Upload musl aarch64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*musllinux_1_1_aarch64*

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.68.0
+RUST_VERSION=1.64.0
 
 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

scripts/deny.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-cargo deny --workspace --all-features check -D warnings

scripts/run_all.sh

@@ -31,9 +31,7 @@ unset DCC_NEW_TMP_EMAIL
 
 # Try to build wheels for a range of interpreters, but don't fail if they are not available.
 # E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
-tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true
-
-auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse"
+tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39,auditwheels --skip-missing-interpreters true
 
 
 echo -----------------------

scripts/set_core_version.py

@@ -93,7 +93,7 @@ def main():
     if "alpha" not in newversion:
         for line in open("CHANGELOG.md"):
             ## 1.25.0
-            if line.startswith("## [") and line[4:].strip().startswith(newversion):
+            if line.startswith("## ") and line[2:].strip().startswith(newversion):
                 break
         else:
             raise SystemExit(
@@ -115,8 +115,10 @@ def main():
 
     print("after commit, on master make sure to: ")
     print("")
-    print(f"   git tag -a v{newversion}")
-    print(f"   git push origin v{newversion}")
+    print(f"   git tag -a {newversion}")
+    print(f"   git push origin {newversion}")
+    print(f"   git tag -a py-{newversion}")
+    print(f"   git push origin py-{newversion}")
     print("")
 
 

scripts/update-provider-database.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Updates provider database.
-# Returns 1 if the database is changed, 0 otherwise.
-set -euo pipefail
-
-export TZ=UTC
-
-# Provider database revision.
-REV=3c8f7e846c915a183dc44536fb5480d1f25d7c42
-
-CORE_ROOT="$PWD"
-TMP="$(mktemp -d)"
-git clone --filter=blob:none https://github.com/deltachat/provider-db.git "$TMP"
-cd "$TMP"
-git checkout "$REV"
-DATE=$(git show -s --format=%cs)
-"$CORE_ROOT"/scripts/create-provider-data-rs.py "$TMP/_providers" "$DATE" >"$CORE_ROOT/src/provider/data.rs"
-rustfmt "$CORE_ROOT/src/provider/data.rs"
-rm -fr "$TMP"
-
-cd "$CORE_ROOT"
-test -z "$(git status --porcelain src/provider/data.rs)"

scripts/zig-rpc-server.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Build statically linked deltachat-rpc-server using cargo-zigbuild.
-
-set -x
-set -e
-
-unset RUSTFLAGS
-
-ZIG_VERSION=0.11.0-dev.2213+515e1c93e
-
-# Download Zig
-rm -fr "$ZIG_VERSION" "zig-linux-x86_64-$ZIG_VERSION.tar.xz"
-wget "https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VERSION.tar.xz"
-tar xf "zig-linux-x86_64-$ZIG_VERSION.tar.xz"
-export PATH="$PWD/zig-linux-x86_64-$ZIG_VERSION:$PATH"
-
-cargo install cargo-zigbuild
-
-for TARGET in x86_64-unknown-linux-musl aarch64-unknown-linux-musl armv7-unknown-linux-musleabihf; do
-	rustup target add "$TARGET"
-	cargo zigbuild --release --target "$TARGET" -p deltachat-rpc-server --features vendored
-done

spec.md

@@ -339,13 +339,13 @@ only on image changes.
 
 In older specs, the profile-image was sent as an attachment
 and `Chat-User-Avatar:` specified its name.
-However, it turned out that these attachments are kind of unuexpected to users,
+However, it turned out that these attachements are kind of unuexpected to users,
 therefore the profile-image go to the header now.
 
 
 # Locations
 
-Locations can be attached to messages using
+Locations can be attachted to messages using
 [standard kml-files](https://www.opengeospatial.org/standards/kml/)
 with well-known names.
 

src/accounts.rs

@@ -262,7 +262,7 @@ impl Accounts {
     pub async fn stop_io(&self) {
         // Sending an event here wakes up event loop even
         // if there are no accounts.
-        info!(self, "Stopping IO for all accounts.");
+        info!(self, "Stopping IO for all accounts");
         for account in self.accounts.values() {
             account.stop_io().await;
         }
@@ -271,14 +271,14 @@ impl Accounts {
     /// Notifies all accounts that the network may have become available.
     pub async fn maybe_network(&self) {
         for account in self.accounts.values() {
-            account.scheduler.maybe_network().await;
+            account.maybe_network().await;
         }
     }
 
     /// Notifies all accounts that the network connection may have been lost.
     pub async fn maybe_network_lost(&self) {
         for account in self.accounts.values() {
-            account.scheduler.maybe_network_lost(account).await;
+            account.maybe_network_lost().await;
         }
     }
 
@@ -427,7 +427,7 @@ impl Config {
         Ok(cfg)
     }
 
-    /// Removes an existing account entirely.
+    /// Removes an existing acccount entirely.
     pub async fn remove_account(&mut self, id: u32) -> Result<()> {
         {
             if let Some(idx) = self.inner.accounts.iter().position(|e| e.id == id) {
@@ -476,18 +476,15 @@ impl Config {
 struct AccountConfig {
     /// Unique id.
     pub id: u32,
-
     /// Root directory for all data for this account.
     ///
     /// The path is relative to the account manager directory.
     pub dir: std::path::PathBuf,
-
-    /// Universally unique account identifier.
     pub uuid: Uuid,
 }
 
 impl AccountConfig {
-    /// Get the canonical dbfile name for this configuration.
+    /// Get the canoncial dbfile name for this configuration.
     pub fn dbfile(&self, accounts_dir: &Path) -> std::path::PathBuf {
         accounts_dir.join(&self.dir).join(DB_NAME)
     }

src/aheader.rs

@@ -235,7 +235,7 @@ mod tests {
         assert!(Aheader::from_str("foo").is_err());
         assert!(Aheader::from_str("\n\n\n").is_err());
         assert!(Aheader::from_str(" ;;").is_err());
-        assert!(Aheader::from_str("addr=a@t.de; unknown=1; keydata=jau").is_err());
+        assert!(Aheader::from_str("addr=a@t.de; unknwon=1; keydata=jau").is_err());
     }
 
     #[test]

src/authres.rs

@@ -334,7 +334,7 @@ async fn set_dkim_works_timestamp(
 async fn clear_dkim_works(context: &Context) -> Result<()> {
     context
         .sql
-        .execute("DELETE FROM sending_domains", ())
+        .execute("DELETE FROM sending_domains", paramsv![])
         .await?;
     Ok(())
 }
@@ -644,7 +644,6 @@ Authentication-Results: dkim=";
             .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();
@@ -822,8 +821,7 @@ 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"));
+        assert!(rcvd.error.unwrap().contains("DKIM failed"));
         // The message info should contain a warning:
         assert!(message::get_msg_info(&bob, rcvd.id)
             .await

src/blob.rs

@@ -4,16 +4,13 @@ use core::cmp::max;
 use std::ffi::OsStr;
 use std::fmt;
 use std::io::Cursor;
-use std::iter::FusedIterator;
 use std::path::{Path, PathBuf};
 
 use anyhow::{format_err, Context as _, Result};
-use futures::StreamExt;
 use image::{DynamicImage, ImageFormat};
 use num_traits::FromPrimitive;
 use tokio::io::AsyncWriteExt;
 use tokio::{fs, io};
-use tokio_stream::wrappers::ReadDirStream;
 
 use crate::config::Config;
 use crate::constants::{
@@ -163,9 +160,9 @@ impl<'a> BlobObject<'a> {
     pub fn from_path(context: &'a Context, path: &Path) -> Result<BlobObject<'a>> {
         let rel_path = path
             .strip_prefix(context.get_blobdir())
-            .with_context(|| format!("wrong blobdir: {}", path.display()))?;
+            .context("wrong blobdir")?;
         if !BlobObject::is_acceptible_blob_name(rel_path) {
-            return Err(format_err!("bad blob name: {}", rel_path.display()));
+            return Err(format_err!("wrong name"));
         }
         let name = rel_path.to_str().context("wrong name")?;
         BlobObject::from_name(context, name.to_string())
@@ -417,7 +414,7 @@ impl<'a> BlobObject<'a> {
 
                             info!(
                                 context,
-                                "Final scaled-down image size: {}B ({}px).",
+                                "Final scaled-down image size: {}B ({}px)",
                                 encoded.len(),
                                 img_wh
                             );
@@ -458,7 +455,7 @@ impl<'a> BlobObject<'a> {
                 Some(3) => return Ok(180),
                 Some(6) => return Ok(90),
                 Some(8) => return Ok(270),
-                other => warn!(context, "Exif orientation value ignored: {other:?}."),
+                other => warn!(context, "exif orientation value ignored: {:?}", other),
             }
         }
         Ok(0)
@@ -471,87 +468,6 @@ impl<'a> fmt::Display for BlobObject<'a> {
     }
 }
 
-/// All files in the blobdir.
-///
-/// This exists so we can have a [`BlobDirIter`] which needs something to own the data of
-/// it's `&Path`.  Use [`BlobDirContents::iter`] to create the iterator.
-///
-/// Additionally pre-allocating this means we get a length for progress report.
-pub(crate) struct BlobDirContents<'a> {
-    inner: Vec<PathBuf>,
-    context: &'a Context,
-}
-
-impl<'a> BlobDirContents<'a> {
-    pub(crate) async fn new(context: &'a Context) -> Result<BlobDirContents<'a>> {
-        let readdir = fs::read_dir(context.get_blobdir()).await?;
-        let inner = ReadDirStream::new(readdir)
-            .filter_map(|entry| async move {
-                match entry {
-                    Ok(entry) => Some(entry),
-                    Err(err) => {
-                        error!(context, "Failed to read blob file: {err}.");
-                        None
-                    }
-                }
-            })
-            .filter_map(|entry| async move {
-                match entry.file_type().await.ok()?.is_file() {
-                    true => Some(entry.path()),
-                    false => {
-                        warn!(
-                            context,
-                            "Export: Found blob dir entry {} that is not a file, ignoring.",
-                            entry.path().display()
-                        );
-                        None
-                    }
-                }
-            })
-            .collect()
-            .await;
-        Ok(Self { inner, context })
-    }
-
-    pub(crate) fn iter(&self) -> BlobDirIter<'_> {
-        BlobDirIter::new(self.context, self.inner.iter())
-    }
-
-    pub(crate) fn len(&self) -> usize {
-        self.inner.len()
-    }
-}
-
-/// A iterator over all the [`BlobObject`]s in the blobdir.
-pub(crate) struct BlobDirIter<'a> {
-    iter: std::slice::Iter<'a, PathBuf>,
-    context: &'a Context,
-}
-
-impl<'a> BlobDirIter<'a> {
-    fn new(context: &'a Context, iter: std::slice::Iter<'a, PathBuf>) -> BlobDirIter<'a> {
-        Self { iter, context }
-    }
-}
-
-impl<'a> Iterator for BlobDirIter<'a> {
-    type Item = BlobObject<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        for path in self.iter.by_ref() {
-            // In theory this can error but we'd have corrupted filenames in the blobdir, so
-            // silently skipping them is fine.
-            match BlobObject::from_path(self.context, path) {
-                Ok(blob) => return Some(blob),
-                Err(err) => warn!(self.context, "{err}"),
-            }
-        }
-        None
-    }
-}
-
-impl FusedIterator for BlobDirIter<'_> {}
-
 fn encode_img(img: &DynamicImage, encoded: &mut Vec<u8>) -> anyhow::Result<()> {
     encoded.clear();
     let mut buf = Cursor::new(encoded);
@@ -569,7 +485,7 @@ fn encoded_img_exceeds_bytes(
         if encoded.len() > max_bytes {
             info!(
                 context,
-                "Image size {}B ({}x{}px) exceeds {}B, need to scale down.",
+                "image size {}B ({}x{}px) exceeds {}B, need to scale down",
                 encoded.len(),
                 img.width(),
                 img.height(),

src/chat.rs

@@ -46,7 +46,7 @@ use crate::{location, sql};
 pub enum ChatItem {
     /// Chat message stored in the database.
     Message {
-        /// Database ID of the message.
+        /// Database ID of the messsage.
         msg_id: MsgId,
     },
 
@@ -247,7 +247,7 @@ impl ChatId {
                 } else {
                     warn!(
                         context,
-                        "Cannot create chat, contact {contact_id} does not exist."
+                        "Cannot create chat, contact {} does not exist.", contact_id,
                     );
                     bail!("Can not create chat for non-existing contact");
                 }
@@ -276,7 +276,7 @@ impl ChatId {
                     grpname,
                     grpid,
                     create_blocked,
-                    create_smeared_timestamp(context),
+                    create_smeared_timestamp(context).await,
                     create_protected,
                     param.unwrap_or_default(),
                 ],
@@ -285,7 +285,7 @@ impl ChatId {
         let chat_id = ChatId::new(u32::try_from(row_id)?);
         info!(
             context,
-            "Created group/mailinglist '{}' grpid={} as {}, blocked={}.",
+            "Created group/mailinglist '{}' grpid={} as {}, blocked={}",
             grpname,
             grpid,
             chat_id,
@@ -338,14 +338,14 @@ impl ChatId {
                     if contact_id != ContactId::SELF {
                         info!(
                             context,
-                            "Blocking the contact {contact_id} to block 1:1 chat."
+                            "Blocking the contact {} to block 1:1 chat", contact_id
                         );
                         Contact::block(context, contact_id).await?;
                     }
                 }
             }
             Chattype::Group => {
-                info!(context, "Can't block groups yet, deleting the chat.");
+                info!(context, "Can't block groups yet, deleting the chat");
                 self.delete(context).await?;
             }
             Chattype::Mailinglist => {
@@ -418,7 +418,7 @@ impl ChatId {
             ProtectionStatus::Protected => match chat.typ {
                 Chattype::Single | Chattype::Group | Chattype::Broadcast => {
                     let contact_ids = get_chat_contacts(context, self).await?;
-                    for contact_id in contact_ids {
+                    for contact_id in contact_ids.into_iter() {
                         let contact = Contact::get_by_id(context, contact_id).await?;
                         if contact.is_verified(context).await? != VerifiedStatus::BidirectVerified {
                             bail!("{} is not verified.", contact.get_display_name());
@@ -482,7 +482,7 @@ impl ChatId {
                 self,
                 &msg_text,
                 cmd,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
                 None,
                 None,
                 None,
@@ -500,7 +500,7 @@ impl ChatId {
         let chat = Chat::load_from_db(context, self).await?;
 
         if let Err(e) = self.inner_set_protection(context, protect).await {
-            error!(context, "Cannot set protection: {e:#}."); // make error user-visible
+            error!(context, "Cannot set protection: {}", e); // make error user-visible
             return Err(e);
         }
 
@@ -639,10 +639,7 @@ impl ChatId {
         context.emit_msgs_changed_without_ids();
 
         context.set_config(Config::LastHousekeeping, None).await?;
-        context
-            .scheduler
-            .interrupt_inbox(InterruptInfo::new(false))
-            .await;
+        context.interrupt_inbox(InterruptInfo::new(false)).await;
 
         if chat.is_self_talk() {
             let mut msg = Message::new(Viewtype::Text);
@@ -856,7 +853,7 @@ impl ChatId {
                     AND c.blocked=0
                     AND c.archived=1
                     ",
-                    (),
+                    paramsv![],
                 )
                 .await?
         } else {
@@ -1070,7 +1067,7 @@ impl ChatId {
         );
         info!(
             context,
-            "Set gossiped_timestamp for chat {} to {}.", self, timestamp,
+            "set gossiped_timestamp for chat {} to {}.", self, timestamp,
         );
 
         context
@@ -1209,10 +1206,7 @@ impl Chat {
                         }
                     }
                     Err(err) => {
-                        error!(
-                            context,
-                            "Failed to load contacts for {}: {:#}.", chat.id, err
-                        );
+                        error!(context, "faild to load contacts for {}: {:#}", chat.id, err);
                     }
                 }
                 chat.name = chat_name;
@@ -1670,7 +1664,7 @@ impl Chat {
 
             maybe_set_logging_xdc(context, msg, self.id).await?;
         }
-        context.scheduler.interrupt_ephemeral_task().await;
+        context.interrupt_ephemeral_task().await;
         Ok(msg.id)
     }
 }
@@ -1887,10 +1881,7 @@ pub(crate) async fn update_special_chat_names(context: &Context) -> Result<()> {
 /// [`Deref`]: std::ops::Deref
 #[derive(Debug)]
 pub(crate) struct ChatIdBlocked {
-    /// Chat ID.
     pub id: ChatId,
-
-    /// Whether the chat is blocked, unblocked or a contact request.
     pub blocked: Blocked,
 }
 
@@ -1962,6 +1953,7 @@ impl ChatIdBlocked {
             _ => (),
         }
 
+        let created_timestamp = create_smeared_timestamp(context).await;
         let chat_id = context
             .sql
             .transaction(move |transaction| {
@@ -1974,7 +1966,7 @@ impl ChatIdBlocked {
                         chat_name,
                         params.to_string(),
                         create_blocked as u8,
-                        create_smeared_timestamp(context)
+                        created_timestamp,
                     ],
                 )?;
                 let chat_id = ChatId::new(
@@ -2032,11 +2024,8 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
             .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?;
 
         if msg.viewtype == Viewtype::Image {
-            if let Err(err) = blob.recode_to_image_size(context).await {
-                warn!(
-                    context,
-                    "Cannot recode image, using original data: {err:#}."
-                );
+            if let Err(e) = blob.recode_to_image_size(context).await {
+                warn!(context, "Cannot recode image, using original data: {:?}", e);
             }
         }
         msg.param.set(Param::File, blob.as_name());
@@ -2125,7 +2114,7 @@ async fn prepare_msg_common(
             context,
             msg,
             update_msg_id,
-            create_smeared_timestamp(context),
+            create_smeared_timestamp(context).await,
         )
         .await?;
     msg.chat_id = chat_id;
@@ -2156,7 +2145,7 @@ pub async fn is_contact_in_chat(
 
 /// Sends a message object to a chat.
 ///
-/// Sends the event #DC_EVENT_MSGS_CHANGED on success.
+/// Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
 /// However, this does not imply, the message really reached the recipient -
 /// sending may be delayed eg. due to network problems. However, from your
 /// view, you're done with the message. Sooner or later it will find its way.
@@ -2207,10 +2196,7 @@ async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -
             context.emit_event(EventType::LocationChanged(Some(ContactId::SELF)));
         }
 
-        context
-            .scheduler
-            .interrupt_smtp(InterruptInfo::new(false))
-            .await;
+        context.interrupt_smtp(InterruptInfo::new(false)).await;
     }
 
     Ok(msg.id)
@@ -2259,7 +2245,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
     let attach_selfavatar = match shall_attach_selfavatar(context, msg.chat_id).await {
         Ok(attach_selfavatar) => attach_selfavatar,
         Err(err) => {
-            warn!(context, "SMTP job cannot get selfavatar-state: {err:#}.");
+            warn!(context, "job: cannot get selfavatar-state: {:#}", err);
             false
         }
     };
@@ -2286,7 +2272,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
         // may happen eg. for groups with only SELF and bcc_self disabled
         info!(
             context,
-            "Message {msg_id} has no recipient, skipping smtp-send."
+            "message {} has no recipient, skipping smtp-send", msg_id
         );
         msg_id.set_delivered(context).await?;
         return Ok(None);
@@ -2321,27 +2307,27 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
 
     if 0 != rendered_msg.last_added_location_id {
         if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, time()).await {
-            error!(context, "Failed to set kml sent_timestamp: {err:#}.");
+            error!(context, "Failed to set kml sent_timestamp: {:#}", err);
         }
         if !msg.hidden {
             if let Err(err) =
                 location::set_msg_location_id(context, msg.id, rendered_msg.last_added_location_id)
                     .await
             {
-                error!(context, "Failed to set msg_location_id: {err:#}.");
+                error!(context, "Failed to set msg_location_id: {:#}", err);
             }
         }
     }
 
     if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
         if let Err(err) = context.delete_sync_ids(sync_ids).await {
-            error!(context, "Failed to delete sync ids: {err:#}.");
+            error!(context, "Failed to delete sync ids: {:#}", err);
         }
     }
 
     if attach_selfavatar {
         if let Err(err) = msg.chat_id.set_selfavatar_timestamp(context, time()).await {
-            error!(context, "Failed to set selfavatar timestamp: {err:#}.");
+            error!(context, "Failed to set selfavatar timestamp: {:#}", err);
         }
     }
 
@@ -2523,7 +2509,7 @@ pub async fn get_chat_msgs_ex(
         context
             .sql
             .query_map(
-        // GLOB is used here instead of LIKE because it is case-sensitive
+        // GLOB is used here instead of LIKE becase it is case-sensitive
                 "SELECT m.id AS id, m.timestamp AS timestamp, m.param AS param, m.from_id AS from_id, m.to_id AS to_id
                FROM msgs m
               WHERE m.chat_id=?
@@ -2587,7 +2573,7 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()>
                 "SELECT DISTINCT(m.chat_id) FROM msgs m
                     LEFT JOIN chats c ON m.chat_id=c.id
                     WHERE m.state=10 AND m.hidden=0 AND m.chat_id>9 AND c.blocked=0 AND c.archived=1",
-                    (),
+                paramsv![],
                 |row| row.get::<_, ChatId>(0),
                 |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into)
             )
@@ -2696,7 +2682,8 @@ pub(crate) async fn mark_old_messages_as_noticed(
     if !changed_chats.is_empty() {
         info!(
             context,
-            "Marking chats as noticed because there are newer outgoing messages: {changed_chats:?}."
+            "Marking chats as noticed because there are newer outgoing messages: {:?}",
+            changed_chats
         );
     }
 
@@ -2727,14 +2714,12 @@ pub async fn get_chat_media(
             "SELECT id
                FROM msgs
               WHERE (1=? OR chat_id=?)
-                AND chat_id != ?
                 AND (type=? OR type=? OR type=?)
                 AND hidden=0
               ORDER BY timestamp, id;",
             paramsv![
                 chat_id.is_none(),
                 chat_id.unwrap_or_else(|| ChatId::new(0)),
-                DC_CHAT_ID_TRASH,
                 msg_type,
                 if msg_type2 != Viewtype::Unknown {
                     msg_type2
@@ -2854,7 +2839,7 @@ pub async fn create_group_chat(
                 Chattype::Group,
                 chat_name,
                 grpid,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
             ],
         )
         .await?;
@@ -2912,7 +2897,7 @@ pub async fn create_broadcast_list(context: &Context) -> Result<ChatId> {
                 Chattype::Broadcast,
                 chat_name,
                 grpid,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
             ],
         )
         .await?;
@@ -3019,7 +3004,7 @@ pub(crate) async fn add_contact_to_chat_ex(
         // if SELF is not in the group, members cannot be added at all.
         warn!(
             context,
-            "Invalid attempt to add self e-mail address to group."
+            "invalid attempt to add self e-mail address to group"
         );
         return Ok(false);
     }
@@ -3373,7 +3358,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
         if let Some(reason) = chat.why_cant_send(context).await? {
             bail!("cannot send to {}: {}", chat_id, reason);
         }
-        curr_timestamp = create_smeared_timestamps(context, msg_ids.len());
+        curr_timestamp = create_smeared_timestamps(context, msg_ids.len()).await;
         let ids = context
             .sql
             .query_map(
@@ -3443,10 +3428,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
                     .await?;
                 curr_timestamp += 1;
                 if create_send_msg_job(context, new_msg_id).await?.is_some() {
-                    context
-                        .scheduler
-                        .interrupt_smtp(InterruptInfo::new(false))
-                        .await;
+                    context.interrupt_smtp(InterruptInfo::new(false)).await;
                 }
             }
             created_chats.push(chat_id);
@@ -3501,10 +3483,7 @@ pub async fn resend_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
                 msg_id: msg.id,
             });
             if create_send_msg_job(context, msg.id).await?.is_some() {
-                context
-                    .scheduler
-                    .interrupt_smtp(InterruptInfo::new(false))
-                    .await;
+                context.interrupt_smtp(InterruptInfo::new(false)).await;
             }
         }
     }
@@ -3516,7 +3495,10 @@ pub(crate) async fn get_chat_cnt(context: &Context) -> Result<usize> {
         // no database, no chats - this is no error (needed eg. for information)
         let count = context
             .sql
-            .count("SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;", ())
+            .count(
+                "SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;",
+                paramsv![],
+            )
             .await?;
         Ok(count)
     } else {
@@ -3566,7 +3548,7 @@ pub async fn add_device_msg_with_importance(
 
     if let Some(label) = label {
         if was_device_msg_ever_added(context, label).await? {
-            info!(context, "Device-message {label} already added.");
+            info!(context, "device-message {} already added", label);
             return Ok(msg_id);
         }
     }
@@ -3578,7 +3560,7 @@ pub async fn add_device_msg_with_importance(
         msg.try_calc_and_set_dimensions(context).await.ok();
         prepare_msg_blob(context, msg).await?;
 
-        let timestamp_sent = create_smeared_timestamp(context);
+        let timestamp_sent = create_smeared_timestamp(context).await;
 
         // makes sure, the added message is the last one,
         // even if the date is wrong (useful esp. when warning about bad dates)
@@ -3678,7 +3660,7 @@ pub async fn was_device_msg_ever_added(context: &Context, label: &str) -> Result
 // - deletion in `msgs` with `ContactId::DEVICE` makes sure,
 //   no wrong information are shown in the device chat
 // - deletion in `devmsglabels` makes sure,
-//   deleted messages are reset and useful messages can be added again
+//   deleted messages are resetted and useful messages can be added again
 // - we reset the config-option `QuotaExceeding`
 //   that is used as a helper to drive the corresponding device message.
 pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Result<()> {
@@ -3689,14 +3671,17 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
             paramsv![ContactId::DEVICE],
         )
         .await?;
-    context.sql.execute("DELETE FROM devmsglabels;", ()).await?;
+    context
+        .sql
+        .execute("DELETE FROM devmsglabels;", paramsv![])
+        .await?;
 
     // Insert labels for welcome messages to avoid them being readded on reconfiguration.
     context
         .sql
         .execute(
             r#"INSERT INTO devmsglabels (label) VALUES ("core-welcome-image"), ("core-welcome")"#,
-            (),
+            paramsv![],
         )
         .await?;
     context.set_config(Config::QuotaExceeding, None).await?;
@@ -3797,7 +3782,6 @@ mod tests {
     use crate::chatlist::{get_archived_cnt, Chatlist};
     use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
     use crate::contact::{Contact, ContactAddress};
-    use crate::message::delete_msgs;
     use crate::receive_imf::receive_imf;
     use crate::test_utils::TestContext;
 
@@ -4104,6 +4088,7 @@ mod tests {
         send_text_msg(&alice, alice_chat_id, "populate".to_string()).await?;
 
         add_contact_to_chat(&alice, alice_chat_id, bob_id).await?;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
         let add1 = alice.pop_sent_msg().await;
 
         add_contact_to_chat(&alice, alice_chat_id, claire_id).await?;
@@ -4122,18 +4107,29 @@ mod tests {
 
         remove_contact_from_chat(&alice, alice_chat_id, daisy_id).await?;
         let remove2 = alice.pop_sent_msg().await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
 
         assert_eq!(get_chat_contacts(&alice, alice_chat_id).await?.len(), 2);
 
         // Bob receives the add and deletion messages out of order
         let bob = TestContext::new_bob().await;
         bob.recv_msg(&add1).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
         bob.recv_msg(&add3).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
         let bob_chat_id = bob.recv_msg(&add2).await.chat_id;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
         assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 4);
 
         bob.recv_msg(&remove2).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
         bob.recv_msg(&remove1).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
         assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 2);
 
         Ok(())
@@ -4445,7 +4441,7 @@ mod tests {
             .unwrap();
         assert!(msg_id2.is_unset());
 
-        // ... unless everything is deleted and reset - as needed eg. on device switch
+        // ... unless everything is deleted and resetted - as needed eg. on device switch
         delete_and_reset_all_device_msgs(&t).await.unwrap();
         assert!(!was_device_msg_ever_added(&t, "some-label").await.unwrap());
         let msg_id3 = add_device_msg(&t, Some("some-label"), Some(&mut msg))
@@ -5980,7 +5976,7 @@ mod tests {
             include_bytes!("../test-data/image/avatar64x64.png"),
         )
         .await?;
-        let second_image_msg_id = send_media(
+        send_media(
             &t,
             chat_id2,
             Viewtype::Image,
@@ -6082,21 +6078,6 @@ mod tests {
             4
         );
 
-        // Delete an image.
-        delete_msgs(&t, &[second_image_msg_id]).await?;
-        assert_eq!(
-            get_chat_media(
-                &t,
-                None,
-                Viewtype::Image,
-                Viewtype::Sticker,
-                Viewtype::Webxdc,
-            )
-            .await?
-            .len(),
-            3
-        );
-
         Ok(())
     }
 }

src/chatlist.rs

@@ -176,7 +176,7 @@ impl Chatlist {
             // allow searching over special names that may change at any time
             // when the ui calls set_stock_translation()
             if let Err(err) = update_special_chat_names(context).await {
-                warn!(context, "Cannot update special chat names: {err:#}.")
+                warn!(context, "cannot update special chat names: {:?}", err)
             }
 
             let str_like_cmd = format!("%{query}%");

src/config.rs

@@ -1,6 +1,5 @@
 //! # Key-value configuration management.
 
-use std::env;
 use std::str::FromStr;
 
 use anyhow::{ensure, Context as _, Result};
@@ -247,7 +246,7 @@ pub enum Config {
     Configured,
 
     /// All secondary self addresses separated by spaces
-    /// (`addr1@example.org addr2@example.org addr3@example.org`)
+    /// (`addr1@example.org addr2@exapmle.org addr3@example.org`)
     SecondaryAddrs,
 
     /// Read-only core version string.
@@ -301,9 +300,6 @@ pub enum Config {
     /// See `crate::authres::update_authservid_candidates`.
     AuthservIdCandidates,
 
-    /// Make all outgoing messages with Autocrypt header "multipart/signed".
-    SignUnencrypted,
-
     /// Let the core save all events to the database.
     /// This value is used internally to remember the MsgId of the logging xdc
     #[strum(props(default = "0"))]
@@ -318,11 +314,6 @@ impl Context {
 
     /// Get a configuration key. Returns `None` if no value is set, and no default value found.
     pub async fn get_config(&self, key: Config) -> Result<Option<String>> {
-        let env_key = format!("DELTACHAT_{}", key.as_ref().to_uppercase());
-        if let Ok(value) = env::var(env_key) {
-            return Ok(Some(value));
-        }
-
         let value = match key {
             Config::Selfavatar => {
                 let rel_path = self.sql.get_raw_config(key.as_ref()).await?;
@@ -424,7 +415,7 @@ impl Context {
         match key {
             Config::Selfavatar => {
                 self.sql
-                    .execute("UPDATE contacts SET selfavatar_sent=0;", ())
+                    .execute("UPDATE contacts SET selfavatar_sent=0;", paramsv![])
                     .await?;
                 match value {
                     Some(value) => {
@@ -443,7 +434,7 @@ impl Context {
             Config::DeleteDeviceAfter => {
                 let ret = self.sql.set_raw_config(key.as_ref(), value).await;
                 // Interrupt ephemeral loop to delete old messages immediately.
-                self.scheduler.interrupt_ephemeral_task().await;
+                self.interrupt_ephemeral_task().await;
                 ret?
             }
             Config::Displayname => {

src/configure.rs

@@ -59,7 +59,7 @@ impl Context {
     /// Configures this account with the currently set parameters.
     pub async fn configure(&self) -> Result<()> {
         ensure!(
-            !self.scheduler.is_running().await,
+            self.scheduler.read().await.is_none(),
             "cannot configure, already running"
         );
         ensure!(
@@ -469,9 +469,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     ctx.set_config_bool(Config::FetchedExistingMsgs, false)
         .await?;
-    ctx.scheduler
-        .interrupt_inbox(InterruptInfo::new(false))
-        .await;
+    ctx.interrupt_inbox(InterruptInfo::new(false)).await;
 
     progress!(ctx, 940);
     update_device_chats_handle.await??;
@@ -648,14 +646,10 @@ async fn try_smtp_one_param(
     }
 }
 
-/// Failure to connect and login with email client configuration.
 #[derive(Debug, thiserror::Error)]
 #[error("Trying {config}…\nError: {msg}")]
 pub struct ConfigurationError {
-    /// Tried configuration description.
     config: String,
-
-    /// Error message.
     msg: String,
 }
 

src/configure/server_params.rs

@@ -4,7 +4,7 @@ use crate::provider::{Protocol, Socket};
 
 /// Set of variable parameters to try during configuration.
 ///
-/// Can be loaded from offline provider database, online configuration
+/// Can be loaded from offline provider database, online configuraiton
 /// or derived from user entered parameters.
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct ServerParams {

src/constants.rs

@@ -103,7 +103,7 @@ pub(crate) const DC_RESEND_USER_AVATAR_DAYS: i64 = 14;
 // warn about an outdated app after a given number of days.
 // as we use the "provider-db generation date" as reference (that might not be updated very often)
 // and as not all system get speedy updates,
-// do not use too small value that will annoy users checking for nonexistent updates.
+// do not use too small value that will annoy users checking for nonexistant updates.
 pub(crate) const DC_OUTDATED_WARNING_DAYS: i64 = 365;
 
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
@@ -190,11 +190,11 @@ pub const DC_LP_AUTH_NORMAL: i32 = 0x4;
 pub const DC_LP_AUTH_FLAGS: i32 = DC_LP_AUTH_OAUTH2 | DC_LP_AUTH_NORMAL;
 
 /// How many existing messages shall be fetched after configuration.
-pub(crate) const DC_FETCH_EXISTING_MSGS_COUNT: i64 = 100;
+pub const DC_FETCH_EXISTING_MSGS_COUNT: i64 = 100;
 
 // max. width/height of an avatar
-pub(crate) const BALANCED_AVATAR_SIZE: u32 = 256;
-pub(crate) const WORSE_AVATAR_SIZE: u32 = 128;
+pub const BALANCED_AVATAR_SIZE: u32 = 256;
+pub const WORSE_AVATAR_SIZE: u32 = 128;
 
 // max. width/height of images
 pub const BALANCED_IMAGE_SIZE: u32 = 1280;

src/contact.rs

@@ -727,7 +727,7 @@ impl Contact {
     pub async fn add_address_book(context: &Context, addr_book: &str) -> Result<usize> {
         let mut modify_cnt = 0;
 
-        for (name, addr) in split_address_book(addr_book) {
+        for (name, addr) in split_address_book(addr_book).into_iter() {
             let (name, addr) = sanitize_name_and_addr(name, addr);
             let name = normalize_name(&name);
             match ContactAddress::new(&addr) {
@@ -1466,10 +1466,7 @@ pub(crate) async fn update_last_seen(
         > 0
         && timestamp > time() - SEEN_RECENTLY_SECONDS
     {
-        context
-            .scheduler
-            .interrupt_recently_seen(contact_id, timestamp)
-            .await;
+        context.interrupt_recently_seen(contact_id, timestamp).await;
     }
     Ok(())
 }
@@ -1555,7 +1552,7 @@ impl RecentlySeenLoop {
     pub(crate) fn new(context: Context) -> Self {
         let (interrupt_send, interrupt_recv) = channel::bounded(1);
 
-        let handle = task::spawn(Self::run(context, interrupt_recv));
+        let handle = task::spawn(async move { Self::run(context, interrupt_recv).await });
         Self {
             handle,
             interrupt_send,

src/context.rs

@@ -4,7 +4,6 @@ use std::collections::{BTreeMap, HashMap};
 use std::ffi::OsString;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime};
 
@@ -24,10 +23,9 @@ use crate::key::{DcKey, SignedPublicKey};
 use crate::login_param::LoginParam;
 use crate::message::{self, MessageState, MsgId};
 use crate::quota::QuotaInfo;
-use crate::scheduler::SchedulerState;
+use crate::scheduler::Scheduler;
 use crate::sql::Sql;
 use crate::stock_str::StockStrings;
-use crate::timesmearing::SmearedTimestamp;
 use crate::tools::{duration_to_str, time};
 
 /// Builder for the [`Context`].
@@ -114,7 +112,7 @@ impl ContextBuilder {
     /// Sets the event channel for this [`Context`].
     ///
     /// Mostly useful when using multiple [`Context`]s, this allows creating one [`Events`]
-    /// channel and passing it to all [`Context`]s so all events are received on the same
+    /// channel and passing it to all [`Context`]s so all events are recieved on the same
     /// channel.
     ///
     /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
@@ -190,34 +188,24 @@ pub struct InnerContext {
     /// Blob directory path
     pub(crate) blobdir: PathBuf,
     pub(crate) sql: Sql,
-    pub(crate) smeared_timestamp: SmearedTimestamp,
-    /// The global "ongoing" process state.
-    ///
-    /// This is a global mutex-like state for operations which should be modal in the
-    /// clients.
+    pub(crate) last_smeared_timestamp: RwLock<i64>,
     running_state: RwLock<RunningState>,
     /// Mutex to avoid generating the key for the user more than once.
     pub(crate) generating_key_mutex: Mutex<()>,
     /// Mutex to enforce only a single running oauth2 is running.
     pub(crate) oauth2_mutex: Mutex<()>,
-    /// Mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messages being sent.
+    /// Mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messeges being sent.
     pub(crate) wrong_pw_warning_mutex: Mutex<()>,
     pub(crate) translated_stockstrings: StockStrings,
     pub(crate) events: Events,
 
-    pub(crate) scheduler: SchedulerState,
+    pub(crate) scheduler: RwLock<Option<Scheduler>>,
     pub(crate) ratelimit: RwLock<Ratelimit>,
 
     /// Recently loaded quota information, if any.
     /// Set to `None` if quota was never tried to load.
     pub(crate) quota: RwLock<Option<QuotaInfo>>,
 
-    /// Set to true if quota update is requested.
-    pub(crate) quota_update_request: AtomicBool,
-
-    /// IMAP UID resync request.
-    pub(crate) resync_request: AtomicBool,
-
     /// Server ID response if ID capability is supported
     /// and the server returned non-NIL on the inbox connection.
     /// <https://datatracker.ietf.org/doc/html/rfc2971>
@@ -238,7 +226,7 @@ pub struct InnerContext {
     /// `last_error` should be used to avoid races with the event thread.
     pub(crate) last_error: std::sync::RwLock<String>,
 
-    /// If debug logging is enabled, this contains all necessary information
+    /// If debug logging is enabled, this contains all neccesary information
     pub(crate) debug_logging: RwLock<Option<DebugLogging>>,
 }
 
@@ -246,7 +234,7 @@ pub struct InnerContext {
 pub(crate) struct DebugLogging {
     /// The message containing the logging xdc
     pub(crate) msg_id: MsgId,
-    /// Handle to the background task responsible for sending
+    /// Handle to the background task responisble for sending
     pub(crate) loop_handle: task::JoinHandle<()>,
     /// Channel that log events should be send to
     /// A background loop will receive and handle them
@@ -260,7 +248,7 @@ enum RunningState {
     Running { cancel_sender: Sender<()> },
 
     /// Cancel signal has been sent, waiting for ongoing process to be freed.
-    ShallStop { request: Instant },
+    ShallStop,
 
     /// There is no ongoing process, a new one can be allocated.
     Stopped,
@@ -368,17 +356,15 @@ impl Context {
             blobdir,
             running_state: RwLock::new(Default::default()),
             sql: Sql::new(dbfile),
-            smeared_timestamp: SmearedTimestamp::new(),
+            last_smeared_timestamp: RwLock::new(0),
             generating_key_mutex: Mutex::new(()),
             oauth2_mutex: Mutex::new(()),
             wrong_pw_warning_mutex: Mutex::new(()),
             translated_stockstrings: stockstrings,
             events,
-            scheduler: SchedulerState::new(),
+            scheduler: RwLock::new(None),
             ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow to send 6 messages immediately, no more than once every 10 seconds.
             quota: RwLock::new(None),
-            quota_update_request: AtomicBool::new(false),
-            resync_request: AtomicBool::new(false),
             server_id: RwLock::new(None),
             creation_time: std::time::SystemTime::now(),
             last_full_folder_scan: Mutex::new(None),
@@ -399,23 +385,42 @@ impl Context {
             warn!(self, "can not start io on a context that is not configured");
             return;
         }
-        self.scheduler.start(self.clone()).await;
+
+        info!(self, "starting IO");
+        let mut lock = self.inner.scheduler.write().await;
+        if lock.is_none() {
+            match Scheduler::start(self.clone()).await {
+                Err(err) => error!(self, "Failed to start IO: {:#}", err),
+                Ok(scheduler) => *lock = Some(scheduler),
+            }
+        }
     }
 
     /// Stops the IO scheduler.
     pub async fn stop_io(&self) {
-        self.scheduler.stop(self).await;
+        // Sending an event wakes up event pollers (get_next_event)
+        // so the caller of stop_io() can arrange for proper termination.
+        // For this, the caller needs to instruct the event poller
+        // to terminate on receiving the next event and then call stop_io()
+        // which will emit the below event(s)
+        info!(self, "stopping IO");
+        if let Some(debug_logging) = self.debug_logging.read().await.as_ref() {
+            debug_logging.loop_handle.abort();
+        }
+        if let Some(scheduler) = self.inner.scheduler.write().await.take() {
+            scheduler.stop(self).await;
+        }
     }
 
     /// Restarts the IO scheduler if it was running before
     /// when it is not running this is an no-op
     pub async fn restart_io_if_running(&self) {
-        self.scheduler.restart(self).await;
-    }
-
-    /// Indicate that the network likely has come back.
-    pub async fn maybe_network(&self) {
-        self.scheduler.maybe_network().await;
+        info!(self, "restarting IO");
+        let is_running = { self.inner.scheduler.read().await.is_some() };
+        if is_running {
+            self.stop_io().await;
+            self.start_io().await;
+        }
     }
 
     /// Returns a reference to the underlying SQL instance.
@@ -506,13 +511,6 @@ impl Context {
 
     // Ongoing process allocation/free/check
 
-    /// Tries to acquire the global UI "ongoing" mutex.
-    ///
-    /// This is for modal operations during which no other user actions are allowed.  Only
-    /// one such operation is allowed at any given time.
-    ///
-    /// The return value is a cancel token, which will release the ongoing mutex when
-    /// dropped.
     pub(crate) async fn alloc_ongoing(&self) -> Result<Receiver<()>> {
         let mut s = self.running_state.write().await;
         ensure!(
@@ -530,9 +528,6 @@ impl Context {
 
     pub(crate) async fn free_ongoing(&self) {
         let mut s = self.running_state.write().await;
-        if let RunningState::ShallStop { request } = *s {
-            info!(self, "Ongoing stopped in {:?}", request.elapsed());
-        }
         *s = RunningState::Stopped;
     }
 
@@ -545,11 +540,9 @@ impl Context {
                     warn!(self, "could not cancel ongoing: {:#}", err);
                 }
                 info!(self, "Signaling the ongoing process to stop ASAP.",);
-                *s = RunningState::ShallStop {
-                    request: Instant::now(),
-                };
+                *s = RunningState::ShallStop;
             }
-            RunningState::ShallStop { .. } | RunningState::Stopped => {
+            RunningState::ShallStop | RunningState::Stopped => {
                 info!(self, "No ongoing process to stop.",);
             }
         }
@@ -559,7 +552,7 @@ impl Context {
     pub(crate) async fn shall_stop_ongoing(&self) -> bool {
         match &*self.running_state.read().await {
             RunningState::Running { .. } => false,
-            RunningState::ShallStop { .. } | RunningState::Stopped => true,
+            RunningState::ShallStop | RunningState::Stopped => true,
         }
     }
 
@@ -587,7 +580,7 @@ impl Context {
             .unwrap_or_default();
         let journal_mode = self
             .sql
-            .query_get_value("PRAGMA journal_mode;", ())
+            .query_get_value("PRAGMA journal_mode;", paramsv![])
             .await?
             .unwrap_or_else(|| "unknown".to_string());
         let e2ee_enabled = self.get_config_int(Config::E2eeEnabled).await?;
@@ -595,11 +588,14 @@ impl Context {
         let bcc_self = self.get_config_int(Config::BccSelf).await?;
         let send_sync_msgs = self.get_config_int(Config::SendSyncMsgs).await?;
 
-        let prv_key_cnt = self.sql.count("SELECT COUNT(*) FROM keypairs;", ()).await?;
+        let prv_key_cnt = self
+            .sql
+            .count("SELECT COUNT(*) FROM keypairs;", paramsv![])
+            .await?;
 
         let pub_key_cnt = self
             .sql
-            .count("SELECT COUNT(*) FROM acpeerstates;", ())
+            .count("SELECT COUNT(*) FROM acpeerstates;", paramsv![])
             .await?;
         let fingerprint_str = match SignedPublicKey::load_self(self).await {
             Ok(key) => key.fingerprint().hex(),
@@ -761,12 +757,6 @@ impl Context {
                 .await?
                 .unwrap_or_default(),
         );
-        res.insert(
-            "sign_unencrypted",
-            self.get_config_int(Config::SignUnencrypted)
-                .await?
-                .to_string(),
-        );
 
         res.insert(
             "debug_logging",

src/decrypt.rs

@@ -99,8 +99,7 @@ pub(crate) async fn prepare_decryption(
         from,
         autocrypt_header.as_ref(),
         message_time,
-        // Disallowing keychanges is disabled for now:
-        true, // dkim_results.allow_keychange,
+        dkim_results.allow_keychange,
     )
     .await?;
 

src/download.rs

@@ -13,6 +13,7 @@ use crate::imap::{Imap, ImapActionResult};
 use crate::job::{self, Action, Job, Status};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, Part};
+use crate::param::Params;
 use crate::tools::time;
 use crate::{job_try, stock_str, EventType};
 
@@ -22,7 +23,7 @@ use crate::{job_try, stock_str, EventType};
 /// need to be downloaded completely to handle them correctly,
 /// eg. to assign them to the correct chat.
 /// As these messages are typically small,
-/// they're caught by `MIN_DOWNLOAD_LIMIT`.
+/// they're catched by `MIN_DOWNLOAD_LIMIT`.
 const MIN_DOWNLOAD_LIMIT: u32 = 32768;
 
 /// If a message is downloaded only partially
@@ -85,7 +86,11 @@ impl MsgId {
             DownloadState::Available | DownloadState::Failure => {
                 self.update_download_state(context, DownloadState::InProgress)
                     .await?;
-                job::add(context, Job::new(Action::DownloadMsg, self.to_u32())).await?;
+                job::add(
+                    context,
+                    Job::new(Action::DownloadMsg, self.to_u32(), Params::new(), 0),
+                )
+                .await?;
             }
         }
         Ok(())