rename

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ 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
@@ -32,24 +32,13 @@ jobs:
       - name: Run clippy
         run: scripts/clippy.sh
 
-  cargo_deny:
-    name: cargo deny
+  foo:
+    name: bar
     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
+        arguments: --all-features --workspace
 
   docs:
     name: Rust doc comments
@@ -72,19 +61,19 @@ 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.
 
-          # 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:

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

@@ -8,40 +8,91 @@ concurrency:
 
 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
+  build_static_linux:
+    name: Build deltachat-rpc-server for Linux
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
-      - name: Build
-        run: sh scripts/zig-rpc-server.sh
+      - name: Setup rust target
+        run: rustup target add x86_64-unknown-linux-musl
 
-      - name: Upload x86_64 binary
+      - name: Install musl-gcc
+        run: sudo apt install musl-tools
+
+      - name: Build
+        env:
+          RUSTFLAGS: "-C link-arg=-s"
+        run: cargo build --release --target x86_64-unknown-linux-musl -p deltachat-rpc-server --features vendored
+      - name: Upload 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
+  build_aarch64_linux:
+    name: Cross-compile deltachat-rpc-server for aarch64 Linux
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build
+        run: sh scripts/aarch64-unknown-linux-musl.sh
+
+      - name: Upload 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
+  build_android:
+    name: Cross-compile deltachat-rpc-server for Android (armeabi-v7a, arm64-v8a, x86 and x86_64)
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r21d
+
+      - name: Build
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: sh scripts/android-rpc-server.sh
+
+      - name: Upload binary
         uses: actions/upload-artifact@v3
         with:
-          name: deltachat-rpc-server-armv7
-          path: target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server
+          name: deltachat-rpc-server-android-armv7
+          path: target/armv7-linux-androideabi/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-android-aarch64
+          path: target/aarch64-linux-android/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-android-i686
+          path: target/i686-linux-android/release/deltachat-rpc-server
+          if-no-files-found: error
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: deltachat-rpc-server-android-x86_64
+          path: target/x86_64-linux-android/release/deltachat-rpc-server
           if-no-files-found: error
 
   build_windows:
@@ -76,51 +127,3 @@ jobs:
           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 deltachat-rpc-server-x86_64
-        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-x86_64"
-          path: "dist/deltachat-rpc-server-x86_64"
-
-      - name: Download deltachat-rpc-server-aarch64
-        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-aarch64"
-          path: "dist/deltachat-rpc-server-aarch64"
-
-      - name: Download deltachat-rpc-server-armv7
-        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-armv7"
-          path: "dist/deltachat-rpc-server-armv7"
-
-      - name: Download deltachat-rpc-server-win32.exe
-        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-win32.exe"
-          path: "dist/deltachat-rpc-server-win32.exe"
-
-      - name: Download deltachat-rpc-server-win64.exe
-        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-win64.exe"
-          path: "dist/deltachat-rpc-server-win64.exe"
-
-      - 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/deltachat-rpc-server-*

.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/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,45 +1,15 @@
 # Changelog
 
-## [Unreleased]
-
-### Changes
-- "full message view" not needed because of footers that go to contact status #4151
-- Pick up system's light/dark mode in generated message HTML #4150
-- Support non-persistent configuration with DELTACHAT_* env
-- Print deltachat-repl errors with causes. #4166
-- 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
-- More accurate maybe_add_bcc_self device message text #4175
-
-### 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
-
-## [1.111.0] - 2023-03-05
+## Unreleased
 
 ### 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
@@ -63,8 +33,6 @@
 - 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
-
 
 ## 1.109.0
 
@@ -127,7 +95,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
@@ -228,7 +196,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
@@ -380,7 +348,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`
@@ -406,7 +374,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
 
@@ -706,7 +674,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
 
@@ -794,7 +762,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
@@ -847,7 +815,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
@@ -2069,7 +2037,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
 
@@ -2148,7 +2116,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
@@ -2186,7 +2154,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 
@@ -2205,7 +2173,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
@@ -2313,6 +2281,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
-
-[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...HEAD
-[1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.111.0"
+version = "1.110.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.64"
+rust-version = "1.63"
 
 [profile.dev]
 debug = 0
@@ -17,17 +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]
-default-net = { git = "https://github.com/dignifiedquire/default-net.git", branch="feat-android" }
-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" }
@@ -37,8 +31,8 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = "1"
 async-channel = "1.8.0"
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", 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-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"
@@ -53,8 +47,6 @@ 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.3.0", default-features = false }
-iroh = { git = 'https://github.com/n0-computer/iroh', branch = "flub/ticket-multiple-addrs" }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -102,7 +94,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.111.0"
+version = "1.110.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -17,7 +17,7 @@ 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"] }
@@ -29,5 +29,5 @@ 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;
@@ -613,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.
  *
@@ -870,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.
@@ -881,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.
@@ -910,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.
@@ -927,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.
@@ -938,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.
@@ -1147,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);
  * }
@@ -2101,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`
@@ -2295,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
@@ -2321,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().
  *
@@ -2341,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().
@@ -2635,117 +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.
- *
- * @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
  *
@@ -3300,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.
@@ -6457,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."
@@ -6739,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

deltachat-ffi/src/lib.rs

@@ -1,4 +1,4 @@
-#![warn(unused, clippy::all)]
+#![warn(unused, clippy::all, clippy::missing_docs_in_private_items)]
 #![allow(
     non_camel_case_types,
     non_snake_case,
@@ -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]
@@ -1141,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()
             }
         }
@@ -1731,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()
             })
     })
@@ -1894,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
@@ -1935,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();
                 }
             }
@@ -2132,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()
             })
     })
@@ -2154,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
             }
         }
@@ -2180,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,
@@ -2211,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");
     }
@@ -2234,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()
             }
         }
@@ -2253,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()
             }
         }
@@ -2278,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
             }
         }
@@ -2666,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 {
@@ -2709,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
         }
     }
@@ -2729,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
         }
     }
@@ -2810,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 {
@@ -2888,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()
             }
         }
@@ -3040,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();
             }
         };
@@ -3049,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();
             }
@@ -3066,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 {
@@ -3288,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();
             }
         };
@@ -3819,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 {
@@ -4143,116 +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) {
-    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);
-    let qr = match block_on(qr::check_qr(ctx, &qr_text)).log_err(ctx, "Invalid QR code") {
-        Ok(qr) => qr,
-        Err(_) => return 0,
-    };
-    spawn(async move {
-        imex::get_backup(ctx, qr)
-            .await
-            .log_err(ctx, "Get backup failed")
-            .ok();
-    });
-    1
-}
-
 trait ResultExt<T, E> {
     /// Like `log_err()`, but:
     /// - returns the default value instead of an Err value.
@@ -4266,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;
 }
@@ -4772,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 {
@@ -4809,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,
@@ -4825,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.111.0"
+version = "1.110.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]
@@ -38,5 +37,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"]
+webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]

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

@@ -55,5 +55,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.111.0"
+  "version": "1.110.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,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.111.0"
+version = "1.110.0"
 license = "MPL-2.0"
 edition = "2021"
 
@@ -12,7 +12,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/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,
-            "quotedMsg": 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:

deltachat-rpc-client/tox.ini

@@ -6,7 +6,7 @@ envlist =
 
 [testenv]
 commands =
-    pytest --exitfirst {posargs}
+    pytest {posargs}
 setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
     RUST_MIN_STACK=8388608
@@ -25,5 +25,5 @@ deps =
     ruff
     black
 commands =
-    black --quiet --check --diff src/ examples/ tests/
+    black --check --diff src/ examples/ tests/
     ruff src/ examples/ tests/

deltachat-rpc-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.111.0"
+version = "1.110.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"

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_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,84 +1,16 @@
 [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.
-skip = [
-     { name = "base64", version = "<0.21" },
-     { name = "block-buffer", version = "<0.10" },
-     { 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 = "time", version = "<0.3" },
-     { name = "version_check", version = "<0.9" },
-     { name = "wasi", version = "<0.11" },
-     { name = "windows-sys", version = "<0.45" },
-     { name = "windows_x86_64_msvc", version = "<0.42" },
-     { name = "windows_x86_64_gnu", version = "<0.42" },
-     { name = "windows_i686_msvc", version = "<0.42" },
-     { name = "windows_i686_gnu", version = "<0.42" },
-     { name = "windows_aarch64_msvc", version = "<0.42" },
-     { name = "unicode-xid", version = "<0.2.4" },
-     { name = "syn", version = "<1.0" },
-     { name = "quote", version = "<1.0" },
-     { name = "proc-macro2", version = "<1.0" },
-     { name = "portable-atomic", version = "<1.0" },
-     { name = "spin", version = "<0.9.6" },
-     { name = "convert_case", version = "0.4.0" },
-     { name = "clap_lex", version = "0.2.4" },
-     { name = "clap", version = "3.2.23" },
-]
-
-
 [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",
+    "BSL-1.0", # Boost Software License 1.0
     "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",
-       "n0-computer",
-       "quinn-rs",
-       "dignifiedquire",
 ]

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.

fuzz/Cargo.lock

@@ -111,7 +111,7 @@ version = "0.6.0"
 source = "git+https://github.com/async-email/async-imap?branch=master#85ff7a3d9d71a3715354fabf2fc1a8d047b5710e"
 dependencies = [
  "async-channel",
- "async-native-tls 0.4.0",
+ "async-native-tls",
  "base64 0.13.1",
  "byte-pool",
  "chrono",
@@ -139,18 +139,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "async-native-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
-dependencies = [
- "native-tls",
- "thiserror",
- "tokio",
- "url",
-]
-
 [[package]]
 name = "async-smtp"
 version = "0.8.0"
@@ -708,12 +696,12 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
 [[package]]
 name = "deltachat"
-version = "1.111.0"
+version = "1.107.0"
 dependencies = [
  "anyhow",
  "async-channel",
  "async-imap",
- "async-native-tls 0.5.0",
+ "async-native-tls",
  "async-smtp",
  "async_zip",
  "backtrace",
@@ -735,15 +723,17 @@ dependencies = [
  "lettre_email",
  "libc",
  "mailparse 0.14.0",
+ "native-tls",
  "num-derive",
  "num-traits",
  "num_cpus",
  "once_cell",
- "parking_lot",
  "percent-encoding",
  "pgp",
  "qrcodegen",
  "quick-xml",
+ "r2d2",
+ "r2d2_sqlite",
  "rand 0.8.5",
  "ratelimit",
  "regex",
@@ -1294,6 +1284,15 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1305,11 +1304,11 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.8.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
+checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.11.2",
 ]
 
 [[package]]
@@ -1507,7 +1506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -1632,9 +1631,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.25.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa"
+checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
 dependencies = [
  "cc",
  "openssl-sys",
@@ -2242,6 +2241,27 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20f14e071918cbeefc5edc986a7aa92c425dae244e003a35e1cdddb5ca39b5cb"
 
+[[package]]
+name = "r2d2"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
+dependencies = [
+ "log",
+ "parking_lot",
+ "scheduled-thread-pool",
+]
+
+[[package]]
+name = "r2d2_sqlite"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fdc8e4da70586127893be32b7adf21326a4c6b1aba907611edf467d13ffe895"
+dependencies = [
+ "r2d2",
+ "rusqlite",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -2431,15 +2451,16 @@ dependencies = [
 
 [[package]]
 name = "rusqlite"
-version = "0.28.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a"
+checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
 dependencies = [
  "bitflags",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
  "libsqlite3-sys",
+ "memchr",
  "smallvec",
 ]
 
@@ -2493,6 +2514,15 @@ dependencies = [
  "windows-sys 0.36.1",
 ]
 
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
+dependencies = [
+ "parking_lot",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -3096,7 +3126,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.12.3",
  "regex",
 ]
 

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/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/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.111.0"
+  "version": "1.110.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

@@ -51,7 +51,7 @@ git_describe_command = "git describe --dirty --tags --long --match v*.*"
 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/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()

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/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_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)
 
@@ -217,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")
@@ -1497,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)
@@ -1617,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:
@@ -2000,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):
@@ -2033,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):
@@ -2150,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

@@ -8,7 +8,7 @@ envlist =
 
 [testenv]
 commands = 
-    pytest -n6 --exitfirst --extra-info -v -rsXx --ignored --strict-tls {posargs: tests examples}
+    pytest -n6 --extra-info -v -rsXx --ignored --strict-tls {posargs: tests examples}
     pip wheel . -w {toxworkdir}/wheelhouse --no-deps
 setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
@@ -55,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

@@ -20,9 +20,7 @@ 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.
+- `aarch64-unknown-linux-musl.sh` cross-compiles static `deltachat-rpc-server` for aarch64
 
 ## Triggering runs on the build machine locally (fast!)
 

scripts/aarch64-unknown-linux-musl.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Build statically linked deltachat-rpc-server for aarch64-unknown-linux-musl.
+
+set -x
+set -e
+
+# Download Zig
+rm -fr zig-linux-x86_64-0.10.1 zig-linux-x86_64-0.10.1.tar.xz
+wget https://ziglang.org/download/0.10.1/zig-linux-x86_64-0.10.1.tar.xz
+tar xf zig-linux-x86_64-0.10.1.tar.xz
+export PATH="$PATH:$PWD/zig-linux-x86_64-0.10.1"
+
+cargo install cargo-zigbuild
+
+rustup target add aarch64-unknown-linux-musl
+
+cargo zigbuild --release --target aarch64-unknown-linux-musl -p deltachat-rpc-server --features vendored

scripts/android-rpc-server.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+# Build deltachat-rpc-server for Android.
+
+set -e
+
+test -n "$ANDROID_NDK_ROOT" || exit 1
+
+RUSTUP_TOOLCHAIN="1.64.0"
+rustup install "$RUSTUP_TOOLCHAIN"
+rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android --toolchain "$RUSTUP_TOOLCHAIN"
+
+KERNEL="$(uname -s | tr '[:upper:]' '[:lower:]')"
+ARCH="$(uname -m)"
+NDK_HOST_TAG="$KERNEL-$ARCH"
+TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
+export PATH="$PATH:$TOOLCHAIN/bin/"
+
+PACKAGE="deltachat-rpc-server"
+
+export CARGO_PROFILE_RELEASE_LTO=on
+
+CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
+	CFLAGS=-D__ANDROID_API__=16 \
+	TARGET_CC=armv7a-linux-androideabi16-clang \
+	TARGET_AR=llvm-ar \
+	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target armv7-linux-androideabi -p $PACKAGE
+
+CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
+	CFLAGS=-D__ANDROID_API__=21 \
+	TARGET_CC=aarch64-linux-android21-clang \
+	TARGET_AR=llvm-ar \
+	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target aarch64-linux-android -p $PACKAGE
+
+CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" \
+	CFLAGS=-D__ANDROID_API__=16 \
+	TARGET_CC=i686-linux-android16-clang \
+	TARGET_AR=llvm-ar \
+	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target i686-linux-android -p $PACKAGE
+
+CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
+	CFLAGS=-D__ANDROID_API__=21 \
+	TARGET_CC=x86_64-linux-android21-clang \
+	TARGET_AR=llvm-ar \
+	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target x86_64-linux-android -p $PACKAGE

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

@@ -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) {
@@ -487,7 +487,7 @@ struct AccountConfig {
 }
 
 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(())
 }

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())
@@ -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);

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,
     },
 
@@ -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());
@@ -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 {
@@ -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)
     }
 }
@@ -2153,7 +2147,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.
@@ -2204,10 +2198,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)
@@ -2520,7 +2511,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=?
@@ -2584,7 +2575,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)
             )
@@ -3439,10 +3430,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);
@@ -3497,10 +3485,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;
             }
         }
     }
@@ -3512,7 +3497,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 {
@@ -3674,7 +3662,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<()> {
@@ -3685,14 +3673,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?;
@@ -4440,7 +4431,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))

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.
@@ -318,11 +317,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 +418,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 +437,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??;

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)

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

@@ -24,7 +24,7 @@ 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;
@@ -114,7 +114,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
@@ -191,21 +191,17 @@ pub struct InnerContext {
     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.
     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.
@@ -215,9 +211,6 @@ pub struct InnerContext {
     /// 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 +231,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 +239,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
@@ -374,11 +367,10 @@ impl Context {
             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 +391,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 +517,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!(
@@ -582,7 +586,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?;
@@ -590,11 +594,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(),

src/download.rs

@@ -22,7 +22,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

src/ephemeral.rs

@@ -68,7 +68,7 @@ use std::num::ParseIntError;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::{ensure, Result};
+use anyhow::{ensure, Context as _, Result};
 use async_channel::Receiver;
 use serde::{Deserialize, Serialize};
 use tokio::time::timeout;
@@ -317,7 +317,7 @@ impl MsgId {
                     paramsv![ephemeral_timestamp, ephemeral_timestamp, self],
                 )
                 .await?;
-            context.scheduler.interrupt_ephemeral_task().await;
+            context.interrupt_ephemeral_task().await;
         }
         Ok(())
     }
@@ -345,7 +345,7 @@ pub(crate) async fn start_ephemeral_timers_msgids(
         )
         .await?;
     if count > 0 {
-        context.scheduler.interrupt_ephemeral_task().await;
+        context.interrupt_ephemeral_task().await;
     }
     Ok(())
 }
@@ -433,40 +433,37 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
     let rows = select_expired_messages(context, now).await?;
 
     if !rows.is_empty() {
-        info!(context, "Attempting to delete {} messages.", rows.len());
-
-        let (msgs_changed, webxdc_deleted) = context
+        context
             .sql
-            .transaction(|transaction| {
-                let mut msgs_changed = Vec::with_capacity(rows.len());
-                let mut webxdc_deleted = Vec::new();
-
+            .execute(
                 // If you change which information is removed here, also change MsgId::trash() and
                 // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                for (msg_id, chat_id, viewtype) in rows {
-                    transaction.execute(
-                        "UPDATE msgs
-                     SET chat_id=?, txt='', subject='', txt_raw='',
-                         mime_headers='', from_id=0, to_id=0, param=''
-                     WHERE id=?",
-                        params![DC_CHAT_ID_TRASH, msg_id],
-                    )?;
+                &format!(
+                    r#"
+UPDATE msgs
+SET
+  chat_id=?, txt='', subject='', txt_raw='',
+  mime_headers='', from_id=0, to_id=0, param=''
+WHERE id IN ({})
+"#,
+                    sql::repeat_vars(rows.len())
+                ),
+                rusqlite::params_from_iter(
+                    std::iter::once(&DC_CHAT_ID_TRASH as &dyn crate::ToSql).chain(
+                        rows.iter()
+                            .map(|(msg_id, _chat_id, _viewtype)| msg_id as &dyn crate::ToSql),
+                    ),
+                ),
+            )
+            .await
+            .context("update failed")?;
 
-                    msgs_changed.push((chat_id, msg_id));
-                    if viewtype == Viewtype::Webxdc {
-                        webxdc_deleted.push(msg_id)
-                    }
-                }
-                Ok((msgs_changed, webxdc_deleted))
-            })
-            .await?;
-
-        for (chat_id, msg_id) in msgs_changed {
+        for (msg_id, chat_id, viewtype) in rows {
             context.emit_msgs_changed(chat_id, msg_id);
-        }
 
-        for msg_id in webxdc_deleted {
-            context.emit_event(EventType::WebxdcInstanceDeleted { msg_id });
+            if viewtype == Viewtype::Webxdc {
+                context.emit_event(EventType::WebxdcInstanceDeleted { msg_id });
+            }
         }
     }
 
@@ -1173,7 +1170,7 @@ mod tests {
         // No other messages are marked for deletion.
         assert_eq!(
             t.sql
-                .count("SELECT COUNT(*) FROM imap WHERE target=''", ())
+                .count("SELECT COUNT(*) FROM imap WHERE target=''", paramsv![],)
                 .await?,
             0
         );
@@ -1187,7 +1184,10 @@ mod tests {
             .update_download_state(&t, DownloadState::Available)
             .await?;
         t.sql
-            .execute("UPDATE imap SET target=folder WHERE rfc724_mid='1000'", ())
+            .execute(
+                "UPDATE imap SET target=folder WHERE rfc724_mid='1000'",
+                paramsv![],
+            )
             .await?;
         delete_expired_imap_messages(&t).await?;
         test_marked_for_deletion(&t, 1000).await?; // Delete downloadable anyway.
@@ -1198,7 +1198,10 @@ mod tests {
         delete_expired_imap_messages(&t).await?;
         test_marked_for_deletion(&t, 1010).await?;
         t.sql
-            .execute("UPDATE imap SET target=folder WHERE rfc724_mid='1010'", ())
+            .execute(
+                "UPDATE imap SET target=folder WHERE rfc724_mid='1010'",
+                paramsv![],
+            )
             .await?;
 
         MsgId::new(1010)
@@ -1208,7 +1211,7 @@ mod tests {
         // Keep downloadable for now.
         assert_eq!(
             t.sql
-                .count("SELECT COUNT(*) FROM imap WHERE target=''", ())
+                .count("SELECT COUNT(*) FROM imap WHERE target=''", paramsv![],)
                 .await?,
             0
         );
@@ -1270,7 +1273,7 @@ mod tests {
         // protection.
         //
         // Previously Delta Chat fallen back to using <first@example.com> in this case and
-        // compared received timer value to the timer value of the <first@example.com>. Because
+        // compared received timer value to the timer value of the <first@examle.com>. Because
         // their timer values are the same ("disabled"), Delta Chat assumed that the timer was not
         // changed explicitly and the change should be ignored.
         //

src/events.rs

@@ -70,7 +70,7 @@ impl Events {
 pub struct EventEmitter(Receiver<Event>);
 
 impl EventEmitter {
-    /// Async recv of an event. Return `None` if the `Sender` has been dropped.
+    /// Async recv of an event. Return `None` if the `Sender` has been droped.
     pub async fn recv(&self) -> Option<Event> {
         self.0.recv().await.ok()
     }
@@ -89,7 +89,7 @@ impl futures::stream::Stream for EventEmitter {
 
 /// The event emitted by a [`Context`] from an [`EventEmitter`].
 ///
-/// Events are documented on the C/FFI API in `deltachat.h` as `DC_EVENT_*` constants.  The
+/// Events are documented on the C/FFI API in `deltachat.h` as `DC_EVENT_*` contants.  The
 /// context emits them in relation to various operations happening, a lot of these are again
 /// documented in `deltachat.h`.
 ///

src/fuzzing.rs

@@ -5,7 +5,7 @@
 /// Fuzzing target for simplify().
 ///
 /// Calls simplify() and panics if simplify() panics.
-/// Does not return any value to avoid exposing internal crate types.
+/// Does not return any vaule to avoid exposing internal crate types.
 #[cfg(fuzzing)]
 pub fn simplify(input: String, is_chat_message: bool) {
     crate::simplify::simplify(input, is_chat_message);

src/html.rs

@@ -124,7 +124,7 @@ impl HtmlMsgParser {
         async move {
             match get_mime_multipart_type(&mail.ctype) {
                 MimeMultipartType::Multiple => {
-                    for cur_data in &mail.subparts {
+                    for cur_data in mail.subparts.iter() {
                         self.collect_texts_recursive(cur_data).await?
                     }
                     Ok(())
@@ -180,7 +180,7 @@ impl HtmlMsgParser {
         async move {
             match get_mime_multipart_type(&mail.ctype) {
                 MimeMultipartType::Multiple => {
-                    for cur_data in &mail.subparts {
+                    for cur_data in mail.subparts.iter() {
                         self.cid_to_data_recursive(context, cur_data).await?;
                     }
                     Ok(())
@@ -292,10 +292,7 @@ mod tests {
         assert_eq!(
             parser.html,
             r##"<!DOCTYPE html>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="color-scheme" content="light dark" />
-</head><body>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body>
 This message does not have Content-Type nor Subject.<br/>
 <br/>
 </body></html>
@@ -311,10 +308,7 @@ This message does not have Content-Type nor Subject.<br/>
         assert_eq!(
             parser.html,
             r##"<!DOCTYPE html>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="color-scheme" content="light dark" />
-</head><body>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body>
 message with a non-UTF-8 encoding: äöüßÄÖÜ<br/>
 <br/>
 </body></html>
@@ -331,10 +325,7 @@ message with a non-UTF-8 encoding: äöüßÄÖÜ<br/>
         assert_eq!(
             parser.html,
             r##"<!DOCTYPE html>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="color-scheme" content="light dark" />
-</head><body>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body>
 This line ends with a space and will be merged with the next one due to format=flowed.<br/>
 <br/>
 This line does not end with a space<br/>
@@ -353,10 +344,7 @@ and will be wrapped as usual.<br/>
         assert_eq!(
             parser.html,
             r##"<!DOCTYPE html>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="color-scheme" content="light dark" />
-</head><body>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body>
 mime-modified should not be set set as there is no html and no special stuff;<br/>
 although not being a delta-message.<br/>
 test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x27; :)<br/>

src/imap.rs

@@ -475,7 +475,7 @@ impl Imap {
             // Note that the `Config::DeleteDeviceAfter` timer starts as soon as the messages are
             // fetched while the per-chat ephemeral timers start as soon as the messages are marked
             // as noticed.
-            context.scheduler.interrupt_ephemeral_task().await;
+            context.interrupt_ephemeral_task().await;
         }
 
         let session = self
@@ -904,24 +904,6 @@ impl Imap {
         info!(context, "Done fetching existing messages.");
         Ok(())
     }
-
-    /// Synchronizes UIDs for all folders.
-    pub(crate) async fn resync_folders(&mut self, context: &Context) -> Result<()> {
-        self.prepare(context).await?;
-
-        let all_folders = self
-            .list_folders(context)
-            .await
-            .context("listing folders for resync")?;
-        for folder in all_folders {
-            let folder_meaning = get_folder_meaning(&folder);
-            if folder_meaning != FolderMeaning::Virtual {
-                self.resync_folder_uids(context, folder.name(), folder_meaning)
-                    .await?;
-            }
-        }
-        Ok(())
-    }
 }
 
 impl Session {
@@ -1390,11 +1372,11 @@ impl Imap {
             let mut uid_msgs = HashMap::with_capacity(request_uids.len());
 
             let mut count = 0;
-            for &request_uid in &request_uids {
+            for &request_uid in request_uids.iter() {
                 // Check if FETCH response is already in `uid_msgs`.
                 let mut fetch_response = uid_msgs.remove(&request_uid);
 
-                // Try to find a requested UID in returned FETCH responses.
+                // Try to find a requsted UID in returned FETCH responses.
                 while fetch_response.is_none() {
                     let next_fetch_response =
                         if let Some(next_fetch_response) = fetch_responses.next().await {
@@ -2204,11 +2186,11 @@ async fn mark_seen_by_uid(
                 .with_context(|| format!("failed to start ephemeral timer for message {msg_id}"))?;
             Ok(Some(chat_id))
         } else {
-            // Message state has not changed.
+            // Message state has not chnaged.
             Ok(None)
         }
     } else {
-        // There is no message is `msgs` table matching the given UID.
+        // There is no message is `msgs` table matchng the given UID.
         Ok(None)
     }
 }
@@ -2224,10 +2206,7 @@ pub(crate) async fn markseen_on_imap_table(context: &Context, message_id: &str)
             paramsv![message_id],
         )
         .await?;
-    context
-        .scheduler
-        .interrupt_inbox(InterruptInfo::new(false))
-        .await;
+    context.interrupt_inbox(InterruptInfo::new(false)).await;
 
     Ok(())
 }

src/imex.rs

@@ -5,19 +5,18 @@ use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 
 use ::pgp::types::KeyTrait;
-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, ensure, format_err, Context as _, Error, Result};
 use futures::StreamExt;
 use futures_lite::FutureExt;
 use rand::{thread_rng, Rng};
 use tokio::fs::{self, File};
 use tokio_tar::Archive;
 
-use crate::blob::{BlobDirContents, BlobObject};
+use crate::blob::BlobObject;
 use crate::chat::{self, delete_and_reset_all_device_msgs, ChatId};
 use crate::config::Config;
 use crate::contact::ContactId;
 use crate::context::Context;
-use crate::e2ee;
 use crate::events::EventType;
 use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
 use crate::log::LogExt;
@@ -31,14 +30,11 @@ use crate::tools::{
     create_folder, delete_file, get_filesuffix_lc, open_file_std, read_file, time, write_file,
     EmailAddress,
 };
-
-mod transfer;
-
-pub use transfer::{get_backup, BackupProvider};
+use crate::{e2ee, tools};
 
 // Name of the database file in the backup.
 const DBFILE_BACKUP_NAME: &str = "dc_database_backup.sqlite";
-pub(crate) const BLOBS_BACKUP_NAME: &str = "blobs_backup";
+const BLOBS_BACKUP_NAME: &str = "blobs_backup";
 
 /// Import/export command.
 #[derive(Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive)]
@@ -90,17 +86,13 @@ pub async fn imex(
 ) -> Result<()> {
     let cancel = context.alloc_ongoing().await?;
 
-    let res = {
-        let mut guard = context.scheduler.pause(context.clone()).await;
-        let res = imex_inner(context, what, path, passphrase)
-            .race(async {
-                cancel.recv().await.ok();
-                Err(format_err!("canceled"))
-            })
-            .await;
-        guard.resume().await;
-        res
-    };
+    let res = imex_inner(context, what, path, passphrase)
+        .race(async {
+            cancel.recv().await.ok();
+            Err(format_err!("canceled"))
+        })
+        .await;
+
     context.free_ongoing().await;
 
     if let Err(err) = res.as_ref() {
@@ -257,8 +249,8 @@ async fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
         // TODO: define this as a stockstring once the wording is settled.
         msg.text = Some(
             "It seems you are using multiple devices with Delta Chat. Great!\n\n\
-             If you also want to synchronize outgoing messages across all devices, \
-             go to \"Settings → Advanced\" and enable \"Send Copy to Self\"."
+             If you also want to synchronize outgoing messages accross all devices, \
+             go to the settings and enable \"Send copy to self\"."
                 .to_string(),
         );
         chat::add_device_msg(context, Some("bcc-self-hint"), Some(&mut msg)).await?;
@@ -421,7 +413,7 @@ async fn import_backup(
         "Cannot import backups to accounts in use."
     );
     ensure!(
-        !context.scheduler.is_running().await,
+        context.scheduler.read().await.is_none(),
         "cannot import backup, IO is running"
     );
 
@@ -524,9 +516,16 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
     let _d1 = DeleteOnDrop(temp_db_path.clone());
     let _d2 = DeleteOnDrop(temp_path.clone());
 
-    export_database(context, &temp_db_path, passphrase)
-        .await
-        .context("could not export database")?;
+    context
+        .sql
+        .set_raw_config_int("backup_time", now as i32)
+        .await?;
+    sql::housekeeping(context).await.ok_or_log(context);
+
+    ensure!(
+        context.scheduler.read().await.is_none(),
+        "cannot export backup, IO is running"
+    );
 
     info!(
         context,
@@ -535,6 +534,32 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
         dest_path.display(),
     );
 
+    let path_str = temp_db_path
+        .to_str()
+        .with_context(|| format!("path {temp_db_path:?} is not valid unicode"))?;
+
+    context
+        .sql
+        .call(|conn| {
+            if let Err(err) = conn.execute("VACUUM", params![]) {
+                info!(context, "Vacuum failed, exporting anyway: {:#}.", err);
+            }
+            conn.execute(
+                "ATTACH DATABASE ? AS backup KEY ?",
+                paramsv![path_str, passphrase],
+            )
+            .context("failed to attach backup database")?;
+            let res = conn
+                .query_row("SELECT sqlcipher_export('backup')", [], |_row| Ok(()))
+                .context("failed to export to attached backup database");
+            conn.execute("DETACH DATABASE backup", [])
+                .context("failed to detach backup database")?;
+            res?;
+
+            Ok::<_, Error>(())
+        })
+        .await?;
+
     let res = export_backup_inner(context, &temp_db_path, &temp_path).await;
 
     match &res {
@@ -572,15 +597,29 @@ async fn export_backup_inner(
         .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
         .await?;
 
-    let blobdir = BlobDirContents::new(context).await?;
-    let mut last_progress = 0;
+    let read_dir = tools::read_dir(context.get_blobdir()).await?;
+    let count = read_dir.len();
+    let mut written_files = 0;
 
-    for (i, blob) in blobdir.iter().enumerate() {
-        let mut file = File::open(blob.to_abs_path()).await?;
-        let path_in_archive = PathBuf::from(BLOBS_BACKUP_NAME).join(blob.as_name());
+    let mut last_progress = 0;
+    for entry in read_dir.into_iter() {
+        let name = entry.file_name();
+        if !entry.file_type().await?.is_file() {
+            warn!(
+                context,
+                "Export: Found dir entry {} that is not a file, ignoring",
+                name.to_string_lossy()
+            );
+            continue;
+        }
+        let mut file = File::open(entry.path()).await?;
+        let path_in_archive = PathBuf::from(BLOBS_BACKUP_NAME).join(name);
         builder.append_file(path_in_archive, &mut file).await?;
-        let progress = 1000 * i / blobdir.len();
+
+        written_files += 1;
+        let progress = 1000 * written_files / count;
         if progress != last_progress && progress > 10 && progress < 1000 {
+            // We already emitted ImexProgress(10) above
             context.emit_event(EventType::ImexProgress(progress));
             last_progress = progress;
         }
@@ -658,7 +697,7 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> {
         .sql
         .query_map(
             "SELECT id, public_key, private_key, is_default FROM keypairs;",
-            (),
+            paramsv![],
             |row| {
                 let id = row.get(0)?;
                 let public_key_blob: Vec<u8> = row.get(1)?;
@@ -742,48 +781,6 @@ where
     Ok(())
 }
 
-/// Exports the database to *dest*, encrypted using *passphrase*.
-///
-/// The directory of *dest* must already exist, if *dest* itself exists it will be
-/// overwritten.
-///
-/// This also verifies that IO is not running during the export.
-async fn export_database(context: &Context, dest: &Path, passphrase: String) -> Result<()> {
-    ensure!(
-        !context.scheduler.is_running().await,
-        "cannot export backup, IO is running"
-    );
-    let now = time().try_into().context("32-bit UNIX time overflow")?;
-
-    // TODO: Maybe introduce camino crate for UTF-8 paths where we need them.
-    let dest = dest
-        .to_str()
-        .with_context(|| format!("path {} is not valid unicode", dest.display()))?;
-
-    context.sql.set_raw_config_int("backup_time", now).await?;
-    sql::housekeeping(context).await.ok_or_log(context);
-    context
-        .sql
-        .call_write(|conn| {
-            conn.execute("VACUUM;", params![])
-                .map_err(|err| warn!(context, "Vacuum failed, exporting anyway {err}"))
-                .ok();
-            conn.execute(
-                "ATTACH DATABASE ? AS backup KEY ?",
-                paramsv![dest, passphrase],
-            )
-            .context("failed to attach backup database")?;
-            let res = conn
-                .query_row("SELECT sqlcipher_export('backup')", [], |_row| Ok(()))
-                .context("failed to export to attached backup database");
-            conn.execute("DETACH DATABASE backup", [])
-                .context("failed to detach backup database")?;
-            res?;
-            Ok(())
-        })
-        .await
-}
-
 #[cfg(test)]
 mod tests {
     use std::time::Duration;
@@ -803,7 +800,7 @@ mod tests {
         println!("{}", &msg);
         // Check some substrings, indicating things got substituted.
         // In particular note the mixing of `\r\n` and `\n` depending
-        // on who generated the strings.
+        // on who generated the stings.
         assert!(msg.contains("<title>Autocrypt Setup Message</title"));
         assert!(msg.contains("<h1>Autocrypt Setup Message</h1>"));
         assert!(msg.contains("<p>This is the Autocrypt Setup Message used to"));

src/imex/transfer.rs

@@ -1,694 +0,0 @@
-//! Transfer a backup to an other device.
-//!
-//! This module provides support for using n0's iroh tool to initiate transfer of a backup
-//! to another device using a QR code.
-//!
-//! Using the iroh terminology there are two parties to this:
-//!
-//! - The *Provider*, which starts a server and listens for connections.
-//! - The *Getter*, which connects to the server and retrieves the data.
-//!
-//! Iroh is designed around the idea of verifying hashes, the downloads are verified as
-//! they are retrieved.  The entire transfer is initiated by requesting the data of a single
-//! root hash.
-//!
-//! Both the provider and the getter are authenticated:
-//!
-//! - The provider is known by its *peer ID*.
-//! - The provider needs an *authentication token* from the getter before it accepts a
-//!   connection.
-//!
-//! Both these are transferred in the QR code offered to the getter.  This ensures that the
-//! getter can not connect to an impersonated provider and the provider does not offer the
-//! download to an impersonated getter.
-
-use std::future::Future;
-use std::net::Ipv4Addr;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::pin::Pin;
-use std::task::Poll;
-
-use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
-use async_channel::Receiver;
-use futures_lite::StreamExt;
-use iroh::get::{DataStream, Options};
-use iroh::progress::ProgressEmitter;
-use iroh::protocol::AuthToken;
-use iroh::provider::{DataSource, Event, Provider, Ticket};
-use iroh::Hash;
-use tokio::fs::{self, File};
-use tokio::io::{self, AsyncWriteExt, BufWriter};
-use tokio::sync::broadcast::error::RecvError;
-use tokio::sync::{broadcast, Mutex};
-use tokio::task::{JoinHandle, JoinSet};
-use tokio_stream::wrappers::ReadDirStream;
-
-use crate::blob::BlobDirContents;
-use crate::chat::delete_and_reset_all_device_msgs;
-use crate::context::Context;
-use crate::qr::Qr;
-use crate::{e2ee, EventType};
-
-use super::{export_database, DBFILE_BACKUP_NAME};
-
-/// Provide or send a backup of this device.
-///
-/// This creates a backup of the current device and starts a service which offers another
-/// device to download this backup.
-///
-/// This does not make a full backup on disk, only the SQLite database is created on disk,
-/// the blobs in the blob directory are not copied.
-///
-/// This starts a task which acquires the global "ongoing" mutex.  If you need to stop the
-/// task use the [`Context::stop_ongoing`] mechanism.
-///
-/// The task implements [`Future`] and awaiting it will complete once a transfer has been
-/// either completed or aborted.
-#[derive(Debug)]
-pub struct BackupProvider {
-    /// The supervisor task, run by [`BackupProvider::watch_provider`].
-    handle: JoinHandle<Result<()>>,
-    /// The ticket to retrieve the backup collection.
-    ticket: Ticket,
-}
-
-impl BackupProvider {
-    /// Prepares for sending a backup to a second device.
-    ///
-    /// Before calling this function all I/O must be stopped so that no changes to the blobs
-    /// or database are happening, this is done by calling the [`Accounts::stop_io`] or
-    /// [`Context::stop_io`] APIs first.
-    ///
-    /// This will acquire the global "ongoing process" mutex, which can be used to cancel
-    /// the process.
-    ///
-    /// [`Accounts::stop_io`]: crate::accounts::Accounts::stop_io
-    pub async fn prepare(context: &Context) -> Result<Self> {
-        e2ee::ensure_secret_key_exists(context)
-            .await
-            .context("Private key not available, aborting backup export")?;
-
-        // Acquire global "ongoing" mutex.
-        let cancel_token = context.alloc_ongoing().await?;
-        let mut paused_guard = context.scheduler.pause(context.clone()).await;
-        let context_dir = context
-            .get_blobdir()
-            .parent()
-            .ok_or(anyhow!("Context dir not found"))?;
-        let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
-        if fs::metadata(&dbfile).await.is_ok() {
-            fs::remove_file(&dbfile).await?;
-            warn!(context, "Previous database export deleted");
-        }
-        let dbfile = TempPathGuard::new(dbfile);
-        let res = tokio::select! {
-            biased;
-            res = Self::prepare_inner(context, &dbfile) => {
-                match res {
-                    Ok(slf) => Ok(slf),
-                    Err(err) => {
-                        error!(context, "Failed to set up second device setup: {:#}", err);
-                        Err(err)
-                    },
-                }
-            },
-            _ = cancel_token.recv() => Err(format_err!("cancelled")),
-        };
-        let (provider, ticket) = match res {
-            Ok((provider, ticket)) => (provider, ticket),
-            Err(err) => {
-                context.free_ongoing().await;
-                paused_guard.resume().await;
-                return Err(err);
-            }
-        };
-        let handle = {
-            let context = context.clone();
-            tokio::spawn(async move {
-                let res = Self::watch_provider(&context, provider, cancel_token).await;
-                context.free_ongoing().await;
-                paused_guard.resume().await;
-                drop(dbfile);
-                res
-            })
-        };
-        Ok(Self { handle, ticket })
-    }
-
-    /// Creates the provider task.
-    ///
-    /// Having this as a function makes it easier to cancel it when needed.
-    async fn prepare_inner(context: &Context, dbfile: &Path) -> Result<(Provider, Ticket)> {
-        // Generate the token up front: we also use it to encrypt the database.
-        let token = AuthToken::generate();
-        context.emit_event(SendProgress::Started.into());
-        export_database(context, dbfile, token.to_string())
-            .await
-            .context("Database export failed")?;
-        context.emit_event(SendProgress::DatabaseExported.into());
-
-        // Now we can be sure IO is not running.
-        let mut files = vec![DataSource::with_name(
-            dbfile.to_owned(),
-            format!("db/{DBFILE_BACKUP_NAME}"),
-        )];
-        let blobdir = BlobDirContents::new(context).await?;
-        for blob in blobdir.iter() {
-            let path = blob.to_abs_path();
-            let name = format!("blob/{}", blob.as_file_name());
-            files.push(DataSource::with_name(path, name));
-        }
-
-        // Start listening.
-        let (db, hash) = iroh::provider::create_collection(files).await?;
-        context.emit_event(SendProgress::CollectionCreated.into());
-        let provider = Provider::builder(db)
-            .bind_addr((Ipv4Addr::UNSPECIFIED, 0).into())
-            .auth_token(token)
-            .spawn()?;
-        context.emit_event(SendProgress::ProviderListening.into());
-        info!(context, "Waiting for remote to connect");
-        let ticket = provider.ticket(hash);
-        Ok((provider, ticket))
-    }
-
-    /// Supervises the iroh [`Provider`], terminating it when needed.
-    ///
-    /// This will watch the provider and terminate it when:
-    ///
-    /// - A transfer is completed, successful or unsuccessful.
-    /// - An event could not be observed to protect against not knowing of a completed event.
-    /// - The ongoing process is cancelled.
-    ///
-    /// The *cancel_token* is the handle for the ongoing process mutex, when this completes
-    /// we must cancel this operation.
-    async fn watch_provider(
-        context: &Context,
-        mut provider: Provider,
-        cancel_token: Receiver<()>,
-    ) -> Result<()> {
-        // _dbfile exists so we can clean up the file once it is no longer needed
-        let mut events = provider.subscribe();
-        let mut total_size = 0;
-        let mut current_size = 0;
-        let res = loop {
-            tokio::select! {
-                biased;
-                res = &mut provider => {
-                    break res.context("BackupProvider failed");
-                },
-                maybe_event = events.recv() => {
-                    match maybe_event {
-                        Ok(event) => {
-                            match event {
-                                Event::ClientConnected { ..} => {
-                                    context.emit_event(SendProgress::ClientConnected.into());
-                                }
-                                Event::RequestReceived { .. } => {
-                                }
-                                Event::TransferCollectionStarted { total_blobs_size, .. } => {
-                                    total_size = total_blobs_size;
-                                    context.emit_event(SendProgress::TransferInProgress {
-                                        current_size,
-                                        total_size,
-                                    }.into());
-                                }
-                                Event::TransferBlobCompleted { size, .. } => {
-                                    current_size += size;
-                                    context.emit_event(SendProgress::TransferInProgress {
-                                        current_size,
-                                        total_size,
-                                    }.into());
-                                }
-                                Event::TransferCollectionCompleted { .. } => {
-                                    context.emit_event(SendProgress::TransferInProgress {
-                                        current_size: total_size,
-                                        total_size
-                                    }.into());
-                                    provider.shutdown();
-                                }
-                                Event::TransferAborted { .. } => {
-                                    provider.shutdown();
-                                    break Err(anyhow!("BackupProvider transfer aborted"));
-                                }
-                            }
-                        }
-                        Err(broadcast::error::RecvError::Closed) => {
-                            // We should never see this, provider.join() should complete
-                            // first.
-                        }
-                        Err(broadcast::error::RecvError::Lagged(_)) => {
-                            // We really shouldn't be lagging, if we did we may have missed
-                            // a completion event.
-                            provider.shutdown();
-                            break Err(anyhow!("Missed events from BackupProvider"));
-                        }
-                    }
-                },
-                _ = cancel_token.recv() => {
-                    provider.shutdown();
-                    break Err(anyhow!("BackupSender cancelled"));
-                },
-            }
-        };
-        match &res {
-            Ok(_) => context.emit_event(SendProgress::Completed.into()),
-            Err(err) => {
-                error!(context, "Backup transfer failure: {err:#}");
-                context.emit_event(SendProgress::Failed.into())
-            }
-        }
-        res
-    }
-
-    /// Returns a QR code that allows fetching this backup.
-    ///
-    /// This QR code can be passed to [`get_backup`] on a (different) device.
-    pub fn qr(&self) -> Qr {
-        Qr::Backup {
-            ticket: self.ticket.clone(),
-        }
-    }
-}
-
-impl Future for BackupProvider {
-    type Output = Result<()>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.handle).poll(cx)?
-    }
-}
-
-/// A guard which will remove the path when dropped.
-///
-/// It implements [`Deref`] it it can be used as a `&Path`.
-#[derive(Debug)]
-struct TempPathGuard {
-    path: PathBuf,
-}
-
-impl TempPathGuard {
-    fn new(path: PathBuf) -> Self {
-        Self { path }
-    }
-}
-
-impl Drop for TempPathGuard {
-    fn drop(&mut self) {
-        let path = self.path.clone();
-        tokio::spawn(async move {
-            fs::remove_file(&path).await.ok();
-        });
-    }
-}
-
-impl Deref for TempPathGuard {
-    type Target = Path;
-
-    fn deref(&self) -> &Self::Target {
-        &self.path
-    }
-}
-
-/// Create [`EventType::ImexProgress`] events using readable names.
-///
-/// Plus you get warnings if you don't use all variants.
-#[derive(Debug)]
-enum SendProgress {
-    Failed,
-    Started,
-    DatabaseExported,
-    CollectionCreated,
-    ProviderListening,
-    ClientConnected,
-    TransferInProgress { current_size: u64, total_size: u64 },
-    Completed,
-}
-
-impl From<SendProgress> for EventType {
-    fn from(source: SendProgress) -> Self {
-        use SendProgress::*;
-        let num: u16 = match source {
-            Failed => 0,
-            Started => 100,
-            DatabaseExported => 300,
-            CollectionCreated => 350,
-            ProviderListening => 400,
-            ClientConnected => 450,
-            TransferInProgress {
-                current_size,
-                total_size,
-            } => {
-                // the range is 450..=950
-                450 + ((current_size as f64 / total_size as f64) * 500.).floor() as u16
-            }
-            Completed => 1000,
-        };
-        Self::ImexProgress(num.into())
-    }
-}
-
-/// Contacts a backup provider and receives the backup from it.
-///
-/// This uses a QR code to contact another instance of deltachat which is providing a backup
-/// using the [`BackupProvider`].  Once connected it will authenticate using the secrets in
-/// the QR code and retrieve the backup.
-///
-/// This is a long running operation which will only when completed.
-///
-/// Using [`Qr`] as argument is a bit odd as it only accepts one specific variant of it.  It
-/// does avoid having [`iroh::provider::Ticket`] in the primary API however, without
-/// having to revert to untyped bytes.
-pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
-    ensure!(
-        matches!(qr, Qr::Backup { .. }),
-        "QR code for backup must be of type DCBACKUP"
-    );
-    ensure!(
-        !context.is_configured().await?,
-        "Cannot import backups to accounts in use."
-    );
-    let mut guard = context.scheduler.pause(context.clone()).await;
-
-    // Acquire global "ongoing" mutex.
-    let cancel_token = context.alloc_ongoing().await?;
-    let res = tokio::select! {
-        biased;
-        res = get_backup_inner(context, qr) => {
-            context.free_ongoing().await;
-            res
-        }
-        _ = cancel_token.recv() => Err(format_err!("cancelled")),
-    };
-    guard.resume().await;
-    res
-}
-
-async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
-    let ticket = match qr {
-        Qr::Backup { ticket } => ticket,
-        _ => bail!("QR code for backup must be of type DCBACKUP"),
-    };
-    if ticket.addrs.is_empty() {
-        bail!("ticket is missing addresses to dial");
-    }
-    for addr in &ticket.addrs {
-        let opts = Options {
-            addr: *addr,
-            peer_id: Some(ticket.peer),
-            keylog: false,
-        };
-        info!(context, "attempting to contact {}", addr);
-        match transfer_from_provider(context, &ticket, opts).await {
-            Ok(_) => {
-                delete_and_reset_all_device_msgs(context).await?;
-                context.emit_event(ReceiveProgress::Completed.into());
-                return Ok(());
-            }
-            Err(TransferError::ConnectionError(err)) => {
-                warn!(context, "Connection error: {err:#}.");
-                continue;
-            }
-            Err(TransferError::Other(err)) => {
-                // Clean up any blobs we already wrote.
-                let readdir = fs::read_dir(context.get_blobdir()).await?;
-                let mut readdir = ReadDirStream::new(readdir);
-                while let Some(dirent) = readdir.next().await {
-                    if let Ok(dirent) = dirent {
-                        fs::remove_file(dirent.path()).await.ok();
-                    }
-                }
-                context.emit_event(ReceiveProgress::Failed.into());
-                return Err(err);
-            }
-        }
-    }
-    Err(anyhow!("failed to contact provider"))
-}
-
-/// Error during a single transfer attempt.
-///
-/// Mostly exists to distinguish between `ConnectionError` and any other errors.
-#[derive(Debug, thiserror::Error)]
-enum TransferError {
-    #[error("connection error")]
-    ConnectionError(#[source] anyhow::Error),
-    #[error("other")]
-    Other(#[source] anyhow::Error),
-}
-
-async fn transfer_from_provider(
-    context: &Context,
-    ticket: &Ticket,
-    opts: Options,
-) -> Result<(), TransferError> {
-    let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
-    spawn_progress_proxy(context.clone(), progress.subscribe());
-    let mut connected = false;
-    let on_connected = || {
-        context.emit_event(ReceiveProgress::Connected.into());
-        connected = true;
-        async { Ok(()) }
-    };
-    let jobs = Mutex::new(JoinSet::default());
-    let on_blob =
-        |hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
-    let res = iroh::get::run(
-        ticket.hash,
-        ticket.token,
-        opts,
-        on_connected,
-        |collection| {
-            context.emit_event(ReceiveProgress::CollectionReceived.into());
-            progress.set_total(collection.total_blobs_size());
-            async { Ok(()) }
-        },
-        on_blob,
-    )
-    .await;
-
-    let mut jobs = jobs.lock().await;
-    while let Some(job) = jobs.join_next().await {
-        job.context("job failed").map_err(TransferError::Other)?;
-    }
-
-    drop(progress);
-    match res {
-        Ok(stats) => {
-            info!(
-                context,
-                "Backup transfer finished, transfer rate is {} Mbps.",
-                stats.mbits()
-            );
-            Ok(())
-        }
-        Err(err) => match connected {
-            true => Err(TransferError::Other(err)),
-            false => Err(TransferError::ConnectionError(err)),
-        },
-    }
-}
-
-/// Get callback when a blob is received from the provider.
-///
-/// This writes the blobs to the blobdir.  If the blob is the database it will import it to
-/// the database of the current [`Context`].
-async fn on_blob(
-    context: &Context,
-    progress: &ProgressEmitter,
-    jobs: &Mutex<JoinSet<()>>,
-    ticket: &Ticket,
-    _hash: Hash,
-    mut reader: DataStream,
-    name: String,
-) -> Result<DataStream> {
-    ensure!(!name.is_empty(), "Received a nameless blob");
-    let path = if name.starts_with("db/") {
-        let context_dir = context
-            .get_blobdir()
-            .parent()
-            .ok_or(anyhow!("Context dir not found"))?;
-        let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
-        if fs::metadata(&dbfile).await.is_ok() {
-            fs::remove_file(&dbfile).await?;
-            warn!(context, "Previous database export deleted");
-        }
-        dbfile
-    } else {
-        ensure!(name.starts_with("blob/"), "malformatted blob name");
-        let blobname = name.rsplit('/').next().context("malformatted blob name")?;
-        context.get_blobdir().join(blobname)
-    };
-
-    let mut wrapped_reader = progress.wrap_async_read(&mut reader);
-    let file = File::create(&path).await?;
-    let mut file = BufWriter::with_capacity(128 * 1024, file);
-    io::copy(&mut wrapped_reader, &mut file).await?;
-    file.flush().await?;
-
-    if name.starts_with("db/") {
-        let context = context.clone();
-        let token = ticket.token.to_string();
-        jobs.lock().await.spawn(async move {
-            if let Err(err) = context.sql.import(&path, token).await {
-                error!(context, "cannot import database: {:#?}", err);
-            }
-            if let Err(err) = fs::remove_file(&path).await {
-                error!(
-                    context,
-                    "failed to delete database import file '{}': {:#?}",
-                    path.display(),
-                    err,
-                );
-            }
-        });
-    }
-    Ok(reader)
-}
-
-/// Spawns a task proxying progress events.
-///
-/// This spawns a tokio task which receives events from the [`ProgressEmitter`] and sends
-/// them to the context.  The task finishes when the emitter is dropped.
-///
-/// This could be done directly in the emitter by making it less generic.
-fn spawn_progress_proxy(context: Context, mut rx: broadcast::Receiver<u16>) {
-    tokio::spawn(async move {
-        loop {
-            match rx.recv().await {
-                Ok(step) => context.emit_event(ReceiveProgress::BlobProgress(step).into()),
-                Err(RecvError::Closed) => break,
-                Err(RecvError::Lagged(_)) => continue,
-            }
-        }
-    });
-}
-
-/// Create [`EventType::ImexProgress`] events using readable names.
-///
-/// Plus you get warnings if you don't use all variants.
-#[derive(Debug)]
-enum ReceiveProgress {
-    Connected,
-    CollectionReceived,
-    /// A value between 0 and 85 interpreted as a percentage.
-    ///
-    /// Other values are already used by the other variants of this enum.
-    BlobProgress(u16),
-    Completed,
-    Failed,
-}
-
-impl ReceiveProgress {
-    /// The maximum value for [`ReceiveProgress::BlobProgress`].
-    ///
-    /// This only exists to keep this magic value local in this type.
-    fn max_blob_progress() -> u16 {
-        85
-    }
-}
-
-impl From<ReceiveProgress> for EventType {
-    fn from(source: ReceiveProgress) -> Self {
-        let val = match source {
-            ReceiveProgress::Connected => 50,
-            ReceiveProgress::CollectionReceived => 100,
-            ReceiveProgress::BlobProgress(val) => 100 + 10 * val,
-            ReceiveProgress::Completed => 1000,
-            ReceiveProgress::Failed => 0,
-        };
-        EventType::ImexProgress(val.into())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use crate::chat::{get_chat_msgs, send_msg, ChatItem};
-    use crate::message::{Message, Viewtype};
-    use crate::test_utils::TestContextManager;
-
-    use super::*;
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_receive() {
-        let mut tcm = TestContextManager::new();
-
-        // Create first device.
-        let ctx0 = tcm.alice().await;
-
-        // Write a message in the self chat
-        let self_chat = ctx0.get_self_chat().await;
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("hi there".to_string()));
-        send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();
-
-        // Send an attachment in the self chat
-        let file = ctx0.get_blobdir().join("hello.txt");
-        fs::write(&file, "i am attachment").await.unwrap();
-        let mut msg = Message::new(Viewtype::File);
-        msg.set_file(file.to_str().unwrap(), Some("text/plain"));
-        send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();
-
-        // Prepare to transfer backup.
-        let provider = BackupProvider::prepare(&ctx0).await.unwrap();
-
-        // Set up second device.
-        let ctx1 = tcm.unconfigured().await;
-        get_backup(&ctx1, provider.qr()).await.unwrap();
-
-        // Make sure the provider finishes without an error.
-        tokio::time::timeout(Duration::from_secs(30), provider)
-            .await
-            .expect("timed out")
-            .expect("error in provider");
-
-        // Check that we have the self message.
-        let self_chat = ctx1.get_self_chat().await;
-        let msgs = get_chat_msgs(&ctx1, self_chat.id).await.unwrap();
-        assert_eq!(msgs.len(), 2);
-        let msgid = match msgs.get(0).unwrap() {
-            ChatItem::Message { msg_id } => msg_id,
-            _ => panic!("wrong chat item"),
-        };
-        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
-        let text = msg.get_text().unwrap();
-        assert_eq!(text, "hi there");
-        let msgid = match msgs.get(1).unwrap() {
-            ChatItem::Message { msg_id } => msg_id,
-            _ => panic!("wrong chat item"),
-        };
-        let msg = Message::load_from_db(&ctx1, *msgid).await.unwrap();
-        let path = msg.get_file(&ctx1).unwrap();
-        let text = fs::read_to_string(&path).await.unwrap();
-        assert_eq!(text, "i am attachment");
-
-        // Check that both received the ImexProgress events.
-        ctx0.evtracker
-            .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
-            .await;
-        ctx1.evtracker
-            .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
-            .await;
-    }
-
-    #[test]
-    fn test_send_progress() {
-        let cases = [
-            ((0, 100), 450),
-            ((10, 100), 500),
-            ((50, 100), 700),
-            ((100, 100), 950),
-        ];
-
-        for ((current_size, total_size), progress) in cases {
-            let out = EventType::from(SendProgress::TransferInProgress {
-                current_size,
-                total_size,
-            });
-            assert_eq!(out, EventType::ImexProgress(progress));
-        }
-    }
-}

src/job.rs

@@ -6,14 +6,13 @@
 #![allow(missing_docs)]
 
 use std::fmt;
-use std::sync::atomic::Ordering;
 
 use anyhow::{Context as _, Result};
 use deltachat_derive::{FromSql, ToSql};
 use rand::{thread_rng, Rng};
 
 use crate::context::Context;
-use crate::imap::Imap;
+use crate::imap::{get_folder_meaning, FolderMeaning, Imap};
 use crate::scheduler::InterruptInfo;
 use crate::tools::time;
 
@@ -25,6 +24,7 @@ const JOB_RETRIES: u32 = 17;
 pub enum Status {
     Finished(Result<()>),
     RetryNow,
+    RetryLater,
 }
 
 #[macro_export]
@@ -62,6 +62,10 @@ pub enum Action {
     // Most messages are downloaded automatically on fetch
     // and do not go through this job.
     DownloadMsg = 250,
+
+    // UID synchronization is high-priority to make sure correct UIDs
+    // are used by message moving/deletion.
+    ResyncFolders = 300,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -138,6 +142,52 @@ impl Job {
 
         Ok(())
     }
+    /// Synchronizes UIDs for all folders.
+    async fn resync_folders(&mut self, context: &Context, imap: &mut Imap) -> Status {
+        if let Err(err) = imap.prepare(context).await {
+            warn!(context, "could not connect: {:#}", err);
+            return Status::RetryLater;
+        }
+
+        let all_folders = match imap.list_folders(context).await {
+            Ok(v) => v,
+            Err(e) => {
+                warn!(context, "Listing folders for resync failed: {:#}", e);
+                return Status::RetryLater;
+            }
+        };
+
+        let mut any_failed = false;
+
+        for folder in all_folders {
+            let folder_meaning = get_folder_meaning(&folder);
+            if folder_meaning == FolderMeaning::Virtual {
+                continue;
+            }
+            if let Err(e) = imap
+                .resync_folder_uids(context, folder.name(), folder_meaning)
+                .await
+            {
+                warn!(context, "{:#}", e);
+                any_failed = true;
+            }
+        }
+
+        if any_failed {
+            Status::RetryLater
+        } else {
+            Status::Finished(Ok(()))
+        }
+    }
+}
+
+/// Delete all pending jobs with the given action.
+pub async fn kill_action(context: &Context, action: Action) -> Result<()> {
+    context
+        .sql
+        .execute("DELETE FROM jobs WHERE action=?;", paramsv![action])
+        .await?;
+    Ok(())
 }
 
 pub(crate) enum Connection<'a> {
@@ -161,7 +211,7 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
     };
 
     match try_res {
-        Status::RetryNow => {
+        Status::RetryNow | Status::RetryLater => {
             let tries = job.tries + 1;
 
             if tries < JOB_RETRIES {
@@ -215,6 +265,7 @@ async fn perform_job_action(
     info!(context, "begin immediate try {} of job {}", tries, job);
 
     let try_res = match job.action {
+        Action::ResyncFolders => job.resync_folders(context, connection.inbox()).await,
         Action::DownloadMsg => job.download_msg(context, connection.inbox()).await,
     };
 
@@ -236,13 +287,8 @@ fn get_backoff_time_offset(tries: u32) -> i64 {
 }
 
 pub(crate) async fn schedule_resync(context: &Context) -> Result<()> {
-    context.resync_request.store(true, Ordering::Relaxed);
-    context
-        .scheduler
-        .interrupt_inbox(InterruptInfo {
-            probe_network: false,
-        })
-        .await;
+    kill_action(context, Action::ResyncFolders).await?;
+    add(context, Job::new(Action::ResyncFolders, 0)).await?;
     Ok(())
 }
 
@@ -251,10 +297,7 @@ pub async fn add(context: &Context, job: Job) -> Result<()> {
     job.save(context).await.context("failed to save job")?;
 
     info!(context, "interrupt: imap");
-    context
-        .scheduler
-        .interrupt_inbox(InterruptInfo::new(false))
-        .await;
+    context.interrupt_inbox(InterruptInfo::new(false)).await;
     Ok(())
 }
 

src/key.rs

@@ -148,7 +148,7 @@ impl DcKey for SignedSecretKey {
                      WHERE addr=(SELECT value FROM config WHERE keyname="configured_addr")
                        AND is_default=1;
                     "#,
-                    (),
+                    paramsv![],
                     |row| {
                         let bytes: Vec<u8> = row.get(0)?;
                         Ok(bytes)
@@ -302,7 +302,7 @@ pub async fn store_self_keypair(
                 .context("failed to remove old use of key")?;
             if default == KeyPairUse::Default {
                 transaction
-                    .execute("UPDATE keypairs SET is_default=0;", ())
+                    .execute("UPDATE keypairs SET is_default=0;", paramsv![])
                     .context("failed to clear default")?;
             }
             let is_default = match default {
@@ -592,7 +592,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
 
         let nrows = || async {
             ctx.sql
-                .count("SELECT COUNT(*) FROM keypairs;", ())
+                .count("SELECT COUNT(*) FROM keypairs;", paramsv![])
                 .await
                 .unwrap()
         };

src/lib.rs

@@ -12,10 +12,7 @@
     clippy::wildcard_imports,
     clippy::needless_borrow,
     clippy::cast_lossless,
-    clippy::unused_async,
-    clippy::explicit_iter_loop,
-    clippy::explicit_into_iter_loop,
-    clippy::cloned_instead_of_copied
+    clippy::unused_async
 )]
 #![allow(
     clippy::match_bool,

src/location.rs

@@ -267,7 +267,7 @@ pub async fn send_locations_to_chat(
     }
     context.emit_event(EventType::ChatModified(chat_id));
     if 0 != seconds {
-        context.scheduler.interrupt_location().await;
+        context.interrupt_location().await;
     }
     Ok(())
 }
@@ -434,7 +434,10 @@ fn is_marker(txt: &str) -> bool {
 
 /// Deletes all locations from the database.
 pub async fn delete_all(context: &Context) -> Result<()> {
-    context.sql.execute("DELETE FROM locations;", ()).await?;
+    context
+        .sql
+        .execute("DELETE FROM locations;", paramsv![])
+        .await?;
     context.emit_event(EventType::LocationChanged(None));
     Ok(())
 }
@@ -600,7 +603,7 @@ pub(crate) async fn save(
 
         context
             .sql
-            .call_write(|conn| {
+            .call(|conn| {
                 let mut stmt_test = conn
                     .prepare_cached("SELECT id FROM locations WHERE timestamp=? AND from_id=?")?;
                 let mut stmt_insert = conn.prepare_cached(stmt_insert)?;

src/message.rs

@@ -610,7 +610,7 @@ impl Message {
     // It's a little unfortunate that the UI has to first call `dc_msg_get_override_sender_name` and then if it was `NULL`, call
     // `dc_contact_get_display_name` but this was the best solution:
     // - We could load a Contact struct from the db here to call `dc_get_display_name` instead of returning `None`, but then we had a db
-    //   call every time (and this fn is called a lot while the user is scrolling through a group), so performance would be bad
+    //   call everytime (and this fn is called a lot while the user is scrolling through a group), so performance would be bad
     // - We could pass both a Contact struct and a Message struct in the FFI, but at least on Android we would need to handle raw
     //   C-data in the Java code (i.e. a `long` storing a C pointer)
     // - We can't make a param `SenderDisplayname` for messages as sometimes the display name of a contact changes, and we want to show
@@ -1419,10 +1419,7 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
     }
 
     // Interrupt Inbox loop to start message deletion and run housekeeping.
-    context
-        .scheduler
-        .interrupt_inbox(InterruptInfo::new(false))
-        .await;
+    context.interrupt_inbox(InterruptInfo::new(false)).await;
     Ok(())
 }
 
@@ -1505,7 +1502,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
         curr_rfc724_mid,
         curr_blocked,
         _curr_ephemeral_timer,
-    ) in msgs
+    ) in msgs.into_iter()
     {
         if curr_blocked == Blocked::Not
             && (curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed)
@@ -1534,10 +1531,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()>
                         )
                         .await
                         .context("failed to insert into smtp_mdns")?;
-                    context
-                        .scheduler
-                        .interrupt_smtp(InterruptInfo::new(false))
-                        .await;
+                    context.interrupt_smtp(InterruptInfo::new(false)).await;
                 }
             }
             updated_chat_ids.insert(curr_chat_id);
@@ -1747,7 +1741,7 @@ pub(crate) async fn handle_ndn(
     };
 
     let mut first = true;
-    for msg in msgs {
+    for msg in msgs.into_iter() {
         let (msg_id, chat_id, chat_type) = msg?;
         set_msg_failed(context, msg_id, &error).await;
         if first {
@@ -1800,7 +1794,7 @@ pub async fn get_unblocked_msg_cnt(context: &Context) -> usize {
             "SELECT COUNT(*) \
          FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id \
          WHERE m.id>9 AND m.chat_id>9 AND c.blocked=0;",
-            (),
+            paramsv![],
         )
         .await
     {
@@ -1820,7 +1814,7 @@ pub async fn get_request_msg_cnt(context: &Context) -> usize {
             "SELECT COUNT(*) \
          FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id \
          WHERE c.blocked=2;",
-            (),
+            paramsv![],
         )
         .await
     {

src/mimefactory.rs

@@ -485,7 +485,7 @@ impl<'a> MimeFactory<'a> {
                     None
                 };
 
-            for (name, addr) in &self.recipients {
+            for (name, addr) in self.recipients.iter() {
                 if let Some(email_to_remove) = email_to_remove {
                     if email_to_remove == addr {
                         continue;
@@ -1932,7 +1932,7 @@ mod tests {
 
         // These two combinations are different: If `message_arrives_inbetween` is true, but
         // `reply` is false, the core is actually expected to use the subject of the message
-        // that arrived in between.
+        // that arrived inbetween.
         assert_eq!(
             "Re: Some other, completely unrelated subject",
             msg_to_subject_str_inner(imf_raw, false, false, true).await

src/mimeparser.rs

@@ -357,7 +357,7 @@ impl MimeMessage {
                     // where this would be useful.
                     warn!(
                         context,
-                        "From header in signed part doesn't match the outer one",
+                        "From header in signed part does't match the outer one",
                     );
                 }
             }
@@ -525,7 +525,7 @@ impl MimeMessage {
         }
     }
 
-    /// Squashes mutitpart chat messages with attachment into single-part messages.
+    /// Squashes mutlipart chat messages with attachment into single-part messages.
     ///
     /// Delta Chat sends attachments, such as images, in two-part messages, with the first message
     /// containing a description. If such a message is detected, text from the first part can be
@@ -640,7 +640,7 @@ impl MimeMessage {
         }
 
         if self.is_forwarded {
-            for part in &mut self.parts {
+            for part in self.parts.iter_mut() {
                 part.param.set_int(Param::Forwarded, 1);
             }
         }
@@ -855,9 +855,9 @@ impl MimeMessage {
         let mut any_part_added = false;
         let mimetype = get_mime_type(mail)?.0;
         match (mimetype.type_(), mimetype.subtype().as_str()) {
-            /* Most times, multipart/alternative contains true alternatives
+            /* Most times, mutlipart/alternative contains true alternatives
             as text/plain and text/html.  If we find a multipart/mixed
-            inside multipart/alternative, we use this (happens eg in
+            inside mutlipart/alternative, we use this (happens eg in
             apple mail: "plaintext" as an alternative to "html+PDF attachment") */
             (mime::MULTIPART, "alternative") => {
                 for cur_data in &mail.subparts {
@@ -943,7 +943,7 @@ impl MimeMessage {
                             }
 
                             // Add all parts (we need another part, preferably text/plain, to show as an error message)
-                            for cur_data in &mail.subparts {
+                            for cur_data in mail.subparts.iter() {
                                 if self
                                     .parse_mime_recursive(context, cur_data, is_related)
                                     .await?
@@ -977,7 +977,7 @@ impl MimeMessage {
             _ => {
                 // Add all parts (in fact, AddSinglePartIfKnown() later check if
                 // the parts are really supported)
-                for cur_data in &mail.subparts {
+                for cur_data in mail.subparts.iter() {
                     if self
                         .parse_mime_recursive(context, cur_data, is_related)
                         .await?
@@ -1682,7 +1682,7 @@ impl MimeMessage {
 
 /// Parses `Autocrypt-Gossip` headers from the email and applies them to peerstates.
 /// Params:
-/// from: The address which sent the message currently being parsed
+/// from: The address which sent the message currently beeing parsed
 ///
 /// Returns the set of mail recipient addresses for which valid gossip headers were found.
 async fn update_gossip_peerstates(

src/net.rs

@@ -57,7 +57,7 @@ async fn lookup_host_with_cache(
         }
     };
 
-    for addr in &resolved_addrs {
+    for addr in resolved_addrs.iter() {
         let ip_string = addr.ip().to_string();
         if ip_string == hostname {
             // IP address resolved into itself, not interesting to cache.

src/net/session.rs

@@ -2,7 +2,7 @@ use async_native_tls::TlsStream;
 use fast_socks5::client::Socks5Stream;
 use std::pin::Pin;
 use std::time::Duration;
-use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite, BufStream, BufWriter};
+use tokio::io::{AsyncRead, AsyncWrite, BufWriter};
 use tokio_io_timeout::TimeoutStream;
 
 pub(crate) trait SessionStream:
@@ -22,11 +22,6 @@ impl<T: SessionStream> SessionStream for TlsStream<T> {
         self.get_mut().set_read_timeout(timeout);
     }
 }
-impl<T: SessionStream> SessionStream for BufStream<T> {
-    fn set_read_timeout(&mut self, timeout: Option<Duration>) {
-        self.get_mut().set_read_timeout(timeout);
-    }
-}
 impl<T: SessionStream> SessionStream for BufWriter<T> {
     fn set_read_timeout(&mut self, timeout: Option<Duration>) {
         self.get_mut().set_read_timeout(timeout);
@@ -44,8 +39,3 @@ impl<T: SessionStream> SessionStream for Socks5Stream<T> {
         self.get_socket_mut().set_read_timeout(timeout)
     }
 }
-
-/// Session stream with a read buffer.
-pub(crate) trait SessionBufStream: SessionStream + AsyncBufRead {}
-
-impl<T: SessionStream + AsyncBufRead> SessionBufStream for T {}