fix: separate entered and configured certificate checks

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     name: Lint Rust
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: 1.82.0
+      RUSTUP_TOOLCHAIN: 1.80.1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -95,11 +95,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            rust: 1.82.0
+            rust: 1.80.1
           - os: windows-latest
-            rust: 1.82.0
+            rust: 1.80.1
           - os: macos-latest
-            rust: 1.82.0
+            rust: 1.80.1
 
           # Minimum Supported Rust Version = 1.77.0
           - os: ubuntu-latest
@@ -211,9 +211,9 @@ jobs:
         include:
           # Currently used Rust version.
           - os: ubuntu-latest
-            python: 3.13
+            python: 3.12
           - os: macos-latest
-            python: 3.13
+            python: 3.12
 
           # PyPy tests
           - os: ubuntu-latest
@@ -249,7 +249,7 @@ jobs:
 
       - name: Run python tests
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
           DCC_RS_TARGET: debug
           DCC_RS_DEV: ${{ github.workspace }}
         working-directory: python
@@ -263,11 +263,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python: 3.13
+            python: 3.12
           - os: macos-latest
-            python: 3.13
+            python: 3.12
           - os: windows-latest
-            python: 3.13
+            python: 3.12
 
           # PyPy tests
           - os: ubuntu-latest
@@ -314,6 +314,6 @@ jobs:
 
       - name: Run deltachat-rpc-client tests
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
         working-directory: deltachat-rpc-client
         run: tox -e py

.github/workflows/jsonrpc.yml

@@ -33,7 +33,7 @@ jobs:
         working-directory: deltachat-jsonrpc/typescript
         run: npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
       - name: make sure websocket server version still builds
         working-directory: deltachat-jsonrpc
         run: cargo build --bin deltachat-jsonrpc-server --features webserver

.github/workflows/node-tests.yml

@@ -64,5 +64,5 @@ jobs:
         working-directory: node
         run: npm run test
         env:
-          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
+          CHATMAIL_DOMAIN: ${{ secrets.CHATMAIL_DOMAIN }}
           NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"

CHANGELOG.md

@@ -1,430 +1,5 @@
 # Changelog
 
-## [1.148.6] - 2024-10-31
-
-### API-Changes
-
-- Add Message::new_text() ([#6123](https://github.com/deltachat/deltachat-core-rust/pull/6123)).
-- Add `MessageSearchResult.chat_id` ([#6120](https://github.com/deltachat/deltachat-core-rust/pull/6120)).
-
-### Features / Changes
-
-- Enable Webxdc realtime by default ([#6125](https://github.com/deltachat/deltachat-core-rust/pull/6125)).
-
-### Fixes
-
-- Save full text to mime_headers for long outgoing messages ([#6091](https://github.com/deltachat/deltachat-core-rust/pull/6091)).
-- Show root SMTP connection failure in connectivity view ([#6121](https://github.com/deltachat/deltachat-core-rust/pull/6121)).
-- Skip IDLE if we got unsolicited FETCH ([#6130](https://github.com/deltachat/deltachat-core-rust/pull/6130)).
-
-### Miscellaneous Tasks
-
-- Silence another rust-analyzer false-positive ([#6124](https://github.com/deltachat/deltachat-core-rust/pull/6124)).
-- cargo: Upgrade iroh to 0.26.0.
-
-### Refactor
-
-- Directly use connectives ([#6128](https://github.com/deltachat/deltachat-core-rust/pull/6128)).
-- Use Message::new_text() more ([#6127](https://github.com/deltachat/deltachat-core-rust/pull/6127)).
-
-## [1.148.5] - 2024-10-27
-
-### Fixes
-
-- Set Config::NotifyAboutWrongPw before saving configuration ([#5896](https://github.com/deltachat/deltachat-core-rust/pull/5896)).
-- Do not take write lock for maybe_network_lost() and set_push_device_token().
-- Do not lock the account manager for the whole duration of background_fetch.
-
-### Features / Changes
-
-- Auto-restore 1:1 chat protection after receiving old unverified message.
-
-### CI
-
-- Take `CHATMAIL_DOMAIN` from variables instead of secrets.
-
-### Other
-
-- Revert "build: nix flake update fenix" to fix `nix build .#deltachat-rpc-server-armeabi-v7a-android`.
-
-### Refactor
-
-- Receive_imf::add_parts: Remove excessive `from_id == ContactId::SELF` checks.
-- Factor out `add_gossip_peer_from_header()`.
-
-## [1.148.4] - 2024-10-24
-
-### Features / Changes
-
-- Jsonrpc: add `private_tag` to `Account::Configured` Object ([#6107](https://github.com/deltachat/deltachat-core-rust/pull/6107)).
-
-### Fixes
-
-- Normalize proxy URLs before saving into proxy_url.
-- Do not wait for connections in maybe_add_gossip_peers().
-
-## [1.148.3] - 2024-10-24
-
-### Fixes
-
-- Fix reception of realtime advertisements.
-
-### Features / Changes
-
-- Allow sending realtime messages up to 128 KB in size.
-
-### API-Changes
-
-- deltachat-rpc-client: Add EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED.
-
-### Documentation
-
-- Fix DC_QR_PROXY docs ([#6099](https://github.com/deltachat/deltachat-core-rust/pull/6099)).
-
-### Refactor
-
-- Generate topic inside create_iroh_header().
-
-### Tests
-
-- Test that realtime advertisements work after chatting.
-
-## [1.148.2] - 2024-10-23
-
-### Fixes
-
-- Never initialize Iroh if realtime is disabled.
-
-### Features / Changes
-
-- Add more logging for iroh initialization and peer addition.
-
-### Build system
-
-- `nix flake update nixpkgs`.
-- `nix flake update fenix`.
-
-## [1.148.1] - 2024-10-23
-
-### Build system
-
-- Revert "build: nix flake update"
-
-This reverts commit 6f22ce2722b51773d7fbb0d89e4764f963cafd91..
-
-## [1.148.0] - 2024-10-22
-
-### API-Changes
-
-- Create QR codes from any data ([#6090](https://github.com/deltachat/deltachat-core-rust/pull/6090)).
-- Add delta chat logo to QR codes ([#6093](https://github.com/deltachat/deltachat-core-rust/pull/6093)).
-- Add realtime advertisement received event ([#6043](https://github.com/deltachat/deltachat-core-rust/pull/6043)).
-- Notify adding reactions ([#6072](https://github.com/deltachat/deltachat-core-rust/pull/6072))
-- Internal profile names ([#6088](https://github.com/deltachat/deltachat-core-rust/pull/6088)).
-
-### Features / Changes
-
-- IMAP COMPRESS support.
-- Sort received outgoing message down if it's fresher than all non fresh messages.
-- Prioritize cached results if DNS resolver returns many results.
-- Add in-memory cache for DNS.
-- deltachat-repl: Built-in QR code printer.
-- Log the logic for (not) doing AEAP.
-- Log when late Autocrypt header is ignored.
-- Add more context to `send_msg` errors.
-
-### Fixes
-
-- Replace old draft with a new one atomically.
-- ChatId::maybe_delete_draft: Don't delete message if it's not a draft anymore ([#6053](https://github.com/deltachat/deltachat-core-rust/pull/6053)).
-- Call update_connection_history for proxified connections.
-- sql: Set PRAGMA query_only to avoid writing on read-only connections.
-- sql: Run `PRAGMA incremental_vacuum` on a write connection.
-- Increase MAX_SECONDS_TO_LEND_FROM_FUTURE to 30.
-
-### Build system
-
-- Nix flake update.
-- Resolve warning about default-features, and make it possible to disable vendoring ([#6079](https://github.com/deltachat/deltachat-core-rust/pull/6079)).
-- Silence a rust-analyzer false-positive ([#6077](https://github.com/deltachat/deltachat-core-rust/pull/6077)).
-
-### CI
-
-- Update Rust to 1.82.0.
-
-### Documentation
-
-- Set_protection_for_timestamp_sort does not send messages.
-- Document MimeFactory.req_mdn.
-- Fix `too_long_first_doc_paragraph` clippy lint.
-
-### Refactor
-
-- Update_msg_state: Don't avoid downgrading OutMdnRcvd to OutDelivered.
-- Fix elided_named_lifetimes warning.
-- set_protection_for_timestamp_sort: Do not log bubbled up errors.
-- Fix clippy::needless_lifetimes warnings.
-- Use `HeaderDef` constant for Chat-Disposition-Notification-To.
-- Resultify get_self_fingerprint().
-- sql: Move write mutex into connection pool.
-
-### Tests
-
-- test_qr_setup_contact_svg: Stop testing for no display name.
-- Always gossip if gossip_period is set to 0.
-- test_aeap_flow_verified: Wait for "member added" before sending messages ([#6057](https://github.com/deltachat/deltachat-core-rust/pull/6057)).
-- Make test_verified_group_member_added_recovery more reliable.
-- test_aeap_flow_verified: Do not start ac1new.
-- Fix `test_securejoin_after_contact_resetup` flakiness.
-- Message from old setup preserves contact verification, but breaks 1:1 protection.
-
-## [1.147.1] - 2024-10-13
-
-### Build system
-
-- Build Python 3.13 wheels.
-- deltachat-rpc-client: Add classifiers for all supported Python versions.
-
-### CI
-
-- Update to Python 3.13.
-
-### Documentation
-
-- CONTRIBUTING.md: Add a note on deleting/changing db columns.
-
-### Fixes
-
-- Reset quota on configured address change ([#5908](https://github.com/deltachat/deltachat-core-rust/pull/5908)).
-- Do not emit progress 1000 when configuration is cancelled.
-- Assume file extensions are 32 chars max and don't contain whitespace ([#5338](https://github.com/deltachat/deltachat-core-rust/pull/5338)).
-- Readd tokens.foreign_id column ([#6038](https://github.com/deltachat/deltachat-core-rust/pull/6038)).
-
-### Miscellaneous Tasks
-
-- cargo: Bump futures-* from 0.3.30 to 0.3.31.
-- cargo: Upgrade async_zip to 0.0.17 ([#6035](https://github.com/deltachat/deltachat-core-rust/pull/6035)).
-
-### Refactor
-
-- MsgId::update_download_state: Don't fail if the message doesn't exist anymore.
-
-## [1.147.0] - 2024-10-05
-
-### API-Changes
-
-- [**breaking**] Remove deprecated get_next_media() APIs.
-
-### Features / Changes
-
-- Reuse existing connections in background_fetch() if I/O is started.
-- MsgId::get_info(): Report original filename as well.
-- More context for the "Cannot establish guaranteed..." info message ([#6022](https://github.com/deltachat/deltachat-core-rust/pull/6022)).
-- deltachat-repl: Add `fetch` command to test `background_fetch()`.
-- deltachat-repl: Print send-backup QR code to the terminal.
-
-### Fixes
-
-- Do not attempt to reference info messages.
-- query_row_optional: Do not treat rows with NULL as missing rows.
-- Skip unconfigured folders in `background_fetch()`.
-- Break out of accept() loop if there is an error transferring backup.
-- Make it possible to cancel ongoing backup transfer.
-- Make backup reception cancellable by stopping ongoing process.
-- Smooth progress bar for backup transfer.
-- Emit progress 0 if get_backup() fails.
-
-### Documentation
-
-- CONTRIBUTING.md: Add more SQL advices.
-
-## [1.146.0] - 2024-10-03
-
-### Fixes
-
-- download_msg: Do not fail if the message does not exist anymore.
-- Better log message for failed QR scan.
-
-### Features / Changes
-
-- Assign message to ad-hoc group with matching name and members ([#5385](https://github.com/deltachat/deltachat-core-rust/pull/5385)).
-- Use Rustls instead of native TLS for HTTPS requests.
-
-### Miscellaneous Tasks
-
-- cargo: Bump anyhow from 1.0.86 to 1.0.89.
-- cargo: Bump tokio-stream from 0.1.15 to 0.1.16.
-- cargo: Bump thiserror from 1.0.63 to 1.0.64.
-- cargo: Bump bytes from 1.7.1 to 1.7.2.
-- cargo: Bump libc from 0.2.158 to 0.2.159.
-- cargo: Bump tempfile from 3.10.1 to 3.13.0.
-- cargo: Bump pretty_assertions from 1.4.0 to 1.4.1.
-- cargo: Bump hyper-util from 0.1.7 to 0.1.9.
-- cargo: Bump rustls-pki-types from 1.8.0 to 1.9.0.
-- cargo: Bump quick-xml from 0.36.1 to 0.36.2.
-- cargo: Bump serde from 1.0.209 to 1.0.210.
-- cargo: Bump syn from 2.0.77 to 2.0.79.
-
-### Refactor
-
-- Move group name calculation out of create_adhoc_group().
-- Merge build_tls() function into wrap_tls().
-
-## [1.145.0] - 2024-09-26
-
-### Fixes
-
-- Avoid changing `delete_server_after` default for existing configurations.
-
-### Miscellaneous Tasks
-
-- Sort dependency list.
-
-### Refactor
-
-- Do not wrap shadowsocks::ProxyClientStream.
-
-## [1.144.0] - 2024-09-21
-
-### API-Changes
-
-- [**breaking**] Make QR code type for proxy not specific to SOCKS5 ([#5980](https://github.com/deltachat/deltachat-core-rust/pull/5980)).
-
-  `DC_QR_SOCKS5_PROXY` is replaced with `DC_QR_PROXY`.
-
-### Features / Changes
-
-- Make resending OutPending messages possible ([#5817](https://github.com/deltachat/deltachat-core-rust/pull/5817)).
-- Don't SMTP-send messages to self-chat if BccSelf is disabled.
-- HTTP(S) tunneling.
-- Don't put displayname into From/To/Sender if it equals to address ([#5983](https://github.com/deltachat/deltachat-core-rust/pull/5983)).
-- Use IMAP APPEND command to upload sync messages ([#5845](https://github.com/deltachat/deltachat-core-rust/pull/5845)).
-- Generate 144-bit group IDs.
-- smtp: More verbose SMTP connection establishment errors.
-- Log unexpected message state when resending fails.
-
-### Fixes
-
-- Save QR code token regardless of whether the group exists ([#5954](https://github.com/deltachat/deltachat-core-rust/pull/5954)).
-- Shorten message text in locally sent messages too ([#2281](https://github.com/deltachat/deltachat-core-rust/pull/2281)).
-
-### Documentation
-
-- CONTRIBUTING.md: Document how to format SQL statements.
-
-### Miscellaneous Tasks
-
-- Update provider database.
-- cargo: Update iroh to 0.25.
-- cargo: Update lazy_static to 1.5.0.
-- deps: Bump async-imap from 0.10.0 to 0.10.1.
-
-### Refactor
-
-- Do not store deprecated `addr` and `is_default` into `keypairs`.
-- Remove `addr` from KeyPair.
-- Use `KeyPair::new()` in `create_keypair()`.
-
-## [1.143.0] - 2024-09-12
-
-### Features / Changes
-
-- Automatic reconfiguration, e.g. switching to implicit TLS if STARTTLS port stops working.
-- Always use preloaded DNS results.
-- Add "Auto-Submitted: auto-replied" header to appropriate SecureJoin messages.
-- Parallelize IMAP and SMTP connection attempts ([#5915](https://github.com/deltachat/deltachat-core-rust/pull/5915)).
-- securejoin: Ignore invalid *-request-with-auth messages silently.
-- ChatId::create_for_contact_with_blocked: Don't emit events on no op.
-- Delete messages from a chatmail server immediately by default ([#5805](https://github.com/deltachat/deltachat-core-rust/pull/5805)) ([#5840](https://github.com/deltachat/deltachat-core-rust/pull/5840)).
-- Shadowsocks support.
-- Recognize t.me SOCKS5 proxy QR codes ([#5895](https://github.com/deltachat/deltachat-core-rust/pull/5895))
-- Remove old iroh 0.4 and support for old `DCBACKUP` QR codes.
-
-### Fixes
-
-- http: Set I/O timeout to 1 minute rather than whole request timeout.
-- Add Auto-Submitted header in a single place.
-- Do not allow quotes with "... wrote:" headers in chat messages.
-- Don't sync QR code token before populating the group ([#5935](https://github.com/deltachat/deltachat-core-rust/pull/5935)).
-
-### Documentation
-
-- Document that `bcc_self` is enabled by default.
-
-### CI
-
-- Update Rust to 1.81.0.
-
-### Miscellaneous Tasks
-
-- Update provider database.
-- cargo: Update iroh to 0.23.0.
-- cargo: Reduce number of duplicate dependencies.
-- cargo: Replace unmaintained ansi_term with nu-ansi-term.
-- Replace `reqwest` with direct usage of `hyper`.
-
-### Refactor
-
-- login_param: Use Config:: constants to avoid typos in key names.
-- Make Context::config_exists() crate-public.
-- Get_config_bool_opt(): Return None if only default value exists.
-
-### Tests
-
-- Test that alternative port 443 works.
-- Alice is (non-)bot on Bob's side after QR contact setup.
-
-## [1.142.12] - 2024-09-02
-
-### Fixes
-
-- Display Config::MdnsEnabled as true by default ([#5948](https://github.com/deltachat/deltachat-core-rust/pull/5948)).
-
-## [1.142.11] - 2024-08-30
-
-### Fixes
-
-- Set backward verification when observing vc-contact-confirm or `vg-member-added` ([#5930](https://github.com/deltachat/deltachat-core-rust/pull/5930)).
-
-## [1.142.10] - 2024-08-26
-
-### Fixes
-
-- Only include one From: header in securejoin messages ([#5917](https://github.com/deltachat/deltachat-core-rust/pull/5917)).
-
-## [1.142.9] - 2024-08-24
-
-### Fixes
-
-- Fix reading of multiline SMTP greetings ([#5911](https://github.com/deltachat/deltachat-core-rust/pull/5911)).
-
-### Features / Changes
-
-- Update preloaded DNS cache.
-
-## [1.142.8] - 2024-08-21
-
-### Fixes
-
-- Do not panic on unknown CertificateChecks values.
-
-## [1.142.7] - 2024-08-17
-
-### Fixes
-
-- Do not save "Automatic" into configured_imap_certificate_checks. **This fixes regression introduced in core 1.142.4. Versions 1.142.4..1.142.6 should not be used in releases.**
-- Create a group unblocked for bot even if 1:1 chat is blocked ([#5514](https://github.com/deltachat/deltachat-core-rust/pull/5514)).
-- Update rpgp from 0.13.1 to 0.13.2 to fix "unable to decrypt" errors when sending messages to old Delta Chat clients and using Ed25519 keys to encrypt.
-- Do not request ALPN on standard ports and when using STARTTLS.
-
-### Features / Changes
-
-- jsonrpc: Add ContactObject::e2ee_avail.
-
-### Tests
-
-- Protected group for bot is auto-accepted.
-
 ## [1.142.6] - 2024-08-15
 
 ### Fixes
@@ -5174,22 +4749,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.142.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.3...v1.142.4
 [1.142.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.4...v1.142.5
 [1.142.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.5...v1.142.6
-[1.142.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.6...v1.142.7
-[1.142.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.7...v1.142.8
-[1.142.9]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.8...v1.142.9
-[1.142.10]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.9..v1.142.10
-[1.142.11]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.10..v1.142.11
-[1.142.12]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.11..v1.142.12
-[1.143.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.12..v1.143.0
-[1.144.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.143.0..v1.144.0
-[1.145.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.144.0..v1.145.0
-[1.146.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.145.0..v1.146.0
-[1.147.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.146.0..v1.147.0
-[1.147.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.147.0..v1.147.1
-[1.148.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.147.1..v1.148.0
-[1.148.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.0..v1.148.1
-[1.148.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.1..v1.148.2
-[1.148.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.2..v1.148.3
-[1.148.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.3..v1.148.4
-[1.148.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.4..v1.148.5
-[1.148.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.5..v1.148.6

CMakeLists.txt

@@ -27,7 +27,7 @@ add_custom_command(
         PREFIX=${CMAKE_INSTALL_PREFIX}
         LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
         INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release --features jsonrpc
+	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release --no-default-features --features jsonrpc
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )
 

CONTRIBUTING.md

@@ -32,66 +32,6 @@ on the contributing page: <https://github.com/deltachat/deltachat-core-rust/cont
 We format the code using `rustfmt`. Run `cargo fmt` prior to committing the code.
 Run `scripts/clippy.sh` to check the code for common mistakes with [Clippy].
 
-### SQL
-
-Multi-line SQL statements should be formatted using string literals,
-for example
-```
-    sql.execute(
-        "CREATE TABLE messages (
-id INTEGER PRIMARY KEY AUTOINCREMENT,
-text TEXT DEFAULT '' NOT NULL -- message text
-) STRICT",
-    )
-    .await?;
-```
-
-Do not use macros like [`concat!`](https://doc.rust-lang.org/std/macro.concat.html)
-or [`indoc!](https://docs.rs/indoc).
-Do not escape newlines like this:
-```
-    sql.execute(
-        "CREATE TABLE messages ( \
-id INTEGER PRIMARY KEY AUTOINCREMENT, \
-text TEXT DEFAULT '' NOT NULL \
-) STRICT",
-    )
-    .await?;
-```
-Escaping newlines
-is prone to errors like this if space before backslash is missing:
-```
-"SELECT foo\
- FROM bar"
-```
-Literal above results in `SELECT fooFROM bar` string.
-This style also does not allow using `--` comments.
-
----
-
-Declare new SQL tables with [`STRICT`](https://sqlite.org/stricttables.html) keyword
-to make SQLite check column types.
-
-Declare primary keys with [`AUTOINCREMENT`](https://www.sqlite.org/autoinc.html) keyword.
-This avoids reuse of the row IDs and can avoid dangerous bugs
-like forwarding wrong message because the message was deleted
-and another message took its row ID.
-
-Declare all new columns as `NOT NULL`
-and set the `DEFAULT` value if it is optional so the column can be skipped in `INSERT` statements.
-Dealing with `NULL` values both in SQL and in Rust is tricky and we try to avoid it.
-If column is already declared without `NOT NULL`, use `IFNULL` function to provide default value when selecting it.
-Use `HAVING COUNT(*) > 0` clause
-to [prevent aggregate functions such as `MIN` and `MAX` from returning `NULL`](https://stackoverflow.com/questions/66527856/aggregate-functions-max-etc-return-null-instead-of-no-rows).
-
-Don't delete unused columns too early, but maybe after several months/releases, unused columns are
-still used by older versions, so deleting them breaks downgrading the core or importing a backup in
-an older version. Also don't change the column type, consider adding a new column with another name
-instead. Finally, never change column semantics, this is especially dangerous because the `STRICT`
-keyword doesn't help here.
-
-### Commit messages
-
 Commit messages follow the [Conventional Commits] notation.
 We use [git-cliff] to generate the changelog from commit messages before the release.
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.148.6"
+version = "1.142.6"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -41,30 +41,27 @@ ratelimit = { path = "./deltachat-ratelimit" }
 anyhow = { workspace = true }
 async-broadcast = "0.7.1"
 async-channel = { workspace = true }
-async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
+async-imap = { version = "0.9.7", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
-async_zip = { version = "0.0.17", default-features = false, features = ["deflate", "tokio-fs"] }
+async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
 base64 = { workspace = true }
 brotli = { version = "6", default-features=false, features = ["std"] }
-bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
 fast-socks5 = "0.9"
 fd-lock = "4"
-futures-lite = { workspace = true }
 futures = { workspace = true }
+futures-lite = { workspace = true }
 hex = "0.4.0"
-hickory-resolver = "=0.25.0-alpha.2"
-http-body-util = "0.1.2"
+hickory-resolver = "0.24"
 humansize = "2"
-hyper = "1"
-hyper-util = "0.1.10"
 image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.26.0", default-features = false, features = ["net"] }
-iroh-net = { version = "0.26.0", default-features = false }
+iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
+iroh-net = { version = "0.22.0", default-features = false }
+iroh-gossip = { version = "0.22.0", default-features = false, features = ["net"] }
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = { workspace = true }
@@ -74,53 +71,47 @@ num_cpus = "1.16"
 num-derive = "0.4"
 num-traits = { workspace = true }
 once_cell = { workspace = true }
-parking_lot = "0.12"
 percent-encoding = "2.3"
-pgp = { version = "0.13.2", default-features = false }
-pin-project = "1"
+parking_lot = "0.12"
+pgp = { version = "0.13", default-features = false }
 qrcodegen = "1.7.0"
-quick-xml = "0.37"
+quick-xml = "0.36"
 quoted_printable = "0.5"
 rand = { workspace = true }
 regex = { workspace = true }
+reqwest = { version = "0.12.5", features = ["json"] }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.9.0"
-rustls = { version = "0.23.14", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
-serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
-shadowsocks = { version = "1.21.0", default-features = false, features = ["aead-cipher-2022"] }
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
 tagger = "4.3.4"
 textwrap = "0.16.1"
 thiserror = { workspace = true }
+tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.0", default-features = false }
-tokio-stream = { version = "0.1.16", features = ["fs"] }
+tokio-stream = { version = "0.1.15", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
-tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.8"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
-webpki-roots = "0.26.6"
 
 [dev-dependencies]
+ansi_term = { workspace = true }
 anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
 criterion = { version = "0.5.1", features = ["async_tokio"] }
 futures-lite = { workspace = true }
 log = { workspace = true }
-nu-ansi-term = { workspace = true }
-pretty_assertions = "1.4.1"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = { workspace = true }
 testdir = "0.9.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+pretty_assertions = "1.3.0"
 
 [workspace]
 members = [
@@ -165,26 +156,26 @@ harness = false
 
 [workspace.dependencies]
 anyhow = "1"
+ansi_term = "0.12.1"
 async-channel = "2.3.1"
 base64 = "0.22"
 chrono = { version = "0.4.38", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
-deltachat = { path = ".", default-features = false }
+deltachat-jsonrpc = { path = "deltachat-jsonrpc" }
+deltachat = { path = "." }
 futures = "0.3.30"
-futures-lite = "2.4.0"
+futures-lite = "2.3.0"
 libc = "0.2"
 log = "0.4"
-nu-ansi-term = "0.46"
 num-traits = "0.2"
 once_cell = "1.18.0"
 rand = "0.8"
 regex = "1.10"
 rusqlite = "0.32"
 sanitize-filename = "0.5"
-serde = "1.0"
 serde_json = "1"
-tempfile = "3.13.0"
+serde = "1.0"
+tempfile = "3.10.1"
 thiserror = "1"
 
 # 1.38 is the latest version before `mio` dependency update
@@ -202,7 +193,9 @@ yerpc = "0.6.2"
 default = ["vendored"]
 internals = []
 vendored = [
-  "rusqlite/bundled-sqlcipher-vendored-openssl"
+  "async-native-tls/vendored",
+  "rusqlite/bundled-sqlcipher-vendored-openssl",
+  "reqwest/native-tls-vendored"
 ]
 
 [lints.rust]

assets/qr_overlay_delta.svg-part

@@ -1,12 +0,0 @@
-<path
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   d="m 24.015419,1.2870249 c -12.549421,0 -22.7283936,10.1789711 -22.7283936,22.7283931 0,12.549422 10.1789726,22.728395 22.7283936,22.728395 14.337742,-0.342877 9.614352,-4.702705 23.697556,0.969161 -7.545453,-13.001555 -1.082973,-13.32964 -0.969161,-23.697556 0,-12.549422 -10.178973,-22.7283931 -22.728395,-22.7283931 z" />
-<path
-   style="fill:#000000;fill-opacity:1;stroke:none"
-   d="M 23.982249,5.3106163 C 13.645822,5.4364005 5.2618355,13.92999 5.2618355,24.275753 c 0,10.345764 8.3839865,18.635301 18.7204135,18.509516 9.827724,-0.03951 7.516769,-5.489695 18.380082,-0.443187 -5.950849,-9.296115 0.201753,-10.533667 0.340336,-18.521947 0,-10.345766 -8.383989,-18.6353031 -18.720418,-18.5095187 z" />
-<g
-    style="fill:#ffffff"
-    transform="scale(1.1342891,0.88160947)">
-  <path
-     d="m 21.360141,23.513382 q -1.218487,-1.364705 -3.387392,-3.265543 -2.388233,-2.095797 -3.216804,-3.289913 -0.828571,-1.218486 -0.828571,-2.6563 0,-2.144536 1.998318,-3.363022 1.998317,-1.2428565 5.215121,-1.2428565 3.216804,0 5.605037,1.0966375 2.412603,1.096638 2.412603,3.021846 0,0.92605 -0.584873,1.535293 -0.584874,0.609243 -1.364705,0.609243 -1.121008,0 -2.631931,-1.681511 -1.535292,-1.705881 -2.60756,-2.388233 -1.047898,-0.706722 -2.461343,-0.706722 -1.803359,0 -2.973106,0.804201 -1.145377,0.804201 -1.145377,2.047057 0,1.169747 0.950419,2.193275 0.950419,1.023529 4.898315,3.728568 4.215963,2.899998 5.946213,4.532769 1.75462,1.632772 2.851258,3.972265 1.096638,2.339494 1.096638,4.947055 0,4.581508 -3.241174,8.090749 -3.216804,3.484871 -7.530245,3.484871 -3.923526,0 -6.628566,-2.802519 -2.705039,-2.802518 -2.705039,-7.481506 0,-4.508399 2.973106,-7.530245 2.997477,-3.021846 7.359658,-3.655459 z m 1.072268,1.121008 q -6.994112,1.145377 -6.994112,9.601672 0,4.36218 1.730251,6.774783 1.75462,2.412603 4.069744,2.412603 2.412603,0 3.972265,-2.315124 1.559663,-2.339493 1.559663,-6.311759 0,-5.751255 -4.337811,-10.162175 z" />
-</g>

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.148.6"
+version = "1.142.6"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"

deltachat-ffi/deltachat.h

@@ -403,8 +403,11 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `send_port`    = SMTP-port, guessed if left out
  * - `send_security`= SMTP-socket, one of @ref DC_SOCKET, defaults to #DC_SOCKET_AUTO
  * - `server_flags` = IMAP-/SMTP-flags as a combination of @ref DC_LP flags, guessed if left out
- * - `proxy_enabled` = Proxy enabled. Disabled by default.
- * - `proxy_url` = Proxy URL. May contain multiple URLs separated by newline, but only the first one is used.
+ * - `socks5_enabled` = SOCKS5 enabled
+ * - `socks5_host` = SOCKS5 proxy server host
+ * - `socks5_port` = SOCKS5 proxy server port
+ * - `socks5_user` = SOCKS5 proxy username
+ * - `socks5_password` = SOCKS5 proxy password
  * - `imap_certificate_checks` = how to check IMAP certificates, one of the @ref DC_CERTCK flags, defaults to #DC_CERTCK_AUTO (0)
  * - `smtp_certificate_checks` = deprecated option, should be set to the same value as `imap_certificate_checks` but ignored by the new core
  * - `displayname`  = Own name to use when sending messages. MUAs are allowed to spread this way e.g. using CC, defaults to empty
@@ -419,8 +422,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  * - `mdns_enabled` = 0=do not send or request read receipts,
  *                    1=send and request read receipts
  *                    default=send and request read receipts, only send but not reuqest if `bot` is set
- * - `bcc_self`     = 0=do not send a copy of outgoing messages to self,
- *                    1=send a copy of outgoing messages to self (default).
+ * - `bcc_self`     = 0=do not send a copy of outgoing messages to self (default),
+ *                    1=send a copy of outgoing messages to self.
  *                    Sending messages to self is needed for a proper multi-account setup,
  *                    however, on the other hand, may lead to unwanted notifications in non-delta clients.
  * - `sentbox_watch`= 1=watch `Sent`-folder for changes,
@@ -522,16 +525,14 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    In contrast to `dc_set_chat_mute_duration()`,
  *                    fresh message and badge counters are not changed by this setting,
  *                    but should be tuned down where appropriate.
- * - `private_tag`  = Optional tag as "Work", "Family".
- *                    Meant to help profile owner to differ between profiles with similar names.
  * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
  *                    The prefix should be followed by the system and maybe subsystem,
  *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
  *                    These keys go to backups and allow easy per-account settings when using @ref dc_accounts_t,
  *                    however, are not handled by the core otherwise.
  * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled.
- *                               0 = WebXDC realtime API is disabled and behaves as noop.
- *                               1 = WebXDC realtime API is enabled (default).
+ *                               0 = WebXDC realtime API is disabled and behaves as noop (default).
+ *                               1 = WebXDC realtime API is enabled.
  *
  * If you want to retrieve a value, use dc_get_config().
  *
@@ -866,10 +867,13 @@ void            dc_maybe_network             (dc_context_t* context);
  *
  * @memberof dc_context_t
  * @param context The context as created by dc_context_new().
+ * @param addr The e-mail address of the user. This must match the
+ *    configured_addr setting of the context as well as the UID of the key.
+ * @param public_data Ignored, actual public key is extracted from secret_data.
  * @param secret_data ASCII armored secret key.
  * @return 1 on success, 0 on failure.
  */
-int             dc_preconfigure_keypair        (dc_context_t* context, const char *secret_data);
+int             dc_preconfigure_keypair        (dc_context_t* context, const char *addr, const char *public_data, const char *secret_data);
 
 
 // handle chatlists
@@ -1549,6 +1553,30 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
 dc_array_t*     dc_get_chat_media            (dc_context_t* context, uint32_t chat_id, int msg_type, int msg_type2, int msg_type3);
 
 
+/**
+ * Search next/previous message based on a given message and a list of types.
+ * Typically used to implement the "next" and "previous" buttons
+ * in a gallery or in a media player.
+ *
+ * @deprecated Deprecated 2023-10-03, use dc_get_chat_media() and navigate the returned array instead.
+ * @memberof dc_context_t
+ * @param context The context object as returned from dc_context_new().
+ * @param msg_id The ID of the current message from which the next or previous message should be searched.
+ * @param dir 1=get the next message, -1=get the previous one.
+ * @param msg_type The message type to search for.
+ *     If 0, the message type from curr_msg_id is used.
+ * @param msg_type2 Alternative message type to search for. 0 to skip.
+ * @param msg_type3 Alternative message type to search for. 0 to skip.
+ * @return Returns the message ID that should be played next.
+ *     The returned message is in the same chat as the given one
+ *     and has one of the given types.
+ *     Typically, this result is passed again to dc_get_next_media()
+ *     later on the next swipe.
+ *     If there is not next/previous message, the function returns 0.
+ */
+uint32_t        dc_get_next_media            (dc_context_t* context, uint32_t msg_id, int dir, int msg_type, int msg_type2, int msg_type3);
+
+
 /**
  * Set chat visibility to pinned, archived or normal.
  *
@@ -2479,7 +2507,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_BACKUP                 251
 #define         DC_QR_BACKUP2                252
 #define         DC_QR_WEBRTC_INSTANCE        260 // text1=domain, text2=instance pattern
-#define         DC_QR_PROXY                  271 // text1=address (e.g. "127.0.0.1:9050")
 #define         DC_QR_ADDR                   320 // id=contact
 #define         DC_QR_TEXT                   330 // text1=text
 #define         DC_QR_URL                    332 // text1=URL
@@ -2533,10 +2560,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to use the given service for video chats;
  *   if so, call dc_set_config_from_qr().
  *
- * - DC_QR_PROXY with dc_lot_t::text1=address:
- *   ask the user if they want to use the given proxy.
- *   if so, call dc_set_config_from_qr() and restart I/O.
- *
  * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
  *   e-mail address scanned, optionally, a draft message could be set in
  *   dc_lot_t::text1 in which case dc_lot_t::text1_meaning will be DC_TEXT1_DRAFT;
@@ -2611,7 +2634,6 @@ char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t ch
  * Get QR code image from the QR code text generated by dc_get_securejoin_qr().
  * See dc_get_securejoin_qr() for details about the contained QR code.
  *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_get_securejoin_qr()) instead.
  * @memberof dc_context_t
  * @param context The context object.
  * @param chat_id group-chat-id for secure-join or 0 for setup-contact,
@@ -2792,22 +2814,6 @@ dc_array_t* dc_get_locations                (dc_context_t* context, uint32_t cha
 void        dc_delete_all_locations         (dc_context_t* context);
 
 
-// misc
-
-/**
- * Create a QR code from any input data.
- *
- * The QR code is returned as a square SVG image.
- *
- * @memberof dc_context_t
- * @param payload The content for the QR code.
- * @return SVG image with the QR code.
- *     On errors, an empty string is returned.
- *     The returned string must be released using dc_str_unref() after usage.
- */
-char*           dc_create_qr_svg             (const char* payload);
-
-
 /**
  * Get last error string.
  *
@@ -2896,7 +2902,6 @@ char* dc_backup_provider_get_qr (const dc_backup_provider_t* backup_provider);
  * This works like dc_backup_provider_qr() but returns the text of a rendered
  * SVG image containing the QR code.
  *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_backup_provider_get_qr()) instead.
  * @memberof dc_backup_provider_t
  * @param backup_provider The backup provider object as created by
  *    dc_backup_provider_new().
@@ -2936,7 +2941,7 @@ 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_provider_get_qr().  Typically this is a
+ * 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
@@ -5707,7 +5712,7 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
  * Accept invalid certificates, including self-signed ones
  * or having incorrect hostname.
  */
-#define DC_CERTCK_ACCEPT_INVALID_CERTIFICATES 3
+#define DC_CERTCK_ACCEPT_INVALID_CERTIFICATES 2
 
 /**
  * @}
@@ -6051,21 +6056,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_REACTIONS_CHANGED        2001
 
 
-/**
- * A reaction to one's own sent message received.
- * Typically, the UI will show a notification for that.
- *
- * In addition to this event, DC_EVENT_REACTIONS_CHANGED is emitted.
- *
- * @param data1 (int) contact_id ID of the contact sending this reaction.
- * @param data2 (int) msg_id + (char*) reaction.
- *      ID of the message for which a reaction was received in dc_event_get_data2_int(),
- *      and the reaction as dc_event_get_data2_str().
- *      string must be passed to dc_str_unref() afterwards.
- */
-#define DC_EVENT_INCOMING_REACTION        2002
-
-
 /**
  * There is a fresh message. Typically, the user will show an notification
  * when receiving this message.
@@ -6283,7 +6273,7 @@ void dc_event_unref(dc_event_t* event);
 
 
 /**
- * Webxdc status update received.
+ * webxdc status update received.
  * To get the received status update, use dc_get_webxdc_status_updates() with
  * `serial` set to the last known update
  * (in case of special bots, `status_update_serial` from `data2`
@@ -6318,15 +6308,6 @@ void dc_event_unref(dc_event_t* event);
 
 #define DC_EVENT_WEBXDC_REALTIME_DATA             2150
 
-/**
- * Advertisement for ephemeral peer channel communication received.
- * This can be used by bots to initiate peer-to-peer communication from their side.
- * @param data1 (int) msg_id
- * @param data2 0
- */
-
-#define DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT    2151
-
 /**
  * Tells that the Background fetch was completed (or timed out).
  *

deltachat-ffi/src/lib.rs

@@ -30,7 +30,7 @@ use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
 use deltachat::key::preconfigure_keypair;
 use deltachat::message::MsgId;
-use deltachat::qr_code_generator::{create_qr_svg, generate_backup_qr, get_securejoin_qr_svg};
+use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
@@ -541,7 +541,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::ErrorSelfNotInGroup(_) => 410,
         EventType::MsgsChanged { .. } => 2000,
         EventType::ReactionsChanged { .. } => 2001,
-        EventType::IncomingReaction { .. } => 2002,
         EventType::IncomingMsg { .. } => 2005,
         EventType::IncomingMsgBunch { .. } => 2006,
         EventType::MsgsNoticed { .. } => 2008,
@@ -564,14 +563,10 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
         EventType::WebxdcStatusUpdate { .. } => 2120,
         EventType::WebxdcInstanceDeleted { .. } => 2121,
         EventType::WebxdcRealtimeData { .. } => 2150,
-        EventType::WebxdcRealtimeAdvertisementReceived { .. } => 2151,
         EventType::AccountsBackgroundFetchDone => 2200,
         EventType::ChatlistChanged => 2300,
         EventType::ChatlistItemChanged { .. } => 2301,
         EventType::EventChannelOverflow { .. } => 2400,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -602,7 +597,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::ErrorSelfNotInGroup(_)
         | EventType::AccountsBackgroundFetchDone => 0,
         EventType::ChatlistChanged => 0,
-        EventType::IncomingReaction { contact_id, .. } => contact_id.to_u32() as libc::c_int,
         EventType::MsgsChanged { chat_id, .. }
         | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
@@ -627,15 +621,11 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         }
         EventType::WebxdcRealtimeData { msg_id, .. }
         | EventType::WebxdcStatusUpdate { msg_id, .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { msg_id }
         | EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
         EventType::ChatlistItemChanged { chat_id } => {
             chat_id.unwrap_or_default().to_u32() as libc::c_int
         }
         EventType::EventChannelOverflow { n } => *n as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -676,11 +666,9 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ChatlistItemChanged { .. }
         | EventType::ConfigSynced { .. }
         | EventType::ChatModified(_)
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => 0,
         EventType::MsgsChanged { msg_id, .. }
         | EventType::ReactionsChanged { msg_id, .. }
-        | EventType::IncomingReaction { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
         | EventType::MsgFailed { msg_id, .. }
@@ -694,9 +682,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
             ..
         } => status_update_serial.to_u32() as libc::c_int,
         EventType::WebxdcRealtimeData { data, .. } => data.len() as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -748,7 +733,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::IncomingMsgBunch { .. }
         | EventType::ChatlistItemChanged { .. }
         | EventType::ChatlistChanged
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
         | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -770,14 +754,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             libc::memcpy(ptr, data.as_ptr() as *mut libc::c_void, data.len());
             ptr as *mut libc::c_char
         }
-        EventType::IncomingReaction { reaction, .. } => reaction
-            .as_str()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
     }
 }
 
@@ -859,6 +835,8 @@ pub unsafe extern "C" fn dc_maybe_network(context: *mut dc_context_t) {
 #[no_mangle]
 pub unsafe extern "C" fn dc_preconfigure_keypair(
     context: *mut dc_context_t,
+    addr: *const libc::c_char,
+    _public_data: *const libc::c_char,
     secret_data: *const libc::c_char,
 ) -> i32 {
     if context.is_null() {
@@ -866,8 +844,9 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
         return 0;
     }
     let ctx = &*context;
+    let addr = to_string_lossy(addr);
     let secret_data = to_string_lossy(secret_data);
-    block_on(preconfigure_keypair(ctx, &secret_data))
+    block_on(preconfigure_keypair(ctx, &addr, &secret_data))
         .context("Failed to save keypair")
         .log_err(ctx)
         .is_ok() as libc::c_int
@@ -1467,6 +1446,48 @@ pub unsafe extern "C" fn dc_get_chat_media(
     })
 }
 
+#[no_mangle]
+#[allow(deprecated)]
+pub unsafe extern "C" fn dc_get_next_media(
+    context: *mut dc_context_t,
+    msg_id: u32,
+    dir: libc::c_int,
+    msg_type: libc::c_int,
+    or_msg_type2: libc::c_int,
+    or_msg_type3: libc::c_int,
+) -> u32 {
+    if context.is_null() {
+        eprintln!("ignoring careless call to dc_get_next_media()");
+        return 0;
+    }
+    let direction = if dir < 0 {
+        chat::Direction::Backward
+    } else {
+        chat::Direction::Forward
+    };
+
+    let ctx = &*context;
+    let msg_type = from_prim(msg_type).expect(&format!("invalid msg_type = {msg_type}"));
+    let or_msg_type2 =
+        from_prim(or_msg_type2).expect(&format!("incorrect or_msg_type2 = {or_msg_type2}"));
+    let or_msg_type3 =
+        from_prim(or_msg_type3).expect(&format!("incorrect or_msg_type3 = {or_msg_type3}"));
+
+    block_on(async move {
+        chat::get_next_media(
+            ctx,
+            MsgId::new(msg_id),
+            direction,
+            msg_type,
+            or_msg_type2,
+            or_msg_type3,
+        )
+        .await
+        .map(|msg_id| msg_id.map(|id| id.to_u32()).unwrap_or_default())
+        .unwrap_or(0)
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_chat_visibility(
     context: *mut dc_context_t,
@@ -2594,18 +2615,6 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) {
     });
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_create_qr_svg(payload: *const libc::c_char) -> *mut libc::c_char {
-    if payload.is_null() {
-        eprintln!("ignoring careless call to dc_create_qr_svg()");
-        return "".strdup();
-    }
-
-    create_qr_svg(&to_string_lossy(payload))
-        .unwrap_or_else(|_| "".to_string())
-        .strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut libc::c_char {
     if context.is_null() {
@@ -4528,16 +4537,19 @@ pub unsafe extern "C" fn dc_provider_new_from_email_with_dns(
     let addr = to_string_lossy(addr);
 
     let ctx = &*context;
-    let proxy_enabled = block_on(ctx.get_config_bool(config::Config::ProxyEnabled))
-        .context("Can't get config")
-        .log_err(ctx);
+    let socks5_enabled = block_on(async move {
+        ctx.get_config_bool(config::Config::Socks5Enabled)
+            .await
+            .context("Can't get config")
+            .log_err(ctx)
+    });
 
-    match proxy_enabled {
-        Ok(proxy_enabled) => {
+    match socks5_enabled {
+        Ok(socks5_enabled) => {
             match block_on(provider::get_provider_info_by_addr(
                 ctx,
                 addr.as_str(),
-                proxy_enabled,
+                socks5_enabled,
             ))
             .log_err(ctx)
             .unwrap_or_default()
@@ -4868,7 +4880,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
     }
 
     let accounts = &*accounts;
-    block_on(async move { accounts.read().await.maybe_network_lost().await });
+    block_on(async move { accounts.write().await.maybe_network_lost().await });
 }
 
 #[no_mangle]
@@ -4882,12 +4894,12 @@ pub unsafe extern "C" fn dc_accounts_background_fetch(
     }
 
     let accounts = &*accounts;
-    let background_fetch_future = {
-        let lock = block_on(accounts.read());
-        lock.background_fetch(Duration::from_secs(timeout_in_seconds))
-    };
-    // At this point account manager is not locked anymore.
-    block_on(background_fetch_future);
+    block_on(async move {
+        let accounts = accounts.read().await;
+        accounts
+            .background_fetch(Duration::from_secs(timeout_in_seconds))
+            .await;
+    });
     1
 }
 
@@ -4905,7 +4917,7 @@ pub unsafe extern "C" fn dc_accounts_set_push_device_token(
     let token = to_string_lossy(token);
 
     block_on(async move {
-        let accounts = accounts.read().await;
+        let mut accounts = accounts.write().await;
         if let Err(err) = accounts.set_push_device_token(&token).await {
             accounts.emit_event(EventType::Error(format!(
                 "Failed to set notify token: {err:#}."

deltachat-ffi/src/lot.rs

@@ -34,34 +34,34 @@ pub enum Meaning {
 }
 
 impl Lot {
-    pub fn get_text1(&self) -> Option<Cow<str>> {
+    pub fn get_text1(&self) -> Option<&str> {
         match self {
             Self::Summary(summary) => match &summary.prefix {
                 None => None,
-                Some(SummaryPrefix::Draft(text)) => Some(Cow::Borrowed(text)),
-                Some(SummaryPrefix::Username(username)) => Some(Cow::Borrowed(username)),
-                Some(SummaryPrefix::Me(text)) => Some(Cow::Borrowed(text)),
+                Some(SummaryPrefix::Draft(text)) => Some(text),
+                Some(SummaryPrefix::Username(username)) => Some(username),
+                Some(SummaryPrefix::Me(text)) => Some(text),
             },
             Self::Qr(qr) => match qr {
                 Qr::AskVerifyContact { .. } => None,
-                Qr::AskVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::AskVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::FprOk { .. } => None,
                 Qr::FprMismatch { .. } => None,
-                Qr::FprWithoutAddr { fingerprint, .. } => Some(Cow::Borrowed(fingerprint)),
-                Qr::Account { domain } => Some(Cow::Borrowed(domain)),
+                Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
+                Qr::Account { domain } => Some(domain),
+                Qr::Backup { .. } => None,
                 Qr::Backup2 { .. } => None,
-                Qr::WebrtcInstance { domain, .. } => Some(Cow::Borrowed(domain)),
-                Qr::Proxy { host, port, .. } => Some(Cow::Owned(format!("{host}:{port}"))),
-                Qr::Addr { draft, .. } => draft.as_deref().map(Cow::Borrowed),
-                Qr::Url { url } => Some(Cow::Borrowed(url)),
-                Qr::Text { text } => Some(Cow::Borrowed(text)),
+                Qr::WebrtcInstance { domain, .. } => Some(domain),
+                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Url { url } => Some(url),
+                Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
-                Qr::WithdrawVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
+                Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
-                Qr::ReviveVerifyGroup { grpname, .. } => Some(Cow::Borrowed(grpname)),
-                Qr::Login { address, .. } => Some(Cow::Borrowed(address)),
+                Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
+                Qr::Login { address, .. } => Some(address),
             },
-            Self::Error(err) => Some(Cow::Borrowed(err)),
+            Self::Error(err) => Some(err),
         }
     }
 
@@ -102,9 +102,9 @@ impl Lot {
                 Qr::FprMismatch { .. } => LotState::QrFprMismatch,
                 Qr::FprWithoutAddr { .. } => LotState::QrFprWithoutAddr,
                 Qr::Account { .. } => LotState::QrAccount,
+                Qr::Backup { .. } => LotState::QrBackup,
                 Qr::Backup2 { .. } => LotState::QrBackup2,
                 Qr::WebrtcInstance { .. } => LotState::QrWebrtcInstance,
-                Qr::Proxy { .. } => LotState::QrProxy,
                 Qr::Addr { .. } => LotState::QrAddr,
                 Qr::Url { .. } => LotState::QrUrl,
                 Qr::Text { .. } => LotState::QrText,
@@ -128,9 +128,9 @@ 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::Backup2 { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Proxy { .. } => Default::default(),
                 Qr::Addr { contact_id, .. } => contact_id.to_u32(),
                 Qr::Url { .. } => Default::default(),
                 Qr::Text { .. } => Default::default(),
@@ -185,9 +185,6 @@ pub enum LotState {
     /// text1=domain, text2=instance pattern
     QrWebrtcInstance = 260,
 
-    /// text1=address, text2=protocol
-    QrProxy = 271,
-
     /// id=contact
     QrAddr = 320,
 

deltachat-jsonrpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.148.6"
+version = "1.142.6"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -25,7 +25,7 @@ async-channel = { workspace = true }
 futures = { workspace = true }
 serde_json = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
-typescript-type-def = { version = "0.5.12", features = ["json_value"] }
+typescript-type-def = { version = "0.5.8", features = ["json_value"] }
 tokio = { workspace = true }
 sanitize-filename = { workspace = true }
 walkdir = "2.5.0"

deltachat-jsonrpc/README.md

@@ -4,8 +4,8 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte
 
 The JSON-RPC API is exposed in two fashions:
 
-- A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
-- The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
 
 We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.
 
@@ -24,17 +24,16 @@ If you want to use the server in a production setup, first build it in release m
 ```sh
 cargo build --features webserver --release
 ```
-
 You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
 
 The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
 
 The server can be configured with environment variables:
 
-| variable           | default      | description               |
-| ------------------ | ------------ | ------------------------- |
-| `DC_PORT`          | `20808`      | port to listen on         |
-| `DC_ACCOUNTS_PATH` | `./accounts` | path to storage directory |
+|variable|default|description|
+|-|-|-|
+|`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):
 
@@ -44,53 +43,30 @@ cross build --features=webserver --target armv7-linux-androideabi --release
 
 #### Using the TypeScript/JavaScript client
 
-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder.
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 
 
 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
-
 ```sh
 cd typescript
 npm install
 npm run build
 ```
 
-The package is also published on npm under the name [`@deltachat/jsonrpc-client`](https://www.npmjs.com/package/@deltachat/jsonrpc-client).
+The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
 
-###### Usage
-
-Stdio server (recommended):
 
 ```typescript
-import { startDeltaChat } from "@deltachat/stdio-rpc-server";
-import { C } from "@deltachat/jsonrpc-client";
-
-const dc = await startDeltaChat("deltachat-data");
-console.log(await dc.rpc.getSystemInfo());
-const accounts = await dc.rpc.getAllAccounts();
-console.log("accounts", accounts);
-dc.close();
-```
-
-Websocket:
-
-```typescript
-import { WebsocketDeltaChat as DeltaChat } from '@deltachat/jsonrpc-client''=
-
+import { DeltaChat } from './deltachat.bundle.js'
 const dc = new DeltaChat('ws://localhost:20808/ws')
-console.log(await dc.rpc.getSystemInfo());
 const accounts = await dc.rpc.getAllAccounts()
 console.log('accounts', accounts)
 ```
 
-##### Generate TypeScript/JavaScript documentation
-
 A script is included to build autogenerated documentation, which includes all RPC methods:
-
 ```sh
 cd typescript
 npm run docs
 ```
-
 Then open the [`typescript/docs`](typescript/docs) folder in a web browser.
 
 ## Development
@@ -105,7 +81,6 @@ npm run build
 npm run example:build
 npm run example:start
 ```
-
 Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
 
 Run `npm run example:dev` to live-rebuild the example app when files changes.
@@ -129,7 +104,7 @@ cd typescript
 npm run test
 ```
 
-This will build the `deltachat-rpc-server` binary and then run a test suite against the deltachat-rpc-server (stdio).
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.
 
 The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
 

deltachat-jsonrpc/src/api.rs

@@ -254,12 +254,11 @@ impl CommandApi {
     /// Process all events until you get this one and you can safely return to the background
     /// without forgetting to create notifications caused by timing race conditions.
     async fn accounts_background_fetch(&self, timeout_in_seconds: f64) -> Result<()> {
-        let future = {
-            let lock = self.accounts.read().await;
-            lock.background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
-        };
-        // At this point account manager is not locked anymore.
-        future.await;
+        self.accounts
+            .write()
+            .await
+            .background_fetch(std::time::Duration::from_secs_f64(timeout_in_seconds))
+            .await;
         Ok(())
     }
 
@@ -322,12 +321,12 @@ impl CommandApi {
     ) -> Result<Option<ProviderInfo>> {
         let ctx = self.get_context(account_id).await?;
 
-        let proxy_enabled = ctx
-            .get_config_bool(deltachat::config::Config::ProxyEnabled)
+        let socks5_enabled = ctx
+            .get_config_bool(deltachat::config::Config::Socks5Enabled)
             .await?;
 
         let provider_info =
-            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), proxy_enabled).await;
+            get_provider_info(&ctx, email.split('@').last().unwrap_or(""), socks5_enabled).await;
         Ok(ProviderInfo::from_dc_type(provider_info))
     }
 
@@ -1553,6 +1552,55 @@ impl CommandApi {
         Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
     }
 
+    /// Search next/previous message based on a given message and a list of types.
+    /// Typically used to implement the "next" and "previous" buttons
+    /// in a gallery or in a media player.
+    ///
+    /// one combined call for getting chat::get_next_media for both directions
+    /// the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
+    ///
+    /// Deprecated 2023-10-03, use `get_chat_media` method
+    /// and navigate the returned array instead.
+    #[allow(deprecated)]
+    async fn get_neighboring_chat_media(
+        &self,
+        account_id: u32,
+        msg_id: u32,
+        message_type: MessageViewtype,
+        or_message_type2: Option<MessageViewtype>,
+        or_message_type3: Option<MessageViewtype>,
+    ) -> Result<(Option<u32>, Option<u32>)> {
+        let ctx = self.get_context(account_id).await?;
+
+        let msg_type: Viewtype = message_type.into();
+        let msg_type2: Viewtype = or_message_type2.map(|v| v.into()).unwrap_or_default();
+        let msg_type3: Viewtype = or_message_type3.map(|v| v.into()).unwrap_or_default();
+
+        let prev = chat::get_next_media(
+            &ctx,
+            MsgId::new(msg_id),
+            chat::Direction::Backward,
+            msg_type,
+            msg_type2,
+            msg_type3,
+        )
+        .await?
+        .map(|id| id.to_u32());
+
+        let next = chat::get_next_media(
+            &ctx,
+            MsgId::new(msg_id),
+            chat::Direction::Forward,
+            msg_type,
+            msg_type2,
+            msg_type3,
+        )
+        .await?
+        .map(|id| id.to_u32());
+
+        Ok((prev, next))
+    }
+
     // ---------------------------------------------
     //                   backup
     // ---------------------------------------------
@@ -1947,13 +1995,9 @@ impl CommandApi {
 
     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 = data
-            .create_message(&ctx)
-            .await
-            .context("Failed to create message")?;
+        let mut message = data.create_message(&ctx).await?;
         let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await
-            .context("Failed to send created message")?
+            .await?
             .to_u32();
         Ok(msg_id)
     }
@@ -2118,7 +2162,8 @@ impl CommandApi {
     ) -> Result<u32> {
         let ctx = self.get_context(account_id).await?;
 
-        let mut msg = Message::new_text(text);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(text);
 
         let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
         Ok(message_id.to_u32())

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

@@ -17,9 +17,6 @@ pub enum Account {
         // size: u32,
         profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
         color: String,
-        /// Optional tag as "Work", "Family".
-        /// Meant to help profile owner to differ between profiles with similar names.
-        private_tag: Option<String>,
     },
     #[serde(rename_all = "camelCase")]
     Unconfigured { id: u32 },
@@ -34,14 +31,12 @@ impl Account {
             let color = color_int_to_hex_string(
                 Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
             );
-            let private_tag = ctx.get_config(Config::PrivateTag).await?;
             Ok(Account::Configured {
                 id,
                 display_name,
                 addr,
                 profile_image,
                 color,
-                private_tag,
             })
         } else {
             Ok(Account::Unconfigured { id })

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

@@ -98,14 +98,6 @@ pub enum EventType {
         contact_id: u32,
     },
 
-    /// Incoming reaction, should be notified.
-    #[serde(rename_all = "camelCase")]
-    IncomingReaction {
-        contact_id: u32,
-        msg_id: u32,
-        reaction: String,
-    },
-
     /// There is a fresh message. Typically, the user will show an notification
     /// when receiving this message.
     ///
@@ -252,11 +244,6 @@ pub enum EventType {
     #[serde(rename_all = "camelCase")]
     WebxdcRealtimeData { msg_id: u32, data: Vec<u8> },
 
-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeAdvertisementReceived { msg_id: u32 },
-
     /// Inform that a message containing a webxdc instance has been deleted
     #[serde(rename_all = "camelCase")]
     WebxdcInstanceDeleted { msg_id: u32 },
@@ -310,15 +297,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 contact_id: contact_id.to_u32(),
             },
-            CoreEventType::IncomingReaction {
-                contact_id,
-                msg_id,
-                reaction,
-            } => IncomingReaction {
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                reaction: reaction.as_str().to_string(),
-            },
             CoreEventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
                 chat_id: chat_id.to_u32(),
                 msg_id: msg_id.to_u32(),
@@ -395,11 +373,6 @@ impl From<CoreEventType> for EventType {
                 msg_id: msg_id.to_u32(),
                 data,
             },
-            CoreEventType::WebxdcRealtimeAdvertisementReceived { msg_id } => {
-                WebxdcRealtimeAdvertisementReceived {
-                    msg_id: msg_id.to_u32(),
-                }
-            }
             CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                 msg_id: msg_id.to_u32(),
             },
@@ -409,9 +382,6 @@ impl From<CoreEventType> for EventType {
             },
             CoreEventType::ChatlistChanged => ChatlistChanged,
             CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
-            #[allow(unreachable_patterns)]
-            #[cfg(test)]
-            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
         }
     }
 }

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

@@ -490,7 +490,6 @@ pub struct MessageSearchResult {
     author_name: String,
     author_color: String,
     author_id: u32,
-    chat_id: u32,
     chat_profile_image: Option<String>,
     chat_color: String,
     chat_name: String,
@@ -530,7 +529,6 @@ impl MessageSearchResult {
             author_name,
             author_color: color_int_to_hex_string(sender.get_color()),
             author_id: sender.id.to_u32(),
-            chat_id: chat.id.to_u32(),
             chat_name: chat.get_name().to_owned(),
             chat_color,
             chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
@@ -607,13 +605,16 @@ impl MessageData {
             message.set_location(latitude, longitude);
         }
         if let Some(id) = self.quoted_message_id {
-            let quoted_message = Message::load_from_db(context, MsgId::new(id))
-                .await
-                .context("Failed to load quoted message")?;
             message
-                .set_quote(context, Some(&quoted_message))
-                .await
-                .context("Failed to set quote")?;
+                .set_quote(
+                    context,
+                    Some(
+                        &Message::load_from_db(context, MsgId::new(id))
+                            .await
+                            .context("message to quote could not be loaded")?,
+                    ),
+                )
+                .await?;
         } else if let Some(text) = self.quoted_text {
             let protect = false;
             message.set_quote_text(Some((text, protect)));
@@ -639,7 +640,7 @@ pub struct MessageInfo {
     error: Option<String>,
     rfc724_mid: String,
     server_urls: Vec<String>,
-    hop_info: String,
+    hop_info: Option<String>,
 }
 
 impl MessageInfo {

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

@@ -32,6 +32,9 @@ pub enum QrObject {
     Account {
         domain: String,
     },
+    Backup {
+        ticket: String,
+    },
     Backup2 {
         auth_token: String,
 
@@ -41,11 +44,6 @@ pub enum QrObject {
         domain: String,
         instance_pattern: String,
     },
-    Proxy {
-        url: String,
-        host: String,
-        port: u16,
-    },
     Addr {
         contact_id: u32,
         draft: Option<String>,
@@ -136,6 +134,9 @@ 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::Backup2 {
                 ref node_addr,
                 auth_token,
@@ -151,7 +152,6 @@ impl From<Qr> for QrObject {
                 domain,
                 instance_pattern,
             },
-            Qr::Proxy { url, host, port } => QrObject::Proxy { url, host, port },
             Qr::Addr { contact_id, draft } => {
                 let contact_id = contact_id.to_u32();
                 QrObject::Addr { contact_id, draft }

deltachat-jsonrpc/src/lib.rs

@@ -83,7 +83,7 @@ mod tests {
             assert_eq!(result, response.to_owned());
         }
         {
-            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":""}]}"#;
+            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
             let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
             session.handle_incoming(request).await;
             let result = receiver.recv().await?;

deltachat-jsonrpc/typescript/Readme.md

@@ -1,188 +0,0 @@
-# @deltachat/jsonrpc-client
-
-This package is a client for the jsonrpc server.
-
-> If you are looking for the functions in the documentation, they are under [`RawClient`](https://js.jsonrpc.delta.chat/classes/RawClient.html).
-
-### Important Terms
-
-- [delta chat core](https://github.com/deltachat/deltachat-core-rust/) the heart of all Delta Chat clients. Handels all the heavy lifting (email, encryption, ...) and provides an easy api for bots and clients (`getChatlist`, `getChat`, `getContact`, ...).
-- [jsonrpc](https://www.jsonrpc.org/specification) is a json based protocol
-  for applications to speak to each other by [remote procedure calls](https://en.wikipedia.org/wiki/Remote_procedure_call) (short RPC),
-  which basically means that the client can call methods on the server by sending a json messages.
-- [`deltachat-rpc-server`](https://github.com/deltachat/deltachat-core-rust/tree/main/deltachat-rpc-server) provides the jsonrpc api over stdio (stdin/stdout)
-- [`@deltachat/stdio-rpc-server`](https://www.npmjs.com/package/@deltachat/stdio-rpc-server) is an easy way to install `deltachat-rpc-server` from npm and use it from nodejs.
-
-#### Transport
-
-You need to connect this client to an instance of deltachat core via a transport.
-
-Currently there are 2 transports available:
-
-- (recomended) `StdioTransport` usable from `StdioDeltaChat` - speak to `deltachat-rpc-server` directly
-- `WebsocketTransport` usable from `WebsocketDeltaChat`
-
-You can also make your own transport, for example deltachat desktop uses a custom transport that sends the json messages over electron ipc.
-Just implement your transport based on the `Transport` interface - look at how the [stdio transport is implemented](https://github.com/deltachat/deltachat-core-rust/blob/7121675d226e69fd85d0194d4b9c4442e4dd8299/deltachat-jsonrpc/typescript/src/client.ts#L113) for an example, it's not hard.
-
-## Usage
-
-> The **minimum** nodejs version for `@deltachat/stdio-rpc-server` is `16`
-
-```
-npm i @deltachat/stdio-rpc-server @deltachat/jsonrpc-client
-```
-
-```js
-import { startDeltaChat } from "@deltachat/stdio-rpc-server";
-// Import constants you might need later
-import { C } from "@deltachat/jsonrpc-client";
-
-async function main() {
-  const dc = await startDeltaChat("deltachat-data");
-  console.log(await dc.rpc.getSystemInfo());
-  dc.close();
-}
-main();
-```
-
-For a more complete example refer to <https://github.com/deltachat-bot/echo/tree/master/nodejs_stdio_jsonrpc>.
-
-### Listening for events
-
-```ts
-dc.on("Info", (accountId, { msg }) =>
-  console.info(accountId, "[core:info]", msg)
-);
-// Or get an event emitter for only one account
-const emitter = dc.getContextEvents(accountId);
-emitter.on("IncomingMsg", async ({ chatId, msgId }) => {
-  const message = await dc.rpc.getMessage(accountId, msgId);
-  console.log("got message in chat " + chatId + " : ", message.text);
-});
-```
-
-### Getting Started
-
-This section describes how to handle the Delta Chat core library over the jsonrpc bindings.
-For general information about Delta Chat itself,
-see <https://delta.chat> and <https://github.com/deltachat>.
-
-Let's start.
-
-First of all, you have to start the deltachat-rpc-server process.
-
-```js
-import { startDeltaChat } from "@deltachat/stdio-rpc-server";
-const dc = await startDeltaChat("deltachat-data");
-```
-
-Then we have to create an Account (also called Context or profile) that is bound to a database.
-The database is a normal SQLite file with a "blob directory" beside it.
-But these details are handled by deltachat's account manager.
-So you just have to tell the account manager to create a new account:
-
-```js
-const accountId = await dc.rpc.addAccount();
-```
-
-After that, register event listeners so you can see what core is doing:
-Intenally `@deltachat/jsonrpc-client` implments a loop that waits for new events and then emits them to javascript land.
-```js
-dc.on("Info", (accountId, { msg }) =>
-  console.info(accountId, "[core:info]", msg)
-);
-```
-
-Now you can **configure the account:**
-```js
-// use some real test credentials here
-await dc.rpc.setConfig(accountId, "addr", "alice@example.org")
-await dc.rpc.setConfig(accountId, "mail_pw", "***")
-// you can also set multiple config options in one call
-await dc.rpc.batchSetConfig(accountId, {
-     "addr": "alice@example.org",
-     "mail_pw": "***"
-})
-
-// after setting the credentials attempt to login
-await dc.rpc.configure(accountId)
-```
-
-`configure()` returns a promise that is rejected on error (with await is is thrown).
-The configuration itself may take a while. You can monitor it's progress like this:
-```js
-dc.on("ConfigureProgress", (accountId, { progress, comment }) => {
-    console.log(accountId, "ConfigureProgress", progress, comment);
-});
-// make sure to register this event handler before calling `dc.rpc.configure()`
-```
-
-The configuration result is saved in the database.
-On subsequent starts it is not needed to call `dc.rpc.configure(accountId)`
-(you can check this using `dc.rpc.isConfigured(accountId)`).
-
-On a successfully configuration delta chat core automatically connects to the server, however subsequent starts you **need to do that manually** by calling `dc.rpc.startIo(accountId)` or `dc.rpc.startIoForAllAccounts()`.
-
-```js
-if (!await dc.rpc.isConfigured(accountId)) {
-    // use some real test credentials here
-    await dc.rpc.batchSetConfig(accountId, {
-        "addr": "alice@example.org",
-        "mail_pw": "***"
-    })
-    await dc.rpc.configure(accountId)
-} else {
-    await dc.rpc.startIo(accountId)
-}
-```
-
-Now you can **send the first message:**
-
-```js
-const contactId = await dc.rpc.createContact(accountId, "bob@example.org", null /* optional name */)
-const chatId = await dc.rpc.createChatByContactId(accountId, contactId)
-
-await dc.rpc.miscSendTextMessage(accountId, chatId, "Hi, here is my first message!")
-```
-
-`dc.rpc.miscSendTextMessage()` returns immediately;
-the sending itself is done in the background.
-If you check the testing address (bob),
-you should receive a normal e-mail.
-Answer this e-mail in any e-mail program with "Got it!",
-and the IO you started above will **receive the message**.
-
-You can then **list all messages** of a chat as follows:
-
-```js
-let i = 0;
-for (const msgId of await exp.rpc.getMessageIds(120, 12, false, false)) {
-    i++;
-    console.log(`Message: ${i}`, (await dc.rpc.getMessage(120, msgId)).text);
-}
-```
-
-This will output the following two lines:
-```
-Message 1: Hi, here is my first message!
-Message 2: Got it!
-```
-
-<!-- TODO: ### Clean shutdown? - seems to be more advanced to call async functions on exit, also is this needed in this usecase? -->
-
-## Further information
-
-- `@deltachat/stdio-rpc-server`
-  - [package on npm](https://www.npmjs.com/package/@deltachat/stdio-rpc-server)
-  - [source code on github](https://github.com/deltachat/deltachat-core-rust/tree/main/deltachat-rpc-server/npm-package)
-- [use `@deltachat/stdio-rpc-server` on an usuported platform](https://github.com/deltachat/deltachat-core-rust/tree/main/deltachat-rpc-server/npm-package#how-to-use-on-an-unsupported-platform)
-- The issue-tracker for the core library is here: <https://github.com/deltachat/deltachat-core-rust/issues>
-
-If you need further assistance,
-please do not hesitate to contact us
-through the channels shown at https://delta.chat/en/contribute
-
-Please keep in mind, that your derived work
-must respect the Mozilla Public License 2.0 of deltachat-rpc-server
-and the respective licenses of the libraries deltachat-rpc-server links with.

deltachat-jsonrpc/typescript/example/example.ts

@@ -1,4 +1,4 @@
-import { DcEvent, WebsocketDeltaChat as DeltaChat } from "../deltachat.js";
+import { DcEvent, DeltaChat } from "../deltachat.js";
 
 var SELECTED_ACCOUNT = 0;
 

deltachat-jsonrpc/typescript/package.json

@@ -58,5 +58,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.148.6"
+  "version": "1.142.6"
 }

deltachat-jsonrpc/typescript/src/client.ts

@@ -5,14 +5,14 @@ import { RawClient } from "../generated/client.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";
 
-export type Events = { ALL: (accountId: number, event: EventType) => void } & {
+type Events = { ALL: (accountId: number, event: EventType) => void } & {
   [Property in EventType["kind"]]: (
     accountId: number,
     event: Extract<EventType, { kind: Property }>
   ) => void;
 };
 
-export type ContextEvents = { ALL: (event: EventType) => void } & {
+type ContextEvents = { ALL: (event: EventType) => void } & {
   [Property in EventType["kind"]]: (
     event: Extract<EventType, { kind: Property }>
   ) => void;
@@ -83,7 +83,7 @@ export const DEFAULT_OPTS: Opts = {
   url: "ws://localhost:20808/ws",
   startEventLoop: true,
 };
-export class WebsocketDeltaChat extends BaseDeltaChat<WebsocketTransport> {
+export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
   opts: Opts;
   close() {
     this.transport.close();

deltachat-jsonrpc/typescript/test/online.ts

@@ -86,7 +86,10 @@ describe("online tests", function () {
       null
     );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
 
     await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
     const { chatId: chatIdOnAccountB } = await eventPromise;
@@ -116,7 +119,10 @@ describe("online tests", function () {
       null
     );
     const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
-    const eventPromise = waitForEvent(dc, "IncomingMsg", accountId2);
+    const eventPromise = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId2),
+      waitForEvent(dc, "IncomingMsg", accountId2),
+    ]);
     dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
     // wait for message from A
     console.log("wait for message from A");
@@ -137,7 +143,10 @@ describe("online tests", function () {
     );
     expect(message.text).equal("Hello2");
     // Send message back from B to A
-    const eventPromise2 = waitForEvent(dc, "IncomingMsg", accountId1);
+    const eventPromise2 = Promise.race([
+      waitForEvent(dc, "MsgsChanged", accountId1),
+      waitForEvent(dc, "IncomingMsg", accountId1),
+    ]);
     dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
     // Check if answer arrives at A and if it is encrypted
     await eventPromise2;

deltachat-repl/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
 name = "deltachat-repl"
-version = "1.148.6"
+version = "1.142.6"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
 
 [dependencies]
+ansi_term = { workspace = true }
 anyhow = { workspace = true }
 deltachat = { workspace = true, features = ["internals"]}
 dirs = "5"
 log = { workspace = true }
-nu-ansi-term = { workspace = true }
-qr2term = "0.3.3"
 rusqlite = { workspace = true }
 rustyline = "14"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }

deltachat-repl/src/cmdline.rs

@@ -22,7 +22,6 @@ use deltachat::mimeparser::SystemMessage;
 use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::qr_code_generator::create_qr_svg;
 use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
@@ -356,7 +355,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  configure\n\
                  connect\n\
                  disconnect\n\
-                 fetch\n\
                  connectivity\n\
                  maybenetwork\n\
                  housekeeping\n\
@@ -426,7 +424,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  checkqr <qr-content>\n\
                  joinqr <qr-content>\n\
                  setqr <qr-content>\n\
-                 createqrsvg <qr-content>\n\
                  providerinfo <addr>\n\
                  fileinfo <file>\n\
                  estimatedeletion <seconds>\n\
@@ -489,9 +486,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         }
         "send-backup" => {
             let provider = BackupProvider::prepare(&context).await?;
-            let qr = format_backup(&provider.qr())?;
-            println!("QR code: {}", qr);
-            qr2term::print_qr(qr.as_str())?;
+            let qr = provider.qr();
+            println!("QR code: {}", format_backup(&qr)?);
             provider.await?;
         }
         "receive-backup" => {
@@ -1004,7 +1000,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             if !arg1.is_empty() {
-                let mut draft = Message::new_text(arg1.to_string());
+                let mut draft = Message::new(Viewtype::Text);
+                draft.set_text(arg1.to_string());
                 sel_chat
                     .as_ref()
                     .unwrap()
@@ -1027,7 +1024,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 !arg1.is_empty(),
                 "Please specify text to add as device message."
             );
-            let mut msg = Message::new_text(arg1.to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text(arg1.to_string());
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
@@ -1249,19 +1247,12 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Err(err) => println!("Cannot set config from QR code: {err:?}"),
             }
         }
-        "createqrsvg" => {
-            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
-            let svg = create_qr_svg(arg1)?;
-            let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
-            fs::write(&file, svg).await?;
-            println!("{file:#?} written.");
-        }
         "providerinfo" => {
             ensure!(!arg1.is_empty(), "Argument <addr> missing.");
-            let proxy_enabled = context
-                .get_config_bool(config::Config::ProxyEnabled)
+            let socks5_enabled = context
+                .get_config_bool(config::Config::Socks5Enabled)
                 .await?;
-            match provider::get_provider_info(&context, arg1, proxy_enabled).await {
+            match provider::get_provider_info(&context, arg1, socks5_enabled).await {
                 Some(info) => {
                     println!("Information for provider belonging to {arg1}:");
                     println!("status: {}", info.status as u32);

deltachat-repl/src/main.rs

@@ -9,7 +9,10 @@
 extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::process::Command;
 
+use ansi_term::Color;
 use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
 use deltachat::config;
@@ -19,7 +22,6 @@ use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
 use deltachat::EventType;
 use log::{error, info, warn};
-use nu_ansi_term::Color;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
 use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
@@ -166,7 +168,7 @@ const IMEX_COMMANDS: [&str; 13] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 11] = [
+const DB_COMMANDS: [&str; 10] = [
     "info",
     "set",
     "get",
@@ -174,7 +176,6 @@ const DB_COMMANDS: [&str; 11] = [
     "configure",
     "connect",
     "disconnect",
-    "fetch",
     "connectivity",
     "maybenetwork",
     "housekeeping",
@@ -240,13 +241,12 @@ const CONTACT_COMMANDS: [&str; 9] = [
     "unblock",
     "listblocked",
 ];
-const MISC_COMMANDS: [&str; 12] = [
+const MISC_COMMANDS: [&str; 11] = [
     "getqr",
     "getqrsvg",
     "getbadqr",
     "checkqr",
     "joinqr",
-    "createqrsvg",
     "fileinfo",
     "clear",
     "exit",
@@ -417,9 +417,6 @@ async fn handle_cmd(
         "disconnect" => {
             ctx.stop_io().await;
         }
-        "fetch" => {
-            ctx.background_fetch().await?;
-        }
         "configure" => {
             ctx.configure().await?;
         }
@@ -449,7 +446,12 @@ async fn handle_cmd(
                     qr.replace_range(12..22, "0000000000")
                 }
                 println!("{qr}");
-                qr2term::print_qr(qr.as_str())?;
+                let output = Command::new("qrencode")
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .output()
+                    .expect("failed to execute process");
+                io::stdout().write_all(&output.stdout).unwrap();
+                io::stderr().write_all(&output.stderr).unwrap();
             }
         }
         "getqrsvg" => {

deltachat-rpc-client/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.148.6"
+version = "1.142.6"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -13,13 +13,10 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
     "Topic :: Communications :: Chat",
     "Topic :: Communications :: Email"
 ]

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

@@ -63,7 +63,6 @@ class EventType(str, Enum):
     CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
     CONFIG_SYNCED = "ConfigSynced"
     WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
-    WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"
 
 
 class ChatId(IntEnum):
@@ -166,7 +165,7 @@ class CertificateChecks(IntEnum):
 
     AUTOMATIC = 0
     STRICT = 1
-    ACCEPT_INVALID_CERTIFICATES = 3
+    ACCEPT_INVALID_CERTIFICATES = 2
 
 
 class Connectivity(IntEnum):

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

@@ -9,19 +9,18 @@ import io
 import pathlib
 import ssl
 from contextlib import contextmanager
-from typing import TYPE_CHECKING
 
 from imap_tools import (
     AND,
     Header,
     MailBox,
+    MailBoxTls,
     MailMessage,
     MailMessageFlags,
     errors,
 )
 
-if TYPE_CHECKING:
-    from . import Account
+from . import Account, const
 
 FLAGS = b"FLAGS"
 FETCH = b"FETCH"
@@ -36,15 +35,28 @@ class DirectImap:
         self.connect()
 
     def connect(self):
-        # Assume the testing server supports TLS on port 993.
         host = self.account.get_config("configured_mail_server")
-        port = 993
+        port = int(self.account.get_config("configured_mail_port"))
+        security = int(self.account.get_config("configured_mail_security"))
 
         user = self.account.get_config("addr")
-        host = user.rsplit("@")[-1]
         pw = self.account.get_config("mail_pw")
 
-        self.conn = MailBox(host, port, ssl_context=ssl.create_default_context())
+        if security == const.SocketSecurity.PLAIN:
+            ssl_context = None
+        else:
+            ssl_context = ssl.create_default_context()
+
+            # don't check if certificate hostname doesn't match target hostname
+            ssl_context.check_hostname = False
+
+            # don't check if the certificate is trusted by a certificate authority
+            ssl_context.verify_mode = ssl.CERT_NONE
+
+        if security == const.SocketSecurity.STARTTLS:
+            self.conn = MailBoxTls(host, port, ssl_context=ssl_context)
+        elif security == const.SocketSecurity.PLAIN or security == const.SocketSecurity.SSL:
+            self.conn = MailBox(host, port, ssl_context=ssl_context)
         self.conn.login(user, pw)
 
         self.select_folder("INBOX")

deltachat-rpc-client/tests/test_iroh_webxdc.py

@@ -7,7 +7,6 @@ If you want to debug iroh at rust-trace/log level set
     RUST_LOG=iroh_net=trace,iroh_gossip=trace
 """
 
-import os
 import sys
 import threading
 import time
@@ -108,15 +107,13 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):
     assert snapshot.text == "ping2"
 
     log("sending realtime data ac1 -> ac2")
-    # Test that 128 KB of data can be sent in a single message.
-    data = os.urandom(128000)
-    ac1_webxdc_msg.send_webxdc_realtime_data(data)
+    ac1_webxdc_msg.send_webxdc_realtime_data(b"foo")
 
     log("ac2: waiting for realtime data")
     while 1:
         event = ac2.wait_for_event()
         if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == list(data)
+            assert event.data == list(b"foo")
             break
 
 
@@ -211,28 +208,3 @@ def test_no_reordering(acfactory, path_to_webxdc):
                 if event.data[0] == i:
                     break
                 pytest.fail("Reordering detected")
-
-
-def test_advertisement_after_chatting(acfactory, path_to_webxdc):
-    """Test that realtime advertisement is assigned to the correct message after chatting."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="WebXDC", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
-    assert ac2_webxdc_msg.get_snapshot().text == "WebXDC"
-
-    ac1_ac2_chat.send_text("Hello!")
-    ac2_hello_msg = ac2.wait_for_incoming_msg()
-    ac2_hello_msg_snapshot = ac2_hello_msg.get_snapshot()
-    assert ac2_hello_msg_snapshot.text == "Hello!"
-    ac2_hello_msg_snapshot.chat.accept()
-
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    while 1:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
-            assert event.msg_id == ac1_webxdc_msg.id
-            break

deltachat-rpc-client/tests/test_securejoin.py

@@ -1,5 +1,4 @@
 import logging
-import time
 
 import pytest
 
@@ -45,6 +44,13 @@ def test_qr_setup_contact_svg(acfactory) -> None:
 
     _qr_code, svg = alice.get_qr_code_svg()
 
+    # Test that email address is in SVG
+    # when we have no display name.
+    # Check only the domain name, because
+    # long address may be split over multiple lines
+    # and not matched.
+    assert domain in svg
+
     alice.set_config("displayname", "Alice")
 
     # Test that display name is used
@@ -55,21 +61,14 @@ def test_qr_setup_contact_svg(acfactory) -> None:
 
 
 @pytest.mark.parametrize("protect", [True, False])
-def test_qr_securejoin(acfactory, protect, tmp_path):
-    alice, bob, fiona = acfactory.get_online_accounts(3)
+def test_qr_securejoin(acfactory, protect):
+    alice, bob = acfactory.get_online_accounts(2)
 
-    # Setup second device for Alice
-    # to test observing securejoin protocol.
-    alice.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar"))
-    alice2 = acfactory.get_unconfigured_account()
-    alice2.import_backup(files[0])
-
-    logging.info("Alice creates a group")
-    alice_chat = alice.create_group("Group", protect=protect)
+    logging.info("Alice creates a verified group")
+    alice_chat = alice.create_group("Verified group", protect=protect)
     assert alice_chat.get_basic_snapshot().is_protected == protect
 
-    logging.info("Bob joins the group")
+    logging.info("Bob joins verified group")
     qr_code = alice_chat.get_qr_code()
     bob.secure_join(qr_code)
 
@@ -98,21 +97,6 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
     bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
     assert bob_contact_alice_snapshot.is_verified
 
-    # Start second Alice device.
-    # Alice observes securejoin protocol and verifies Bob on second device.
-    alice2.start_io()
-    alice2.wait_for_securejoin_inviter_success()
-    alice2_contact_bob = alice2.get_contact_by_addr(bob.get_config("addr"))
-    alice2_contact_bob_snapshot = alice2_contact_bob.get_snapshot()
-    assert alice2_contact_bob_snapshot.is_verified
-
-    # The QR code token is synced, so alice2 must be able to handle join requests.
-    logging.info("Fiona joins the group via alice2")
-    alice.stop_io()
-    fiona.secure_join(qr_code)
-    alice2.wait_for_securejoin_inviter_success()
-    fiona.wait_for_securejoin_joiner_success()
-
 
 def test_qr_securejoin_contact_request(acfactory) -> None:
     """Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""
@@ -326,6 +310,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
 
     ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
     ac3_chat.remove_contact(ac3_contact_ac2)
+    ac3_chat.add_contact(ac3_contact_ac2)
 
     msg_id = ac2.wait_for_incoming_msg_event().msg_id
     message = ac2.get_message_by_id(msg_id)
@@ -335,8 +320,6 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
     assert "removed" in snapshot.text
 
-    ac3_chat.add_contact(ac3_contact_ac2)
-
     event = ac2.wait_for_incoming_msg_event()
     msg_id = event.msg_id
     chat_id = event.chat_id
@@ -460,10 +443,7 @@ def test_qr_new_group_unblocked(acfactory):
 
 def test_aeap_flow_verified(acfactory):
     """Test that a new address is added to a contact when it changes its address."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    # ac1new is only used to get a new address.
-    ac1new = acfactory.new_preconfigured_account()
+    ac1, ac2, ac1new = acfactory.get_online_accounts(3)
 
     logging.info("ac1: create verified-group QR, ac2 scans and joins")
     chat = ac1.create_group("hello", protect=True)
@@ -472,7 +452,6 @@ def test_aeap_flow_verified(acfactory):
     logging.info("ac2: start QR-code based join-group protocol")
     ac2.secure_join(qr_code)
     ac1.wait_for_securejoin_inviter_success()
-    ac2.wait_for_securejoin_joiner_success()
 
     logging.info("sending first message")
     msg_out = chat.send_text("old address").get_snapshot()
@@ -570,7 +549,6 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
     ac1_qr_code = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
@@ -585,29 +563,17 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
     # ac1 resetups the account.
     ac1 = acfactory.resetup_account(ac1)
 
-    # Loop sending message from ac1 to ac2
-    # until ac2 accepts new ac1 key.
-    #
-    # This may not happen immediately because resetup of ac1
-    # rewinds "smeared timestamp" so Date: header for messages
-    # sent by new ac1 are in the past compared to the last Date:
-    # header sent by old ac1.
-    while True:
-        # ac1 sends a message to ac2.
-        ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
-        ac1_chat_ac2 = ac1_contact_ac2.create_chat()
-        ac1_chat_ac2.send_text("Hello!")
+    # ac1 sends a message to ac2.
+    ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
+    ac1_chat_ac2 = ac1_contact_ac2.create_chat()
+    ac1_chat_ac2.send_text("Hello!")
 
-        # ac2 receives a message.
-        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-        assert snapshot.text == "Hello!"
-        logging.info("ac2 received Hello!")
+    # ac2 receives a message.
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Hello!"
 
-        # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
-        logging.info("ac2 addr={}, ac1 addr={}".format(ac2.get_config("addr"), ac1.get_config("addr")))
-        if not ac2_contact_ac1.get_snapshot().is_verified:
-            break
-        time.sleep(1)
+    # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
+    assert not ac2_contact_ac1.get_snapshot().is_verified
 
     # ac1 goes offline.
     ac1.remove()
@@ -669,8 +635,7 @@ def test_withdraw_securejoin_qr(acfactory):
     logging.info("Bob scanned withdrawn QR code")
     while True:
         event = alice.wait_for_event()
-        if (
-            event.kind == EventType.WARNING
-            and "Ignoring vg-request-with-auth message because of invalid auth code." in event.msg
-        ):
+        if event.kind == EventType.MSGS_CHANGED and event.chat_id != 0:
             break
+    snapshot = alice.get_message_by_id(event.msg_id).get_snapshot()
+    assert snapshot.text == "Cannot establish guaranteed end-to-end encryption with {}".format(bob.get_config("addr"))

deltachat-rpc-client/tests/test_something.py

@@ -83,26 +83,6 @@ def test_configure_ip(acfactory) -> None:
         account.configure()
 
 
-def test_configure_alternative_port(acfactory) -> None:
-    """Test that configuration with alternative port 443 works."""
-    account = acfactory.new_preconfigured_account()
-
-    account.set_config("mail_port", "443")
-    account.set_config("send_port", "443")
-
-    account.configure()
-
-
-def test_configure_username(acfactory) -> None:
-    account = acfactory.new_preconfigured_account()
-
-    addr = account.get_config("addr")
-    account.set_config("mail_user", addr)
-    account.configure()
-
-    assert account.get_config("configured_mail_user") == addr
-
-
 def test_account(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
@@ -433,7 +413,7 @@ def test_provider_info(rpc) -> None:
     assert provider_info["id"] == "gmail"
 
     # Disable MX record resolution.
-    rpc.set_config(account_id, "proxy_enabled", "1")
+    rpc.set_config(account_id, "socks5_enabled", "1")
     provider_info = rpc.get_provider_info(account_id, "github.com")
     assert provider_info is None
 
@@ -655,24 +635,3 @@ def test_get_http_response(acfactory):
     http_response = alice._rpc.get_http_response(alice.id, "https://example.org")
     assert http_response["mimetype"] == "text/html"
     assert b"<title>Example Domain</title>" in base64.b64decode((http_response["blob"] + "==").encode())
-
-
-def test_configured_imap_certificate_checks(acfactory):
-    alice = acfactory.new_configured_account()
-    configured_certificate_checks = alice.get_config("configured_imap_certificate_checks")
-
-    # Certificate checks should be configured (not None)
-    assert configured_certificate_checks
-
-    # 0 is the value old Delta Chat core versions used
-    # to mean user entered "imap_certificate_checks=0" (Automatic)
-    # and configuration failed to use strict TLS checks
-    # so it switched strict TLS checks off.
-    #
-    # New versions of Delta Chat are not disabling TLS checks
-    # unless users explicitly disables them
-    # or provider database says provider has invalid certificates.
-    #
-    # Core 1.142.4, 1.142.5 and 1.142.6 saved this value due to bug.
-    # This test is a regression test to prevent this happening again.
-    assert configured_certificate_checks != "0"

deltachat-rpc-server/Cargo.toml

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

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

@@ -18,46 +18,20 @@ import { startDeltaChat } from "@deltachat/stdio-rpc-server";
 import { C } from "@deltachat/jsonrpc-client";
 
 async function main() {
-  const dc = await startDeltaChat("deltachat-data");
-  console.log(await dc.rpc.getSystemInfo());
-  dc.close();
+    const dc = await startDeltaChat("deltachat-data");
+    console.log(await dc.rpc.getSystemInfo());
+    dc.close()
 }
-main();
+main()
 ```
 
-For a more complete example refer to https://github.com/deltachat-bot/echo/tree/master/nodejs_stdio_jsonrpc.
+For a more complete example refer to https://github.com/deltachat-bot/echo/pull/69/files (TODO change link when pr is merged).
 
 ## How to use on an unsupported platform
 
-You need to have rust installed to compile deltachat core for your platform and cpu architecture.
-<https://rustup.rs/> is the recommended way to install rust.
-Also your system probably needs more than 4gb ram to compile core, alternatively your could try to build the debug build, that might take less ram to build.
+<!-- todo instructions, will uses an env var for pointing to `deltachat-rpc-server` binary -->
 
-1. clone the core repo, right next to your project folder: `git clone git@github.com:deltachat/deltachat-core-rust.git`
-2. go into your core checkout and run `git pull` and `git checkout <version>` to point it to the correct version (needs to be the same version the `@deltachat/jsonrpc-client` package has)
-3. run `cargo build --release --package deltachat-rpc-server --bin deltachat-rpc-server`
-
-Then you have 2 options:
-
-### point to deltachat-rpc-server via direct path:
-
-```sh
-# start your app with the DELTA_CHAT_RPC_SERVER env var
-DELTA_CHAT_RPC_SERVER="../deltachat-core-rust/target/release/deltachat-rpc-server" node myapp.js
-```
-
-### install deltachat-rpc-server in your $PATH:
-
-```sh
-# use this to install to ~/.cargo/bin
-cargo install --release --package deltachat-rpc-server --bin deltachat-rpc-server
-# or manually move deltachat-core-rust/target/release/deltachat-rpc-server
-# to a location that is included in your $PATH Environment variable.
-```
-
-```js
-startDeltaChat("data-dir", { takeVersionFromPATH: true });
-```
+<!-- todo copy parts from https://github.com/deltachat/deltachat-desktop/blob/7045c6f549e4b9d5caa0709d5bd314bbd9fd53db/docs/UPDATE_CORE.md -->
 
 ## How does it work when you install it
 
@@ -72,7 +46,7 @@ references:
 When you import this package it searches for the rpc server in the following locations and order:
 
 1. `DELTA_CHAT_RPC_SERVER` environment variable
-2. use the PATH when `{takeVersionFromPATH: true}` is supplied in the options.
+2. use the PATH when `{takeVersionFromPATH: true}` is supplied in the options. 
 3. prebuilds in npm packages
 
 so by default it uses the prebuilds.

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

@@ -15,5 +15,5 @@
   },
   "type": "module",
   "types": "index.d.ts",
-  "version": "1.148.6"
+  "version": "1.142.6"
 }

deny.toml

@@ -1,6 +1,7 @@
 [advisories]
 ignore = [
     "RUSTSEC-2020-0071",
+    "RUSTSEC-2022-0093",
 
     # Timing attack on RSA.
     # Delta Chat does not use RSA for new keys
@@ -9,8 +10,15 @@ ignore = [
     # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
     "RUSTSEC-2023-0071",
 
+    # Unmaintained ansi_term
+    "RUSTSEC-2021-0139",
+
     # Unmaintained encoding
     "RUSTSEC-2021-0153",
+
+    # Problem in curve25519-dalek 3.2.0 used by iroh 0.4.
+    # curve25519-dalek 4.1.3 has the problem fixed.
+    "RUSTSEC-2024-0344",
 ]
 
 [bans]
@@ -19,10 +27,28 @@ ignore = [
 # when upgrading.
 # Please keep this list alphabetically sorted.
 skip = [
+     { name = "asn1-rs-derive", version = "0.4.0" },
+     { name = "asn1-rs-impl", version = "0.1.0" },
+     { name = "asn1-rs", version = "0.5.2" },
      { name = "async-channel", version = "1.9.0" },
+     { name = "base16ct", version = "0.1.1" },
      { name = "base64", version = "<0.21" },
      { name = "base64", version = "0.21.7" },
      { name = "bitflags", version = "1.3.2" },
+     { name = "block-buffer", version = "<0.10" },
+     { name = "convert_case", version = "0.4.0" },
+     { name = "curve25519-dalek", version = "3.2.0" },
+     { name = "darling_core", version = "<0.14" },
+     { name = "darling_macro", version = "<0.14" },
+     { name = "darling", version = "<0.14" },
+     { name = "der_derive", version = "0.6.1" },
+     { name = "derive_more", version = "0.99.17" },
+     { name = "der-parser", version = "8.2.0" },
+     { name = "der", version = "0.6.1" },
+     { name = "digest", version = "<0.10" },
+     { name = "dlopen2", version = "0.4.1" },
+     { name = "ed25519-dalek", version = "1.0.1" },
+     { name = "ed25519", version = "1.5.3" },
      { name = "event-listener", version = "2.5.3" },
      { name = "event-listener", version = "4.0.3" },
      { name = "fastrand", version = "1.9.0" },
@@ -32,30 +58,60 @@ skip = [
      { name = "http-body", version = "0.4.6" },
      { name = "http", version = "0.2.12" },
      { name = "hyper", version = "0.14.28" },
+     { name = "idna", version = "0.4.0" },
+     { name = "netlink-packet-core", version = "0.5.0" },
+     { name = "netlink-packet-route", version = "0.15.0" },
      { name = "nix", version = "0.26.4" },
+     { name = "oid-registry", version = "0.6.1" },
+     { name = "pem-rfc7468", version = "0.6.0" },
+     { name = "pem", version = "1.1.1" },
+     { name = "pkcs8", version = "0.9.0" },
      { name = "quick-error", version = "<2.0" },
      { name = "rand_chacha", version = "<0.3" },
      { name = "rand_core", version = "<0.6" },
      { name = "rand", version = "<0.8" },
+     { name = "rcgen", version = "<0.12.1" },
      { name = "redox_syscall", version = "0.3.5" },
      { name = "regex-automata", version = "0.1.10" },
      { name = "regex-syntax", version = "0.6.29" },
+     { name = "ring", version = "0.16.20" },
+     { name = "rustls-pemfile", version = "1.0.4" },
+     { name = "rustls", version = "0.21.11" },
+     { name = "rustls-webpki", version = "0.101.7" },
+     { name = "sec1", version = "0.3.0" },
+     { name = "sha2", version = "<0.10" },
+     { name = "signature", version = "1.6.4" },
+     { name = "spin", version = "<0.9.6" },
+     { name = "spki", version = "0.6.0" },
+     { name = "ssh-encoding", version = "0.1.0" },
+     { name = "ssh-key", version = "0.5.1" },
+     { name = "strsim", version = "0.10.0" },
      { name = "sync_wrapper", version = "0.1.2" },
+     { name = "synstructure", version = "0.12.6" },
      { name = "syn", version = "1.0.109" },
+     { name = "system-configuration-sys", version = "0.5.0" },
+     { name = "system-configuration", version = "0.5.1" },
      { name = "time", version = "<0.3" },
+     { name = "tokio-rustls", version = "0.24.1" },
+     { name = "toml_edit", version = "0.21.1" },
+     { name = "untrusted", version = "0.7.1" },
      { name = "wasi", version = "<0.11" },
+     { name = "webpki-roots", version ="0.25.4" },
      { name = "windows_aarch64_gnullvm", version = "<0.52" },
      { name = "windows_aarch64_msvc", version = "<0.52" },
      { name = "windows-core", version = "<0.54.0" },
      { name = "windows_i686_gnu", version = "<0.52" },
      { name = "windows_i686_msvc", version = "<0.52" },
-     { name = "windows-sys", version = "<0.59" },
+     { name = "windows-sys", version = "<0.52" },
      { name = "windows-targets", version = "<0.52" },
+     { name = "windows", version = "0.32.0" },
      { name = "windows", version = "<0.54.0" },
      { name = "windows_x86_64_gnullvm", version = "<0.52" },
      { name = "windows_x86_64_gnu", version = "<0.52" },
      { name = "windows_x86_64_msvc", version = "<0.52" },
+     { name = "winnow", version = "0.5.40" },
      { name = "winreg", version = "0.50.0" },
+     { name = "x509-parser", version = "<0.16.0" },
 ]
 
 

flake.lock

@@ -195,11 +195,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1714076141,
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
         "type": "github"
       },
       "original": {

node/constants.js

@@ -1,7 +1,7 @@
 // Generated!
 
 module.exports = {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES: 3,
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES: 2,
   DC_CERTCK_AUTO: 0,
   DC_CERTCK_STRICT: 1,
   DC_CHAT_ID_ALLDONE_HINT: 7,
@@ -50,7 +50,6 @@ module.exports = {
   DC_EVENT_IMEX_PROGRESS: 2051,
   DC_EVENT_INCOMING_MSG: 2005,
   DC_EVENT_INCOMING_MSG_BUNCH: 2006,
-  DC_EVENT_INCOMING_REACTION: 2002,
   DC_EVENT_INFO: 100,
   DC_EVENT_LOCATION_CHANGED: 2035,
   DC_EVENT_MSGS_CHANGED: 2000,
@@ -68,7 +67,6 @@ module.exports = {
   DC_EVENT_SMTP_MESSAGE_SENT: 103,
   DC_EVENT_WARNING: 300,
   DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
-  DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT: 2151,
   DC_EVENT_WEBXDC_REALTIME_DATA: 2150,
   DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
   DC_GCL_ADD_ALLDONE_HINT: 4,
@@ -136,7 +134,6 @@ module.exports = {
   DC_QR_FPR_OK: 210,
   DC_QR_FPR_WITHOUT_ADDR: 230,
   DC_QR_LOGIN: 520,
-  DC_QR_PROXY: 271,
   DC_QR_REVIVE_VERIFYCONTACT: 510,
   DC_QR_REVIVE_VERIFYGROUP: 512,
   DC_QR_TEXT: 330,

node/events.js

@@ -16,7 +16,6 @@ module.exports = {
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
   2001: 'DC_EVENT_REACTIONS_CHANGED',
-  2002: 'DC_EVENT_INCOMING_REACTION',
   2005: 'DC_EVENT_INCOMING_MSG',
   2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
@@ -39,7 +38,6 @@ module.exports = {
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
   2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
   2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
-  2151: 'DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT',
   2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
   2300: 'DC_EVENT_CHATLIST_CHANGED',
   2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',

node/lib/constants.ts

@@ -1,7 +1,7 @@
 // Generated!
 
 export enum C {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 2,
   DC_CERTCK_AUTO = 0,
   DC_CERTCK_STRICT = 1,
   DC_CHAT_ID_ALLDONE_HINT = 7,
@@ -50,7 +50,6 @@ export enum C {
   DC_EVENT_IMEX_PROGRESS = 2051,
   DC_EVENT_INCOMING_MSG = 2005,
   DC_EVENT_INCOMING_MSG_BUNCH = 2006,
-  DC_EVENT_INCOMING_REACTION = 2002,
   DC_EVENT_INFO = 100,
   DC_EVENT_LOCATION_CHANGED = 2035,
   DC_EVENT_MSGS_CHANGED = 2000,
@@ -68,7 +67,6 @@ export enum C {
   DC_EVENT_SMTP_MESSAGE_SENT = 103,
   DC_EVENT_WARNING = 300,
   DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
-  DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT = 2151,
   DC_EVENT_WEBXDC_REALTIME_DATA = 2150,
   DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
   DC_GCL_ADD_ALLDONE_HINT = 4,
@@ -136,7 +134,6 @@ export enum C {
   DC_QR_FPR_OK = 210,
   DC_QR_FPR_WITHOUT_ADDR = 230,
   DC_QR_LOGIN = 520,
-  DC_QR_PROXY = 271,
   DC_QR_REVIVE_VERIFYCONTACT = 510,
   DC_QR_REVIVE_VERIFYGROUP = 512,
   DC_QR_TEXT = 330,
@@ -323,7 +320,6 @@ export const EventId2EventName: { [key: number]: string } = {
   410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
   2000: 'DC_EVENT_MSGS_CHANGED',
   2001: 'DC_EVENT_REACTIONS_CHANGED',
-  2002: 'DC_EVENT_INCOMING_REACTION',
   2005: 'DC_EVENT_INCOMING_MSG',
   2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
   2008: 'DC_EVENT_MSGS_NOTICED',
@@ -346,7 +342,6 @@ export const EventId2EventName: { [key: number]: string } = {
   2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
   2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
   2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
-  2151: 'DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT',
   2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
   2300: 'DC_EVENT_CHATLIST_CHANGED',
   2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',

node/lib/context.ts

@@ -475,6 +475,47 @@ export class Context extends EventEmitter {
     return binding.dcn_get_msg_html(this.dcn_context, Number(messageId))
   }
 
+  getNextMediaMessage(
+    messageId: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ) {
+    debug(
+      `getNextMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
+    )
+    return this._getNextMedia(messageId, 1, msgType1, msgType2, msgType3)
+  }
+
+  getPreviousMediaMessage(
+    messageId: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ) {
+    debug(
+      `getPreviousMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
+    )
+    return this._getNextMedia(messageId, -1, msgType1, msgType2, msgType3)
+  }
+
+  _getNextMedia(
+    messageId: number,
+    dir: number,
+    msgType1: number,
+    msgType2: number,
+    msgType3: number
+  ): number {
+    return binding.dcn_get_next_media(
+      this.dcn_context,
+      Number(messageId),
+      dir,
+      msgType1 || 0,
+      msgType2 || 0,
+      msgType3 || 0
+    )
+  }
+
   getSecurejoinQrCode(chatId: number): string {
     debug(`getSecurejoinQrCode ${chatId}`)
     return binding.dcn_get_securejoin_qr(this.dcn_context, Number(chatId))

node/src/module.c

@@ -1053,6 +1053,27 @@ NAPI_METHOD(dcn_get_msg_html) {
   NAPI_RETURN_AND_UNREF_STRING(msg_html);
 }
 
+NAPI_METHOD(dcn_get_next_media) {
+  NAPI_ARGV(6);
+  NAPI_DCN_CONTEXT();
+  NAPI_ARGV_UINT32(msg_id, 1);
+  NAPI_ARGV_INT32(dir, 2);
+  NAPI_ARGV_INT32(msg_type1, 3);
+  NAPI_ARGV_INT32(msg_type2, 4);
+  NAPI_ARGV_INT32(msg_type3, 5);
+
+  //TRACE("calling..");
+  uint32_t next_id = dc_get_next_media(dcn_context->dc_context,
+                                       msg_id,
+                                       dir,
+                                       msg_type1,
+                                       msg_type2,
+                                       msg_type3);
+  //TRACE("result %d", next_id);
+
+  NAPI_RETURN_UINT32(next_id);
+}
+
 NAPI_METHOD(dcn_set_chat_visibility) {
   NAPI_ARGV(3);
   NAPI_DCN_CONTEXT();
@@ -3422,6 +3443,7 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(dcn_get_msg_cnt);
   NAPI_EXPORT_FUNCTION(dcn_get_msg_info);
   NAPI_EXPORT_FUNCTION(dcn_get_msg_html);
+  NAPI_EXPORT_FUNCTION(dcn_get_next_media);
   NAPI_EXPORT_FUNCTION(dcn_set_chat_visibility);
   NAPI_EXPORT_FUNCTION(dcn_get_securejoin_qr);
   NAPI_EXPORT_FUNCTION(dcn_get_securejoin_qr_svg);

node/test/test.mjs

@@ -271,7 +271,7 @@ describe('Basic offline Tests', function () {
       'sync_msgs',
       'sentbox_watch',
       'show_emails',
-      'proxy_enabled',
+      'socks5_enabled',
       'sqlite_version',
       'uptime',
       'used_account_settings',

package.json

@@ -55,5 +55,5 @@
     "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.148.6"
+  "version": "1.142.6"
 }

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat"
-version = "1.148.6"
+version = "1.142.6"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"

python/src/deltachat/account.py

@@ -194,13 +194,15 @@ class Account:
         assert res != ffi.NULL, f"config value not found for: {name!r}"
         return from_dc_charpointer(res)
 
-    def _preconfigure_keypair(self, secret: str) -> None:
+    def _preconfigure_keypair(self, addr: str, secret: str) -> None:
         """See dc_preconfigure_keypair() in deltachat.h.
 
         In other words, you don't need this.
         """
         res = lib.dc_preconfigure_keypair(
             self._dc_context,
+            as_dc_charpointer(addr),
+            ffi.NULL,
             as_dc_charpointer(secret),
         )
         if res == 0:

python/src/deltachat/chat.py

@@ -308,7 +308,7 @@ class Chat:
         msg = as_dc_charpointer(text)
         msg_id = lib.dc_send_text_msg(self.account._dc_context, self.id, msg)
         if msg_id == 0:
-            raise ValueError("The message could not be sent. Does the chat exist?")
+            raise ValueError("message could not be send, does chat exist?")
         return Message.from_db(self.account, msg_id)
 
     def send_file(self, path, mime_type="application/octet-stream"):

python/src/deltachat/direct_imap.py

@@ -8,19 +8,19 @@ import io
 import pathlib
 import ssl
 from contextlib import contextmanager
-from typing import List, TYPE_CHECKING
+from typing import List
 
 from imap_tools import (
     AND,
     Header,
     MailBox,
+    MailBoxTls,
     MailMessage,
     MailMessageFlags,
     errors,
 )
 
-if TYPE_CHECKING:
-    from deltachat import Account
+from deltachat import Account, const
 
 FLAGS = b"FLAGS"
 FETCH = b"FETCH"
@@ -28,7 +28,7 @@ ALL = "1:*"
 
 
 class DirectImap:
-    def __init__(self, account: "Account") -> None:
+    def __init__(self, account: Account) -> None:
         self.account = account
         self.logid = account.get_config("displayname") or id(account)
         self._idling = False
@@ -36,13 +36,27 @@ class DirectImap:
 
     def connect(self):
         host = self.account.get_config("configured_mail_server")
-        port = 993
+        port = int(self.account.get_config("configured_mail_port"))
+        security = int(self.account.get_config("configured_mail_security"))
 
         user = self.account.get_config("addr")
-        host = user.rsplit("@")[-1]
         pw = self.account.get_config("mail_pw")
 
-        self.conn = MailBox(host, port, ssl_context=ssl.create_default_context())
+        if security == const.DC_SOCKET_PLAIN:
+            ssl_context = None
+        else:
+            ssl_context = ssl.create_default_context()
+
+            # don't check if certificate hostname doesn't match target hostname
+            ssl_context.check_hostname = False
+
+            # don't check if the certificate is trusted by a certificate authority
+            ssl_context.verify_mode = ssl.CERT_NONE
+
+        if security == const.DC_SOCKET_STARTTLS:
+            self.conn = MailBoxTls(host, port, ssl_context=ssl_context)
+        elif security == const.DC_SOCKET_PLAIN or security == const.DC_SOCKET_SSL:
+            self.conn = MailBox(host, port, ssl_context=ssl_context)
         self.conn.login(user, pw)
 
         self.select_folder("INBOX")

python/src/deltachat/testplugin.py

@@ -462,7 +462,7 @@ class ACFactory:
     def remove_preconfigured_keys(self) -> None:
         self._preconfigured_keys = []
 
-    def _preconfigure_key(self, account):
+    def _preconfigure_key(self, account, addr):
         # Only set a preconfigured key if we haven't used it yet for another account.
         try:
             keyname = self._preconfigured_keys.pop(0)
@@ -471,9 +471,9 @@ class ACFactory:
         else:
             fname_sec = self.data.read_path(f"key/{keyname}-secret.asc")
             if fname_sec:
-                account._preconfigure_keypair(fname_sec)
+                account._preconfigure_keypair(addr, fname_sec)
                 return True
-            print("WARN: could not use preconfigured keys")
+            print(f"WARN: could not use preconfigured keys for {addr!r}")
 
     def get_pseudo_configured_account(self, passphrase: Optional[str] = None) -> Account:
         # do a pseudo-configured account
@@ -492,7 +492,7 @@ class ACFactory:
                 "configured": "1",
             },
         )
-        self._preconfigure_key(ac)
+        self._preconfigure_key(ac, addr)
         self._acsetup.init_logging(ac)
         return ac
 
@@ -525,10 +525,9 @@ class ACFactory:
         configdict.setdefault("mvbox_move", False)
         configdict.setdefault("sentbox_watch", False)
         configdict.setdefault("sync_msgs", False)
-        configdict.setdefault("delete_server_after", 0)
         ac.update_config(configdict)
         self._acsetup._account2config[ac] = configdict
-        self._preconfigure_key(ac)
+        self._preconfigure_key(ac, configdict["addr"])
         return ac
 
     def wait_configured(self, account) -> None:

python/tests/test_1_online.py

@@ -488,18 +488,10 @@ def test_move_sync_msgs(acfactory):
     ac1 = acfactory.new_online_configuring_account(bcc_self=True, sync_msgs=True, fix_is_chatmail=True)
     acfactory.bring_accounts_online()
 
-    ac1.direct_imap.select_folder("DeltaChat")
-    # Sync messages may also be sent during the configuration.
-    mvbox_msg_cnt = len(ac1.direct_imap.get_all_messages())
-
     ac1.set_config("displayname", "Alice")
-    ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
+    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
     ac1.set_config("displayname", "Bob")
-    ac1._evtracker.get_matching("DC_EVENT_MSG_DELIVERED")
-    ac1.direct_imap.select_folder("Inbox")
-    assert len(ac1.direct_imap.get_all_messages()) == 0
-    ac1.direct_imap.select_folder("DeltaChat")
-    assert len(ac1.direct_imap.get_all_messages()) == mvbox_msg_cnt + 2
+    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
 
 
 def test_forward_messages(acfactory, lp):
@@ -628,7 +620,7 @@ def test_long_group_name(acfactory, lp):
 
 
 def test_send_self_message(acfactory, lp):
-    ac1 = acfactory.new_online_configuring_account(mvbox_move=True, bcc_self=True)
+    ac1 = acfactory.new_online_configuring_account(mvbox_move=True)
     acfactory.bring_accounts_online()
     lp.sec("ac1: create self chat")
     chat = ac1.get_self_contact().create_chat()
@@ -2084,11 +2076,12 @@ def test_send_receive_locations(acfactory, lp):
 def test_immediate_autodelete(acfactory, lp):
     ac1 = acfactory.new_online_configuring_account()
     ac2 = acfactory.new_online_configuring_account()
-    acfactory.bring_accounts_online()
 
     # "1" means delete immediately, while "0" means do not delete
     ac2.set_config("delete_server_after", "1")
 
+    acfactory.bring_accounts_online()
+
     lp.sec("ac1: create chat with ac2")
     chat1 = ac1.create_chat(ac2)
     ac2.create_chat(ac1)
@@ -2209,19 +2202,6 @@ def test_configure_error_msgs_wrong_pw(acfactory):
     # Password is wrong so it definitely has to say something about "password"
     assert "password" in ev.data2
 
-    ac1.stop_io()
-    ac1.set_config("mail_pw", "abc")  # Wrong mail pw
-    ac1.configure()
-    while True:
-        ev = ac1._evtracker.get_matching("DC_EVENT_CONFIGURE_PROGRESS")
-        print(f"Configuration progress: {ev.data1}")
-        if ev.data1 == 0:
-            break
-    assert "password" in ev.data2
-    # Account will continue to work with the old password, so if it becomes wrong, a notification
-    # must be shown.
-    assert ac1.get_config("notify_about_wrong_pw") == "1"
-
 
 def test_configure_error_msgs_invalid_server(acfactory):
     ac2 = acfactory.get_unconfigured_account()

python/tests/test_3_offline.py

@@ -67,7 +67,7 @@ class TestOfflineAccountBasic:
         ac = acfactory.get_unconfigured_account()
         alice_secret = data.read_path("key/alice-secret.asc")
         assert alice_secret
-        ac._preconfigure_keypair(alice_secret)
+        ac._preconfigure_keypair("alice@example.org", alice_secret)
 
     def test_getinfo(self, acfactory):
         ac1 = acfactory.get_unconfigured_account()

release-date.in

@@ -1 +1 @@
-2024-10-31
+2024-08-15

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

scripts/run_all.sh

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

scripts/update-provider-database.sh

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

src/accounts.rs

@@ -5,8 +5,7 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 
 use anyhow::{ensure, Context as _, Result};
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
+use futures::future::join_all;
 use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::AsyncWriteExt;
@@ -302,48 +301,20 @@ impl Accounts {
     ///
     /// This is an auxiliary function and not part of public API.
     /// Use [Accounts::background_fetch] instead.
-    async fn background_fetch_no_timeout(accounts: Vec<Context>, events: Events) {
+    async fn background_fetch_without_timeout(&self) {
         async fn background_fetch_and_log_error(account: Context) {
             if let Err(error) = account.background_fetch().await {
                 warn!(account, "{error:#}");
             }
         }
 
-        events.emit(Event {
-            id: 0,
-            typ: EventType::Info(format!(
-                "Starting background fetch for {} accounts.",
-                accounts.len()
-            )),
-        });
-        let mut futures_unordered: FuturesUnordered<_> = accounts
-            .into_iter()
-            .map(background_fetch_and_log_error)
-            .collect();
-        while futures_unordered.next().await.is_some() {}
-    }
-
-    /// Auxiliary function for [Accounts::background_fetch].
-    async fn background_fetch_with_timeout(
-        accounts: Vec<Context>,
-        events: Events,
-        timeout: std::time::Duration,
-    ) {
-        if let Err(_err) = tokio::time::timeout(
-            timeout,
-            Self::background_fetch_no_timeout(accounts, events.clone()),
+        join_all(
+            self.accounts
+                .values()
+                .cloned()
+                .map(background_fetch_and_log_error),
         )
-        .await
-        {
-            events.emit(Event {
-                id: 0,
-                typ: EventType::Warning("Background fetch timed out.".to_string()),
-            });
-        }
-        events.emit(Event {
-            id: 0,
-            typ: EventType::AccountsBackgroundFetchDone,
-        });
+        .await;
     }
 
     /// Performs a background fetch for all accounts in parallel with a timeout.
@@ -351,13 +322,15 @@ impl Accounts {
     /// The `AccountsBackgroundFetchDone` event is emitted at the end,
     /// process all events until you get this one and you can safely return to the background
     /// without forgetting to create notifications caused by timing race conditions.
-    ///
-    /// Returns a future that resolves when background fetch is done,
-    /// but does not capture `&self`.
-    pub fn background_fetch(&self, timeout: std::time::Duration) -> impl Future<Output = ()> {
-        let accounts: Vec<Context> = self.accounts.values().cloned().collect();
-        let events = self.events.clone();
-        Self::background_fetch_with_timeout(accounts, events, timeout)
+    pub async fn background_fetch(&self, timeout: std::time::Duration) {
+        if let Err(_err) =
+            tokio::time::timeout(timeout, self.background_fetch_without_timeout()).await
+        {
+            self.emit_event(EventType::Warning(
+                "Background fetch timed out.".to_string(),
+            ));
+        }
+        self.emit_event(EventType::AccountsBackgroundFetchDone);
     }
 
     /// Emits a single event.
@@ -371,7 +344,7 @@ impl Accounts {
     }
 
     /// Sets notification token for Apple Push Notification service.
-    pub async fn set_push_device_token(&self, token: &str) -> Result<()> {
+    pub async fn set_push_device_token(&mut self, token: &str) -> Result<()> {
         self.push_subscriber.set_device_token(token).await;
         Ok(())
     }

src/blob.rs

@@ -253,16 +253,16 @@ impl<'a> BlobObject<'a> {
     ///
     /// The extension part will always be lowercased.
     fn sanitise_name(name: &str) -> (String, String) {
-        let mut name = name;
+        let mut name = name.to_string();
         for part in name.rsplit('/') {
             if !part.is_empty() {
-                name = part;
+                name = part.to_string();
                 break;
             }
         }
         for part in name.rsplit('\\') {
             if !part.is_empty() {
-                name = part;
+                name = part.to_string();
                 break;
             }
         }
@@ -272,39 +272,32 @@ impl<'a> BlobObject<'a> {
             replacement: "",
         };
 
-        let name = sanitize_filename::sanitize_with_options(name, opts);
-        // Let's take a tricky filename,
+        let clean = sanitize_filename::sanitize_with_options(name, opts);
+        // Let's take the tricky filename
         // "file.with_lots_of_characters_behind_point_and_double_ending.tar.gz" as an example.
-        // Assume that the extension is 32 chars maximum.
-        let ext: String = name
-            .chars()
+        // Split it into "file" and "with_lots_of_characters_behind_point_and_double_ending.tar.gz":
+        let mut iter = clean.splitn(2, '.');
+
+        let stem: String = iter.next().unwrap_or_default().chars().take(64).collect();
+        // stem == "file"
+
+        let ext_chars = iter.next().unwrap_or_default().chars();
+        let ext: String = ext_chars
             .rev()
-            .take_while(|c| !c.is_whitespace())
-            .take(33)
+            .take(32)
             .collect::<Vec<_>>()
             .iter()
             .rev()
             .collect();
-        // ext == "nd_point_and_double_ending.tar.gz"
+        // ext == "d_point_and_double_ending.tar.gz"
 
-        // Split it into "nd_point_and_double_ending" and "tar.gz":
-        let mut iter = ext.splitn(2, '.');
-        iter.next();
-
-        let ext = iter.next().unwrap_or_default();
-        let ext = if ext.is_empty() {
-            String::new()
+        if ext.is_empty() {
+            (stem, "".to_string())
         } else {
-            format!(".{ext}")
-            // ".tar.gz"
-        };
-        let stem = name
-            .strip_suffix(&ext)
-            .unwrap_or_default()
-            .chars()
-            .take(64)
-            .collect();
-        (stem, ext.to_lowercase())
+            (stem, format!(".{ext}").to_lowercase())
+            // Return ("file", ".d_point_and_double_ending.tar.gz")
+            // which is not perfect but acceptable.
+        }
     }
 
     /// Checks whether a name is a valid blob name.
@@ -622,7 +615,7 @@ fn exif_orientation(exif: &exif::Exif, context: &Context) -> i32 {
     0
 }
 
-impl fmt::Display for BlobObject<'_> {
+impl<'a> fmt::Display for BlobObject<'a> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "$BLOBDIR/{}", self.name)
     }
@@ -673,6 +666,10 @@ impl<'a> BlobDirContents<'a> {
     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.
@@ -970,19 +967,6 @@ mod tests {
         assert!(!stem.contains(':'));
         assert!(!stem.contains('*'));
         assert!(!stem.contains('?'));
-
-        let (stem, ext) = BlobObject::sanitise_name(
-            "file.with_lots_of_characters_behind_point_and_double_ending.tar.gz",
-        );
-        assert_eq!(
-            stem,
-            "file.with_lots_of_characters_behind_point_and_double_ending"
-        );
-        assert_eq!(ext, ".tar.gz");
-
-        let (stem, ext) = BlobObject::sanitise_name("a. tar.tar.gz");
-        assert_eq!(stem, "a. tar");
-        assert_eq!(ext, ".tar.gz");
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/chat.rs

@@ -46,8 +46,8 @@ use crate::stock_str;
 use crate::sync::{self, Sync::*, SyncData};
 use crate::tools::{
     buf_compress, create_id, create_outgoing_rfc724_mid, create_smeared_timestamp,
-    create_smeared_timestamps, get_abs_path, gm2local_offset, smeared_time, time,
-    truncate_msg_text, IsNoneOrEmpty, SystemTime,
+    create_smeared_timestamps, get_abs_path, gm2local_offset, smeared_time, time, IsNoneOrEmpty,
+    SystemTime,
 };
 use crate::webxdc::StatusUpdateSerial;
 
@@ -279,10 +279,9 @@ impl ChatId {
     ) -> Result<Self> {
         let chat_id = match ChatIdBlocked::lookup_by_contact(context, contact_id).await? {
             Some(chat) => {
-                if create_blocked != Blocked::Not || chat.blocked == Blocked::Not {
-                    return Ok(chat.id);
+                if create_blocked == Blocked::Not && chat.blocked != Blocked::Not {
+                    chat.id.set_blocked(context, Blocked::Not).await?;
                 }
-                chat.id.set_blocked(context, Blocked::Not).await?;
                 chat.id
             }
             None => {
@@ -578,7 +577,7 @@ impl ChatId {
         Ok(())
     }
 
-    /// Sets protection and adds a message.
+    /// Sets protection and sends or adds a message.
     ///
     /// `timestamp_sort` is used as the timestamp of the added message
     /// and should be the timestamp of the change happening.
@@ -589,16 +588,20 @@ impl ChatId {
         timestamp_sort: i64,
         contact_id: Option<ContactId>,
     ) -> Result<()> {
-        let protection_status_modified = self
-            .inner_set_protection(context, protect)
-            .await
-            .with_context(|| format!("Cannot set protection for {self}"))?;
-        if protection_status_modified {
-            self.add_protection_msg(context, protect, contact_id, timestamp_sort)
-                .await?;
-            chatlist_events::emit_chatlist_item_changed(context, self);
+        match self.inner_set_protection(context, protect).await {
+            Ok(protection_status_modified) => {
+                if protection_status_modified {
+                    self.add_protection_msg(context, protect, contact_id, timestamp_sort)
+                        .await?;
+                    chatlist_events::emit_chatlist_item_changed(context, self);
+                }
+                Ok(())
+            }
+            Err(e) => {
+                error!(context, "Cannot set protection: {e:#}."); // make error user-visible
+                Err(e)
+            }
         }
-        Ok(())
     }
 
     /// Sets protection and sends or adds a message.
@@ -612,9 +615,8 @@ impl ChatId {
         contact_id: Option<ContactId>,
     ) -> Result<()> {
         let sort_to_bottom = true;
-        let (received, incoming) = (false, false);
         let ts = self
-            .calc_sort_timestamp(context, timestamp_sent, sort_to_bottom, received, incoming)
+            .calc_sort_timestamp(context, timestamp_sent, sort_to_bottom, false)
             .await?
             // Always sort protection messages below `SystemMessage::SecurejoinWait{,Timeout}` ones
             // in case of race conditions.
@@ -797,7 +799,8 @@ impl ChatId {
         context.scheduler.interrupt_inbox().await;
 
         if chat.is_self_talk() {
-            let mut msg = Message::new_text(stock_str::self_deleted_msg_body(context).await);
+            let mut msg = Message::new(Viewtype::Text);
+            msg.text = stock_str::self_deleted_msg_body(context).await;
             add_device_msg(context, None, Some(&mut msg)).await?;
         }
         chatlist_events::emit_chatlist_changed(context);
@@ -865,14 +868,13 @@ impl ChatId {
     ///
     /// Returns `true`, if message was deleted, `false` otherwise.
     async fn maybe_delete_draft(self, context: &Context) -> Result<bool> {
-        Ok(context
-            .sql
-            .execute(
-                "DELETE FROM msgs WHERE chat_id=? AND state=?",
-                (self, MessageState::OutDraft),
-            )
-            .await?
-            > 0)
+        match self.get_draft_msg_id(context).await? {
+            Some(msg_id) => {
+                msg_id.delete_from_db(context).await?;
+                Ok(true)
+            }
+            None => Ok(false),
+        }
     }
 
     /// Set provided message as draft message for specified chat.
@@ -944,18 +946,12 @@ impl ChatId {
             }
         }
 
+        // insert new draft
+        self.maybe_delete_draft(context).await?;
         let row_id = context
             .sql
-            .transaction(|transaction| {
-                // Delete existing draft if it exists.
-                transaction.execute(
-                    "DELETE FROM msgs WHERE chat_id=? AND state=?",
-                    (self, MessageState::OutDraft),
-                )?;
-
-                // Insert new draft.
-                transaction.execute(
-                    "INSERT INTO msgs (
+            .insert(
+                "INSERT INTO msgs (
                  chat_id,
                  from_id,
                  timestamp,
@@ -967,22 +963,19 @@ impl ChatId {
                  hidden,
                  mime_in_reply_to)
          VALUES (?,?,?,?,?,?,?,?,?,?);",
-                    (
-                        self,
-                        ContactId::SELF,
-                        time(),
-                        msg.viewtype,
-                        MessageState::OutDraft,
-                        &msg.text,
-                        message::normalize_text(&msg.text),
-                        msg.param.to_string(),
-                        1,
-                        msg.in_reply_to.as_deref().unwrap_or_default(),
-                    ),
-                )?;
-
-                Ok(transaction.last_insert_rowid())
-            })
+                (
+                    self,
+                    ContactId::SELF,
+                    time(),
+                    msg.viewtype,
+                    MessageState::OutDraft,
+                    &msg.text,
+                    message::normalize_text(&msg.text),
+                    msg.param.to_string(),
+                    1,
+                    msg.in_reply_to.as_deref().unwrap_or_default(),
+                ),
+            )
             .await?;
         msg.id = MsgId::new(row_id.try_into()?);
         Ok(true)
@@ -1048,13 +1041,7 @@ impl ChatId {
     pub(crate) async fn get_timestamp(self, context: &Context) -> Result<Option<i64>> {
         let timestamp = context
             .sql
-            .query_get_value(
-                "SELECT MAX(timestamp)
-                 FROM msgs
-                 WHERE chat_id=?
-                 HAVING COUNT(*) > 0",
-                (self,),
-            )
+            .query_get_value("SELECT MAX(timestamp) FROM msgs WHERE chat_id=?", (self,))
             .await?;
         Ok(timestamp)
     }
@@ -1240,7 +1227,6 @@ impl ChatId {
              AND ((state BETWEEN {} AND {}) OR (state >= {})) \
              AND NOT hidden \
              AND download_state={} \
-             AND from_id != {} \
              ORDER BY timestamp DESC, id DESC \
              LIMIT 1;",
             MessageState::InFresh as u32,
@@ -1249,9 +1235,6 @@ impl ChatId {
             // Do not reply to not fully downloaded messages. Such a message could be a group chat
             // message that we assigned to 1:1 chat.
             DownloadState::Done as u32,
-            // Do not reference info messages, they are not actually sent out
-            // and have Message-IDs unknown to other chat members.
-            ContactId::INFO.to_u32(),
         );
         sql.query_row_optional(&query, (self,), f).await
     }
@@ -1263,7 +1246,7 @@ impl ChatId {
     ) -> Result<Option<(String, String, String)>> {
         self.parent_query(
             context,
-            "rfc724_mid, mime_in_reply_to, IFNULL(mime_references, '')",
+            "rfc724_mid, mime_in_reply_to, mime_references",
             state_out_min,
             |row: &rusqlite::Row| {
                 let rfc724_mid: String = row.get(0)?;
@@ -1398,14 +1381,12 @@ impl ChatId {
     /// corresponding event in case of a system message (usually the current system time).
     /// `always_sort_to_bottom` makes this ajust the returned timestamp up so that the message goes
     /// to the chat bottom.
-    /// `received` -- whether the message is received. Otherwise being sent.
     /// `incoming` -- whether the message is incoming.
     pub(crate) async fn calc_sort_timestamp(
         self,
         context: &Context,
         message_timestamp: i64,
         always_sort_to_bottom: bool,
-        received: bool,
         incoming: bool,
     ) -> Result<i64> {
         let mut sort_timestamp = cmp::min(message_timestamp, smeared_time(context));
@@ -1419,45 +1400,26 @@ impl ChatId {
             context
                 .sql
                 .query_get_value(
-                    "SELECT MAX(timestamp)
-                     FROM msgs
-                     WHERE chat_id=? AND state!=?
-                     HAVING COUNT(*) > 0",
+                    "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? AND state!=?",
                     (self, MessageState::OutDraft),
                 )
                 .await?
-        } else if received {
-            // Received messages shouldn't mingle with just sent ones and appear somewhere in the
-            // middle of the chat, so we go after the newest non fresh message.
-            //
-            // But if a received outgoing message is older than some seen message, better sort the
-            // received message purely by timestamp. We could place it just before that seen
-            // message, but anyway the user may not notice it.
-            //
-            // NB: Received outgoing messages may break sorting of fresh incoming ones, but this
-            // shouldn't happen frequently. Seen incoming messages don't really break sorting of
-            // fresh ones, they rather mean that older incoming messages are actually seen as well.
+        } else if incoming {
+            // get newest non fresh message for this chat.
+
+            // If a user hasn't been online for some time, the Inbox is fetched first and then the
+            // Sentbox. In order for Inbox and Sent messages to be allowed to mingle, outgoing
+            // messages are purely sorted by their sent timestamp. NB: The Inbox must be fetched
+            // first otherwise Inbox messages would be always below old Sentbox messages. We could
+            // take in the query below only incoming messages, but then new incoming messages would
+            // mingle with just sent outgoing ones and apear somewhere in the middle of the chat.
             context
                 .sql
-                .query_row_optional(
-                    "SELECT MAX(timestamp), MAX(IIF(state=?,timestamp_sent,0))
-                     FROM msgs
-                     WHERE chat_id=? AND hidden=0 AND state>?
-                     HAVING COUNT(*) > 0",
-                    (MessageState::InSeen, self, MessageState::InFresh),
-                    |row| {
-                        let ts: i64 = row.get(0)?;
-                        let ts_sent_seen: i64 = row.get(1)?;
-                        Ok((ts, ts_sent_seen))
-                    },
+                .query_get_value(
+                    "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? AND hidden=0 AND state>?",
+                    (self, MessageState::InFresh),
                 )
                 .await?
-                .and_then(|(ts, ts_sent_seen)| {
-                    match incoming || ts_sent_seen <= message_timestamp {
-                        true => Some(ts),
-                        false => None,
-                    }
-                })
         } else {
             None
         };
@@ -1972,13 +1934,11 @@ impl Chat {
             msg.param.set_int(Param::AttachGroupImage, 1);
             self.param.remove(Param::Unpromoted);
             self.update_param(context).await?;
-            // TODO: Remove this compat code needed because Core <= v1.143:
-            // - doesn't accept synchronization of QR code tokens for unpromoted groups, so we also
-            //   send them when the group is promoted.
-            // - doesn't sync QR code tokens for unpromoted groups and the group might be created
-            //   before an upgrade.
+            // send_sync_msg() is called (usually) a moment later at send_msg_to_smtp()
+            // when the group creation message is actually sent through SMTP --
+            // this makes sure, the other devices are aware of grpid that is used in the sync-message.
             context
-                .sync_qr_code_tokens(Some(self.grpid.as_str()))
+                .sync_qr_code_tokens(Some(self.id))
                 .await
                 .log_err(context)
                 .ok();
@@ -2091,26 +2051,21 @@ impl Chat {
             EphemeralTimer::Enabled { duration } => time().saturating_add(duration.into()),
         };
 
-        let (msg_text, was_truncated) = truncate_msg_text(context, msg.text.clone()).await?;
         let new_mime_headers = if msg.has_html() {
-            if msg.param.exists(Param::Forwarded) {
+            let html = if msg.param.exists(Param::Forwarded) {
                 msg.get_id().get_html(context).await?
             } else {
                 msg.param.get(Param::SendHtml).map(|s| s.to_string())
+            };
+            match html {
+                Some(html) => Some(tokio::task::block_in_place(move || {
+                    buf_compress(new_html_mimepart(html).build().as_string().as_bytes())
+                })?),
+                None => None,
             }
         } else {
             None
         };
-        let new_mime_headers = new_mime_headers.or_else(|| match was_truncated {
-            true => Some(msg.text.clone()),
-            false => None,
-        });
-        let new_mime_headers = match new_mime_headers {
-            Some(h) => Some(tokio::task::block_in_place(move || {
-                buf_compress(new_html_mimepart(h).build().as_string().as_bytes())
-            })?),
-            None => None,
-        };
 
         msg.chat_id = self.id;
         msg.from_id = ContactId::SELF;
@@ -2137,8 +2092,8 @@ impl Chat {
                         msg.timestamp_sort,
                         msg.viewtype,
                         msg.state,
-                        msg_text,
-                        message::normalize_text(&msg_text),
+                        msg.text,
+                        message::normalize_text(&msg.text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -2188,8 +2143,8 @@ impl Chat {
                         msg.timestamp_sort,
                         msg.viewtype,
                         msg.state,
-                        msg_text,
-                        message::normalize_text(&msg_text),
+                        msg.text,
+                        message::normalize_text(&msg.text),
                         &msg.subject,
                         msg.param.to_string(),
                         msg.hidden,
@@ -2285,7 +2240,7 @@ pub(crate) async fn sync(context: &Context, id: SyncId, action: SyncAction) -> R
     context
         .add_sync_item(SyncData::AlterChat { id, action })
         .await?;
-    context.scheduler.interrupt_inbox().await;
+    context.scheduler.interrupt_smtp().await;
     Ok(())
 }
 
@@ -2943,15 +2898,13 @@ async fn prepare_send_msg(
         );
         message::update_msg_state(context, msg.id, MessageState::OutPending).await?;
     }
-    let row_ids = create_send_msg_jobs(context, msg)
-        .await
-        .context("Failed to create send jobs")?;
-    Ok(row_ids)
+    create_send_msg_jobs(context, msg).await
 }
 
-/// Constructs jobs for sending a message and inserts them into the appropriate table.
+/// Constructs jobs for sending a message and inserts them into the `smtp` table.
 ///
-/// Returns row ids if `smtp` table jobs were created or an empty `Vec` otherwise.
+/// Returns row ids if jobs were created or an empty `Vec` otherwise, e.g. when sending to a
+/// group with only self and no BCC-to-self configured.
 ///
 /// The caller has to interrupt SMTP loop or otherwise process new rows.
 pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -> Result<Vec<i64>> {
@@ -3045,6 +2998,12 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
         }
     }
 
+    if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
+        if let Err(err) = context.delete_sync_ids(sync_ids).await {
+            error!(context, "Failed to delete sync ids: {err:#}.");
+        }
+    }
+
     if attach_selfavatar {
         if let Err(err) = msg.chat_id.set_selfavatar_timestamp(context, now).await {
             error!(context, "Failed to set selfavatar timestamp: {err:#}.");
@@ -3061,30 +3020,19 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
     let chunk_size = context.get_max_smtp_rcpt_to().await?;
     let trans_fn = |t: &mut rusqlite::Transaction| {
         let mut row_ids = Vec::<i64>::new();
-        if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
-            t.execute(
-                &format!("DELETE FROM multi_device_sync WHERE id IN ({sync_ids})"),
-                (),
+        for recipients_chunk in recipients.chunks(chunk_size) {
+            let recipients_chunk = recipients_chunk.join(" ");
+            let row_id = t.execute(
+                "INSERT INTO smtp (rfc724_mid, recipients, mime, msg_id) \
+                VALUES            (?1,         ?2,         ?3,   ?4)",
+                (
+                    &rendered_msg.rfc724_mid,
+                    recipients_chunk,
+                    &rendered_msg.message,
+                    msg.id,
+                ),
             )?;
-            t.execute(
-                "INSERT INTO imap_send (mime, msg_id) VALUES (?, ?)",
-                (&rendered_msg.message, msg.id),
-            )?;
-        } else {
-            for recipients_chunk in recipients.chunks(chunk_size) {
-                let recipients_chunk = recipients_chunk.join(" ");
-                let row_id = t.execute(
-                    "INSERT INTO smtp (rfc724_mid, recipients, mime, msg_id) \
-                    VALUES            (?1,         ?2,         ?3,   ?4)",
-                    (
-                        &rendered_msg.rfc724_mid,
-                        recipients_chunk,
-                        &rendered_msg.message,
-                        msg.id,
-                    ),
-                )?;
-                row_ids.push(row_id.try_into()?);
-            }
+            row_ids.push(row_id.try_into()?);
         }
         Ok(row_ids)
     };
@@ -3105,7 +3053,8 @@ pub async fn send_text_msg(
         chat_id
     );
 
-    let mut msg = Message::new_text(text_to_send);
+    let mut msg = Message::new(Viewtype::Text);
+    msg.text = text_to_send;
     send_msg(context, chat_id, &mut msg).await
 }
 
@@ -3458,6 +3407,65 @@ pub async fn get_chat_media(
     Ok(list)
 }
 
+/// Indicates the direction over which to iterate.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[repr(i32)]
+pub enum Direction {
+    /// Search forward.
+    Forward = 1,
+
+    /// Search backward.
+    Backward = -1,
+}
+
+/// Searches next/previous message based on the given message and list of types.
+///
+/// Deprecated since 2023-10-03.
+#[deprecated(note = "use `get_chat_media` instead")]
+pub async fn get_next_media(
+    context: &Context,
+    curr_msg_id: MsgId,
+    direction: Direction,
+    msg_type: Viewtype,
+    msg_type2: Viewtype,
+    msg_type3: Viewtype,
+) -> Result<Option<MsgId>> {
+    let mut ret: Option<MsgId> = None;
+
+    if let Ok(msg) = Message::load_from_db(context, curr_msg_id).await {
+        let list: Vec<MsgId> = get_chat_media(
+            context,
+            Some(msg.chat_id),
+            if msg_type != Viewtype::Unknown {
+                msg_type
+            } else {
+                msg.viewtype
+            },
+            msg_type2,
+            msg_type3,
+        )
+        .await?;
+        for (i, msg_id) in list.iter().enumerate() {
+            if curr_msg_id == *msg_id {
+                match direction {
+                    Direction::Forward => {
+                        if i + 1 < list.len() {
+                            ret = list.get(i + 1).copied();
+                        }
+                    }
+                    Direction::Backward => {
+                        if i >= 1 {
+                            ret = list.get(i - 1).copied();
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    Ok(ret)
+}
+
 /// Returns a vector of contact IDs for given chat ID.
 pub async fn get_chat_contacts(context: &Context, chat_id: ChatId) -> Result<Vec<ContactId>> {
     // Normal chats do not include SELF.  Group chats do (as it may happen that one is deleted from a
@@ -3481,29 +3489,6 @@ pub async fn get_chat_contacts(context: &Context, chat_id: ChatId) -> Result<Vec
     Ok(list)
 }
 
-/// Returns a vector of contact IDs for given chat ID where the contact is not SELF.
-pub async fn get_other_chat_contacts(context: &Context, chat_id: ChatId) -> Result<Vec<ContactId>> {
-    // Normal chats do not include SELF.  Group chats do (as it may happen that one is deleted from a
-    // groupchat but the chats stays visible, moreover, this makes displaying lists easier)
-
-    let list = context
-        .sql
-        .query_map(
-            "SELECT cc.contact_id
-               FROM chats_contacts cc
-               LEFT JOIN contacts c
-                      ON c.id=cc.contact_id
-              WHERE cc.chat_id=? AND c.id!=1
-              ORDER BY c.id=1, c.last_seen DESC, c.id DESC;",
-            (chat_id,),
-            |row| row.get::<_, ContactId>(0),
-            |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
-        )
-        .await?;
-
-    Ok(list)
-}
-
 /// Creates a group chat with a given `name`.
 pub async fn create_group_chat(
     context: &Context,
@@ -3741,13 +3726,17 @@ pub(crate) async fn add_contact_to_chat_ex(
         bail!("can not add contact because the account is not part of the group/broadcast");
     }
 
-    let sync_qr_code_tokens;
     if from_handshake && chat.param.get_int(Param::Unpromoted).unwrap_or_default() == 1 {
         chat.param.remove(Param::Unpromoted);
         chat.update_param(context).await?;
-        sync_qr_code_tokens = true;
-    } else {
-        sync_qr_code_tokens = false;
+        if context
+            .sync_qr_code_tokens(Some(chat_id))
+            .await
+            .log_err(context)
+            .is_ok()
+        {
+            context.scheduler.interrupt_smtp().await;
+        }
     }
 
     if context.is_self_addr(contact.get_addr()).await? {
@@ -3791,20 +3780,6 @@ pub(crate) async fn add_contact_to_chat_ex(
             return Err(e);
         }
         sync = Nosync;
-        // TODO: Remove this compat code needed because Core <= v1.143:
-        // - doesn't accept synchronization of QR code tokens for unpromoted groups, so we also send
-        //   them when the group is promoted.
-        // - doesn't sync QR code tokens for unpromoted groups and the group might be created before
-        //   an upgrade.
-        if sync_qr_code_tokens
-            && context
-                .sync_qr_code_tokens(Some(chat.grpid.as_str()))
-                .await
-                .log_err(context)
-                .is_ok()
-        {
-            context.scheduler.interrupt_inbox().await;
-        }
     }
     context.emit_event(EventType::ChatModified(chat_id));
     if sync.into() {
@@ -4279,14 +4254,10 @@ pub async fn resend_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
             msg.update_param(context).await?;
         }
         match msg.get_state() {
-            // `get_state()` may return an outdated `OutPending`, so update anyway.
-            MessageState::OutPending
-            | MessageState::OutFailed
-            | MessageState::OutDelivered
-            | MessageState::OutMdnRcvd => {
+            MessageState::OutFailed | MessageState::OutDelivered | MessageState::OutMdnRcvd => {
                 message::update_msg_state(context, msg.id, MessageState::OutPending).await?
             }
-            msg_state => bail!("Unexpected message state {msg_state}"),
+            _ => bail!("unexpected message state"),
         }
         context.emit_event(EventType::MsgsChanged {
             chat_id: msg.chat_id,
@@ -4406,10 +4377,7 @@ pub async fn add_device_msg_with_importance(
         if let Some(last_msg_time) = context
             .sql
             .query_get_value(
-                "SELECT MAX(timestamp)
-                 FROM msgs
-                 WHERE chat_id=?
-                 HAVING COUNT(*) > 0",
+                "SELECT MAX(timestamp) FROM msgs WHERE chat_id=?",
                 (chat_id,),
             )
             .await?
@@ -4735,7 +4703,6 @@ mod tests {
     use super::*;
     use crate::chatlist::get_archived_cnt;
     use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
-    use crate::headerdef::HeaderDef;
     use crate::message::delete_msgs;
     use crate::receive_imf::receive_imf;
     use crate::test_utils::{sync, TestContext, TestContextManager};
@@ -4801,7 +4768,8 @@ mod tests {
     async fn test_get_draft() {
         let t = TestContext::new().await;
         let chat_id = &t.get_self_chat().await.id;
-        let mut msg = Message::new_text("hello".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hello".to_string());
 
         chat_id.set_draft(&t, Some(&mut msg)).await.unwrap();
         let draft = chat_id.get_draft(&t).await.unwrap().unwrap();
@@ -4815,11 +4783,13 @@ mod tests {
         let t = TestContext::new_alice().await;
         let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "abc").await?;
 
-        let mut msg = Message::new_text("hi!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi!".to_string());
         chat_id.set_draft(&t, Some(&mut msg)).await?;
         assert!(chat_id.get_draft(&t).await?.is_some());
 
-        let mut msg = Message::new_text("another".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("another".to_string());
         chat_id.set_draft(&t, Some(&mut msg)).await?;
         assert!(chat_id.get_draft(&t).await?.is_some());
 
@@ -4833,7 +4803,8 @@ mod tests {
     async fn test_forwarding_draft_failing() -> Result<()> {
         let t = TestContext::new_alice().await;
         let chat_id = &t.get_self_chat().await.id;
-        let mut msg = Message::new_text("hello".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hello".to_string());
         chat_id.set_draft(&t, Some(&mut msg)).await?;
         assert_eq!(msg.id, chat_id.get_draft(&t).await?.unwrap().id);
 
@@ -4846,7 +4817,8 @@ mod tests {
     async fn test_draft_stable_ids() -> Result<()> {
         let t = TestContext::new_alice().await;
         let chat_id = &t.get_self_chat().await.id;
-        let mut msg = Message::new_text("hello".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hello".to_string());
         assert_eq!(msg.id, MsgId::new_unset());
         assert!(chat_id.get_draft_msg_id(&t).await?.is_none());
 
@@ -4886,33 +4858,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_only_one_draft_per_chat() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "abc").await?;
-
-        let msgs: Vec<message::Message> = (1..=1000)
-            .map(|i| Message::new_text(i.to_string()))
-            .collect();
-        let mut tasks = Vec::new();
-        for mut msg in msgs {
-            let ctx = t.clone();
-            let task = tokio::spawn(async move {
-                let ctx = ctx;
-                chat_id.set_draft(&ctx, Some(&mut msg)).await
-            });
-            tasks.push(task);
-        }
-        futures::future::join_all(tasks.into_iter()).await;
-
-        assert!(chat_id.get_draft(&t).await?.is_some());
-
-        chat_id.set_draft(&t, None).await?;
-        assert!(chat_id.get_draft(&t).await?.is_none());
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_change_quotes_on_reused_message_object() -> Result<()> {
         let t = TestContext::new_alice().await;
@@ -4925,7 +4870,8 @@ mod tests {
                 .await?;
 
         // save a draft
-        let mut draft = Message::new_text("draft text".to_string());
+        let mut draft = Message::new(Viewtype::Text);
+        draft.set_text("draft text".to_string());
         chat_id.set_draft(&t, Some(&mut draft)).await?;
 
         let test = Message::load_from_db(&t, draft.id).await?;
@@ -4978,25 +4924,29 @@ mod tests {
         let one2one_msg = Message::load_from_db(&alice, one2one_msg_id).await?;
 
         // quoting messages in same chat is okay
-        let mut msg = Message::new_text("baz".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("baz".to_string());
         msg.set_quote(&alice, Some(&grp_msg)).await?;
         let result = send_msg(&alice, grp_chat_id, &mut msg).await;
         assert!(result.is_ok());
 
-        let mut msg = Message::new_text("baz".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("baz".to_string());
         msg.set_quote(&alice, Some(&one2one_msg)).await?;
         let result = send_msg(&alice, one2one_chat_id, &mut msg).await;
         assert!(result.is_ok());
         let one2one_quote_reply_msg_id = result.unwrap();
 
         // quoting messages from groups to one-to-ones is okay ("reply privately")
-        let mut msg = Message::new_text("baz".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("baz".to_string());
         msg.set_quote(&alice, Some(&grp_msg)).await?;
         let result = send_msg(&alice, one2one_chat_id, &mut msg).await;
         assert!(result.is_ok());
 
         // quoting messages from one-to-one chats in groups is an error; usually this is also not allowed by UI at all ...
-        let mut msg = Message::new_text("baz".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("baz".to_string());
         msg.set_quote(&alice, Some(&one2one_msg)).await?;
         let result = send_msg(&alice, grp_chat_id, &mut msg).await;
         assert!(result.is_err());
@@ -5488,11 +5438,13 @@ mod tests {
         let t = TestContext::new().await;
 
         // add two device-messages
-        let mut msg1 = Message::new_text("first message".to_string());
+        let mut msg1 = Message::new(Viewtype::Text);
+        msg1.set_text("first message".to_string());
         let msg1_id = add_device_msg(&t, None, Some(&mut msg1)).await;
         assert!(msg1_id.is_ok());
 
-        let mut msg2 = Message::new_text("second message".to_string());
+        let mut msg2 = Message::new(Viewtype::Text);
+        msg2.set_text("second message".to_string());
         let msg2_id = add_device_msg(&t, None, Some(&mut msg2)).await;
         assert!(msg2_id.is_ok());
         assert_ne!(msg1_id.as_ref().unwrap(), msg2_id.as_ref().unwrap());
@@ -5521,12 +5473,14 @@ mod tests {
         let t = TestContext::new().await;
 
         // add two device-messages with the same label (second attempt is not added)
-        let mut msg1 = Message::new_text("first message".to_string());
+        let mut msg1 = Message::new(Viewtype::Text);
+        msg1.text = "first message".to_string();
         let msg1_id = add_device_msg(&t, Some("any-label"), Some(&mut msg1)).await;
         assert!(msg1_id.is_ok());
         assert!(!msg1_id.as_ref().unwrap().is_unset());
 
-        let mut msg2 = Message::new_text("second message".to_string());
+        let mut msg2 = Message::new(Viewtype::Text);
+        msg2.text = "second message".to_string();
         let msg2_id = add_device_msg(&t, Some("any-label"), Some(&mut msg2)).await;
         assert!(msg2_id.is_ok());
         assert!(msg2_id.as_ref().unwrap().is_unset());
@@ -5573,7 +5527,8 @@ mod tests {
         let res = add_device_msg(&t, Some("some-label"), None).await;
         assert!(res.is_ok());
 
-        let mut msg = Message::new_text("message text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("message text".to_string());
 
         let msg_id = add_device_msg(&t, Some("some-label"), Some(&mut msg)).await;
         assert!(msg_id.is_ok());
@@ -5590,7 +5545,8 @@ mod tests {
         add_device_msg(&t, Some("some-label"), None).await.ok();
         assert!(was_device_msg_ever_added(&t, "some-label").await.unwrap());
 
-        let mut msg = Message::new_text("message text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("message text".to_string());
         add_device_msg(&t, Some("another-label"), Some(&mut msg))
             .await
             .ok();
@@ -5607,7 +5563,8 @@ mod tests {
     async fn test_delete_device_chat() {
         let t = TestContext::new().await;
 
-        let mut msg = Message::new_text("message text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("message text".to_string());
         add_device_msg(&t, Some("some-label"), Some(&mut msg))
             .await
             .ok();
@@ -5630,7 +5587,8 @@ mod tests {
             .await
             .unwrap();
 
-        let mut msg = Message::new_text("message text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("message text".to_string());
         assert!(send_msg(&t, device_chat_id, &mut msg).await.is_err());
         assert!(prepare_msg(&t, device_chat_id, &mut msg).await.is_err());
 
@@ -5641,7 +5599,8 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_delete_and_reset_all_device_msgs() {
         let t = TestContext::new().await;
-        let mut msg = Message::new_text("message text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("message text".to_string());
         let msg_id1 = add_device_msg(&t, Some("some-label"), Some(&mut msg))
             .await
             .unwrap();
@@ -5673,7 +5632,8 @@ mod tests {
     async fn test_archive() {
         // create two chats
         let t = TestContext::new().await;
-        let mut msg = Message::new_text("foo".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foo".to_string());
         let msg_id = add_device_msg(&t, None, Some(&mut msg)).await.unwrap();
         let chat_id1 = message::Message::load_from_db(&t, msg_id)
             .await
@@ -5973,7 +5933,8 @@ mod tests {
         let t = TestContext::new().await;
 
         // create 3 chats, wait 1 second in between to get a reliable order (we order by time)
-        let mut msg = Message::new_text("foo".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foo".to_string());
         let msg_id = add_device_msg(&t, None, Some(&mut msg)).await.unwrap();
         let chat_id1 = message::Message::load_from_db(&t, msg_id)
             .await
@@ -6050,7 +6011,8 @@ mod tests {
             ChatVisibility::Pinned,
         );
 
-        let mut msg = Message::new_text("hi!".into());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi!".into());
         let sent_msg = bob.send_msg(bob_chat_id, &mut msg).await;
         let msg = alice.recv_msg(&sent_msg).await;
         assert_eq!(msg.chat_id, alice_chat_id);
@@ -6307,10 +6269,11 @@ mod tests {
         // Alice has an SMTP-server replacing the `Message-ID:`-header (as done eg. by outlook.com).
         let sent_msg = alice.pop_sent_msg().await;
         let msg = sent_msg.payload();
-        assert_eq!(msg.match_indices("Message-ID: <").count(), 2);
-        assert_eq!(msg.match_indices("References: <").count(), 1);
-        let msg = msg.replace("Message-ID: <", "Message-ID: <X.X");
-        assert_eq!(msg.match_indices("References: <").count(), 1);
+        assert_eq!(msg.match_indices("Message-ID: <Mr.").count(), 2);
+        assert_eq!(msg.match_indices("References: <Mr.").count(), 1);
+        let msg = msg.replace("Message-ID: <Mr.", "Message-ID: <XXX");
+        assert_eq!(msg.match_indices("Message-ID: <Mr.").count(), 0);
+        assert_eq!(msg.match_indices("References: <Mr.").count(), 1);
 
         // Bob receives this message, he may detect group by `References:`- or `Chat-Group:`-header
         receive_imf(&bob, msg.as_bytes(), false).await.unwrap();
@@ -6327,7 +6290,7 @@ mod tests {
         send_text_msg(&bob, bob_chat.id, "ho!".to_string()).await?;
         let sent_msg = bob.pop_sent_msg().await;
         let msg = sent_msg.payload();
-        let msg = msg.replace("Message-ID: <", "Message-ID: <X.X");
+        let msg = msg.replace("Message-ID: <Mr.", "Message-ID: <XXX");
         let msg = msg.replace("Chat-", "XXXX-");
         assert_eq!(msg.match_indices("Chat-").count(), 0);
 
@@ -6689,7 +6652,8 @@ mod tests {
         let alice_chat = alice.create_chat(&bob).await;
         let bob_chat = bob.create_chat(&alice).await;
 
-        let mut msg = Message::new_text("Hi Bob".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Hi Bob".to_owned());
         let sent_msg = alice.send_msg(alice_chat.get_id(), &mut msg).await;
         let msg = bob.recv_msg(&sent_msg).await;
 
@@ -6740,7 +6704,8 @@ mod tests {
         let received_msg = bob.recv_msg(&sent_msg).await;
 
         // Bob quotes received message and sends a reply to Alice.
-        let mut reply = Message::new_text("Reply".to_owned());
+        let mut reply = Message::new(Viewtype::Text);
+        reply.set_text("Reply".to_owned());
         reply.set_quote(&bob, Some(&received_msg)).await?;
         let sent_reply = bob.send_msg(bob_chat.id, &mut reply).await;
         let received_reply = alice.recv_msg(&sent_reply).await;
@@ -6823,7 +6788,8 @@ mod tests {
         let group_id =
             create_group_chat(&alice, ProtectionStatus::Unprotected, "secretgrpname").await?;
         add_contact_to_chat(&alice, group_id, bob_id).await?;
-        let mut msg = Message::new_text("bla foo".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("bla foo".to_owned());
         let sent_msg = alice.send_msg(group_id, &mut msg).await;
         assert!(sent_msg.payload().contains("secretgrpname"));
         assert!(sent_msg.payload().contains("secretname"));
@@ -6874,29 +6840,8 @@ mod tests {
         )
         .await?;
         let sent2 = alice.pop_sent_msg().await;
-        let resent_msg_id = sent1.sender_msg_id;
-        resend_msgs(&alice, &[resent_msg_id]).await?;
-        assert_eq!(
-            resent_msg_id.get_state(&alice).await?,
-            MessageState::OutPending
-        );
-        resend_msgs(&alice, &[resent_msg_id]).await?;
-        // Message can be re-sent multiple times.
-        assert_eq!(
-            resent_msg_id.get_state(&alice).await?,
-            MessageState::OutPending
-        );
-        alice.pop_sent_msg().await;
-        // There's still one more pending SMTP job.
-        assert_eq!(
-            resent_msg_id.get_state(&alice).await?,
-            MessageState::OutPending
-        );
+        resend_msgs(&alice, &[sent1.sender_msg_id]).await?;
         let sent3 = alice.pop_sent_msg().await;
-        assert_eq!(
-            resent_msg_id.get_state(&alice).await?,
-            MessageState::OutDelivered
-        );
 
         // Bob receives all messages
         let bob = TestContext::new_bob().await;
@@ -7693,29 +7638,4 @@ mod tests {
 
         Ok(())
     }
-
-    /// Tests that info message is ignored when constructing `In-Reply-To`.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_info_not_referenced() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let bob_received_message = tcm.send_recv_accept(alice, bob, "Hi!").await;
-        let bob_chat_id = bob_received_message.chat_id;
-        add_info_msg(bob, bob_chat_id, "Some info", create_smeared_timestamp(bob)).await?;
-
-        // Bob sends a message.
-        // This message should reference Alice's "Hi!" message and not the info message.
-        let sent = bob.send_text(bob_chat_id, "Hi hi!").await;
-        let mime_message = alice.parse_msg(&sent).await;
-
-        let in_reply_to = mime_message.get_header(HeaderDef::InReplyTo).unwrap();
-        assert_eq!(
-            in_reply_to,
-            format!("<{}>", bob_received_message.rfc724_mid)
-        );
-
-        Ok(())
-    }
 }

src/chatlist.rs

@@ -476,6 +476,7 @@ mod tests {
         add_contact_to_chat, create_group_chat, get_chat_contacts, remove_contact_from_chat,
         send_text_msg, ProtectionStatus,
     };
+    use crate::message::Viewtype;
     use crate::receive_imf::receive_imf;
     use crate::stock_str::StockMessage;
     use crate::test_utils::TestContext;
@@ -509,7 +510,8 @@ mod tests {
         // Instead of setting drafts for chat_id1 and chat_id3, we could also sleep
         // 2s here.
         for chat_id in &[chat_id1, chat_id3, chat_id2] {
-            let mut msg = Message::new_text("hello".to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text("hello".to_string());
             chat_id.set_draft(&t, Some(&mut msg)).await.unwrap();
         }
 
@@ -753,7 +755,8 @@ mod tests {
             .await
             .unwrap();
 
-        let mut msg = Message::new_text("foo:\nbar \r\n test".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foo:\nbar \r\n test".to_string());
         chat_id1.set_draft(&t, Some(&mut msg)).await.unwrap();
 
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();

src/config.rs

@@ -91,44 +91,21 @@ pub enum Config {
     /// Should not be extended in the future, create new config keys instead.
     ServerFlags,
 
-    /// True if proxy is enabled.
-    ///
-    /// Can be used to disable proxy without erasing known URLs.
-    ProxyEnabled,
-
-    /// Proxy URL.
-    ///
-    /// Supported URLs schemes are `http://` (HTTP), `https://` (HTTPS),
-    /// `socks5://` (SOCKS5) and `ss://` (Shadowsocks).
-    ///
-    /// May contain multiple URLs separated by newline, in which case the first one is used.
-    ProxyUrl,
-
     /// True if SOCKS5 is enabled.
     ///
     /// Can be used to disable SOCKS5 without erasing SOCKS5 configuration.
-    ///
-    /// Deprecated in favor of `ProxyEnabled`.
     Socks5Enabled,
 
     /// SOCKS5 proxy server hostname or address.
-    ///
-    /// Deprecated in favor of `ProxyUrl`.
     Socks5Host,
 
     /// SOCKS5 proxy server port.
-    ///
-    /// Deprecated in favor of `ProxyUrl`.
     Socks5Port,
 
     /// SOCKS5 proxy server username.
-    ///
-    /// Deprecated in favor of `ProxyUrl`.
     Socks5User,
 
     /// SOCKS5 proxy server password.
-    ///
-    /// Deprecated in favor of `ProxyUrl`.
     Socks5Password,
 
     /// Own name to use in the `From:` field when sending messages.
@@ -152,7 +129,6 @@ pub enum Config {
 
     /// True if Message Delivery Notifications (read receipts) should
     /// be sent and requested.
-    #[strum(props(default = "1"))]
     MdnsEnabled,
 
     /// True if "Sent" folder should be watched for changes.
@@ -197,12 +173,12 @@ pub enum Config {
     /// Timer in seconds after which the message is deleted from the
     /// server.
     ///
-    /// 0 means messages are never deleted by Delta Chat.
+    /// Equals to 0 by default, which means the message is never
+    /// deleted.
     ///
     /// Value 1 is treated as "delete at once": messages are deleted
     /// immediately, without moving to DeltaChat folder.
-    ///
-    /// Default is 1 for chatmail accounts before a backup export, 0 otherwise.
+    #[strum(props(default = "0"))]
     DeleteServerAfter,
 
     /// Timer in seconds after which the message is deleted from the
@@ -223,32 +199,21 @@ pub enum Config {
     /// The primary email address. Also see `SecondaryAddrs`.
     ConfiguredAddr,
 
-    /// List of configured IMAP servers as a JSON array.
-    ConfiguredImapServers,
-
     /// Configured IMAP server hostname.
-    ///
-    /// This is replaced by `configured_imap_servers` for new configurations.
     ConfiguredMailServer,
 
-    /// Configured IMAP server port.
-    ///
-    /// This is replaced by `configured_imap_servers` for new configurations.
-    ConfiguredMailPort,
-
-    /// Configured IMAP server security (e.g. TLS, STARTTLS).
-    ///
-    /// This is replaced by `configured_imap_servers` for new configurations.
-    ConfiguredMailSecurity,
-
     /// Configured IMAP server username.
-    ///
-    /// This is set if user has configured username manually.
     ConfiguredMailUser,
 
     /// Configured IMAP server password.
     ConfiguredMailPw,
 
+    /// Configured IMAP server port.
+    ConfiguredMailPort,
+
+    /// Configured IMAP server security (e.g. TLS, STARTTLS).
+    ConfiguredMailSecurity,
+
     /// Configured TLS certificate checks.
     /// This option is saved on successful configuration
     /// and should not be modified manually.
@@ -257,32 +222,18 @@ pub enum Config {
     /// but has "IMAP" in the name for backwards compatibility.
     ConfiguredImapCertificateChecks,
 
-    /// List of configured SMTP servers as a JSON array.
-    ConfiguredSmtpServers,
-
     /// Configured SMTP server hostname.
-    ///
-    /// This is replaced by `configured_smtp_servers` for new configurations.
     ConfiguredSendServer,
 
-    /// Configured SMTP server port.
-    ///
-    /// This is replaced by `configured_smtp_servers` for new configurations.
-    ConfiguredSendPort,
-
-    /// Configured SMTP server security (e.g. TLS, STARTTLS).
-    ///
-    /// This is replaced by `configured_smtp_servers` for new configurations.
-    ConfiguredSendSecurity,
-
     /// Configured SMTP server username.
-    ///
-    /// This is set if user has configured username manually.
     ConfiguredSendUser,
 
     /// Configured SMTP server password.
     ConfiguredSendPw,
 
+    /// Configured SMTP server port.
+    ConfiguredSendPort,
+
     /// Deprecated, stored for backwards compatibility.
     ///
     /// ConfiguredImapCertificateChecks is actually used.
@@ -291,6 +242,9 @@ pub enum Config {
     /// Whether OAuth 2 is used with configured provider.
     ConfiguredServerFlags,
 
+    /// Configured SMTP server security (e.g. TLS, STARTTLS).
+    ConfiguredSendSecurity,
+
     /// Configured folder for incoming messages.
     ConfiguredInboxFolder,
 
@@ -321,10 +275,6 @@ pub enum Config {
     /// True if account is muted.
     IsMuted,
 
-    /// Optional tag as "Work", "Family".
-    /// Meant to help profile owner to differ between profiles with similar names.
-    PrivateTag,
-
     /// All secondary self addresses separated by spaces
     /// (`addr1@example.org addr2@example.org addr3@example.org`)
     SecondaryAddrs,
@@ -433,7 +383,6 @@ pub enum Config {
     WebxdcIntegration,
 
     /// Enable webxdc realtime features.
-    #[strum(props(default = "1"))]
     WebxdcRealtimeEnabled,
 }
 
@@ -466,16 +415,13 @@ impl Config {
 }
 
 impl Context {
-    /// Returns true if configuration value is set in the db for the given key.
-    ///
-    /// NB: Don't use this to check if the key is configured because this doesn't look into
-    /// environment. The proper use of this function is e.g. checking a key before setting it.
-    pub(crate) async fn config_exists(&self, key: Config) -> Result<bool> {
+    /// Returns true if configuration value is set for the given key.
+    pub async fn config_exists(&self, key: Config) -> Result<bool> {
         Ok(self.sql.get_raw_config(key.as_ref()).await?.is_some())
     }
 
-    /// Get a config key value. Returns `None` if no value is set.
-    pub(crate) async fn get_config_opt(&self, key: Config) -> Result<Option<String>> {
+    /// 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));
@@ -495,38 +441,19 @@ impl Context {
             Config::SysConfigKeys => Some(get_config_keys_string()),
             _ => self.sql.get_raw_config(key.as_ref()).await?,
         };
-        Ok(value)
-    }
 
-    /// Get a config key value if set, or a default value. Returns `None` if no value exists.
-    pub async fn get_config(&self, key: Config) -> Result<Option<String>> {
-        let value = self.get_config_opt(key).await?;
         if value.is_some() {
             return Ok(value);
         }
 
         // Default values
-        let val = match key {
-            Config::ConfiguredInboxFolder => Some("INBOX"),
-            Config::DeleteServerAfter => match Box::pin(self.is_chatmail()).await? {
-                false => Some("0"),
-                true => Some("1"),
-            },
-            _ => key.get_str("default"),
-        };
-        Ok(val.map(|s| s.to_string()))
+        match key {
+            Config::ConfiguredInboxFolder => Ok(Some("INBOX".to_owned())),
+            _ => Ok(key.get_str("default").map(|s| s.to_string())),
+        }
     }
 
-    /// Returns Some(T) if a value for the given key is set and was successfully parsed.
-    /// Returns None if could not parse.
-    pub(crate) async fn get_config_opt_parsed<T: FromStr>(&self, key: Config) -> Result<Option<T>> {
-        self.get_config_opt(key)
-            .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()))
-    }
-
-    /// Returns Some(T) if a value for the given key exists (incl. default value) and was
-    /// successfully parsed.
+    /// Returns Some(T) if a value for the given key exists and was successfully parsed.
     /// Returns None if could not parse.
     pub async fn get_config_parsed<T: FromStr>(&self, key: Config) -> Result<Option<T>> {
         self.get_config(key)
@@ -554,21 +481,14 @@ impl Context {
         Ok(self.get_config_parsed(key).await?.unwrap_or_default())
     }
 
-    /// Returns boolean configuration value (if set) for the given key.
-    pub(crate) async fn get_config_bool_opt(&self, key: Config) -> Result<Option<bool>> {
-        Ok(self
-            .get_config_opt_parsed::<i32>(key)
-            .await?
-            .map(|x| x != 0))
+    /// Returns boolean configuration value (if any) for the given key.
+    pub async fn get_config_bool_opt(&self, key: Config) -> Result<Option<bool>> {
+        Ok(self.get_config_parsed::<i32>(key).await?.map(|x| x != 0))
     }
 
     /// Returns boolean configuration value for the given key.
     pub async fn get_config_bool(&self, key: Config) -> Result<bool> {
-        Ok(self
-            .get_config_parsed::<i32>(key)
-            .await?
-            .map(|x| x != 0)
-            .unwrap_or_default())
+        Ok(self.get_config_bool_opt(key).await?.unwrap_or_default())
     }
 
     /// Returns true if movebox ("DeltaChat" folder) should be watched.
@@ -594,12 +514,6 @@ impl Context {
             && !self.get_config_bool(Config::Bot).await?)
     }
 
-    /// Returns whether sync messages should be uploaded to the mvbox.
-    pub(crate) async fn should_move_sync_msgs(&self) -> Result<bool> {
-        Ok(self.get_config_bool(Config::MvboxMove).await?
-            || !self.get_config_bool(Config::IsChatmail).await?)
-    }
-
     /// Returns whether MDNs should be requested.
     pub(crate) async fn should_request_mdns(&self) -> Result<bool> {
         match self.get_config_bool_opt(Config::MdnsEnabled).await? {
@@ -610,7 +524,10 @@ impl Context {
 
     /// Returns whether MDNs should be sent.
     pub(crate) async fn should_send_mdns(&self) -> Result<bool> {
-        self.get_config_bool(Config::MdnsEnabled).await
+        Ok(self
+            .get_config_bool_opt(Config::MdnsEnabled)
+            .await?
+            .unwrap_or(true))
     }
 
     /// Gets configured "delete_server_after" value.
@@ -618,16 +535,11 @@ impl Context {
     /// `None` means never delete the message, `Some(0)` means delete
     /// at once, `Some(x)` means delete after `x` seconds.
     pub async fn get_config_delete_server_after(&self) -> Result<Option<i64>> {
-        let val = match self
-            .get_config_parsed::<i64>(Config::DeleteServerAfter)
-            .await?
-            .unwrap_or(0)
-        {
-            0 => None,
-            1 => Some(0),
-            x => Some(x),
-        };
-        Ok(val)
+        match self.get_config_int(Config::DeleteServerAfter).await? {
+            0 => Ok(None),
+            1 => Ok(Some(0)),
+            x => Ok(Some(i64::from(x))),
+        }
     }
 
     /// Gets the configured provider, as saved in the `configured_provider` value.
@@ -672,7 +584,6 @@ impl Context {
     fn check_config(key: Config, value: Option<&str>) -> Result<()> {
         match key {
             Config::Socks5Enabled
-            | Config::ProxyEnabled
             | Config::BccSelf
             | Config::E2eeEnabled
             | Config::MdnsEnabled
@@ -803,7 +714,7 @@ impl Context {
         {
             return Ok(());
         }
-        self.scheduler.interrupt_inbox().await;
+        self.scheduler.interrupt_smtp().await;
         Ok(())
     }
 
@@ -862,8 +773,6 @@ impl Context {
     ///
     /// This should only be used by test code and during configure.
     pub(crate) async fn set_primary_self_addr(&self, primary_new: &str) -> Result<()> {
-        self.quota.write().await.take();
-
         // add old primary address (if exists) to secondary addresses
         let mut secondary_addrs = self.get_all_self_addrs().await?;
         // never store a primary address also as a secondary
@@ -876,7 +785,7 @@ impl Context {
 
         self.set_config_internal(Config::ConfiguredAddr, Some(primary_new))
             .await?;
-        self.emit_event(EventType::ConnectivityChanged);
+
         Ok(())
     }
 
@@ -1075,15 +984,9 @@ mod tests {
         let t = &TestContext::new_alice().await;
         assert!(t.should_request_mdns().await?);
         assert!(t.should_send_mdns().await?);
-        assert!(t.get_config_bool_opt(Config::MdnsEnabled).await?.is_none());
-        // The setting should be displayed correctly.
-        assert!(t.get_config_bool(Config::MdnsEnabled).await?);
-
         t.set_config_bool(Config::Bot, true).await?;
         assert!(!t.should_request_mdns().await?);
         assert!(t.should_send_mdns().await?);
-        assert!(t.get_config_bool_opt(Config::MdnsEnabled).await?.is_none());
-        assert!(t.get_config_bool(Config::MdnsEnabled).await?);
         Ok(())
     }
 
@@ -1188,7 +1091,7 @@ mod tests {
         let status = "Synced via usual message";
         alice0.set_config(Config::Selfstatus, Some(status)).await?;
         alice0.send_sync_msg().await?;
-        alice0.pop_sent_sync_msg().await;
+        alice0.pop_sent_msg().await;
         let status1 = "Synced via sync message";
         alice1.set_config(Config::Selfstatus, Some(status1)).await?;
         tcm.send_recv(alice0, alice1, "hi Alice!").await;
@@ -1212,7 +1115,7 @@ mod tests {
             .set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
             .await?;
         alice0.send_sync_msg().await?;
-        alice0.pop_sent_sync_msg().await;
+        alice0.pop_sent_msg().await;
         let file = alice1.dir.path().join("avatar.jpg");
         let bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
         tokio::fs::write(&file, bytes).await?;

src/configure.rs

@@ -11,31 +11,28 @@
 
 mod auto_mozilla;
 mod auto_outlook;
-pub(crate) mod server_params;
+mod server_params;
 
-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, ensure, Context as _, Result};
 use auto_mozilla::moz_autoconfigure;
 use auto_outlook::outlk_autodiscover;
 use deltachat_contact_tools::EmailAddress;
 use futures::FutureExt;
 use futures_lite::FutureExt as _;
-use percent_encoding::utf8_percent_encode;
+use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use server_params::{expand_param_vector, ServerParams};
 use tokio::task;
 
 use crate::config::{self, Config};
-use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
-use crate::imap::Imap;
+use crate::imap::{session::Session as ImapSession, Imap};
 use crate::log::LogExt;
-use crate::login_param::{
-    ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
-    ConnectionCandidate, EnteredCertificateChecks, EnteredLoginParam,
-};
-use crate::message::Message;
+use crate::login_param::{LoginParam, ServerLoginParam};
+use crate::message::{Message, Viewtype};
 use crate::oauth2::get_oauth2_addr;
 use crate::provider::{Protocol, Socket, UsernamePattern};
 use crate::smtp::Smtp;
+use crate::socks::Socks5Config;
 use crate::stock_str;
 use crate::sync::Sync::*;
 use crate::tools::time;
@@ -81,7 +78,10 @@ impl Context {
 
         let res = self
             .inner_configure()
-            .race(cancel_channel.recv().map(|_| Err(format_err!("Cancelled"))))
+            .race(cancel_channel.recv().map(|_| {
+                progress!(self, 0);
+                Ok(())
+            }))
             .await;
 
         self.free_ongoing().await;
@@ -110,19 +110,25 @@ impl Context {
     async fn inner_configure(&self) -> Result<()> {
         info!(self, "Configure ...");
 
-        let param = EnteredLoginParam::load(self).await?;
+        let mut param = LoginParam::load_candidate_params(self).await?;
         let old_addr = self.get_config(Config::ConfiguredAddr).await?;
-        let configured_param = configure(self, &param).await?;
+
+        let success = configure(self, &mut param).await;
+        self.set_config_internal(Config::NotifyAboutWrongPw, None)
+            .await?;
+
+        on_configure_completed(self, param, old_addr).await?;
+
+        success?;
         self.set_config_internal(Config::NotifyAboutWrongPw, Some("1"))
             .await?;
-        on_configure_completed(self, configured_param, old_addr).await?;
         Ok(())
     }
 }
 
 async fn on_configure_completed(
     context: &Context,
-    param: ConfiguredLoginParam,
+    param: LoginParam,
     old_addr: Option<String>,
 ) -> Result<()> {
     if let Some(provider) = param.provider {
@@ -143,7 +149,8 @@ async fn on_configure_completed(
         }
 
         if !provider.after_login_hint.is_empty() {
-            let mut msg = Message::new_text(provider.after_login_hint.to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.text = provider.after_login_hint.to_string();
             if chat::add_device_msg(context, Some("core-provider-info"), Some(&mut msg))
                 .await
                 .is_err()
@@ -156,9 +163,9 @@ async fn on_configure_completed(
     if let Some(new_addr) = context.get_config(Config::ConfiguredAddr).await? {
         if let Some(old_addr) = old_addr {
             if !addr_cmp(&new_addr, &old_addr) {
-                let mut msg = Message::new_text(
-                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await,
-                );
+                let mut msg = Message::new(Viewtype::Text);
+                msg.text =
+                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await;
                 chat::add_device_msg(context, None, Some(&mut msg))
                     .await
                     .context("Cannot add AEAP explanation")
@@ -171,28 +178,19 @@ async fn on_configure_completed(
     Ok(())
 }
 
-/// Retrieves data from autoconfig and provider database
-/// to transform user-entered login parameters into complete configuration.
-async fn get_configured_param(
-    ctx: &Context,
-    param: &EnteredLoginParam,
-) -> Result<ConfiguredLoginParam> {
-    ensure!(!param.addr.is_empty(), "Missing email address.");
+async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
+    progress!(ctx, 1);
 
-    ensure!(!param.imap.password.is_empty(), "Missing (IMAP) password.");
+    let socks5_config = param.socks5_config.clone();
+    let socks5_enabled = socks5_config.is_some();
 
-    // SMTP password is an "advanced" setting. If unset, use the same password as for IMAP.
-    let smtp_password = if param.smtp.password.is_empty() {
-        param.imap.password.clone()
-    } else {
-        param.smtp.password.clone()
-    };
+    let ctx2 = ctx.clone();
+    let update_device_chats_handle = task::spawn(async move { ctx2.update_device_chats().await });
 
-    let proxy_config = param.proxy_config.clone();
-    let proxy_enabled = proxy_config.is_some();
+    // Step 1: Load the parameters and check email-address and password
 
-    let mut addr = param.addr.clone();
-    if param.oauth2 {
+    // OAuth is always set either for both IMAP and SMTP or not at all.
+    if param.imap.oauth2 {
         // the used oauth2 addr may differ, check this.
         // if get_oauth2_addr() is not available in the oauth2 implementation, just use the given one.
         progress!(ctx, 10);
@@ -201,7 +199,7 @@ async fn get_configured_param(
             .and_then(|e| e.parse().ok())
         {
             info!(ctx, "Authorized address is {}", oauth2_addr);
-            addr = oauth2_addr;
+            param.addr = oauth2_addr;
             ctx.sql
                 .set_raw_config("addr", Some(param.addr.as_str()))
                 .await?;
@@ -213,9 +211,9 @@ async fn get_configured_param(
     let parsed = EmailAddress::new(&param.addr).context("Bad email-address")?;
     let param_domain = parsed.domain;
 
+    // Step 2: Autoconfig
     progress!(ctx, 200);
 
-    let provider;
     let param_autoconfig;
     if param.imap.server.is_empty()
         && param.imap.port == 0
@@ -227,51 +225,63 @@ async fn get_configured_param(
         && param.smtp.user.is_empty()
     {
         // no advanced parameters entered by the user: query provider-database or do Autoconfig
+
         info!(
             ctx,
             "checking internal provider-info for offline autoconfig"
         );
 
-        provider = provider::get_provider_info(ctx, &param_domain, proxy_enabled).await;
-        if let Some(provider) = provider {
-            if provider.server.is_empty() {
-                info!(ctx, "Offline autoconfig found, but no servers defined.");
-                param_autoconfig = None;
-            } else {
-                info!(ctx, "Offline autoconfig found.");
-                let servers = provider
-                    .server
-                    .iter()
-                    .map(|s| ServerParams {
-                        protocol: s.protocol,
-                        socket: s.socket,
-                        hostname: s.hostname.to_string(),
-                        port: s.port,
-                        username: match s.username_pattern {
-                            UsernamePattern::Email => param.addr.to_string(),
-                            UsernamePattern::Emaillocalpart => {
-                                if let Some(at) = param.addr.find('@') {
-                                    param.addr.split_at(at).0.to_string()
-                                } else {
-                                    param.addr.to_string()
-                                }
-                            }
-                        },
-                    })
-                    .collect();
+        if let Some(provider) =
+            provider::get_provider_info(ctx, &param_domain, socks5_enabled).await
+        {
+            param.provider = Some(provider);
+            match provider.status {
+                provider::Status::Ok | provider::Status::Preparation => {
+                    if provider.server.is_empty() {
+                        info!(ctx, "offline autoconfig found, but no servers defined");
+                        param_autoconfig = None;
+                    } else {
+                        info!(ctx, "offline autoconfig found");
+                        let servers = provider
+                            .server
+                            .iter()
+                            .map(|s| ServerParams {
+                                protocol: s.protocol,
+                                socket: s.socket,
+                                hostname: s.hostname.to_string(),
+                                port: s.port,
+                                username: match s.username_pattern {
+                                    UsernamePattern::Email => param.addr.to_string(),
+                                    UsernamePattern::Emaillocalpart => {
+                                        if let Some(at) = param.addr.find('@') {
+                                            param.addr.split_at(at).0.to_string()
+                                        } else {
+                                            param.addr.to_string()
+                                        }
+                                    }
+                                },
+                            })
+                            .collect();
 
-                param_autoconfig = Some(servers)
+                        param_autoconfig = Some(servers)
+                    }
+                }
+                provider::Status::Broken => {
+                    info!(ctx, "offline autoconfig found, provider is broken");
+                    param_autoconfig = None;
+                }
             }
         } else {
             // Try receiving autoconfig
-            info!(ctx, "No offline autoconfig found.");
+            info!(ctx, "no offline autoconfig found");
             param_autoconfig = get_autoconfig(ctx, param, &param_domain).await;
         }
     } else {
-        provider = None;
         param_autoconfig = None;
     }
 
+    let strict_tls = param.strict_tls();
+
     progress!(ctx, 500);
 
     let mut servers = param_autoconfig.unwrap_or_default();
@@ -302,126 +312,107 @@ async fn get_configured_param(
 
     let servers = expand_param_vector(servers, &param.addr, &param_domain);
 
-    let configured_login_param = ConfiguredLoginParam {
-        addr,
-        imap: servers
-            .iter()
-            .filter_map(|params| {
-                let Ok(security) = params.socket.try_into() else {
-                    return None;
-                };
-                if params.protocol == Protocol::Imap {
-                    Some(ConfiguredServerLoginParam {
-                        connection: ConnectionCandidate {
-                            host: params.hostname.clone(),
-                            port: params.port,
-                            security,
-                        },
-                        user: params.username.clone(),
-                    })
-                } else {
-                    None
-                }
-            })
-            .collect(),
-        imap_user: param.imap.user.clone(),
-        imap_password: param.imap.password.clone(),
-        smtp: servers
-            .iter()
-            .filter_map(|params| {
-                let Ok(security) = params.socket.try_into() else {
-                    return None;
-                };
-                if params.protocol == Protocol::Smtp {
-                    Some(ConfiguredServerLoginParam {
-                        connection: ConnectionCandidate {
-                            host: params.hostname.clone(),
-                            port: params.port,
-                            security,
-                        },
-                        user: params.username.clone(),
-                    })
-                } else {
-                    None
-                }
-            })
-            .collect(),
-        smtp_user: param.smtp.user.clone(),
-        smtp_password,
-        proxy_config: param.proxy_config.clone(),
-        provider,
-        certificate_checks: match param.certificate_checks {
-            EnteredCertificateChecks::Automatic => ConfiguredCertificateChecks::Automatic,
-            EnteredCertificateChecks::Strict => ConfiguredCertificateChecks::Strict,
-            EnteredCertificateChecks::AcceptInvalidCertificates
-            | EnteredCertificateChecks::AcceptInvalidCertificates2 => {
-                ConfiguredCertificateChecks::AcceptInvalidCertificates
-            }
-        },
-        oauth2: param.oauth2,
-    };
-    Ok(configured_login_param)
-}
-
-async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<ConfiguredLoginParam> {
-    progress!(ctx, 1);
-
-    let ctx2 = ctx.clone();
-    let update_device_chats_handle = task::spawn(async move { ctx2.update_device_chats().await });
-
-    let configured_param = get_configured_param(ctx, param).await?;
-    let strict_tls = configured_param.strict_tls();
-
     progress!(ctx, 550);
 
     // Spawn SMTP configuration task
-    // to try SMTP while connecting to IMAP.
+    let mut smtp = Smtp::new();
+
     let context_smtp = ctx.clone();
-    let smtp_param = configured_param.smtp.clone();
-    let smtp_password = configured_param.smtp_password.clone();
-    let smtp_addr = configured_param.addr.clone();
-    let proxy_config = configured_param.proxy_config.clone();
+    let mut smtp_param = param.smtp.clone();
+    let smtp_addr = param.addr.clone();
+    let smtp_servers: Vec<ServerParams> = servers
+        .iter()
+        .filter(|params| params.protocol == Protocol::Smtp)
+        .cloned()
+        .collect();
 
     let smtp_config_task = task::spawn(async move {
-        let mut smtp = Smtp::new();
-        smtp.connect(
-            &context_smtp,
-            &smtp_param,
-            &smtp_password,
-            &proxy_config,
-            &smtp_addr,
-            strict_tls,
-            configured_param.oauth2,
-        )
-        .await?;
+        let mut smtp_configured = false;
+        let mut errors = Vec::new();
+        for smtp_server in smtp_servers {
+            smtp_param.user.clone_from(&smtp_server.username);
+            smtp_param.server.clone_from(&smtp_server.hostname);
+            smtp_param.port = smtp_server.port;
+            smtp_param.security = smtp_server.socket;
 
-        Ok::<(), anyhow::Error>(())
+            match try_smtp_one_param(
+                &context_smtp,
+                &smtp_param,
+                &socks5_config,
+                &smtp_addr,
+                strict_tls,
+                &mut smtp,
+            )
+            .await
+            {
+                Ok(_) => {
+                    smtp_configured = true;
+                    break;
+                }
+                Err(e) => errors.push(e),
+            }
+        }
+
+        if smtp_configured {
+            Ok(smtp_param)
+        } else {
+            Err(errors)
+        }
     });
 
     progress!(ctx, 600);
 
     // Configure IMAP
 
-    let (_s, r) = async_channel::bounded(1);
-    let mut imap = Imap::new(
-        configured_param.imap.clone(),
-        configured_param.imap_password.clone(),
-        configured_param.proxy_config.clone(),
-        &configured_param.addr,
-        strict_tls,
-        configured_param.oauth2,
-        r,
-    );
-    let configuring = true;
-    let mut imap_session = match imap.connect(ctx, configuring).await {
-        Ok(session) => session,
-        Err(err) => bail!("{}", nicer_configuration_error(ctx, err.to_string()).await),
+    let mut imap: Option<(Imap, ImapSession)> = None;
+    let imap_servers: Vec<&ServerParams> = servers
+        .iter()
+        .filter(|params| params.protocol == Protocol::Imap)
+        .collect();
+    let imap_servers_count = imap_servers.len();
+    let mut errors = Vec::new();
+    for (imap_server_index, imap_server) in imap_servers.into_iter().enumerate() {
+        param.imap.user.clone_from(&imap_server.username);
+        param.imap.server.clone_from(&imap_server.hostname);
+        param.imap.port = imap_server.port;
+        param.imap.security = imap_server.socket;
+
+        match try_imap_one_param(
+            ctx,
+            &param.imap,
+            &param.socks5_config,
+            &param.addr,
+            strict_tls,
+        )
+        .await
+        {
+            Ok(configured_imap) => {
+                imap = Some(configured_imap);
+                break;
+            }
+            Err(e) => errors.push(e),
+        }
+        progress!(
+            ctx,
+            600 + (800 - 600) * (1 + imap_server_index) / imap_servers_count
+        );
+    }
+    let (mut imap, mut imap_session) = match imap {
+        Some(imap) => imap,
+        None => bail!(nicer_configuration_error(ctx, errors).await),
     };
 
     progress!(ctx, 850);
 
     // Wait for SMTP configuration
-    smtp_config_task.await.unwrap()?;
+    match smtp_config_task.await.unwrap() {
+        Ok(smtp_param) => {
+            param.smtp = smtp_param;
+        }
+        Err(errors) => {
+            bail!(nicer_configuration_error(ctx, errors).await);
+        }
+    }
 
     progress!(ctx, 900);
 
@@ -469,7 +460,8 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
         }
     }
 
-    configured_param.save_as_configured_params(ctx).await?;
+    // the trailing underscore is correct
+    param.save_as_configured_params(ctx).await?;
     ctx.set_config_internal(Config::ConfiguredTimestamp, Some(&time().to_string()))
         .await?;
 
@@ -487,7 +479,7 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
 
     ctx.sql.set_raw_config_bool("configured", true).await?;
 
-    Ok(configured_param)
+    Ok(())
 }
 
 /// Retrieve available autoconfigurations.
@@ -496,18 +488,10 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
 /// B. If we have no configuration yet, search configuration in Thunderbird's central database
 async fn get_autoconfig(
     ctx: &Context,
-    param: &EnteredLoginParam,
+    param: &LoginParam,
     param_domain: &str,
 ) -> Option<Vec<ServerParams>> {
-    // Make sure to not encode `.` as `%2E` here.
-    // Some servers like murena.io on 2024-11-01 produce incorrect autoconfig XML
-    // when address is encoded.
-    // E.g.
-    // <https://autoconfig.murena.io/mail/config-v1.1.xml?emailaddress=foobar%40example%2Eorg>
-    // produced XML file with `<username>foobar@example%2Eorg</username>`
-    // resulting in failure to log in.
-    let param_addr_urlencoded =
-        utf8_percent_encode(&param.addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
+    let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
 
     if let Ok(res) = moz_autoconfigure(
         ctx,
@@ -575,19 +559,140 @@ async fn get_autoconfig(
     None
 }
 
-async fn nicer_configuration_error(context: &Context, e: String) -> String {
-    if e.to_lowercase().contains("could not resolve")
-        || e.to_lowercase().contains("connection attempts")
-        || e.to_lowercase()
-            .contains("temporary failure in name resolution")
-        || e.to_lowercase().contains("name or service not known")
-        || e.to_lowercase()
-            .contains("failed to lookup address information")
+async fn try_imap_one_param(
+    context: &Context,
+    param: &ServerLoginParam,
+    socks5_config: &Option<Socks5Config>,
+    addr: &str,
+    strict_tls: bool,
+) -> Result<(Imap, ImapSession), ConfigurationError> {
+    let inf = format!(
+        "imap: {}@{}:{} security={} strict_tls={} oauth2={} socks5_config={}",
+        param.user,
+        param.server,
+        param.port,
+        param.security,
+        strict_tls,
+        param.oauth2,
+        if let Some(socks5_config) = socks5_config {
+            socks5_config.to_string()
+        } else {
+            "None".to_string()
+        }
+    );
+    info!(context, "Trying: {}", inf);
+
+    let (_s, r) = async_channel::bounded(1);
+
+    let mut imap = match Imap::new(param, socks5_config.clone(), addr, strict_tls, r) {
+        Err(err) => {
+            info!(context, "failure: {:#}", err);
+            return Err(ConfigurationError {
+                config: inf,
+                msg: format!("{err:#}"),
+            });
+        }
+        Ok(imap) => imap,
+    };
+
+    match imap.connect(context).await {
+        Err(err) => {
+            info!(context, "IMAP failure: {err:#}.");
+            Err(ConfigurationError {
+                config: inf,
+                msg: format!("{err:#}"),
+            })
+        }
+        Ok(session) => {
+            info!(context, "IMAP success: {inf}.");
+            Ok((imap, session))
+        }
+    }
+}
+
+async fn try_smtp_one_param(
+    context: &Context,
+    param: &ServerLoginParam,
+    socks5_config: &Option<Socks5Config>,
+    addr: &str,
+    strict_tls: bool,
+    smtp: &mut Smtp,
+) -> Result<(), ConfigurationError> {
+    let inf = format!(
+        "smtp: {}@{}:{} security={} strict_tls={} oauth2={} socks5_config={}",
+        param.user,
+        param.server,
+        param.port,
+        param.security,
+        strict_tls,
+        param.oauth2,
+        if let Some(socks5_config) = socks5_config {
+            socks5_config.to_string()
+        } else {
+            "None".to_string()
+        }
+    );
+    info!(context, "Trying: {}", inf);
+
+    if let Err(err) = smtp
+        .connect(context, param, socks5_config, addr, strict_tls)
+        .await
     {
+        info!(context, "SMTP failure: {err:#}.");
+        Err(ConfigurationError {
+            config: inf,
+            msg: format!("{err:#}"),
+        })
+    } else {
+        info!(context, "SMTP success: {inf}.");
+        smtp.disconnect();
+        Ok(())
+    }
+}
+
+/// Failure to connect and login with email client configuration.
+#[derive(Debug, thiserror::Error)]
+#[error("Trying {config}…\nError: {msg}")]
+pub struct ConfigurationError {
+    /// Tried configuration description.
+    config: String,
+
+    /// Error message.
+    msg: String,
+}
+
+async fn nicer_configuration_error(context: &Context, errors: Vec<ConfigurationError>) -> String {
+    let first_err = if let Some(f) = errors.first() {
+        f
+    } else {
+        // This means configuration failed but no errors have been captured. This should never
+        // happen, but if it does, the user will see classic "Error: no error".
+        return "no error".to_string();
+    };
+
+    if errors.iter().all(|e| {
+        e.msg.to_lowercase().contains("could not resolve")
+            || e.msg.to_lowercase().contains("no dns resolution results")
+            || e.msg
+                .to_lowercase()
+                .contains("temporary failure in name resolution")
+            || e.msg.to_lowercase().contains("name or service not known")
+            || e.msg
+                .to_lowercase()
+                .contains("failed to lookup address information")
+    }) {
         return stock_str::error_no_network(context).await;
     }
 
-    e
+    if errors.iter().all(|e| e.msg == first_err.msg) {
+        return first_err.msg.to_string();
+    }
+
+    errors
+        .iter()
+        .map(|e| e.to_string())
+        .collect::<Vec<String>>()
+        .join("\n\n")
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -613,9 +718,7 @@ pub enum Error {
 mod tests {
     #![allow(clippy::indexing_slicing)]
 
-    use super::*;
     use crate::config::Config;
-    use crate::login_param::EnteredServerLoginParam;
     use crate::test_utils::TestContext;
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -627,24 +730,4 @@ mod tests {
         t.set_config(Config::MailPw, Some("123456")).await.unwrap();
         assert!(t.configure().await.is_err());
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_get_configured_param() -> Result<()> {
-        let t = &TestContext::new().await;
-        let entered_param = EnteredLoginParam {
-            addr: "alice@example.org".to_string(),
-
-            imap: EnteredServerLoginParam {
-                user: "alice@example.net".to_string(),
-                password: "foobar".to_string(),
-                ..Default::default()
-            },
-
-            ..Default::default()
-        };
-        let configured_param = get_configured_param(t, &entered_param).await?;
-        assert_eq!(configured_param.imap_user, "alice@example.net");
-        assert_eq!(configured_param.smtp_user, "");
-        Ok(())
-    }
 }

src/constants.rs

@@ -4,16 +4,12 @@
 
 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
-use percent_encoding::{AsciiSet, NON_ALPHANUMERIC};
 use serde::{Deserialize, Serialize};
 
 use crate::chat::ChatId;
 
 pub static DC_VERSION_STR: Lazy<String> = Lazy::new(|| env!("CARGO_PKG_VERSION").to_string());
 
-/// Set of characters to percent-encode in email addresses and names.
-pub(crate) const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
-
 #[derive(
     Debug,
     Default,
@@ -183,9 +179,7 @@ pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEX
 // and may be set together with the username, password etc.
 // via dc_set_config() using the key "server_flags".
 
-/// Force OAuth2 authorization.
-///
-/// This flag does not skip automatic configuration.
+/// Force OAuth2 authorization. This flag does not skip automatic configuration.
 /// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: i32 = 0x2;

src/contact.rs

@@ -30,6 +30,7 @@ use crate::context::Context;
 use crate::events::EventType;
 use crate::key::{load_self_public_key, DcKey, SignedPublicKey};
 use crate::log::LogExt;
+use crate::login_param::LoginParam;
 use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
@@ -425,12 +426,9 @@ pub enum Origin {
     /// To: of incoming messages of unknown sender
     IncomingUnknownTo = 0x40,
 
-    /// Address scanned but not verified.
+    /// address scanned but not verified
     UnhandledQrScan = 0x80,
 
-    /// Address scanned from a SecureJoin QR code, but not verified yet.
-    UnhandledSecurejoinQrScan = 0x81,
-
     /// Reply-To: of incoming message of known sender
     /// Contacts with at least this origin value are shown in the contact list.
     IncomingReplyTo = 0x100,
@@ -1193,10 +1191,7 @@ impl Contact {
         );
 
         let contact = Contact::get_by_id(context, contact_id).await?;
-        let addr = context
-            .get_config(Config::ConfiguredAddr)
-            .await?
-            .unwrap_or_default();
+        let loginparam = LoginParam::load_configured_params(context).await?;
         let peerstate = Peerstate::from_addr(context, &contact.addr).await?;
 
         let Some(peerstate) = peerstate.filter(|peerstate| peerstate.peek_key(false).is_some())
@@ -1225,8 +1220,8 @@ impl Contact {
             .peek_key(false)
             .map(|k| k.fingerprint().to_string())
             .unwrap_or_default();
-        if addr < peerstate.addr {
-            cat_fingerprint(&mut ret, &addr, &fingerprint_self, "");
+        if loginparam.addr < peerstate.addr {
+            cat_fingerprint(&mut ret, &loginparam.addr, &fingerprint_self, "");
             cat_fingerprint(
                 &mut ret,
                 &peerstate.addr,
@@ -1240,7 +1235,7 @@ impl Contact {
                 &fingerprint_other_verified,
                 &fingerprint_other_unverified,
             );
-            cat_fingerprint(&mut ret, &addr, &fingerprint_self, "");
+            cat_fingerprint(&mut ret, &loginparam.addr, &fingerprint_self, "");
         }
 
         Ok(ret)
@@ -2893,7 +2888,7 @@ Hi."#;
         bob.recv_msg(&sent_msg).await;
         let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?;
 
-        let green = nu_ansi_term::Color::Green.normal();
+        let green = ansi_term::Color::Green.normal();
         assert!(
             contact.was_seen_recently(),
             "{}",

src/context.rs

@@ -27,8 +27,8 @@ use crate::download::DownloadState;
 use crate::events::{Event, EventEmitter, EventType, Events};
 use crate::imap::{FolderMeaning, Imap, ServerMetadata};
 use crate::key::{load_self_public_key, load_self_secret_key, DcKey as _};
-use crate::login_param::{ConfiguredLoginParam, EnteredLoginParam};
-use crate::message::{self, Message, MessageState, MsgId};
+use crate::login_param::LoginParam;
+use crate::message::{self, Message, MessageState, MsgId, Viewtype};
 use crate::param::{Param, Params};
 use crate::peer_channels::Iroh;
 use crate::peerstate::Peerstate;
@@ -515,11 +515,8 @@ impl Context {
         Ok(val)
     }
 
-    /// Does a single round of fetching from IMAP and returns.
-    ///
-    /// Can be used even if I/O is currently stopped.
-    /// If I/O is currently stopped, starts a new IMAP connection
-    /// and fetches from Inbox and DeltaChat folders.
+    /// Does a background fetch
+    /// pauses the scheduler and does one imap fetch, then unpauses and returns
     pub async fn background_fetch(&self) -> Result<()> {
         if !(self.is_configured().await?) {
             return Ok(());
@@ -527,63 +524,35 @@ impl Context {
 
         let address = self.get_primary_self_addr().await?;
         let time_start = tools::Time::now();
-        info!(self, "background_fetch started fetching {address}.");
+        info!(self, "background_fetch started fetching {address}");
 
-        if self.scheduler.is_running().await {
-            self.scheduler.maybe_network().await;
+        let _pause_guard = self.scheduler.pause(self.clone()).await?;
 
-            // Wait until fetching is finished.
-            // Ideally we could wait for connectivity change events,
-            // but sleep loop is good enough.
+        // connection
+        let mut connection = Imap::new_configured(self, channel::bounded(1).1).await?;
+        let mut session = connection.prepare(self).await?;
 
-            // First 100 ms sleep in chunks of 10 ms.
-            for _ in 0..10 {
-                if self.all_work_done().await {
-                    break;
-                }
-                tokio::time::sleep(std::time::Duration::from_millis(10)).await;
-            }
+        // fetch imap folders
+        for folder_meaning in [FolderMeaning::Inbox, FolderMeaning::Mvbox] {
+            let (_, watch_folder) = convert_folder_meaning(self, folder_meaning).await?;
+            connection
+                .fetch_move_delete(self, &mut session, &watch_folder, folder_meaning)
+                .await?;
+        }
 
-            // If we are not finished in 100 ms, keep waking up every 100 ms.
-            while !self.all_work_done().await {
-                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-            }
-        } else {
-            // Pause the scheduler to ensure another connection does not start
-            // while we are fetching on a dedicated connection.
-            let _pause_guard = self.scheduler.pause(self.clone()).await?;
-
-            // Start a new dedicated connection.
-            let mut connection = Imap::new_configured(self, channel::bounded(1).1).await?;
-            let mut session = connection.prepare(self).await?;
-
-            // Fetch IMAP folders.
-            // Inbox is fetched before Mvbox because fetching from Inbox
-            // may result in moving some messages to Mvbox.
-            for folder_meaning in [FolderMeaning::Inbox, FolderMeaning::Mvbox] {
-                if let Some((_folder_config, watch_folder)) =
-                    convert_folder_meaning(self, folder_meaning).await?
-                {
-                    connection
-                        .fetch_move_delete(self, &mut session, &watch_folder, folder_meaning)
-                        .await?;
-                }
-            }
-
-            // Update quota (to send warning if full) - but only check it once in a while.
-            if self
-                .quota_needs_update(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
-                .await
-            {
-                if let Err(err) = self.update_recent_quota(&mut session).await {
-                    warn!(self, "Failed to update quota: {err:#}.");
-                }
+        // update quota (to send warning if full) - but only check it once in a while
+        if self
+            .quota_needs_update(DC_BACKGROUND_FETCH_QUOTA_CHECK_RATELIMIT)
+            .await
+        {
+            if let Err(err) = self.update_recent_quota(&mut session).await {
+                warn!(self, "Failed to update quota: {err:#}.");
             }
         }
 
         info!(
             self,
-            "background_fetch done for {address} took {:?}.",
+            "background_fetch done for {address} took {:?}",
             time_elapsed(&time_start),
         );
 
@@ -746,10 +715,8 @@ impl Context {
     /// Returns information about the context as key-value pairs.
     pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
         let unset = "0";
-        let l = EnteredLoginParam::load(self).await?;
-        let l2 = ConfiguredLoginParam::load(self)
-            .await?
-            .map_or_else(|| "Not configured".to_string(), |param| param.to_string());
+        let l = LoginParam::load_candidate_params_unchecked(self).await?;
+        let l2 = LoginParam::load_configured_params(self).await?;
         let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
         let displayname = self.get_config(Config::Displayname).await?;
         let chats = get_chat_cnt(self).await?;
@@ -757,7 +724,7 @@ impl Context {
         let request_msgs = message::get_request_msg_cnt(self).await;
         let contacts = Contact::get_real_cnt(self).await?;
         let is_configured = self.get_config_int(Config::Configured).await?;
-        let proxy_enabled = self.get_config_int(Config::ProxyEnabled).await?;
+        let socks5_enabled = self.get_config_int(Config::Socks5Enabled).await?;
         let dbversion = self
             .sql
             .get_raw_config_int("dbversion")
@@ -838,9 +805,9 @@ impl Context {
                 .unwrap_or_else(|| "<unset>".to_string()),
         );
         res.insert("is_configured", is_configured.to_string());
-        res.insert("proxy_enabled", proxy_enabled.to_string());
+        res.insert("socks5_enabled", socks5_enabled.to_string());
         res.insert("entered_account_settings", l.to_string());
-        res.insert("used_account_settings", l2);
+        res.insert("used_account_settings", l2.to_string());
 
         if let Some(server_id) = &*self.server_id.read().await {
             res.insert("imap_server_id", format!("{server_id:?}"));
@@ -857,12 +824,6 @@ impl Context {
             "is_muted",
             self.get_config_bool(Config::IsMuted).await?.to_string(),
         );
-        res.insert(
-            "private_tag",
-            self.get_config(Config::PrivateTag)
-                .await?
-                .unwrap_or_else(|| "<unset>".to_string()),
-        );
 
         if let Some(metadata) = &*self.metadata.read().await {
             if let Some(comment) = &metadata.comment {
@@ -1178,7 +1139,8 @@ impl Context {
             .set_protection(self, ProtectionStatus::Protected, time(), Some(contact_id))
             .await?;
 
-        let mut msg = Message::new_text(self.get_self_report().await?);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = self.get_self_report().await?;
 
         chat_id.set_draft(self, Some(&mut msg)).await?;
 
@@ -1303,12 +1265,6 @@ impl Context {
     ///
     /// If `chat_id` is provided this searches only for messages in this chat, if `chat_id`
     /// is `None` this searches messages from all chats.
-    ///
-    /// NB: Wrt the search in long messages which are shown truncated with the "Show Full Message…"
-    /// button, we only look at the first several kilobytes. Let's not fix this -- one can send a
-    /// dictionary in the message that matches any reasonable search request, but the user won't see
-    /// the match because they should tap on "Show Full Message…" for that. Probably such messages
-    /// would only clutter search results.
     pub async fn search_msgs(&self, chat_id: Option<ChatId>, query: &str) -> Result<Vec<MsgId>> {
         let real_query = query.trim().to_lowercase();
         if real_query.is_empty() {
@@ -1735,8 +1691,6 @@ mod tests {
             "server_flags",
             "skip_start_messages",
             "smtp_certificate_checks",
-            "proxy_url",      // May contain passwords, don't leak it to the logs.
-            "socks5_enabled", // SOCKS5 options are deprecated.
             "socks5_host",
             "socks5_port",
             "socks5_user",
@@ -1777,10 +1731,12 @@ mod tests {
         assert!(res.is_empty());
 
         // Add messages to chat with Bob.
-        let mut msg1 = Message::new_text("foobar".to_string());
+        let mut msg1 = Message::new(Viewtype::Text);
+        msg1.set_text("foobar".to_string());
         send_msg(&alice, chat.id, &mut msg1).await?;
 
-        let mut msg2 = Message::new_text("barbaz".to_string());
+        let mut msg2 = Message::new(Viewtype::Text);
+        msg2.set_text("barbaz".to_string());
         send_msg(&alice, chat.id, &mut msg2).await?;
 
         alice.send_text(chat.id, "Δ-Chat").await;
@@ -1883,7 +1839,8 @@ mod tests {
             .await;
 
         // Add 999 messages
-        let mut msg = Message::new_text("foobar".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foobar".to_string());
         for _ in 0..999 {
             send_msg(&alice, chat.id, &mut msg).await?;
         }

src/decrypt.rs

@@ -313,7 +313,7 @@ pub(crate) async fn get_autocrypt_peerstate(
         if let Some(ref mut peerstate) = peerstate {
             if addr_cmp(&peerstate.addr, from) {
                 if allow_change {
-                    peerstate.apply_header(context, header, message_time);
+                    peerstate.apply_header(header, message_time);
                     peerstate.save_to_db(&context.sql).await?;
                 } else {
                     info!(

src/download.rs

@@ -98,26 +98,19 @@ impl MsgId {
         Ok(())
     }
 
-    /// Updates the message download state. Returns `Ok` if the message doesn't exist anymore.
     pub(crate) async fn update_download_state(
         self,
         context: &Context,
         download_state: DownloadState,
     ) -> Result<()> {
-        if context
+        let msg = Message::load_from_db(context, self).await?;
+        context
             .sql
             .execute(
                 "UPDATE msgs SET download_state=? WHERE id=?;",
                 (download_state, self),
             )
-            .await?
-            == 0
-        {
-            return Ok(());
-        }
-        let Some(msg) = Message::load_from_db_optional(context, self).await? else {
-            return Ok(());
-        };
+            .await?;
         context.emit_event(EventType::MsgsChanged {
             chat_id: msg.chat_id,
             msg_id: self,
@@ -142,17 +135,7 @@ pub(crate) async fn download_msg(
     msg_id: MsgId,
     session: &mut Session,
 ) -> Result<()> {
-    let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
-        // If partially downloaded message was already deleted
-        // we do not know its Message-ID anymore
-        // so cannot download it.
-        //
-        // Probably the message expired due to `delete_device_after`
-        // setting or was otherwise removed from the device,
-        // so we don't want it to reappear anyway.
-        return Ok(());
-    };
-
+    let msg = Message::load_from_db(context, msg_id).await?;
     let row = context
         .sql
         .query_row_optional(
@@ -318,7 +301,8 @@ mod tests {
         let t = TestContext::new_alice().await;
         let chat = t.create_chat_with_contact("Bob", "bob@example.org").await;
 
-        let mut msg = Message::new_text("Hi Bob".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Hi Bob".to_owned());
         let msg_id = send_msg(&t, chat.id, &mut msg).await?;
         let msg = Message::load_from_db(&t, msg_id).await?;
         assert_eq!(msg.download_state(), DownloadState::Done);
@@ -328,19 +312,11 @@ mod tests {
             DownloadState::InProgress,
             DownloadState::Failure,
             DownloadState::Done,
-            DownloadState::Done,
         ] {
             msg_id.update_download_state(&t, *s).await?;
             let msg = Message::load_from_db(&t, msg_id).await?;
             assert_eq!(msg.download_state(), *s);
         }
-        t.sql
-            .execute("DELETE FROM msgs WHERE id=?", (msg_id,))
-            .await?;
-        // Nothing to do is ok.
-        msg_id
-            .update_download_state(&t, DownloadState::Done)
-            .await?;
 
         Ok(())
     }

src/ephemeral.rs

@@ -69,7 +69,7 @@ use std::num::ParseIntError;
 use std::str::FromStr;
 use std::time::{Duration, UNIX_EPOCH};
 
-use anyhow::{ensure, Context as _, Result};
+use anyhow::{ensure, Result};
 use async_channel::Receiver;
 use serde::{Deserialize, Serialize};
 use tokio::time::timeout;
@@ -176,13 +176,9 @@ impl ChatId {
     pub async fn get_ephemeral_timer(self, context: &Context) -> Result<Timer> {
         let timer = context
             .sql
-            .query_get_value(
-                "SELECT IFNULL(ephemeral_timer, 0) FROM chats WHERE id=?",
-                (self,),
-            )
-            .await?
-            .with_context(|| format!("Chat {self} not found"))?;
-        Ok(timer)
+            .query_get_value("SELECT ephemeral_timer FROM chats WHERE id=?;", (self,))
+            .await?;
+        Ok(timer.unwrap_or_default())
     }
 
     /// Set ephemeral timer value without sending a message.
@@ -223,9 +219,8 @@ impl ChatId {
         self.inner_set_ephemeral_timer(context, timer).await?;
 
         if self.is_promoted(context).await? {
-            let mut msg = Message::new_text(
-                stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await,
-            );
+            let mut msg = Message::new(Viewtype::Text);
+            msg.text = stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await;
             msg.param.set_cmd(SystemMessage::EphemeralTimerChanged);
             if let Err(err) = send_msg(context, self, &mut msg).await {
                 error!(
@@ -514,8 +509,7 @@ async fn next_delete_device_after_timestamp(context: &Context) -> Result<Option<
                 FROM msgs
                 WHERE chat_id > ?
                   AND chat_id != ?
-                  AND chat_id != ?
-                HAVING count(*) > 0
+                  AND chat_id != ?;
                 "#,
                 (DC_CHAT_ID_TRASH, self_chat_id, device_chat_id),
             )
@@ -539,8 +533,7 @@ async fn next_expiration_timestamp(context: &Context) -> Option<i64> {
             SELECT min(ephemeral_timestamp)
             FROM msgs
             WHERE ephemeral_timestamp != 0
-              AND chat_id != ?
-            HAVING count(*) > 0
+              AND chat_id != ?;
             "#,
             (DC_CHAT_ID_TRASH,), // Trash contains already deleted messages, skip them
         )
@@ -1363,7 +1356,8 @@ mod tests {
         chat.id
             .set_ephemeral_timer(&alice, Timer::Enabled { duration })
             .await?;
-        let mut msg = Message::new_text("hi".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi".to_string());
         assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
             .await
             .is_err());
@@ -1393,7 +1387,8 @@ mod tests {
         let sent = alice.pop_sent_msg().await;
         bob.recv_msg(&sent).await;
 
-        let mut poi_msg = Message::new_text("Here".to_string());
+        let mut poi_msg = Message::new(Viewtype::Text);
+        poi_msg.text = "Here".to_string();
         poi_msg.set_location(10.0, 20.0);
 
         let alice_sent_message = alice.send_msg(chat.id, &mut poi_msg).await;
@@ -1415,14 +1410,4 @@ mod tests {
 
         Ok(())
     }
-
-    /// Tests that `.get_ephemeral_timer()` returns an error for invalid chat ID.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_get_ephemeral_timer_wrong_chat_id() -> Result<()> {
-        let context = TestContext::new().await;
-        let chat_id = ChatId::new(12345);
-        assert!(chat_id.get_ephemeral_timer(&context).await.is_err());
-
-        Ok(())
-    }
 }

src/events/payload.rs

@@ -8,7 +8,6 @@ use crate::config::Config;
 use crate::contact::ContactId;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::message::MsgId;
-use crate::reaction::Reaction;
 use crate::webxdc::StatusUpdateSerial;
 
 /// Event payload.
@@ -95,18 +94,6 @@ pub enum EventType {
         contact_id: ContactId,
     },
 
-    /// Reactions for the message changed.
-    IncomingReaction {
-        /// ID of the contact whose reaction set is changed.
-        contact_id: ContactId,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: MsgId,
-
-        /// The reaction.
-        reaction: Reaction,
-    },
-
     /// There is a fresh message. Typically, the user will show an notification
     /// when receiving this message.
     ///
@@ -301,13 +288,6 @@ pub enum EventType {
         data: Vec<u8>,
     },
 
-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    WebxdcRealtimeAdvertisementReceived {
-        /// Message ID of the webxdc instance.
-        msg_id: MsgId,
-    },
-
     /// Inform that a message containing a webxdc instance has been deleted.
     WebxdcInstanceDeleted {
         /// ID of the deleted message.

src/html.rs

@@ -525,7 +525,8 @@ test some special html-characters as < > and & but also " and &#x
 
         // alice sends a message with html-part to bob
         let chat_id = alice.create_chat(&bob).await.id;
-        let mut msg = Message::new_text("plain text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("plain text".to_string());
         msg.set_html(Some("<b>html</b> text".to_string()));
         assert!(msg.mime_modified);
         chat::send_msg(&alice, chat_id, &mut msg).await.unwrap();

src/imap.rs

@@ -32,19 +32,15 @@ use crate::contact::{Contact, ContactId, Modifier, Origin};
 use crate::context::Context;
 use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
-use crate::log::LogExt;
-use crate::login_param::{
-    prioritize_server_login_params, ConfiguredLoginParam, ConfiguredServerLoginParam,
-};
-use crate::message::{self, Message, MessageState, MessengerMessage, MsgId};
+use crate::login_param::{LoginParam, ServerLoginParam};
+use crate::message::{self, Message, MessageState, MessengerMessage, MsgId, Viewtype};
 use crate::mimeparser;
-use crate::net::proxy::ProxyConfig;
-use crate::net::session::SessionStream;
 use crate::oauth2::get_oauth2_access_token;
 use crate::receive_imf::{
     from_field_to_contact_id, get_prefetch_parent_message, receive_imf_inner, ReceivedMsg,
 };
 use crate::scheduler::connectivity::ConnectivityStore;
+use crate::socks::Socks5Config;
 use crate::sql;
 use crate::stock_str;
 use crate::tools::{self, create_id, duration_to_str};
@@ -56,7 +52,7 @@ pub mod scan_folders;
 pub mod select_folder;
 pub(crate) mod session;
 
-use client::{determine_capabilities, Client};
+use client::Client;
 use mailparse::SingleInfo;
 use session::Session;
 
@@ -77,18 +73,12 @@ pub(crate) struct Imap {
     addr: String,
 
     /// Login parameters.
-    lp: Vec<ConfiguredServerLoginParam>,
-
-    /// Password.
-    password: String,
-
-    /// Proxy configuration.
-    proxy_config: Option<ProxyConfig>,
+    lp: ServerLoginParam,
 
+    /// SOCKS 5 configuration.
+    socks5_config: Option<Socks5Config>,
     strict_tls: bool,
 
-    oauth2: bool,
-
     login_failed_once: bool,
 
     pub(crate) connectivity: ConnectivityStore,
@@ -238,29 +228,31 @@ impl Imap {
     ///
     /// `addr` is used to renew token if OAuth2 authentication is used.
     pub fn new(
-        lp: Vec<ConfiguredServerLoginParam>,
-        password: String,
-        proxy_config: Option<ProxyConfig>,
+        lp: &ServerLoginParam,
+        socks5_config: Option<Socks5Config>,
         addr: &str,
         strict_tls: bool,
-        oauth2: bool,
         idle_interrupt_receiver: Receiver<()>,
-    ) -> Self {
-        Imap {
+    ) -> Result<Self> {
+        if lp.server.is_empty() || lp.user.is_empty() || lp.password.is_empty() {
+            bail!("Incomplete IMAP connection parameters");
+        }
+
+        let imap = Imap {
             idle_interrupt_receiver,
             addr: addr.to_string(),
-            lp,
-            password,
-            proxy_config,
+            lp: lp.clone(),
+            socks5_config,
             strict_tls,
-            oauth2,
             login_failed_once: false,
             connectivity: Default::default(),
             conn_last_try: UNIX_EPOCH,
             conn_backoff_ms: 0,
             // 1 connection per minute + a burst of 2.
             ratelimit: Ratelimit::new(Duration::new(120, 0), 2.0),
-        }
+        };
+
+        Ok(imap)
     }
 
     /// Creates new disconnected IMAP client using configured parameters.
@@ -268,18 +260,18 @@ impl Imap {
         context: &Context,
         idle_interrupt_receiver: Receiver<()>,
     ) -> Result<Self> {
-        let param = ConfiguredLoginParam::load(context)
-            .await?
-            .context("Not configured")?;
+        if !context.is_configured().await? {
+            bail!("IMAP Connect without configured params");
+        }
+
+        let param = LoginParam::load_configured_params(context).await?;
         let imap = Self::new(
-            param.imap.clone(),
-            param.imap_password.clone(),
-            param.proxy_config.clone(),
+            &param.imap,
+            param.socks5_config.clone(),
             &param.addr,
             param.strict_tls(),
-            param.oauth2,
             idle_interrupt_receiver,
-        );
+        )?;
         Ok(imap)
     }
 
@@ -290,11 +282,11 @@ impl Imap {
     /// Calling this function is not enough to perform IMAP operations. Use [`Imap::prepare`]
     /// instead if you are going to actually use connection rather than trying connection
     /// parameters.
-    pub(crate) async fn connect(
-        &mut self,
-        context: &Context,
-        configuring: bool,
-    ) -> Result<Session> {
+    pub(crate) async fn connect(&mut self, context: &Context) -> Result<Session> {
+        if self.lp.server.is_empty() {
+            bail!("IMAP operation attempted while it is torn down");
+        }
+
         let now = tools::Time::now();
         let until_can_send = max(
             min(self.conn_last_try, now)
@@ -336,121 +328,91 @@ impl Imap {
         );
         self.conn_backoff_ms = max(BACKOFF_MIN_MS, self.conn_backoff_ms);
 
-        let login_params = prioritize_server_login_params(&context.sql, &self.lp, "imap").await?;
-        let mut first_error = None;
-        for lp in login_params {
-            info!(context, "IMAP trying to connect to {}.", &lp.connection);
-            let connection_candidate = lp.connection.clone();
-            let client = match Client::connect(
-                context,
-                self.proxy_config.clone(),
-                self.strict_tls,
-                connection_candidate,
-            )
-            .await
-            {
-                Ok(client) => client,
-                Err(err) => {
-                    warn!(context, "IMAP failed to connect: {err:#}.");
-                    first_error.get_or_insert(err);
-                    continue;
-                }
+        let connection_res = Client::connect(
+            context,
+            self.lp.server.as_ref(),
+            self.lp.port,
+            self.strict_tls,
+            self.socks5_config.clone(),
+            self.lp.security,
+        )
+        .await;
+
+        let client = connection_res?;
+        self.conn_backoff_ms = BACKOFF_MIN_MS;
+        self.ratelimit.send();
+
+        let imap_user: &str = self.lp.user.as_ref();
+        let imap_pw: &str = self.lp.password.as_ref();
+        let oauth2 = self.lp.oauth2;
+
+        let login_res = if oauth2 {
+            info!(context, "Logging into IMAP server with OAuth 2");
+            let addr: &str = self.addr.as_ref();
+
+            let token = get_oauth2_access_token(context, addr, imap_pw, true)
+                .await?
+                .context("IMAP could not get OAUTH token")?;
+            let auth = OAuth2 {
+                user: imap_user.into(),
+                access_token: token,
             };
+            client.authenticate("XOAUTH2", auth).await
+        } else {
+            info!(context, "Logging into IMAP server with LOGIN");
+            client.login(imap_user, imap_pw).await
+        };
 
-            self.conn_backoff_ms = BACKOFF_MIN_MS;
-            self.ratelimit.send();
+        match login_res {
+            Ok(session) => {
+                // Store server ID in the context to display in account info.
+                let mut lock = context.server_id.write().await;
+                lock.clone_from(&session.capabilities.server_id);
 
-            let imap_user: &str = lp.user.as_ref();
-            let imap_pw: &str = &self.password;
+                self.login_failed_once = false;
+                context.emit_event(EventType::ImapConnected(format!(
+                    "IMAP-LOGIN as {}",
+                    self.lp.user
+                )));
+                self.connectivity.set_connected(context).await;
+                info!(context, "Successfully logged into IMAP server");
+                Ok(session)
+            }
 
-            let login_res = if self.oauth2 {
-                info!(context, "Logging into IMAP server with OAuth 2.");
-                let addr: &str = self.addr.as_ref();
+            Err(err) => {
+                let imap_user = self.lp.user.to_owned();
+                let message = stock_str::cannot_login(context, &imap_user).await;
 
-                let token = get_oauth2_access_token(context, addr, imap_pw, true)
-                    .await?
-                    .context("IMAP could not get OAUTH token")?;
-                let auth = OAuth2 {
-                    user: imap_user.into(),
-                    access_token: token,
-                };
-                client.authenticate("XOAUTH2", auth).await
-            } else {
-                info!(context, "Logging into IMAP server with LOGIN.");
-                client.login(imap_user, imap_pw).await
-            };
+                warn!(context, "{} ({:#})", message, err);
 
-            match login_res {
-                Ok(mut session) => {
-                    let capabilities = determine_capabilities(&mut session).await?;
-
-                    let session = if capabilities.can_compress {
-                        info!(context, "Enabling IMAP compression.");
-                        let compressed_session = session
-                            .compress(|s| {
-                                let session_stream: Box<dyn SessionStream> = Box::new(s);
-                                session_stream
-                            })
-                            .await
-                            .context("Failed to enable IMAP compression")?;
-                        Session::new(compressed_session, capabilities)
-                    } else {
-                        Session::new(session, capabilities)
-                    };
-
-                    // Store server ID in the context to display in account info.
-                    let mut lock = context.server_id.write().await;
-                    lock.clone_from(&session.capabilities.server_id);
-
-                    self.login_failed_once = false;
-                    context.emit_event(EventType::ImapConnected(format!(
-                        "IMAP-LOGIN as {}",
-                        lp.user
-                    )));
-                    self.connectivity.set_connected(context).await;
-                    info!(context, "Successfully logged into IMAP server");
-                    return Ok(session);
-                }
-
-                Err(err) => {
-                    let imap_user = lp.user.to_owned();
-                    let message = stock_str::cannot_login(context, &imap_user).await;
-
-                    let err_str = err.to_string();
-                    warn!(context, "IMAP failed to login: {err:#}.");
-                    first_error.get_or_insert(format_err!("{message} ({err:#})"));
-
-                    let _lock = context.wrong_pw_warning_mutex.lock().await;
-                    if !configuring
-                        && self.login_failed_once
-                        && err_str.to_lowercase().contains("authentication")
-                        && context.get_config_bool(Config::NotifyAboutWrongPw).await?
-                    {
-                        let mut msg = Message::new_text(message);
-                        if let Err(e) = chat::add_device_msg_with_importance(
-                            context,
-                            None,
-                            Some(&mut msg),
-                            true,
-                        )
+                let lock = context.wrong_pw_warning_mutex.lock().await;
+                if self.login_failed_once
+                    && err.to_string().to_lowercase().contains("authentication")
+                    && context.get_config_bool(Config::NotifyAboutWrongPw).await?
+                {
+                    if let Err(e) = context
+                        .set_config_internal(Config::NotifyAboutWrongPw, None)
                         .await
-                        {
-                            warn!(context, "Failed to add device message: {e:#}.");
-                        } else {
-                            context
-                                .set_config_internal(Config::NotifyAboutWrongPw, None)
-                                .await
-                                .log_err(context)
-                                .ok();
-                        }
-                    } else {
-                        self.login_failed_once = true;
+                    {
+                        warn!(context, "{:#}", e);
                     }
+                    drop(lock);
+
+                    let mut msg = Message::new(Viewtype::Text);
+                    msg.text.clone_from(&message);
+                    if let Err(e) =
+                        chat::add_device_msg_with_importance(context, None, Some(&mut msg), true)
+                            .await
+                    {
+                        warn!(context, "{:#}", e);
+                    }
+                } else {
+                    self.login_failed_once = true;
                 }
+
+                Err(format_err!("{}\n\n{:#}", message, err))
             }
         }
-
-        Err(first_error.unwrap_or_else(|| format_err!("No IMAP connection candidates provided")))
     }
 
     /// Prepare for IMAP operation.
@@ -458,8 +420,7 @@ impl Imap {
     /// Ensure that IMAP client is connected, folders are created and IMAP capabilities are
     /// determined.
     pub(crate) async fn prepare(&mut self, context: &Context) -> Result<Session> {
-        let configuring = false;
-        let mut session = match self.connect(context, configuring).await {
+        let mut session = match self.connect(context).await {
             Ok(session) => session,
             Err(err) => {
                 self.connectivity.set_err(context, &err).await;
@@ -1064,52 +1025,6 @@ impl Session {
         Ok(())
     }
 
-    /// Uploads sync messages from the `imap_send` table with `\Seen` flag set.
-    pub(crate) async fn send_sync_msgs(&mut self, context: &Context, folder: &str) -> Result<()> {
-        context.send_sync_msg().await?;
-        while let Some((id, mime, msg_id, attempts)) = context
-            .sql
-            .query_row_optional(
-                "SELECT id, mime, msg_id, attempts FROM imap_send ORDER BY id LIMIT 1",
-                (),
-                |row| {
-                    let id: i64 = row.get(0)?;
-                    let mime: String = row.get(1)?;
-                    let msg_id: MsgId = row.get(2)?;
-                    let attempts: i64 = row.get(3)?;
-                    Ok((id, mime, msg_id, attempts))
-                },
-            )
-            .await
-            .context("Failed to SELECT from imap_send")?
-        {
-            let res = self
-                .append(folder, Some("(\\Seen)"), None, mime)
-                .await
-                .with_context(|| format!("IMAP APPEND to {folder} failed for {msg_id}"))
-                .log_err(context);
-            if res.is_ok() {
-                msg_id.set_delivered(context).await?;
-            }
-            const MAX_ATTEMPTS: i64 = 2;
-            if res.is_ok() || attempts >= MAX_ATTEMPTS - 1 {
-                context
-                    .sql
-                    .execute("DELETE FROM imap_send WHERE id=?", (id,))
-                    .await
-                    .context("Failed to delete from imap_send")?;
-            } else {
-                context
-                    .sql
-                    .execute("UPDATE imap_send SET attempts=attempts+1 WHERE id=?", (id,))
-                    .await
-                    .context("Failed to update imap_send.attempts")?;
-                res?;
-            }
-        }
-        Ok(())
-    }
-
     /// Stores pending `\Seen` flags for messages in `imap_markseen` table.
     pub(crate) async fn store_seen_flags_on_imap(&mut self, context: &Context) -> Result<()> {
         let rows = context
@@ -1199,8 +1114,6 @@ impl Session {
             .await
             .context("failed to fetch flags")?;
 
-        let mut got_unsolicited_fetch = false;
-
         while let Some(fetch) = list
             .try_next()
             .await
@@ -1210,7 +1123,6 @@ impl Session {
                 uid
             } else {
                 info!(context, "FETCH result contains no UID, skipping");
-                got_unsolicited_fetch = true;
                 continue;
             };
             let is_seen = fetch.flags().any(|flag| flag == Flag::Seen);
@@ -1233,15 +1145,6 @@ impl Session {
                 warn!(context, "FETCH result contains no MODSEQ");
             }
         }
-        drop(list);
-
-        if got_unsolicited_fetch {
-            // We got unsolicited FETCH, which means some flags
-            // have been modified while our request was in progress.
-            // We may or may not have these new flags as a part of the response,
-            // so better skip next IDLE and do another round of flag synchronization.
-            self.new_mail = true;
-        }
 
         set_modseq(context, folder, highest_modseq)
             .await
@@ -1727,21 +1630,17 @@ impl Imap {
 }
 
 impl Session {
-    /// Return whether the server sent an unsolicited EXISTS or FETCH response.
-    ///
+    /// Return whether the server sent an unsolicited EXISTS response.
     /// Drains all responses from `session.unsolicited_responses` in the process.
-    ///
-    /// If this returns `true`, this means that new emails arrived
-    /// or flags have been changed.
-    /// In this case we may want to skip next IDLE and do a round
-    /// of fetching new messages and synchronizing seen flags.
-    fn drain_unsolicited_responses(&self, context: &Context) -> Result<bool> {
+    /// If this returns `true`, this means that new emails arrived and you should
+    /// fetch again, even if you just fetched.
+    fn server_sent_unsolicited_exists(&self, context: &Context) -> Result<bool> {
         use async_imap::imap_proto::Response;
         use async_imap::imap_proto::ResponseCode;
         use UnsolicitedResponse::*;
 
         let folder = self.selected_folder.as_deref().unwrap_or_default();
-        let mut should_refetch = false;
+        let mut unsolicited_exists = false;
         while let Ok(response) = self.unsolicited_responses.try_recv() {
             match response {
                 Exists(_) => {
@@ -1749,38 +1648,28 @@ impl Session {
                         context,
                         "Need to refetch {folder:?}, got unsolicited EXISTS {response:?}"
                     );
-                    should_refetch = true;
+                    unsolicited_exists = true;
                 }
 
+                // We are not interested in the following responses and they are are
+                // sent quite frequently, so, we ignore them without logging them
                 Expunge(_) | Recent(_) => {}
-                Other(ref response_data) => {
-                    match response_data.parsed() {
-                        Response::Fetch { .. } => {
-                            info!(
-                                context,
-                                "Need to refetch {folder:?}, got unsolicited FETCH {response:?}"
-                            );
-                            should_refetch = true;
-                        }
+                Other(response_data)
+                    if matches!(
+                        response_data.parsed(),
+                        Response::Fetch { .. }
+                            | Response::Done {
+                                code: Some(ResponseCode::CopyUid(_, _, _)),
+                                ..
+                            }
+                    ) => {}
 
-                        // We are not interested in the following responses and they are are
-                        // sent quite frequently, so, we ignore them without logging them.
-                        Response::Done {
-                            code: Some(ResponseCode::CopyUid(_, _, _)),
-                            ..
-                        } => {}
-
-                        _ => {
-                            info!(context, "{folder:?}: got unsolicited response {response:?}")
-                        }
-                    }
-                }
                 _ => {
                     info!(context, "{folder:?}: got unsolicited response {response:?}")
                 }
             }
         }
-        Ok(should_refetch)
+        Ok(unsolicited_exists)
     }
 }
 

src/imap/capabilities.rs

@@ -25,10 +25,6 @@ pub(crate) struct Capabilities {
     /// <https://tools.ietf.org/html/rfc5464>
     pub can_metadata: bool,
 
-    /// True if the server has COMPRESS=DEFLATE capability as defined in
-    /// <https://tools.ietf.org/html/rfc4978>
-    pub can_compress: bool,
-
     /// True if the server supports XDELTAPUSH capability.
     /// This capability means setting /private/devicetoken IMAP METADATA
     /// on the INBOX results in new mail notifications

src/imap/client.rs

@@ -1,21 +1,22 @@
 use std::net::SocketAddr;
 use std::ops::{Deref, DerefMut};
 
-use anyhow::{Context as _, Result};
+use anyhow::{bail, format_err, Context as _, Result};
 use async_imap::Client as ImapClient;
 use async_imap::Session as ImapSession;
+use fast_socks5::client::Socks5Stream;
 use tokio::io::BufWriter;
 
 use super::capabilities::Capabilities;
+use super::session::Session;
 use crate::context::Context;
-use crate::login_param::{ConnectionCandidate, ConnectionSecurity};
 use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
-use crate::net::proxy::ProxyConfig;
 use crate::net::session::SessionStream;
 use crate::net::tls::wrap_tls;
-use crate::net::{
-    connect_tcp_inner, connect_tls_inner, run_connection_attempts, update_connection_history,
-};
+use crate::net::update_connection_history;
+use crate::net::{connect_tcp_inner, connect_tls_inner};
+use crate::provider::Socket;
+use crate::socks::Socks5Config;
 use crate::tools::time;
 
 #[derive(Debug)]
@@ -37,20 +38,10 @@ impl DerefMut for Client {
     }
 }
 
-/// Converts port number to ALPN list.
-fn alpn(port: u16) -> &'static [&'static str] {
-    if port == 993 {
-        // Do not request ALPN on standard port.
-        &[]
-    } else {
-        &["imap"]
-    }
-}
-
 /// Determine server capabilities.
 ///
 /// If server supports ID capability, send our client ID.
-pub(crate) async fn determine_capabilities(
+async fn determine_capabilities(
     session: &mut ImapSession<Box<dyn SessionStream>>,
 ) -> Result<Capabilities> {
     let caps = session
@@ -68,7 +59,6 @@ pub(crate) async fn determine_capabilities(
         can_check_quota: caps.has_str("QUOTA"),
         can_condstore: caps.has_str("CONDSTORE"),
         can_metadata: caps.has_str("METADATA"),
-        can_compress: caps.has_str("COMPRESS=DEFLATE"),
         can_push: caps.has_str("XDELTAPUSH"),
         is_chatmail: caps.has_str("XCHATMAIL"),
         server_id,
@@ -83,126 +73,91 @@ impl Client {
         }
     }
 
-    pub(crate) async fn login(
-        self,
-        username: &str,
-        password: &str,
-    ) -> Result<ImapSession<Box<dyn SessionStream>>> {
+    pub(crate) async fn login(self, username: &str, password: &str) -> Result<Session> {
         let Client { inner, .. } = self;
-
-        let session = inner
+        let mut session = inner
             .login(username, password)
             .await
             .map_err(|(err, _client)| err)?;
-        Ok(session)
+        let capabilities = determine_capabilities(&mut session).await?;
+        Ok(Session::new(session, capabilities))
     }
 
     pub(crate) async fn authenticate(
         self,
         auth_type: &str,
         authenticator: impl async_imap::Authenticator,
-    ) -> Result<ImapSession<Box<dyn SessionStream>>> {
+    ) -> Result<Session> {
         let Client { inner, .. } = self;
-        let session = inner
+        let mut session = inner
             .authenticate(auth_type, authenticator)
             .await
             .map_err(|(err, _client)| err)?;
-        Ok(session)
-    }
-
-    async fn connection_attempt(
-        context: Context,
-        host: String,
-        security: ConnectionSecurity,
-        resolved_addr: SocketAddr,
-        strict_tls: bool,
-    ) -> Result<Self> {
-        let context = &context;
-        let host = &host;
-        info!(
-            context,
-            "Attempting IMAP connection to {host} ({resolved_addr})."
-        );
-        let res = match security {
-            ConnectionSecurity::Tls => {
-                Client::connect_secure(resolved_addr, host, strict_tls).await
-            }
-            ConnectionSecurity::Starttls => {
-                Client::connect_starttls(resolved_addr, host, strict_tls).await
-            }
-            ConnectionSecurity::Plain => Client::connect_insecure(resolved_addr).await,
-        };
-        match res {
-            Ok(client) => {
-                let ip_addr = resolved_addr.ip().to_string();
-                let port = resolved_addr.port();
-
-                let save_cache = match security {
-                    ConnectionSecurity::Tls | ConnectionSecurity::Starttls => strict_tls,
-                    ConnectionSecurity::Plain => false,
-                };
-                if save_cache {
-                    update_connect_timestamp(context, host, &ip_addr).await?;
-                }
-                update_connection_history(context, "imap", host, port, &ip_addr, time()).await?;
-                Ok(client)
-            }
-            Err(err) => {
-                warn!(
-                    context,
-                    "Failed to connect to {host} ({resolved_addr}): {err:#}."
-                );
-                Err(err)
-            }
-        }
+        let capabilities = determine_capabilities(&mut session).await?;
+        Ok(Session::new(session, capabilities))
     }
 
     pub async fn connect(
         context: &Context,
-        proxy_config: Option<ProxyConfig>,
+        host: &str,
+        port: u16,
         strict_tls: bool,
-        candidate: ConnectionCandidate,
+        socks5_config: Option<Socks5Config>,
+        security: Socket,
     ) -> Result<Self> {
-        let host = &candidate.host;
-        let port = candidate.port;
-        let security = candidate.security;
-        if let Some(proxy_config) = proxy_config {
+        if let Some(socks5_config) = socks5_config {
             let client = match security {
-                ConnectionSecurity::Tls => {
-                    Client::connect_secure_proxy(context, host, port, strict_tls, proxy_config)
+                Socket::Automatic => bail!("IMAP port security is not configured"),
+                Socket::Ssl => {
+                    Client::connect_secure_socks5(context, host, port, strict_tls, socks5_config)
                         .await?
                 }
-                ConnectionSecurity::Starttls => {
-                    Client::connect_starttls_proxy(context, host, port, proxy_config, strict_tls)
+                Socket::Starttls => {
+                    Client::connect_starttls_socks5(context, host, port, socks5_config, strict_tls)
                         .await?
                 }
-                ConnectionSecurity::Plain => {
-                    Client::connect_insecure_proxy(context, host, port, proxy_config).await?
+                Socket::Plain => {
+                    Client::connect_insecure_socks5(context, host, port, socks5_config).await?
                 }
             };
-            update_connection_history(context, "imap", host, port, host, time()).await?;
             Ok(client)
         } else {
-            let load_cache = match security {
-                ConnectionSecurity::Tls | ConnectionSecurity::Starttls => strict_tls,
-                ConnectionSecurity::Plain => false,
-            };
-
-            let connection_futures =
-                lookup_host_with_cache(context, host, port, "imap", load_cache)
-                    .await?
-                    .into_iter()
-                    .map(|resolved_addr| {
-                        let context = context.clone();
-                        let host = host.to_string();
-                        Self::connection_attempt(context, host, security, resolved_addr, strict_tls)
-                    });
-            run_connection_attempts(connection_futures).await
+            let mut first_error = None;
+            let load_cache =
+                strict_tls && (security == Socket::Ssl || security == Socket::Starttls);
+            for resolved_addr in
+                lookup_host_with_cache(context, host, port, "imap", load_cache).await?
+            {
+                let res = match security {
+                    Socket::Automatic => bail!("IMAP port security is not configured"),
+                    Socket::Ssl => Client::connect_secure(resolved_addr, host, strict_tls).await,
+                    Socket::Starttls => {
+                        Client::connect_starttls(resolved_addr, host, strict_tls).await
+                    }
+                    Socket::Plain => Client::connect_insecure(resolved_addr).await,
+                };
+                match res {
+                    Ok(client) => {
+                        let ip_addr = resolved_addr.ip().to_string();
+                        if load_cache {
+                            update_connect_timestamp(context, host, &ip_addr).await?;
+                        }
+                        update_connection_history(context, "imap", host, port, &ip_addr, time())
+                            .await?;
+                        return Ok(client);
+                    }
+                    Err(err) => {
+                        warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
+                        first_error.get_or_insert(err);
+                    }
+                }
+            }
+            Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
         }
     }
 
     async fn connect_secure(addr: SocketAddr, hostname: &str, strict_tls: bool) -> Result<Self> {
-        let tls_stream = connect_tls_inner(addr, hostname, strict_tls, alpn(addr.port())).await?;
+        let tls_stream = connect_tls_inner(addr, hostname, strict_tls, "imap").await?;
         let buffered_stream = BufWriter::new(tls_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -242,7 +197,7 @@ impl Client {
         let buffered_tcp_stream = client.into_inner();
         let tcp_stream = buffered_tcp_stream.into_inner();
 
-        let tls_stream = wrap_tls(strict_tls, host, &[], tcp_stream)
+        let tls_stream = wrap_tls(strict_tls, host, "imap", tcp_stream)
             .await
             .context("STARTTLS upgrade failed")?;
 
@@ -252,17 +207,17 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_secure_proxy(
+    async fn connect_secure_socks5(
         context: &Context,
         domain: &str,
         port: u16,
         strict_tls: bool,
-        proxy_config: ProxyConfig,
+        socks5_config: Socks5Config,
     ) -> Result<Self> {
-        let proxy_stream = proxy_config
+        let socks5_stream = socks5_config
             .connect(context, domain, port, strict_tls)
             .await?;
-        let tls_stream = wrap_tls(strict_tls, domain, alpn(port), proxy_stream).await?;
+        let tls_stream = wrap_tls(strict_tls, domain, "imap", socks5_stream).await?;
         let buffered_stream = BufWriter::new(tls_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
@@ -273,14 +228,14 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_insecure_proxy(
+    async fn connect_insecure_socks5(
         context: &Context,
         domain: &str,
         port: u16,
-        proxy_config: ProxyConfig,
+        socks5_config: Socks5Config,
     ) -> Result<Self> {
-        let proxy_stream = proxy_config.connect(context, domain, port, false).await?;
-        let buffered_stream = BufWriter::new(proxy_stream);
+        let socks5_stream = socks5_config.connect(context, domain, port, false).await?;
+        let buffered_stream = BufWriter::new(socks5_stream);
         let session_stream: Box<dyn SessionStream> = Box::new(buffered_stream);
         let mut client = Client::new(session_stream);
         let _greeting = client
@@ -290,20 +245,20 @@ impl Client {
         Ok(client)
     }
 
-    async fn connect_starttls_proxy(
+    async fn connect_starttls_socks5(
         context: &Context,
         hostname: &str,
         port: u16,
-        proxy_config: ProxyConfig,
+        socks5_config: Socks5Config,
         strict_tls: bool,
     ) -> Result<Self> {
-        let proxy_stream = proxy_config
+        let socks5_stream = socks5_config
             .connect(context, hostname, port, strict_tls)
             .await?;
 
         // Run STARTTLS command and convert the client back into a stream.
-        let buffered_proxy_stream = BufWriter::new(proxy_stream);
-        let mut client = ImapClient::new(buffered_proxy_stream);
+        let buffered_socks5_stream = BufWriter::new(socks5_stream);
+        let mut client = ImapClient::new(buffered_socks5_stream);
         let _greeting = client
             .read_response()
             .await
@@ -312,10 +267,10 @@ impl Client {
             .run_command_and_check_ok("STARTTLS", None)
             .await
             .context("STARTTLS command failed")?;
-        let buffered_proxy_stream = client.into_inner();
-        let proxy_stream = buffered_proxy_stream.into_inner();
+        let buffered_socks5_stream = client.into_inner();
+        let socks5_stream: Socks5Stream<_> = buffered_socks5_stream.into_inner();
 
-        let tls_stream = wrap_tls(strict_tls, hostname, &[], proxy_stream)
+        let tls_stream = wrap_tls(strict_tls, hostname, "imap", socks5_stream)
             .await
             .context("STARTTLS upgrade failed")?;
         let buffered_stream = BufWriter::new(tls_stream);

src/imap/idle.rs

@@ -9,6 +9,7 @@ use tokio::time::timeout;
 use super::session::Session;
 use super::Imap;
 use crate::context::Context;
+use crate::imap::FolderMeaning;
 use crate::net::TIMEOUT;
 use crate::tools::{self, time_elapsed};
 
@@ -31,7 +32,7 @@ impl Session {
 
         self.select_with_uidvalidity(context, folder).await?;
 
-        if self.drain_unsolicited_responses(context)? {
+        if self.server_sent_unsolicited_exists(context)? {
             self.new_mail = true;
         }
 
@@ -108,16 +109,37 @@ impl Imap {
     pub(crate) async fn fake_idle(
         &mut self,
         context: &Context,
+        session: &mut Session,
         watch_folder: String,
+        folder_meaning: FolderMeaning,
     ) -> Result<()> {
         let fake_idle_start_time = tools::Time::now();
 
         info!(context, "IMAP-fake-IDLEing folder={:?}", watch_folder);
 
-        // Wait for 60 seconds or until we are interrupted.
-        match timeout(Duration::from_secs(60), self.idle_interrupt_receiver.recv()).await {
-            Err(_) => info!(context, "Fake IDLE finished."),
-            Ok(_) => info!(context, "Fake IDLE interrupted."),
+        // Loop until we are interrupted or until we fetch something.
+        loop {
+            match timeout(Duration::from_secs(60), self.idle_interrupt_receiver.recv()).await {
+                Err(_) => {
+                    // Let's see if fetching messages results
+                    // in anything.  If so, we behave as if IDLE had data but
+                    // will have already fetched the messages so perform_*_fetch
+                    // will not find any new.
+                    let res = self
+                        .fetch_new_messages(context, session, &watch_folder, folder_meaning, false)
+                        .await?;
+
+                    info!(context, "fetch_new_messages returned {:?}", res);
+
+                    if res {
+                        break;
+                    }
+                }
+                Ok(_) => {
+                    info!(context, "Fake IDLE interrupted.");
+                    break;
+                }
+            }
         }
 
         info!(

src/imap/scan_folders.rs

@@ -66,11 +66,21 @@ impl Imap {
                 && folder_meaning != FolderMeaning::Drafts
                 && folder_meaning != FolderMeaning::Trash
             {
-                self.fetch_move_delete(context, session, folder.name(), folder_meaning)
-                    .await
-                    .context("Can't fetch new msgs in scanned folder")
-                    .log_err(context)
-                    .ok();
+                // Drain leftover unsolicited EXISTS messages
+                session.server_sent_unsolicited_exists(context)?;
+
+                loop {
+                    self.fetch_move_delete(context, session, folder.name(), folder_meaning)
+                        .await
+                        .context("Can't fetch new msgs in scanned folder")
+                        .log_err(context)
+                        .ok();
+
+                    // If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
+                    if !session.server_sent_unsolicited_exists(context)? {
+                        break;
+                    }
+                }
             }
         }
 

src/imex.rs

@@ -2,21 +2,18 @@
 
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
-use std::pin::Pin;
 
 use ::pgp::types::KeyTrait;
 use anyhow::{bail, ensure, format_err, Context as _, Result};
+use deltachat_contact_tools::EmailAddress;
 use futures::TryStreamExt;
 use futures_lite::FutureExt;
-use pin_project::pin_project;
 
 use tokio::fs::{self, File};
-use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_tar::Archive;
 
 use crate::blob::BlobDirContents;
 use crate::chat::{self, delete_and_reset_all_device_msgs};
-use crate::config::Config;
 use crate::context::Context;
 use crate::e2ee;
 use crate::events::EventType;
@@ -180,7 +177,10 @@ async fn set_self_key(context: &Context, armored: &str, set_default: bool) -> Re
         info!(context, "No Autocrypt-Prefer-Encrypt header.");
     };
 
+    let self_addr = context.get_primary_self_addr().await?;
+    let addr = EmailAddress::new(&self_addr)?;
     let keypair = pgp::KeyPair {
+        addr,
         public: public_key,
         secret: private_key,
     };
@@ -215,7 +215,7 @@ async fn imex_inner(
         path.display()
     );
     ensure!(context.sql.is_open().await, "Database not opened.");
-    context.emit_event(EventType::ImexProgress(1));
+    context.emit_event(EventType::ImexProgress(10));
 
     if what == ImexMode::ExportBackup || what == ImexMode::ExportSelfKeys {
         // before we export anything, make sure the private key exists
@@ -297,71 +297,12 @@ pub(crate) async fn import_backup_stream<R: tokio::io::AsyncRead + Unpin>(
         .0
 }
 
-/// Reader that emits progress events as bytes are read from it.
-#[pin_project]
-struct ProgressReader<R> {
-    /// Wrapped reader.
-    #[pin]
-    inner: R,
-
-    /// Number of bytes successfully read from the internal reader.
-    read: usize,
-
-    /// Total size of the backup .tar file expected to be read from the reader.
-    /// Used to calculate the progress.
-    file_size: usize,
-
-    /// Last progress emitted to avoid emitting the same progress value twice.
-    last_progress: usize,
-
-    /// Context for emitting progress events.
-    context: Context,
-}
-
-impl<R> ProgressReader<R> {
-    fn new(r: R, context: Context, file_size: u64) -> Self {
-        Self {
-            inner: r,
-            read: 0,
-            file_size: file_size as usize,
-            last_progress: 1,
-            context,
-        }
-    }
-}
-
-impl<R> AsyncRead for ProgressReader<R>
-where
-    R: AsyncRead,
-{
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-        buf: &mut ReadBuf<'_>,
-    ) -> std::task::Poll<std::io::Result<()>> {
-        let this = self.project();
-        let before = buf.filled().len();
-        let res = this.inner.poll_read(cx, buf);
-        if let std::task::Poll::Ready(Ok(())) = res {
-            *this.read = this.read.saturating_add(buf.filled().len() - before);
-
-            let progress = std::cmp::min(1000 * *this.read / *this.file_size, 999);
-            if progress > *this.last_progress {
-                this.context.emit_event(EventType::ImexProgress(progress));
-                *this.last_progress = progress;
-            }
-        }
-        res
-    }
-}
-
 async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
     context: &Context,
     backup_file: R,
     file_size: u64,
     passphrase: String,
 ) -> (Result<()>,) {
-    let backup_file = ProgressReader::new(backup_file, context.clone(), file_size);
     let mut archive = Archive::new(backup_file);
 
     let mut entries = match archive.entries() {
@@ -369,12 +310,29 @@ async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
         Err(e) => return (Err(e).context("Failed to get archive entries"),),
     };
     let mut blobs = Vec::new();
+    // We already emitted ImexProgress(10) above
+    let mut last_progress = 10;
+    const PROGRESS_MIGRATIONS: u128 = 999;
+    let mut total_size: u64 = 0;
     let mut res: Result<()> = loop {
         let mut f = match entries.try_next().await {
             Ok(Some(f)) => f,
             Ok(None) => break Ok(()),
             Err(e) => break Err(e).context("Failed to get next entry"),
         };
+        total_size += match f.header().entry_size() {
+            Ok(size) => size,
+            Err(e) => break Err(e).context("Failed to get entry size"),
+        };
+        let max = PROGRESS_MIGRATIONS - 1;
+        let progress = std::cmp::min(
+            max * u128::from(total_size) / std::cmp::max(u128::from(file_size), 1),
+            max,
+        );
+        if progress > last_progress {
+            context.emit_event(EventType::ImexProgress(progress as usize));
+            last_progress = progress;
+        }
 
         let path = match f.path() {
             Ok(path) => path.to_path_buf(),
@@ -415,16 +373,13 @@ async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
             .await
             .context("cannot import unpacked database");
     }
-    if res.is_ok() {
-        res = adjust_delete_server_after(context).await;
-    }
     fs::remove_file(unpacked_database)
         .await
         .context("cannot remove unpacked database")
         .log_err(context)
         .ok();
     if res.is_ok() {
-        context.emit_event(EventType::ImexProgress(999));
+        context.emit_event(EventType::ImexProgress(PROGRESS_MIGRATIONS as usize));
         res = context.sql.run_migrations(context).await;
     }
     if res.is_ok() {
@@ -497,14 +452,7 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
 
     let file = File::create(&temp_path).await?;
     let blobdir = BlobDirContents::new(context).await?;
-
-    let mut file_size = 0;
-    file_size += temp_db_path.metadata()?.len();
-    for blob in blobdir.iter() {
-        file_size += blob.to_abs_path().metadata()?.len()
-    }
-
-    export_backup_stream(context, &temp_db_path, blobdir, file, file_size)
+    export_backup_stream(context, &temp_db_path, blobdir, file)
         .await
         .context("Exporting backup to file failed")?;
     fs::rename(temp_path, &dest_path).await?;
@@ -512,99 +460,33 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
     Ok(())
 }
 
-/// Writer that emits progress events as bytes are written into it.
-#[pin_project]
-struct ProgressWriter<W> {
-    /// Wrapped writer.
-    #[pin]
-    inner: W,
-
-    /// Number of bytes successfully written into the internal writer.
-    written: usize,
-
-    /// Total size of the backup .tar file expected to be written into the writer.
-    /// Used to calculate the progress.
-    file_size: usize,
-
-    /// Last progress emitted to avoid emitting the same progress value twice.
-    last_progress: usize,
-
-    /// Context for emitting progress events.
-    context: Context,
-}
-
-impl<W> ProgressWriter<W> {
-    fn new(w: W, context: Context, file_size: u64) -> Self {
-        Self {
-            inner: w,
-            written: 0,
-            file_size: file_size as usize,
-            last_progress: 1,
-            context,
-        }
-    }
-}
-
-impl<W> AsyncWrite for ProgressWriter<W>
-where
-    W: AsyncWrite,
-{
-    fn poll_write(
-        self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-        buf: &[u8],
-    ) -> std::task::Poll<Result<usize, std::io::Error>> {
-        let this = self.project();
-        let res = this.inner.poll_write(cx, buf);
-        if let std::task::Poll::Ready(Ok(written)) = res {
-            *this.written = this.written.saturating_add(written);
-
-            let progress = std::cmp::min(1000 * *this.written / *this.file_size, 999);
-            if progress > *this.last_progress {
-                this.context.emit_event(EventType::ImexProgress(progress));
-                *this.last_progress = progress;
-            }
-        }
-        res
-    }
-
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        self.project().inner.poll_flush(cx)
-    }
-
-    fn poll_shutdown(
-        self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        self.project().inner.poll_shutdown(cx)
-    }
-}
-
 /// Exports the database and blobs into a stream.
 pub(crate) async fn export_backup_stream<'a, W>(
     context: &'a Context,
     temp_db_path: &Path,
     blobdir: BlobDirContents<'a>,
     writer: W,
-    file_size: u64,
 ) -> Result<()>
 where
     W: tokio::io::AsyncWrite + tokio::io::AsyncWriteExt + Unpin + Send + 'static,
 {
-    let writer = ProgressWriter::new(writer, context.clone(), file_size);
     let mut builder = tokio_tar::Builder::new(writer);
 
     builder
         .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
         .await?;
 
-    for blob in blobdir.iter() {
+    let mut last_progress = 10;
+
+    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());
         builder.append_file(path_in_archive, &mut file).await?;
+        let progress = std::cmp::min(1000 * i / blobdir.len(), 999);
+        if progress > last_progress {
+            context.emit_event(EventType::ImexProgress(progress));
+            last_progress = progress;
+        }
     }
 
     builder.finish().await?;
@@ -795,7 +677,6 @@ async fn export_database(
         .to_str()
         .with_context(|| format!("path {} is not valid unicode", dest.display()))?;
 
-    adjust_delete_server_after(context).await?;
     context
         .sql
         .set_raw_config_int("backup_time", timestamp)
@@ -825,19 +706,6 @@ async fn export_database(
         .await
 }
 
-/// Sets `Config::DeleteServerAfter` to "never" if needed so that new messages are present on the
-/// server after a backup restoration or available for all devices in multi-device case.
-/// NB: Calling this after a backup import isn't reliable as we can crash in between, but this is a
-/// problem only for old backups, new backups already have `DeleteServerAfter` set if necessary.
-async fn adjust_delete_server_after(context: &Context) -> Result<()> {
-    if context.is_chatmail().await? && !context.config_exists(Config::DeleteServerAfter).await? {
-        context
-            .set_config(Config::DeleteServerAfter, Some("0"))
-            .await?;
-    }
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
     use std::time::Duration;
@@ -1023,49 +891,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_export_import_chatmail_backup() -> Result<()> {
-        let backup_dir = tempfile::tempdir().unwrap();
-
-        let context1 = &TestContext::new_alice().await;
-
-        // Check that the setting is displayed correctly.
-        assert_eq!(
-            context1.get_config(Config::DeleteServerAfter).await?,
-            Some("0".to_string())
-        );
-        context1.set_config_bool(Config::IsChatmail, true).await?;
-        assert_eq!(
-            context1.get_config(Config::DeleteServerAfter).await?,
-            Some("1".to_string())
-        );
-
-        assert_eq!(context1.get_config_delete_server_after().await?, Some(0));
-        imex(context1, ImexMode::ExportBackup, backup_dir.path(), None).await?;
-        let _event = context1
-            .evtracker
-            .get_matching(|evt| matches!(evt, EventType::ImexProgress(1000)))
-            .await;
-
-        let context2 = &TestContext::new().await;
-        let backup = has_backup(context2, backup_dir.path()).await?;
-        imex(context2, ImexMode::ImportBackup, backup.as_ref(), None).await?;
-        let _event = context2
-            .evtracker
-            .get_matching(|evt| matches!(evt, EventType::ImexProgress(1000)))
-            .await;
-        assert!(context2.is_configured().await?);
-        assert!(context2.is_chatmail().await?);
-        for ctx in [context1, context2] {
-            assert_eq!(
-                ctx.get_config(Config::DeleteServerAfter).await?,
-                Some("0".to_string())
-            );
-            assert_eq!(ctx.get_config_delete_server_after().await?, None);
-        }
-        Ok(())
-    }
-
     /// This is a regression test for
     /// https://github.com/deltachat/deltachat-android/issues/2263
     /// where the config cache wasn't reset properly after a backup.

src/imex/transfer.rs

@@ -31,25 +31,36 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::Poll;
 
-use anyhow::{bail, format_err, Context as _, Result};
-use futures_lite::FutureExt;
+use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
+use futures_lite::StreamExt;
 use iroh_net::relay::RelayMode;
 use iroh_net::Endpoint;
-use tokio::fs;
-use tokio::task::JoinHandle;
+use iroh_old;
+use iroh_old::blobs::Collection;
+use iroh_old::get::DataStream;
+use iroh_old::progress::ProgressEmitter;
+use iroh_old::provider::Ticket;
+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 tokio_util::sync::CancellationToken;
 
-use crate::chat::add_device_msg;
+use crate::chat::{add_device_msg, delete_and_reset_all_device_msgs};
 use crate::context::Context;
 use crate::imex::BlobDirContents;
-use crate::message::Message;
-use crate::qr::Qr;
+use crate::message::{Message, Viewtype};
+use crate::qr::{self, Qr};
 use crate::stock_str::backup_transfer_msg_body;
 use crate::tools::{create_id, time, TempPathGuard};
 use crate::EventType;
 
 use super::{export_backup_stream, export_database, import_backup_stream, DBFILE_BACKUP_NAME};
 
+const MAX_CONCURRENT_DIALS: u8 = 16;
+
 /// ALPN protocol identifier for the backup transfer protocol.
 const BACKUP_ALPN: &[u8] = b"/deltachat/backup";
 
@@ -98,7 +109,7 @@ impl BackupProvider {
         let endpoint = Endpoint::builder()
             .alpns(vec![BACKUP_ALPN.to_vec()])
             .relay_mode(relay_mode)
-            .bind()
+            .bind(0)
             .await?;
         let node_addr = endpoint.node_addr().await?;
 
@@ -109,7 +120,6 @@ impl BackupProvider {
             .get_blobdir()
             .parent()
             .context("Context dir not found")?;
-
         let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
         if fs::metadata(&dbfile).await.is_ok() {
             fs::remove_file(&dbfile).await?;
@@ -125,6 +135,7 @@ impl BackupProvider {
         export_database(context, &dbfile, passphrase, time())
             .await
             .context("Database export failed")?;
+        context.emit_event(EventType::ImexProgress(300));
 
         let drop_token = CancellationToken::new();
         let handle = {
@@ -178,7 +189,6 @@ impl BackupProvider {
         }
 
         info!(context, "Received valid backup authentication token.");
-        context.emit_event(EventType::ImexProgress(1));
 
         let blobdir = BlobDirContents::new(&context).await?;
 
@@ -190,7 +200,7 @@ impl BackupProvider {
 
         send_stream.write_all(&file_size.to_be_bytes()).await?;
 
-        export_backup_stream(&context, &dbfile, blobdir, send_stream, file_size)
+        export_backup_stream(&context, &dbfile, blobdir, send_stream)
             .await
             .context("Failed to write backup into QUIC stream")?;
         info!(context, "Finished writing backup into QUIC stream.");
@@ -200,7 +210,8 @@ impl BackupProvider {
         info!(context, "Received backup reception acknowledgement.");
         context.emit_event(EventType::ImexProgress(1000));
 
-        let mut msg = Message::new_text(backup_transfer_msg_body(&context).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = backup_transfer_msg_body(&context).await;
         add_device_msg(&context, None, Some(&mut msg)).await?;
 
         Ok(())
@@ -221,31 +232,12 @@ impl BackupProvider {
 
                 conn = endpoint.accept() => {
                     if let Some(conn) = conn {
-                        let conn = match conn.accept() {
-                            Ok(conn) => conn,
-                            Err(err) => {
-                               warn!(context, "Failed to accept iroh connection: {err:#}.");
-                               continue;
-                            }
-                        };
                         // Got a new in-progress connection.
                         let context = context.clone();
                         let auth_token = auth_token.clone();
                         let dbfile = dbfile.clone();
-                        if let Err(err) = Self::handle_connection(context.clone(), conn, auth_token, dbfile).race(
-                            async {
-                                cancel_token.recv().await.ok();
-                                Err(format_err!("Backup transfer cancelled"))
-                            }
-                        ).race(
-                            async {
-                                drop_token.cancelled().await;
-                                Err(format_err!("Backup provider dropped"))
-                            }
-                        ).await {
+                        if let Err(err) = Self::handle_connection(context.clone(), conn, auth_token, dbfile).await {
                             warn!(context, "Error while handling backup connection: {err:#}.");
-                            context.emit_event(EventType::ImexProgress(0));
-                            break;
                         } else {
                             info!(context, "Backup transfer finished successfully.");
                             break;
@@ -255,12 +247,10 @@ impl BackupProvider {
                     }
                 },
                 _ = cancel_token.recv() => {
-                    info!(context, "Backup transfer cancelled by the user, stopping accept loop.");
                     context.emit_event(EventType::ImexProgress(0));
                     break;
                 }
                 _ = drop_token.cancelled() => {
-                    info!(context, "Backup transfer cancelled by dropping the provider, stopping accept loop.");
                     context.emit_event(EventType::ImexProgress(0));
                     break;
                 }
@@ -289,6 +279,33 @@ impl Future for BackupProvider {
     }
 }
 
+/// Retrieves backup from a legacy backup provider using iroh 0.4.
+pub async fn get_legacy_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."
+    );
+    // Acquire global "ongoing" mutex.
+    let cancel_token = context.alloc_ongoing().await?;
+    let _guard = context.scheduler.pause(context.clone()).await;
+    info!(
+        context,
+        "Running get_backup for {}",
+        qr::format_backup(&qr)?
+    );
+    let res = tokio::select! {
+        biased;
+        res = get_backup_inner(context, qr) => res,
+        _ = cancel_token.recv() => Err(format_err!("cancelled")),
+    };
+    context.free_ongoing().await;
+    res
+}
+
 pub async fn get_backup2(
     context: &Context,
     node_addr: iroh_net::NodeAddr,
@@ -296,7 +313,7 @@ pub async fn get_backup2(
 ) -> Result<()> {
     let relay_mode = RelayMode::Disabled;
 
-    let endpoint = Endpoint::builder().relay_mode(relay_mode).bind().await?;
+    let endpoint = Endpoint::builder().relay_mode(relay_mode).bind(0).await?;
 
     let conn = endpoint.connect(node_addr, BACKUP_ALPN).await?;
     let (mut send_stream, mut recv_stream) = conn.open_bi().await?;
@@ -318,13 +335,9 @@ pub async fn get_backup2(
     // Send an acknowledgement, but ignore the errors.
     // We have imported backup successfully already.
     send_stream.write_all(b".").await.ok();
-    send_stream.finish().ok();
+    send_stream.finish().await.ok();
     info!(context, "Sent backup reception acknowledgment.");
 
-    // Wait for the peer to acknowledge reception of the acknowledgement
-    // before closing the connection.
-    _ = send_stream.stopped().await;
-
     Ok(())
 }
 
@@ -336,39 +349,207 @@ pub async fn get_backup2(
 ///
 /// This is a long running operation which will return only when completed.
 ///
-/// Using [`Qr`] as argument is a bit odd as it only accepts specific variant of it.  It
-/// does avoid having [`iroh_net::NodeAddr`] in the primary API however, without
+/// Using [`Qr`] as argument is a bit odd as it only accepts specific variants of it.  It
+/// does avoid having [`iroh_old::provider::Ticket`] in the primary API however, without
 /// having to revert to untyped bytes.
 pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
     match qr {
+        Qr::Backup { .. } => get_legacy_backup(context, qr).await?,
         Qr::Backup2 {
             node_addr,
             auth_token,
-        } => {
-            let cancel_token = context.alloc_ongoing().await?;
-            let res = get_backup2(context, node_addr, auth_token)
-                .race(async {
-                    cancel_token.recv().await.ok();
-                    Err(format_err!("Backup reception cancelled"))
-                })
-                .await;
-            if res.is_err() {
-                context.emit_event(EventType::ImexProgress(0));
-            }
-            context.free_ongoing().await;
-            res?;
-        }
-        _ => bail!("QR code for backup must be of type DCBACKUP2"),
+        } => get_backup2(context, node_addr, auth_token).await?,
+        _ => bail!("QR code for backup must be of type DCBACKUP or DCBACKUP2"),
     }
     Ok(())
 }
 
+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"),
+    };
+
+    match transfer_from_provider(context, &ticket).await {
+        Ok(()) => {
+            context.sql.run_migrations(context).await?;
+            delete_and_reset_all_device_msgs(context).await?;
+            context.emit_event(ReceiveProgress::Completed.into());
+            Ok(())
+        }
+        Err(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());
+            Err(err)
+        }
+    }
+}
+
+async fn transfer_from_provider(context: &Context, ticket: &Ticket) -> Result<()> {
+    let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
+    spawn_progress_proxy(context.clone(), progress.subscribe());
+    let on_connected = || {
+        context.emit_event(ReceiveProgress::Connected.into());
+        async { Ok(()) }
+    };
+    let on_collection = |collection: &Collection| {
+        context.emit_event(ReceiveProgress::CollectionReceived.into());
+        progress.set_total(collection.total_blobs_size());
+        async { Ok(()) }
+    };
+    let jobs = Mutex::new(JoinSet::default());
+    let on_blob =
+        |hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
+
+    // Perform the transfer.
+    let keylog = false; // Do not enable rustls SSLKEYLOGFILE env var functionality
+    let stats = iroh_old::get::run_ticket(
+        ticket,
+        keylog,
+        MAX_CONCURRENT_DIALS,
+        on_connected,
+        on_collection,
+        on_blob,
+    )
+    .await?;
+
+    let mut jobs = jobs.lock().await;
+    while let Some(job) = jobs.join_next().await {
+        job.context("job failed")?;
+    }
+    drop(progress);
+    info!(
+        context,
+        "Backup transfer finished, transfer rate was {} Mbps.",
+        stats.mbits()
+    );
+    Ok(())
+}
+
+/// 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: iroh_old::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_else(|| 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::Viewtype;
     use crate::test_utils::TestContextManager;
 
     use super::*;
@@ -382,7 +563,8 @@ mod tests {
 
         // Write a message in the self chat
         let self_chat = ctx0.get_self_chat().await;
-        let mut msg = Message::new_text("hi there".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi there".to_string());
         send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();
 
         // Send an attachment in the self chat

src/key.rs

@@ -244,7 +244,7 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     let _guard = context.generating_key_mutex.lock().await;
 
     // Check if the key appeared while we were waiting on the lock.
-    match load_keypair(context).await? {
+    match load_keypair(context, &addr).await? {
         Some(key_pair) => Ok(key_pair),
         None => {
             let start = tools::Time::now();
@@ -266,7 +266,10 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     }
 }
 
-pub(crate) async fn load_keypair(context: &Context) -> Result<Option<KeyPair>> {
+pub(crate) async fn load_keypair(
+    context: &Context,
+    addr: &EmailAddress,
+) -> Result<Option<KeyPair>> {
     let res = context
         .sql
         .query_row_optional(
@@ -284,6 +287,7 @@ pub(crate) async fn load_keypair(context: &Context) -> Result<Option<KeyPair>> {
 
     Ok(if let Some((pub_bytes, sec_bytes)) = res {
         Some(KeyPair {
+            addr: addr.clone(),
             public: SignedPublicKey::from_slice(&pub_bytes)?,
             secret: SignedSecretKey::from_slice(&sec_bytes)?,
         })
@@ -333,11 +337,17 @@ pub(crate) async fn store_self_keypair(
                 KeyPairUse::ReadOnly => false,
             };
 
+            // `addr` and `is_default` written for compatibility with older versions,
+            // until new cores are rolled out everywhere.
+            // otherwise "add second device" or "backup" may break.
+            // moreover, this allows downgrades to the previous version.
+            // writing of `addr` and `is_default` can be removed ~ 2024-08
+            let addr = keypair.addr.to_string();
             transaction
                 .execute(
-                    "INSERT OR REPLACE INTO keypairs (public_key, private_key)
-                     VALUES (?,?)",
-                    (&public_key, &secret_key),
+                    "INSERT OR REPLACE INTO keypairs (public_key, private_key, addr, is_default)
+                     VALUES (?,?,?,?)",
+                    (&public_key, &secret_key, addr, is_default),
                 )
                 .context("Failed to insert keypair")?;
 
@@ -367,10 +377,15 @@ pub(crate) async fn store_self_keypair(
 /// This API is used for testing purposes
 /// to avoid generating the key in tests.
 /// Use import/export APIs instead.
-pub async fn preconfigure_keypair(context: &Context, secret_data: &str) -> Result<()> {
+pub async fn preconfigure_keypair(context: &Context, addr: &str, secret_data: &str) -> Result<()> {
+    let addr = EmailAddress::new(addr)?;
     let secret = SignedSecretKey::from_asc(secret_data)?.0;
     let public = secret.split_public_key()?;
-    let keypair = KeyPair { public, secret };
+    let keypair = KeyPair {
+        addr,
+        public,
+        secret,
+    };
     store_self_keypair(context, &keypair, KeyPairUse::Default).await?;
     Ok(())
 }

src/lib.rs

@@ -84,6 +84,7 @@ mod scheduler;
 pub mod securejoin;
 mod simplify;
 mod smtp;
+mod socks;
 pub mod stock_str;
 mod sync;
 mod timesmearing;

src/location.rs

@@ -290,7 +290,8 @@ pub async fn send_locations_to_chat(
         )
         .await?;
     if 0 != seconds && !is_sending_locations_before {
-        let mut msg = Message::new_text(stock_str::msg_location_enabled(context).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = stock_str::msg_location_enabled(context).await;
         msg.param.set_cmd(SystemMessage::LocationStreamingEnabled);
         chat::send_msg(context, chat_id, &mut msg)
             .await

src/message.rs

@@ -148,6 +148,21 @@ impl MsgId {
         Ok(())
     }
 
+    /// Deletes a message, corresponding MDNs and unsent SMTP messages from the database.
+    pub(crate) async fn delete_from_db(self, context: &Context) -> Result<()> {
+        context
+            .sql
+            .transaction(move |transaction| {
+                transaction.execute("DELETE FROM smtp WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs_mdns WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs_status_updates WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs WHERE id=?", (self,))?;
+                Ok(())
+            })
+            .await?;
+        Ok(())
+    }
+
     pub(crate) async fn set_delivered(self, context: &Context) -> Result<()> {
         update_msg_state(context, self, MessageState::OutDelivered).await?;
         let chat_id: ChatId = context
@@ -204,13 +219,11 @@ impl MsgId {
     }
 
     /// Returns information about hops of a message, used for message info
-    pub async fn hop_info(self, context: &Context) -> Result<String> {
-        let hop_info = context
+    pub async fn hop_info(self, context: &Context) -> Result<Option<String>> {
+        context
             .sql
-            .query_get_value("SELECT IFNULL(hop_info, '') FROM msgs WHERE id=?", (self,))
-            .await?
-            .with_context(|| format!("Message {self} not found"))?;
-        Ok(hop_info)
+            .query_get_value("SELECT hop_info FROM msgs WHERE id=?", (self,))
+            .await
     }
 
     /// Returns detailed message information in a multi-line text form.
@@ -315,12 +328,7 @@ impl MsgId {
 
         if let Some(path) = msg.get_file(context) {
             let bytes = get_filebytes(context, &path).await?;
-            ret += &format!(
-                "\nFile: {}, name: {}, {} bytes\n",
-                path.display(),
-                msg.get_filename().unwrap_or_default(),
-                bytes
-            );
+            ret += &format!("\nFile: {}, {} bytes\n", path.display(), bytes);
         }
 
         if msg.viewtype != Viewtype::Text {
@@ -353,11 +361,7 @@ impl MsgId {
         let hop_info = self.hop_info(context).await?;
 
         ret += "\n\n";
-        if hop_info.is_empty() {
-            ret += "No Hop Info";
-        } else {
-            ret += &hop_info;
-        }
+        ret += &hop_info.unwrap_or_else(|| "No Hop Info".to_owned());
 
         Ok(ret)
     }
@@ -491,15 +495,6 @@ impl Message {
         }
     }
 
-    /// Creates a new message with Viewtype::Text.
-    pub fn new_text(text: String) -> Self {
-        Message {
-            viewtype: Viewtype::Text,
-            text,
-            ..Default::default()
-        }
-    }
-
     /// Loads message with given ID from the database.
     ///
     /// Returns an error if the message does not exist.
@@ -1820,8 +1815,8 @@ pub(crate) async fn update_msg_state(
     context
         .sql
         .execute(
-            &format!("UPDATE msgs SET state=? {error_subst} WHERE id=?"),
-            (state, msg_id),
+            &format!("UPDATE msgs SET state=?1 {error_subst} WHERE id=?2 AND (?1!=?3 OR state<?3)"),
+            (state, msg_id, MessageState::OutDelivered),
         )
         .await?;
     Ok(())
@@ -1909,7 +1904,6 @@ pub async fn get_request_msg_cnt(context: &Context) -> usize {
 
 /// Estimates the number of messages that will be deleted
 /// by the options `delete_device_after` or `delete_server_after`.
-///
 /// This is typically used to show the estimated impact to the user
 /// before actually enabling deletion of old messages.
 ///
@@ -1999,9 +1993,7 @@ pub(crate) async fn rfc724_mid_exists_ex(
         .query_row_optional(
             &("SELECT id, timestamp_sent, MIN(".to_string()
                 + expr
-                + ") FROM msgs WHERE rfc724_mid=?
-              HAVING COUNT(*) > 0 -- Prevent MIN(expr) from returning NULL when there are no rows.
-              ORDER BY timestamp_sent DESC"),
+                + ") FROM msgs WHERE rfc724_mid=? ORDER BY timestamp_sent DESC"),
             (rfc724_mid,),
             |row| {
                 let msg_id: MsgId = row.get(0)?;
@@ -2342,7 +2334,8 @@ mod tests {
 
         let chat = d.create_chat_with_contact("", "dest@example.com").await;
 
-        let mut msg = Message::new_text("Quoted message".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Quoted message".to_string());
 
         // Prepare message for sending, so it gets a Message-Id.
         assert!(msg.rfc724_mid.is_empty());
@@ -2364,25 +2357,6 @@ mod tests {
         assert_eq!(quoted_msg.get_text(), msg2.quoted_text().unwrap());
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_no_quote() {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        tcm.send_recv_accept(alice, bob, "Hi!").await;
-        let msg = tcm
-            .send_recv(
-                alice,
-                bob,
-                "On 2024-08-28, Alice wrote:\n> A quote.\nNot really.",
-            )
-            .await;
-
-        assert!(msg.quoted_text().is_none());
-        assert!(msg.quoted_message(bob).await.unwrap().is_none());
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_unencrypted_quote_encrypted_message() -> Result<()> {
         let mut tcm = TestContextManager::new();
@@ -2408,8 +2382,9 @@ mod tests {
         add_contact_to_chat(alice, alice_group, alice_flubby_contact_id).await?;
 
         // Alice quotes encrypted message in unencrypted chat.
-        let mut msg = Message::new_text("unencrypted".to_string());
+        let mut msg = Message::new(Viewtype::Text);
         msg.set_quote(alice, Some(&alice_received_message)).await?;
+        msg.set_text("unencrypted".to_string());
         chat::send_msg(alice, alice_group, &mut msg).await?;
 
         let bob_received_message = bob.recv_msg(&alice.pop_sent_msg().await).await;
@@ -2467,7 +2442,8 @@ mod tests {
             .unwrap();
         let contact = Contact::get_by_id(&alice, contact_id).await.unwrap();
 
-        let mut msg = Message::new_text("bla blubb".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("bla blubb".to_string());
         msg.set_override_sender_name(Some("over ride".to_string()));
         assert_eq!(
             msg.get_override_sender_name(),
@@ -2514,7 +2490,8 @@ mod tests {
         let alice = TestContext::new_alice().await;
         let bob = TestContext::new_bob().await;
         let alice_chat = alice.create_chat(&bob).await;
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());
 
         // alice sends to bob,
         assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
@@ -2599,7 +2576,8 @@ mod tests {
         }
 
         // check outgoing messages states on sender side
-        let mut alice_msg = Message::new_text("hi!".to_string());
+        let mut alice_msg = Message::new(Viewtype::Text);
+        alice_msg.set_text("hi!".to_string());
         assert_eq!(alice_msg.get_state(), MessageState::Undefined); // message not yet in db, assert_state() won't work
 
         alice_chat
@@ -2782,7 +2760,8 @@ def hello():
         let chat = alice
             .create_chat_with_contact("Bob", "bob@example.org")
             .await;
-        let mut msg = Message::new_text("hi".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi".to_string());
         assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
             .await
             .is_err());

src/mimefactory.rs

@@ -20,7 +20,6 @@ use crate::e2ee::EncryptHelper;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::headerdef::HeaderDef;
 use crate::html::new_html_mimepart;
-use crate::location;
 use crate::message::{self, Message, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
 use crate::param::Param;
@@ -33,6 +32,7 @@ use crate::tools::{
     create_outgoing_rfc724_mid, create_smeared_timestamp, remove_subject_prefix, time,
 };
 use crate::webxdc::StatusUpdateSerial;
+use crate::{location, peer_channels};
 
 // attachments of 25 mb brutto should work on the majority of providers
 // (brutto examples: web.de=50, 1&1=40, t-online.de=32, gmail=25, posteo=50, yahoo=25, all-inkl=100).
@@ -82,10 +82,7 @@ pub struct MimeFactory {
     /// as needed.
     references: String,
 
-    /// True if the message requests Message Disposition Notification
-    /// using `Chat-Disposition-Notification-To` header.
     req_mdn: bool,
-
     last_added_location_id: Option<u32>,
 
     /// If the created mime-structure contains sync-items,
@@ -107,8 +104,10 @@ pub struct RenderedEmail {
     pub is_gossiped: bool,
     pub last_added_location_id: Option<u32>,
 
-    /// A comma-separated string of sync-IDs that are used by the rendered email and must be deleted
-    /// from `multi_device_sync` once the message is actually queued for sending.
+    /// A comma-separated string of sync-IDs that are used by the rendered email
+    /// and must be deleted once the message is actually queued for sending
+    /// (deletion must be done by `delete_sync_ids()`).
+    /// If the rendered email is not queued for sending, the IDs must not be deleted.
     pub sync_ids_to_delete: Option<String>,
 
     /// Message ID (Message in the sense of Email)
@@ -118,13 +117,6 @@ pub struct RenderedEmail {
     pub subject: String,
 }
 
-fn new_address_with_name(name: &str, address: String) -> Address {
-    match name == address {
-        true => Address::new_mailbox(address),
-        false => Address::new_mailbox_with_name(name.to_string(), address),
-    }
-}
-
 impl MimeFactory {
     pub async fn from_msg(context: &Context, msg: Message) -> Result<MimeFactory> {
         let chat = Chat::load_from_db(context, msg.chat_id).await?;
@@ -151,9 +143,7 @@ impl MimeFactory {
         let mut req_mdn = false;
 
         if chat.is_self_talk() {
-            if msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage {
-                recipients.push((from_displayname.to_string(), from_addr.to_string()));
-            }
+            recipients.push((from_displayname.to_string(), from_addr.to_string()));
         } else if chat.is_mailing_list() {
             let list_post = chat
                 .param
@@ -204,8 +194,7 @@ impl MimeFactory {
         let (in_reply_to, references) = context
             .sql
             .query_row(
-                "SELECT mime_in_reply_to, IFNULL(mime_references, '')
-                 FROM msgs WHERE id=?",
+                "SELECT mime_in_reply_to, mime_references FROM msgs WHERE id=?",
                 (msg.id,),
                 |row| {
                     let in_reply_to: String = row.get(0)?;
@@ -355,11 +344,7 @@ impl MimeFactory {
                     // beside key- and member-changes, force a periodic re-gossip.
                     let gossiped_timestamp = chat.id.get_gossiped_timestamp(context).await?;
                     let gossip_period = context.get_config_i64(Config::GossipPeriod).await?;
-                    // `gossip_period == 0` is a special case for testing,
-                    // enabling gossip in every message.
-                    // Othewise "smeared timestamps" may result in the condition
-                    // to fail even if the clock is monotonic.
-                    if gossip_period == 0 || time() >= gossiped_timestamp + gossip_period {
+                    if time() >= gossiped_timestamp + gossip_period {
                         Ok(true)
                     } else {
                         Ok(false)
@@ -487,7 +472,10 @@ impl MimeFactory {
     pub async fn render(mut self, context: &Context) -> Result<RenderedEmail> {
         let mut headers = Vec::<Header>::new();
 
-        let from = new_address_with_name(&self.from_displayname, self.from_addr.clone());
+        let from = Address::new_mailbox_with_name(
+            self.from_displayname.to_string(),
+            self.from_addr.clone(),
+        );
 
         let undisclosed_recipients = match &self.loaded {
             Loaded::Message { chat, .. } => chat.typ == Chattype::Broadcast,
@@ -522,7 +510,10 @@ impl MimeFactory {
                 if name.is_empty() {
                     to.push(Address::new_mailbox(addr.clone()));
                 } else {
-                    to.push(new_address_with_name(name, addr.clone()));
+                    to.push(Address::new_mailbox_with_name(
+                        name.to_string(),
+                        addr.clone(),
+                    ));
                 }
             }
 
@@ -537,7 +528,8 @@ impl MimeFactory {
         headers.push(from_header.clone());
 
         if let Some(sender_displayname) = &self.sender_displayname {
-            let sender = new_address_with_name(sender_displayname, self.from_addr.clone());
+            let sender =
+                Address::new_mailbox_with_name(sender_displayname.clone(), self.from_addr.clone());
             headers.push(Header::new_with_value("Sender".into(), vec![sender]).unwrap());
         }
         headers.push(Header::new_with_value("To".into(), to.clone()).unwrap());
@@ -587,16 +579,6 @@ impl MimeFactory {
                 "Auto-Submitted".to_string(),
                 "auto-generated".to_string(),
             ));
-        } else if let Loaded::Message { msg, .. } = &self.loaded {
-            if msg.param.get_cmd() == SystemMessage::SecurejoinMessage {
-                let step = msg.param.get(Param::Arg).unwrap_or_default();
-                if step != "vg-request" && step != "vc-request" {
-                    headers.push(Header::new(
-                        "Auto-Submitted".to_string(),
-                        "auto-replied".to_string(),
-                    ));
-                }
-            }
         }
 
         if let Loaded::Message { chat, .. } = &self.loaded {
@@ -617,9 +599,7 @@ impl MimeFactory {
             // because replies to "Disposition-Notification-To" are weird in many cases
             // eg. are just freetext and/or do not follow any standard.
             headers.push(Header::new(
-                HeaderDef::ChatDispositionNotificationTo
-                    .get_headername()
-                    .to_string(),
+                "Chat-Disposition-Notification-To".into(),
                 self.from_addr.clone(),
             ));
         }
@@ -746,18 +726,18 @@ impl MimeFactory {
             } else if header_name == "autocrypt" {
                 unprotected_headers.push(header.clone());
             } else if header_name == "from" {
-                // Unencrypted securejoin messages should _not_ include the display name:
-                if is_encrypted || !is_securejoin_message {
-                    protected_headers.push(header.clone());
+                protected_headers.push(header.clone());
+                if is_encrypted && verified || is_securejoin_message {
+                    unprotected_headers.push(
+                        Header::new_with_value(
+                            header.name,
+                            vec![Address::new_mailbox(self.from_addr.clone())],
+                        )
+                        .unwrap(),
+                    );
+                } else {
+                    unprotected_headers.push(header);
                 }
-
-                unprotected_headers.push(
-                    Header::new_with_value(
-                        header.name,
-                        vec![Address::new_mailbox(self.from_addr.clone())],
-                    )
-                    .unwrap(),
-                );
             } else if header_name == "to" {
                 protected_headers.push(header.clone());
                 if is_encrypted {
@@ -922,11 +902,12 @@ impl MimeFactory {
                 .fold(message, |message, header| message.header(header.clone()));
 
             if skip_autocrypt || !context.get_config_bool(Config::SignUnencrypted).await? {
-                // Deduplicate unprotected headers that also are in the protected headers:
-                let protected: HashSet<&str> =
-                    HashSet::from_iter(protected_headers.iter().map(|h| h.name.as_str()));
-                unprotected_headers.retain(|h| !protected.contains(&h.name.as_str()));
-
+                let protected: HashSet<Header> = HashSet::from_iter(protected_headers.into_iter());
+                for h in unprotected_headers.split_off(0) {
+                    if !protected.contains(&h) {
+                        unprotected_headers.push(h);
+                    }
+                }
                 message
             } else {
                 let message = message.header(get_content_type_directives_header());
@@ -1387,7 +1368,8 @@ impl MimeFactory {
             let json = msg.param.get(Param::Arg).unwrap_or_default();
             parts.push(context.build_status_update_part(json));
         } else if msg.viewtype == Viewtype::Webxdc {
-            headers.push(create_iroh_header(context, msg.id).await?);
+            let topic = peer_channels::create_random_topic();
+            headers.push(create_iroh_header(context, topic, msg.id).await?);
             if let (Some(json), _) = context
                 .render_webxdc_status_update_object(
                     msg.id,
@@ -1683,7 +1665,10 @@ mod tests {
             .chars()
             .all(|c| c.is_ascii_alphanumeric() || c == ' '));
 
-        let s = format!("{}", new_address_with_name(display_name, addr.to_string()));
+        let s = format!(
+            "{}",
+            Address::new_mailbox_with_name(display_name.to_string(), addr.to_string())
+        );
 
         println!("{s}");
 
@@ -1700,19 +1685,15 @@ mod tests {
             .chars()
             .all(|c| c.is_ascii_alphanumeric() || c == ' '));
 
-        let s = format!("{}", new_address_with_name(display_name, addr.to_string()));
+        let s = format!(
+            "{}",
+            Address::new_mailbox_with_name(display_name.to_string(), addr.to_string())
+        );
 
         // Addresses should not be unnecessarily be encoded, see <https://github.com/deltachat/deltachat-core-rust/issues/1575>:
         assert_eq!(s, "a space <x@y.org>");
     }
 
-    #[test]
-    fn test_render_email_address_duplicated_as_name() {
-        let addr = "x@y.org";
-        let s = format!("{}", new_address_with_name(addr, addr.to_string()));
-        assert_eq!(s, "<x@y.org>");
-    }
-
     #[test]
     fn test_render_rfc724_mid() {
         assert_eq!(
@@ -1982,7 +1963,8 @@ mod tests {
             group_id: ChatId,
             quote: Option<&Message>,
         ) -> Result<String> {
-            let mut new_msg = Message::new_text("Hi".to_string());
+            let mut new_msg = Message::new(Viewtype::Text);
+            new_msg.set_text("Hi".to_string());
             if let Some(q) = quote {
                 new_msg.set_quote(t, Some(q)).await?;
             }
@@ -2068,7 +2050,8 @@ mod tests {
 
         let chat_id = ChatId::create_for_contact(&t, contact_id).await.unwrap();
 
-        let mut new_msg = Message::new_text("Hi".to_string());
+        let mut new_msg = Message::new(Viewtype::Text);
+        new_msg.set_text("Hi".to_string());
         new_msg.chat_id = chat_id;
         chat::prepare_msg(&t, chat_id, &mut new_msg).await.unwrap();
 
@@ -2175,7 +2158,8 @@ mod tests {
         let chat_id = chats.get_chat_id(0).unwrap();
         chat_id.accept(context).await.unwrap();
 
-        let mut new_msg = Message::new_text("Hi".to_string());
+        let mut new_msg = Message::new(Viewtype::Text);
+        new_msg.set_text("Hi".to_string());
         new_msg.chat_id = chat_id;
         chat::prepare_msg(context, chat_id, &mut new_msg)
             .await
@@ -2251,7 +2235,7 @@ mod tests {
                 if name.is_empty() {
                     Address::new_mailbox(addr.to_string())
                 } else {
-                    new_address_with_name(name, addr.to_string())
+                    Address::new_mailbox_with_name(name.to_string(), addr.to_string())
                 }
             })
             .collect();
@@ -2292,7 +2276,8 @@ mod tests {
 
         // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
         // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());
 
         let sent_msg = t.send_msg(chat.id, &mut msg).await;
         let mut payload = sent_msg.payload().splitn(3, "\r\n\r\n");
@@ -2358,7 +2343,8 @@ mod tests {
         // send message to bob: that should get multipart/signed.
         // `Subject:` is protected by copying it.
         // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());
 
         let sent_msg = t.send_msg(chat.id, &mut msg).await;
         let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");
@@ -2491,7 +2477,8 @@ mod tests {
 
         // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
         // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());
 
         let sent_msg = t.send_msg(chat.id, &mut msg).await;
         let payload = sent_msg.payload();

src/mimeparser.rs

@@ -17,7 +17,7 @@ use crate::aheader::{Aheader, EncryptPreference};
 use crate::blob::BlobObject;
 use crate::chat::{add_info_msg, ChatId};
 use crate::config::Config;
-use crate::constants::{self, Chattype};
+use crate::constants::{self, Chattype, DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
 use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
 use crate::decrypt::{
@@ -34,7 +34,7 @@ use crate::peerstate::Peerstate;
 use crate::simplify::{simplify, SimplifiedText};
 use crate::sync::SyncItems;
 use crate::tools::{
-    create_smeared_timestamp, get_filemeta, parse_receive_headers, smeared_time, truncate_msg_text,
+    create_smeared_timestamp, get_filemeta, parse_receive_headers, smeared_time, truncate_by_lines,
     validate_id,
 };
 use crate::{chatlist_events, location, stock_str, tools};
@@ -770,15 +770,6 @@ impl MimeMessage {
         Ok(())
     }
 
-    /// Set different sender name for a message.
-    /// This overrides the name set by the `set_config()`-option `displayname`.
-    pub fn set_override_sender_name(&mut self, name: Option<String>) {
-        self.parts.iter_mut().for_each(|part| {
-            part.param
-                .set_optional(Param::OverrideSenderDisplayname, name.clone());
-        });
-    }
-
     async fn avatar_action_from_header(
         &mut self,
         context: &Context,
@@ -1188,11 +1179,22 @@ impl MimeMessage {
                             (simplified_txt, top_quote)
                         };
 
-                        let (simplified_txt, was_truncated) =
-                            truncate_msg_text(context, simplified_txt).await?;
-                        if was_truncated {
-                            self.is_mime_modified = was_truncated;
-                        }
+                        let is_bot = context.get_config_bool(Config::Bot).await?;
+
+                        let simplified_txt = if is_bot {
+                            simplified_txt
+                        } else {
+                            // Truncate text if it has too many lines
+                            let (simplified_txt, was_truncated) = truncate_by_lines(
+                                simplified_txt,
+                                DC_DESIRED_TEXT_LINES,
+                                DC_DESIRED_TEXT_LINE_LEN,
+                            );
+                            if was_truncated {
+                                self.is_mime_modified = was_truncated;
+                            }
+                            simplified_txt
+                        };
 
                         if !simplified_txt.is_empty() || simplified_quote.is_some() {
                             let mut part = Part {
@@ -2249,22 +2251,12 @@ async fn handle_ndn(
     } else {
         "Delivery to at least one recipient failed.".to_string()
     };
-    let err_msg = &error;
 
     let mut first = true;
     for msg in msgs {
         let (msg_id, chat_id, chat_type) = msg?;
         let mut message = Message::load_from_db(context, msg_id).await?;
-        let aggregated_error = message
-            .error
-            .as_ref()
-            .map(|err| format!("{}\n\n{}", err, err_msg));
-        set_msg_failed(
-            context,
-            &mut message,
-            aggregated_error.as_ref().unwrap_or(err_msg),
-        )
-        .await?;
+        set_msg_failed(context, &mut message, &error).await?;
         if first {
             // Add only one info msg for all failed messages
             ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
@@ -3617,31 +3609,8 @@ On 2020-10-25, Bob wrote:
             assert!(mimemsg.parts[0].msg.len() <= DC_DESIRED_TEXT_LEN + DC_ELLIPSIS.len());
         }
 
-        for draft in [false, true] {
-            let chat = t.get_self_chat().await;
-            let mut msg = Message::new_text(long_txt.clone());
-            if draft {
-                chat.id.set_draft(&t, Some(&mut msg)).await?;
-            }
-            t.send_msg(chat.id, &mut msg).await;
-            let msg = t.get_last_msg_in(chat.id).await;
-            assert!(msg.has_html());
-            assert_eq!(
-                msg.id
-                    .get_html(&t)
-                    .await?
-                    .unwrap()
-                    .matches("just repeated")
-                    .count(),
-                REPEAT_CNT
-            );
-            assert!(
-                msg.text.matches("just repeated").count() <= DC_DESIRED_TEXT_LEN / REPEAT_TXT.len()
-            );
-            assert!(msg.text.len() <= DC_DESIRED_TEXT_LEN + DC_ELLIPSIS.len());
-        }
-
         t.set_config(Config::Bot, Some("1")).await?;
+
         {
             let mimemsg = MimeMessage::from_bytes(&t, long_txt.as_ref(), None).await?;
             assert!(!mimemsg.is_mime_modified);

src/net.rs

@@ -1,5 +1,4 @@
 //! # Common network utilities.
-use std::future::Future;
 use std::net::SocketAddr;
 use std::pin::Pin;
 use std::time::Duration;
@@ -7,17 +6,14 @@ use std::time::Duration;
 use anyhow::{format_err, Context as _, Result};
 use async_native_tls::TlsStream;
 use tokio::net::TcpStream;
-use tokio::task::JoinSet;
 use tokio::time::timeout;
 use tokio_io_timeout::TimeoutStream;
 
 use crate::context::Context;
-use crate::sql::Sql;
 use crate::tools::time;
 
 pub(crate) mod dns;
 pub(crate) mod http;
-pub(crate) mod proxy;
 pub(crate) mod session;
 pub(crate) mod tls;
 
@@ -47,14 +43,6 @@ pub(crate) async fn prune_connection_history(context: &Context) -> Result<()> {
     Ok(())
 }
 
-/// Update the timestamp of the last successfull connection
-/// to the given `host` and `port`
-/// with the given application protocol `alpn`.
-///
-/// `addr` is the string representation of IP address.
-/// If connection is made over a proxy which does
-/// its own DNS resolution,
-/// `addr` should be the same as `host`.
 pub(crate) async fn update_connection_history(
     context: &Context,
     alpn: &str,
@@ -76,22 +64,21 @@ pub(crate) async fn update_connection_history(
     Ok(())
 }
 
-/// Returns timestamp of the most recent successful connection
-/// to the host and port for given protocol.
 pub(crate) async fn load_connection_timestamp(
-    sql: &Sql,
+    context: &Context,
     alpn: &str,
     host: &str,
     port: u16,
-    addr: Option<&str>,
+    addr: &str,
 ) -> Result<Option<i64>> {
-    let timestamp = sql
+    let timestamp = context
+        .sql
         .query_get_value(
             "SELECT timestamp FROM connection_history
              WHERE host = ?
                AND port = ?
                AND alpn = ?
-               AND addr = IFNULL(?, addr)",
+               AND addr = ?",
             (host, port, alpn, addr),
         )
         .await?;
@@ -127,103 +114,13 @@ pub(crate) async fn connect_tls_inner(
     addr: SocketAddr,
     host: &str,
     strict_tls: bool,
-    alpn: &[&str],
+    alpn: &str,
 ) -> Result<TlsStream<Pin<Box<TimeoutStream<TcpStream>>>>> {
     let tcp_stream = connect_tcp_inner(addr).await?;
     let tls_stream = wrap_tls(strict_tls, host, alpn, tcp_stream).await?;
     Ok(tls_stream)
 }
 
-/// Runs connection attempt futures.
-///
-/// Accepts iterator of connection attempt futures
-/// and runs them until one of them succeeds
-/// or all of them fail.
-///
-/// If all connection attempts fail, returns the first error.
-///
-/// This functions starts with one connection attempt and maintains
-/// up to five parallel connection attempts if connecting takes time.
-pub(crate) async fn run_connection_attempts<O, I, F>(mut futures: I) -> Result<O>
-where
-    I: Iterator<Item = F>,
-    F: Future<Output = Result<O>> + Send + 'static,
-    O: Send + 'static,
-{
-    let mut connection_attempt_set = JoinSet::new();
-
-    // Start additional connection attempts after 300 ms, 1 s, 5 s and 10 s.
-    // This way we can have up to 5 parallel connection attempts at the same time.
-    let mut delay_set = JoinSet::new();
-    for delay in [
-        Duration::from_millis(300),
-        Duration::from_secs(1),
-        Duration::from_secs(5),
-        Duration::from_secs(10),
-    ] {
-        delay_set.spawn(tokio::time::sleep(delay));
-    }
-
-    let mut first_error = None;
-
-    let res = loop {
-        if let Some(fut) = futures.next() {
-            connection_attempt_set.spawn(fut);
-        }
-
-        tokio::select! {
-            biased;
-
-            res = connection_attempt_set.join_next() => {
-                match res {
-                    Some(res) => {
-                        match res.context("Failed to join task") {
-                            Ok(Ok(conn)) => {
-                                // Successfully connected.
-                                break Ok(conn);
-                            }
-                            Ok(Err(err)) => {
-                                // Some connection attempt failed.
-                                first_error.get_or_insert(err);
-                            }
-                            Err(err) => {
-                                break Err(err);
-                            }
-                        }
-                    }
-                    None => {
-                        // Out of connection attempts.
-                        //
-                        // Break out of the loop and return error.
-                        break Err(
-                            first_error.unwrap_or_else(|| format_err!("No connection attempts were made"))
-                        );
-                    }
-                }
-            },
-
-            _ = delay_set.join_next(), if !delay_set.is_empty() => {
-                // Delay expired.
-                //
-                // Don't do anything other than pushing
-                // another connection attempt into `connection_attempt_set`.
-            }
-        }
-    };
-
-    // Abort remaining connection attempts and free resources
-    // such as OS sockets and `Context` references
-    // held by connection attempt tasks.
-    //
-    // `delay_set` contains just `sleep` tasks
-    // so no need to await futures there,
-    // it is enough that futures are aborted
-    // when the set is dropped.
-    connection_attempt_set.shutdown().await;
-
-    res
-}
-
 /// If `load_cache` is true, may use cached DNS results.
 /// Because the cache may be poisoned with incorrect results by networks hijacking DNS requests,
 /// this option should only be used when connection is authenticated,
@@ -236,9 +133,22 @@ pub(crate) async fn connect_tcp(
     port: u16,
     load_cache: bool,
 ) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
-    let connection_futures = lookup_host_with_cache(context, host, port, "", load_cache)
-        .await?
-        .into_iter()
-        .map(connect_tcp_inner);
-    run_connection_attempts(connection_futures).await
+    let mut first_error = None;
+
+    for resolved_addr in lookup_host_with_cache(context, host, port, "", load_cache).await? {
+        match connect_tcp_inner(resolved_addr).await {
+            Ok(stream) => {
+                return Ok(stream);
+            }
+            Err(err) => {
+                warn!(
+                    context,
+                    "Failed to connect to {}: {:#}.", resolved_addr, err
+                );
+                first_error.get_or_insert(err);
+            }
+        }
+    }
+
+    Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
 }

src/net/dns.rs

@@ -1,47 +1,6 @@
 //! DNS resolution and cache.
-//!
-//! DNS cache in Delta Chat has two layers:
-//! in-memory cache and persistent `dns_cache` SQL table.
-//!
-//! In-memory cache is using a "stale-while-revalidate" strategy.
-//! If there is a cached value, it is returned immediately
-//! and revalidation task is started in the background
-//! to replace old cached IP addresses with new ones.
-//! If there is no cached value yet,
-//! lookup only finishes when `lookup_host` returns first results.
-//! In-memory cache is shared between all accounts
-//! and is never stored on the disk.
-//! It can be thought of as an extension
-//! of the system resolver.
-//!
-//! Persistent `dns_cache` SQL table is used to collect
-//! all IP addresses ever seen for the hostname
-//! together with the timestamp
-//! of the last time IP address has been seen.
-//! Note that this timestamp reflects the time
-//! IP address was returned by the in-memory cache
-//! rather than the underlying system resolver.
-//! Unused entries are removed after 30 days
-//! (`CACHE_TTL` constant) to avoid having
-//! old non-working IP addresses in the cache indefinitely.
-//!
-//! When Delta Chat needs an IP address for the host,
-//! it queries in-memory cache for the next result
-//! and merges the list of IP addresses
-//! with the list of IP addresses from persistent cache.
-//! Resulting list is constructed
-//! by taking the first two results from the resolver
-//! followed up by persistent cache results
-//! and terminated by the rest of resolver results.
-//!
-//! Persistent cache results are sorted
-//! by the time of the most recent successful connection
-//! using the result. For results that have never been
-//! used for successful connection timestamp of
-//! retrieving them from in-memory cache is used.
 
 use anyhow::{Context as _, Result};
-use std::collections::HashMap;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::str::FromStr;
 use tokio::net::lookup_host;
@@ -50,7 +9,6 @@ use tokio::time::timeout;
 use super::load_connection_timestamp;
 use crate::context::Context;
 use crate::tools::time;
-use once_cell::sync::Lazy;
 
 /// Inserts entry into DNS cache
 /// or updates existing one with a new timestamp.
@@ -82,110 +40,33 @@ pub(crate) async fn prune_dns_cache(context: &Context) -> Result<()> {
     Ok(())
 }
 
-/// Map from hostname to IP addresses.
-///
-/// NOTE: sync RwLock is used, so it must not be held across `.await`
-/// to avoid deadlocks.
-/// See
-/// <https://docs.rs/tokio/1.40.0/tokio/sync/struct.Mutex.html#which-kind-of-mutex-should-you-use>
-/// and
-/// <https://stackoverflow.com/questions/63712823/why-do-i-get-a-deadlock-when-using-tokio-with-a-stdsyncmutex>.
-static LOOKUP_HOST_CACHE: Lazy<parking_lot::RwLock<HashMap<String, Vec<IpAddr>>>> =
-    Lazy::new(Default::default);
-
-/// Wrapper for `lookup_host` that returns IP addresses.
-async fn lookup_ips(host: impl tokio::net::ToSocketAddrs) -> Result<impl Iterator<Item = IpAddr>> {
-    Ok(lookup_host(host)
-        .await
-        .context("DNS lookup failure")?
-        .map(|addr| addr.ip()))
-}
-
-async fn lookup_host_with_memory_cache(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-) -> Result<Vec<IpAddr>> {
-    let stale_result = {
-        let rwlock_read_guard = LOOKUP_HOST_CACHE.read();
-        rwlock_read_guard.get(hostname).cloned()
-    };
-    if let Some(stale_result) = stale_result {
-        // Revalidate the cache in the background.
-        {
-            let context = context.clone();
-            let hostname = hostname.to_string();
-            tokio::spawn(async move {
-                match lookup_ips((hostname.clone(), port)).await {
-                    Ok(res) => {
-                        LOOKUP_HOST_CACHE.write().insert(hostname, res.collect());
-                    }
-                    Err(err) => {
-                        warn!(
-                            context,
-                            "Failed to revalidate results for {hostname:?}: {err:#}."
-                        );
-                    }
-                }
-            });
-        }
-
-        info!(
-            context,
-            "Using memory-cached DNS resolution for {hostname}."
-        );
-        Ok(stale_result)
-    } else {
-        info!(
-            context,
-            "No memory-cached DNS resolution for {hostname} available, waiting for the resolver."
-        );
-        let res: Vec<IpAddr> = lookup_ips((hostname, port)).await?.collect();
-
-        // Insert initial result into the cache.
-        //
-        // There may already be a result from a parallel
-        // task stored, overwriting it is not a problem.
-        LOOKUP_HOST_CACHE
-            .write()
-            .insert(hostname.to_string(), res.clone());
-        Ok(res)
-    }
-}
-
-/// Looks up the hostname and updates
-/// persistent DNS cache on success.
+/// Looks up the hostname and updates DNS cache
+/// on success.
 async fn lookup_host_and_update_cache(
     context: &Context,
     hostname: &str,
     port: u16,
     now: i64,
 ) -> Result<Vec<SocketAddr>> {
-    let res: Vec<IpAddr> = timeout(
-        super::TIMEOUT,
-        lookup_host_with_memory_cache(context, hostname, port),
-    )
-    .await
-    .context("DNS lookup timeout")?
-    .context("DNS lookup with memory cache failure")?;
+    let res: Vec<SocketAddr> = timeout(super::TIMEOUT, lookup_host((hostname, port)))
+        .await
+        .context("DNS lookup timeout")?
+        .context("DNS lookup failure")?
+        .collect();
 
-    for ip in &res {
-        let ip_string = ip.to_string();
+    for addr in &res {
+        let ip_string = addr.ip().to_string();
         if ip_string == hostname {
             // IP address resolved into itself, not interesting to cache.
             continue;
         }
 
-        info!(context, "Resolved {hostname} into {ip}.");
+        info!(context, "Resolved {hostname}:{port} into {addr}.");
 
         // Update the cache.
         update_cache(context, hostname, &ip_string, now).await?;
     }
 
-    let res = res
-        .into_iter()
-        .map(|ip| SocketAddr::new(ip, port))
-        .collect();
     Ok(res)
 }
 
@@ -225,402 +106,71 @@ pub(crate) async fn update_connect_timestamp(
     Ok(())
 }
 
-/// Preloaded DNS results that can be used in case of DNS server failures.
+/// Load hardcoded cache if everything else fails.
 ///
 /// See <https://support.delta.chat/t/no-dns-resolution-result/2778> and
 /// <https://github.com/deltachat/deltachat-core-rust/issues/4920> for reasons.
-static DNS_PRELOAD: Lazy<HashMap<&'static str, Vec<IpAddr>>> = Lazy::new(|| {
-    HashMap::from([
-        (
-            "mail.sangham.net",
+///
+/// In the future we may pre-resolve all provider database addresses
+/// and build them in.
+fn load_hardcoded_cache(hostname: &str, port: u16) -> Vec<SocketAddr> {
+    match hostname {
+        "mail.sangham.net" => {
             vec![
-                IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
-                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
-            ],
-        ),
-        (
-            "nine.testrun.org",
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)), port),
+            ]
+        }
+        "nine.testrun.org" => {
             vec![
-                IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
-                IpAddr::V4(Ipv4Addr::new(128, 140, 126, 197)),
-                IpAddr::V4(Ipv4Addr::new(49, 12, 116, 128)),
-                IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
-            ],
-        ),
-        (
-            "disroot.org",
-            vec![IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139))],
-        ),
-        (
-            "imap.gmail.com",
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)), port),
+            ]
+        }
+        "disroot.org" => {
+            vec![SocketAddr::new(
+                IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139)),
+                port,
+            )]
+        }
+        "mail.riseup.net" => {
             vec![
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 108)),
-                IpAddr::V4(Ipv4Addr::new(66, 102, 1, 109)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
-            ],
-        ),
-        (
-            "smtp.gmail.com",
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)), port),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)), port),
+            ]
+        }
+        "imap.gmail.com" => {
             vec![
-                IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
-            ],
-        ),
-        (
-            "mail.autistici.org",
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
+                    port,
+                ),
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)), port),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)), port),
+            ]
+        }
+        "smtp.gmail.com" => {
             vec![
-                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
-                IpAddr::V4(Ipv4Addr::new(82, 94, 249, 234)),
-                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
-            ],
-        ),
-        (
-            "smtp.autistici.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(198, 167, 222, 108)),
-                IpAddr::V4(Ipv4Addr::new(82, 94, 249, 234)),
-                IpAddr::V4(Ipv4Addr::new(93, 190, 126, 19)),
-            ],
-        ),
-        (
-            "daleth.cafe",
-            vec![IpAddr::V4(Ipv4Addr::new(37, 27, 6, 204))],
-        ),
-        (
-            "imap.163.com",
-            vec![IpAddr::V4(Ipv4Addr::new(111, 124, 203, 45))],
-        ),
-        (
-            "smtp.163.com",
-            vec![IpAddr::V4(Ipv4Addr::new(103, 129, 252, 45))],
-        ),
-        (
-            "imap.aol.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(212, 82, 101, 33)),
-                IpAddr::V4(Ipv4Addr::new(87, 248, 98, 69)),
-            ],
-        ),
-        (
-            "smtp.aol.com",
-            vec![IpAddr::V4(Ipv4Addr::new(87, 248, 97, 31))],
-        ),
-        (
-            "mail.arcor.de",
-            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 234))],
-        ),
-        (
-            "imap.arcor.de",
-            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 230))],
-        ),
-        (
-            "imap.fastmail.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(103, 168, 172, 43)),
-                IpAddr::V4(Ipv4Addr::new(103, 168, 172, 58)),
-            ],
-        ),
-        (
-            "smtp.fastmail.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(103, 168, 172, 45)),
-                IpAddr::V4(Ipv4Addr::new(103, 168, 172, 60)),
-            ],
-        ),
-        (
-            "imap.gmx.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 170)),
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 186)),
-            ],
-        ),
-        (
-            "imap.mail.de",
-            vec![IpAddr::V4(Ipv4Addr::new(62, 201, 172, 16))],
-        ),
-        (
-            "smtp.mailbox.org",
-            vec![IpAddr::V4(Ipv4Addr::new(185, 97, 174, 196))],
-        ),
-        (
-            "imap.mailbox.org",
-            vec![IpAddr::V4(Ipv4Addr::new(185, 97, 174, 199))],
-        ),
-        (
-            "imap.naver.com",
-            vec![IpAddr::V4(Ipv4Addr::new(125, 209, 238, 153))],
-        ),
-        (
-            "imap.ouvaton.coop",
-            vec![IpAddr::V4(Ipv4Addr::new(194, 36, 166, 20))],
-        ),
-        (
-            "imap.purelymail.com",
-            vec![IpAddr::V4(Ipv4Addr::new(18, 204, 123, 63))],
-        ),
-        (
-            "imap.tiscali.it",
-            vec![IpAddr::V4(Ipv4Addr::new(213, 205, 33, 10))],
-        ),
-        (
-            "smtp.tiscali.it",
-            vec![IpAddr::V4(Ipv4Addr::new(213, 205, 33, 13))],
-        ),
-        (
-            "imap.web.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 162)),
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 178)),
-            ],
-        ),
-        (
-            "imap.ziggo.nl",
-            vec![IpAddr::V4(Ipv4Addr::new(84, 116, 6, 3))],
-        ),
-        (
-            "imap.zoho.eu",
-            vec![IpAddr::V4(Ipv4Addr::new(185, 230, 214, 25))],
-        ),
-        (
-            "imaps.bluewin.ch",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(16, 62, 253, 42)),
-                IpAddr::V4(Ipv4Addr::new(16, 63, 141, 244)),
-                IpAddr::V4(Ipv4Addr::new(16, 63, 146, 183)),
-            ],
-        ),
-        (
-            "mail.buzon.uy",
-            vec![IpAddr::V4(Ipv4Addr::new(185, 101, 93, 79))],
-        ),
-        (
-            "mail.ecloud.global",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 246, 96))],
-        ),
-        (
-            "mail.ende.in.net",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 5, 72))],
-        ),
-        (
-            "mail.gmx.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 168)),
-                IpAddr::V4(Ipv4Addr::new(212, 227, 17, 190)),
-            ],
-        ),
-        (
-            "mail.infomaniak.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(83, 166, 143, 44)),
-                IpAddr::V4(Ipv4Addr::new(83, 166, 143, 45)),
-            ],
-        ),
-        (
-            "mail.mymagenta.at",
-            vec![IpAddr::V4(Ipv4Addr::new(80, 109, 253, 241))],
-        ),
-        (
-            "mail.nubo.coop",
-            vec![IpAddr::V4(Ipv4Addr::new(79, 99, 201, 10))],
-        ),
-        (
-            "mail.riseup.net",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)),
-                IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)),
-            ],
-        ),
-        (
-            "mail.systemausfall.org",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(51, 75, 71, 249)),
-                IpAddr::V4(Ipv4Addr::new(80, 153, 252, 42)),
-            ],
-        ),
-        (
-            "mail.systemli.org",
-            vec![IpAddr::V4(Ipv4Addr::new(93, 190, 126, 36))],
-        ),
-        (
-            "mehl.cloud",
-            vec![IpAddr::V4(Ipv4Addr::new(95, 217, 223, 172))],
-        ),
-        (
-            "mx.freenet.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 210)),
-                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 211)),
-                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 212)),
-                IpAddr::V4(Ipv4Addr::new(195, 4, 92, 213)),
-            ],
-        ),
-        (
-            "newyear.aktivix.org",
-            vec![IpAddr::V4(Ipv4Addr::new(162, 247, 75, 192))],
-        ),
-        (
-            "pimap.schulon.org",
-            vec![IpAddr::V4(Ipv4Addr::new(194, 77, 246, 20))],
-        ),
-        (
-            "posteo.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(185, 67, 36, 168)),
-                IpAddr::V4(Ipv4Addr::new(185, 67, 36, 169)),
-            ],
-        ),
-        (
-            "psmtp.schulon.org",
-            vec![IpAddr::V4(Ipv4Addr::new(194, 77, 246, 20))],
-        ),
-        (
-            "secureimap.t-online.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 114)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 115)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 50)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 51)),
-            ],
-        ),
-        (
-            "securesmtp.t-online.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 110)),
-                IpAddr::V4(Ipv4Addr::new(194, 25, 134, 46)),
-            ],
-        ),
-        (
-            "smtp.aliyun.com",
-            vec![IpAddr::V4(Ipv4Addr::new(47, 246, 136, 232))],
-        ),
-        (
-            "smtp.mail.de",
-            vec![IpAddr::V4(Ipv4Addr::new(62, 201, 172, 21))],
-        ),
-        (
-            "smtp.mail.ru",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(217, 69, 139, 160)),
-                IpAddr::V4(Ipv4Addr::new(94, 100, 180, 160)),
-            ],
-        ),
-        (
-            "imap.mail.yahoo.com",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(87, 248, 103, 8)),
-                IpAddr::V4(Ipv4Addr::new(212, 82, 101, 24)),
-            ],
-        ),
-        (
-            "smtp.mail.yahoo.com",
-            vec![IpAddr::V4(Ipv4Addr::new(87, 248, 97, 36))],
-        ),
-        (
-            "imap.mailo.com",
-            vec![IpAddr::V4(Ipv4Addr::new(213, 182, 54, 20))],
-        ),
-        (
-            "smtp.mailo.com",
-            vec![IpAddr::V4(Ipv4Addr::new(213, 182, 54, 20))],
-        ),
-        (
-            "smtp.naver.com",
-            vec![IpAddr::V4(Ipv4Addr::new(125, 209, 238, 155))],
-        ),
-        (
-            "smtp.ouvaton.coop",
-            vec![IpAddr::V4(Ipv4Addr::new(194, 36, 166, 20))],
-        ),
-        (
-            "smtp.purelymail.com",
-            vec![IpAddr::V4(Ipv4Addr::new(18, 204, 123, 63))],
-        ),
-        (
-            "imap.qq.com",
-            vec![IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54))],
-        ),
-        (
-            "smtp.qq.com",
-            vec![IpAddr::V4(Ipv4Addr::new(43, 129, 255, 54))],
-        ),
-        (
-            "imap.rambler.ru",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 169)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 171)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 168)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 170)),
-            ],
-        ),
-        (
-            "smtp.rambler.ru",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 165)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 167)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 166)),
-                IpAddr::V4(Ipv4Addr::new(81, 19, 77, 164)),
-            ],
-        ),
-        (
-            "imap.vivaldi.net",
-            vec![IpAddr::V4(Ipv4Addr::new(31, 209, 137, 15))],
-        ),
-        (
-            "smtp.vivaldi.net",
-            vec![IpAddr::V4(Ipv4Addr::new(31, 209, 137, 12))],
-        ),
-        (
-            "imap.vodafonemail.de",
-            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 230))],
-        ),
-        (
-            "smtp.vodafonemail.de",
-            vec![IpAddr::V4(Ipv4Addr::new(2, 207, 150, 234))],
-        ),
-        (
-            "smtp.web.de",
-            vec![
-                IpAddr::V4(Ipv4Addr::new(213, 165, 67, 108)),
-                IpAddr::V4(Ipv4Addr::new(213, 165, 67, 124)),
-            ],
-        ),
-        (
-            "imap.yandex.com",
-            vec![IpAddr::V4(Ipv4Addr::new(77, 88, 21, 125))],
-        ),
-        (
-            "smtp.yandex.com",
-            vec![IpAddr::V4(Ipv4Addr::new(77, 88, 21, 158))],
-        ),
-        (
-            "smtp.ziggo.nl",
-            vec![IpAddr::V4(Ipv4Addr::new(84, 116, 6, 3))],
-        ),
-        (
-            "smtp.zoho.eu",
-            vec![IpAddr::V4(Ipv4Addr::new(185, 230, 212, 164))],
-        ),
-        (
-            "smtpauths.bluewin.ch",
-            vec![IpAddr::V4(Ipv4Addr::new(195, 186, 120, 54))],
-        ),
-        (
-            "stinpriza.net",
-            vec![IpAddr::V4(Ipv4Addr::new(5, 9, 122, 184))],
-        ),
-        (
-            "undernet.uy",
-            vec![IpAddr::V4(Ipv4Addr::new(167, 62, 254, 153))],
-        ),
-        (
-            "webbox222.server-home.org",
-            vec![IpAddr::V4(Ipv4Addr::new(91, 203, 111, 88))],
-        ),
-    ])
-});
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)), port),
+            ]
+        }
+        _ => Vec::new(),
+    }
+}
 
 async fn lookup_cache(
     context: &Context,
@@ -680,16 +230,11 @@ async fn sort_by_connection_timestamp(
     alpn: &str,
     host: &str,
 ) -> Result<Vec<SocketAddr>> {
-    let mut res: Vec<(Option<i64>, SocketAddr)> = Vec::with_capacity(input.len());
+    let mut res: Vec<(Option<i64>, SocketAddr)> = Vec::new();
     for addr in input {
-        let timestamp = load_connection_timestamp(
-            &context.sql,
-            alpn,
-            host,
-            addr.port(),
-            Some(&addr.ip().to_string()),
-        )
-        .await?;
+        let timestamp =
+            load_connection_timestamp(context, alpn, host, addr.port(), &addr.ip().to_string())
+                .await?;
         res.push((timestamp, addr));
     }
     res.sort_by_key(|(ts, _addr)| std::cmp::Reverse(*ts));
@@ -714,14 +259,9 @@ pub(crate) async fn lookup_host_with_cache(
     load_cache: bool,
 ) -> Result<Vec<SocketAddr>> {
     let now = time();
-    let resolved_addrs = match lookup_host_and_update_cache(context, hostname, port, now).await {
-        Ok(res) => {
-            if alpn.is_empty() {
-                res
-            } else {
-                sort_by_connection_timestamp(context, res, alpn, hostname).await?
-            }
-        }
+    let mut resolved_addrs = match lookup_host_and_update_cache(context, hostname, port, now).await
+    {
+        Ok(res) => res,
         Err(err) => {
             warn!(
                 context,
@@ -730,43 +270,24 @@ pub(crate) async fn lookup_host_with_cache(
             Vec::new()
         }
     };
+    if !alpn.is_empty() {
+        resolved_addrs =
+            sort_by_connection_timestamp(context, resolved_addrs, alpn, hostname).await?;
+    }
 
     if load_cache {
-        let mut cache = lookup_cache(context, hostname, port, alpn, now).await?;
-        if let Some(ips) = DNS_PRELOAD.get(hostname) {
-            for ip in ips {
-                let addr = SocketAddr::new(*ip, port);
-                if !cache.contains(&addr) {
-                    cache.push(addr);
-                }
+        for addr in lookup_cache(context, hostname, port, alpn, now).await? {
+            if !resolved_addrs.contains(&addr) {
+                resolved_addrs.push(addr);
             }
         }
 
-        Ok(merge_with_cache(resolved_addrs, cache))
-    } else {
-        Ok(resolved_addrs)
-    }
-}
-
-/// Merges results received from DNS with cached results.
-///
-/// At most 10 results are returned.
-fn merge_with_cache(
-    mut resolved_addrs: Vec<SocketAddr>,
-    cache: Vec<SocketAddr>,
-) -> Vec<SocketAddr> {
-    let rest = resolved_addrs.split_off(std::cmp::min(resolved_addrs.len(), 2));
-
-    for addr in cache.into_iter().chain(rest.into_iter()) {
-        if !resolved_addrs.contains(&addr) {
-            resolved_addrs.push(addr);
-            if resolved_addrs.len() >= 10 {
-                break;
-            }
+        if resolved_addrs.is_empty() {
+            return Ok(load_hardcoded_cache(hostname, port));
         }
     }
 
-    resolved_addrs
+    Ok(resolved_addrs)
 }
 
 #[cfg(test)]
@@ -1002,131 +523,4 @@ mod tests {
             ],
         );
     }
-
-    #[test]
-    fn test_merge_with_cache() {
-        let first_addr = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1));
-        let second_addr = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 2));
-
-        // If there is no cache, just return resolved addresses.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(first_addr, 993),
-                SocketAddr::new(second_addr, 993),
-            ];
-            let cache = vec![];
-            assert_eq!(
-                merge_with_cache(resolved_addrs.clone(), cache),
-                resolved_addrs
-            );
-        }
-
-        // If cache contains address that is not in resolution results,
-        // it is inserted in the merged result.
-        {
-            let resolved_addrs = vec![SocketAddr::new(first_addr, 993)];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(first_addr, 993),
-                    SocketAddr::new(second_addr, 993),
-                ]
-            );
-        }
-
-        // If cache contains address that is already in resolution results,
-        // it is not duplicated.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(first_addr, 993),
-                SocketAddr::new(second_addr, 993),
-            ];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(first_addr, 993),
-                    SocketAddr::new(second_addr, 993),
-                ]
-            );
-        }
-
-        // If DNS resolvers returns a lot of results,
-        // we should try cached results before going through all
-        // the resolver results.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-            ];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                    SocketAddr::new(second_addr, 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                ]
-            );
-        }
-
-        // Even if cache already contains all the incorrect results
-        // that resolver returns, this should not result in them being sorted to the top.
-        // Cache has known to work result returned first,
-        // so we should try it after the second result.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-            ];
-            let cache = vec![
-                SocketAddr::new(second_addr, 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-            ];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                    SocketAddr::new(second_addr, 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                ]
-            );
-        }
-    }
 }

src/net/http.rs

@@ -1,16 +1,21 @@
 //! # HTTP module.
 
-use anyhow::{anyhow, bail, Context as _, Result};
-use bytes::Bytes;
-use http_body_util::BodyExt;
-use hyper_util::rt::TokioIo;
+use std::sync::Arc;
+
+use anyhow::{anyhow, Result};
 use mime::Mime;
-use serde::Serialize;
+use once_cell::sync::Lazy;
 
 use crate::context::Context;
-use crate::net::proxy::ProxyConfig;
-use crate::net::session::SessionStream;
-use crate::net::tls::wrap_rustls;
+use crate::net::lookup_host_with_cache;
+use crate::socks::Socks5Config;
+
+static LETSENCRYPT_ROOT: Lazy<reqwest::tls::Certificate> = Lazy::new(|| {
+    reqwest::tls::Certificate::from_der(include_bytes!(
+        "../../assets/root-certificates/letsencrypt/isrgrootx1.der"
+    ))
+    .unwrap()
+});
 
 /// HTTP(S) GET response.
 #[derive(Debug)]
@@ -27,94 +32,48 @@ pub struct Response {
 
 /// Retrieves the text contents of URL using HTTP GET request.
 pub async fn read_url(context: &Context, url: &str) -> Result<String> {
-    let response = read_url_blob(context, url).await?;
-    let text = String::from_utf8_lossy(&response.blob);
-    Ok(text.to_string())
-}
-
-async fn get_http_sender<B>(
-    context: &Context,
-    parsed_url: hyper::Uri,
-) -> Result<hyper::client::conn::http1::SendRequest<B>>
-where
-    B: hyper::body::Body + 'static + Send,
-    B::Data: Send,
-    B::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
-{
-    let scheme = parsed_url.scheme_str().context("URL has no scheme")?;
-    let host = parsed_url.host().context("URL has no host")?;
-    let proxy_config_opt = ProxyConfig::load(context).await?;
-
-    let stream: Box<dyn SessionStream> = match scheme {
-        "http" => {
-            let port = parsed_url.port_u16().unwrap_or(80);
-
-            // It is safe to use cached IP addresses
-            // for HTTPS URLs, but for HTTP URLs
-            // better resolve from scratch each time to prevent
-            // cache poisoning attacks from having lasting effects.
-            let load_cache = false;
-            if let Some(proxy_config) = proxy_config_opt {
-                let proxy_stream = proxy_config
-                    .connect(context, host, port, load_cache)
-                    .await?;
-                Box::new(proxy_stream)
-            } else {
-                let tcp_stream = crate::net::connect_tcp(context, host, port, load_cache).await?;
-                Box::new(tcp_stream)
-            }
-        }
-        "https" => {
-            let port = parsed_url.port_u16().unwrap_or(443);
-            let load_cache = true;
-
-            if let Some(proxy_config) = proxy_config_opt {
-                let proxy_stream = proxy_config
-                    .connect(context, host, port, load_cache)
-                    .await?;
-                let tls_stream = wrap_rustls(host, &[], proxy_stream).await?;
-                Box::new(tls_stream)
-            } else {
-                let tcp_stream = crate::net::connect_tcp(context, host, port, load_cache).await?;
-                let tls_stream = wrap_rustls(host, &[], tcp_stream).await?;
-                Box::new(tls_stream)
-            }
-        }
-        _ => bail!("Unknown URL scheme"),
-    };
-
-    let io = TokioIo::new(stream);
-    let (sender, conn) = hyper::client::conn::http1::handshake(io).await?;
-    tokio::task::spawn(conn);
-
-    Ok(sender)
+    Ok(read_url_inner(context, url).await?.text().await?)
 }
 
 /// Retrieves the binary contents of URL using HTTP GET request.
 pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> {
+    let response = read_url_inner(context, url).await?;
+    let content_type = response
+        .headers()
+        .get(reqwest::header::CONTENT_TYPE)
+        .and_then(|value| value.to_str().ok())
+        .and_then(|value| value.parse::<Mime>().ok());
+    let mimetype = content_type
+        .as_ref()
+        .map(|mime| mime.essence_str().to_string());
+    let encoding = content_type.as_ref().and_then(|mime| {
+        mime.get_param(mime::CHARSET)
+            .map(|charset| charset.as_str().to_string())
+    });
+    let blob: Vec<u8> = response.bytes().await?.into();
+    Ok(Response {
+        blob,
+        mimetype,
+        encoding,
+    })
+}
+
+async fn read_url_inner(context: &Context, url: &str) -> Result<reqwest::Response> {
+    // It is safe to use cached IP addresses
+    // for HTTPS URLs, but for HTTP URLs
+    // better resolve from scratch each time to prevent
+    // cache poisoning attacks from having lasting effects.
+    let load_cache = url.starts_with("https://");
+
+    let client = get_client(context, load_cache).await?;
     let mut url = url.to_string();
 
     // Follow up to 10 http-redirects
     for _i in 0..10 {
-        let parsed_url = url
-            .parse::<hyper::Uri>()
-            .with_context(|| format!("Failed to parse URL {url:?}"))?;
-
-        let mut sender = get_http_sender(context, parsed_url.clone()).await?;
-        let authority = parsed_url
-            .authority()
-            .context("URL has no authority")?
-            .clone();
-
-        let req = hyper::Request::builder()
-            .uri(parsed_url.path())
-            .header(hyper::header::HOST, authority.as_str())
-            .body(http_body_util::Empty::<Bytes>::new())?;
-        let response = sender.send_request(req).await?;
-
+        let response = client.get(&url).send().await?;
         if response.status().is_redirection() {
-            let header = response
-                .headers()
+            let headers = response.headers();
+            let header = headers
                 .get_all("location")
                 .iter()
                 .last()
@@ -125,119 +84,72 @@ pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> {
             continue;
         }
 
-        let content_type = response
-            .headers()
-            .get("content-type")
-            .and_then(|value| value.to_str().ok())
-            .and_then(|value| value.parse::<Mime>().ok());
-        let mimetype = content_type
-            .as_ref()
-            .map(|mime| mime.essence_str().to_string());
-        let encoding = content_type.as_ref().and_then(|mime| {
-            mime.get_param(mime::CHARSET)
-                .map(|charset| charset.as_str().to_string())
-        });
-        let body = response.collect().await?.to_bytes();
-        let blob: Vec<u8> = body.to_vec();
-        return Ok(Response {
-            blob,
-            mimetype,
-            encoding,
-        });
+        return Ok(response);
     }
 
     Err(anyhow!("Followed 10 redirections"))
 }
 
-/// Sends an empty POST request to the URL.
-///
-/// Returns response text and whether request was successful or not.
-///
-/// Does not follow redirects.
-pub(crate) async fn post_empty(context: &Context, url: &str) -> Result<(String, bool)> {
-    let parsed_url = url
-        .parse::<hyper::Uri>()
-        .with_context(|| format!("Failed to parse URL {url:?}"))?;
-    let scheme = parsed_url.scheme_str().context("URL has no scheme")?;
-    if scheme != "https" {
-        bail!("POST requests to non-HTTPS URLs are not allowed");
-    }
+struct CustomResolver {
+    context: Context,
 
-    let mut sender = get_http_sender(context, parsed_url.clone()).await?;
-    let authority = parsed_url
-        .authority()
-        .context("URL has no authority")?
-        .clone();
-    let req = hyper::Request::post(parsed_url.path())
-        .header(hyper::header::HOST, authority.as_str())
-        .body(http_body_util::Empty::<Bytes>::new())?;
-
-    let response = sender.send_request(req).await?;
-
-    let response_status = response.status();
-    let body = response.collect().await?.to_bytes();
-    let text = String::from_utf8_lossy(&body);
-    let response_text = text.to_string();
-
-    Ok((response_text, response_status.is_success()))
+    /// Whether to return cached results or not.
+    /// If resolver can be used for URLs
+    /// without TLS, e.g. HTTP URLs from HTML email,
+    /// this must be false. If TLS is used
+    /// and certificate hostnames are checked,
+    /// it is safe to load cache.
+    load_cache: bool,
 }
 
-/// Posts string to the given URL.
-///
-/// Returns true if successful HTTP response code was returned.
-///
-/// Does not follow redirects.
-#[allow(dead_code)]
-pub(crate) async fn post_string(context: &Context, url: &str, body: String) -> Result<bool> {
-    let parsed_url = url
-        .parse::<hyper::Uri>()
-        .with_context(|| format!("Failed to parse URL {url:?}"))?;
-    let scheme = parsed_url.scheme_str().context("URL has no scheme")?;
-    if scheme != "https" {
-        bail!("POST requests to non-HTTPS URLs are not allowed");
+impl CustomResolver {
+    fn new(context: Context, load_cache: bool) -> Self {
+        Self {
+            context,
+            load_cache,
+        }
     }
-
-    let mut sender = get_http_sender(context, parsed_url.clone()).await?;
-    let authority = parsed_url
-        .authority()
-        .context("URL has no authority")?
-        .clone();
-
-    let request = hyper::Request::post(parsed_url.path())
-        .header(hyper::header::HOST, authority.as_str())
-        .body(body)?;
-    let response = sender.send_request(request).await?;
-
-    Ok(response.status().is_success())
 }
 
-/// Sends a POST request with x-www-form-urlencoded data.
-///
-/// Does not follow redirects.
-pub(crate) async fn post_form<T: Serialize + ?Sized>(
-    context: &Context,
-    url: &str,
-    form: &T,
-) -> Result<Bytes> {
-    let parsed_url = url
-        .parse::<hyper::Uri>()
-        .with_context(|| format!("Failed to parse URL {url:?}"))?;
-    let scheme = parsed_url.scheme_str().context("URL has no scheme")?;
-    if scheme != "https" {
-        bail!("POST requests to non-HTTPS URLs are not allowed");
-    }
+impl reqwest::dns::Resolve for CustomResolver {
+    fn resolve(&self, hostname: reqwest::dns::Name) -> reqwest::dns::Resolving {
+        let context = self.context.clone();
+        let load_cache = self.load_cache;
+        Box::pin(async move {
+            let port = 443; // Actual port does not matter.
 
-    let encoded_body = serde_urlencoded::to_string(form).context("Failed to encode data")?;
-    let mut sender = get_http_sender(context, parsed_url.clone()).await?;
-    let authority = parsed_url
-        .authority()
-        .context("URL has no authority")?
-        .clone();
-    let request = hyper::Request::post(parsed_url.path())
-        .header(hyper::header::HOST, authority.as_str())
-        .header("content-type", "application/x-www-form-urlencoded")
-        .body(encoded_body)?;
-    let response = sender.send_request(request).await?;
-    let bytes = response.collect().await?.to_bytes();
-    Ok(bytes)
+            let socket_addrs =
+                lookup_host_with_cache(&context, hostname.as_str(), port, "", load_cache).await;
+            match socket_addrs {
+                Ok(socket_addrs) => {
+                    let addrs: reqwest::dns::Addrs = Box::new(socket_addrs.into_iter());
+
+                    Ok(addrs)
+                }
+                Err(err) => Err(err.into()),
+            }
+        })
+    }
+}
+
+pub(crate) async fn get_client(context: &Context, load_cache: bool) -> Result<reqwest::Client> {
+    let socks5_config = Socks5Config::from_database(&context.sql).await?;
+    let resolver = Arc::new(CustomResolver::new(context.clone(), load_cache));
+
+    let builder = reqwest::ClientBuilder::new()
+        .timeout(super::TIMEOUT)
+        .add_root_certificate(LETSENCRYPT_ROOT.clone())
+        .dns_resolver(resolver);
+
+    let builder = if let Some(socks5_config) = socks5_config {
+        let proxy = reqwest::Proxy::all(socks5_config.to_url())?;
+        builder.proxy(proxy)
+    } else {
+        // Disable usage of "system" proxy configured via environment variables.
+        // It is enabled by default in `reqwest`, see
+        // <https://docs.rs/reqwest/0.11.14/reqwest/struct.ClientBuilder.html#method.no_proxy>
+        // for documentation.
+        builder.no_proxy()
+    };
+    Ok(builder.build()?)
 }

src/net/proxy.rs

@@ -1,697 +0,0 @@
-//! # Proxy support.
-//!
-//! Delta Chat supports HTTP(S) CONNECT, SOCKS5 and Shadowsocks protocols.
-
-use std::fmt;
-use std::pin::Pin;
-
-use anyhow::{bail, format_err, Context as _, Result};
-use base64::Engine;
-use bytes::{BufMut, BytesMut};
-use fast_socks5::client::Socks5Stream;
-use fast_socks5::util::target_addr::ToTargetAddr;
-use fast_socks5::AuthenticationMethod;
-use fast_socks5::Socks5Command;
-use percent_encoding::{percent_encode, utf8_percent_encode, NON_ALPHANUMERIC};
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-use tokio::net::TcpStream;
-use tokio_io_timeout::TimeoutStream;
-use url::Url;
-
-use crate::config::Config;
-use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
-use crate::context::Context;
-use crate::net::connect_tcp;
-use crate::net::session::SessionStream;
-use crate::net::tls::wrap_rustls;
-use crate::sql::Sql;
-
-/// Default SOCKS5 port according to [RFC 1928](https://tools.ietf.org/html/rfc1928).
-pub const DEFAULT_SOCKS_PORT: u16 = 1080;
-
-#[derive(Debug, Clone)]
-pub struct ShadowsocksConfig {
-    pub server_config: shadowsocks::config::ServerConfig,
-}
-
-impl PartialEq for ShadowsocksConfig {
-    fn eq(&self, other: &Self) -> bool {
-        self.server_config.to_url() == other.server_config.to_url()
-    }
-}
-
-impl Eq for ShadowsocksConfig {}
-
-impl ShadowsocksConfig {
-    fn to_url(&self) -> String {
-        self.server_config.to_url()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct HttpConfig {
-    /// HTTP proxy host.
-    pub host: String,
-
-    /// HTTP proxy port.
-    pub port: u16,
-
-    /// Username and password for basic authentication.
-    ///
-    /// If set, `Proxy-Authorization` header is sent.
-    pub user_password: Option<(String, String)>,
-}
-
-impl HttpConfig {
-    fn from_url(url: Url) -> Result<Self> {
-        let host = url
-            .host_str()
-            .context("HTTP proxy URL has no host")?
-            .to_string();
-        let port = url
-            .port_or_known_default()
-            .context("HTTP(S) URLs are guaranteed to return Some port")?;
-        let user_password = if let Some(password) = url.password() {
-            let username = percent_encoding::percent_decode_str(url.username())
-                .decode_utf8()
-                .context("HTTP(S) proxy username is not a valid UTF-8")?
-                .to_string();
-            let password = percent_encoding::percent_decode_str(password)
-                .decode_utf8()
-                .context("HTTP(S) proxy password is not a valid UTF-8")?
-                .to_string();
-            Some((username, password))
-        } else {
-            None
-        };
-        let http_config = HttpConfig {
-            host,
-            port,
-            user_password,
-        };
-        Ok(http_config)
-    }
-
-    fn to_url(&self, scheme: &str) -> String {
-        let host = utf8_percent_encode(&self.host, NON_ALPHANUMERIC_WITHOUT_DOT);
-        if let Some((user, password)) = &self.user_password {
-            let user = utf8_percent_encode(user, NON_ALPHANUMERIC);
-            let password = utf8_percent_encode(password, NON_ALPHANUMERIC);
-            format!("{scheme}://{user}:{password}@{host}:{}", self.port)
-        } else {
-            format!("{scheme}://{host}:{}", self.port)
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Socks5Config {
-    pub host: String,
-    pub port: u16,
-    pub user_password: Option<(String, String)>,
-}
-
-impl Socks5Config {
-    async fn connect(
-        &self,
-        context: &Context,
-        target_host: &str,
-        target_port: u16,
-        load_dns_cache: bool,
-    ) -> Result<Socks5Stream<Pin<Box<TimeoutStream<TcpStream>>>>> {
-        let tcp_stream = connect_tcp(context, &self.host, self.port, load_dns_cache)
-            .await
-            .context("Failed to connect to SOCKS5 proxy")?;
-
-        let authentication_method = if let Some((username, password)) = self.user_password.as_ref()
-        {
-            Some(AuthenticationMethod::Password {
-                username: username.into(),
-                password: password.into(),
-            })
-        } else {
-            None
-        };
-        let mut socks_stream =
-            Socks5Stream::use_stream(tcp_stream, authentication_method, Default::default()).await?;
-        let target_addr = (target_host, target_port).to_target_addr()?;
-        socks_stream
-            .request(Socks5Command::TCPConnect, target_addr)
-            .await?;
-
-        Ok(socks_stream)
-    }
-
-    fn to_url(&self) -> String {
-        let host = utf8_percent_encode(&self.host, NON_ALPHANUMERIC_WITHOUT_DOT);
-        if let Some((user, password)) = &self.user_password {
-            let user = utf8_percent_encode(user, NON_ALPHANUMERIC);
-            let password = utf8_percent_encode(password, NON_ALPHANUMERIC);
-            format!("socks5://{user}:{password}@{host}:{}", self.port)
-        } else {
-            format!("socks5://{host}:{}", self.port)
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ProxyConfig {
-    // HTTP proxy.
-    Http(HttpConfig),
-
-    // HTTPS proxy.
-    Https(HttpConfig),
-
-    // SOCKS5 proxy.
-    Socks5(Socks5Config),
-
-    // Shadowsocks proxy.
-    Shadowsocks(ShadowsocksConfig),
-}
-
-/// Constructs HTTP/1.1 `CONNECT` request for HTTP(S) proxy.
-fn http_connect_request(host: &str, port: u16, auth: Option<(&str, &str)>) -> String {
-    // According to <https://datatracker.ietf.org/doc/html/rfc7230#section-5.4>
-    // clients MUST send `Host:` header in HTTP/1.1 requests,
-    // so repeat the host there.
-    let mut res = format!("CONNECT {host}:{port} HTTP/1.1\r\nHost: {host}:{port}\r\n");
-    if let Some((username, password)) = auth {
-        res += "Proxy-Authorization: Basic ";
-        res += &base64::engine::general_purpose::STANDARD.encode(format!("{username}:{password}"));
-        res += "\r\n";
-    }
-    res += "\r\n";
-    res
-}
-
-/// Sends HTTP/1.1 `CONNECT` request over given connection
-/// to establish an HTTP tunnel.
-///
-/// Returns the same connection back so actual data can be tunneled over it.
-async fn http_tunnel<T>(mut conn: T, host: &str, port: u16, auth: Option<(&str, &str)>) -> Result<T>
-where
-    T: AsyncReadExt + AsyncWriteExt + Unpin,
-{
-    // Send HTTP/1.1 CONNECT request.
-    let request = http_connect_request(host, port, auth);
-    conn.write_all(request.as_bytes()).await?;
-
-    let mut buffer = BytesMut::with_capacity(4096);
-
-    let res = loop {
-        if !buffer.has_remaining_mut() {
-            bail!("CONNECT response exceeded buffer size");
-        }
-        let n = conn.read_buf(&mut buffer).await?;
-        if n == 0 {
-            bail!("Unexpected end of CONNECT response");
-        }
-
-        let res = &buffer[..];
-        if res.ends_with(b"\r\n\r\n") {
-            // End of response is not reached, read more.
-            break res;
-        }
-    };
-
-    // Normally response looks like
-    // `HTTP/1.1 200 Connection established\r\n\r\n`.
-    if !res.starts_with(b"HTTP/") {
-        bail!("Unexpected HTTP CONNECT response: {res:?}");
-    }
-
-    // HTTP-version followed by space has fixed length
-    // according to RFC 7230:
-    // <https://datatracker.ietf.org/doc/html/rfc7230#section-3.1.2>
-    //
-    // Normally status line starts with `HTTP/1.1 `.
-    // We only care about 3-digit status code.
-    let status_code = res
-        .get(9..12)
-        .context("HTTP status line does not contain a status code")?;
-
-    // Interpert status code according to
-    // <https://datatracker.ietf.org/doc/html/rfc7231#section-6>.
-    if status_code == b"407" {
-        Err(format_err!("Proxy Authentication Required"))
-    } else if status_code.starts_with(b"2") {
-        // Success.
-        Ok(conn)
-    } else {
-        Err(format_err!(
-            "Failed to establish HTTP CONNECT tunnel: {res:?}"
-        ))
-    }
-}
-
-impl ProxyConfig {
-    /// Creates a new proxy configuration by parsing given proxy URL.
-    pub(crate) fn from_url(url: &str) -> Result<Self> {
-        let url = Url::parse(url).context("Cannot parse proxy URL")?;
-        match url.scheme() {
-            "http" => {
-                let http_config = HttpConfig::from_url(url)?;
-                Ok(Self::Http(http_config))
-            }
-            "https" => {
-                let https_config = HttpConfig::from_url(url)?;
-                Ok(Self::Https(https_config))
-            }
-            "ss" => {
-                let server_config = shadowsocks::config::ServerConfig::from_url(url.as_str())?;
-                let shadowsocks_config = ShadowsocksConfig { server_config };
-                Ok(Self::Shadowsocks(shadowsocks_config))
-            }
-
-            // Because of `curl` convention,
-            // `socks5` URL scheme may be expected to resolve domain names locally
-            // with `socks5h` URL scheme meaning that hostnames are passed to the proxy.
-            // Resolving hostnames locally is not supported
-            // in Delta Chat when using a proxy
-            // to prevent DNS leaks.
-            // Because of this we do not distinguish
-            // between `socks5` and `socks5h`.
-            "socks5" => {
-                let host = url
-                    .host_str()
-                    .context("socks5 URL has no host")?
-                    .to_string();
-                let port = url.port().unwrap_or(DEFAULT_SOCKS_PORT);
-                let user_password = if let Some(password) = url.password() {
-                    let username = percent_encoding::percent_decode_str(url.username())
-                        .decode_utf8()
-                        .context("SOCKS5 username is not a valid UTF-8")?
-                        .to_string();
-                    let password = percent_encoding::percent_decode_str(password)
-                        .decode_utf8()
-                        .context("SOCKS5 password is not a valid UTF-8")?
-                        .to_string();
-                    Some((username, password))
-                } else {
-                    None
-                };
-                let socks5_config = Socks5Config {
-                    host,
-                    port,
-                    user_password,
-                };
-                Ok(Self::Socks5(socks5_config))
-            }
-            scheme => Err(format_err!("Unknown URL scheme {scheme:?}")),
-        }
-    }
-
-    /// Serializes proxy config into an URL.
-    ///
-    /// This function can be used to normalize proxy URL
-    /// by parsing it and serializing back.
-    pub(crate) fn to_url(&self) -> String {
-        match self {
-            Self::Http(http_config) => http_config.to_url("http"),
-            Self::Https(http_config) => http_config.to_url("https"),
-            Self::Socks5(socks5_config) => socks5_config.to_url(),
-            Self::Shadowsocks(shadowsocks_config) => shadowsocks_config.to_url(),
-        }
-    }
-
-    /// Migrates legacy `socks5_host`, `socks5_port`, `socks5_user` and `socks5_password`
-    /// config into `proxy_url` if `proxy_url` is unset or empty.
-    ///
-    /// Unsets `socks5_host`, `socks5_port`, `socks5_user` and `socks5_password` in any case.
-    async fn migrate_socks_config(sql: &Sql) -> Result<()> {
-        if sql.get_raw_config("proxy_url").await?.is_none() {
-            // Load legacy SOCKS5 settings.
-            if let Some(host) = sql
-                .get_raw_config("socks5_host")
-                .await?
-                .filter(|s| !s.is_empty())
-            {
-                let port: u16 = sql
-                    .get_raw_config_int("socks5_port")
-                    .await?
-                    .unwrap_or(DEFAULT_SOCKS_PORT.into()) as u16;
-                let user = sql.get_raw_config("socks5_user").await?.unwrap_or_default();
-                let pass = sql
-                    .get_raw_config("socks5_password")
-                    .await?
-                    .unwrap_or_default();
-
-                let mut proxy_url = "socks5://".to_string();
-                if !pass.is_empty() {
-                    proxy_url += &percent_encode(user.as_bytes(), NON_ALPHANUMERIC).to_string();
-                    proxy_url += ":";
-                    proxy_url += &percent_encode(pass.as_bytes(), NON_ALPHANUMERIC).to_string();
-                    proxy_url += "@";
-                };
-                proxy_url += &host;
-                proxy_url += ":";
-                proxy_url += &port.to_string();
-
-                sql.set_raw_config("proxy_url", Some(&proxy_url)).await?;
-            } else {
-                sql.set_raw_config("proxy_url", Some("")).await?;
-            }
-
-            let socks5_enabled = sql.get_raw_config("socks5_enabled").await?;
-            sql.set_raw_config("proxy_enabled", socks5_enabled.as_deref())
-                .await?;
-        }
-
-        sql.set_raw_config("socks5_enabled", None).await?;
-        sql.set_raw_config("socks5_host", None).await?;
-        sql.set_raw_config("socks5_port", None).await?;
-        sql.set_raw_config("socks5_user", None).await?;
-        sql.set_raw_config("socks5_password", None).await?;
-        Ok(())
-    }
-
-    /// Reads proxy configuration from the database.
-    pub async fn load(context: &Context) -> Result<Option<Self>> {
-        Self::migrate_socks_config(&context.sql)
-            .await
-            .context("Failed to migrate legacy SOCKS config")?;
-
-        let enabled = context.get_config_bool(Config::ProxyEnabled).await?;
-        if !enabled {
-            return Ok(None);
-        }
-
-        let proxy_url = context
-            .get_config(Config::ProxyUrl)
-            .await?
-            .unwrap_or_default();
-        let proxy_url = proxy_url
-            .split_once('\n')
-            .map_or(proxy_url.clone(), |(first_url, _rest)| {
-                first_url.to_string()
-            });
-        let proxy_config = Self::from_url(&proxy_url).context("Failed to parse proxy URL")?;
-        Ok(Some(proxy_config))
-    }
-
-    /// If `load_dns_cache` is true, loads cached DNS resolution results.
-    /// Use this only if the connection is going to be protected with TLS checks.
-    pub async fn connect(
-        &self,
-        context: &Context,
-        target_host: &str,
-        target_port: u16,
-        load_dns_cache: bool,
-    ) -> Result<Box<dyn SessionStream>> {
-        match self {
-            ProxyConfig::Http(http_config) => {
-                let load_cache = false;
-                let tcp_stream = crate::net::connect_tcp(
-                    context,
-                    &http_config.host,
-                    http_config.port,
-                    load_cache,
-                )
-                .await?;
-                let auth = if let Some((username, password)) = &http_config.user_password {
-                    Some((username.as_str(), password.as_str()))
-                } else {
-                    None
-                };
-                let tunnel_stream = http_tunnel(tcp_stream, target_host, target_port, auth).await?;
-                Ok(Box::new(tunnel_stream))
-            }
-            ProxyConfig::Https(https_config) => {
-                let load_cache = true;
-                let tcp_stream = crate::net::connect_tcp(
-                    context,
-                    &https_config.host,
-                    https_config.port,
-                    load_cache,
-                )
-                .await?;
-                let tls_stream = wrap_rustls(&https_config.host, &[], tcp_stream).await?;
-                let auth = if let Some((username, password)) = &https_config.user_password {
-                    Some((username.as_str(), password.as_str()))
-                } else {
-                    None
-                };
-                let tunnel_stream = http_tunnel(tls_stream, target_host, target_port, auth).await?;
-                Ok(Box::new(tunnel_stream))
-            }
-            ProxyConfig::Socks5(socks5_config) => {
-                let socks5_stream = socks5_config
-                    .connect(context, target_host, target_port, load_dns_cache)
-                    .await?;
-                Ok(Box::new(socks5_stream))
-            }
-            ProxyConfig::Shadowsocks(ShadowsocksConfig { server_config }) => {
-                let shadowsocks_context = shadowsocks::context::Context::new_shared(
-                    shadowsocks::config::ServerType::Local,
-                );
-
-                let tcp_stream = {
-                    let server_addr = server_config.addr();
-                    let host = server_addr.host();
-                    let port = server_addr.port();
-                    connect_tcp(context, &host, port, load_dns_cache)
-                        .await
-                        .context("Failed to connect to Shadowsocks proxy")?
-                };
-
-                let shadowsocks_stream = shadowsocks::ProxyClientStream::from_stream(
-                    shadowsocks_context,
-                    tcp_stream,
-                    server_config,
-                    (target_host.to_string(), target_port),
-                );
-
-                Ok(Box::new(shadowsocks_stream))
-            }
-        }
-    }
-}
-
-impl fmt::Display for Socks5Config {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "host:{},port:{},user_password:{}",
-            self.host,
-            self.port,
-            if let Some(user_password) = self.user_password.clone() {
-                format!("user: {}, password: ***", user_password.0)
-            } else {
-                "user: None".to_string()
-            }
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::config::Config;
-    use crate::test_utils::TestContext;
-
-    #[test]
-    fn test_socks5_url() {
-        let proxy_config = ProxyConfig::from_url("socks5://127.0.0.1:9050").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 9050,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("socks5://foo:bar@127.0.0.1:9150").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 9150,
-                user_password: Some(("foo".to_string(), "bar".to_string()))
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("socks5://%66oo:b%61r@127.0.0.1:9150").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 9150,
-                user_password: Some(("foo".to_string(), "bar".to_string()))
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("socks5://127.0.0.1:80").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 80,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("socks5://127.0.0.1").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 1080,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("socks5://127.0.0.1:1080").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Socks5(Socks5Config {
-                host: "127.0.0.1".to_string(),
-                port: 1080,
-                user_password: None
-            })
-        );
-    }
-
-    #[test]
-    fn test_http_url() {
-        let proxy_config = ProxyConfig::from_url("http://127.0.0.1").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Http(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 80,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("http://127.0.0.1:80").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Http(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 80,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("http://127.0.0.1:443").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Http(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 443,
-                user_password: None
-            })
-        );
-    }
-
-    #[test]
-    fn test_https_url() {
-        let proxy_config = ProxyConfig::from_url("https://127.0.0.1").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Https(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 443,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("https://127.0.0.1:80").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Https(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 80,
-                user_password: None
-            })
-        );
-
-        let proxy_config = ProxyConfig::from_url("https://127.0.0.1:443").unwrap();
-        assert_eq!(
-            proxy_config,
-            ProxyConfig::Https(HttpConfig {
-                host: "127.0.0.1".to_string(),
-                port: 443,
-                user_password: None
-            })
-        );
-    }
-
-    #[test]
-    fn test_http_connect_request() {
-        assert_eq!(http_connect_request("example.org", 143, Some(("aladdin", "opensesame"))), "CONNECT example.org:143 HTTP/1.1\r\nHost: example.org:143\r\nProxy-Authorization: Basic YWxhZGRpbjpvcGVuc2VzYW1l\r\n\r\n");
-        assert_eq!(
-            http_connect_request("example.net", 587, None),
-            "CONNECT example.net:587 HTTP/1.1\r\nHost: example.net:587\r\n\r\n"
-        );
-    }
-
-    #[test]
-    fn test_shadowsocks_url() {
-        // Example URL from <https://shadowsocks.org/doc/sip002.html>.
-        let proxy_config =
-            ProxyConfig::from_url("ss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1")
-                .unwrap();
-        assert!(matches!(proxy_config, ProxyConfig::Shadowsocks(_)));
-    }
-
-    #[test]
-    fn test_invalid_proxy_url() {
-        assert!(ProxyConfig::from_url("foobar://127.0.0.1:9050").is_err());
-        assert!(ProxyConfig::from_url("abc").is_err());
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_socks5_migration() -> Result<()> {
-        let t = TestContext::new().await;
-
-        // Test that config is migrated on attempt to load even if disabled.
-        t.set_config(Config::Socks5Host, Some("127.0.0.1")).await?;
-        t.set_config(Config::Socks5Port, Some("9050")).await?;
-
-        let proxy_config = ProxyConfig::load(&t).await?;
-        // Even though proxy is not enabled, config should be migrated.
-        assert_eq!(proxy_config, None);
-
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?.unwrap(),
-            "socks5://127.0.0.1:9050"
-        );
-        Ok(())
-    }
-
-    // Test SOCKS5 setting migration if proxy was never configured.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_socks5_migration_unconfigured() -> Result<()> {
-        let t = TestContext::new().await;
-
-        // Try to load config to trigger migration.
-        assert_eq!(ProxyConfig::load(&t).await?, None);
-
-        assert_eq!(t.get_config(Config::ProxyEnabled).await?, None);
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?.unwrap(),
-            String::new()
-        );
-        Ok(())
-    }
-
-    // Test SOCKS5 setting migration if SOCKS5 host is empty.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_socks5_migration_empty() -> Result<()> {
-        let t = TestContext::new().await;
-
-        t.set_config(Config::Socks5Host, Some("")).await?;
-
-        // Try to load config to trigger migration.
-        assert_eq!(ProxyConfig::load(&t).await?, None);
-
-        assert_eq!(t.get_config(Config::ProxyEnabled).await?, None);
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?.unwrap(),
-            String::new()
-        );
-        Ok(())
-    }
-}

src/net/session.rs

@@ -1,3 +1,4 @@
+use async_native_tls::TlsStream;
 use fast_socks5::client::Socks5Stream;
 use std::pin::Pin;
 use std::time::Duration;
@@ -16,16 +17,11 @@ impl SessionStream for Box<dyn SessionStream> {
         self.as_mut().set_read_timeout(timeout);
     }
 }
-impl<T: SessionStream> SessionStream for async_native_tls::TlsStream<T> {
+impl<T: SessionStream> SessionStream for TlsStream<T> {
     fn set_read_timeout(&mut self, timeout: Option<Duration>) {
         self.get_mut().set_read_timeout(timeout);
     }
 }
-impl<T: SessionStream> SessionStream for tokio_rustls::client::TlsStream<T> {
-    fn set_read_timeout(&mut self, timeout: Option<Duration>) {
-        self.get_mut().0.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);
@@ -48,16 +44,6 @@ impl<T: SessionStream> SessionStream for Socks5Stream<T> {
         self.get_socket_mut().set_read_timeout(timeout)
     }
 }
-impl<T: SessionStream> SessionStream for shadowsocks::ProxyClientStream<T> {
-    fn set_read_timeout(&mut self, timeout: Option<Duration>) {
-        self.get_mut().set_read_timeout(timeout)
-    }
-}
-impl<T: SessionStream> SessionStream for async_imap::DeflateStream<T> {
-    fn set_read_timeout(&mut self, timeout: Option<Duration>) {
-        self.get_mut().set_read_timeout(timeout)
-    }
-}
 
 /// Session stream with a read buffer.
 pub(crate) trait SessionBufStream: SessionStream + AsyncBufRead {}

src/net/tls.rs

@@ -1,5 +1,4 @@
 //! TLS support.
-use std::sync::Arc;
 
 use anyhow::Result;
 use async_native_tls::{Certificate, Protocol, TlsConnector, TlsStream};
@@ -15,42 +14,41 @@ static LETSENCRYPT_ROOT: Lazy<Certificate> = Lazy::new(|| {
     .unwrap()
 });
 
-pub async fn wrap_tls<T: AsyncRead + AsyncWrite + Unpin>(
-    strict_tls: bool,
-    hostname: &str,
-    alpn: &[&str],
-    stream: T,
-) -> Result<TlsStream<T>> {
+pub fn build_tls(strict_tls: bool, alpns: &[&str]) -> TlsConnector {
     let tls_builder = TlsConnector::new()
         .min_protocol_version(Some(Protocol::Tlsv12))
-        .request_alpns(alpn)
+        .request_alpns(alpns)
         .add_root_certificate(LETSENCRYPT_ROOT.clone());
-    let tls = if strict_tls {
+
+    if strict_tls {
         tls_builder
     } else {
         tls_builder
             .danger_accept_invalid_hostnames(true)
             .danger_accept_invalid_certs(true)
-    };
+    }
+}
+
+pub async fn wrap_tls<T: AsyncRead + AsyncWrite + Unpin>(
+    strict_tls: bool,
+    hostname: &str,
+    alpn: &str,
+    stream: T,
+) -> Result<TlsStream<T>> {
+    let tls = build_tls(strict_tls, &[alpn]);
     let tls_stream = tls.connect(hostname, stream).await?;
     Ok(tls_stream)
 }
 
-pub async fn wrap_rustls<T: AsyncRead + AsyncWrite + Unpin>(
-    hostname: &str,
-    alpn: &[&str],
-    stream: T,
-) -> Result<tokio_rustls::client::TlsStream<T>> {
-    let mut root_cert_store = rustls::RootCertStore::empty();
-    root_cert_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned());
+#[cfg(test)]
+mod tests {
+    use super::*;
 
-    let mut config = rustls::ClientConfig::builder()
-        .with_root_certificates(root_cert_store)
-        .with_no_client_auth();
-    config.alpn_protocols = alpn.iter().map(|s| s.as_bytes().to_vec()).collect();
-
-    let tls = tokio_rustls::TlsConnector::from(Arc::new(config));
-    let name = rustls_pki_types::ServerName::try_from(hostname)?.to_owned();
-    let tls_stream = tls.connect(name, stream).await?;
-    Ok(tls_stream)
+    #[test]
+    fn test_build_tls() {
+        // we are using some additional root certificates.
+        // make sure, they do not break construction of TlsConnector
+        let _ = build_tls(true, &[]);
+        let _ = build_tls(false, &[]);
+    }
 }

src/oauth2.rs

@@ -2,13 +2,12 @@
 
 use std::collections::HashMap;
 
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 
+use crate::config::Config;
 use crate::context::Context;
-use crate::net::http::post_form;
-use crate::net::read_url_blob;
 use crate::provider;
 use crate::provider::Oauth2Authorizer;
 use crate::tools::time;
@@ -61,7 +60,8 @@ pub async fn get_oauth2_url(
     addr: &str,
     redirect_uri: &str,
 ) -> Result<Option<String>> {
-    if let Some(oauth2) = Oauth2::from_address(context, addr).await {
+    let socks5_enabled = context.get_config_bool(Config::Socks5Enabled).await?;
+    if let Some(oauth2) = Oauth2::from_address(context, addr, socks5_enabled).await {
         context
             .sql
             .set_raw_config("oauth2_pending_redirect_uri", Some(redirect_uri))
@@ -81,7 +81,8 @@ pub(crate) async fn get_oauth2_access_token(
     code: &str,
     regenerate: bool,
 ) -> Result<Option<String>> {
-    if let Some(oauth2) = Oauth2::from_address(context, addr).await {
+    let socks5_enabled = context.get_config_bool(Config::Socks5Enabled).await?;
+    if let Some(oauth2) = Oauth2::from_address(context, addr, socks5_enabled).await {
         let lock = context.oauth2_mutex.lock().await;
 
         // read generated token
@@ -158,19 +159,25 @@ pub(crate) async fn get_oauth2_access_token(
 
         // ... and POST
 
-        let response: Response = match post_form(context, post_url, &post_param).await {
-            Ok(resp) => match serde_json::from_slice(&resp) {
+        // All OAuth URLs are hardcoded HTTPS URLs,
+        // so it is safe to load DNS cache.
+        let load_cache = true;
+
+        let client = crate::net::http::get_client(context, load_cache).await?;
+
+        let response: Response = match client.post(post_url).form(&post_param).send().await {
+            Ok(resp) => match resp.json().await {
                 Ok(response) => response,
                 Err(err) => {
                     warn!(
                         context,
-                        "Failed to parse OAuth2 JSON response from {token_url}: {err:#}."
+                        "Failed to parse OAuth2 JSON response from {}: error: {}", token_url, err
                     );
                     return Ok(None);
                 }
             },
             Err(err) => {
-                warn!(context, "Error calling OAuth2 at {token_url}: {err:#}.");
+                warn!(context, "Error calling OAuth2 at {}: {:?}", token_url, err);
                 return Ok(None);
             }
         };
@@ -229,7 +236,8 @@ pub(crate) async fn get_oauth2_addr(
     addr: &str,
     code: &str,
 ) -> Result<Option<String>> {
-    let oauth2 = match Oauth2::from_address(context, addr).await {
+    let socks5_enabled = context.get_config_bool(Config::Socks5Enabled).await?;
+    let oauth2 = match Oauth2::from_address(context, addr, socks5_enabled).await {
         Some(o) => o,
         None => return Ok(None),
     };
@@ -238,20 +246,11 @@ pub(crate) async fn get_oauth2_addr(
     }
 
     if let Some(access_token) = get_oauth2_access_token(context, addr, code, false).await? {
-        let addr_out = match oauth2.get_addr(context, &access_token).await {
-            Ok(addr) => addr,
-            Err(err) => {
-                warn!(context, "Error getting addr: {err:#}.");
-                None
-            }
-        };
+        let addr_out = oauth2.get_addr(context, &access_token).await;
         if addr_out.is_none() {
             // regenerate
             if let Some(access_token) = get_oauth2_access_token(context, addr, code, true).await? {
-                Ok(oauth2
-                    .get_addr(context, &access_token)
-                    .await
-                    .unwrap_or_default())
+                Ok(oauth2.get_addr(context, &access_token).await)
             } else {
                 Ok(None)
             }
@@ -264,9 +263,8 @@ pub(crate) async fn get_oauth2_addr(
 }
 
 impl Oauth2 {
-    async fn from_address(context: &Context, addr: &str) -> Option<Self> {
+    async fn from_address(context: &Context, addr: &str, skip_mx: bool) -> Option<Self> {
         let addr_normalized = normalize_addr(addr);
-        let skip_mx = true;
         if let Some(domain) = addr_normalized
             .find('@')
             .map(|index| addr_normalized.split_at(index + 1).1)
@@ -284,7 +282,7 @@ impl Oauth2 {
         None
     }
 
-    async fn get_addr(&self, context: &Context, access_token: &str) -> Result<Option<String>> {
+    async fn get_addr(&self, context: &Context, access_token: &str) -> Option<String> {
         let userinfo_url = self.get_userinfo.unwrap_or("");
         let userinfo_url = replace_in_uri(userinfo_url, "$ACCESS_TOKEN", access_token);
 
@@ -296,21 +294,44 @@ impl Oauth2 {
         //   "picture": "https://lh4.googleusercontent.com/-Gj5jh_9R0BY/AAAAAAAAAAI/AAAAAAAAAAA/IAjtjfjtjNA/photo.jpg"
         // }
 
-        let response = read_url_blob(context, &userinfo_url).await?;
-        let parsed: HashMap<String, serde_json::Value> =
-            serde_json::from_slice(&response.blob).context("Error getting userinfo")?;
+        // All OAuth URLs are hardcoded HTTPS URLs,
+        // so it is safe to load DNS cache.
+        let load_cache = true;
+
+        let client = match crate::net::http::get_client(context, load_cache).await {
+            Ok(cl) => cl,
+            Err(err) => {
+                warn!(context, "failed to get HTTP client: {}", err);
+                return None;
+            }
+        };
+        let response = match client.get(userinfo_url).send().await {
+            Ok(response) => response,
+            Err(err) => {
+                warn!(context, "failed to get userinfo: {}", err);
+                return None;
+            }
+        };
+        let response: Result<HashMap<String, serde_json::Value>, _> = response.json().await;
+        let parsed = match response {
+            Ok(parsed) => parsed,
+            Err(err) => {
+                warn!(context, "Error getting userinfo: {}", err);
+                return None;
+            }
+        };
         // CAVE: serde_json::Value.as_str() removes the quotes of json-strings
         // but serde_json::Value.to_string() does not!
         if let Some(addr) = parsed.get("email") {
             if let Some(s) = addr.as_str() {
-                Ok(Some(s.to_string()))
+                Some(s.to_string())
             } else {
                 warn!(context, "E-mail in userinfo is not a string: {}", addr);
-                Ok(None)
+                None
             }
         } else {
             warn!(context, "E-mail missing in userinfo.");
-            Ok(None)
+            None
         }
     }
 }
@@ -364,20 +385,38 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_oauth_from_address() {
         let t = TestContext::new().await;
-
-        // Delta Chat does not have working Gmail client ID anymore.
-        assert_eq!(Oauth2::from_address(&t, "hello@gmail.com").await, None);
-        assert_eq!(Oauth2::from_address(&t, "hello@googlemail.com").await, None);
-
         assert_eq!(
-            Oauth2::from_address(&t, "hello@yandex.com").await,
+            Oauth2::from_address(&t, "hello@gmail.com", false).await,
+            Some(OAUTH2_GMAIL)
+        );
+        assert_eq!(
+            Oauth2::from_address(&t, "hello@googlemail.com", false).await,
+            Some(OAUTH2_GMAIL)
+        );
+        assert_eq!(
+            Oauth2::from_address(&t, "hello@yandex.com", false).await,
             Some(OAUTH2_YANDEX)
         );
         assert_eq!(
-            Oauth2::from_address(&t, "hello@yandex.ru").await,
+            Oauth2::from_address(&t, "hello@yandex.ru", false).await,
             Some(OAUTH2_YANDEX)
         );
-        assert_eq!(Oauth2::from_address(&t, "hello@web.de").await, None);
+        assert_eq!(Oauth2::from_address(&t, "hello@web.de", false).await, None);
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_oauth_from_mx() {
+        // youtube staff seems to use "google workspace with oauth2", figures this out by MX lookup
+        let t = TestContext::new().await;
+        assert_eq!(
+            Oauth2::from_address(&t, "hello@youtube.com", false).await,
+            Some(OAUTH2_GMAIL)
+        );
+        // without MX lookup, we would not know as youtube.com is not in our provider-db
+        assert_eq!(
+            Oauth2::from_address(&t, "hello@youtube.com", true).await,
+            None
+        );
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -393,11 +432,11 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_get_oauth2_url() {
         let ctx = TestContext::new().await;
-        let addr = "example@yandex.com";
+        let addr = "dignifiedquire@gmail.com";
         let redirect_uri = "chat.delta:/com.b44t.messenger";
         let res = get_oauth2_url(&ctx.ctx, addr, redirect_uri).await.unwrap();
 
-        assert_eq!(res, Some("https://oauth.yandex.com/authorize?client_id=c4d0b6735fc8420a816d7e1303469341&response_type=code&scope=mail%3Aimap_full%20mail%3Asmtp&force_confirm=true".into()));
+        assert_eq!(res, Some("https://accounts.google.com/o/oauth2/auth?client_id=959970109878%2D4mvtgf6feshskf7695nfln6002mom908%2Eapps%2Egoogleusercontent%2Ecom&redirect_uri=chat%2Edelta%3A%2Fcom%2Eb44t%2Emessenger&response_type=code&scope=https%3A%2F%2Fmail.google.com%2F%20email&access_type=offline".into()));
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]

src/peer_channels.rs

@@ -23,7 +23,7 @@
 //!    (scoped per WebXDC app instance/message-id). The other peers can then join the gossip with `joinRealtimeChannel().setListener()`
 //!    and `joinRealtimeChannel().send()` just like the other peers.
 
-use anyhow::{anyhow, bail, Context as _, Result};
+use anyhow::{anyhow, Context as _, Result};
 use email::Header;
 use futures_lite::StreamExt;
 use iroh_gossip::net::{Event, Gossip, GossipEvent, JoinOptions, GOSSIP_ALPN};
@@ -143,10 +143,9 @@ impl Iroh {
                 self.endpoint.add_node_addr(peer.clone())?;
             }
 
-            self.gossip.join_with_opts(
-                topic,
-                JoinOptions::with_bootstrap(peers.into_iter().map(|peer| peer.node_id)),
-            );
+            self.gossip
+                .join(topic, peers.into_iter().map(|peer| peer.node_id).collect())
+                .await?;
         }
         Ok(())
     }
@@ -233,7 +232,6 @@ impl ChannelState {
 impl Context {
     /// Create iroh endpoint and gossip.
     async fn init_peer_channels(&self) -> Result<Iroh> {
-        info!(self, "Initializing peer channels.");
         let secret_key = SecretKey::generate();
         let public_key = secret_key.public();
 
@@ -255,25 +253,19 @@ impl Context {
             .secret_key(secret_key)
             .alpns(vec![GOSSIP_ALPN.to_vec()])
             .relay_mode(relay_mode)
-            .bind()
+            .bind(0)
             .await?;
 
         // create gossip
         let my_addr = endpoint.node_addr().await?;
-        let gossip_config = iroh_gossip::proto::topic::Config {
-            // Allow messages up to 128 KB in size.
-            // We set the limit to 128 KiB to account for internal overhead,
-            // but only guarantee 128 KB of payload to WebXDC developers.
-            max_message_size: 128 * 1024,
-            ..Default::default()
-        };
-        let gossip = Gossip::from_endpoint(endpoint.clone(), gossip_config, &my_addr.info);
+        let gossip = Gossip::from_endpoint(endpoint.clone(), Default::default(), &my_addr.info);
 
         // spawn endpoint loop that forwards incoming connections to the gossiper
         let context = self.clone();
 
         // Shuts down on deltachat shutdown
         tokio::spawn(endpoint_loop(context, endpoint.clone(), gossip.clone()));
+        tokio::spawn(gossip_direct_address_loop(endpoint.clone(), gossip.clone()));
 
         Ok(Iroh {
             endpoint,
@@ -286,10 +278,6 @@ impl Context {
 
     /// Get or initialize the iroh peer channel.
     pub async fn get_or_try_init_peer_channel(&self) -> Result<&Iroh> {
-        if !self.get_config_bool(Config::WebxdcRealtimeEnabled).await? {
-            bail!("Attempt to get Iroh when realtime is disabled");
-        }
-
         let ctx = self.clone();
         self.iroh
             .get_or_try_init(|| async { ctx.init_peer_channels().await })
@@ -297,6 +285,15 @@ impl Context {
     }
 }
 
+/// Loop to update direct addresses of the gossip.
+async fn gossip_direct_address_loop(endpoint: Endpoint, gossip: Gossip) -> Result<()> {
+    let mut stream = endpoint.direct_addresses();
+    while let Some(addrs) = stream.next().await {
+        gossip.update_direct_addresses(&addrs)?;
+    }
+    Ok(())
+}
+
 /// Cache a peers [NodeId] for one topic.
 pub(crate) async fn iroh_add_peer_for_topic(
     ctx: &Context,
@@ -314,47 +311,6 @@ pub(crate) async fn iroh_add_peer_for_topic(
     Ok(())
 }
 
-/// Add gossip peer from `Iroh-Node-Addr` header to WebXDC message identified by `instance_id`.
-pub async fn add_gossip_peer_from_header(
-    context: &Context,
-    instance_id: MsgId,
-    node_addr: &str,
-) -> Result<()> {
-    if !context
-        .get_config_bool(Config::WebxdcRealtimeEnabled)
-        .await?
-    {
-        return Ok(());
-    }
-
-    info!(
-        context,
-        "Adding iroh peer with address {node_addr:?} to the topic of {instance_id}."
-    );
-    let node_addr =
-        serde_json::from_str::<NodeAddr>(node_addr).context("Failed to parse node address")?;
-
-    context.emit_event(EventType::WebxdcRealtimeAdvertisementReceived {
-        msg_id: instance_id,
-    });
-
-    let Some(topic) = get_iroh_topic_for_msg(context, instance_id).await? else {
-        warn!(
-            context,
-            "Could not add iroh peer because {instance_id} has no topic."
-        );
-        return Ok(());
-    };
-
-    let node_id = node_addr.node_id;
-    let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
-    iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server).await?;
-
-    let iroh = context.get_or_try_init_peer_channel().await?;
-    iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
-    Ok(())
-}
-
 /// Insert topicId into the database so that we can use it to retrieve the topic.
 pub(crate) async fn insert_topic_stub(ctx: &Context, msg_id: MsgId, topic: TopicId) -> Result<()> {
     ctx.sql
@@ -468,15 +424,15 @@ pub async fn leave_webxdc_realtime(ctx: &Context, msg_id: MsgId) -> Result<()> {
     Ok(())
 }
 
-/// Creates a new random gossip topic.
-fn create_random_topic() -> TopicId {
+pub(crate) fn create_random_topic() -> TopicId {
     TopicId::from_bytes(rand::random())
 }
 
-/// Creates `Iroh-Gossip-Header` with a new random topic
-/// and stores the topic for the message.
-pub(crate) async fn create_iroh_header(ctx: &Context, msg_id: MsgId) -> Result<Header> {
-    let topic = create_random_topic();
+pub(crate) async fn create_iroh_header(
+    ctx: &Context,
+    topic: TopicId,
+    msg_id: MsgId,
+) -> Result<Header> {
     insert_topic_stub(ctx, msg_id, topic).await?;
     Ok(Header::new(
         HeaderDef::IrohGossipTopic.get_headername().to_string(),
@@ -486,13 +442,6 @@ pub(crate) async fn create_iroh_header(ctx: &Context, msg_id: MsgId) -> Result<H
 
 async fn endpoint_loop(context: Context, endpoint: Endpoint, gossip: Gossip) {
     while let Some(conn) = endpoint.accept().await {
-        let conn = match conn.accept() {
-            Ok(conn) => conn,
-            Err(err) => {
-                warn!(context, "Failed to accept iroh connection: {err:#}.");
-                continue;
-            }
-        };
         info!(context, "IROH_REALTIME: accepting iroh connection");
         let gossip = gossip.clone();
         let context = context.clone();
@@ -590,6 +539,17 @@ mod tests {
         let alice = &mut tcm.alice().await;
         let bob = &mut tcm.bob().await;
 
+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
         // Alice sends webxdc to bob
         let alice_chat = alice.create_chat(bob).await;
         let mut instance = Message::new(Viewtype::File);
@@ -619,13 +579,6 @@ mod tests {
             .unwrap();
 
         bob.recv_msg_trash(&alice.pop_sent_msg().await).await;
-        loop {
-            let event = bob.evtracker.recv().await.unwrap();
-            if let EventType::WebxdcRealtimeAdvertisementReceived { msg_id } = event.typ {
-                assert!(msg_id == alice_webxdc.id);
-                break;
-            }
-        }
         let bob_iroh = bob.get_or_try_init_peer_channel().await.unwrap();
 
         // Bob adds alice to gossip peers.
@@ -728,6 +681,17 @@ mod tests {
         let alice = &mut tcm.alice().await;
         let bob = &mut tcm.bob().await;
 
+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
         assert!(alice
             .get_config_bool(Config::WebxdcRealtimeEnabled)
             .await
@@ -885,6 +849,17 @@ mod tests {
         let alice = &mut tcm.alice().await;
         let bob = &mut tcm.bob().await;
 
+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
         // Alice sends webxdc to bob
         let alice_chat = alice.create_chat(bob).await;
         let mut instance = Message::new(Viewtype::File);
@@ -953,11 +928,6 @@ mod tests {
         let mut tcm = TestContextManager::new();
         let alice = &mut tcm.alice().await;
 
-        alice
-            .set_config_bool(Config::WebxdcRealtimeEnabled, false)
-            .await
-            .unwrap();
-
         // creates iroh endpoint as side effect
         send_webxdc_realtime_advertisement(alice, MsgId::new(1))
             .await
@@ -975,10 +945,6 @@ mod tests {
         // creates iroh endpoint as side effect
         leave_webxdc_realtime(alice, MsgId::new(1)).await.unwrap();
 
-        assert!(alice.ctx.iroh.get().is_none());
-
-        // This internal function should return error
-        // if accidentally called with the setting disabled.
-        assert!(alice.ctx.get_or_try_init_peer_channel().await.is_err());
+        assert!(alice.ctx.iroh.get().is_none())
     }
 }

src/peerstate.rs

@@ -343,7 +343,7 @@ impl Peerstate {
     }
 
     /// Updates peerstate according to the given `Autocrypt` header.
-    pub fn apply_header(&mut self, context: &Context, header: &Aheader, message_time: i64) {
+    pub fn apply_header(&mut self, header: &Aheader, message_time: i64) {
         if !addr_cmp(&self.addr, &header.addr) {
             return;
         }
@@ -362,13 +362,6 @@ impl Peerstate {
                 self.public_key = Some(header.public_key.clone());
                 self.recalc_fingerprint();
             }
-        } else {
-            warn!(
-                context,
-                "Ignoring outdated Autocrypt header because message_time={} < last_seen={}.",
-                message_time,
-                self.last_seen
-            );
         }
     }
 
@@ -773,65 +766,23 @@ pub(crate) async fn maybe_do_aeap_transition(
 
     // If the from addr is different from the peerstate address we know,
     // we may want to do an AEAP transition.
-    if !addr_cmp(&peerstate.addr, &mime_parser.from.addr) {
-        // Check if it's a chat message; we do this to avoid
-        // some accidental transitions if someone writes from multiple
-        // addresses with an MUA.
-        if !mime_parser.has_chat_version() {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because the message is not a chat message.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // Check if the message is encrypted and signed correctly. If it's not encrypted, it's
-        // probably from a new contact sharing the same key.
-        if mime_parser.signatures.is_empty() {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because the message is not encrypted and signed.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // Check if the From: address was also in the signed part of the email.
-        // Without this check, an attacker could replay a message from Alice
-        // to Bob. Then Bob's device would do an AEAP transition from Alice's
-        // to the attacker's address, allowing for easier phishing.
-        if !mime_parser.from_is_signed {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because From: is not signed.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // DC avoids sending messages with the same timestamp, that's why messages
-        // with equal timestamps are ignored here unlike in `Peerstate::apply_header()`.
-        if info.message_time <= peerstate.last_seen {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because {} < {}.",
-                &peerstate.addr,
-                &mime_parser.from.addr,
-                info.message_time,
-                peerstate.last_seen
-            );
-            return Ok(());
-        }
-
-        info!(
-            context,
-            "Doing AEAP transition from {} to {}.", &peerstate.addr, &mime_parser.from.addr
-        );
-
+    if !addr_cmp(&peerstate.addr, &mime_parser.from.addr)
+            // Check if it's a chat message; we do this to avoid
+            // some accidental transitions if someone writes from multiple
+            // addresses with an MUA.
+            && mime_parser.has_chat_version()
+            // Check if the message is encrypted and signed correctly. If it's not encrypted, it's
+            // probably from a new contact sharing the same key.
+            && !mime_parser.signatures.is_empty()
+            // Check if the From: address was also in the signed part of the email.
+            // Without this check, an attacker could replay a message from Alice
+            // to Bob. Then Bob's device would do an AEAP transition from Alice's
+            // to the attacker's address, allowing for easier phishing.
+            && mime_parser.from_is_signed
+            // DC avoids sending messages with the same timestamp, that's why `>` is here unlike in
+            // `Peerstate::apply_header()`.
+            && info.message_time > peerstate.last_seen
+    {
         let info = &mut mime_parser.decryption_info;
         let peerstate = info.peerstate.as_mut().context("no peerstate??")?;
         // Add info messages to chats with this (verified) contact
@@ -849,7 +800,7 @@ pub(crate) async fn maybe_do_aeap_transition(
         let header = info.autocrypt_header.as_ref().context(
             "Internal error: Tried to do an AEAP transition without an autocrypt header??",
         )?;
-        peerstate.apply_header(context, header, info.message_time);
+        peerstate.apply_header(header, info.message_time);
 
         peerstate
             .save_to_db_ex(&context.sql, Some(&old_addr))
@@ -1028,8 +979,6 @@ mod tests {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_peerstate_degrade_reordering() {
-        let ctx = crate::test_utils::TestContext::new().await;
-
         let addr = "example@example.org";
         let pub_key = alice_keypair().public;
         let header = Aheader::new(addr.to_string(), pub_key, EncryptPreference::Mutual);
@@ -1054,7 +1003,7 @@ mod tests {
             fingerprint_changed: false,
         };
 
-        peerstate.apply_header(&ctx, &header, 100);
+        peerstate.apply_header(&header, 100);
         assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
 
         peerstate.degrade_encryption(300);
@@ -1062,11 +1011,11 @@ mod tests {
 
         // This has message time 200, while encryption was degraded at timestamp 300.
         // Because of reordering, header should not be applied.
-        peerstate.apply_header(&ctx, &header, 200);
+        peerstate.apply_header(&header, 200);
         assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Reset);
 
         // Same header will be applied in the future.
-        peerstate.apply_header(&ctx, &header, 300);
+        peerstate.apply_header(&header, 300);
         assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
     }
 }

src/pgp.rs

@@ -14,7 +14,9 @@ use pgp::composed::{
 use pgp::crypto::ecc_curve::ECCCurve;
 use pgp::crypto::hash::HashAlgorithm;
 use pgp::crypto::sym::SymmetricKeyAlgorithm;
-use pgp::types::{CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, StringToKey};
+use pgp::types::{
+    CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, SecretKeyTrait, StringToKey,
+};
 use rand::{thread_rng, CryptoRng, Rng};
 use tokio::runtime::Handle;
 
@@ -41,7 +43,7 @@ enum SignedPublicKeyOrSubkey<'a> {
     Subkey(&'a SignedPublicSubKey),
 }
 
-impl KeyTrait for SignedPublicKeyOrSubkey<'_> {
+impl<'a> KeyTrait for SignedPublicKeyOrSubkey<'a> {
     fn fingerprint(&self) -> Vec<u8> {
         match self {
             Self::Key(k) => k.fingerprint(),
@@ -64,7 +66,7 @@ impl KeyTrait for SignedPublicKeyOrSubkey<'_> {
     }
 }
 
-impl PublicKeyTrait for SignedPublicKeyOrSubkey<'_> {
+impl<'a> PublicKeyTrait for SignedPublicKeyOrSubkey<'a> {
     fn verify_signature(
         &self,
         hash: HashAlgorithm,
@@ -133,6 +135,9 @@ pub fn split_armored_data(buf: &[u8]) -> Result<(BlockType, BTreeMap<String, Str
 /// keys together as they are one unit.
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct KeyPair {
+    /// Email address.
+    pub addr: EmailAddress,
+
     /// Public key.
     pub public: SignedPublicKey,
 
@@ -140,18 +145,6 @@ pub struct KeyPair {
     pub secret: SignedSecretKey,
 }
 
-impl KeyPair {
-    /// Creates new keypair from a secret key.
-    ///
-    /// Public key is split off the secret key.
-    pub fn new(secret: SignedSecretKey) -> Result<Self> {
-        use crate::key::DcSecretKey;
-
-        let public = secret.split_public_key()?;
-        Ok(Self { public, secret })
-    }
-}
-
 /// Create a new key pair.
 ///
 /// Both secret and public key consist of signing primary key and encryption subkey
@@ -208,12 +201,19 @@ pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Res
         .verify()
         .context("invalid secret key generated")?;
 
-    let key_pair = KeyPair::new(secret_key)?;
-    key_pair
-        .public
+    let public_key = secret_key
+        .public_key()
+        .sign(&secret_key, || "".into())
+        .context("failed to sign public key")?;
+    public_key
         .verify()
         .context("invalid public key generated")?;
-    Ok(key_pair)
+
+    Ok(KeyPair {
+        addr,
+        public: public_key,
+        secret: secret_key,
+    })
 }
 
 /// Select public key or subkey to use for encryption.

src/provider.rs

@@ -1,6 +1,6 @@
 //! [Provider database](https://providers.delta.chat/) module.
 
-pub(crate) mod data;
+mod data;
 
 use anyhow::Result;
 use deltachat_contact_tools::EmailAddress;

src/provider/data.rs

@@ -509,8 +509,6 @@ static P_FREENET_DE: Provider = Provider {
     overview_page: "https://providers.delta.chat/freenet-de",
     server: &[
         Server { protocol: Imap, socket: Ssl, hostname: "mx.freenet.de", port: 993, username_pattern: Email },
-        Server { protocol: Imap, socket: Starttls, hostname: "mx.freenet.de", port: 143, username_pattern: Email },
-        Server { protocol: Smtp, socket: Ssl, hostname: "mx.freenet.de", port: 465, username_pattern: Email },
         Server { protocol: Smtp, socket: Starttls, hostname: "mx.freenet.de", port: 587, username_pattern: Email },
     ],
     opt: ProviderOptions::new(),
@@ -534,7 +532,7 @@ static P_GMAIL: Provider = Provider {
         ..ProviderOptions::new()
     },
     config_defaults: None,
-    oauth2_authorizer: None,
+    oauth2_authorizer: Some(Oauth2Authorizer::Gmail),
 };
 
 // gmx.net.md: gmx.net, gmx.de, gmx.at, gmx.ch, gmx.org, gmx.eu, gmx.info, gmx.biz, gmx.com
@@ -876,20 +874,6 @@ static P_MEHL_CLOUD: Provider = Provider {
     after_login_hint: "",
     overview_page: "https://providers.delta.chat/mehl-cloud",
     server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "mehl.cloud",
-            port: 443,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "mehl.cloud",
-            port: 443,
-            username_pattern: Email,
-        },
         Server {
             protocol: Imap,
             socket: Ssl,
@@ -940,41 +924,6 @@ static P_MEHL_STORE: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// migadu.md: migadu.com
-static P_MIGADU: Provider = Provider {
-    id: "migadu",
-    status: Status::Ok,
-    before_login_hint: "",
-    after_login_hint: "",
-    overview_page: "https://providers.delta.chat/migadu",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "imap.migadu.com",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "smtp.migadu.com",
-            port: 465,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Starttls,
-            hostname: "smtp.migadu.com",
-            port: 587,
-            username_pattern: Email,
-        },
-    ],
-    opt: ProviderOptions::new(),
-    config_defaults: None,
-    oauth2_authorizer: None,
-};
-
 // nauta.cu.md: nauta.cu
 static P_NAUTA_CU: Provider = Provider {
     id: "nauta.cu",
@@ -1060,20 +1009,6 @@ static P_NINE_TESTRUN_ORG: Provider = Provider {
     after_login_hint: "",
     overview_page: "https://providers.delta.chat/nine-testrun-org",
     server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "nine.testrun.org",
-            port: 443,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "nine.testrun.org",
-            port: 443,
-            username_pattern: Email,
-        },
         Server {
             protocol: Imap,
             socket: Ssl,
@@ -1102,6 +1037,20 @@ static P_NINE_TESTRUN_ORG: Provider = Provider {
             port: 587,
             username_pattern: Email,
         },
+        Server {
+            protocol: Imap,
+            socket: Ssl,
+            hostname: "nine.testrun.org",
+            port: 443,
+            username_pattern: Email,
+        },
+        Server {
+            protocol: Smtp,
+            socket: Ssl,
+            hostname: "nine.testrun.org",
+            port: 443,
+            username_pattern: Email,
+        },
     ],
     opt: ProviderOptions::new(),
     config_defaults: Some(&[ConfigDefault {
@@ -1195,7 +1144,7 @@ static P_OUVATON_COOP: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-// posteo.md: posteo.de, posteo.af, posteo.at, posteo.be, posteo.ca, posteo.ch, posteo.cl, posteo.co, posteo.co.uk, posteo.com, posteo.com.br, posteo.cr, posteo.cz, posteo.dk, posteo.ee, posteo.es, posteo.eu, posteo.fi, posteo.gl, posteo.gr, posteo.hn, posteo.hr, posteo.hu, posteo.ie, posteo.in, posteo.is, posteo.it, posteo.jp, posteo.la, posteo.li, posteo.lt, posteo.lu, posteo.me, posteo.mx, posteo.my, posteo.net, posteo.nl, posteo.no, posteo.nz, posteo.org, posteo.pe, posteo.pl, posteo.pm, posteo.pt, posteo.ro, posteo.ru, posteo.se, posteo.sg, posteo.si, posteo.tn, posteo.uk, posteo.us
+// posteo.md: posteo.de, posteo.af, posteo.at, posteo.be, posteo.ca, posteo.ch, posteo.cl, posteo.co, posteo.co.uk, posteo.com.br, posteo.cr, posteo.cz, posteo.dk, posteo.ee, posteo.es, posteo.eu, posteo.fi, posteo.gl, posteo.gr, posteo.hn, posteo.hr, posteo.hu, posteo.ie, posteo.in, posteo.is, posteo.it, posteo.jp, posteo.la, posteo.li, posteo.lt, posteo.lu, posteo.me, posteo.mx, posteo.my, posteo.net, posteo.nl, posteo.no, posteo.nz, posteo.org, posteo.pe, posteo.pl, posteo.pm, posteo.pt, posteo.ro, posteo.ru, posteo.se, posteo.sg, posteo.si, posteo.tn, posteo.uk, posteo.us
 static P_POSTEO: Provider = Provider {
     id: "posteo",
     status: Status::Ok,
@@ -1569,26 +1518,11 @@ static P_TUTANOTA: Provider = Provider {
 // ukr.net.md: ukr.net
 static P_UKR_NET: Provider = Provider {
     id: "ukr.net",
-    status: Status::Preparation,
-    before_login_hint: "You must allow IMAP access to your account before you can login.",
+    status: Status::Ok,
+    before_login_hint: "",
     after_login_hint: "",
     overview_page: "https://providers.delta.chat/ukr-net",
-    server: &[
-        Server {
-            protocol: Imap,
-            socket: Ssl,
-            hostname: "imap.ukr.net",
-            port: 993,
-            username_pattern: Email,
-        },
-        Server {
-            protocol: Smtp,
-            socket: Ssl,
-            hostname: "smtp.ukr.net",
-            port: 465,
-            username_pattern: Email,
-        },
-    ],
+    server: &[],
     opt: ProviderOptions::new(),
     config_defaults: None,
     oauth2_authorizer: None,
@@ -1870,7 +1804,7 @@ static P_ZOHO: Provider = Provider {
     oauth2_authorizer: None,
 };
 
-pub(crate) static PROVIDER_DATA: [(&str, &Provider); 533] = [
+pub(crate) static PROVIDER_DATA: [(&str, &Provider); 531] = [
     ("163.com", &P_163),
     ("aktivix.org", &P_AKTIVIX_ORG),
     ("aliyun.com", &P_ALIYUN),
@@ -2243,7 +2177,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 533] = [
     ("ente.quest", &P_MEHL_STORE),
     ("ente.cfd", &P_MEHL_STORE),
     ("nein.jetzt", &P_MEHL_STORE),
-    ("migadu.com", &P_MIGADU),
     ("nauta.cu", &P_NAUTA_CU),
     ("naver.com", &P_NAVER),
     ("nine.testrun.org", &P_NINE_TESTRUN_ORG),
@@ -2264,7 +2197,6 @@ pub(crate) static PROVIDER_DATA: [(&str, &Provider); 533] = [
     ("posteo.cl", &P_POSTEO),
     ("posteo.co", &P_POSTEO),
     ("posteo.co.uk", &P_POSTEO),
-    ("posteo.com", &P_POSTEO),
     ("posteo.com.br", &P_POSTEO),
     ("posteo.cr", &P_POSTEO),
     ("posteo.cz", &P_POSTEO),
@@ -2447,7 +2379,6 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
         ("mailo.com", &P_MAILO_COM),
         ("mehl.cloud", &P_MEHL_CLOUD),
         ("mehl.store", &P_MEHL_STORE),
-        ("migadu", &P_MIGADU),
         ("nauta.cu", &P_NAUTA_CU),
         ("naver", &P_NAVER),
         ("nine.testrun.org", &P_NINE_TESTRUN_ORG),
@@ -2486,4 +2417,4 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
 });
 
 pub static _PROVIDER_UPDATED: Lazy<chrono::NaiveDate> =
-    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2024, 9, 13).unwrap());
+    Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2024, 8, 14).unwrap());

src/push.rs

@@ -31,7 +31,7 @@ impl PushSubscriber {
     }
 
     /// Sets device token for Apple Push Notification service.
-    pub(crate) async fn set_device_token(&self, token: &str) {
+    pub(crate) async fn set_device_token(&mut self, token: &str) {
         self.inner.write().await.device_token = Some(token.to_string());
     }
 
@@ -61,13 +61,16 @@ impl PushSubscriber {
             return Ok(());
         };
 
-        if http::post_string(
-            context,
-            "https://notifications.delta.chat/register",
-            format!("{{\"token\":\"{token}\"}}"),
-        )
-        .await?
-        {
+        let load_cache = true;
+        let response = http::get_client(context, load_cache)
+            .await?
+            .post("https://notifications.delta.chat/register")
+            .body(format!("{{\"token\":\"{token}\"}}"))
+            .send()
+            .await?;
+
+        let response_status = response.status();
+        if response_status.is_success() {
             state.heartbeat_subscribed = true;
         }
         Ok(())

src/qr.rs

@@ -7,11 +7,11 @@ use anyhow::{anyhow, bail, ensure, Context as _, Result};
 pub use dclogin_scheme::LoginOptions;
 use deltachat_contact_tools::{addr_normalize, may_be_valid_addr, ContactAddress};
 use once_cell::sync::Lazy;
-use percent_encoding::{percent_decode_str, percent_encode, NON_ALPHANUMERIC};
+use percent_encoding::percent_decode_str;
 use serde::Deserialize;
 
 use self::dclogin_scheme::configure_from_login_qr;
-use crate::chat::ChatIdBlocked;
+use crate::chat::{get_chat_id_by_grpid, ChatIdBlocked};
 use crate::config::Config;
 use crate::constants::Blocked;
 use crate::contact::{Contact, ContactId, Origin};
@@ -19,11 +19,10 @@ use crate::context::Context;
 use crate::events::EventType;
 use crate::key::Fingerprint;
 use crate::message::Message;
-use crate::net::http::post_empty;
-use crate::net::proxy::{ProxyConfig, DEFAULT_SOCKS_PORT};
 use crate::peerstate::Peerstate;
 use crate::token;
 use crate::tools::validate_id;
+use iroh_old as iroh;
 
 const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
 const IDELTACHAT_SCHEME: &str = "https://i.delta.chat/#";
@@ -31,13 +30,15 @@ const IDELTACHAT_NOSLASH_SCHEME: &str = "https://i.delta.chat#";
 const DCACCOUNT_SCHEME: &str = "DCACCOUNT:";
 pub(super) const DCLOGIN_SCHEME: &str = "DCLOGIN:";
 const DCWEBRTC_SCHEME: &str = "DCWEBRTC:";
-const TG_SOCKS_SCHEME: &str = "https://t.me/socks";
 const MAILTO_SCHEME: &str = "mailto:";
 const MATMSG_SCHEME: &str = "MATMSG:";
 const VCARD_SCHEME: &str = "BEGIN:VCARD";
 const SMTP_SCHEME: &str = "SMTP:";
+const HTTP_SCHEME: &str = "http://";
 const HTTPS_SCHEME: &str = "https://";
-const SHADOWSOCKS_SCHEME: &str = "ss://";
+
+/// Legacy backup transfer based on iroh 0.4.
+pub(crate) const DCBACKUP_SCHEME: &str = "DCBACKUP:";
 
 /// Backup transfer based on iroh-net.
 pub(crate) const DCBACKUP2_SCHEME: &str = "DCBACKUP2:";
@@ -109,6 +110,20 @@ pub enum Qr {
         domain: String,
     },
 
+    /// Provides a backup that can be retrieved using legacy iroh 0.4.
+    ///
+    /// This contains all the data needed to connect to a device and download a backup from
+    /// it to configure the receiving device with the same account.
+    Backup {
+        /// Printable version of the provider information.
+        ///
+        /// This is the printable version of a `sendme` ticket, which contains all the
+        /// information to connect to and authenticate a backup provider.
+        ///
+        /// The format is somewhat opaque, but `sendme` can deserialise this.
+        ticket: iroh::provider::Ticket,
+    },
+
     /// Provides a backup that can be retrieved using iroh-net based backup transfer protocol.
     Backup2 {
         /// Iroh node address.
@@ -127,28 +142,6 @@ pub enum Qr {
         instance_pattern: String,
     },
 
-    /// Ask the user if they want to use the given proxy.
-    ///
-    /// Note that HTTP(S) URLs without a path
-    /// and query parameters are treated as HTTP(S) proxy URL.
-    /// UI may want to still offer to open the URL
-    /// in the browser if QR code contents
-    /// starts with `http://` or `https://`
-    /// and the QR code was not scanned from
-    /// the proxy configuration screen.
-    Proxy {
-        /// Proxy URL.
-        ///
-        /// This is the URL that is going to be added.
-        url: String,
-
-        /// Host extracted from the URL to display in the UI.
-        host: String,
-
-        /// Port extracted from the URL to display in the UI.
-        port: u16,
-    },
-
     /// Contact address is scanned.
     ///
     /// Optionally, a draft message could be provided.
@@ -284,10 +277,8 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
         dclogin_scheme::decode_login(qr)?
     } else if starts_with_ignore_case(qr, DCWEBRTC_SCHEME) {
         decode_webrtc_instance(context, qr)?
-    } else if starts_with_ignore_case(qr, TG_SOCKS_SCHEME) {
-        decode_tg_socks_proxy(context, qr)?
-    } else if qr.starts_with(SHADOWSOCKS_SCHEME) {
-        decode_shadowsocks_proxy(qr)?
+    } else if starts_with_ignore_case(qr, DCBACKUP_SCHEME) {
+        decode_backup(qr)?
     } else if starts_with_ignore_case(qr, DCBACKUP2_SCHEME) {
         decode_backup2(qr)?
     } else if qr.starts_with(MAILTO_SCHEME) {
@@ -298,44 +289,9 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
         decode_matmsg(context, qr).await?
     } else if qr.starts_with(VCARD_SCHEME) {
         decode_vcard(context, qr).await?
-    } else if let Ok(url) = url::Url::parse(qr) {
-        match url.scheme() {
-            "socks5" => Qr::Proxy {
-                url: qr.to_string(),
-                host: url.host_str().context("URL has no host")?.to_string(),
-                port: url.port().unwrap_or(DEFAULT_SOCKS_PORT),
-            },
-            "http" | "https" => {
-                // Parsing with a non-standard scheme
-                // is a hack to work around the `url` crate bug
-                // <https://github.com/servo/rust-url/issues/957>.
-                let url = if let Some(rest) = qr.strip_prefix("http://") {
-                    url::Url::parse(&format!("foobarbaz://{rest}"))?
-                } else if let Some(rest) = qr.strip_prefix("https://") {
-                    url::Url::parse(&format!("foobarbaz://{rest}"))?
-                } else {
-                    // Should not happen.
-                    url
-                };
-
-                if url.port().is_none() | (url.path() != "") | url.query().is_some() {
-                    // URL without a port, with a path or query cannot be a proxy URL.
-                    Qr::Url {
-                        url: qr.to_string(),
-                    }
-                } else {
-                    Qr::Proxy {
-                        url: qr.to_string(),
-                        host: url.host_str().context("URL has no host")?.to_string(),
-                        port: url
-                            .port_or_known_default()
-                            .context("HTTP(S) URLs are guaranteed to return Some port")?,
-                    }
-                }
-            }
-            _ => Qr::Url {
-                url: qr.to_string(),
-            },
+    } else if qr.starts_with(HTTP_SCHEME) || qr.starts_with(HTTPS_SCHEME) {
+        Qr::Url {
+            url: qr.to_string(),
         }
     } else {
         Qr::Text {
@@ -345,7 +301,7 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
     Ok(qrcode)
 }
 
-/// Formats the text of the [`Qr::Backup2`] variant.
+/// Formats the text of the [`Qr::Backup`] variant.
 ///
 /// This is the inverse of [`check_qr`] for that variant only.
 ///
@@ -353,6 +309,7 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
 /// into `FromStr`.
 pub fn format_backup(qr: &Qr) -> Result<String> {
     match qr {
+        Qr::Backup { ref ticket } => Ok(format!("{DCBACKUP_SCHEME}{ticket}")),
         Qr::Backup2 {
             ref node_addr,
             ref auth_token,
@@ -446,7 +403,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
     if let (Some(addr), Some(invitenumber), Some(authcode)) = (&addr, invitenumber, authcode) {
         let addr = ContactAddress::new(addr)?;
         let (contact_id, _) =
-            Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledSecurejoinQrScan)
+            Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan)
                 .await
                 .with_context(|| format!("failed to add or lookup contact for address {addr:?}"))?;
 
@@ -539,7 +496,7 @@ async fn decode_ideltachat(context: &Context, prefix: &str, qr: &str) -> Result<
     let qr = qr.replacen('&', "#", 1);
     decode_openpgp(context, &qr)
         .await
-        .with_context(|| format!("failed to decode {prefix} QR code"))
+        .context("failed to decode {prefix} QR code")
 }
 
 /// scheme: `DCACCOUNT:https://example.org/new_email?t=1w_7wDjgjelxeX884x96v3`
@@ -582,55 +539,16 @@ fn decode_webrtc_instance(_context: &Context, qr: &str) -> Result<Qr> {
     }
 }
 
-/// scheme: `https://t.me/socks?server=foo&port=123` or `https://t.me/socks?server=1.2.3.4&port=123`
-fn decode_tg_socks_proxy(_context: &Context, qr: &str) -> Result<Qr> {
-    let url = url::Url::parse(qr).context("Invalid t.me/socks url")?;
-
-    let mut host: Option<String> = None;
-    let mut port: u16 = DEFAULT_SOCKS_PORT;
-    let mut user: Option<String> = None;
-    let mut pass: Option<String> = None;
-    for (key, value) in url.query_pairs() {
-        if key == "server" {
-            host = Some(value.to_string());
-        } else if key == "port" {
-            port = value.parse().unwrap_or(DEFAULT_SOCKS_PORT);
-        } else if key == "user" {
-            user = Some(value.to_string());
-        } else if key == "pass" {
-            pass = Some(value.to_string());
-        }
-    }
-
-    let Some(host) = host else {
-        bail!("Bad t.me/socks url: {:?}", url);
-    };
-
-    let mut url = "socks5://".to_string();
-    if let Some(pass) = pass {
-        url += &percent_encode(user.unwrap_or_default().as_bytes(), NON_ALPHANUMERIC).to_string();
-        url += ":";
-        url += &percent_encode(pass.as_bytes(), NON_ALPHANUMERIC).to_string();
-        url += "@";
-    };
-    url += &host;
-    url += ":";
-    url += &port.to_string();
-
-    Ok(Qr::Proxy { url, host, port })
-}
-
-/// Decodes `ss://` URLs for Shadowsocks proxies.
-fn decode_shadowsocks_proxy(qr: &str) -> Result<Qr> {
-    let server_config = shadowsocks::config::ServerConfig::from_url(qr)?;
-    let addr = server_config.addr();
-    let host = addr.host().to_string();
-    let port = addr.port();
-    Ok(Qr::Proxy {
-        url: qr.to_string(),
-        host,
-        port,
-    })
+/// Decodes a [`DCBACKUP_SCHEME`] QR code.
+///
+/// The format of this scheme is `DCBACKUP:<encoded ticket>`.  The encoding is the
+/// [`iroh::provider::Ticket`]'s `Display` impl.
+fn decode_backup(qr: &str) -> Result<Qr> {
+    let payload = qr
+        .strip_prefix(DCBACKUP_SCHEME)
+        .ok_or_else(|| anyhow!("invalid DCBACKUP scheme"))?;
+    let ticket: iroh::provider::Ticket = payload.parse().context("invalid DCBACKUP payload")?;
+    Ok(Qr::Backup { ticket })
 }
 
 /// Decodes a [`DCBACKUP2_SCHEME`] QR code.
@@ -676,8 +594,21 @@ async fn set_account_from_qr(context: &Context, qr: &str) -> Result<()> {
         bail!("DCACCOUNT QR codes must use HTTPS scheme");
     }
 
-    let (response_text, response_success) = post_empty(context, url_str).await?;
-    if response_success {
+    // As only HTTPS is used, it is safe to load DNS cache.
+    let load_cache = true;
+
+    let response = crate::net::http::get_client(context, load_cache)
+        .await?
+        .post(url_str)
+        .send()
+        .await?;
+    let response_status = response.status();
+    let response_text = response
+        .text()
+        .await
+        .context("Cannot create account, request failed: empty response")?;
+
+    if response_status.is_success() {
         let CreateAccountSuccessResponse { password, email } = serde_json::from_str(&response_text)
             .with_context(|| {
                 format!("Cannot create account, response is malformed:\n{response_text:?}")
@@ -718,27 +649,6 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
                 .set_config_internal(Config::WebrtcInstance, Some(&instance_pattern))
                 .await?;
         }
-        Qr::Proxy { url, .. } => {
-            let old_proxy_url_value = context
-                .get_config(Config::ProxyUrl)
-                .await?
-                .unwrap_or_default();
-
-            // Normalize the URL.
-            let url = ProxyConfig::from_url(&url)?.to_url();
-
-            let proxy_urls: Vec<&str> = std::iter::once(url.as_str())
-                .chain(
-                    old_proxy_url_value
-                        .split('\n')
-                        .filter(|s| !s.is_empty() && *s != url),
-                )
-                .collect();
-            context
-                .set_config(Config::ProxyUrl, Some(&proxy_urls.join("\n")))
-                .await?;
-            context.set_config_bool(Config::ProxyEnabled, true).await?;
-        }
         Qr::WithdrawVerifyContact {
             invitenumber,
             authcode,
@@ -769,7 +679,7 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             token::save(context, token::Namespace::InviteNumber, None, &invitenumber).await?;
             token::save(context, token::Namespace::Auth, None, &authcode).await?;
             context.sync_qr_code_tokens(None).await?;
-            context.scheduler.interrupt_inbox().await;
+            context.scheduler.interrupt_smtp().await;
         }
         Qr::ReviveVerifyGroup {
             invitenumber,
@@ -777,16 +687,19 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
             grpid,
             ..
         } => {
+            let chat_id = get_chat_id_by_grpid(context, &grpid)
+                .await?
+                .map(|(chat_id, _protected, _blocked)| chat_id);
             token::save(
                 context,
                 token::Namespace::InviteNumber,
-                Some(&grpid),
+                chat_id,
                 &invitenumber,
             )
             .await?;
-            token::save(context, token::Namespace::Auth, Some(&grpid), &authcode).await?;
-            context.sync_qr_code_tokens(Some(&grpid)).await?;
-            context.scheduler.interrupt_inbox().await;
+            token::save(context, token::Namespace::Auth, chat_id, &authcode).await?;
+            context.sync_qr_code_tokens(chat_id).await?;
+            context.scheduler.interrupt_smtp().await;
         }
         Qr::Login { address, options } => {
             configure_from_login_qr(context, &address, options).await?
@@ -957,7 +870,6 @@ mod tests {
     use super::*;
     use crate::aheader::EncryptPreference;
     use crate::chat::{create_group_chat, ProtectionStatus};
-    use crate::config::Config;
     use crate::key::DcKey;
     use crate::securejoin::get_securejoin_qr;
     use crate::test_utils::{alice_keypair, TestContext};
@@ -966,38 +878,11 @@ mod tests {
     async fn test_decode_http() -> Result<()> {
         let ctx = TestContext::new().await;
 
-        let qr = check_qr(&ctx.ctx, "http://www.hello.com:80").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "http://www.hello.com:80".to_string(),
-                host: "www.hello.com".to_string(),
-                port: 80
-            }
-        );
-
-        // If it has no explicit port, then it is not a proxy.
         let qr = check_qr(&ctx.ctx, "http://www.hello.com").await?;
         assert_eq!(
             qr,
             Qr::Url {
-                url: "http://www.hello.com".to_string(),
-            }
-        );
-
-        // If it has a path, then it is not a proxy.
-        let qr = check_qr(&ctx.ctx, "http://www.hello.com/").await?;
-        assert_eq!(
-            qr,
-            Qr::Url {
-                url: "http://www.hello.com/".to_string(),
-            }
-        );
-        let qr = check_qr(&ctx.ctx, "http://www.hello.com/hello").await?;
-        assert_eq!(
-            qr,
-            Qr::Url {
-                url: "http://www.hello.com/hello".to_string(),
+                url: "http://www.hello.com".to_string()
             }
         );
 
@@ -1008,38 +893,11 @@ mod tests {
     async fn test_decode_https() -> Result<()> {
         let ctx = TestContext::new().await;
 
-        let qr = check_qr(&ctx.ctx, "https://www.hello.com:443").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "https://www.hello.com:443".to_string(),
-                host: "www.hello.com".to_string(),
-                port: 443
-            }
-        );
-
-        // If it has no explicit port, then it is not a proxy.
         let qr = check_qr(&ctx.ctx, "https://www.hello.com").await?;
         assert_eq!(
             qr,
             Qr::Url {
-                url: "https://www.hello.com".to_string(),
-            }
-        );
-
-        // If it has a path, then it is not a proxy.
-        let qr = check_qr(&ctx.ctx, "https://www.hello.com/").await?;
-        assert_eq!(
-            qr,
-            Qr::Url {
-                url: "https://www.hello.com/".to_string(),
-            }
-        );
-        let qr = check_qr(&ctx.ctx, "https://www.hello.com/hello").await?;
-        assert_eq!(
-            qr,
-            Qr::Url {
-                url: "https://www.hello.com/hello".to_string(),
+                url: "https://www.hello.com".to_string()
             }
         );
 
@@ -1270,8 +1128,7 @@ mod tests {
         if let Qr::AskVerifyContact { contact_id, .. } = qr {
             let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
             assert_eq!(contact.get_addr(), "cli@deltachat.de");
-            assert_eq!(contact.get_authname(), "Jörn P. P.");
-            assert_eq!(contact.get_name(), "");
+            assert_eq!(contact.get_name(), "Jörn P. P.");
         } else {
             bail!("Wrong QR code type");
         }
@@ -1286,7 +1143,6 @@ mod tests {
         if let Qr::AskVerifyContact { contact_id, .. } = qr {
             let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
             assert_eq!(contact.get_addr(), "cli@deltachat.de");
-            assert_eq!(contact.get_authname(), "");
             assert_eq!(contact.get_name(), "");
         } else {
             bail!("Wrong QR code type");
@@ -1622,69 +1478,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_tg_socks_proxy() -> Result<()> {
-        let t = TestContext::new().await;
-
-        let qr = check_qr(&t, "https://t.me/socks?server=84.53.239.95&port=4145").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "socks5://84.53.239.95:4145".to_string(),
-                host: "84.53.239.95".to_string(),
-                port: 4145,
-            }
-        );
-
-        let qr = check_qr(&t, "https://t.me/socks?server=foo.bar&port=123").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "socks5://foo.bar:123".to_string(),
-                host: "foo.bar".to_string(),
-                port: 123,
-            }
-        );
-
-        let qr = check_qr(&t, "https://t.me/socks?server=foo.baz").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "socks5://foo.baz:1080".to_string(),
-                host: "foo.baz".to_string(),
-                port: 1080,
-            }
-        );
-
-        let qr = check_qr(
-            &t,
-            "https://t.me/socks?server=foo.baz&port=12345&user=ada&pass=ms%21%2F%24",
-        )
-        .await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "socks5://ada:ms%21%2F%24@foo.baz:12345".to_string(),
-                host: "foo.baz".to_string(),
-                port: 12345,
-            }
-        );
-
-        // wrong domain results in Qr:Url instead of Qr::Socks5Proxy
-        let qr = check_qr(&t, "https://not.me/socks?noserver=84.53.239.95&port=4145").await?;
-        assert_eq!(
-            qr,
-            Qr::Url {
-                url: "https://not.me/socks?noserver=84.53.239.95&port=4145".to_string()
-            }
-        );
-
-        let qr = check_qr(&t, "https://t.me/socks?noserver=84.53.239.95&port=4145").await;
-        assert!(qr.is_err());
-
-        Ok(())
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_decode_account_bad_scheme() {
         let ctx = TestContext::new().await;
@@ -1705,7 +1498,7 @@ mod tests {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_set_webrtc_instance_config_from_qr() -> Result<()> {
+    async fn test_set_config_from_qr() -> Result<()> {
         let ctx = TestContext::new().await;
 
         assert!(ctx.ctx.get_config(Config::WebrtcInstance).await?.is_none());
@@ -1714,6 +1507,10 @@ mod tests {
         assert!(res.is_err());
         assert!(ctx.ctx.get_config(Config::WebrtcInstance).await?.is_none());
 
+        let res = set_config_from_qr(&ctx.ctx, "https://no.qr").await;
+        assert!(res.is_err());
+        assert!(ctx.ctx.get_config(Config::WebrtcInstance).await?.is_none());
+
         let res = set_config_from_qr(&ctx.ctx, "dcwebrtc:https://example.org/").await;
         assert!(res.is_ok());
         assert_eq!(
@@ -1731,117 +1528,4 @@ mod tests {
 
         Ok(())
     }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_set_proxy_config_from_qr() -> Result<()> {
-        let t = TestContext::new().await;
-
-        assert_eq!(t.get_config_bool(Config::ProxyEnabled).await?, false);
-
-        let res = set_config_from_qr(&t, "https://t.me/socks?server=foo&port=666").await;
-        assert!(res.is_ok());
-        assert_eq!(t.get_config_bool(Config::ProxyEnabled).await?, true);
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some("socks5://foo:666".to_string())
-        );
-
-        // Test URL without port.
-        let res = set_config_from_qr(&t, "https://t.me/socks?server=1.2.3.4").await;
-        assert!(res.is_ok());
-        assert_eq!(t.get_config_bool(Config::ProxyEnabled).await?, true);
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some("socks5://1.2.3.4:1080\nsocks5://foo:666".to_string())
-        );
-
-        // make sure, user&password are set when specified in the URL
-        // Password is an URL-encoded "x&%$X".
-        let res =
-            set_config_from_qr(&t, "https://t.me/socks?server=jau&user=Da&pass=x%26%25%24X").await;
-        assert!(res.is_ok());
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some(
-                "socks5://Da:x%26%25%24X@jau:1080\nsocks5://1.2.3.4:1080\nsocks5://foo:666"
-                    .to_string()
-            )
-        );
-
-        // Scanning existing proxy brings it to the top in the list.
-        let res = set_config_from_qr(&t, "https://t.me/socks?server=foo&port=666").await;
-        assert!(res.is_ok());
-        assert_eq!(t.get_config_bool(Config::ProxyEnabled).await?, true);
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some(
-                "socks5://foo:666\nsocks5://Da:x%26%25%24X@jau:1080\nsocks5://1.2.3.4:1080"
-                    .to_string()
-            )
-        );
-
-        set_config_from_qr(
-            &t,
-            "ss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1",
-        )
-        .await?;
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some(
-                "ss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1\nsocks5://foo:666\nsocks5://Da:x%26%25%24X@jau:1080\nsocks5://1.2.3.4:1080"
-                    .to_string()
-            )
-        );
-
-        // SOCKS5 config does not have port 1080 explicitly specified,
-        // but should bring `socks5://1.2.3.4:1080` to the top instead of creating another entry.
-        set_config_from_qr(&t, "socks5://1.2.3.4").await?;
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some(
-                "socks5://1.2.3.4:1080\nss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1\nsocks5://foo:666\nsocks5://Da:x%26%25%24X@jau:1080"
-                    .to_string()
-            )
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_shadowsocks() -> Result<()> {
-        let ctx = TestContext::new().await;
-
-        let qr = check_qr(
-            &ctx.ctx,
-            "ss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1",
-        )
-        .await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "ss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1".to_string(),
-                host: "192.168.100.1".to_string(),
-                port: 8888,
-            }
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_socks5() -> Result<()> {
-        let ctx = TestContext::new().await;
-
-        let qr = check_qr(&ctx.ctx, "socks5://127.0.0.1:9050").await?;
-        assert_eq!(
-            qr,
-            Qr::Proxy {
-                url: "socks5://127.0.0.1:9050".to_string(),
-                host: "127.0.0.1".to_string(),
-                port: 9050,
-            }
-        );
-
-        Ok(())
-    }
 }