add missing members receiving non-dc messages

.circleci/config.yml

@@ -8,12 +8,112 @@ executors:
     docker:
       - image: hrektts/doxygen
             
+
+restore-workspace: &restore-workspace
+  attach_workspace:
+    at: /mnt
+
+restore-cache: &restore-cache
+  restore_cache:
+    keys:
+      - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - repo-source-{{ .Branch }}-{{ .Revision }}
+
+commands:
+  test_target:
+    parameters:
+      target:
+        type: string
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Test (<< parameters.target >>)
+          command: TARGET=<< parameters.target >> ci_scripts/run-rust-test.sh
+          no_output_timeout: 15m
+
 jobs:
+  cargo_fetch:
+    executor: default
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+      - run: rustup install $(cat rust-toolchain)
+      - run: rustup default $(cat rust-toolchain)
+      - run: rustup component add --toolchain $(cat rust-toolchain) rustfmt
+      - run: rustup component add --toolchain $(cat rust-toolchain) clippy-preview
+      - run: cargo fetch
+      - run: rustc +stable --version
+      - run: rustc +$(cat rust-toolchain) --version
+      # make sure this git repo doesn't grow too big
+      - run: git gc
+      - persist_to_workspace:
+          root: /mnt
+          paths:
+            - crate
+      - save_cache:
+          key: cargo-v3-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          paths:
+            - "~/.cargo"
+            - "~/.rustup"
+
+  rustfmt:
+    executor: default
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Run cargo fmt
+          command: cargo fmt --all -- --check
+
+  test_macos:
+    macos:
+      xcode: "10.0.0"
+    working_directory: ~/crate
+    steps:
+      - run:
+          name: Configure environment variables
+          command: |
+            echo 'export PATH="${HOME}/.cargo/bin:${HOME}/.bin:${PATH}"' >> $BASH_ENV
+            echo 'export CIRCLE_ARTIFACTS="/tmp"' >> $BASH_ENV
+      - checkout
+      - run:
+          name: Install Rust
+          command: |
+            curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - run: rustup install $(cat rust-toolchain)
+      - run: rustup default $(cat rust-toolchain)
+      - run: cargo fetch
+      - run:
+          name: Test
+          command: TARGET=x86_64-apple-darwin ci_scripts/run-rust-test.sh
+
+  test_x86_64-unknown-linux-gnu:
+    executor: default
+    steps:
+      - test_target:
+          target: "x86_64-unknown-linux-gnu"
+
+  test_i686-unknown-linux-gnu:
+    executor: default
+    steps:
+      - test_target:
+          target: "i686-unknown-linux-gnu"
+
+  test_aarch64-linux-android:
+    executor: default
+    steps:
+      - test_target:
+          target: "aarch64-linux-android"
+
+
   build_doxygen:
     executor: doxygen
     steps:
       - checkout
-      - run: bash scripts/run-doxygen.sh
+      - run: bash ci_scripts/run-doxygen.sh
       - run: mkdir -p workspace/c-docs
       - run: cp -av deltachat-ffi/{html,xml} workspace/c-docs/
       - persist_to_workspace:
@@ -27,7 +127,7 @@ jobs:
       - checkout
       # the following commands on success produces
       # workspace/{wheelhouse,py-docs} as artefact directories
-      - run: bash scripts/remote_python_packaging.sh
+      - run: bash ci_scripts/remote_python_packaging.sh 
       - persist_to_workspace:
           root: workspace
           paths:
@@ -35,6 +135,18 @@ jobs:
             - py-docs
             - wheelhouse
 
+  remote_tests_rust:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_rust.sh
+
+  remote_tests_python:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_python.sh
+
   upload_docs_wheels:
     machine: true
     steps:
@@ -42,17 +154,41 @@ jobs:
       - attach_workspace:
           at: workspace
       - run: ls -laR workspace
-      - run: scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
+      - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
+
+  clippy:
+    executor: default
+    steps:
+      - *restore-workspace
+      - *restore-cache
+      - run:
+          name: Run cargo clippy
+          command: cargo clippy 
+
 
 workflows:
   version: 2.1
 
   test:
     jobs:
+      # - cargo_fetch
+
+      - remote_tests_rust:
+          filters:
+            tags:
+              only: /.*/
+
+      - remote_tests_python:
+          filters:
+            tags:
+              only: /.*/
+
       - remote_python_packaging:
           filters:
             branches:
               only: master
+            #tags:
+            #  only: /.*/
 
       - upload_docs_wheels:
           requires:
@@ -61,8 +197,38 @@ workflows:
           filters:
             branches:
               only: master
+            tags:
+              only: /.*/
+      # - rustfmt:
+      #     requires:
+      #       - cargo_fetch
+      # - clippy:
+      #     requires:
+      #      - cargo_fetch
 
       - build_doxygen:
           filters:
             branches:
               only: master
+            tags:
+              only: /.*/
+
+      # Linux Desktop 64bit
+      # - test_x86_64-unknown-linux-gnu:
+      #     requires:
+      #       - cargo_fetch
+
+      # Linux Desktop 32bit
+      # - test_i686-unknown-linux-gnu:
+      #     requires:
+      #       - cargo_fetch
+
+      # Android 64bit
+      # - test_aarch64-linux-android:
+      #     requires:
+      #       - cargo_fetch
+
+      # Desktop Apple
+      # - test_macos:
+      #     requires:
+      #       - cargo_fetch

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    commit-message:
-      prefix: "cargo"
-    open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -29,7 +29,7 @@ jobs:
   run_clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: 1.50.0
@@ -114,10 +114,8 @@ jobs:
 
     - name: check
       uses: actions-rs/cargo@v1
-      env:
-        RUSTFLAGS: -D warnings
       with:
-        command: check
+        command:  check
         args: --all --bins --examples --tests --features repl
 
     - name: tests

.github/workflows/remote_tests.yml

@@ -1,18 +0,0 @@
-name: Remote tests
-on: [push]
-jobs:
-  remote_tests_python:
-    name: Remote Python tests
-    runs-on: ubuntu-latest
-    env:
-      DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: mkdir -m 700 -p ~/.ssh
-      - run: touch ~/.ssh/id_ed25519
-      - run: chmod 600 ~/.ssh/id_ed25519
-      - run: 'echo "$SSH_KEY" | base64 -d > ~/.ssh/id_ed25519'
-        shell: bash
-        env:
-          SSH_KEY: ${{ secrets.SSH_KEY }}
-      - run: scripts/remote_tests_python.sh "deltachat-core/python/${{ github.ref }}/${{ github.run_number }}"

.gitignore

@@ -1,6 +1,5 @@
 /target
 **/*.rs.bk
-/build
 
 # ignore vi temporaries
 *~
@@ -26,5 +25,3 @@ deltachat-ffi/html
 deltachat-ffi/xml
 
 .rsynclist
-
-coverage/

CHANGELOG.md

@@ -1,85 +1,22 @@
 # Changelog 
 
-## 1.54.0
+## UNRELEASED
 
-- switch back from `sqlx` to `rusqlite` due to performance regressions #2380 #2381 #2385 #2387
+- breaking change: You have to call dc_stop_io()/dc_start_io() before/after EXPORT_BACKUP:
+  fix race condition and db corruption when a message was received during backup #2253
 
-- global search performance improvement #2364 #2365 #2366
-
-- improve SQLite performance with `PRAGMA synchronous=normal` #2382
-
-- python: fix building of bindings against system-wide install of `libdeltachat` #2383 #2385
-
-- python: list `requests` as a requirement #2390
-
-- fix creation of many delete jobs when being offline #2372
-
-- synchronize status between devices #2386
-
-- deaddrop (contact requests) chat improvements #2373
-
-- add "Forwarded:" to notification and chatlist summaries #2310
-
-- place user avatar directly into `Chat-User-Avatar` header #2232 #2384
-
-- improve tests #2360 #2362 #2370 #2377 #2387
-
-- cleanup #2359 #2361 #2374 #2376 #2379 #2388
-
-
-## 1.53.0
-
-- fix sqlx performance regression #2355 2356
-
-- add a `ci_scripts/coverage.sh` #2333 #2334
-
-- refactorings and tests #2348 #2349 #2350
-
-- improve python bindings #2332 #2326
-
-
-## 1.52.0
-
-- database library changed from rusqlite to sqlx #2089 #2331 #2336 #2340
-
-- add alias support: UIs should check for `dc_msg_get_override_sender_name()`
-  also in single-chats now and display divergent names and avatars #2297
-
-- parse blockquote-tags for better quote detection #2313
-
-- ignore unknown classical emails from spam folder #2311
-
-- support "Mixed Up” encryption repairing #2321
-
-- fix single chat search #2344
-
-- fix nightly clippy and rustc errors #2341
-
-- update dependencies #2350
-
-- improve ci #2342
-
-- improve python bindings #2332 #2326
-
-
-## 1.51.0
-
-- breaking change: You have to call `dc_stop_io()`/`dc_start_io()`
-  before/after `dc_imex(DC_IMEX_EXPORT_BACKUP)`:
-  fix race condition and db corruption
-  when a message was received during backup #2253
-
-- save subject for messages: new api `dc_msg_get_subject()`,
-  when quoting, use the subject of the quoted message as the new subject,
-  instead of the last subject in the chat #2274 #2283
+- save subject for messages:
+  new api `dc_msg_get_subject()`,
+  when quoting, use the subject of the quoted message as the new subject, instead of the
+  last subject in the chat
 
 - new apis to get full or html message,
-  `dc_msg_has_html()` and `dc_get_msg_html()` #2125 #2151 #2264 #2279
+  `dc_msg_has_html()` and `dc_get_msg_html()` #2125 #2151
 
 - new chat type and apis for the new mailing list support,
   `DC_CHAT_TYPE_MAILINGLIST`, `dc_msg_get_real_chat_id()`,
   `dc_msg_get_override_sender_name()` #1964 #2181 #2185 #2195 #2211 #2210 #2240
-  #2241 #2243 #2258 #2259 #2261 #2267 #2270 #2272 #2290
+  #2243
 
 - new api `dc_decide_on_contact_request()`,
   deprecated `dc_create_chat_by_msg_id()` and `dc_marknoticed_contact()` #1964
@@ -88,7 +25,7 @@
 
 - new api `dc_get_chat_encrinfo()` #2186
 
-- new api `dc_contact_get_status()`, returning the recent footer #2218 #2307
+- new api `dc_contact_get_status()`, returning the recent footer #2218
 
 - improve contact name update rules,
   add api `dc_contact_get_auth_name()` #2206 #2212 #2225
@@ -101,11 +38,6 @@
 
 - api removed: `dc_contact_get_first_name()` #2165 #2171
 
-- improve compatibility with providers changing the Message-ID
-  (as Outlook.com) #2250 #2265
-
-- correctly show emails that were sent to an alias and then bounced 
-
 - implement Consistent Color Generation (XEP-0392),
   that results in contact colors be be changed #2228 #2229 #2239
 
@@ -140,7 +72,7 @@
 
 - enable strict TLS for known providers by default #2121
 
-- improve and harden secure join #2154 #2161 #2251
+- improve and harden secure join #2154 #2161
 
 - update `dc_get_info()` to return more information #2156
 
@@ -168,24 +100,10 @@
 
 - fix parsing quoted encoded words in From: header #2193 #2204
 
-- fix import/export race condition #2250
-
-- fix: exclude muted chats from notified-list #2269 #2275
-
-- fix: update uid_next if the server rewind it #2288
-
-- fix: return error on fingerprint mismatch on qr-scan #2295
-
-- fix ci #2217 #2226 #2244 #2245 #2249 #2277 #2286
+- fix ci #2217 #2226
 
 - try harder on backup opening #2148
 
-- trash messages more thoroughly #2273
-
-- nicer logging #2284
-
-- add CMakeLists.txt #2260
-
 - switch to rust 1.50, update toolchains, deps #2150 #2155 #2165 #2107 #2262 #2271
 
 - improve python bindings #2113 #2115 #2133 #2214
@@ -193,9 +111,7 @@
 - improve documentation #2143 #2160 #2175 #2146
 
 - refactorings #2110 #2136 #2135 #2168 #2178 #2189 #2190 #2198 #2197 #2201 #2196
-  #2200 #2230 #2262 #2203
-
-- update provider-database #2299
+  #2200 #2230
 
 
 ## 1.50.0

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.16)
-project(deltachat)
+cmake_minimum_required(VERSION 3.18)
+project (deltachat)
 
 find_program(CARGO cargo)
 
@@ -8,18 +8,8 @@ add_custom_command(
 	"target/release/libdeltachat.a"
 	"target/release/libdeltachat.so"
 	"target/release/pkgconfig/deltachat.pc"
-	COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --release --no-default-features
-
-	# Build in `deltachat-ffi` directory instead of using
-	# `--package deltachat_ffi` to avoid feature resolver version
-	# "1" bug which makes `--no-default-features` affect only
-	# `deltachat`, but not `deltachat-ffi` package.
-	#
-	# We can't enable version "2" resolver [1] because it is not
-	# stable yet on rust 1.50.0.
-	#
-	# [1] https://doc.rust-lang.org/nightly/cargo/reference/features.html#resolver-version-2-command-line-flags
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
+	COMMAND PREFIX=${CMAKE_INSTALL_PREFIX} ${CARGO} build --package deltachat_ffi --release
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.54.0"
+version = "1.51.0-alpha.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"
@@ -14,76 +14,76 @@ lto = true
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 
-ansi_term = { version = "0.12.1", optional = true }
-anyhow = "1.0.40"
-async-imap = "0.5.0"
-async-native-tls = { version = "0.3.3" }
-async-smtp = { git = "https://github.com/async-email/async-smtp", rev="2275fd8d13e39b2c58d6605c786ff06ff9e05708" }
-async-std-resolver = "0.20.2"
-async-std = { version = "~1.9.0", features = ["unstable"] }
-async-tar = "0.3.0"
-async-trait = "0.1.50"
-backtrace = "0.3.58"
-base64 = "0.13"
-bitflags = "1.1.0"
-byteorder = "1.3.1"
-charset = "0.1"
-chrono = "0.4.6"
-dirs = { version = "3.0.2", optional=true }
-email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
-escaper = "0.1.0"
-futures = "0.3.14"
-hex = "0.4.0"
-image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-indexmap = "1.3.0"
-itertools = "0.10.0"
-kamadak-exif = "0.5"
-lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2.51"
-log = {version = "0.4.8", optional = true }
-mailparse = "0.13.4"
-native-tls = "0.2.3"
-num_cpus = "1.13.0"
-num-derive = "0.3.0"
-num-traits = "0.2.6"
-once_cell = "1.4.1"
-percent-encoding = "2.0"
-pgp = { version = "0.7.0", default-features = false }
-pretty_env_logger = { version = "0.4.0", optional = true }
-quick-xml = "0.22.0"
-r2d2 = "0.8.9"
-r2d2_sqlite = "0.18.0"
-rand = "0.7.0"
-regex = "1.4.6"
-rusqlite = "0.25"
-rust-hsluv = "0.1.4"
-rustyline = { version = "8.0.0", optional = true }
-sanitize-filename = "0.3.0"
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
+pgp = { version = "0.7.0", default-features = false } 
+hex = "0.4.0"
 sha-1 = "0.9.3"
 sha2 = "0.9.0"
+rand = "0.7.0"
 smallvec = "1.0.0"
-stop-token = "0.2.0"
-strum = "0.20.0"
-strum_macros = "0.20.1"
 surf = { version = "2.0.0-alpha.4", default-features = false, features = ["h1-client"] }
+num-derive = "0.3.0"
+num-traits = "0.2.6"
+async-smtp = { git = "https://github.com/async-email/async-smtp", rev="2275fd8d13e39b2c58d6605c786ff06ff9e05708" }
+email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
+lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
+async-imap = "0.4.0"
+async-native-tls = { version = "0.3.3" }
+async-std = { version = "~1.8.0", features = ["unstable"] }
+base64 = "0.12"
+charset = "0.1"
+percent-encoding = "2.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+chrono = "0.4.6"
+indexmap = "1.3.0"
+kamadak-exif = "0.5"
+once_cell = "1.4.1"
+regex = "1.1.6"
+rusqlite = { version = "0.24", features = ["bundled"] }
+r2d2_sqlite = "0.17.0"
+r2d2 = "0.8.5"
+strum = "0.19.0"
+strum_macros = "0.19.0"
+backtrace = "0.3.33"
+byteorder = "1.3.1"
+itertools = "0.9.0"
+quick-xml = "0.18.1"
+escaper = "0.1.0"
+bitflags = "1.1.0"
+sanitize-filename = "0.3.0"
+stop-token = { version = "0.1.1", features = ["unstable"] }
+mailparse = "0.13.0"
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
+native-tls = "0.2.3"
+image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+futures = "0.3.4"
 thiserror = "1.0.14"
-toml = "0.5.6"
+anyhow = "1.0.28"
+async-trait = "0.1.31"
 url = "2.1.1"
+async-std-resolver = "0.19.5"
+async-tar = "0.3.0"
 uuid = { version = "0.8", features = ["serde", "v4"] }
+rust-hsluv = "0.1.4"
+
+pretty_env_logger = { version = "0.4.0", optional = true }
+log = {version = "0.4.8", optional = true }
+rustyline = { version = "4.1.0", optional = true }
+ansi_term = { version = "0.12.1", optional = true }
+dirs = { version = "3.0.1", optional=true }
+toml = "0.5.6"
+
 
 [dev-dependencies]
-ansi_term = "0.12.0"
-async-std = { version = "1.9.0", features = ["unstable", "attributes"] }
-criterion = "0.3"
-futures-lite = "1.7.0"
-log = "0.4.11"
-pretty_assertions = "0.7.2"
-pretty_env_logger = "0.4.0"
-proptest = "1.0"
 tempfile = "3.0"
+pretty_assertions = "0.6.1"
+pretty_env_logger = "0.4.0"
+proptest = "0.10"
+async-std = { version = "1.6.4", features = ["unstable", "attributes"] }
+futures-lite = "1.7.0"
+criterion = "0.3"
+ansi_term = "0.12.0"
 
 [workspace]
 members = [
@@ -106,17 +106,10 @@ required-features = ["repl"]
 name = "create_account"
 harness = false
 
-[[bench]]
-name = "contacts"
-harness = false
-
-[[bench]]
-name = "search_msgs"
-harness = false
-
 [features]
 default = []
 internals = []
 repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs"]
-vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored", "rusqlite/bundled"]
+vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored"]
 nightly = ["pgp/nightly"]
+

README.md

@@ -2,9 +2,7 @@
 
 > Deltachat-core written in Rust 
 
-[![Rust CI](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/ci.yml)
-[![Remote tests](https://github.com/deltachat/deltachat-core-rust/actions/workflows/remote_tests.yml/badge.svg)](https://github.com/deltachat/deltachat-core-rust/actions/workflows/remote_tests.yml)
-[![CircleCI](https://circleci.com/gh/deltachat/deltachat-core-rust.svg?style=shield)](https://circleci.com/gh/deltachat/deltachat-core-rust/)
+[![CircleCI build status][circle-shield]][circle] [![Appveyor build status][appveyor-shield]][appveyor]
 
 ## Installing Rust and Cargo
 
@@ -19,7 +17,7 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:
 
 ```
-$ RUST_LOG=repl=info cargo run --example repl --features repl -- ~/deltachat-db
+$ RUST_LOG=info cargo run --example repl --features repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.
 
@@ -97,7 +95,7 @@ $ cargo build -p deltachat_ffi --release
 
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 
 
-- `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.
 
 ### Expensive tests
@@ -113,6 +111,11 @@ $ cargo test -- --ignored
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
 - `nightly`: Enable nightly only performance and security related features.
 
+[circle-shield]: https://img.shields.io/circleci/project/github/deltachat/deltachat-core-rust/master.svg?style=flat-square
+[circle]: https://circleci.com/gh/deltachat/deltachat-core-rust/
+[appveyor-shield]: https://ci.appveyor.com/api/projects/status/lqpegel3ld4ipxj8/branch/master?style=flat-square
+[appveyor]: https://ci.appveyor.com/project/dignifiedquire/deltachat-core-rust/branch/master
+
 ## Language bindings and frontend projects
 
 Language bindings are available for:

benches/contacts.rs

@@ -1,39 +0,0 @@
-use async_std::task::block_on;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::contact::Contact;
-use deltachat::context::Context;
-use tempfile::tempdir;
-
-async fn address_book_benchmark(n: u32, read_count: u32) {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let id = 100;
-    let context = Context::new("FakeOS".into(), dbfile.into(), id)
-        .await
-        .unwrap();
-
-    let book = (0..n)
-        .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
-        .collect::<Vec<String>>()
-        .join("");
-
-    Contact::add_address_book(&context, book).await.unwrap();
-
-    let query: Option<&str> = None;
-    for _ in 0..read_count {
-        Contact::get_all(&context, 0, query).await.unwrap();
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("create 500 contacts", |b| {
-        b.iter(|| block_on(async { address_book_benchmark(black_box(500), black_box(0)).await }))
-    });
-
-    c.bench_function("create 100 contacts and read it 1000 times", |b| {
-        b.iter(|| block_on(async { address_book_benchmark(black_box(100), black_box(1000)).await }))
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

benches/search_msgs.rs

@@ -1,29 +0,0 @@
-use async_std::task::block_on;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::context::Context;
-use std::path::Path;
-
-async fn search_benchmark(path: impl AsRef<Path>) {
-    let dbfile = path.as_ref();
-    let id = 100;
-    let context = Context::new("FakeOS".into(), dbfile.into(), id)
-        .await
-        .unwrap();
-
-    for _ in 0..10u32 {
-        context.search_msgs(None, "hello").await.unwrap();
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
-    // messages, such as your primary account.
-    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        c.bench_function("search hello", |b| {
-            b.iter(|| block_on(async { search_benchmark(black_box(&path)).await }))
-        });
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

ci_scripts/README.md

@@ -1,15 +1,11 @@
 # Continuous Integration Scripts for Delta Chat
 
-Continuous Integration, run through [GitHub
-Actions](https://docs.github.com/actions),
-[CircleCI](https://app.circleci.com/) and an own build machine.
+Continuous Integration, run through CircleCI and an own build machine.
 
 ## Description of scripts 
 
-- `../.github/workflows` contains jobs run by GitHub Actions.
-
 - `../.circleci/config.yml` describing the build jobs that are run
-  by CircleCI.
+  by Circle-CI
 
 - `remote_tests_python.sh` rsyncs to a build machine and runs
   `run-python-test.sh` remotely on the build machine. 
@@ -30,8 +26,8 @@ There is experimental support for triggering a remote Python or Rust test run
 from your local checkout/branch. You will need to be authorized to login to 
 the build machine (ask your friendly sysadmin on #deltachat freenode) to type::
 
-    scripts/manual_remote_tests.sh rust
-    scripts/manual_remote_tests.sh python
+    ci_scripts/manual_remote_tests.sh rust
+    ci_scripts/manual_remote_tests.sh python
 
 This will **rsync** your current checkout to the remote build machine 
 (no need to commit before) and then run either rust or python tests. 
@@ -45,6 +41,6 @@ python tests and build wheels (binary packages for Python)
 You can build the docker images yourself locally
 to avoid the relatively large download:: 
  
-    cd scripts  # where all CI things are 
+    cd ci_scripts  # where all CI things are 
     docker build -t deltachat/coredeps docker-coredeps
     docker build -t deltachat/doxygen docker-doxygen 

ci_scripts/ci_upload.sh

@@ -12,9 +12,8 @@ WHEELHOUSEDIR=${2:?directory with pre-built wheels}
 DOXYDOCDIR=${3:?directory where doxygen docs to be found}
 SSHTARGET=ci@b1.delta.chat
 
-
-# if CIRCLE_BRANCH is not set we are called for a tag with empty CIRCLE_BRANCH variable. 
-export BRANCH=${CIRCLE_BRANCH:master}
+    
+export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 
 export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}/wheelhouse
 
@@ -42,7 +41,7 @@ echo -----------------------
 # Bundle external shared libraries into the wheels
 
 ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SSHTARGET mkdir -p $BUILDDIR 
-scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null scripts/cleanup_devpi_indices.py $SSHTARGET:$BUILDDIR 
+scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ci_scripts/cleanup_devpi_indices.py $SSHTARGET:$BUILDDIR 
 rsync -avz \
   -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
   $WHEELHOUSEDIR \

ci_scripts/docker-coredeps/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux2014_x86_64
+FROM quay.io/pypa/manylinux2010_x86_64
 
 # Configure ld.so/ldconfig and pkg-config
 RUN echo /usr/local/lib64 > /etc/ld.so.conf.d/local.conf && \

ci_scripts/manual_remote_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -xe
+export CIRCLE_JOB=remote_tests_${1:?need to specify 'rust' or 'python'} 
+export CIRCLE_BUILD_NUM=$USER
+export CIRCLE_BRANCH=`git branch | grep \* | cut -d ' ' -f2`
+export CIRCLE_PROJECT_REPONAME=$(basename `git rev-parse --show-toplevel`)
+
+time bash ci_scripts/$CIRCLE_JOB.sh 

ci_scripts/old/gh-actions-rust.yml

@@ -0,0 +1,77 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  build_and_test:
+    name: Build and test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [nightly]
+
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Install ${{ matrix.rust }}
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        override: true
+
+    - name: check
+      uses: actions-rs/cargo@v1
+      if: matrix.rust == 'nightly'
+      with:
+        command:  check
+        args: --all --bins --examples --tests
+
+    - name: tests
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
+
+    - name: tests ignored
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all --release -- --ignored
+
+  check_fmt:
+    name: Checking fmt and docs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: actions-rs/toolchain@v1
+      with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+
+    - name: fmt
+      run: cargo fmt --all -- --check
+
+#  clippy_check:
+#    name: Clippy check
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#    - uses: actions/checkout@v1
+#    - uses: actions-rs/toolchain@v1
+#      with:
+#          profile: minimal
+#          toolchain: nightly
+#          override: true
+#          components: clippy
+#
+#    - name: clippy
+#      run: cargo clippy --all

ci_scripts/old/run-python.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# Build the Delta Chat C/Rust library typically run in a docker
+# container that contains all library deps but should also work
+# outside if you have the dependencies installed on your system.
+
+set -e -x
+
+# Perform clean build of core and install.
+export TOXWORKDIR=.docker-tox
+
+# install core lib
+
+export PATH=/root/.cargo/bin:$PATH
+cargo build --release -p deltachat_ffi
+# cargo test --all --all-features
+
+# Statically link against libdeltachat.a.
+export DCC_RS_DEV=$(pwd)
+
+# Configure access to a base python and to several python interpreters
+# needed by tox below.
+export PATH=$PATH:/opt/python/cp35-cp35m/bin
+export PYTHONDONTWRITEBYTECODE=1
+pushd /bin
+ln -s /opt/python/cp27-cp27m/bin/python2.7
+ln -s /opt/python/cp36-cp36m/bin/python3.6
+ln -s /opt/python/cp37-cp37m/bin/python3.7
+popd
+
+if [ -n "$TESTS" ]; then
+
+    pushd python
+    # prepare a clean tox run
+    rm -rf tests/__pycache__
+    rm -rf src/deltachat/__pycache__
+    export PYTHONDONTWRITEBYTECODE=1
+
+    # run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
+    # allows running of "liveconfig" tests but for speed reasons
+    # we run them only for the highest python version we support
+    
+    # we split out qr-tests run to minimize likelyness of flaky tests
+    # (some qr tests are pretty heavy in terms of send/received
+    # messages and rust's imap code likely has concurrency problems) 
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
+    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
+    unset DCC_PY_LIVECONFIG
+    unset DCC_NEW_TMP_EMAIL
+    tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
+    tox --workdir "$TOXWORKDIR" -e auditwheels
+    popd
+fi
+
+
+# if [ -n "$DOCS" ]; then
+#     echo -----------------------
+#     echo generating python docs
+#     echo -----------------------
+#     (cd python && tox --workdir "$TOXWORKDIR" -e doc)
+# fi

ci_scripts/remote_python_packaging.sh

@@ -30,13 +30,14 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
     set +x -e
     shopt -s huponexit
     cd $BUILDDIR
+    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
     export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
     set -x
 
     # run everything else inside docker 
-    docker run -e DCC_NEW_TMP_EMAIL \
+    docker run -e DCC_NEW_TMP_EMAIL -e DCC_PY_LIVECONFIG \
        --rm -it -v \$(pwd):/mnt -w /mnt \
-       deltachat/coredeps scripts/run_all.sh
+       deltachat/coredeps ci_scripts/run_all.sh
 
 _HERE
 

ci_scripts/remote_tests_python.sh

@@ -1,9 +1,10 @@
 #!/bin/bash 
 
-BUILD_ID=${1:?specify build ID}
+export BRANCH=${CIRCLE_BRANCH:-master}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:-deltachat-core-rust}
+export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
 
-SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
-BUILDDIR=ci_builds/$BUILD_ID
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
 
 echo "--- Copying files to $SSHTARGET:$BUILDDIR"
 
@@ -17,7 +18,7 @@ rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
 
 set +x
 
-echo "--- Running Python tests remotely"
+echo "--- Running $CIRCLE_JOB remotely"
 
 ssh $SSHTARGET <<_HERE
     set +x -e
@@ -28,6 +29,7 @@ ssh $SSHTARGET <<_HERE
     export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
     export TARGET=release
+    export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
     export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
 
     #we rely on tox/virtualenv being available in the host
@@ -41,5 +43,5 @@ ssh $SSHTARGET <<_HERE
     source \$HOME/venv/bin/activate
     which python
 
-    bash scripts/run-python-test.sh 
+    bash ci_scripts/run-python-test.sh 
 _HERE

ci_scripts/remote_tests_rust.sh

@@ -0,0 +1,30 @@
+#!/bin/bash 
+
+export BRANCH=${CIRCLE_BRANCH:-master}
+export REPONAME=${CIRCLE_PROJECT_REPONAME:-deltachat-core-rust}
+export SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
+
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}
+
+set -e
+
+echo "--- Copying files to $SSHTARGET:$BUILDDIR"
+
+ssh -oBatchMode=yes -oStrictHostKeyChecking=no  $SSHTARGET mkdir -p "$BUILDDIR"
+git ls-files >.rsynclist 
+rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
+
+echo "--- Running $CIRCLE_JOB remotely"
+
+ssh $SSHTARGET <<_HERE
+    set +x -e
+    # make sure all processes exit when ssh dies
+    shopt -s huponexit
+    export RUSTC_WRAPPER=\`which sccache\`
+    cd $BUILDDIR
+    export TARGET=x86_64-unknown-linux-gnu
+    export RUSTC_WRAPPER=sccache
+
+    bash ci_scripts/run-rust-test.sh
+_HERE
+

ci_scripts/run-doxygen.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+cd deltachat-ffi 
+PROJECT_NUMBER=$(git log -1 --format "%h (%cd)") doxygen 

ci_scripts/run_all.sh

@@ -39,6 +39,7 @@ mkdir -p $TOXWORKDIR
 # XXX we may switch on some live-tests on for better ensurances 
 # Note that the independent remote_tests_python step does all kinds of
 # live-testing already. 
+unset DCC_PY_LIVECONFIG
 unset DCC_NEW_TMP_EMAIL
 tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels
 popd

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.54.0"
+version = "1.51.0-alpha.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -20,8 +20,8 @@ libc = "0.2"
 human-panic = "1.0.1"
 num-traits = "0.2.6"
 serde_json = "1.0"
-async-std = "1.9.0"
-anyhow = "1.0.40"
+async-std = "1.6.0"
+anyhow = "1.0.28"
 thiserror = "1.0.14"
 rand = "0.7.3"
 

deltachat-ffi/deltachat.h

@@ -1078,9 +1078,9 @@ int             dc_estimate_deletion_cnt    (dc_context_t* context, int from_ser
  * or badge counters eg. on the app-icon.
  * The list is already sorted and starts with the most recent fresh message.
  *
- * Messages belonging to muted chats or to the deaddrop are not returned;
- * these messages should not be notified
- * and also badge counters should not include these messages.
+ * Messages belonging to muted chats are not returned,
+ * as they should not be notified
+ * and also a badge counters should not include messages of muted chats.
  *
  * To get the number of fresh messages for a single chat, muted or not,
  * use dc_get_fresh_msg_cnt().
@@ -1104,8 +1104,7 @@ dc_array_t*     dc_get_fresh_msgs            (dc_context_t* context);
  *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
- * @param chat_id The chat ID of which all messages should be marked as being noticed
- *     (this also works for the virtual chat ID DC_CHAT_ID_DEADDROP).
+ * @param chat_id The chat ID of which all messages should be marked as being noticed.
  */
 void            dc_marknoticed_chat          (dc_context_t* context, uint32_t chat_id);
 
@@ -1273,12 +1272,6 @@ uint32_t dc_get_chat_ephemeral_timer (dc_context_t* context, uint32_t chat_id);
  * search results may just hilite the corresponding messages and present a
  * prev/next button.
  *
- * For global search, result is limited to 1000 messages,
- * this allows incremental search done fast.
- * So, when getting exactly 1000 results, the result may be truncated;
- * the UIs may display sth. as "1000+ messages found" in this case.
- * Chat search (if a chat_id is set) is not limited.
- *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id ID of the chat to search messages in.
@@ -1594,22 +1587,13 @@ void            dc_marknoticed_contact       (dc_context_t* context, uint32_t co
 
 
 /**
- * Mark messages as presented to the user.
- * Typically, UIs call this function on scrolling through the chatlist,
- * when the messages are presented at least for a little moment.
- * The concrete action depends on the type of the chat and on the users settings
- * (dc_msgs_presented() may be a better name therefore, but well :)
+ * Mark a message as _seen_, updates the IMAP state and
+ * sends MDNs. If the message is not in a real chat (e.g. a contact request), the
+ * message is only marked as NOTICED and no IMAP/MDNs is done.  See also
+ * dc_marknoticed_chat().
  *
- * - For normal chats, the IMAP state is updated, MDN is sent
- *   (if dc_set_config()-options `mdns_enabled` is set)
- *   and the internal state is changed to DC_STATE_IN_SEEN to reflect these actions.
- *
- * - For the deaddrop, no IMAP or MNDs is done
- *   and the internal change is not changed therefore.
- *   See also dc_marknoticed_chat().
- *
- * Moreover, timer is started for incoming ephemeral messages.
- * This also happens for messages in the deaddrop.
+ * Moreover, if messages belong to a chat with ephemeral messages enabled,
+ * the ephemeral timer is started for these messages.
  *
  * One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
  *
@@ -3563,31 +3547,17 @@ char*           dc_msg_get_summarytext        (const dc_msg_t* msg, int approx_c
 
 /**
  * Get the name that should be shown over the message (in a group chat) instead of the contact
- * display name, or NULL.
- *
- * If this returns non-NULL, put a `~` before the override-sender-name and show the
- * override-sender-name and the sender's avatar even in 1:1 chats.
+ * display name.
  *
  * In mailing lists, sender display name and sender address do not always belong together.
  * In this case, this function gives you the name that should actually be shown over the message.
  *
- * Also, sometimes, we need to indicate a different sender in 1:1 chats:
- * Suppose that our user writes an email to support@delta.chat, which forwards to 
- * Bob <bob@delta.chat>, and Bob replies.
- * 
- * Then, Bob's reply is shown in our 1:1 chat with support@delta.chat and the override-sender-name is
- * set to `Bob`. The UI should show the sender name as `~Bob` and show the avatar, just
- * as in group messages. If the user then taps on the avatar, they can see that this message
- * comes from bob@delta.chat.
- * 
- * You should show a `~` before the override-sender-name in chats, so that the user can
- * see that this isn't the sender's actual name.
- *
  * @memberof dc_msg_t
  * @param msg The message object.
  * @return the name to show over this message or NULL.
  *     If this returns NULL, call `dc_contact_get_display_name()`.
  *     The returned string must be released using dc_str_unref().
+ *     Returns an empty string on errors, never returns NULL.
  */
 char*           dc_msg_get_override_sender_name(const dc_msg_t* msg);
 
@@ -5635,11 +5605,6 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
 #define DC_STR_EPHEMERAL_WEEKS            96
 
-/// "Forwarded"
-///
-/// Used in message summary text for notifications and chatlist.
-#define DC_STR_FORWARDED                  97
-
 /**
  * @}
  */

deltachat-ffi/src/lib.rs

@@ -21,7 +21,6 @@ use std::ptr;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime};
 
-use anyhow::Context as _;
 use async_std::task::{block_on, spawn};
 use num_traits::{FromPrimitive, ToPrimitive};
 
@@ -131,14 +130,12 @@ pub unsafe extern "C" fn dc_set_config(
         return 0;
     }
     let ctx = &*context;
-    let key = to_string_lossy(key);
-    match config::Config::from_str(&key) {
+    match config::Config::from_str(&to_string_lossy(key)) {
+        // When ctx.set_config() fails it already logged the error.
+        // TODO: Context::set_config() should not log this
         Ok(key) => block_on(async move {
-            let value = to_opt_string_lossy(value);
-            ctx.set_config(key, value.as_deref())
+            ctx.set_config(key, to_opt_string_lossy(value).as_deref())
                 .await
-                .with_context(|| format!("Can't set {} to {:?}", key, value))
-                .log_err(ctx, "dc_set_config() failed")
                 .is_ok() as libc::c_int
         }),
         Err(_) => {
@@ -159,14 +156,7 @@ pub unsafe extern "C" fn dc_get_config(
     }
     let ctx = &*context;
     match config::Config::from_str(&to_string_lossy(key)) {
-        Ok(key) => block_on(async move {
-            ctx.get_config(key)
-                .await
-                .log_err(ctx, "Can't get config")
-                .unwrap_or_default()
-                .unwrap_or_default()
-                .strdup()
-        }),
+        Ok(key) => block_on(async move { ctx.get_config(key).await.unwrap_or_default().strdup() }),
         Err(_) => {
             warn!(ctx, "dc_get_config(): invalid key");
             "".strdup()
@@ -235,13 +225,8 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
     }
     let ctx = &*context;
     block_on(async move {
-        match ctx.get_info().await {
-            Ok(info) => render_info(info).unwrap_or_default().strdup(),
-            Err(err) => {
-                warn!(ctx, "failed to get info: {}", err);
-                "".strdup()
-            }
-        }
+        let info = ctx.get_info().await;
+        render_info(info).unwrap_or_default().strdup()
     })
 }
 
@@ -298,12 +283,7 @@ pub unsafe extern "C" fn dc_is_configured(context: *mut dc_context_t) -> libc::c
     }
     let ctx = &*context;
 
-    block_on(async move {
-        ctx.is_configured()
-            .await
-            .log_err(ctx, "failed to get configured state")
-            .unwrap_or_default() as libc::c_int
-    })
+    block_on(async move { ctx.is_configured().await as libc::c_int })
 }
 
 #[no_mangle]
@@ -788,12 +768,7 @@ pub unsafe extern "C" fn dc_set_draft(
         Some(&mut ffi_msg.message)
     };
 
-    block_on(async move {
-        ChatId::new(chat_id)
-            .set_draft(&ctx, msg)
-            .await
-            .unwrap_or_log_default(ctx, "failed to set draft");
-    });
+    block_on(ChatId::new(chat_id).set_draft(&ctx, msg))
 }
 
 #[no_mangle]
@@ -888,7 +863,6 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
         Box::into_raw(Box::new(
             chat::get_chat_msgs(&ctx, ChatId::new(chat_id), flags, marker_flag)
                 .await
-                .unwrap_or_log_default(ctx, "failed to get chat msgs")
                 .into(),
         ))
     })
@@ -902,12 +876,7 @@ pub unsafe extern "C" fn dc_get_msg_cnt(context: *mut dc_context_t, chat_id: u32
     }
     let ctx = &*context;
 
-    block_on(async move {
-        ChatId::new(chat_id)
-            .get_msg_cnt(&ctx)
-            .await
-            .unwrap_or_log_default(ctx, "failed to get msg count") as libc::c_int
-    })
+    block_on(async move { ChatId::new(chat_id).get_msg_cnt(&ctx).await as libc::c_int })
 }
 
 #[no_mangle]
@@ -921,12 +890,7 @@ pub unsafe extern "C" fn dc_get_fresh_msg_cnt(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        ChatId::new(chat_id)
-            .get_fresh_msg_cnt(&ctx)
-            .await
-            .unwrap_or_log_default(ctx, "failed to get fresh msg cnt") as libc::c_int
-    })
+    block_on(async move { ChatId::new(chat_id).get_fresh_msg_cnt(&ctx).await as libc::c_int })
 }
 
 #[no_mangle]
@@ -1024,7 +988,6 @@ pub unsafe extern "C" fn dc_get_chat_media(
                 or_msg_type3,
             )
             .await
-            .unwrap_or_log_default(ctx, "Failed get_chat_media")
             .into(),
         ))
     })
@@ -1066,7 +1029,7 @@ pub unsafe extern "C" fn dc_get_next_media(
             or_msg_type3,
         )
         .await
-        .map(|msg_id| msg_id.map(|id| id.to_u32()).unwrap_or_default())
+        .map(|msg_id| msg_id.to_u32())
         .unwrap_or(0)
     })
 }
@@ -1159,11 +1122,7 @@ pub unsafe extern "C" fn dc_get_chat_contacts(
     let ctx = &*context;
 
     block_on(async move {
-        let arr = dc_array_t::from(
-            chat::get_chat_contacts(&ctx, ChatId::new(chat_id))
-                .await
-                .unwrap_or_log_default(ctx, "Failed get_chat_contacts"),
-        );
+        let arr = dc_array_t::from(chat::get_chat_contacts(&ctx, ChatId::new(chat_id)).await);
         Box::into_raw(Box::new(arr))
     })
 }
@@ -1189,7 +1148,6 @@ pub unsafe extern "C" fn dc_search_msgs(
         let arr = dc_array_t::from(
             ctx.search_msgs(chat_id, to_string_lossy(query))
                 .await
-                .unwrap_or_log_default(ctx, "Failed search_msgs")
                 .iter()
                 .map(|msg_id| msg_id.to_u32())
                 .collect::<Vec<u32>>(),
@@ -1303,8 +1261,7 @@ pub unsafe extern "C" fn dc_set_chat_name(
     chat_id: u32,
     name: *const libc::c_char,
 ) -> libc::c_int {
-    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL.to_u32() || name.is_null()
-    {
+    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL as u32 || name.is_null() {
         eprintln!("ignoring careless call to dc_set_chat_name()");
         return 0;
     }
@@ -1324,7 +1281,7 @@ pub unsafe extern "C" fn dc_set_chat_profile_image(
     chat_id: u32,
     image: *const libc::c_char,
 ) -> libc::c_int {
-    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL.to_u32() {
+    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL as u32 {
         eprintln!("ignoring careless call to dc_set_chat_profile_image()");
         return 0;
     }
@@ -1449,12 +1406,7 @@ pub unsafe extern "C" fn dc_get_msg_info(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        message::get_msg_info(&ctx, MsgId::new(msg_id))
-            .await
-            .unwrap_or_log_default(ctx, "failed to get msg id")
-            .strdup()
-    })
+    block_on(message::get_msg_info(&ctx, MsgId::new(msg_id))).strdup()
 }
 
 #[no_mangle]
@@ -1468,9 +1420,7 @@ pub unsafe extern "C" fn dc_get_msg_html(
     }
     let ctx = &*context;
 
-    block_on(MsgId::new(msg_id).get_html(&ctx))
-        .unwrap_or_log_default(ctx, "Failed get_msg_html")
-        .strdup()
+    block_on(MsgId::new(msg_id).get_html(&ctx)).strdup()
 }
 
 #[no_mangle]
@@ -1485,13 +1435,10 @@ pub unsafe extern "C" fn dc_get_mime_headers(
     let ctx = &*context;
 
     block_on(async move {
-        let mime = message::get_mime_headers(&ctx, MsgId::new(msg_id))
+        message::get_mime_headers(&ctx, MsgId::new(msg_id))
             .await
-            .unwrap_or_log_default(ctx, "failed to get mime headers");
-        if mime.is_empty() {
-            return ptr::null_mut();
-        }
-        mime.strdup()
+            .map(|s| s.strdup())
+            .unwrap_or_else(ptr::null_mut)
     })
 }
 
@@ -1521,7 +1468,7 @@ pub unsafe extern "C" fn dc_forward_msgs(
     if context.is_null()
         || msg_ids.is_null()
         || msg_cnt <= 0
-        || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL.to_u32()
+        || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL as u32
     {
         eprintln!("ignoring careless call to dc_forward_msgs()");
         return;
@@ -1617,12 +1564,14 @@ pub unsafe extern "C" fn dc_lookup_contact_id_by_addr(
     }
     let ctx = &*context;
 
-    block_on(async move {
-        Contact::lookup_id_by_addr(&ctx, to_string_lossy(addr), Origin::IncomingReplyTo)
-            .await
-            .unwrap_or_log_default(ctx, "failed to lookup id")
-            .unwrap_or(0)
-    })
+    block_on(Contact::lookup_id_by_addr(
+        &ctx,
+        to_string_lossy(addr),
+        Origin::IncomingReplyTo,
+    ))
+    .ok()
+    .flatten()
+    .unwrap_or_default()
 }
 
 #[no_mangle]
@@ -1696,7 +1645,8 @@ pub unsafe extern "C" fn dc_get_blocked_cnt(context: *mut dc_context_t) -> libc:
     block_on(async move {
         Contact::get_all_blocked(&ctx)
             .await
-            .unwrap_or_log_default(ctx, "failed to get blocked count")
+            .log_err(&ctx, "Can't get blocked count")
+            .unwrap_or_default()
             .len() as libc::c_int
     })
 }
@@ -1981,7 +1931,7 @@ pub unsafe extern "C" fn dc_send_locations_to_chat(
     chat_id: u32,
     seconds: libc::c_int,
 ) {
-    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL.to_u32() || seconds < 0 {
+    if context.is_null() || chat_id <= constants::DC_CHAT_ID_LAST_SPECIAL as u32 || seconds < 0 {
         eprintln!("ignoring careless call to dc_send_locations_to_chat()");
         return;
     }
@@ -2061,8 +2011,7 @@ pub unsafe extern "C" fn dc_get_locations(
             timestamp_begin as i64,
             timestamp_end as i64,
         )
-        .await
-        .unwrap_or_log_default(ctx, "Failed get_locations");
+        .await;
         Box::into_raw(Box::new(dc_array_t::from(res)))
     })
 }
@@ -2443,12 +2392,8 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
 
     block_on(async move {
         match ffi_chat.chat.get_profile_image(&ctx).await {
-            Ok(Some(p)) => p.to_string_lossy().strdup(),
-            Ok(None) => ptr::null_mut(),
-            Err(err) => {
-                error!(ctx, "failed to get profile image: {:?}", err);
-                ptr::null_mut()
-            }
+            Some(p) => p.to_string_lossy().strdup(),
+            None => ptr::null_mut(),
         }
     })
 }
@@ -2462,7 +2407,7 @@ pub unsafe extern "C" fn dc_chat_get_color(chat: *mut dc_chat_t) -> u32 {
     let ffi_chat = &*chat;
     let ctx = &*ffi_chat.context;
 
-    block_on(ffi_chat.chat.get_color(&ctx)).unwrap_or_log_default(ctx, "Failed get_color")
+    block_on(ffi_chat.chat.get_color(&ctx))
 }
 
 #[no_mangle]
@@ -3373,7 +3318,6 @@ pub unsafe extern "C" fn dc_contact_get_profile_image(
             .contact
             .get_profile_image(&ctx)
             .await
-            .unwrap_or_log_default(ctx, "failed to get profile image")
             .map(|p| p.to_string_lossy().strdup())
             .unwrap_or_else(std::ptr::null_mut)
     })
@@ -3605,7 +3549,6 @@ pub unsafe extern "C" fn dc_provider_get_status(provider: *const dc_provider_t)
 }
 
 #[no_mangle]
-#[allow(clippy::needless_return)]
 pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
     if provider.is_null() {
         eprintln!("ignoring careless call to dc_provider_unref()");

deltachat-ffi/src/string.rs

@@ -241,7 +241,7 @@ pub(crate) fn to_opt_string_lossy(s: *const libc::c_char) -> Option<String> {
 /// [OsStrExt::to_c_string] requires valid Unicode on Windows, this
 /// requires that the pointer contains valid UTF-8 on Windows.
 ///
-/// Because this returns a reference the [Path] slice can not outlive
+/// Because this returns a reference the [Path] silce can not outlive
 /// the original pointer.
 ///
 /// [Path]: std::path::Path

deltachat_derive/Cargo.toml

@@ -9,5 +9,5 @@ license = "MPL-2.0"
 proc-macro = true
 
 [dependencies]
-syn = "1.0.71"
+syn = "1.0.13"
 quote = "1.0.2"

deltachat_derive/src/lib.rs

@@ -35,11 +35,7 @@ pub fn from_sql_derive(input: TokenStream) -> TokenStream {
         impl rusqlite::types::FromSql for #name {
             fn column_result(col: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
                 let inner = rusqlite::types::FromSql::column_result(col)?;
-                if let Some(value) = num_traits::FromPrimitive::from_i64(inner) {
-                    Ok(value)
-                } else {
-                    Err(rusqlite::types::FromSqlError::OutOfRange(inner))
-                }
+                Ok(num_traits::FromPrimitive::from_i64(inner).unwrap_or_default())
             }
         }
     };

examples/repl/cmdline.rs

@@ -120,11 +120,11 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
         real_spec = spec.to_string();
         context
             .sql()
-            .set_raw_config("import_spec", Some(&real_spec))
+            .set_raw_config(context, "import_spec", Some(&real_spec))
             .await
             .unwrap();
     } else {
-        let rs = context.sql().get_raw_config("import_spec").await.unwrap();
+        let rs = context.sql().get_raw_config(context, "import_spec").await;
         if rs.is_none() {
             error!(context, "Import: No file or folder given.");
             return false;
@@ -201,7 +201,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         contact_id,
         msgtext.unwrap_or_default(),
         if msg.has_html() { "[HAS-HTML]️" } else { "" },
-        if msg.get_from_id() == 1 {
+        if msg.get_from_id() == 1 as libc::c_uint {
             ""
         } else if msg.get_state() == MessageState::InSeen {
             "[SEEN]"
@@ -292,7 +292,7 @@ async fn log_contactlist(context: &Context, contacts: &[u32]) {
             let peerstate = Peerstate::from_addr(context, &addr)
                 .await
                 .expect("peerstate error");
-            if peerstate.is_some() && *contact_id != 1 {
+            if peerstate.is_some() && *contact_id != 1 as libc::c_uint {
                 line2 = format!(
                     ", prefer-encrypt={}",
                     peerstate.as_ref().unwrap().prefer_encrypt
@@ -526,7 +526,9 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 None,
             )
             .await?;
-            let time_needed = time_start.elapsed().unwrap_or_default();
+            let time_needed = std::time::SystemTime::now()
+                .duration_since(time_start)
+                .unwrap_or_default();
 
             let cnt = chatlist.len();
             if cnt > 0 {
@@ -541,7 +543,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                         chat_prefix(&chat),
                         chat.get_id(),
                         chat.get_name(),
-                        chat.get_id().get_fresh_msg_cnt(&context).await?,
+                        chat.get_id().get_fresh_msg_cnt(&context).await,
                         if chat.is_muted() { "🔇" } else { "" },
                         match chat.visibility {
                             ChatVisibility::Normal => "",
@@ -603,11 +605,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "Failed to select chat");
             let sel_chat = sel_chat.as_ref().unwrap();
 
-            let time_start = std::time::SystemTime::now();
-            let msglist =
-                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER, None).await?;
-            let time_needed = time_start.elapsed().unwrap_or_default();
-
+            let msglist = chat::get_chat_msgs(&context, sel_chat.get_id(), 0x1, None).await;
             let msglist: Vec<MsgId> = msglist
                 .into_iter()
                 .map(|x| match x {
@@ -617,7 +615,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 })
                 .collect();
 
-            let members = chat::get_chat_contacts(&context, sel_chat.id).await?;
+            let members = chat::get_chat_contacts(&context, sel_chat.id).await;
             let subtitle = if sel_chat.is_device_talk() {
                 "device-talk".to_string()
             } else if sel_chat.get_type() == Chattype::Single && !members.is_empty() {
@@ -640,7 +638,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 } else {
                     ""
                 },
-                match sel_chat.get_profile_image(&context).await? {
+                match sel_chat.get_profile_image(&context).await {
                     Some(icon) => match icon.to_str() {
                         Some(icon) => format!(" Icon: {}", icon),
                         _ => " Icon: Err".to_string(),
@@ -660,22 +658,14 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
 
             println!(
                 "{} messages.",
-                sel_chat.get_id().get_msg_cnt(&context).await?
+                sel_chat.get_id().get_msg_cnt(&context).await
             );
-
-            let time_noticed_start = std::time::SystemTime::now();
             chat::marknoticed_chat(&context, sel_chat.get_id()).await?;
-            let time_noticed_needed = time_noticed_start.elapsed().unwrap_or_default();
-
-            println!(
-                "{:?} to create this list, {:?} to mark all messages as noticed.",
-                time_needed, time_noticed_needed
-            );
         }
         "createchat" => {
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id: u32 = arg1.parse()?;
-            let chat_id = chat::create_by_contact_id(&context, contact_id).await?;
+            let contact_id: libc::c_int = arg1.parse()?;
+            let chat_id = chat::create_by_contact_id(&context, contact_id as u32).await?;
 
             println!("Single#{} created successfully.", chat_id,);
         }
@@ -726,11 +716,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected");
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
 
-            let contact_id_0: u32 = arg1.parse()?;
+            let contact_id_0: libc::c_int = arg1.parse()?;
             if chat::add_contact_to_chat(
                 &context,
                 sel_chat.as_ref().unwrap().get_id(),
-                contact_id_0,
+                contact_id_0 as u32,
             )
             .await
             {
@@ -742,11 +732,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "removemember" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id_1: u32 = arg1.parse()?;
+            let contact_id_1: libc::c_int = arg1.parse()?;
             chat::remove_contact_from_chat(
                 &context,
                 sel_chat.as_ref().unwrap().get_id(),
-                contact_id_1,
+                contact_id_1 as u32,
             )
             .await?;
 
@@ -772,7 +762,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
 
             let contacts =
-                chat::get_chat_contacts(&context, sel_chat.as_ref().unwrap().get_id()).await?;
+                chat::get_chat_contacts(&context, sel_chat.as_ref().unwrap().get_id()).await;
             println!("Memberlist:");
 
             log_contactlist(&context, &contacts).await;
@@ -797,7 +787,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 0,
                 0,
             )
-            .await?;
+            .await;
             let default_marker = "-".to_string();
             for location in &locations {
                 let marker = location.marker.as_ref().unwrap_or(&default_marker);
@@ -909,13 +899,10 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 None
             };
 
-            let time_start = std::time::SystemTime::now();
-            let msglist = context.search_msgs(chat, arg1).await?;
-            let time_needed = time_start.elapsed().unwrap_or_default();
+            let msglist = context.search_msgs(chat, arg1).await;
 
             log_msglist(&context, &msglist).await?;
             println!("{} messages.", msglist.len());
-            println!("{:?} to create this list", time_needed);
         }
         "draft" => {
             ensure!(sel_chat.is_some(), "No chat selected.");
@@ -928,7 +915,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                     .unwrap()
                     .get_id()
                     .set_draft(&context, Some(&mut draft))
-                    .await?;
+                    .await;
                 println!("Draft saved.");
             } else {
                 sel_chat
@@ -936,7 +923,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                     .unwrap()
                     .get_id()
                     .set_draft(&context, None)
-                    .await?;
+                    .await;
                 println!("Draft deleted.");
             }
         }
@@ -959,7 +946,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 Viewtype::Gif,
                 Viewtype::Video,
             )
-            .await?;
+            .await;
             println!("{} images or videos: ", images.len());
             for (i, data) in images.iter().enumerate() {
                 if 0 == i {
@@ -1025,7 +1012,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "msginfo" => {
             ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
             let id = MsgId::new(arg1.parse()?);
-            let res = message::get_msg_info(&context, id).await?;
+            let res = message::get_msg_info(&context, id).await;
             println!("{}", res);
         }
         "html" => {
@@ -1034,7 +1021,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let file = dirs::home_dir()
                 .unwrap_or_default()
                 .join(format!("msg-{}.html", id.to_u32()));
-            let html = id.get_html(&context).await?.unwrap_or_default();
+            let html = id.get_html(&context).await.unwrap_or_default();
             fs::write(&file, html)?;
             println!("HTML written to: {:#?}", file);
         }
@@ -1094,14 +1081,14 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "contactinfo" => {
             ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
 
-            let contact_id: u32 = arg1.parse()?;
+            let contact_id = arg1.parse()?;
             let contact = Contact::get_by_id(&context, contact_id).await?;
             let name_n_addr = contact.get_name_n_addr();
 
             let mut res = format!(
                 "Contact info for: {}:\nIcon: {}\n",
                 name_n_addr,
-                match contact.get_profile_image(&context).await? {
+                match contact.get_profile_image(&context).await {
                     Some(image) => image.to_str().unwrap().to_string(),
                     None => "NoIcon".to_string(),
                 }
@@ -1190,7 +1177,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         //     let r = context.emit_event(event, 0 as libc::uintptr_t, 0 as libc::uintptr_t);
         //     println!(
         //         "Sending event {:?}({}), received value {}.",
-        //         event, event as usize, r,
+        //         event, event as usize, r as libc::c_int,
         //     );
         // }
         "fileinfo" => {

examples/repl/main.rs

@@ -26,9 +26,8 @@ use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
 use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
-use rustyline::validate::Validator;
 use rustyline::{
-    Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyEvent,
+    Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyPress,
 };
 
 mod cmdline;
@@ -238,9 +237,7 @@ const MISC_COMMANDS: [&str; 10] = [
 ];
 
 impl Hinter for DcHelper {
-    type Hint = String;
-
-    fn hint(&self, line: &str, pos: usize, ctx: &RustyContext<'_>) -> Option<Self::Hint> {
+    fn hint(&self, line: &str, pos: usize, ctx: &RustyContext<'_>) -> Option<String> {
         if !line.is_empty() {
             for &cmds in &[
                 &IMEX_COMMANDS[..],
@@ -262,10 +259,11 @@ impl Hinter for DcHelper {
 }
 
 static COLORED_PROMPT: &str = "\x1b[1;32m> \x1b[0m";
+static PROMPT: &str = "> ";
 
 impl Highlighter for DcHelper {
-    fn highlight_prompt<'b, 's: 'b, 'p: 'b>(&self, prompt: &'p str, default: bool) -> Cow<'b, str> {
-        if default {
+    fn highlight_prompt<'p>(&self, prompt: &'p str) -> Cow<'p, str> {
+        if prompt == PROMPT {
             Borrowed(COLORED_PROMPT)
         } else {
             Borrowed(prompt)
@@ -286,7 +284,6 @@ impl Highlighter for DcHelper {
 }
 
 impl Helper for DcHelper {}
-impl Validator for DcHelper {}
 
 async fn start(args: Vec<String>) -> Result<(), Error> {
     if args.len() < 2 {
@@ -320,8 +317,8 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         };
         let mut rl = Editor::with_config(config);
         rl.set_helper(Some(h));
-        rl.bind_sequence(KeyEvent::alt('N'), Cmd::HistorySearchForward);
-        rl.bind_sequence(KeyEvent::alt('P'), Cmd::HistorySearchBackward);
+        rl.bind_sequence(KeyPress::Meta('N'), Cmd::HistorySearchForward);
+        rl.bind_sequence(KeyPress::Meta('P'), Cmd::HistorySearchBackward);
         if rl.load_history(".dc-history.txt").is_err() {
             println!("No previous history.");
         }
@@ -393,7 +390,7 @@ async fn handle_cmd(
             ctx.configure().await?;
         }
         "oauth2" => {
-            if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
+            if let Some(addr) = ctx.get_config(config::Config::Addr).await {
                 let oauth2_url =
                     dc_get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await;
                 if oauth2_url.is_none() {

python/CHANGELOG

@@ -1,10 +1,3 @@
-1.51.0
-------
-
-- adapt python bindings and APIs to core51 release 
-  (see CHANGELOG of https://github.com/deltachat/deltachat-core-rust/blob/1.51.0/CHANGELOG.md#1510
-  for more details on all core changes) 
-
 1.44.0
 ------
 

python/README.rst

@@ -142,7 +142,7 @@ This docker image can be used to run tests and build Python wheels for all inter
 
     $ docker run -e DCC_NEW_TMP_EMAIL \
        --rm -it -v \$(pwd):/mnt -w /mnt \
-       deltachat/coredeps scripts/run_all.sh
+       deltachat/coredeps ci_scripts/run_all.sh
 
 
 Optionally build your own docker image
@@ -151,9 +151,9 @@ Optionally build your own docker image
 If you want to build your own custom docker image you can do this::
 
    $ cd deltachat-core # cd to deltachat-core checkout directory
-   $ docker build -t deltachat/coredeps scripts/docker_coredeps
+   $ docker build -t deltachat/coredeps ci_scripts/docker_coredeps
 
-This will use the ``scripts/docker_coredeps/Dockerfile`` to build
+This will use the ``ci_scripts/docker_coredeps/Dockerfile`` to build
 up docker image called ``deltachat/coredeps``.  You can afterwards
 find it with::
 

python/setup.py

@@ -18,7 +18,7 @@ def main():
         description='Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat',
         long_description=long_description,
         author='holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors',
-        install_requires=['cffi>=1.0.0', 'pluggy', 'imapclient', 'requests'],
+        install_requires=['cffi>=1.0.0', 'pluggy', 'imapclient'],
         packages=setuptools.find_packages('src'),
         package_dir={'': 'src'},
         cffi_modules=['src/deltachat/_build.py:ffibuilder'],

python/src/deltachat/_build.py

@@ -9,6 +9,8 @@ import subprocess
 import tempfile
 import textwrap
 import types
+from os.path import abspath
+from os.path import dirname as dn
 
 import cffi
 
@@ -48,7 +50,6 @@ def system_build_flags():
     flags.objs = []
     flags.incs = []
     flags.extra_link_args = []
-    return flags
 
 
 def extract_functions(flags):
@@ -167,8 +168,11 @@ def extract_defines(flags):
 
 def ffibuilder():
     projdir = os.environ.get('DCC_RS_DEV')
+    if not projdir:
+        p = dn(dn(dn(dn(abspath(__file__)))))
+        projdir = os.environ["DCC_RS_DEV"] = p
+    target = os.environ.get('DCC_RS_TARGET', 'release')
     if projdir:
-        target = os.environ.get('DCC_RS_TARGET', 'release')
         flags = local_build_flags(projdir, target)
     else:
         flags = system_build_flags()

python/src/deltachat/account.py

@@ -89,22 +89,6 @@ class Account(object):
             d[key.lower()] = value
         return d
 
-    def dump_account_info(self, logfile):
-        def log(*args, **kwargs):
-            kwargs["file"] = logfile
-            print(*args, **kwargs)
-
-        log("=============== " + self.get_config("displayname") + " ===============")
-        cursor = 0
-        for name, val in self.get_info().items():
-            entry = "{}={}".format(name.upper(), val)
-            if cursor + len(entry) > 80:
-                log("")
-                cursor = 0
-            log(entry, end=" ")
-            cursor += len(entry) + 1
-        log("")
-
     def set_stock_translation(self, id, string):
         """ set stock translation string.
 

python/src/deltachat/chat.py

@@ -254,19 +254,17 @@ class Chat(object):
         return Message.from_db(self.account, sent_id)
 
     def prepare_message(self, msg):
-        """ prepare a message for sending.
+        """ create a new prepared message.
 
         :param msg: the message to be prepared.
-        :returns: a :class:`deltachat.message.Message` instance.
-           This is the same object that was passed in, which
-           has been modified with the new state of the core.
+        :returns: :class:`deltachat.message.Message` instance.
         """
         msg_id = lib.dc_prepare_msg(self.account._dc_context, self.id, msg._dc_msg)
         if msg_id == 0:
             raise ValueError("message could not be prepared")
-        # modify message in place to avoid bad state for the caller
-        msg._dc_msg = Message.from_db(self.account, msg_id)._dc_msg
-        return msg
+        # invalidate passed in message which is not safe to use anymore
+        msg._dc_msg = msg.id = None
+        return Message.from_db(self.account, msg_id)
 
     def prepare_message_file(self, path, mime_type=None, view_type="file"):
         """ prepare a message for sending and return the resulting Message instance.

python/src/deltachat/direct_imap.py

@@ -47,9 +47,8 @@ def dc_account_extra_configure(account):
 
     except Exception as e:
         # Uncaught exceptions here would lead to a timeout without any note written to the log
-        # start with DC_EVENT_WARNING so that the line is printed in yellow and won't be overlooked when reading
-        account.log("DC_EVENT_WARNING =================== DIRECT_IMAP CAN'T RESET ACCOUNT: ===================")
-        account.log("DC_EVENT_WARNING =================== " + str(e) + " ===================")
+        account.log("=============================== CAN'T RESET ACCOUNT: ===============================")
+        account.log("===================", e, "===================")
 
 
 @deltachat.global_hookimpl
@@ -173,6 +172,21 @@ class DirectImap:
     def get_unread_cnt(self):
         return len(self.get_unread_messages())
 
+    def dump_account_info(self, logfile):
+        def log(*args, **kwargs):
+            kwargs["file"] = logfile
+            print(*args, **kwargs)
+
+        cursor = 0
+        for name, val in self.account.get_info().items():
+            entry = "{}={}".format(name.upper(), val)
+            if cursor + len(entry) > 80:
+                log("")
+                cursor = 0
+            log(entry, end=" ")
+            cursor += len(entry) + 1
+        log("")
+
     def dump_imap_structures(self, dir, logfile):
         assert not self._idling
         stream = io.StringIO()

python/src/deltachat/message.py

@@ -21,8 +21,8 @@ class Message(object):
         assert isinstance(dc_msg, ffi.CData)
         assert dc_msg != ffi.NULL
         self._dc_msg = dc_msg
-        msg_id = self.id
-        assert msg_id is not None and msg_id >= 0, repr(msg_id)
+        self.id = lib.dc_msg_get_id(dc_msg)
+        assert self.id is not None and self.id >= 0, repr(self.id)
 
     def __eq__(self, other):
         return self.account == other.account and self.id == other.id
@@ -46,13 +46,9 @@ class Message(object):
     def new_empty(cls, account, view_type):
         """ create a non-persistent message.
 
-        :param: view_type is the message type code or one of the strings:
-           "text", "audio", "video", "file", "sticker"
+        :param: view_type is "text", "audio", "video", "file"
         """
-        if isinstance(view_type, int):
-            view_type_code = view_type
-        else:
-            view_type_code = get_viewtype_code_from_name(view_type)
+        view_type_code = get_viewtype_code_from_name(view_type)
         return Message(account, ffi.gc(
             lib.dc_msg_new(account._dc_context, view_type_code),
             lib.dc_msg_unref
@@ -72,11 +68,6 @@ class Message(object):
         self._dc_msg = ffi.gc(lib.dc_get_msg(ctx, self.id), lib.dc_msg_unref)
         return Chat(self.account, chat_id)
 
-    @props.with_doc
-    def id(self):
-        """id of this message. """
-        return lib.dc_msg_get_id(self._dc_msg)
-
     @props.with_doc
     def text(self):
         """unicode text of this messages (might be empty if not a text message). """
@@ -86,23 +77,6 @@ class Message(object):
         """set text of this message. """
         lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))
 
-    @props.with_doc
-    def html(self):
-        """html text of this messages (might be empty if not an html message). """
-        return from_dc_charpointer(
-            lib.dc_get_msg_html(self.account._dc_context, self.id)) or ""
-
-    def has_html(self):
-        """return True if this message has an html part, False otherwise."""
-        return lib.dc_msg_has_html(self._dc_msg)
-
-    def set_html(self, html_text):
-        """set the html part of this message.
-
-        It is possible to have text and html part at the same time.
-        """
-        lib.dc_msg_set_html(self._dc_msg, as_dc_charpointer(html_text))
-
     @props.with_doc
     def filename(self):
         """filename if there was an attachment, otherwise empty string. """
@@ -253,20 +227,6 @@ class Message(object):
         chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
         return Chat(self.account, chat_id)
 
-    @props.with_doc
-    def override_sender_name(self):
-        """the name that should be shown over the message instead of the contact display name.
-
-        Usually used to impersonate someone else.
-        """
-        return from_dc_charpointer(
-            lib.dc_msg_get_override_sender_name(self._dc_msg))
-
-    def set_override_sender_name(self, name):
-        """set different sender name for a message. """
-        lib.dc_msg_set_override_sender_name(
-            self._dc_msg, as_dc_charpointer(name))
-
     def get_sender_chat(self):
         """return the 1:1 chat with the sender of this message.
 
@@ -379,10 +339,6 @@ class Message(object):
         """ return True if it's a gif message. """
         return self._view_type == const.DC_MSG_GIF
 
-    def is_sticker(self):
-        """ return True if it's a sticker message. """
-        return self._view_type == const.DC_MSG_STICKER
-
     def is_audio(self):
         """ return True if it's an audio message. """
         return self._view_type == const.DC_MSG_AUDIO
@@ -403,22 +359,21 @@ class Message(object):
 # some code for handling DC_MSG_* view types
 
 _view_type_mapping = {
-    'text': const.DC_MSG_TEXT,
-    'image': const.DC_MSG_IMAGE,
-    'gif': const.DC_MSG_GIF,
-    'audio': const.DC_MSG_AUDIO,
-    'video': const.DC_MSG_VIDEO,
-    'file': const.DC_MSG_FILE,
-    'sticker': const.DC_MSG_STICKER,
+    const.DC_MSG_TEXT: 'text',
+    const.DC_MSG_IMAGE: 'image',
+    const.DC_MSG_GIF: 'gif',
+    const.DC_MSG_AUDIO: 'audio',
+    const.DC_MSG_VIDEO: 'video',
+    const.DC_MSG_FILE: 'file'
 }
 
 
 def get_viewtype_code_from_name(view_type_name):
-    code = _view_type_mapping.get(view_type_name)
-    if code is not None:
-        return code
+    for code, value in _view_type_mapping.items():
+        if value == view_type_name:
+            return code
     raise ValueError("message typecode not found for {!r}, "
-                     "available {!r}".format(view_type_name, list(_view_type_mapping.keys())))
+                     "available {!r}".format(view_type_name, list(_view_type_mapping.values())))
 
 
 #

python/src/deltachat/testplugin.py

@@ -414,13 +414,13 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
 
         def dump_imap_summary(self, logfile):
             for ac in self._accounts:
-                ac.dump_account_info(logfile=logfile)
                 imap = getattr(ac, "direct_imap", None)
                 if imap is not None:
                     try:
                         imap.idle_done()
                     except Exception:
                         pass
+                    imap.dump_account_info(logfile=logfile)
                     imap.dump_imap_structures(tmpdir, logfile=logfile)
 
         def get_accepted_chat(self, ac1, ac2):

python/tests/test_account.py

@@ -816,48 +816,6 @@ class TestOnlineAccount:
         assert open(msg.filename).read() == content
         assert msg.filename.endswith(basename)
 
-    def test_html_message(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = acfactory.get_accepted_chat(ac1, ac2)
-        html_text = "<p>hello HTML world</p>"
-
-        lp.sec("ac1: prepare and send text message to ac2")
-        msg1 = chat.send_text("message0")
-        assert not msg1.has_html()
-        assert msg1.html == ""
-
-        lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert msg2.text == "message0"
-        assert not msg2.has_html()
-        assert msg2.html == ""
-
-        lp.sec("ac1: prepare and send HTML+text message to ac2")
-        msg1 = Message.new_empty(ac1, "text")
-        msg1.set_text("message1")
-        msg1.set_html(html_text)
-        msg1 = chat.send_msg(msg1)
-        assert msg1.has_html()
-        assert html_text in msg1.html
-
-        lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert msg2.text == "message1"
-        assert msg2.has_html()
-        assert html_text in msg2.html
-
-        lp.sec("ac1: prepare and send HTML-only message to ac2")
-        msg1 = Message.new_empty(ac1, "text")
-        msg1.set_html(html_text)
-        msg1 = chat.send_msg(msg1)
-
-        lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert "<p>" not in msg2.text
-        assert "hello HTML world" in msg2.text
-        assert msg2.has_html()
-        assert html_text in msg2.html
-
     def test_mvbox_sentbox_threads(self, acfactory, lp):
         lp.sec("ac1: start with mvbox thread")
         ac1 = acfactory.get_online_configuring_account(mvbox=True, move=True, sentbox=True)
@@ -1033,38 +991,6 @@ class TestOnlineAccount:
         except queue.Empty:
             pass  # mark_seen_messages() has generated events before it returns
 
-    def test_message_override_sender_name(self, acfactory, lp):
-        ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = acfactory.get_accepted_chat(ac1, ac2)
-        overridden_name = "someone else"
-
-        ac1.set_config("displayname", "ac1")
-
-        lp.sec("sending text message with overridden name from ac1 to ac2")
-        msg1 = Message.new_empty(ac1, "text")
-        msg1.set_override_sender_name(overridden_name)
-        msg1.set_text("message1")
-        msg1 = chat.send_msg(msg1)
-        assert msg1.override_sender_name == overridden_name
-
-        lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert msg2.text == "message1"
-        assert msg2.get_sender_contact().name == ac1.get_config("displayname")
-        assert msg2.override_sender_name == overridden_name
-
-        lp.sec("sending normal text message from ac1 to ac2")
-        msg1 = Message.new_empty(ac1, "text")
-        msg1.set_text("message2")
-        msg1 = chat.send_msg(msg1)
-        assert not msg1.override_sender_name
-
-        lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_incoming_message()
-        assert msg2.text == "message2"
-        assert msg2.get_sender_contact().name == ac1.get_config("displayname")
-        assert not msg2.override_sender_name
-
     @pytest.mark.parametrize("mvbox_move", [True, False])
     def test_markseen_message_and_mdn(self, acfactory, mvbox_move):
         # Please only change this test if you are very sure that it will still catch the issues it catches now.
@@ -1572,12 +1498,6 @@ class TestOnlineAccount:
         original_image_path = data.get_path("d.png")
         chat1.send_image(original_image_path)
 
-        # Add another 100KB file that ensures that the progress is smooth enough
-        path = tmpdir.join("attachment.txt")
-        with open(path, "w") as file:
-            file.truncate(100000)
-        chat1.send_file(path.strpath)
-
         def assert_account_is_proper(ac):
             contacts = ac.get_contacts(query="some1")
             assert len(contacts) == 1
@@ -1585,7 +1505,7 @@ class TestOnlineAccount:
             assert contact2.addr == "some1@example.org"
             chat2 = contact2.create_chat()
             messages = chat2.get_messages()
-            assert len(messages) == 3
+            assert len(messages) == 2
             assert messages[0].text == "msg1"
             assert messages[1].filemime == "image/png"
             assert os.stat(messages[1].filename).st_size == os.stat(original_image_path).st_size
@@ -1713,7 +1633,7 @@ class TestOnlineAccount:
         ac1._evtracker.wait_securejoin_inviter_progress(1000)
 
     def test_qr_verified_group_and_chatting(self, acfactory, lp):
-        ac1, ac2, ac3 = acfactory.get_many_online_accounts(3)
+        ac1, ac2 = acfactory.get_two_online_accounts()
         lp.sec("ac1: create verified-group QR, ac2 scans and joins")
         chat1 = ac1.create_group_chat("hello", verified=True)
         assert chat1.is_protected()
@@ -1744,29 +1664,6 @@ class TestOnlineAccount:
         assert msg.text == "world"
         assert msg.is_encrypted()
 
-        lp.sec("ac1: create QR code and let ac3 scan it, starting the securejoin")
-        qr = ac1.get_setup_contact_qr()
-
-        lp.sec("ac3: start QR-code based setup contact protocol")
-        ch = ac3.qr_setup_contact(qr)
-        assert ch.id >= 10
-        ac1._evtracker.wait_securejoin_inviter_progress(1000)
-
-        lp.sec("ac1: add ac3 to verified group")
-        chat1.add_contact(ac3)
-        msg = ac2._evtracker.wait_next_incoming_message()
-        assert msg.is_encrypted()
-        assert msg.is_system_message()
-        assert not msg.error
-
-        lp.sec("ac2: send message and let ac3 read it")
-        chat2.send_text("hi")
-        # Skip system message about added member
-        ac3._evtracker.wait_next_incoming_message()
-        msg = ac3._evtracker.wait_next_incoming_message()
-        assert msg.text == "hi"
-        assert msg.is_encrypted()
-
     def test_set_get_contact_avatar(self, acfactory, data, lp):
         lp.sec("configuring ac1 and ac2")
         ac1, ac2 = acfactory.get_two_online_accounts()
@@ -2290,25 +2187,9 @@ class TestOnlineAccount:
         chat12 = acfactory.get_accepted_chat(ac1, ac2)
         ac1.set_config("selfstatus", "New status")
         chat12.send_text("hi")
-        msg_received = ac2._evtracker.wait_next_incoming_message()
-        assert msg_received.text == "hi"
-        assert msg_received.get_sender_contact().status == "New status"
-
-        # Send a reply from ac2 to ac1 so ac1 can send a read receipt.
-        reply_msg = msg_received.chat.send_text("reply")
-        reply_msg_received = ac1._evtracker.wait_next_incoming_message()
-        assert reply_msg_received.text == "reply"
-
-        # Send read receipt from ac1 to ac2.
-        # It does not contain the signature.
-        ac1.mark_seen_messages([reply_msg_received])
-        ev = ac2._evtracker.get_matching("DC_EVENT_MSG_READ")
-        assert ev.data1 == reply_msg.chat.id
-        assert ev.data2 == reply_msg.id
-        assert reply_msg.is_out_mdn_received()
-
-        # Test that the status is not cleared as a result of receiving a read receipt.
-        assert msg_received.get_sender_contact().status == "New status"
+        msg = ac2._evtracker.wait_next_incoming_message()
+        assert msg.text == "hi"
+        assert msg.get_sender_contact().status == "New status"
 
         ac1.set_config("selfstatus", "")
         chat12.send_text("hello")

python/tox.ini

@@ -13,6 +13,7 @@ passenv =
     TRAVIS 
     DCC_RS_DEV
     DCC_RS_TARGET
+    DCC_PY_LIVECONFIG
     DCC_NEW_TMP_EMAIL 
     CARGO_TARGET_DIR
     RUSTC_WRAPPER
@@ -46,9 +47,10 @@ commands =
 [testenv:doc]
 changedir=doc
 deps =
-    # Pin dependencies to the versions which actually work with Python 3.5.
+    # With Python 3.7 and Sphinx 3.5.0, it throws an exception.
+    # Pin the version to the working one.
     sphinx==3.4.3
-    breathe==4.28.0
+    breathe
 commands =
     sphinx-build -Q -w toxdoc-warnings.log -b html . _build/html
 

run-integration-tests.sh

@@ -4,11 +4,11 @@
 # purposes.  Any arguments are passed straight to tox.  E.g. to run
 # only one environment run with:
 #
-#   scripts/run-integration-tests.sh -e py35
+#   ./run-integration-tests.sh -e py35
 #
 # To also run with `pytest -x` use:
 #
-#   scripts/run-integration-tests.sh -e py35 -- -x
+#   ./run-integration-tests.sh -e py35 -- -x
 
 export DCC_RS_DEV=$(pwd)
 export DCC_RS_TARGET=${DCC_RS_TARGET:-release}
@@ -23,6 +23,9 @@ if [ $? != 0 ]; then
 fi
 
 pushd python
+if [ -e "./liveconfig" -a -z "$DCC_PY_LIVECONFIG" ]; then
+    export DCC_PY_LIVECONFIG=liveconfig
+fi
 tox "$@"
 ret=$?
 popd

scripts/coverage.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-set -eu
-
-if ! which grcov 2>/dev/null 1>&2; then
-    echo >&2 '`grcov` not found. Check README at https://github.com/mozilla/grcov for setup instructions.'
-    echo >&2 'Run `cargo install grcov` to build `grcov` from source.'
-    exit 1
-fi
-
-# Allow `-Z` flags without using nightly Rust.
-export RUSTC_BOOTSTRAP=1
-
-# We are using `-Zprofile` instead of source-based coverage [1]
-# (`-Zinstrument-coverage`) due to a bug resulting in empty reports [2].
-#
-# [1] https://blog.rust-lang.org/inside-rust/2020/11/12/source-based-code-coverage.html
-# [2] https://github.com/mozilla/grcov/issues/595
-
-export CARGO_INCREMENTAL=0
-export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
-export RUSTDOCFLAGS="-Cpanic=abort"
-cargo clean
-cargo build
-cargo test
-
-grcov . -s . --binary-path ./target/debug/ -t html --branch --ignore-not-existing -o ./coverage/

scripts/manual_remote_tests.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -xe
-
-JOB=${1:?need to specify 'rust' or 'python'}
-BRANCH="$(git branch | grep \* | cut -d ' ' -f2)"
-REPONAME="$(basename $(git rev-parse --show-toplevel))"
-
-time bash "scripts/remote_tests_$JOB.sh" "$USER-$BRANCH-$REPONAME"

scripts/remote_tests_rust.sh

@@ -1,29 +0,0 @@
-#!/bin/bash 
-
-BUILD_ID=${1:?specify build ID}
-
-SSHTARGET=${SSHTARGET-ci@b1.delta.chat}
-BUILDDIR=ci_builds/$BUILD_ID
-
-set -e
-
-echo "--- Copying files to $SSHTARGET:$BUILDDIR"
-
-ssh -oBatchMode=yes -oStrictHostKeyChecking=no $SSHTARGET mkdir -p "$BUILDDIR"
-git ls-files >.rsynclist
-rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
-
-echo "--- Running Rust tests remotely"
-
-ssh $SSHTARGET <<_HERE
-    set +x -e
-    # make sure all processes exit when ssh dies
-    shopt -s huponexit
-    export RUSTC_WRAPPER=\`which sccache\`
-    cd $BUILDDIR
-    export TARGET=x86_64-unknown-linux-gnu
-    export RUSTC_WRAPPER=sccache
-
-    bash scripts/run-rust-test.sh
-_HERE
-

scripts/run-doxygen.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-cd deltachat-ffi 
-PROJECT_NUMBER=$(git log -1 --format="%h (%cd)") doxygen

src/accounts.rs

@@ -135,25 +135,15 @@ impl Accounts {
         let old_id = self.config.get_selected_account().await;
 
         // create new account
-        let account_config = self
-            .config
-            .new_account(&self.dir)
-            .await
-            .context("failed to create new account")?;
+        let account_config = self.config.new_account(&self.dir).await?;
 
         let new_dbfile = account_config.dbfile().into();
         let new_blobdir = Context::derive_blobdir(&new_dbfile);
 
         let res = {
-            fs::create_dir_all(&account_config.dir)
-                .await
-                .context("failed to create dir")?;
-            fs::rename(&dbfile, &new_dbfile)
-                .await
-                .context("failed to rename dbfile")?;
-            fs::rename(&blobdir, &new_blobdir)
-                .await
-                .context("failed to rename blobdir")?;
+            fs::create_dir_all(&account_config.dir).await?;
+            fs::rename(&dbfile, &new_dbfile).await?;
+            fs::rename(&blobdir, &new_blobdir).await?;
             Ok(())
         };
 
@@ -512,10 +502,7 @@ mod tests {
         let ctx = accounts.get_selected_account().await;
         assert_eq!(
             "me@mail.com",
-            ctx.get_config(crate::config::Config::Addr)
-                .await
-                .unwrap()
-                .unwrap()
+            ctx.get_config(crate::config::Config::Addr).await.unwrap()
         );
     }
 

src/blob.rs

@@ -1,6 +1,5 @@
 //! # Blob directory management
 
-use core::cmp::max;
 use std::ffi::OsStr;
 use std::fmt;
 
@@ -8,12 +7,8 @@ use async_std::path::{Path, PathBuf};
 use async_std::prelude::*;
 use async_std::{fs, io};
 
-use anyhow::format_err;
-use anyhow::Context as _;
 use anyhow::Error;
-use image::DynamicImage;
 use image::GenericImageView;
-use image::ImageFormat;
 use num_traits::FromPrimitive;
 use thiserror::Error;
 
@@ -385,26 +380,18 @@ impl<'a> BlobObject<'a> {
         true
     }
 
-    pub async fn recode_to_avatar_size(&mut self, context: &Context) -> Result<(), BlobError> {
+    pub async fn recode_to_avatar_size(&self, context: &Context) -> Result<(), BlobError> {
         let blob_abs = self.to_abs_path();
 
         let img_wh =
-            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await?)
+            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await)
                 .unwrap_or_default()
             {
                 MediaQuality::Balanced => BALANCED_AVATAR_SIZE,
                 MediaQuality::Worse => WORSE_AVATAR_SIZE,
             };
 
-        // max_bytes is 20_000 bytes: Outlook servers don't allow headers larger than 32k.
-        // 32 / 4 * 3 = 24k if you account for base64 encoding. To be safe, we reduced this to 20k.
-        if let Some(new_name) = self
-            .recode_to_size(context, blob_abs, img_wh, Some(20_000))
-            .await?
-        {
-            self.name = new_name;
-        }
-        Ok(())
+        self.recode_to_size(context, blob_abs, img_wh).await
     }
 
     pub async fn recode_to_image_size(&self, context: &Context) -> Result<(), BlobError> {
@@ -416,76 +403,37 @@ impl<'a> BlobObject<'a> {
         }
 
         let img_wh =
-            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await?)
+            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await)
                 .unwrap_or_default()
             {
                 MediaQuality::Balanced => BALANCED_IMAGE_SIZE,
                 MediaQuality::Worse => WORSE_IMAGE_SIZE,
             };
 
-        if self
-            .recode_to_size(context, blob_abs, img_wh, None)
-            .await?
-            .is_some()
-        {
-            return Err(format_err!(
-                "Internal error: recode_to_size(..., None) shouldn't change the name of the image"
-            )
-            .into());
-        }
-        Ok(())
+        self.recode_to_size(context, blob_abs, img_wh).await
     }
 
     async fn recode_to_size(
         &self,
         context: &Context,
-        mut blob_abs: PathBuf,
-        mut img_wh: u32,
-        max_bytes: Option<usize>,
-    ) -> Result<Option<String>, BlobError> {
+        blob_abs: PathBuf,
+        img_wh: u32,
+    ) -> Result<(), BlobError> {
         let mut img = image::open(&blob_abs).map_err(|err| BlobError::RecodeFailure {
             blobdir: context.get_blobdir().to_path_buf(),
             blobname: blob_abs.to_str().unwrap_or_default().to_string(),
             cause: err,
         })?;
         let orientation = self.get_exif_orientation(context);
-        let mut encoded = Vec::new();
-        let mut changed_name = None;
 
-        fn encode_img(img: &DynamicImage, encoded: &mut Vec<u8>) -> anyhow::Result<()> {
-            encoded.clear();
-            img.write_to(encoded, image::ImageFormat::Jpeg)?;
-            Ok(())
-        }
-        fn encode_img_exceeds_bytes(
-            context: &Context,
-            img: &DynamicImage,
-            max_bytes: Option<usize>,
-            encoded: &mut Vec<u8>,
-        ) -> anyhow::Result<bool> {
-            if let Some(max_bytes) = max_bytes {
-                encode_img(img, encoded)?;
-                if encoded.len() > max_bytes {
-                    info!(
-                        context,
-                        "image size {}B ({}x{}px) exceeds {}B, need to scale down",
-                        encoded.len(),
-                        img.width(),
-                        img.height(),
-                        max_bytes,
-                    );
-                    return Ok(true);
-                }
-            }
-            Ok(false)
-        }
-        let exceeds_width = img.width() > img_wh || img.height() > img_wh;
-
-        let do_scale =
-            exceeds_width || encode_img_exceeds_bytes(context, &img, max_bytes, &mut encoded)?;
+        let do_scale = img.width() > img_wh || img.height() > img_wh;
         let do_rotate = matches!(orientation, Ok(90) | Ok(180) | Ok(270));
 
         if do_scale || do_rotate {
+            if do_scale {
+                img = img.thumbnail(img_wh, img_wh);
+            }
+
             if do_rotate {
                 img = match orientation {
                     Ok(90) => img.rotate90(),
@@ -495,60 +443,14 @@ impl<'a> BlobObject<'a> {
                 }
             }
 
-            if do_scale {
-                if !exceeds_width {
-                    // The image is already smaller than img_wh, but exceeds max_bytes
-                    // We can directly start with trying to scale down to 2/3 of its current width
-                    img_wh = max(img.width(), img.height()) * 2 / 3
-                }
-
-                loop {
-                    let new_img = img.thumbnail(img_wh, img_wh);
-
-                    if encode_img_exceeds_bytes(context, &new_img, max_bytes, &mut encoded)? {
-                        if img_wh < 20 {
-                            return Err(format_err!(
-                                "Failed to scale image to below {}B",
-                                max_bytes.unwrap_or_default()
-                            )
-                            .into());
-                        }
-
-                        img_wh = img_wh * 2 / 3;
-                    } else {
-                        info!(
-                            context,
-                            "Final scaled-down image size: {}B ({}px)",
-                            encoded.len(),
-                            img_wh
-                        );
-                        break;
-                    }
-                }
-            }
-
-            // The file format is JPEG now, we may have to change the file extension
-            if !matches!(ImageFormat::from_path(&blob_abs), Ok(ImageFormat::Jpeg)) {
-                blob_abs = blob_abs.with_extension("jpg");
-                let file_name = blob_abs.file_name().context("No avatar file name (???)")?;
-                let file_name = file_name.to_str().context("Filename is no UTF-8 (???)")?;
-                changed_name = Some(format!("$BLOBDIR/{}", file_name));
-            }
-
-            if encoded.is_empty() {
-                encode_img(&img, &mut encoded)?;
-            }
-
-            fs::write(&blob_abs, &encoded)
-                .await
-                .map_err(|err| BlobError::WriteFailure {
-                    blobdir: context.get_blobdir().to_path_buf(),
-                    blobname: blob_abs.to_str().unwrap_or_default().to_string(),
-                    cause: err.into(),
-                })?;
+            img.save(&blob_abs).map_err(|err| BlobError::WriteFailure {
+                blobdir: context.get_blobdir().to_path_buf(),
+                blobname: blob_abs.to_str().unwrap_or_default().to_string(),
+                cause: err.into(),
+            })?;
         }
 
-        Ok(changed_name)
+        Ok(())
     }
 
     pub fn get_exif_orientation(&self, context: &Context) -> Result<i32, Error> {
@@ -612,16 +514,10 @@ pub enum BlobError {
     WrongBlobdir { blobdir: PathBuf, src: PathBuf },
     #[error("Blob has a badname {}", .blobname.display())]
     WrongName { blobname: PathBuf },
-    #[error("Sql: {0}")]
-    Sql(#[from] crate::sql::Error),
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
 }
 
 #[cfg(test)]
 mod tests {
-    use fs::File;
-
     use super::*;
 
     use crate::test_utils::TestContext;
@@ -815,105 +711,4 @@ mod tests {
         assert!(!stem.contains('*'));
         assert!(!stem.contains('?'));
     }
-
-    #[async_std::test]
-    async fn test_selfavatar_outside_blobdir() {
-        let t = TestContext::new().await;
-        let avatar_src = t.dir.path().join("avatar.jpg");
-        let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
-        File::create(&avatar_src)
-            .await
-            .unwrap()
-            .write_all(avatar_bytes)
-            .await
-            .unwrap();
-        let avatar_blob = t.get_blobdir().join("avatar.jpg");
-        assert!(!avatar_blob.exists().await);
-        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
-            .await
-            .unwrap();
-        assert!(avatar_blob.exists().await);
-        assert!(std::fs::metadata(&avatar_blob).unwrap().len() < avatar_bytes.len() as u64);
-        let avatar_cfg = t.get_config(Config::Selfavatar).await.unwrap();
-        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
-
-        let img = image::open(avatar_src).unwrap();
-        assert_eq!(img.width(), 1000);
-        assert_eq!(img.height(), 1000);
-
-        let img = image::open(&avatar_blob).unwrap();
-        assert_eq!(img.width(), BALANCED_AVATAR_SIZE);
-        assert_eq!(img.height(), BALANCED_AVATAR_SIZE);
-
-        async fn file_size(path_buf: &PathBuf) -> u64 {
-            let file = File::open(path_buf).await.unwrap();
-            file.metadata().await.unwrap().len()
-        }
-
-        let blob = BlobObject::new_from_path(&t, &avatar_blob).await.unwrap();
-
-        blob.recode_to_size(&t, blob.to_abs_path(), 1000, Some(3000))
-            .await
-            .unwrap();
-        assert!(file_size(&avatar_blob).await <= 3000);
-        assert!(file_size(&avatar_blob).await > 2000);
-        let img = image::open(&avatar_blob).unwrap();
-        assert!(img.width() > 130);
-        assert_eq!(img.width(), img.height());
-    }
-
-    #[async_std::test]
-    async fn test_selfavatar_in_blobdir() {
-        let t = TestContext::new().await;
-        let avatar_src = t.get_blobdir().join("avatar.png");
-        let avatar_bytes = include_bytes!("../test-data/image/avatar900x900.png");
-        File::create(&avatar_src)
-            .await
-            .unwrap()
-            .write_all(avatar_bytes)
-            .await
-            .unwrap();
-
-        let img = image::open(&avatar_src).unwrap();
-        assert_eq!(img.width(), 900);
-        assert_eq!(img.height(), 900);
-
-        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
-            .await
-            .unwrap();
-        let avatar_cfg = t.get_config(Config::Selfavatar).await.unwrap().unwrap();
-        assert_eq!(
-            avatar_cfg,
-            avatar_src.with_extension("jpg").to_str().unwrap()
-        );
-
-        let img = image::open(avatar_cfg).unwrap();
-        assert_eq!(img.width(), BALANCED_AVATAR_SIZE);
-        assert_eq!(img.height(), BALANCED_AVATAR_SIZE);
-    }
-
-    #[async_std::test]
-    async fn test_selfavatar_copy_without_recode() {
-        let t = TestContext::new().await;
-        let avatar_src = t.dir.path().join("avatar.png");
-        let avatar_bytes = include_bytes!("../test-data/image/avatar64x64.png");
-        File::create(&avatar_src)
-            .await
-            .unwrap()
-            .write_all(avatar_bytes)
-            .await
-            .unwrap();
-        let avatar_blob = t.get_blobdir().join("avatar.png");
-        assert!(!avatar_blob.exists().await);
-        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
-            .await
-            .unwrap();
-        assert!(avatar_blob.exists().await);
-        assert_eq!(
-            std::fs::metadata(&avatar_blob).unwrap().len(),
-            avatar_bytes.len() as u64
-        );
-        let avatar_cfg = t.get_config(Config::Selfavatar).await.unwrap();
-        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
-    }
 }

src/chatlist.rs

@@ -110,15 +110,6 @@ impl Chatlist {
 
         let mut add_archived_link_item = false;
 
-        let skip_id = if flag_for_forwarding {
-            chat::lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
-                .await
-                .unwrap_or_default()
-                .0
-        } else {
-            ChatId::new(0)
-        };
-
         let process_row = |row: &rusqlite::Row| {
             let chat_id: ChatId = row.get(0)?;
             let msg_id: MsgId = row.get(1).unwrap_or_default();
@@ -130,6 +121,15 @@ impl Chatlist {
                 .map_err(Into::into)
         };
 
+        let skip_id = if flag_for_forwarding {
+            chat::lookup_by_contact_id(context, DC_CONTACT_ID_DEVICE)
+                .await
+                .unwrap_or_default()
+                .0
+        } else {
+            ChatId::new(0)
+        };
+
         // select with left join and minimum:
         //
         // - the inner select must use `hidden` and _not_ `m.hidden`
@@ -260,11 +260,13 @@ impl Chatlist {
                 process_rows,
             ).await?;
             if !flag_no_specials {
-                if let Some(last_deaddrop_fresh_msg_id) =
-                    get_last_deaddrop_fresh_msg(context).await?
+                if let Some(last_deaddrop_fresh_msg_id) = get_last_deaddrop_fresh_msg(context).await
                 {
                     if !flag_for_forwarding {
-                        ids.insert(0, (DC_CHAT_ID_DEADDROP, last_deaddrop_fresh_msg_id));
+                        ids.insert(
+                            0,
+                            (ChatId::new(DC_CHAT_ID_DEADDROP), last_deaddrop_fresh_msg_id),
+                        );
                     }
                 }
                 add_archived_link_item = true;
@@ -272,11 +274,11 @@ impl Chatlist {
             ids
         };
 
-        if add_archived_link_item && dc_get_archived_cnt(context).await? > 0 {
+        if add_archived_link_item && dc_get_archived_cnt(context).await > 0 {
             if ids.is_empty() && flag_add_alldone_hint {
-                ids.push((DC_CHAT_ID_ALLDONE_HINT, MsgId::new(0)));
+                ids.push((ChatId::new(DC_CHAT_ID_ALLDONE_HINT), MsgId::new(0)));
             }
-            ids.push((DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0)));
+            ids.push((ChatId::new(DC_CHAT_ID_ARCHIVED_LINK), MsgId::new(0)));
         }
 
         Ok(Chatlist { ids })
@@ -398,23 +400,25 @@ impl Chatlist {
 }
 
 /// Returns the number of archived chats
-pub async fn dc_get_archived_cnt(context: &Context) -> Result<usize> {
-    let count = context
+pub async fn dc_get_archived_cnt(context: &Context) -> u32 {
+    context
         .sql
-        .count(
+        .query_get_value(
+            context,
             "SELECT COUNT(*) FROM chats WHERE blocked=0 AND archived=1;",
             paramsv![],
         )
-        .await?;
-    Ok(count)
+        .await
+        .unwrap_or_default()
 }
 
-async fn get_last_deaddrop_fresh_msg(context: &Context) -> Result<Option<MsgId>> {
+async fn get_last_deaddrop_fresh_msg(context: &Context) -> Option<MsgId> {
     // We have an index over the state-column, this should be
     // sufficient as there are typically only few fresh messages.
-    let id = context
+    context
         .sql
         .query_get_value(
+            context,
             concat!(
                 "SELECT m.id",
                 " FROM msgs m",
@@ -427,19 +431,15 @@ async fn get_last_deaddrop_fresh_msg(context: &Context) -> Result<Option<MsgId>>
             ),
             paramsv![],
         )
-        .await?;
-    Ok(id)
+        .await
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    use crate::chat::{create_group_chat, get_chat_contacts, ProtectionStatus};
+    use crate::chat::{create_group_chat, ProtectionStatus};
     use crate::constants::Viewtype;
-    use crate::dc_receive_imf::dc_receive_imf;
-    use crate::message;
-    use crate::message::ContactRequestDecision;
     use crate::stock_str::StockMessage;
     use crate::test_utils::TestContext;
 
@@ -466,7 +466,7 @@ mod tests {
         // drafts are sorted to the top
         let mut msg = Message::new(Viewtype::Text);
         msg.set_text(Some("hello".to_string()));
-        chat_id2.set_draft(&t, Some(&mut msg)).await.unwrap();
+        chat_id2.set_draft(&t, Some(&mut msg)).await;
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.get_chat_id(0), chat_id2);
 
@@ -545,136 +545,6 @@ mod tests {
         assert_eq!(chats.len(), 1);
     }
 
-    #[async_std::test]
-    async fn test_search_single_chat() -> anyhow::Result<()> {
-        let t = TestContext::new_alice().await;
-
-        // receive a one-to-one-message, accept contact request
-        dc_receive_imf(
-            &t,
-            b"From: Bob Authname <bob@example.org>\n\
-                 To: alice@example.com\n\
-                 Subject: foo\n\
-                 Message-ID: <msg1234@example.org>\n\
-                 Chat-Version: 1.0\n\
-                 Date: Sun, 22 Mar 2021 22:37:57 +0000\n\
-                 \n\
-                 hello foo\n",
-            "INBOX",
-            1,
-            false,
-        )
-        .await?;
-
-        let chats = Chatlist::try_load(&t, 0, Some("Bob Authname"), None).await?;
-        assert_eq!(chats.len(), 0);
-
-        let msg = t.get_last_msg().await;
-        assert_eq!(msg.get_chat_id(), DC_CHAT_ID_DEADDROP);
-
-        let chat_id =
-            message::decide_on_contact_request(&t, msg.get_id(), ContactRequestDecision::StartChat)
-                .await
-                .unwrap();
-        let contacts = get_chat_contacts(&t, chat_id).await?;
-        let contact_id = *contacts.first().unwrap();
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "Bob Authname");
-
-        // check, the one-to-one-chat can be found using chatlist search query
-        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.get_chat_id(0), chat_id);
-
-        // change the name of the contact; this also changes the name of the one-to-one-chat
-        let test_id = Contact::create(&t, "Bob Nickname", "bob@example.org").await?;
-        assert_eq!(contact_id, test_id);
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "Bob Nickname");
-        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
-        assert_eq!(chats.len(), 0);
-        let chats = Chatlist::try_load(&t, 0, Some("bob nickname"), None).await?;
-        assert_eq!(chats.len(), 1);
-
-        // revert contact to authname, this again changes the name of the one-to-one-chat
-        let test_id = Contact::create(&t, "", "bob@example.org").await?;
-        assert_eq!(contact_id, test_id);
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "Bob Authname");
-        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
-        assert_eq!(chats.len(), 1);
-        let chats = Chatlist::try_load(&t, 0, Some("bob nickname"), None).await?;
-        assert_eq!(chats.len(), 0);
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_search_single_chat_without_authname() -> anyhow::Result<()> {
-        let t = TestContext::new_alice().await;
-
-        // receive a one-to-one-message without authname set, accept contact request
-        dc_receive_imf(
-            &t,
-            b"From: bob@example.org\n\
-                 To: alice@example.com\n\
-                 Subject: foo\n\
-                 Message-ID: <msg5678@example.org>\n\
-                 Chat-Version: 1.0\n\
-                 Date: Sun, 22 Mar 2021 22:38:57 +0000\n\
-                 \n\
-                 hello foo\n",
-            "INBOX",
-            1,
-            false,
-        )
-        .await?;
-
-        let msg = t.get_last_msg().await;
-        let chat_id =
-            message::decide_on_contact_request(&t, msg.get_id(), ContactRequestDecision::StartChat)
-                .await
-                .unwrap();
-        let contacts = get_chat_contacts(&t, chat_id).await?;
-        let contact_id = *contacts.first().unwrap();
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "bob@example.org");
-
-        // check, the one-to-one-chat can be found using chatlist search query
-        let chats = Chatlist::try_load(&t, 0, Some("bob@example.org"), None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.get_chat_id(0), chat_id);
-
-        // change the name of the contact; this also changes the name of the one-to-one-chat
-        let test_id = Contact::create(&t, "Bob Nickname", "bob@example.org").await?;
-        assert_eq!(contact_id, test_id);
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "Bob Nickname");
-        let chats = Chatlist::try_load(&t, 0, Some("bob@example.org"), None).await?;
-        assert_eq!(chats.len(), 0); // email-addresses are searchable in contacts, not in chats
-        let chats = Chatlist::try_load(&t, 0, Some("Bob Nickname"), None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.get_chat_id(0), chat_id);
-
-        // revert name change, this again changes the name of the one-to-one-chat to the email-address
-        let test_id = Contact::create(&t, "", "bob@example.org").await?;
-        assert_eq!(contact_id, test_id);
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "bob@example.org");
-        let chats = Chatlist::try_load(&t, 0, Some("bob@example.org"), None).await?;
-        assert_eq!(chats.len(), 1);
-        let chats = Chatlist::try_load(&t, 0, Some("bob nickname"), None).await?;
-        assert_eq!(chats.len(), 0);
-
-        // finally, also check that a simple substring-search is working with email-addresses
-        let chats = Chatlist::try_load(&t, 0, Some("b@exa"), None).await?;
-        assert_eq!(chats.len(), 1);
-        let chats = Chatlist::try_load(&t, 0, Some("b@exac"), None).await?;
-        assert_eq!(chats.len(), 0);
-
-        Ok(())
-    }
-
     #[async_std::test]
     async fn test_get_summary_unwrap() {
         let t = TestContext::new().await;
@@ -684,7 +554,7 @@ mod tests {
 
         let mut msg = Message::new(Viewtype::Text);
         msg.set_text(Some("foo:\nbar \r\n test".to_string()));
-        chat_id1.set_draft(&t, Some(&mut msg)).await.unwrap();
+        chat_id1.set_draft(&t, Some(&mut msg)).await;
 
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         let summary = chats.get_summary(&t, 0, None).await;

src/config.rs

@@ -1,6 +1,5 @@
 //! # Key-value configuration management
 
-use anyhow::Result;
 use strum::{EnumProperty, IntoEnumIterator};
 use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString};
 
@@ -151,66 +150,69 @@ pub enum Config {
 }
 
 impl Context {
-    pub async fn config_exists(&self, key: Config) -> Result<bool> {
-        Ok(self.sql.get_raw_config(key).await?.is_some())
+    pub async fn config_exists(&self, key: Config) -> bool {
+        self.sql.get_raw_config(self, key).await.is_some()
     }
 
     /// 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>> {
+    pub async fn get_config(&self, key: Config) -> Option<String> {
         let value = match key {
             Config::Selfavatar => {
-                let rel_path = self.sql.get_raw_config(key).await?;
+                let rel_path = self.sql.get_raw_config(self, key).await;
                 rel_path.map(|p| dc_get_abs_path(self, &p).to_string_lossy().into_owned())
             }
             Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
             Config::SysMsgsizeMaxRecommended => Some(format!("{}", RECOMMENDED_FILE_SIZE)),
             Config::SysConfigKeys => Some(get_config_keys_string()),
-            _ => self.sql.get_raw_config(key).await?,
+            _ => self.sql.get_raw_config(self, key).await,
         };
 
         if value.is_some() {
-            return Ok(value);
+            return value;
         }
 
         // Default values
         match key {
-            Config::Selfstatus => Ok(Some(stock_str::status_line(self).await)),
-            Config::ConfiguredInboxFolder => Ok(Some("INBOX".to_owned())),
-            _ => Ok(key.get_str("default").map(|s| s.to_string())),
+            Config::Selfstatus => Some(stock_str::status_line(self).await),
+            Config::ConfiguredInboxFolder => Some("INBOX".to_owned()),
+            _ => key.get_str("default").map(|s| s.to_string()),
         }
     }
 
-    pub async fn get_config_int(&self, key: Config) -> Result<i32> {
+    pub async fn get_config_int(&self, key: Config) -> i32 {
         self.get_config(key)
             .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+            .and_then(|s| s.parse().ok())
+            .unwrap_or_default()
     }
 
-    pub async fn get_config_i64(&self, key: Config) -> Result<i64> {
+    pub async fn get_config_i64(&self, key: Config) -> i64 {
         self.get_config(key)
             .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+            .and_then(|s| s.parse().ok())
+            .unwrap_or_default()
     }
 
-    pub async fn get_config_u64(&self, key: Config) -> Result<u64> {
+    pub async fn get_config_u64(&self, key: Config) -> u64 {
         self.get_config(key)
             .await
-            .map(|s: Option<String>| s.and_then(|s| s.parse().ok()).unwrap_or_default())
+            .and_then(|s| s.parse().ok())
+            .unwrap_or_default()
     }
 
-    pub async fn get_config_bool(&self, key: Config) -> Result<bool> {
-        Ok(self.get_config_int(key).await? != 0)
+    pub async fn get_config_bool(&self, key: Config) -> bool {
+        self.get_config_int(key).await != 0
     }
 
     /// Gets configured "delete_server_after" value.
     ///
     /// `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>> {
-        match self.get_config_int(Config::DeleteServerAfter).await? {
-            0 => Ok(None),
-            1 => Ok(Some(0)),
-            x => Ok(Some(x as i64)),
+    pub async fn get_config_delete_server_after(&self) -> Option<i64> {
+        match self.get_config_int(Config::DeleteServerAfter).await {
+            0 => None,
+            1 => Some(0),
+            x => Some(x as i64),
         }
     }
 
@@ -218,46 +220,41 @@ impl Context {
     ///
     /// The provider is determined by `get_provider_info()` during configuration and then saved
     /// to the db in `param.save_to_database()`, together with all the other `configured_*` values.
-    pub async fn get_configured_provider(&self) -> Result<Option<&'static Provider>> {
-        if let Some(cfg) = self.get_config(Config::ConfiguredProvider).await? {
-            return Ok(get_provider_by_id(&cfg));
-        }
-        Ok(None)
+    pub async fn get_configured_provider(&self) -> Option<&'static Provider> {
+        get_provider_by_id(&self.get_config(Config::ConfiguredProvider).await?)
     }
 
     /// Gets configured "delete_device_after" value.
     ///
     /// `None` means never delete the message, `Some(x)` means delete
     /// after `x` seconds.
-    pub async fn get_config_delete_device_after(&self) -> Result<Option<i64>> {
-        match self.get_config_int(Config::DeleteDeviceAfter).await? {
-            0 => Ok(None),
-            x => Ok(Some(x as i64)),
+    pub async fn get_config_delete_device_after(&self) -> Option<i64> {
+        match self.get_config_int(Config::DeleteDeviceAfter).await {
+            0 => None,
+            x => Some(x as i64),
         }
     }
 
     /// Set the given config key.
     /// If `None` is passed as a value the value is cleared and set to the default if there is one.
-    pub async fn set_config(&self, key: Config, value: Option<&str>) -> Result<()> {
+    pub async fn set_config(&self, key: Config, value: Option<&str>) -> crate::sql::Result<()> {
         match key {
             Config::Selfavatar => {
                 self.sql
                     .execute("UPDATE contacts SET selfavatar_sent=0;", paramsv![])
                     .await?;
                 self.sql
-                    .set_raw_config_bool("attach_selfavatar", true)
+                    .set_raw_config_bool(self, "attach_selfavatar", true)
                     .await?;
                 match value {
                     Some(value) => {
-                        let mut blob = BlobObject::new_from_path(self, value).await?;
+                        let blob = BlobObject::new_from_path(self, value).await?;
                         blob.recode_to_avatar_size(self).await?;
-                        self.sql.set_raw_config(key, Some(blob.as_name())).await?;
-                        Ok(())
-                    }
-                    None => {
-                        self.sql.set_raw_config(key, None).await?;
-                        Ok(())
+                        self.sql
+                            .set_raw_config(self, key, Some(blob.as_name()))
+                            .await
                     }
+                    None => self.sql.set_raw_config(self, key, None).await,
                 }
             }
             Config::Selfstatus => {
@@ -268,15 +265,10 @@ impl Context {
                     value
                 };
 
-                self.sql.set_raw_config(key, val).await?;
-                Ok(())
+                self.sql.set_raw_config(self, key, val).await
             }
             Config::DeleteDeviceAfter => {
-                let ret = self
-                    .sql
-                    .set_raw_config(key, value)
-                    .await
-                    .map_err(Into::into);
+                let ret = self.sql.set_raw_config(self, key, value).await;
                 // Force chatlist reload to delete old messages immediately.
                 self.emit_event(EventType::MsgsChanged {
                     msg_id: MsgId::new(0),
@@ -286,29 +278,20 @@ impl Context {
             }
             Config::Displayname => {
                 let value = value.map(improve_single_line_input);
-                self.sql.set_raw_config(key, value.as_deref()).await?;
-                Ok(())
+                self.sql.set_raw_config(self, key, value.as_deref()).await
             }
             Config::DeleteServerAfter => {
-                let ret = self
-                    .sql
-                    .set_raw_config(key, value)
-                    .await
-                    .map_err(Into::into);
+                let ret = self.sql.set_raw_config(self, key, value).await;
                 job::schedule_resync(self).await;
                 ret
             }
-            _ => {
-                self.sql.set_raw_config(key, value).await?;
-                Ok(())
-            }
+            _ => self.sql.set_raw_config(self, key, value).await,
         }
     }
 
     pub async fn set_config_bool(&self, key: Config, value: bool) -> crate::sql::Result<()> {
         self.set_config(key, if value { Some("1") } else { None })
-            .await?;
-        Ok(())
+            .await
     }
 }
 
@@ -331,8 +314,12 @@ mod tests {
     use std::string::ToString;
 
     use crate::constants;
+    use crate::constants::BALANCED_AVATAR_SIZE;
     use crate::test_utils::TestContext;
+    use image::GenericImageView;
     use num_traits::FromPrimitive;
+    use std::fs::File;
+    use std::io::Write;
 
     #[test]
     fn test_to_string() {
@@ -346,17 +333,93 @@ mod tests {
         );
     }
 
+    #[async_std::test]
+    async fn test_selfavatar_outside_blobdir() {
+        let t = TestContext::new().await;
+        let avatar_src = t.dir.path().join("avatar.jpg");
+        let avatar_bytes = include_bytes!("../test-data/image/avatar1000x1000.jpg");
+        File::create(&avatar_src)
+            .unwrap()
+            .write_all(avatar_bytes)
+            .unwrap();
+        let avatar_blob = t.get_blobdir().join("avatar.jpg");
+        assert!(!avatar_blob.exists().await);
+        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
+            .await
+            .unwrap();
+        assert!(avatar_blob.exists().await);
+        assert!(std::fs::metadata(&avatar_blob).unwrap().len() < avatar_bytes.len() as u64);
+        let avatar_cfg = t.get_config(Config::Selfavatar).await;
+        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
+
+        let img = image::open(avatar_src).unwrap();
+        assert_eq!(img.width(), 1000);
+        assert_eq!(img.height(), 1000);
+
+        let img = image::open(avatar_blob).unwrap();
+        assert_eq!(img.width(), BALANCED_AVATAR_SIZE);
+        assert_eq!(img.height(), BALANCED_AVATAR_SIZE);
+    }
+
+    #[async_std::test]
+    async fn test_selfavatar_in_blobdir() {
+        let t = TestContext::new().await;
+        let avatar_src = t.get_blobdir().join("avatar.png");
+        let avatar_bytes = include_bytes!("../test-data/image/avatar900x900.png");
+        File::create(&avatar_src)
+            .unwrap()
+            .write_all(avatar_bytes)
+            .unwrap();
+
+        let img = image::open(&avatar_src).unwrap();
+        assert_eq!(img.width(), 900);
+        assert_eq!(img.height(), 900);
+
+        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
+            .await
+            .unwrap();
+        let avatar_cfg = t.get_config(Config::Selfavatar).await;
+        assert_eq!(avatar_cfg, avatar_src.to_str().map(|s| s.to_string()));
+
+        let img = image::open(avatar_src).unwrap();
+        assert_eq!(img.width(), BALANCED_AVATAR_SIZE);
+        assert_eq!(img.height(), BALANCED_AVATAR_SIZE);
+    }
+
+    #[async_std::test]
+    async fn test_selfavatar_copy_without_recode() {
+        let t = TestContext::new().await;
+        let avatar_src = t.dir.path().join("avatar.png");
+        let avatar_bytes = include_bytes!("../test-data/image/avatar64x64.png");
+        File::create(&avatar_src)
+            .unwrap()
+            .write_all(avatar_bytes)
+            .unwrap();
+        let avatar_blob = t.get_blobdir().join("avatar.png");
+        assert!(!avatar_blob.exists().await);
+        t.set_config(Config::Selfavatar, Some(avatar_src.to_str().unwrap()))
+            .await
+            .unwrap();
+        assert!(avatar_blob.exists().await);
+        assert_eq!(
+            std::fs::metadata(&avatar_blob).unwrap().len(),
+            avatar_bytes.len() as u64
+        );
+        let avatar_cfg = t.get_config(Config::Selfavatar).await;
+        assert_eq!(avatar_cfg, avatar_blob.to_str().map(|s| s.to_string()));
+    }
+
     #[async_std::test]
     async fn test_media_quality_config_option() {
         let t = TestContext::new().await;
-        let media_quality = t.get_config_int(Config::MediaQuality).await.unwrap();
+        let media_quality = t.get_config_int(Config::MediaQuality).await;
         assert_eq!(media_quality, 0);
         let media_quality = constants::MediaQuality::from_i32(media_quality).unwrap_or_default();
         assert_eq!(media_quality, constants::MediaQuality::Balanced);
 
         t.set_config(Config::MediaQuality, Some("1")).await.unwrap();
 
-        let media_quality = t.get_config_int(Config::MediaQuality).await.unwrap();
+        let media_quality = t.get_config_int(Config::MediaQuality).await;
         assert_eq!(media_quality, 1);
         assert_eq!(constants::MediaQuality::Worse as i32, 1);
         let media_quality = constants::MediaQuality::from_i32(media_quality).unwrap_or_default();

src/configure/auto_mozilla.rs

@@ -115,8 +115,8 @@ fn parse_server<B: BufRead>(
                     MozConfigTag::Username => username = Some(val),
                     MozConfigTag::Sockettype => {
                         sockettype = match val.to_lowercase().as_ref() {
-                            "ssl" => Socket::Ssl,
-                            "starttls" => Socket::Starttls,
+                            "ssl" => Socket::SSL,
+                            "starttls" => Socket::STARTTLS,
                             "plain" => Socket::Plain,
                             _ => Socket::Automatic,
                         }
@@ -233,8 +233,8 @@ fn parse_serverparams(in_emailaddr: &str, xml_raw: &str) -> Result<Vec<ServerPar
         .chain(moz_ac.outgoing_servers.into_iter())
         .filter_map(|server| {
             let protocol = match server.typ.as_ref() {
-                "imap" => Some(Protocol::Imap),
-                "smtp" => Some(Protocol::Smtp),
+                "imap" => Some(Protocol::IMAP),
+                "smtp" => Some(Protocol::SMTP),
                 _ => None,
             };
             Some(ServerParams {
@@ -276,10 +276,10 @@ mod tests {
     fn test_parse_outlook_autoconfig() {
         let xml_raw = include_str!("../../test-data/autoconfig/outlook.com.xml");
         let res = parse_serverparams("example@outlook.com", xml_raw).expect("XML parsing failed");
-        assert_eq!(res[0].protocol, Protocol::Imap);
+        assert_eq!(res[0].protocol, Protocol::IMAP);
         assert_eq!(res[0].hostname, "outlook.office365.com");
         assert_eq!(res[0].port, 993);
-        assert_eq!(res[1].protocol, Protocol::Smtp);
+        assert_eq!(res[1].protocol, Protocol::SMTP);
         assert_eq!(res[1].hostname, "smtp.office365.com");
         assert_eq!(res[1].port, 587);
     }
@@ -295,25 +295,25 @@ mod tests {
         assert_eq!(res.incoming_servers[0].typ, "imap");
         assert_eq!(res.incoming_servers[0].hostname, "mail.lakenet.ch");
         assert_eq!(res.incoming_servers[0].port, 993);
-        assert_eq!(res.incoming_servers[0].sockettype, Socket::Ssl);
+        assert_eq!(res.incoming_servers[0].sockettype, Socket::SSL);
         assert_eq!(res.incoming_servers[0].username, "example@lakenet.ch");
 
         assert_eq!(res.incoming_servers[1].typ, "imap");
         assert_eq!(res.incoming_servers[1].hostname, "mail.lakenet.ch");
         assert_eq!(res.incoming_servers[1].port, 143);
-        assert_eq!(res.incoming_servers[1].sockettype, Socket::Starttls);
+        assert_eq!(res.incoming_servers[1].sockettype, Socket::STARTTLS);
         assert_eq!(res.incoming_servers[1].username, "example@lakenet.ch");
 
         assert_eq!(res.incoming_servers[2].typ, "pop3");
         assert_eq!(res.incoming_servers[2].hostname, "mail.lakenet.ch");
         assert_eq!(res.incoming_servers[2].port, 995);
-        assert_eq!(res.incoming_servers[2].sockettype, Socket::Ssl);
+        assert_eq!(res.incoming_servers[2].sockettype, Socket::SSL);
         assert_eq!(res.incoming_servers[2].username, "example@lakenet.ch");
 
         assert_eq!(res.incoming_servers[3].typ, "pop3");
         assert_eq!(res.incoming_servers[3].hostname, "mail.lakenet.ch");
         assert_eq!(res.incoming_servers[3].port, 110);
-        assert_eq!(res.incoming_servers[3].sockettype, Socket::Starttls);
+        assert_eq!(res.incoming_servers[3].sockettype, Socket::STARTTLS);
         assert_eq!(res.incoming_servers[3].username, "example@lakenet.ch");
 
         assert_eq!(res.outgoing_servers.len(), 1);
@@ -321,7 +321,7 @@ mod tests {
         assert_eq!(res.outgoing_servers[0].typ, "smtp");
         assert_eq!(res.outgoing_servers[0].hostname, "mail.lakenet.ch");
         assert_eq!(res.outgoing_servers[0].port, 587);
-        assert_eq!(res.outgoing_servers[0].sockettype, Socket::Starttls);
+        assert_eq!(res.outgoing_servers[0].sockettype, Socket::STARTTLS);
         assert_eq!(res.outgoing_servers[0].username, "example@lakenet.ch");
     }
 }

src/configure/auto_outlook.rs

@@ -169,8 +169,8 @@ fn protocols_to_serverparams(protocols: Vec<ProtocolTag>) -> Vec<ServerParams> {
         .filter_map(|protocol| {
             Some(ServerParams {
                 protocol: match protocol.typ.to_lowercase().as_ref() {
-                    "imap" => Some(Protocol::Imap),
-                    "smtp" => Some(Protocol::Smtp),
+                    "imap" => Some(Protocol::IMAP),
+                    "smtp" => Some(Protocol::SMTP),
                     _ => None,
                 }?,
                 socket: match protocol.ssl {

src/configure/mod.rs

@@ -50,11 +50,8 @@ macro_rules! progress {
 
 impl Context {
     /// Checks if the context is already configured.
-    pub async fn is_configured(&self) -> Result<bool> {
-        self.sql
-            .get_raw_config_bool("configured")
-            .await
-            .map_err(Into::into)
+    pub async fn is_configured(&self) -> bool {
+        self.sql.get_raw_config_bool(self, "configured").await
     }
 
     /// Configures this account with the currently set parameters.
@@ -87,14 +84,14 @@ impl Context {
     async fn inner_configure(&self) -> Result<()> {
         info!(self, "Configure ...");
 
-        let mut param = LoginParam::from_database(self, "").await?;
+        let mut param = LoginParam::from_database(self, "").await;
         let success = configure(self, &mut param).await;
         self.set_config(Config::NotifyAboutWrongPw, None).await?;
 
         if let Some(provider) = param.provider {
             if let Some(config_defaults) = &provider.config_defaults {
                 for def in config_defaults.iter() {
-                    if !self.config_exists(def.key).await? {
+                    if !self.config_exists(def.key).await {
                         info!(self, "apply config_defaults {}={}", def.key, def.value);
                         self.set_config(def.key, Some(def.value)).await?;
                     } else {
@@ -180,13 +177,13 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         // if dc_get_oauth2_addr() is not available in the oauth2 implementation, just use the given one.
         progress!(ctx, 10);
         if let Some(oauth2_addr) = dc_get_oauth2_addr(ctx, &param.addr, &param.imap.password)
-            .await?
+            .await
             .and_then(|e| e.parse().ok())
         {
             info!(ctx, "Authorized address is {}", oauth2_addr);
             param.addr = oauth2_addr;
             ctx.sql
-                .set_raw_config("addr", Some(param.addr.as_str()))
+                .set_raw_config(ctx, "addr", Some(param.addr.as_str()))
                 .await?;
         }
         progress!(ctx, 20);
@@ -220,7 +217,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
         if let Some(provider) = provider::get_provider_info(&param_domain).await {
             param.provider = Some(provider);
             match provider.status {
-                provider::Status::Ok | provider::Status::Preparation => {
+                provider::Status::OK | provider::Status::PREPARATION => {
                     if provider.server.is_empty() {
                         info!(ctx, "offline autoconfig found, but no servers defined");
                         param_autoconfig = None;
@@ -235,8 +232,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
                                 hostname: s.hostname.to_string(),
                                 port: s.port,
                                 username: match s.username_pattern {
-                                    UsernamePattern::Email => param.addr.to_string(),
-                                    UsernamePattern::Emaillocalpart => {
+                                    UsernamePattern::EMAIL => param.addr.to_string(),
+                                    UsernamePattern::EMAILLOCALPART => {
                                         if let Some(at) = param.addr.find('@') {
                                             param.addr.split_at(at).0.to_string()
                                         } else {
@@ -250,7 +247,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
                         param_autoconfig = Some(servers)
                     }
                 }
-                provider::Status::Broken => {
+                provider::Status::BROKEN => {
                     info!(ctx, "offline autoconfig found, provider is broken");
                     param_autoconfig = None;
                 }
@@ -269,10 +266,10 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     let mut servers = param_autoconfig.unwrap_or_default();
     if !servers
         .iter()
-        .any(|server| server.protocol == Protocol::Imap)
+        .any(|server| server.protocol == Protocol::IMAP)
     {
         servers.push(ServerParams {
-            protocol: Protocol::Imap,
+            protocol: Protocol::IMAP,
             hostname: param.imap.server.clone(),
             port: param.imap.port,
             socket: param.imap.security,
@@ -281,10 +278,10 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     }
     if !servers
         .iter()
-        .any(|server| server.protocol == Protocol::Smtp)
+        .any(|server| server.protocol == Protocol::SMTP)
     {
         servers.push(ServerParams {
-            protocol: Protocol::Smtp,
+            protocol: Protocol::SMTP,
             hostname: param.smtp.server.clone(),
             port: param.smtp.port,
             socket: param.smtp.security,
@@ -303,7 +300,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     let smtp_addr = param.addr.clone();
     let smtp_servers: Vec<ServerParams> = servers
         .iter()
-        .filter(|params| params.protocol == Protocol::Smtp)
+        .filter(|params| params.protocol == Protocol::SMTP)
         .cloned()
         .collect();
     let provider_strict_tls = param.provider.map_or(false, |provider| provider.strict_tls);
@@ -351,7 +348,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     let mut imap_configured = false;
     let imap_servers: Vec<&ServerParams> = servers
         .iter()
-        .filter(|params| params.protocol == Protocol::Imap)
+        .filter(|params| params.protocol == Protocol::IMAP)
         .collect();
     let imap_servers_count = imap_servers.len();
     let mut errors = Vec::new();
@@ -400,8 +397,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     progress!(ctx, 900);
 
-    let create_mvbox = ctx.get_config_bool(Config::MvboxWatch).await?
-        || ctx.get_config_bool(Config::MvboxMove).await?;
+    let create_mvbox = ctx.get_config_bool(Config::MvboxWatch).await
+        || ctx.get_config_bool(Config::MvboxMove).await;
 
     imap.configure_folders(ctx, create_mvbox).await?;
 
@@ -416,7 +413,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     // "configured_" prefix; also write the "configured"-flag */
     // the trailing underscore is correct
     param.save_to_database(ctx, "configured_").await?;
-    ctx.sql.set_raw_config_bool("configured", true).await?;
+    ctx.sql.set_raw_config_bool(ctx, "configured", true).await?;
     ctx.set_config(Config::ConfiguredTimestamp, Some(&time().to_string()))
         .await?;
 

src/configure/server_params.rs

@@ -25,7 +25,7 @@ pub(crate) struct ServerParams {
 }
 
 impl ServerParams {
-    fn expand_usernames(mut self, addr: &str) -> Vec<ServerParams> {
+    pub(crate) fn expand_usernames(mut self, addr: &str) -> Vec<ServerParams> {
         let mut res = Vec::new();
 
         if self.username.is_empty() {
@@ -42,15 +42,15 @@ impl ServerParams {
         res
     }
 
-    fn expand_hostnames(mut self, param_domain: &str) -> Vec<ServerParams> {
+    pub(crate) fn expand_hostnames(mut self, param_domain: &str) -> Vec<ServerParams> {
         let mut res = Vec::new();
         if self.hostname.is_empty() {
             self.hostname = param_domain.to_string();
             res.push(self.clone());
 
             self.hostname = match self.protocol {
-                Protocol::Imap => "imap.".to_string() + param_domain,
-                Protocol::Smtp => "smtp.".to_string() + param_domain,
+                Protocol::IMAP => "imap.".to_string() + param_domain,
+                Protocol::SMTP => "smtp.".to_string() + param_domain,
             };
             res.push(self.clone());
 
@@ -62,17 +62,17 @@ impl ServerParams {
         res
     }
 
-    fn expand_ports(mut self) -> Vec<ServerParams> {
+    pub(crate) fn expand_ports(mut self) -> Vec<ServerParams> {
         // Try to infer port from socket security.
         if self.port == 0 {
             self.port = match self.socket {
-                Socket::Ssl => match self.protocol {
-                    Protocol::Imap => 993,
-                    Protocol::Smtp => 465,
+                Socket::SSL => match self.protocol {
+                    Protocol::IMAP => 993,
+                    Protocol::SMTP => 465,
                 },
-                Socket::Starttls | Socket::Plain => match self.protocol {
-                    Protocol::Imap => 143,
-                    Protocol::Smtp => 587,
+                Socket::STARTTLS | Socket::Plain => match self.protocol {
+                    Protocol::IMAP => 143,
+                    Protocol::SMTP => 587,
                 },
                 Socket::Automatic => 0,
             }
@@ -85,27 +85,27 @@ impl ServerParams {
             // Try common secure combinations.
 
             // Try STARTTLS
-            self.socket = Socket::Starttls;
+            self.socket = Socket::STARTTLS;
             self.port = match self.protocol {
-                Protocol::Imap => 143,
-                Protocol::Smtp => 587,
+                Protocol::IMAP => 143,
+                Protocol::SMTP => 587,
             };
             res.push(self.clone());
 
             // Try TLS
-            self.socket = Socket::Ssl;
+            self.socket = Socket::SSL;
             self.port = match self.protocol {
-                Protocol::Imap => 993,
-                Protocol::Smtp => 465,
+                Protocol::IMAP => 993,
+                Protocol::SMTP => 465,
             };
             res.push(self);
         } else if self.socket == Socket::Automatic {
             // Try TLS over user-provided port.
-            self.socket = Socket::Ssl;
+            self.socket = Socket::SSL;
             res.push(self.clone());
 
             // Try STARTTLS over user-provided port.
-            self.socket = Socket::Starttls;
+            self.socket = Socket::STARTTLS;
             res.push(self);
         } else {
             res.push(self);
@@ -140,10 +140,10 @@ mod tests {
     fn test_expand_param_vector() {
         let v = expand_param_vector(
             vec![ServerParams {
-                protocol: Protocol::Imap,
+                protocol: Protocol::IMAP,
                 hostname: "example.net".to_string(),
                 port: 0,
-                socket: Socket::Ssl,
+                socket: Socket::SSL,
                 username: "foobar".to_string(),
             }],
             "foobar@example.net",
@@ -153,44 +153,12 @@ mod tests {
         assert_eq!(
             v,
             vec![ServerParams {
-                protocol: Protocol::Imap,
+                protocol: Protocol::IMAP,
                 hostname: "example.net".to_string(),
                 port: 993,
-                socket: Socket::Ssl,
+                socket: Socket::SSL,
                 username: "foobar".to_string(),
             }],
         );
-
-        let v = expand_param_vector(
-            vec![ServerParams {
-                protocol: Protocol::Smtp,
-                hostname: "example.net".to_string(),
-                port: 123,
-                socket: Socket::Automatic,
-                username: "foobar".to_string(),
-            }],
-            "foobar@example.net",
-            "example.net",
-        );
-
-        assert_eq!(
-            v,
-            vec![
-                ServerParams {
-                    protocol: Protocol::Smtp,
-                    hostname: "example.net".to_string(),
-                    port: 123,
-                    socket: Socket::Ssl,
-                    username: "foobar".to_string()
-                },
-                ServerParams {
-                    protocol: Protocol::Smtp,
-                    hostname: "example.net".to_string(),
-                    port: 123,
-                    socket: Socket::Starttls,
-                    username: "foobar".to_string()
-                }
-            ],
-        );
     }
 }

src/constants.rs

@@ -3,8 +3,6 @@ use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
-use crate::chat::ChatId;
-
 pub static DC_VERSION_STR: Lazy<String> = Lazy::new(|| env!("CARGO_PKG_VERSION").to_string());
 
 #[derive(
@@ -21,7 +19,7 @@ pub static DC_VERSION_STR: Lazy<String> = Lazy::new(|| env!("CARGO_PKG_VERSION")
     Serialize,
     Deserialize,
 )]
-#[repr(i8)]
+#[repr(u8)]
 pub enum Blocked {
     Not = 0,
     Manually = 1,
@@ -124,15 +122,15 @@ pub const DC_RESEND_USER_AVATAR_DAYS: i64 = 14;
 pub const DC_OUTDATED_WARNING_DAYS: i64 = 365;
 
 /// virtual chat showing all messages belonging to chats flagged with chats.blocked=2
-pub const DC_CHAT_ID_DEADDROP: ChatId = ChatId::new(1);
+pub const DC_CHAT_ID_DEADDROP: u32 = 1;
 /// messages that should be deleted get this chat_id; the messages are deleted from the working thread later then. This is also needed as rfc724_mid should be preset as long as the message is not deleted on the server (otherwise it is downloaded again)
-pub const DC_CHAT_ID_TRASH: ChatId = ChatId::new(3);
+pub const DC_CHAT_ID_TRASH: u32 = 3;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ARCHIVED_LINK: ChatId = ChatId::new(6);
+pub const DC_CHAT_ID_ARCHIVED_LINK: u32 = 6;
 /// only an indicator in a chatlist
-pub const DC_CHAT_ID_ALLDONE_HINT: ChatId = ChatId::new(7);
+pub const DC_CHAT_ID_ALLDONE_HINT: u32 = 7;
 /// larger chat IDs are "real" chats, their messages are "real" messages.
-pub const DC_CHAT_ID_LAST_SPECIAL: ChatId = ChatId::new(9);
+pub const DC_CHAT_ID_LAST_SPECIAL: u32 = 9;
 
 #[derive(
     Debug,
@@ -263,7 +261,7 @@ pub const DEFAULT_MAX_SMTP_RCPT_TO: usize = 50;
     Serialize,
     Deserialize,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub enum Viewtype {
     Unknown = 0,
 
@@ -322,6 +320,16 @@ impl Default for Viewtype {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn derive_display_works_as_expected() {
+        assert_eq!(format!("{}", Viewtype::Audio), "Audio");
+    }
+}
+
 pub const DC_JOB_DELETE_MSG_ON_IMAP: i32 = 110;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
@@ -330,100 +338,3 @@ pub enum KeyType {
     Public = 0,
     Private = 1,
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use num_traits::FromPrimitive;
-
-    #[test]
-    fn test_derive_display_works_as_expected() {
-        assert_eq!(format!("{}", Viewtype::Audio), "Audio");
-    }
-
-    #[test]
-    fn test_viewtype_values() {
-        // values may be written to disk and must not change
-        assert_eq!(Viewtype::Unknown, Viewtype::default());
-        assert_eq!(Viewtype::Unknown, Viewtype::from_i32(0).unwrap());
-        assert_eq!(Viewtype::Text, Viewtype::from_i32(10).unwrap());
-        assert_eq!(Viewtype::Image, Viewtype::from_i32(20).unwrap());
-        assert_eq!(Viewtype::Gif, Viewtype::from_i32(21).unwrap());
-        assert_eq!(Viewtype::Sticker, Viewtype::from_i32(23).unwrap());
-        assert_eq!(Viewtype::Audio, Viewtype::from_i32(40).unwrap());
-        assert_eq!(Viewtype::Voice, Viewtype::from_i32(41).unwrap());
-        assert_eq!(Viewtype::Video, Viewtype::from_i32(50).unwrap());
-        assert_eq!(Viewtype::File, Viewtype::from_i32(60).unwrap());
-        assert_eq!(
-            Viewtype::VideochatInvitation,
-            Viewtype::from_i32(70).unwrap()
-        );
-    }
-
-    #[test]
-    fn test_chattype_values() {
-        // values may be written to disk and must not change
-        assert_eq!(Chattype::Undefined, Chattype::default());
-        assert_eq!(Chattype::Undefined, Chattype::from_i32(0).unwrap());
-        assert_eq!(Chattype::Single, Chattype::from_i32(100).unwrap());
-        assert_eq!(Chattype::Group, Chattype::from_i32(120).unwrap());
-        assert_eq!(Chattype::Mailinglist, Chattype::from_i32(140).unwrap());
-    }
-
-    #[test]
-    fn test_keygentype_values() {
-        // values may be written to disk and must not change
-        assert_eq!(KeyGenType::Default, KeyGenType::default());
-        assert_eq!(KeyGenType::Default, KeyGenType::from_i32(0).unwrap());
-        assert_eq!(KeyGenType::Rsa2048, KeyGenType::from_i32(1).unwrap());
-        assert_eq!(KeyGenType::Ed25519, KeyGenType::from_i32(2).unwrap());
-    }
-
-    #[test]
-    fn test_keytype_values() {
-        // values may be written to disk and must not change
-        assert_eq!(KeyType::Public, KeyType::from_i32(0).unwrap());
-        assert_eq!(KeyType::Private, KeyType::from_i32(1).unwrap());
-    }
-
-    #[test]
-    fn test_showemails_values() {
-        // values may be written to disk and must not change
-        assert_eq!(ShowEmails::Off, ShowEmails::default());
-        assert_eq!(ShowEmails::Off, ShowEmails::from_i32(0).unwrap());
-        assert_eq!(
-            ShowEmails::AcceptedContacts,
-            ShowEmails::from_i32(1).unwrap()
-        );
-        assert_eq!(ShowEmails::All, ShowEmails::from_i32(2).unwrap());
-    }
-
-    #[test]
-    fn test_blocked_values() {
-        // values may be written to disk and must not change
-        assert_eq!(Blocked::Not, Blocked::default());
-        assert_eq!(Blocked::Not, Blocked::from_i32(0).unwrap());
-        assert_eq!(Blocked::Manually, Blocked::from_i32(1).unwrap());
-        assert_eq!(Blocked::Deaddrop, Blocked::from_i32(2).unwrap());
-    }
-
-    #[test]
-    fn test_mediaquality_values() {
-        // values may be written to disk and must not change
-        assert_eq!(MediaQuality::Balanced, MediaQuality::default());
-        assert_eq!(MediaQuality::Balanced, MediaQuality::from_i32(0).unwrap());
-        assert_eq!(MediaQuality::Worse, MediaQuality::from_i32(1).unwrap());
-    }
-
-    #[test]
-    fn test_videochattype_values() {
-        // values may be written to disk and must not change
-        assert_eq!(VideochatType::Unknown, VideochatType::default());
-        assert_eq!(VideochatType::Unknown, VideochatType::from_i32(0).unwrap());
-        assert_eq!(
-            VideochatType::BasicWebrtc,
-            VideochatType::from_i32(1).unwrap()
-        );
-        assert_eq!(VideochatType::Jitsi, VideochatType::from_i32(2).unwrap());
-    }
-}

src/contact.rs

@@ -1,8 +1,6 @@
 //! Contacts module
 
-use std::convert::{TryFrom, TryInto};
-
-use anyhow::{bail, ensure, format_err, Result};
+use anyhow::{bail, ensure, format_err, Context as _, Result};
 use async_std::path::PathBuf;
 use deltachat_derive::{FromSql, ToSql};
 use itertools::Itertools;
@@ -81,7 +79,7 @@ pub struct Contact {
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromPrimitive, ToPrimitive, FromSql, ToSql,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub enum Origin {
     Unknown = 0,
 
@@ -176,7 +174,7 @@ pub enum VerifiedStatus {
 
 impl Contact {
     pub async fn load_from_db(context: &Context, contact_id: u32) -> crate::sql::Result<Self> {
-        let mut contact = context
+        let mut res = context
             .sql
             .query_row(
                 "SELECT c.name, c.addr, c.origin, c.blocked, c.authname, c.param, c.status
@@ -184,42 +182,35 @@ impl Contact {
               WHERE c.id=?;",
                 paramsv![contact_id as i32],
                 |row| {
-                    let name: String = row.get(0)?;
-                    let addr: String = row.get(1)?;
-                    let origin: Origin = row.get(2)?;
-                    let blocked: Option<bool> = row.get(3)?;
-                    let authname: String = row.get(4)?;
-                    let param: String = row.get(5)?;
-                    let status: Option<String> = row.get(6)?;
                     let contact = Self {
                         id: contact_id,
-                        name,
-                        authname,
-                        addr,
-                        blocked: blocked.unwrap_or_default(),
-                        origin,
-                        param: param.parse().unwrap_or_default(),
-                        status: status.unwrap_or_default(),
+                        name: row.get::<_, String>(0)?,
+                        authname: row.get::<_, String>(4)?,
+                        addr: row.get::<_, String>(1)?,
+                        blocked: row.get::<_, Option<i32>>(3)?.unwrap_or_default() != 0,
+                        origin: row.get(2)?,
+                        param: row.get::<_, String>(5)?.parse().unwrap_or_default(),
+                        status: row.get(6).unwrap_or_default(),
                     };
                     Ok(contact)
                 },
             )
             .await?;
         if contact_id == DC_CONTACT_ID_SELF {
-            contact.name = stock_str::self_msg(context).await;
-            contact.addr = context
+            res.name = stock_str::self_msg(context).await;
+            res.addr = context
                 .get_config(Config::ConfiguredAddr)
-                .await?
+                .await
                 .unwrap_or_default();
-            contact.status = context
+            res.status = context
                 .get_config(Config::Selfstatus)
-                .await?
+                .await
                 .unwrap_or_default();
         } else if contact_id == DC_CONTACT_ID_DEVICE {
-            contact.name = stock_str::device_messages(context).await;
-            contact.addr = DC_CONTACT_ID_DEVICE_ADDR.to_string();
+            res.name = stock_str::device_messages(context).await;
+            res.addr = DC_CONTACT_ID_DEVICE_ADDR.to_string();
         }
-        Ok(contact)
+        Ok(res)
     }
 
     /// Returns `true` if this contact is blocked.
@@ -296,7 +287,7 @@ impl Contact {
             .await
             .is_ok()
         {
-            context.emit_event(EventType::MsgsNoticed(DC_CHAT_ID_DEADDROP));
+            context.emit_event(EventType::MsgsNoticed(ChatId::new(DC_CHAT_ID_DEADDROP)));
         }
     }
 
@@ -317,25 +308,21 @@ impl Contact {
 
         let addr_normalized = addr_normalize(addr.as_ref());
 
-        if let Some(addr_self) = context.get_config(Config::ConfiguredAddr).await? {
+        if let Some(addr_self) = context.get_config(Config::ConfiguredAddr).await {
             if addr_cmp(addr_normalized, addr_self) {
                 return Ok(Some(DC_CONTACT_ID_SELF));
             }
         }
-        let id = context
-            .sql
-            .query_get_value(
-                "SELECT id FROM contacts \
-            WHERE addr=?1 COLLATE NOCASE \
-            AND id>?2 AND origin>=?3 AND blocked=0;",
-                paramsv![
-                    addr_normalized,
-                    DC_CONTACT_ID_LAST_SPECIAL as i32,
-                    min_origin as u32,
-                ],
-            )
-            .await?;
-        Ok(id)
+        context.sql.query_get_value_result(
+            "SELECT id FROM contacts WHERE addr=?1 COLLATE NOCASE AND id>?2 AND origin>=?3 AND blocked=0;",
+            paramsv![
+                addr_normalized,
+                DC_CONTACT_ID_LAST_SPECIAL as i32,
+                min_origin as u32,
+            ],
+        )
+            .await
+            .context("lookup_id_by_addr: SQL query failed")
     }
 
     /// Lookup a contact and create it if it does not exist yet.
@@ -380,7 +367,7 @@ impl Contact {
         let addr = addr_normalize(addr.as_ref()).to_string();
         let addr_self = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .unwrap_or_default();
 
         if addr_cmp(&addr, addr_self) {
@@ -432,33 +419,26 @@ impl Contact {
         let mut update_addr = false;
         let mut row_id = 0;
 
-        if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context
-            .sql
-            .query_row(
-                "SELECT id, name, addr, origin, authname \
-            FROM contacts WHERE addr=? COLLATE NOCASE;",
-                paramsv![addr.to_string()],
-                |row| {
-                    let row_id: isize = row.get(0)?;
-                    let row_name: String = row.get(1)?;
-                    let row_addr: String = row.get(2)?;
-                    let row_origin: Origin = row.get(3)?;
-                    let row_authname: String = row.get(4)?;
+        if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context.sql.query_row(
+            "SELECT id, name, addr, origin, authname FROM contacts WHERE addr=? COLLATE NOCASE;",
+            paramsv![addr.to_string()],
+            |row| {
+                let row_id = row.get(0)?;
+                let row_name: String = row.get(1)?;
+                let row_addr: String = row.get(2)?;
+                let row_origin: Origin = row.get(3)?;
+                let row_authname: String = row.get(4)?;
 
-                    Ok((row_id, row_name, row_addr, row_origin, row_authname))
-                },
-            )
-            .await
-        {
+                Ok((row_id, row_name, row_addr, row_origin, row_authname))
+            },
+        )
+        .await {
             let update_name = manual && name != row_name;
-            let update_authname = !manual
-                && name != row_authname
-                && !name.is_empty()
-                && (origin >= row_origin
-                    || origin == Origin::IncomingUnknownFrom
-                    || row_authname.is_empty());
+            let update_authname =
+                !manual && name != row_authname && !name.is_empty() &&
+                (origin >= row_origin || origin == Origin::IncomingUnknownFrom || row_authname.is_empty());
 
-            row_id = u32::try_from(id)?;
+            row_id = id;
             if origin as i32 >= row_origin as i32 && addr != row_addr {
                 update_addr = true;
             }
@@ -475,11 +455,7 @@ impl Contact {
                         "UPDATE contacts SET name=?, addr=?, origin=?, authname=? WHERE id=?;",
                         paramsv![
                             new_name,
-                            if update_addr {
-                                addr.to_string()
-                            } else {
-                                row_addr
-                            },
+                            if update_addr { addr.to_string() } else { row_addr },
                             if origin > row_origin {
                                 origin
                             } else {
@@ -499,29 +475,17 @@ impl Contact {
                 if update_name {
                     // Update the contact name also if it is used as a group name.
                     // This is one of the few duplicated data, however, getting the chat list is easier this way.
-                    let chat_id: Option<i32> = context.sql.query_get_value(
+                    let chat_id = context.sql.query_get_value::<i32>(
+                        context,
                         "SELECT id FROM chats WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?)",
-                        paramsv![Chattype::Single, isize::try_from(row_id)?]
-                    ).await?;
+                        paramsv![Chattype::Single, row_id]
+                    ).await;
                     if let Some(chat_id) = chat_id {
-                        let contact = Contact::get_by_id(context, row_id as u32).await?;
-                        let chat_name = contact.get_display_name();
-                        match context
-                            .sql
-                            .execute(
-                                "UPDATE chats SET name=?1 WHERE id=?2 AND name!=?3",
-                                paramsv![chat_name, chat_id, chat_name],
-                            )
-                            .await
-                        {
+                        match context.sql.execute("UPDATE chats SET name=? WHERE id=? AND name!=?1", paramsv![new_name, chat_id]).await {
                             Err(err) => warn!(context, "Can't update chat name: {}", err),
-                            Ok(count) => {
-                                if count > 0 {
-                                    // Chat name updated
-                                    context.emit_event(EventType::ChatModified(ChatId::new(
-                                        chat_id.try_into()?,
-                                    )));
-                                }
+                            Ok(count) => if count > 0 {
+                                // Chat name updated
+                                context.emit_event(EventType::ChatModified(ChatId::new(chat_id as u32)));
                             }
                         }
                     }
@@ -532,28 +496,24 @@ impl Contact {
             let update_name = manual;
             let update_authname = !manual;
 
-            if let Ok(new_row_id) = context
+            if context
                 .sql
-                .insert(
+                .execute(
                     "INSERT INTO contacts (name, addr, origin, authname) VALUES(?, ?, ?, ?);",
                     paramsv![
-                        if update_name {
-                            name.to_string()
-                        } else {
-                            "".to_string()
-                        },
+                        if update_name { name.to_string() } else { "".to_string() },
                         addr,
                         origin,
-                        if update_authname {
-                            name.to_string()
-                        } else {
-                            "".to_string()
-                        }
+                        if update_authname { name.to_string() } else { "".to_string() }
                     ],
                 )
                 .await
+                .is_ok()
             {
-                row_id = u32::try_from(new_row_id)?;
+                row_id = context
+                    .sql
+                    .get_rowid(context, "contacts", "addr", &addr)
+                    .await?;
                 sth_modified = Modifier::Created;
                 info!(context, "added contact id={} addr={}", row_id, &addr);
             } else {
@@ -624,7 +584,7 @@ impl Contact {
     ) -> Result<Vec<u32>> {
         let self_addr = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .unwrap_or_default();
 
         let mut add_self = false;
@@ -672,7 +632,7 @@ impl Contact {
 
             let self_name = context
                 .get_config(Config::Displayname)
-                .await?
+                .await
                 .unwrap_or_default();
             let self_name2 = stock_str::self_msg(context);
 
@@ -698,11 +658,7 @@ impl Contact {
                  AND origin>=?3
                  AND blocked=0
                  ORDER BY LOWER(iif(name='',authname,name)||addr),id;",
-                    paramsv![
-                        self_addr,
-                        DC_CONTACT_ID_LAST_SPECIAL as i32,
-                        Origin::IncomingReplyTo
-                    ],
+                    paramsv![self_addr, DC_CONTACT_ID_LAST_SPECIAL as i32, 0x100],
                     |row| row.get::<_, i32>(0),
                     |ids| {
                         for id in ids {
@@ -742,10 +698,7 @@ impl Contact {
         for (name, grpid) in blocked_mailinglists {
             if !context
                 .sql
-                .exists(
-                    "SELECT COUNT(id) FROM contacts WHERE addr=?;",
-                    paramsv![grpid],
-                )
+                .exists("SELECT id FROM contacts WHERE addr=?;", paramsv![grpid])
                 .await?
             {
                 context
@@ -765,17 +718,6 @@ impl Contact {
         Ok(())
     }
 
-    pub async fn get_blocked_cnt(context: &Context) -> Result<usize> {
-        let count = context
-            .sql
-            .count(
-                "SELECT COUNT(*) FROM contacts WHERE id>? AND blocked!=0",
-                paramsv![DC_CONTACT_ID_LAST_SPECIAL],
-            )
-            .await?;
-        Ok(count as usize)
-    }
-
     /// Get blocked contacts.
     pub async fn get_all_blocked(context: &Context) -> Result<Vec<u32>> {
         if let Err(e) = Contact::update_blocked_mailinglist_contacts(context).await {
@@ -785,7 +727,7 @@ impl Contact {
             );
         }
 
-        let list = context
+        let ret = context
             .sql
             .query_map(
                 "SELECT id FROM contacts WHERE id>? AND blocked!=0 ORDER BY LOWER(iif(name='',authname,name)||addr),id;",
@@ -797,7 +739,7 @@ impl Contact {
                 },
             )
             .await?;
-        Ok(list)
+        Ok(ret)
     }
 
     /// Returns a textual summary of the encryption state for the contact.
@@ -813,7 +755,7 @@ impl Contact {
 
         let mut ret = String::new();
         if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
-            let loginparam = LoginParam::from_database(context, "configured_").await?;
+            let loginparam = LoginParam::from_database(context, "configured_").await;
             let peerstate = Peerstate::from_addr(context, &contact.addr).await?;
 
             if let Some(peerstate) = peerstate.filter(|peerstate| {
@@ -880,22 +822,26 @@ impl Contact {
             "Can not delete special contact"
         );
 
-        let count_contacts = context
+        let count_contacts: i32 = context
             .sql
-            .count(
+            .query_get_value(
+                context,
                 "SELECT COUNT(*) FROM chats_contacts WHERE contact_id=?;",
                 paramsv![contact_id as i32],
             )
-            .await?;
+            .await
+            .unwrap_or_default();
 
-        let count_msgs = if count_contacts > 0 {
+        let count_msgs: i32 = if count_contacts > 0 {
             context
                 .sql
-                .count(
+                .query_get_value(
+                    context,
                     "SELECT COUNT(*) FROM msgs WHERE from_id=? OR to_id=?;",
                     paramsv![contact_id as i32, contact_id as i32],
                 )
-                .await?
+                .await
+                .unwrap_or_default()
         } else {
             0
         };
@@ -1021,17 +967,17 @@ impl Contact {
     /// Get the contact's profile image.
     /// This is the image set by each remote user on their own
     /// using dc_set_config(context, "selfavatar", image).
-    pub async fn get_profile_image(&self, context: &Context) -> Result<Option<PathBuf>> {
+    pub async fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
         if self.id == DC_CONTACT_ID_SELF {
-            if let Some(p) = context.get_config(Config::Selfavatar).await? {
-                return Ok(Some(PathBuf::from(p)));
+            if let Some(p) = context.get_config(Config::Selfavatar).await {
+                return Some(PathBuf::from(p));
             }
         } else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
             if !image_rel.is_empty() {
-                return Ok(Some(dc_get_abs_path(context, image_rel)));
+                return Some(dc_get_abs_path(context, image_rel));
             }
         }
-        Ok(None)
+        None
     }
 
     /// Get a color for the contact.
@@ -1119,19 +1065,20 @@ impl Contact {
         false
     }
 
-    pub async fn get_real_cnt(context: &Context) -> Result<usize> {
+    pub async fn get_real_cnt(context: &Context) -> usize {
         if !context.sql.is_open().await {
-            return Ok(0);
+            return 0;
         }
 
-        let count = context
+        context
             .sql
-            .count(
+            .query_get_value::<isize>(
+                context,
                 "SELECT COUNT(*) FROM contacts WHERE id>?;",
                 paramsv![DC_CONTACT_ID_LAST_SPECIAL as i32],
             )
-            .await?;
-        Ok(count)
+            .await
+            .unwrap_or_default() as usize
     }
 
     pub async fn real_exists_by_id(context: &Context, contact_id: u32) -> bool {
@@ -1142,7 +1089,7 @@ impl Contact {
         context
             .sql
             .exists(
-                "SELECT COUNT(*) FROM contacts WHERE id=?;",
+                "SELECT id FROM contacts WHERE id=?;",
                 paramsv![contact_id as i32],
             )
             .await
@@ -1219,20 +1166,9 @@ async fn set_block_contact(context: &Context, contact_id: u32, new_blocking: boo
             // (Maybe, beside normal chats (type=100) we should also block group chats with only this user.
             // However, I'm not sure about this point; it may be confusing if the user wants to add other people;
             // this would result in recreating the same group...)
-            if context
-                .sql
-                .execute(
-                    r#"
-UPDATE chats
-SET blocked=?
-WHERE type=? AND id IN (
-  SELECT chat_id FROM chats_contacts WHERE contact_id=?
-);
-"#,
-                    paramsv![new_blocking, Chattype::Single, contact_id],
-                )
-                .await
-                .is_ok()
+            if context.sql.execute(
+                "UPDATE chats SET blocked=? WHERE type=? AND id IN (SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
+                paramsv![new_blocking, 100, contact_id as i32]).await.is_ok()
             {
                 Contact::mark_noticed(context, contact_id).await;
                 context.emit_event(EventType::ContactsChanged(Some(contact_id)));
@@ -1300,31 +1236,13 @@ pub(crate) async fn set_profile_image(
 }
 
 /// Sets contact status.
-///
-/// For contact SELF, the status is not saved in the contact table, but as Config::Selfstatus.  This
-/// is only done if message is sent from Delta Chat and it is encrypted, to synchronize signature
-/// between Delta Chat devices.
-pub(crate) async fn set_status(
-    context: &Context,
-    contact_id: u32,
-    status: String,
-    encrypted: bool,
-    has_chat_version: bool,
-) -> Result<()> {
-    if contact_id == DC_CONTACT_ID_SELF {
-        if encrypted && has_chat_version {
-            context
-                .set_config(Config::Selfstatus, Some(&status))
-                .await?;
-        }
-    } else {
-        let mut contact = Contact::load_from_db(context, contact_id).await?;
+pub(crate) async fn set_status(context: &Context, contact_id: u32, status: String) -> Result<()> {
+    let mut contact = Contact::load_from_db(context, contact_id).await?;
 
-        if contact.status != status {
-            contact.status = status;
-            contact.update_status(context).await?;
-            context.emit_event(EventType::ContactsChanged(Some(contact_id)));
-        }
+    if contact.status != status {
+        contact.status = status;
+        contact.update_status(context).await?;
+        context.emit_event(EventType::ContactsChanged(Some(contact_id)));
     }
     Ok(())
 }
@@ -1381,7 +1299,7 @@ impl Context {
     pub async fn is_self_addr(&self, addr: &str) -> Result<bool> {
         let self_addr = self
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .ok_or_else(|| format_err!("Not configured"))?;
 
         Ok(addr_cmp(self_addr, addr))
@@ -1415,7 +1333,6 @@ mod tests {
     use super::*;
 
     use crate::chat::send_text_msg;
-    use crate::message::Message;
     use crate::test_utils::TestContext;
 
     #[test]
@@ -1921,70 +1838,4 @@ CCCB 5AA9 F6E1 141C 9431
 
         Ok(())
     }
-
-    /// Tests that status is synchronized when sending encrypted BCC-self messages and not
-    /// synchronized when the message is not encrypted.
-    #[async_std::test]
-    async fn test_synchronize_status() -> Result<()> {
-        // Alice has two devices.
-        let alice1 = TestContext::new_alice().await;
-        let alice2 = TestContext::new_alice().await;
-
-        // Bob has one device.
-        let bob = TestContext::new_bob().await;
-
-        let default_status = alice1.get_config(Config::Selfstatus).await?;
-
-        alice1
-            .set_config(Config::Selfstatus, Some("New status"))
-            .await?;
-        let chat = alice1
-            .create_chat_with_contact("Bob", "bob@example.net")
-            .await;
-
-        // Alice sends a message to Bob from the first device.
-        send_text_msg(&alice1, chat.id, "Hello".to_string()).await?;
-        let sent_msg = alice1.pop_sent_msg().await;
-
-        // Message is not encrypted.
-        let message = Message::load_from_db(&alice1, sent_msg.sender_msg_id).await?;
-        assert!(!message.get_showpadlock());
-
-        // Alice's second devices receives a copy of outgoing message.
-        alice2.recv_msg(&sent_msg).await;
-
-        // Bob receives message.
-        bob.recv_msg(&sent_msg).await;
-
-        // Message was not encrypted, so status is not copied.
-        assert_eq!(alice2.get_config(Config::Selfstatus).await?, default_status);
-
-        // Bob replies.
-        let chat = bob
-            .create_chat_with_contact("Alice", "alice@example.com")
-            .await;
-
-        send_text_msg(&bob, chat.id, "Reply".to_string()).await?;
-        let sent_msg = bob.pop_sent_msg().await;
-        alice1.recv_msg(&sent_msg).await;
-        alice2.recv_msg(&sent_msg).await;
-
-        // Alice sends second message.
-        send_text_msg(&alice1, chat.id, "Hello".to_string()).await?;
-        let sent_msg = alice1.pop_sent_msg().await;
-
-        // Second message is encrypted.
-        let message = Message::load_from_db(&alice1, sent_msg.sender_msg_id).await?;
-        assert!(message.get_showpadlock());
-
-        // Alice's second devices receives a copy of second outgoing message.
-        alice2.recv_msg(&sent_msg).await;
-
-        assert_eq!(
-            alice2.get_config(Config::Selfstatus).await?,
-            Some("New status".to_string())
-        );
-
-        Ok(())
-    }
 }

src/context.rs

@@ -91,7 +91,6 @@ pub fn get_info() -> BTreeMap<&'static str, String> {
     res.insert("deltachat_core_version", format!("v{}", &*DC_VERSION_STR));
     res.insert("sqlite_version", rusqlite::version().to_string());
     res.insert("arch", (std::mem::size_of::<usize>() * 8).to_string());
-    res.insert("num_cpus", num_cpus::get().to_string());
     res.insert("level", "awesome".into());
     res
 }
@@ -271,68 +270,68 @@ impl Context {
      * UI chat/message related API
      ******************************************************************************/
 
-    pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
+    pub async fn get_info(&self) -> BTreeMap<&'static str, String> {
         let unset = "0";
-        let l = LoginParam::from_database(self, "").await?;
-        let l2 = LoginParam::from_database(self, "configured_").await?;
-        let displayname = self.get_config(Config::Displayname).await?;
-        let chats = get_chat_cnt(self).await? as usize;
+        let l = LoginParam::from_database(self, "").await;
+        let l2 = LoginParam::from_database(self, "configured_").await;
+        let displayname = self.get_config(Config::Displayname).await;
+        let chats = get_chat_cnt(self).await as usize;
         let real_msgs = message::get_real_msg_cnt(self).await as usize;
         let deaddrop_msgs = message::get_deaddrop_msg_cnt(self).await as usize;
-        let contacts = Contact::get_real_cnt(self).await? as usize;
-        let is_configured = self.get_config_int(Config::Configured).await?;
+        let contacts = Contact::get_real_cnt(self).await as usize;
+        let is_configured = self.get_config_int(Config::Configured).await;
         let dbversion = self
             .sql
-            .get_raw_config_int("dbversion")
-            .await?
+            .get_raw_config_int(self, "dbversion")
+            .await
             .unwrap_or_default();
         let journal_mode = self
             .sql
-            .query_get_value("PRAGMA journal_mode;", paramsv![])
-            .await?
+            .query_get_value(self, "PRAGMA journal_mode;", paramsv![])
+            .await
             .unwrap_or_else(|| "unknown".to_string());
-        let e2ee_enabled = self.get_config_int(Config::E2eeEnabled).await?;
-        let mdns_enabled = self.get_config_int(Config::MdnsEnabled).await?;
-        let bcc_self = self.get_config_int(Config::BccSelf).await?;
+        let e2ee_enabled = self.get_config_int(Config::E2eeEnabled).await;
+        let mdns_enabled = self.get_config_int(Config::MdnsEnabled).await;
+        let bcc_self = self.get_config_int(Config::BccSelf).await;
 
-        let prv_key_cnt = self
+        let prv_key_cnt: Option<isize> = self
             .sql
-            .count("SELECT COUNT(*) FROM keypairs;", paramsv![])
-            .await?;
+            .query_get_value(self, "SELECT COUNT(*) FROM keypairs;", paramsv![])
+            .await;
 
-        let pub_key_cnt = self
+        let pub_key_cnt: Option<isize> = self
             .sql
-            .count("SELECT COUNT(*) FROM acpeerstates;", paramsv![])
-            .await?;
+            .query_get_value(self, "SELECT COUNT(*) FROM acpeerstates;", paramsv![])
+            .await;
         let fingerprint_str = match SignedPublicKey::load_self(self).await {
             Ok(key) => key.fingerprint().hex(),
             Err(err) => format!("<key failure: {}>", err),
         };
 
-        let inbox_watch = self.get_config_int(Config::InboxWatch).await?;
-        let sentbox_watch = self.get_config_int(Config::SentboxWatch).await?;
-        let mvbox_watch = self.get_config_int(Config::MvboxWatch).await?;
-        let mvbox_move = self.get_config_int(Config::MvboxMove).await?;
-        let sentbox_move = self.get_config_int(Config::SentboxMove).await?;
+        let inbox_watch = self.get_config_int(Config::InboxWatch).await;
+        let sentbox_watch = self.get_config_int(Config::SentboxWatch).await;
+        let mvbox_watch = self.get_config_int(Config::MvboxWatch).await;
+        let mvbox_move = self.get_config_int(Config::MvboxMove).await;
+        let sentbox_move = self.get_config_int(Config::SentboxMove).await;
         let folders_configured = self
             .sql
-            .get_raw_config_int("folders_configured")
-            .await?
+            .get_raw_config_int(self, "folders_configured")
+            .await
             .unwrap_or_default();
 
         let configured_sentbox_folder = self
             .get_config(Config::ConfiguredSentboxFolder)
-            .await?
+            .await
             .unwrap_or_else(|| "<unset>".to_string());
         let configured_mvbox_folder = self
             .get_config(Config::ConfiguredMvboxFolder)
-            .await?
+            .await
             .unwrap_or_else(|| "<unset>".to_string());
 
         let mut res = get_info();
 
         // insert values
-        res.insert("bot", self.get_config_int(Config::Bot).await?.to_string());
+        res.insert("bot", self.get_config_int(Config::Bot).await.to_string());
         res.insert("number_of_chats", chats.to_string());
         res.insert("number_of_chat_messages", real_msgs.to_string());
         res.insert("messages_in_contact_requests", deaddrop_msgs.to_string());
@@ -345,7 +344,7 @@ impl Context {
         res.insert(
             "selfavatar",
             self.get_config(Config::Selfavatar)
-                .await?
+                .await
                 .unwrap_or_else(|| "<unset>".to_string()),
         );
         res.insert("is_configured", is_configured.to_string());
@@ -354,12 +353,12 @@ impl Context {
         res.insert(
             "fetch_existing_msgs",
             self.get_config_int(Config::FetchExistingMsgs)
-                .await?
+                .await
                 .to_string(),
         );
         res.insert(
             "show_emails",
-            self.get_config_int(Config::ShowEmails).await?.to_string(),
+            self.get_config_int(Config::ShowEmails).await.to_string(),
         );
         res.insert("inbox_watch", inbox_watch.to_string());
         res.insert("sentbox_watch", sentbox_watch.to_string());
@@ -373,51 +372,57 @@ impl Context {
         res.insert("e2ee_enabled", e2ee_enabled.to_string());
         res.insert(
             "key_gen_type",
-            self.get_config_int(Config::KeyGenType).await?.to_string(),
+            self.get_config_int(Config::KeyGenType).await.to_string(),
         );
         res.insert("bcc_self", bcc_self.to_string());
-        res.insert("private_key_count", prv_key_cnt.to_string());
-        res.insert("public_key_count", pub_key_cnt.to_string());
+        res.insert(
+            "private_key_count",
+            prv_key_cnt.unwrap_or_default().to_string(),
+        );
+        res.insert(
+            "public_key_count",
+            pub_key_cnt.unwrap_or_default().to_string(),
+        );
         res.insert("fingerprint", fingerprint_str);
         res.insert(
             "webrtc_instance",
             self.get_config(Config::WebrtcInstance)
-                .await?
+                .await
                 .unwrap_or_else(|| "<unset>".to_string()),
         );
         res.insert(
             "media_quality",
-            self.get_config_int(Config::MediaQuality).await?.to_string(),
+            self.get_config_int(Config::MediaQuality).await.to_string(),
         );
         res.insert(
             "delete_device_after",
             self.get_config_int(Config::DeleteDeviceAfter)
-                .await?
+                .await
                 .to_string(),
         );
         res.insert(
             "delete_server_after",
             self.get_config_int(Config::DeleteServerAfter)
-                .await?
+                .await
                 .to_string(),
         );
         res.insert(
             "last_housekeeping",
             self.get_config_int(Config::LastHousekeeping)
-                .await?
+                .await
                 .to_string(),
         );
         res.insert(
             "scan_all_folders_debounce_secs",
             self.get_config_int(Config::ScanAllFoldersDebounceSecs)
-                .await?
+                .await
                 .to_string(),
         );
 
         let elapsed = self.creation_time.elapsed();
         res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));
 
-        Ok(res)
+        res
     }
 
     /// Get a list of fresh, unmuted messages in any chat but deaddrop.
@@ -427,7 +432,7 @@ impl Context {
     /// Moreover, the number of returned messages
     /// can be used for a badge counter on the app icon.
     pub async fn get_fresh_msgs(&self) -> Result<Vec<MsgId>> {
-        let list = self
+        let ret = self
             .sql
             .query_map(
                 concat!(
@@ -448,31 +453,28 @@ impl Context {
                 paramsv![MessageState::InFresh, time()],
                 |row| row.get::<_, MsgId>(0),
                 |rows| {
-                    let mut list = Vec::new();
+                    let mut ret = Vec::new();
                     for row in rows {
-                        list.push(row?);
+                        ret.push(row?);
                     }
-                    Ok(list)
+                    Ok(ret)
                 },
             )
             .await?;
-        Ok(list)
+        Ok(ret)
     }
 
     /// Searches for messages containing the query string.
     ///
     /// If `chat_id` is provided this searches only for messages in this chat, if `chat_id`
     /// is `None` this searches messages from all chats.
-    pub async fn search_msgs(
-        &self,
-        chat_id: Option<ChatId>,
-        query: impl AsRef<str>,
-    ) -> Result<Vec<MsgId>> {
+    pub async fn search_msgs(&self, chat_id: Option<ChatId>, query: impl AsRef<str>) -> Vec<MsgId> {
         let real_query = query.as_ref().trim();
         if real_query.is_empty() {
-            return Ok(Vec::new());
+            return Vec::new();
         }
         let str_like_in_text = format!("%{}%", real_query);
+        let str_like_beg = format!("{}%", real_query);
 
         let do_query = |query, params| {
             self.sql.query_map(
@@ -489,7 +491,7 @@ impl Context {
             )
         };
 
-        let list = if let Some(chat_id) = chat_id {
+        if let Some(chat_id) = chat_id {
             do_query(
                 "SELECT m.id AS id, m.timestamp AS timestamp
                  FROM msgs m
@@ -498,22 +500,13 @@ impl Context {
                  WHERE m.chat_id=?
                    AND m.hidden=0
                    AND ct.blocked=0
-                   AND txt LIKE ?
+                   AND (txt LIKE ? OR ct.name LIKE ?)
                  ORDER BY m.timestamp,m.id;",
-                paramsv![chat_id, str_like_in_text],
+                paramsv![chat_id, str_like_in_text, str_like_beg],
             )
-            .await?
+            .await
+            .unwrap_or_default()
         } else {
-            // For performance reasons results are sorted only by `id`, that is in the order of
-            // message reception.
-            //
-            // Unlike chat view, sorting by `timestamp` is not necessary but slows down the query by
-            // ~25% according to benchmarks.
-            //
-            // To speed up incremental search, where queries for few characters usually return lots
-            // of unwanted results that are discarded moments later, we added `LIMIT 1000`.
-            // According to some tests, this limit speeds up eg. 2 character searches by factor 10.
-            // The limit is documented and UI may add a hint when getting 1000 results.
             do_query(
                 "SELECT m.id AS id, m.timestamp AS timestamp
                  FROM msgs m
@@ -525,38 +518,33 @@ impl Context {
                    AND m.hidden=0
                    AND c.blocked=0
                    AND ct.blocked=0
-                   AND m.txt LIKE ?
-                 ORDER BY m.id DESC LIMIT 1000",
-                paramsv![str_like_in_text],
+                   AND (m.txt LIKE ? OR ct.name LIKE ?)
+                 ORDER BY m.timestamp DESC,m.id DESC;",
+                paramsv![str_like_in_text, str_like_beg],
             )
-            .await?
-        };
-
-        Ok(list)
+            .await
+            .unwrap_or_default()
+        }
     }
 
-    pub async fn is_inbox(&self, folder_name: impl AsRef<str>) -> Result<bool> {
-        let inbox = self.get_config(Config::ConfiguredInboxFolder).await?;
-        Ok(inbox == Some(folder_name.as_ref().to_string()))
+    pub async fn is_inbox(&self, folder_name: impl AsRef<str>) -> bool {
+        self.get_config(Config::ConfiguredInboxFolder).await
+            == Some(folder_name.as_ref().to_string())
     }
 
-    pub async fn is_sentbox(&self, folder_name: impl AsRef<str>) -> Result<bool> {
-        let sentbox = self.get_config(Config::ConfiguredSentboxFolder).await?;
-
-        Ok(sentbox == Some(folder_name.as_ref().to_string()))
+    pub async fn is_sentbox(&self, folder_name: impl AsRef<str>) -> bool {
+        self.get_config(Config::ConfiguredSentboxFolder).await
+            == Some(folder_name.as_ref().to_string())
     }
 
-    pub async fn is_mvbox(&self, folder_name: impl AsRef<str>) -> Result<bool> {
-        let mvbox = self.get_config(Config::ConfiguredMvboxFolder).await?;
-
-        Ok(mvbox == Some(folder_name.as_ref().to_string()))
+    pub async fn is_mvbox(&self, folder_name: impl AsRef<str>) -> bool {
+        self.get_config(Config::ConfiguredMvboxFolder).await
+            == Some(folder_name.as_ref().to_string())
     }
 
-    pub async fn is_spam_folder(&self, folder_name: impl AsRef<str>) -> Result<bool> {
-        let is_spam = self.get_config(Config::ConfiguredSpamFolder).await?
-            == Some(folder_name.as_ref().to_string());
-
-        Ok(is_spam)
+    pub async fn is_spam_folder(&self, folder_name: impl AsRef<str>) -> bool {
+        self.get_config(Config::ConfiguredSpamFolder).await
+            == Some(folder_name.as_ref().to_string())
     }
 
     pub fn derive_blobdir(dbfile: &PathBuf) -> PathBuf {
@@ -608,14 +596,9 @@ pub fn get_version_str() -> &'static str {
 mod tests {
     use super::*;
 
-    use crate::chat::{
-        create_by_contact_id, get_chat_contacts, get_chat_msgs, send_msg, set_muted, Chat,
-        MuteDuration,
-    };
-    use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
+    use crate::chat::{get_chat_contacts, get_chat_msgs, set_muted, Chat, MuteDuration};
     use crate::dc_receive_imf::dc_receive_imf;
     use crate::dc_tools::dc_create_outgoing_rfc724_mid;
-    use crate::message::Message;
     use crate::test_utils::TestContext;
     use std::time::Duration;
     use strum::IntoEnumIterator;
@@ -637,7 +620,7 @@ mod tests {
     }
 
     async fn receive_msg(t: &TestContext, chat: &Chat) {
-        let members = get_chat_contacts(t, chat.id).await.unwrap();
+        let members = get_chat_contacts(t, chat.id).await;
         let contact = Contact::load_from_db(t, *members.first().unwrap())
             .await
             .unwrap();
@@ -668,49 +651,43 @@ mod tests {
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 0);
 
         receive_msg(&t, &bob).await;
-        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.unwrap().len(), 1);
-        assert_eq!(bob.id.get_fresh_msg_cnt(&t).await.unwrap(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.len(), 1);
+        assert_eq!(bob.id.get_fresh_msg_cnt(&t).await, 1);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 1);
 
         receive_msg(&t, &claire).await;
         receive_msg(&t, &claire).await;
-        assert_eq!(
-            get_chat_msgs(&t, claire.id, 0, None).await.unwrap().len(),
-            2
-        );
-        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 2);
+        assert_eq!(get_chat_msgs(&t, claire.id, 0, None).await.len(), 2);
+        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await, 2);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 3);
 
         receive_msg(&t, &dave).await;
         receive_msg(&t, &dave).await;
         receive_msg(&t, &dave).await;
-        assert_eq!(get_chat_msgs(&t, dave.id, 0, None).await.unwrap().len(), 3);
-        assert_eq!(dave.id.get_fresh_msg_cnt(&t).await.unwrap(), 3);
+        assert_eq!(get_chat_msgs(&t, dave.id, 0, None).await.len(), 3);
+        assert_eq!(dave.id.get_fresh_msg_cnt(&t).await, 3);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 6);
 
         // mute one of the chats
         set_muted(&t, claire.id, MuteDuration::Forever)
             .await
             .unwrap();
-        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 2);
+        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await, 2);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 4); // muted claires messages are no longer counted
 
         // receive more messages
         receive_msg(&t, &bob).await;
         receive_msg(&t, &claire).await;
         receive_msg(&t, &dave).await;
-        assert_eq!(
-            get_chat_msgs(&t, claire.id, 0, None).await.unwrap().len(),
-            3
-        );
-        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 3);
+        assert_eq!(get_chat_msgs(&t, claire.id, 0, None).await.len(), 3);
+        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await, 3);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 6); // muted claire is not counted
 
         // unmute claire again
         set_muted(&t, claire.id, MuteDuration::NotMuted)
             .await
             .unwrap();
-        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await.unwrap(), 3);
+        assert_eq!(claire.id.get_fresh_msg_cnt(&t).await, 3);
         assert_eq!(t.get_fresh_msgs().await.unwrap().len(), 9); // claire is counted again
     }
 
@@ -719,7 +696,7 @@ mod tests {
         let t = TestContext::new_alice().await;
         let bob = t.create_chat_with_contact("", "bob@g.it").await;
         receive_msg(&t, &bob).await;
-        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.unwrap().len(), 1);
+        assert_eq!(get_chat_msgs(&t, bob.id, 0, None).await.len(), 1);
 
         // chat is unmuted by default, here and in the following assert(),
         // we check mainly that the SQL-statements in is_muted() and get_fresh_msgs()
@@ -834,7 +811,7 @@ mod tests {
     async fn test_get_info() {
         let t = TestContext::new().await;
 
-        let info = t.get_info().await.unwrap();
+        let info = t.get_info().await;
         assert!(info.get("database_dir").is_some());
     }
 
@@ -874,7 +851,7 @@ mod tests {
             "smtp_certificate_checks",
         ];
         let t = TestContext::new().await;
-        let info = t.get_info().await.unwrap();
+        let info = t.get_info().await;
         for key in Config::iter() {
             let key: String = key.to_string();
             if !skip_from_get_info.contains(&&*key)
@@ -883,99 +860,9 @@ mod tests {
             {
                 assert!(
                     info.contains_key(&*key),
-                    "'{}' missing in get_info() output",
-                    key
+                    format!("'{}' missing in get_info() output", key)
                 );
             }
         }
     }
-
-    #[async_std::test]
-    async fn test_search_msgs() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let self_talk = create_by_contact_id(&alice, DC_CONTACT_ID_SELF).await?;
-        let chat = alice
-            .create_chat_with_contact("Bob", "bob@example.org")
-            .await;
-
-        // Global search finds nothing.
-        let res = alice.search_msgs(None, "foo").await?;
-        assert!(res.is_empty());
-
-        // Search in chat with Bob finds nothing.
-        let res = alice.search_msgs(Some(chat.id), "foo").await?;
-        assert!(res.is_empty());
-
-        // Add messages to chat with Bob.
-        let mut msg1 = Message::new(Viewtype::Text);
-        msg1.set_text(Some("foobar".to_string()));
-        send_msg(&alice, chat.id, &mut msg1).await?;
-
-        let mut msg2 = Message::new(Viewtype::Text);
-        msg2.set_text(Some("barbaz".to_string()));
-        send_msg(&alice, chat.id, &mut msg2).await?;
-
-        // Global search with a part of text finds the message.
-        let res = alice.search_msgs(None, "ob").await?;
-        assert_eq!(res.len(), 1);
-
-        // Global search for "bar" matches both "foobar" and "barbaz".
-        let res = alice.search_msgs(None, "bar").await?;
-        assert_eq!(res.len(), 2);
-
-        // Message added later is returned first.
-        assert_eq!(res.get(0), Some(&msg2.id));
-        assert_eq!(res.get(1), Some(&msg1.id));
-
-        // Global search with longer text does not find any message.
-        let res = alice.search_msgs(None, "foobarbaz").await?;
-        assert!(res.is_empty());
-
-        // Search for random string finds nothing.
-        let res = alice.search_msgs(None, "abc").await?;
-        assert!(res.is_empty());
-
-        // Search in chat with Bob finds the message.
-        let res = alice.search_msgs(Some(chat.id), "foo").await?;
-        assert_eq!(res.len(), 1);
-
-        // Search in Saved Messages does not find the message.
-        let res = alice.search_msgs(Some(self_talk), "foo").await?;
-        assert!(res.is_empty());
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_limit_search_msgs() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let chat = alice
-            .create_chat_with_contact("Bob", "bob@example.org")
-            .await;
-
-        // Add 999 messages
-        let mut msg = Message::new(Viewtype::Text);
-        msg.set_text(Some("foobar".to_string()));
-        for _ in 0..999 {
-            send_msg(&alice, chat.id, &mut msg).await?;
-        }
-        let res = alice.search_msgs(None, "foo").await?;
-        assert_eq!(res.len(), 999);
-
-        // Add one more message, no limit yet
-        send_msg(&alice, chat.id, &mut msg).await?;
-        let res = alice.search_msgs(None, "foo").await?;
-        assert_eq!(res.len(), 1000);
-
-        // Add one more message, that one is truncated then
-        send_msg(&alice, chat.id, &mut msg).await?;
-        let res = alice.search_msgs(None, "foo").await?;
-        assert_eq!(res.len(), 1000);
-
-        // In-chat should not be not limited
-        let res = alice.search_msgs(Some(chat.id), "foo").await?;
-        assert_eq!(res.len(), 1001);
-
-        Ok(())
-    }
 }

src/dc_tools.rs

@@ -887,6 +887,16 @@ mod tests {
         }
 
         assert!(!dc_delete_file(context, "$BLOBDIR/lkqwjelqkwlje").await);
+        if dc_file_exist!(context, "$BLOBDIR/foobar").await
+            || dc_file_exist!(context, "$BLOBDIR/dada").await
+            || dc_file_exist!(context, "$BLOBDIR/foobar.dadada").await
+            || dc_file_exist!(context, "$BLOBDIR/foobar-folder").await
+        {
+            dc_delete_file(context, "$BLOBDIR/foobar").await;
+            dc_delete_file(context, "$BLOBDIR/dada").await;
+            dc_delete_file(context, "$BLOBDIR/foobar.dadada").await;
+            dc_delete_file(context, "$BLOBDIR/foobar-folder").await;
+        }
         assert!(dc_write_file(context, "$BLOBDIR/foobar", b"content")
             .await
             .is_ok());
@@ -1043,9 +1053,7 @@ mod tests {
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), 1);
 
         // the message should be added only once a day - test that an hour later and nearly a day later
@@ -1055,9 +1063,7 @@ mod tests {
             get_provider_update_timestamp(),
         )
         .await;
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), 1);
 
         maybe_warn_on_bad_time(
@@ -1066,9 +1072,7 @@ mod tests {
             get_provider_update_timestamp(),
         )
         .await;
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), 1);
 
         // next day, there should be another device message
@@ -1081,9 +1085,7 @@ mod tests {
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         assert_eq!(device_chat_id, chats.get_chat_id(0));
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), 2);
     }
 
@@ -1113,9 +1115,7 @@ mod tests {
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), 1);
 
         // do not repeat the warning every day ...
@@ -1135,9 +1135,7 @@ mod tests {
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         let test_len = msgs.len();
         assert!(test_len == 1 || test_len == 2);
 
@@ -1152,9 +1150,7 @@ mod tests {
         let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
         assert_eq!(chats.len(), 1);
         let device_chat_id = chats.get_chat_id(0);
-        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let msgs = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         assert_eq!(msgs.len(), test_len + 1);
     }
 }

src/dehtml.rs

@@ -23,14 +23,11 @@ struct Dehtml {
     /// Everything between <div name="quote"> and <div name="quoted-content"> is usually metadata
     /// If this is > `0`, then we are inside a `<div name="quoted-content">`.
     divs_since_quoted_content_div: u32,
-    /// All-Inkl just puts the quote into `<blockquote> </blockquote>`. This count is
-    /// increased at each `<blockquote>` and decreased at each `</blockquote>`.
-    blockquotes_since_blockquote: u32,
 }
 
 impl Dehtml {
     fn line_prefix(&self) -> &str {
-        if self.divs_since_quoted_content_div > 0 || self.blockquotes_since_blockquote > 0 {
+        if self.divs_since_quoted_content_div > 0 {
             "> "
         } else {
             ""
@@ -70,7 +67,7 @@ pub fn dehtml(buf: &str) -> Option<String> {
     None
 }
 
-fn dehtml_quick_xml(buf: &str) -> String {
+pub fn dehtml_quick_xml(buf: &str) -> String {
     let buf = buf.trim().trim_start_matches("<!doctype html>");
 
     let mut dehtml = Dehtml {
@@ -79,7 +76,6 @@ fn dehtml_quick_xml(buf: &str) -> String {
         last_href: None,
         divs_since_quote_div: 0,
         divs_since_quoted_content_div: 0,
-        blockquotes_since_blockquote: 0,
     };
 
     let mut reader = quick_xml::Reader::from_str(buf);
@@ -183,7 +179,6 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
                 dehtml.strbuilder += "_";
             }
         }
-        "blockquote" => pop_tag(&mut dehtml.blockquotes_since_blockquote),
         _ => {}
     }
 }
@@ -246,7 +241,6 @@ fn dehtml_starttag_cb<B: std::io::BufRead>(
                 dehtml.strbuilder += "_";
             }
         }
-        "blockquote" => dehtml.blockquotes_since_blockquote += 1,
         _ => {}
     }
 }
@@ -314,7 +308,6 @@ mod tests {
                 "[ Foo ](https://example.com)",
             ),
             ("<b> bar </b>", "* bar *"),
-            ("<i>foo</i>", "_foo_"),
             ("<b> bar <i> foo", "* bar _ foo"),
             ("&amp; bar", "& bar"),
             // Despite missing ', this should be shown:
@@ -392,13 +385,6 @@ mod tests {
         assert_eq!(txt.trim(), "lots of text");
     }
 
-    #[test]
-    fn test_pre_tag() {
-        let input = "<html><pre>\ntwo\nlines\n</pre></html>";
-        let txt = dehtml(input).unwrap();
-        assert_eq!(txt.trim(), "two\nlines");
-    }
-
     #[async_std::test]
     async fn test_quote_div() {
         let input = include_str!("../test-data/message/gmx-quote-body.eml");

src/e2ee.rs

@@ -26,9 +26,9 @@ pub struct EncryptHelper {
 impl EncryptHelper {
     pub async fn new(context: &Context) -> Result<EncryptHelper> {
         let prefer_encrypt =
-            EncryptPreference::from_i32(context.get_config_int(Config::E2eeEnabled).await?)
+            EncryptPreference::from_i32(context.get_config_int(Config::E2eeEnabled).await)
                 .unwrap_or_default();
-        let addr = match context.get_config(Config::ConfiguredAddr).await? {
+        let addr = match context.get_config(Config::ConfiguredAddr).await {
             None => {
                 bail!("addr not configured!");
             }
@@ -209,58 +209,29 @@ pub async fn try_decrypt(
     Ok((out_mail, signatures))
 }
 
-/// Returns a reference to the encrypted payload of a valid PGP/MIME message.
-///
-/// Returns `None` if the message is not a valid PGP/MIME message.
-fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
-    if mail.ctype.mimetype != "multipart/encrypted" {
-        return None;
-    }
+/// Returns a reference to the encrypted payload and validates the autocrypt structure.
+fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Result<&'a ParsedMail<'b>> {
+    ensure!(
+        mail.ctype.mimetype == "multipart/encrypted",
+        "Not a multipart/encrypted message: {}",
+        mail.ctype.mimetype
+    );
     if let [first_part, second_part] = &mail.subparts[..] {
-        if first_part.ctype.mimetype == "application/pgp-encrypted"
-            && second_part.ctype.mimetype == "application/octet-stream"
-        {
-            Some(second_part)
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}
+        ensure!(
+            first_part.ctype.mimetype == "application/pgp-encrypted",
+            "Invalid Autocrypt Level 1 version part: {:?}",
+            first_part.ctype,
+        );
 
-/// Returns a reference to the encrypted payload of a ["Mixed
-/// Up"][pgpmime-message-mangling] message.
-///
-/// According to [RFC 3156] encrypted messages should have
-/// `multipart/encrypted` MIME type and two parts, but Microsoft
-/// Exchange and ProtonMail IMAP/SMTP Bridge are known to mangle this
-/// structure by changing the type to `multipart/mixed` and prepending
-/// an empty part at the start.
-///
-/// ProtonMail IMAP/SMTP Bridge prepends a part literally saying
-/// "Empty Message", so we don't check its contents at all, checking
-/// only for `text/plain` type.
-///
-/// Returns `None` if the message is not a "Mixed Up" message.
-///
-/// [RFC 3156]: https://www.rfc-editor.org/info/rfc3156
-/// [pgpmime-message-mangling]: https://tools.ietf.org/id/draft-dkg-openpgp-pgpmime-message-mangling-00.html
-fn get_mixed_up_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Option<&'a ParsedMail<'b>> {
-    if mail.ctype.mimetype != "multipart/mixed" {
-        return None;
-    }
-    if let [first_part, second_part, third_part] = &mail.subparts[..] {
-        if first_part.ctype.mimetype == "text/plain"
-            && second_part.ctype.mimetype == "application/pgp-encrypted"
-            && third_part.ctype.mimetype == "application/octet-stream"
-        {
-            Some(third_part)
-        } else {
-            None
-        }
+        ensure!(
+            second_part.ctype.mimetype == "application/octet-stream",
+            "Invalid Autocrypt Level 1 encrypted part: {:?}",
+            second_part.ctype
+        );
+
+        Ok(second_part)
     } else {
-        None
+        bail!("Invalid Autocrypt Level 1 Mime Parts")
     }
 }
 
@@ -271,12 +242,12 @@ async fn decrypt_if_autocrypt_message(
     public_keyring_for_validate: Keyring<SignedPublicKey>,
     ret_valid_signatures: &mut HashSet<Fingerprint>,
 ) -> Result<Option<Vec<u8>>> {
-    let encrypted_data_part = match get_autocrypt_mime(mail).or_else(|| get_mixed_up_mime(mail)) {
-        None => {
+    let encrypted_data_part = match get_autocrypt_mime(mail) {
+        Err(_) => {
             // not an autocrypt mime message, abort and ignore
             return Ok(None);
         }
-        Some(res) => res,
+        Ok(res) => res,
     };
     info!(context, "Detected Autocrypt-mime message");
 
@@ -358,7 +329,7 @@ fn contains_report(mail: &ParsedMail<'_>) -> bool {
 pub async fn ensure_secret_key_exists(context: &Context) -> Result<String> {
     let self_addr = context
         .get_config(Config::ConfiguredAddr)
-        .await?
+        .await
         .ok_or_else(|| {
             format_err!(concat!(
                 "Failed to get self address, ",
@@ -544,7 +515,9 @@ Sent with my Delta Chat Messenger: https://delta.chat";
             to_save: Some(ToSave::All),
             fingerprint_changed: false,
         };
-        vec![(Some(peerstate), addr)]
+        let mut peerstates = Vec::new();
+        peerstates.push((Some(peerstate), addr));
+        peerstates
     }
 
     #[async_std::test]
@@ -569,31 +542,9 @@ Sent with my Delta Chat Messenger: https://delta.chat";
         assert!(encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
 
         // test with missing peerstate
-        let ps = vec![(None, "bob@foo.bar")];
+        let mut ps = Vec::new();
+        ps.push((None, "bob@foo.bar"));
         assert!(encrypt_helper.should_encrypt(&t, true, &ps).is_err());
         assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
     }
-
-    #[test]
-    fn test_mixed_up_mime() -> Result<()> {
-        // "Mixed Up" mail as received when sending an encrypted
-        // message using Delta Chat Desktop via ProtonMail IMAP/SMTP
-        // Bridge.
-        let mixed_up_mime = include_bytes!("../test-data/message/protonmail-mixed-up.eml");
-        let mail = mailparse::parse_mail(mixed_up_mime)?;
-        assert!(get_autocrypt_mime(&mail).is_none());
-        assert!(get_mixed_up_mime(&mail).is_some());
-
-        // Same "Mixed Up" mail repaired by Thunderbird 78.9.0.
-        //
-        // It added `X-Enigmail-Info: Fixed broken PGP/MIME message`
-        // header although the repairing is done by the built-in
-        // OpenPGP support, not Enigmail.
-        let repaired_mime = include_bytes!("../test-data/message/protonmail-repaired.eml");
-        let mail = mailparse::parse_mail(repaired_mime)?;
-        assert!(get_autocrypt_mime(&mail).is_some());
-        assert!(get_mixed_up_mime(&mail).is_none());
-
-        Ok(())
-    }
 }

src/ephemeral.rs

@@ -61,10 +61,11 @@ use std::num::ParseIntError;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::{ensure, Context as _, Error};
+use anyhow::{ensure, Error};
 use async_std::task;
 use serde::{Deserialize, Serialize};
 
+use crate::chat::{lookup_by_contact_id, send_msg, ChatId};
 use crate::constants::{
     Viewtype, DC_CHAT_ID_LAST_SPECIAL, DC_CHAT_ID_TRASH, DC_CONTACT_ID_DEVICE, DC_CONTACT_ID_SELF,
 };
@@ -75,10 +76,6 @@ use crate::message::{Message, MessageState, MsgId};
 use crate::mimeparser::SystemMessage;
 use crate::sql;
 use crate::stock_str;
-use crate::{
-    chat::{lookup_by_contact_id, send_msg, ChatId},
-    job,
-};
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize)]
 pub enum Timer {
@@ -153,7 +150,7 @@ impl ChatId {
     pub async fn get_ephemeral_timer(self, context: &Context) -> Result<Timer, Error> {
         let timer = context
             .sql
-            .query_get_value(
+            .query_get_value_result(
                 "SELECT ephemeral_timer FROM chats WHERE id=?;",
                 paramsv![self],
             )
@@ -264,10 +261,10 @@ pub(crate) async fn stock_ephemeral_timer_changed(
 
 impl MsgId {
     /// Returns ephemeral message timer value for the message.
-    pub(crate) async fn ephemeral_timer(self, context: &Context) -> anyhow::Result<Timer> {
+    pub(crate) async fn ephemeral_timer(self, context: &Context) -> crate::sql::Result<Timer> {
         let res = match context
             .sql
-            .query_get_value(
+            .query_get_value_result(
                 "SELECT ephemeral_timer FROM msgs WHERE id=?",
                 paramsv![self],
             )
@@ -280,7 +277,7 @@ impl MsgId {
     }
 
     /// Starts ephemeral message timer for the message if it is not started yet.
-    pub(crate) async fn start_ephemeral_timer(self, context: &Context) -> anyhow::Result<()> {
+    pub(crate) async fn start_ephemeral_timer(self, context: &Context) -> crate::sql::Result<()> {
         if let Timer::Enabled { duration } = self.ephemeral_timer(context).await? {
             let ephemeral_timestamp = time() + i64::from(duration);
 
@@ -313,23 +310,18 @@ pub(crate) async fn delete_expired_messages(context: &Context) -> Result<bool, E
         .execute(
             // If you change which information is removed here, also change MsgId::trash() and
             // which information dc_receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-            r#"
-UPDATE msgs
-SET 
-  chat_id=?, txt='', subject='', txt_raw='', 
-  mime_headers='', from_id=0, to_id=0, param=''
-WHERE
-  ephemeral_timestamp != 0
-  AND ephemeral_timestamp <= ?
-  AND chat_id != ?
-"#,
+            "UPDATE msgs \
+             SET chat_id=?, txt='', subject='', txt_raw='', mime_headers='', from_id=0, to_id=0, param='' \
+             WHERE \
+             ephemeral_timestamp != 0 \
+             AND ephemeral_timestamp <= ? \
+             AND chat_id != ?",
             paramsv![DC_CHAT_ID_TRASH, time(), DC_CHAT_ID_TRASH],
         )
-        .await
-        .context("update failed")?
+        .await?
         > 0;
 
-    if let Some(delete_device_after) = context.get_config_delete_device_after().await? {
+    if let Some(delete_device_after) = context.get_config_delete_device_after().await {
         let self_chat_id = lookup_by_contact_id(context, DC_CONTACT_ID_SELF)
             .await
             .unwrap_or_default()
@@ -362,8 +354,7 @@ WHERE
                     device_chat_id
                 ],
             )
-            .await
-            .context("deleted update failed")?;
+            .await?;
 
         updated |= rows_modified > 0;
     }
@@ -385,15 +376,13 @@ WHERE
 pub async fn schedule_ephemeral_task(context: &Context) {
     let ephemeral_timestamp: Option<i64> = match context
         .sql
-        .query_get_value(
-            r#"
-    SELECT ephemeral_timestamp
-    FROM msgs
-    WHERE ephemeral_timestamp != 0
-      AND chat_id != ?
-    ORDER BY ephemeral_timestamp ASC
-    LIMIT 1;
-    "#,
+        .query_get_value_result(
+            "SELECT ephemeral_timestamp \
+         FROM msgs \
+         WHERE ephemeral_timestamp != 0 \
+           AND chat_id != ? \
+         ORDER BY ephemeral_timestamp ASC \
+         LIMIT 1",
             paramsv![DC_CHAT_ID_TRASH], // Trash contains already deleted messages, skip them
         )
         .await
@@ -447,10 +436,10 @@ pub async fn schedule_ephemeral_task(context: &Context) {
 ///
 /// It looks up the trash chat too, to find messages that are already
 /// deleted locally, but not deleted on the server.
-pub(crate) async fn load_imap_deletion_msgid(context: &Context) -> anyhow::Result<Option<MsgId>> {
+pub(crate) async fn load_imap_deletion_msgid(context: &Context) -> sql::Result<Option<MsgId>> {
     let now = time();
 
-    let threshold_timestamp = match context.get_config_delete_server_after().await? {
+    let threshold_timestamp = match context.get_config_delete_server_after().await {
         None => 0,
         Some(delete_server_after) => now - delete_server_after,
     };
@@ -464,13 +453,9 @@ pub(crate) async fn load_imap_deletion_msgid(context: &Context) -> anyhow::Resul
          OR (ephemeral_timestamp != 0 AND ephemeral_timestamp <= ?) \
          ) \
          AND server_uid != 0 \
-         AND NOT id IN (SELECT foreign_id FROM jobs WHERE action = ?)
          LIMIT 1",
-            paramsv![threshold_timestamp, now, job::Action::DeleteMsgOnImap],
-            |row| {
-                let msg_id: MsgId = row.get(0)?;
-                Ok(msg_id)
-            },
+            paramsv![threshold_timestamp, now],
+            |row| row.get::<_, MsgId>(0),
         )
         .await
 }
@@ -507,7 +492,6 @@ pub(crate) async fn start_ephemeral_timers(context: &Context) -> sql::Result<()>
 
 #[cfg(test)]
 mod tests {
-    use crate::param::Params;
     use async_std::task::sleep;
 
     use super::*;
@@ -729,38 +713,11 @@ mod tests {
 
         sleep(Duration::from_millis(1100)).await;
 
-        // Check checks that the msg was deleted locally
         check_msg_was_deleted(&t, &chat, msg.sender_msg_id).await;
-
-        // Check that the msg will be deleted on the server
-        // First of all, set a server_uid so that DC thinks that it's actually possible to delete
-        t.sql
-            .execute(
-                "UPDATE msgs SET server_uid=1 WHERE id=?",
-                paramsv![msg.sender_msg_id],
-            )
-            .await
-            .unwrap();
-        let job = job::load_imap_deletion_job(&t).await.unwrap();
-        assert_eq!(
-            job,
-            Some(job::Job::new(
-                job::Action::DeleteMsgOnImap,
-                msg.sender_msg_id.to_u32(),
-                Params::new(),
-                0,
-            ))
-        );
-        // Let's assume that executing the job fails on first try and the job is saved to the db
-        job.unwrap().save(&t).await.unwrap();
-
-        // Make sure that we don't get yet another job when loading from db
-        let job2 = job::load_imap_deletion_job(&t).await.unwrap();
-        assert_eq!(job2, None);
     }
 
     async fn check_msg_was_deleted(t: &TestContext, chat: &Chat, msg_id: MsgId) {
-        let chat_items = chat::get_chat_msgs(t, chat.id, 0, None).await.unwrap();
+        let chat_items = chat::get_chat_msgs(t, chat.id, 0, None).await;
         // Check that the chat is empty except for possibly info messages:
         for item in &chat_items {
             if let ChatItem::Message { msg_id } = item {
@@ -773,13 +730,12 @@ mod tests {
         if let Ok(msg) = Message::load_from_db(t, msg_id).await {
             assert_eq!(msg.from_id, 0);
             assert_eq!(msg.to_id, 0);
-            assert!(msg.text.is_none_or_empty(), "{:?}", msg.text);
+            assert!(msg.text.is_none_or_empty(), msg.text);
             let rawtxt: Option<String> = t
                 .sql
-                .query_get_value("SELECT txt_raw FROM msgs WHERE id=?;", paramsv![msg_id])
-                .await
-                .unwrap();
-            assert!(rawtxt.is_none_or_empty(), "{:?}", rawtxt);
+                .query_get_value(t, "SELECT txt_raw FROM msgs WHERE id=?;", paramsv![msg_id])
+                .await;
+            assert!(rawtxt.is_none_or_empty(), rawtxt);
         }
     }
 }

src/format_flowed.rs

@@ -146,17 +146,6 @@ mod tests {
 
         let text = "> Not a quote";
         assert_eq!(format_flowed(text), " > Not a quote");
-
-        // Test space stuffing of wrapped lines
-        let text = "> This is the Autocrypt Setup Message used to transfer your key between clients.\n\
-                    >                               \n\
-                    > To decrypt and use your key, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device.";
-        let expected = "\x20> This is the Autocrypt Setup Message used to transfer your key between \r\n\
-                        clients.\r\n\
-                        \x20>\r\n\
-                        \x20> To decrypt and use your key, open the message in an Autocrypt-compliant \r\n\
-                        client and enter the setup code presented on the generating device.";
-        assert_eq!(format_flowed(text), expected);
     }
 
     #[test]

src/html.rs

@@ -13,12 +13,12 @@ use std::pin::Pin;
 use anyhow::Result;
 use lettre_email::mime::{self, Mime};
 
+use crate::context::Context;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::message::{Message, MsgId};
 use crate::mimeparser::parse_message_id;
 use crate::param::Param::SendHtml;
 use crate::plaintext::PlainText;
-use crate::{context::Context, message};
 use lettre_email::PartBuilder;
 use mailparse::ParsedContentType;
 
@@ -244,20 +244,32 @@ impl MsgId {
     /// this is the case at least when `Message.has_html()` returns true
     /// (we do not save raw mime unconditionally in the database to save space).
     /// The corresponding ffi-function is `dc_get_msg_html()`.
-    pub async fn get_html(self, context: &Context) -> Result<Option<String>> {
-        let rawmime = message::get_mime_headers(context, self).await?;
+    pub async fn get_html(self, context: &Context) -> Option<String> {
+        let rawmime: Option<String> = context
+            .sql
+            .query_get_value(
+                context,
+                "SELECT mime_headers FROM msgs WHERE id=?;",
+                paramsv![self],
+            )
+            .await;
 
-        if !rawmime.is_empty() {
-            match HtmlMsgParser::from_bytes(context, rawmime.as_bytes()).await {
-                Err(err) => {
-                    warn!(context, "get_html: parser error: {}", err);
-                    Ok(None)
+        if let Some(rawmime) = rawmime {
+            if !rawmime.is_empty() {
+                match HtmlMsgParser::from_bytes(context, rawmime.as_bytes()).await {
+                    Err(err) => {
+                        warn!(context, "get_html: parser error: {}", err);
+                        None
+                    }
+                    Ok(parser) => Some(parser.html),
                 }
-                Ok(parser) => Ok(Some(parser.html)),
+            } else {
+                warn!(context, "get_html: empty mime for {}", self);
+                None
             }
         } else {
             warn!(context, "get_html: no mime for {}", self);
-            Ok(None)
+            None
         }
     }
 }
@@ -426,8 +438,8 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
     #[async_std::test]
     async fn test_get_html_empty() {
         let t = TestContext::new().await;
-        let msg_id = MsgId::new(100);
-        assert!(msg_id.get_html(&t).await.unwrap().is_none())
+        let msg_id = MsgId::new_unset();
+        assert!(msg_id.get_html(&t).await.is_none())
     }
 
     #[async_std::test]
@@ -448,7 +460,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert!(!msg.is_forwarded());
         assert!(msg.get_text().unwrap().contains("this is plain"));
         assert!(msg.has_html());
-        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&alice).await.unwrap();
         assert!(html.contains("this is <b>html</b>"));
 
         // alice: create chat with bob and forward received html-message there
@@ -462,7 +474,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert!(msg.is_forwarded());
         assert!(msg.get_text().unwrap().contains("this is plain"));
         assert!(msg.has_html());
-        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&alice).await.unwrap();
         assert!(html.contains("this is <b>html</b>"));
 
         // bob: check that bob also got the html-part of the forwarded message
@@ -475,7 +487,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert!(msg.is_forwarded());
         assert!(msg.get_text().unwrap().contains("this is plain"));
         assert!(msg.has_html());
-        let html = msg.get_id().get_html(&bob).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&bob).await.unwrap();
         assert!(html.contains("this is <b>html</b>"));
     }
 
@@ -505,7 +517,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
 
         // receive the message on another device
         let alice = TestContext::new_alice().await;
-        assert_eq!(alice.get_config_int(Config::ShowEmails).await.unwrap(), 0); // set to "1" above, make sure it is another db
+        assert_eq!(alice.get_config_int(Config::ShowEmails).await, 0); // set to "1" above, make sure it is another db
         alice.recv_msg(&msg).await;
         let chat = alice.get_self_chat().await;
         let msg = alice.get_last_msg_in(chat.get_id()).await;
@@ -515,7 +527,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert!(msg.is_forwarded());
         assert!(msg.get_text().unwrap().contains("this is plain"));
         assert!(msg.has_html());
-        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&alice).await.unwrap();
         assert!(html.contains("this is <b>html</b>"));
     }
 
@@ -537,7 +549,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert_eq!(msg.get_text(), Some("plain text".to_string()));
         assert!(!msg.is_forwarded());
         assert!(msg.mime_modified);
-        let html = msg.get_id().get_html(&alice).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&alice).await.unwrap();
         assert!(html.contains("<b>html</b> text"));
 
         // let bob receive the message
@@ -547,7 +559,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x
         assert_eq!(msg.get_text(), Some("plain text".to_string()));
         assert!(!msg.is_forwarded());
         assert!(msg.mime_modified);
-        let html = msg.get_id().get_html(&bob).await.unwrap().unwrap();
+        let html = msg.get_id().get_html(&bob).await.unwrap();
         assert!(html.contains("<b>html</b> text"));
     }
 }

src/imap/mod.rs

@@ -194,7 +194,7 @@ impl Imap {
 
         let oauth2 = self.config.oauth2;
 
-        let connection_res: ImapResult<Client> = if self.config.lp.security == Socket::Starttls
+        let connection_res: ImapResult<Client> = if self.config.lp.security == Socket::STARTTLS
             || self.config.lp.security == Socket::Plain
         {
             let config = &mut self.config;
@@ -203,7 +203,7 @@ impl Imap {
 
             match Client::connect_insecure((imap_server, imap_port)).await {
                 Ok(client) => {
-                    if config.lp.security == Socket::Starttls {
+                    if config.lp.security == Socket::STARTTLS {
                         client.secure(imap_server, config.strict_tls).await
                     } else {
                         Ok(client)
@@ -229,7 +229,7 @@ impl Imap {
                     let addr: &str = config.addr.as_ref();
 
                     if let Some(token) =
-                        dc_get_oauth2_access_token(context, addr, imap_pw, true).await?
+                        dc_get_oauth2_access_token(context, addr, imap_pw, true).await
                     {
                         let auth = OAuth2 {
                             user: imap_user.into(),
@@ -267,7 +267,7 @@ impl Imap {
 
                 let lock = context.wrong_pw_warning_mutex.lock().await;
                 if self.login_failed_once
-                    && context.get_config_bool(Config::NotifyAboutWrongPw).await?
+                    && context.get_config_bool(Config::NotifyAboutWrongPw).await
                 {
                     if let Err(e) = context.set_config(Config::NotifyAboutWrongPw, None).await {
                         warn!(context, "{}", e);
@@ -339,11 +339,11 @@ impl Imap {
         if self.is_connected() && !self.should_reconnect() {
             return Ok(());
         }
-        if !context.is_configured().await? {
+        if !context.is_configured().await {
             bail!("IMAP Connect without configured params");
         }
 
-        let param = LoginParam::from_database(context, "configured_").await?;
+        let param = LoginParam::from_database(context, "configured_").await;
         // the trailing underscore is correct
 
         if let Err(err) = self
@@ -521,20 +521,23 @@ impl Imap {
         // Write collected UIDs to SQLite database.
         context
             .sql
-            .transaction(move |transaction| {
-                transaction.execute(
+            .with_conn(move |mut conn| {
+                let conn2 = &mut conn;
+                let tx = conn2.transaction()?;
+                tx.execute(
                     "UPDATE msgs SET server_uid=0 WHERE server_folder=?",
                     params![folder],
                 )?;
                 for (uid, rfc724_mid) in &msg_ids {
                     // This may detect previously undetected moved
                     // messages, so we update server_folder too.
-                    transaction.execute(
+                    tx.execute(
                         "UPDATE msgs \
-                             SET server_folder=?,server_uid=? WHERE rfc724_mid=?",
+                         SET server_folder=?,server_uid=? WHERE rfc724_mid=?",
                         params![folder, uid, rfc724_mid],
                     )?;
                 }
+                tx.commit()?;
                 Ok(())
             })
             .await?;
@@ -572,15 +575,6 @@ impl Imap {
                 // new messages is only one command, just as a SELECT command)
                 true
             } else if let Some(uid_next) = mailbox.uid_next {
-                if uid_next < old_uid_next {
-                    warn!(
-                        context,
-                        "The server illegally decreased the uid_next of folder {} from {} to {} without changing validity ({}), resyncing UIDs...", 
-                        folder, old_uid_next, uid_next, new_uid_validity,
-                    );
-                    set_uid_next(context, folder, uid_next).await?;
-                    job::schedule_resync(context).await;
-                }
                 uid_next != old_uid_next // If uid_next changed, there are new emails
             } else {
                 true // We have no uid_next and if in doubt, return true
@@ -652,7 +646,7 @@ impl Imap {
         folder: S,
         fetch_existing_msgs: bool,
     ) -> Result<bool> {
-        let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?)
+        let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await)
             .unwrap_or_default();
 
         let new_emails = self
@@ -751,7 +745,7 @@ impl Imap {
         let session = self.session.as_mut().unwrap();
         let self_addr = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .ok_or_else(|| format_err!("Not configured"))?;
 
         let search_command = format!("FROM \"{}\"", self_addr);
@@ -1273,7 +1267,10 @@ impl Imap {
         context: &Context,
         create_mvbox: bool,
     ) -> Result<()> {
-        let folders_configured = context.sql.get_raw_config_int("folders_configured").await?;
+        let folders_configured = context
+            .sql
+            .get_raw_config_int(context, "folders_configured")
+            .await;
         if folders_configured.unwrap_or_default() >= DC_FOLDERS_CONFIGURED_VERSION {
             return Ok(());
         }
@@ -1401,7 +1398,7 @@ impl Imap {
             }
             context
                 .sql
-                .set_raw_config_int("folders_configured", DC_FOLDERS_CONFIGURED_VERSION)
+                .set_raw_config_int(context, "folders_configured", DC_FOLDERS_CONFIGURED_VERSION)
                 .await?;
         }
         info!(context, "FINISHED configuring IMAP-folders.");
@@ -1513,7 +1510,7 @@ async fn precheck_imf(
                 "[move] detected bcc-self {} as {}/{}", rfc724_mid, server_folder, server_uid
             );
 
-            let delete_server_after = context.get_config_delete_server_after().await?;
+            let delete_server_after = context.get_config_delete_server_after().await;
 
             if delete_server_after != Some(0) {
                 if msg_id
@@ -1615,7 +1612,7 @@ pub(crate) async fn prefetch_should_download(
     let is_chat_message = headers.get_header_value(HeaderDef::ChatVersion).is_some();
     let parent = get_prefetch_parent_message(context, headers).await?;
     let is_reply_to_chat_message = parent.is_some();
-    if let Some(parent) = &parent {
+    if let Some(parent) = parent {
         let chat = chat::Chat::load_from_db(context, parent.get_chat_id()).await?;
         if chat.typ == Chattype::Group {
             // This might be a group command, like removing a group member.
@@ -1661,7 +1658,6 @@ pub(crate) async fn prefetch_should_download(
             }
             ShowEmails::All => true,
         };
-
     let should_download = (show && !blocked_contact) || maybe_ndn;
     Ok(should_download)
 }
@@ -1740,7 +1736,7 @@ pub(crate) async fn set_uid_next(context: &Context, folder: &str, uid_next: u32)
 async fn get_uid_next(context: &Context, folder: &str) -> Result<u32> {
     Ok(context
         .sql
-        .query_get_value(
+        .query_get_value_result(
             "SELECT uid_next FROM imap_sync WHERE folder=?;",
             paramsv![folder],
         )
@@ -1767,7 +1763,7 @@ pub(crate) async fn set_uidvalidity(
 async fn get_uidvalidity(context: &Context, folder: &str) -> Result<u32> {
     Ok(context
         .sql
-        .query_get_value(
+        .query_get_value_result(
             "SELECT uidvalidity FROM imap_sync WHERE folder=?;",
             paramsv![folder],
         )
@@ -1776,20 +1772,17 @@ async fn get_uidvalidity(context: &Context, folder: &str) -> Result<u32> {
 }
 
 /// Deprecated, use get_uid_next() and get_uidvalidity()
-pub async fn get_config_last_seen_uid<S: AsRef<str>>(
-    context: &Context,
-    folder: S,
-) -> Result<(u32, u32)> {
+pub async fn get_config_last_seen_uid<S: AsRef<str>>(context: &Context, folder: S) -> (u32, u32) {
     let key = format!("imap.mailbox.{}", folder.as_ref());
-    if let Some(entry) = context.sql.get_raw_config(&key).await? {
+    if let Some(entry) = context.sql.get_raw_config(context, &key).await {
         // the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
         let mut parts = entry.split(':');
-        Ok((
+        (
             parts.next().unwrap_or_default().parse().unwrap_or(0),
             parts.next().unwrap_or_default().parse().unwrap_or(0),
-        ))
+        )
     } else {
-        Ok((0, 0))
+        (0, 0)
     }
 }
 

src/imap/scan_folders.rs

@@ -17,7 +17,7 @@ impl Imap {
             let elapsed_secs = last_scan.elapsed().as_secs();
             let debounce_secs = context
                 .get_config_u64(Config::ScanAllFoldersDebounceSecs)
-                .await?;
+                .await;
 
             if elapsed_secs < debounce_secs {
                 return Ok(());
@@ -61,8 +61,14 @@ impl Imap {
                 spam_folder = Some(folder.name().to_string());
             }
 
-            // Don't scan folders that are watched anyway
-            if !watched_folders.contains(&foldername.to_string()) {
+            if watched_folders.contains(&foldername.to_string()) {
+                info!(
+                    context,
+                    "Not scanning folder {} as it is watched anyway", foldername
+                );
+            } else {
+                info!(context, "Scanning folder: {}", foldername);
+
                 if let Err(e) = self.fetch_new_messages(context, foldername, false).await {
                     warn!(context, "Can't fetch new msgs in scanned folder: {:#}", e);
                 }
@@ -89,8 +95,8 @@ async fn get_watched_folders(context: &Context) -> Vec<String> {
         (Config::InboxWatch, Config::ConfiguredInboxFolder),
     ];
     for (watched, configured) in folder_watched_configured {
-        if context.get_config_bool(*watched).await.unwrap_or_default() {
-            if let Ok(Some(folder)) = context.get_config(*configured).await {
+        if context.get_config_bool(*watched).await {
+            if let Some(folder) = context.get_config(*configured).await {
                 res.push(folder);
             }
         }

src/imex.rs

@@ -38,7 +38,7 @@ const DBFILE_BACKUP_NAME: &str = "dc_database_backup.sqlite";
 const BLOBS_BACKUP_NAME: &str = "blobs_backup";
 
 #[derive(Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive)]
-#[repr(u32)]
+#[repr(i32)]
 pub enum ImexMode {
     /// Export all private keys and all public keys of the user to the
     /// directory given as `param1`.  The default key is written to the files `public-key-default.asc`
@@ -170,8 +170,8 @@ pub async fn has_backup_old(context: &Context, dir_name: impl AsRef<Path>) -> Re
                 match sql.open(context, &path, true).await {
                     Ok(_) => {
                         let curr_backup_time = sql
-                            .get_raw_config_int("backup_time")
-                            .await?
+                            .get_raw_config_int(context, "backup_time")
+                            .await
                             .unwrap_or_default();
                         if curr_backup_time > newest_backup_time {
                             newest_backup_path = Some(path);
@@ -271,7 +271,7 @@ pub async fn render_setup_file(context: &Context, passphrase: &str) -> Result<St
         bail!("Passphrase must be at least 2 chars long.");
     };
     let private_key = SignedSecretKey::load_self(context).await?;
-    let ac_headers = match context.get_config_bool(Config::E2eeEnabled).await? {
+    let ac_headers = match context.get_config_bool(Config::E2eeEnabled).await {
         false => None,
         true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
     };
@@ -333,7 +333,7 @@ pub fn create_setup_code(_context: &Context) -> String {
 }
 
 async fn maybe_add_bcc_self_device_msg(context: &Context) -> Result<()> {
-    if !context.sql.get_raw_config_bool("bcc_self").await? {
+    if !context.sql.get_raw_config_bool(context, "bcc_self").await {
         let mut msg = Message::new(Viewtype::Text);
         // TODO: define this as a stockstring once the wording is settled.
         msg.text = Some(
@@ -394,7 +394,7 @@ async fn set_self_key(
             };
             context
                 .sql
-                .set_raw_config_int("e2ee_enabled", e2ee_enabled)
+                .set_raw_config_int(context, "e2ee_enabled", e2ee_enabled)
                 .await?;
         }
         None => {
@@ -404,7 +404,7 @@ async fn set_self_key(
         }
     };
 
-    let self_addr = context.get_config(Config::ConfiguredAddr).await?;
+    let self_addr = context.get_config(Config::ConfiguredAddr).await;
     ensure!(self_addr.is_some(), "Missing self addr");
     let addr = EmailAddress::new(&self_addr.unwrap_or_default())?;
     let keypair = pgp::KeyPair {
@@ -493,7 +493,7 @@ async fn import_backup(context: &Context, backup_to_import: impl AsRef<Path>) ->
     );
 
     ensure!(
-        !context.is_configured().await?,
+        !context.is_configured().await,
         "Cannot import backups to accounts in use."
     );
     ensure!(
@@ -564,7 +564,7 @@ async fn import_backup_old(context: &Context, backup_to_import: impl AsRef<Path>
     );
 
     ensure!(
-        !context.is_configured().await?,
+        !context.is_configured().await,
         "Cannot import backups to accounts in use."
     );
     ensure!(
@@ -594,8 +594,9 @@ async fn import_backup_old(context: &Context, backup_to_import: impl AsRef<Path>
 
     let total_files_cnt = context
         .sql
-        .count("SELECT COUNT(*) FROM backup_blobs;", paramsv![])
-        .await?;
+        .query_get_value::<isize>(context, "SELECT COUNT(*) FROM backup_blobs;", paramsv![])
+        .await
+        .unwrap_or_default() as usize;
     info!(
         context,
         "***IMPORT-in-progress: total_files_cnt={:?}", total_files_cnt,
@@ -624,11 +625,7 @@ async fn import_backup_old(context: &Context, backup_to_import: impl AsRef<Path>
             .query_row(
                 "SELECT file_name, file_content FROM backup_blobs WHERE id = ?",
                 paramsv![file_id],
-                |row| {
-                    let file_name: String = row.get(0)?;
-                    let file_blob: Vec<u8> = row.get(1)?;
-                    Ok((file_name, file_blob))
-                },
+                |row| Ok((row.get::<_, String>(0)?, row.get::<_, Vec<u8>>(1)?)),
             )
             .await?;
 
@@ -677,7 +674,7 @@ async fn export_backup(context: &Context, dir: impl AsRef<Path>) -> Result<()> {
 
     context
         .sql
-        .set_raw_config_int("backup_time", now as i32)
+        .set_raw_config_int(context, "backup_time", now as i32)
         .await?;
     sql::housekeeping(context).await.ok_or_log(context);
 

src/job.rs

@@ -39,7 +39,7 @@ const JOB_RETRIES: u32 = 17;
 #[derive(
     Debug, Display, Copy, Clone, PartialEq, Eq, FromPrimitive, ToPrimitive, FromSql, ToSql,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub(crate) enum Thread {
     Unknown = 0,
     Imap = 100,
@@ -88,7 +88,7 @@ impl Default for Thread {
     FromSql,
     ToSql,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub enum Action {
     Unknown = 0,
 
@@ -141,7 +141,7 @@ impl From<Action> for Thread {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone)]
 pub struct Job {
     pub job_id: u32,
     pub action: Action,
@@ -253,7 +253,7 @@ impl Job {
         let status = match smtp.send(context, recipients, message, job_id).await {
             Err(crate::smtp::send::Error::SendError(err)) => {
                 // Remote error, retry later.
-                warn!(context, "SMTP failed to send: {:?}", err);
+                warn!(context, "SMTP failed to send: {}", err);
                 self.pending_error = Some(err.to_string());
 
                 let res = match err {
@@ -339,12 +339,6 @@ impl Job {
                 error!(context, "SMTP job failed because SMTP has no transport");
                 Status::Finished(Err(format_err!("SMTP has not transport")))
             }
-            Err(crate::smtp::send::Error::Other(err)) => {
-                // Local error, job is invalid, do not retry.
-                smtp.disconnect().await;
-                warn!(context, "unable to load job: {}", err);
-                Status::Finished(Err(err))
-            }
             Ok(()) => {
                 job_try!(success_cb().await);
                 Status::Finished(Ok(()))
@@ -393,21 +387,11 @@ impl Job {
         /* if there is a msg-id and it does not exist in the db, cancel sending.
         this happends if dc_delete_msgs() was called
         before the generated mime was sent out */
-        if 0 != self.foreign_id {
-            match message::exists(context, MsgId::new(self.foreign_id)).await {
-                Ok(exists) => {
-                    if !exists {
-                        return Status::Finished(Err(format_err!(
-                            "Not sending Message {} as it was deleted",
-                            self.foreign_id
-                        )));
-                    }
-                }
-                Err(err) => {
-                    warn!(context, "failed to check message existence: {:?}", err);
-                    return Status::RetryLater;
-                }
-            }
+        if 0 != self.foreign_id && !message::exists(context, MsgId::new(self.foreign_id)).await {
+            return Status::Finished(Err(format_err!(
+                "Not sending Message {} as it was deleted",
+                self.foreign_id
+            )));
         };
 
         let foreign_id = self.foreign_id;
@@ -415,7 +399,7 @@ impl Job {
             async move {
                 // smtp success, update db ASAP, then delete smtp file
                 if 0 != foreign_id {
-                    set_delivered(context, MsgId::new(foreign_id)).await?;
+                    set_delivered(context, MsgId::new(foreign_id)).await;
                 }
                 // now also delete the generated file
                 dc_delete_file(context, filename).await;
@@ -469,8 +453,7 @@ impl Job {
     }
 
     async fn send_mdn(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
-        let mdns_enabled = job_try!(context.get_config_bool(Config::MdnsEnabled).await);
-        if !mdns_enabled {
+        if !context.get_config_bool(Config::MdnsEnabled).await {
             // User has disabled MDNs after job scheduling but before
             // execution.
             return Status::Finished(Err(format_err!("MDNs are disabled")));
@@ -556,13 +539,7 @@ impl Job {
                 );
                 return Status::Finished(Ok(()));
             }
-            Ok(Some(config)) => match context.get_config(config).await {
-                Ok(folder) => folder,
-                Err(err) => {
-                    warn!(context, "failed to load config: {}", err);
-                    return Status::RetryLater;
-                }
-            },
+            Ok(Some(config)) => context.get_config(config).await,
         };
 
         if let Some(dest_folder) = dest_folder {
@@ -680,7 +657,7 @@ impl Job {
     /// Then, Fetch the last messages DC_FETCH_EXISTING_MSGS_COUNT emails from the server
     /// and show them in the chat list.
     async fn fetch_existing_msgs(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if job_try!(context.get_config_bool(Config::Bot).await) {
+        if context.get_config_bool(Config::Bot).await {
             return Status::Finished(Ok(())); // Bots don't want those messages
         }
         if let Err(err) = imap.connect_configured(context).await {
@@ -692,13 +669,13 @@ impl Job {
         add_all_recipients_as_contacts(context, imap, Config::ConfiguredMvboxFolder).await;
         add_all_recipients_as_contacts(context, imap, Config::ConfiguredInboxFolder).await;
 
-        if job_try!(context.get_config_bool(Config::FetchExistingMsgs).await) {
+        if context.get_config_bool(Config::FetchExistingMsgs).await {
             for config in &[
                 Config::ConfiguredMvboxFolder,
                 Config::ConfiguredInboxFolder,
                 Config::ConfiguredSentboxFolder,
             ] {
-                if let Some(folder) = job_try!(context.get_config(*config).await) {
+                if let Some(folder) = context.get_config(*config).await {
                     if let Err(e) = imap.fetch_new_messages(context, folder, true).await {
                         // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
                         warn!(context, "Could not fetch messages, retrying: {:#}", e);
@@ -711,7 +688,7 @@ impl Job {
         // Make sure that if there now is a chat with a contact (created by an outgoing
         // message), then group contact requests from this contact should also be unblocked.
         // See https://github.com/deltachat/deltachat-core-rust/issues/2097.
-        for item in job_try!(chat::get_chat_msgs(context, DC_CHAT_ID_DEADDROP, 0, None).await) {
+        for item in chat::get_chat_msgs(context, ChatId::new(DC_CHAT_ID_DEADDROP), 0, None).await {
             if let ChatItem::Message { msg_id } = item {
                 let msg = match Message::load_from_db(context, msg_id).await {
                     Err(e) => {
@@ -759,21 +736,26 @@ impl Job {
             return Status::RetryLater;
         }
 
-        let sentbox_folder = job_try!(context.get_config(Config::ConfiguredSentboxFolder).await);
-        if let Some(sentbox_folder) = sentbox_folder {
-            job_try!(imap.resync_folder_uids(context, sentbox_folder).await);
+        if let Some(sentbox_folder) = &context.get_config(Config::ConfiguredSentboxFolder).await {
+            job_try!(
+                imap.resync_folder_uids(context, sentbox_folder.to_string())
+                    .await
+            );
         }
 
-        let inbox_folder = job_try!(context.get_config(Config::ConfiguredInboxFolder).await);
-        if let Some(inbox_folder) = inbox_folder {
-            job_try!(imap.resync_folder_uids(context, inbox_folder).await);
+        if let Some(inbox_folder) = &context.get_config(Config::ConfiguredInboxFolder).await {
+            job_try!(
+                imap.resync_folder_uids(context, inbox_folder.to_string())
+                    .await
+            );
         }
 
-        let mvbox_folder = job_try!(context.get_config(Config::ConfiguredMvboxFolder).await);
-        if let Some(mvbox_folder) = mvbox_folder {
-            job_try!(imap.resync_folder_uids(context, mvbox_folder).await);
+        if let Some(mvbox_folder) = &context.get_config(Config::ConfiguredMvboxFolder).await {
+            job_try!(
+                imap.resync_folder_uids(context, mvbox_folder.to_string())
+                    .await
+            );
         }
-
         Status::Finished(Ok(()))
     }
 
@@ -821,13 +803,11 @@ impl Job {
                 // the name sent in the From field by the user.
                 if msg.param.get_bool(Param::WantsMdn).unwrap_or_default()
                     && !msg.is_system_message()
+                    && context.get_config_bool(Config::MdnsEnabled).await
                 {
-                    let mdns_enabled = job_try!(context.get_config_bool(Config::MdnsEnabled).await);
-                    if mdns_enabled {
-                        if let Err(err) = send_mdn(context, &msg).await {
-                            warn!(context, "could not send out mdn for {}: {}", msg.id, err);
-                            return Status::Finished(Err(err));
-                        }
+                    if let Err(err) = send_mdn(context, &msg).await {
+                        warn!(context, "could not send out mdn for {}: {}", msg.id, err);
+                        return Status::Finished(Err(err));
                     }
                 }
                 Status::Finished(Ok(()))
@@ -847,13 +827,15 @@ pub async fn kill_action(context: &Context, action: Action) -> bool {
 
 /// Remove jobs with specified IDs.
 async fn kill_ids(context: &Context, job_ids: &[u32]) -> sql::Result<()> {
-    let q = format!(
-        "DELETE FROM jobs WHERE id IN({})",
-        job_ids.iter().map(|_| "?").join(",")
-    );
     context
         .sql
-        .execute(q, rusqlite::params_from_iter(job_ids))
+        .execute(
+            format!(
+                "DELETE FROM jobs WHERE id IN({})",
+                job_ids.iter().map(|_| "?").join(",")
+            ),
+            job_ids.iter().map(|i| i as &dyn crate::ToSql).collect(),
+        )
         .await?;
     Ok(())
 }
@@ -861,27 +843,27 @@ async fn kill_ids(context: &Context, job_ids: &[u32]) -> sql::Result<()> {
 pub async fn action_exists(context: &Context, action: Action) -> bool {
     context
         .sql
-        .exists(
-            "SELECT COUNT(*) FROM jobs WHERE action=?;",
-            paramsv![action],
-        )
+        .exists("SELECT id FROM jobs WHERE action=?;", paramsv![action])
         .await
         .unwrap_or_default()
 }
 
-async fn set_delivered(context: &Context, msg_id: MsgId) -> Result<()> {
+async fn set_delivered(context: &Context, msg_id: MsgId) {
     message::update_msg_state(context, msg_id, MessageState::OutDelivered).await;
     let chat_id: ChatId = context
         .sql
-        .query_get_value("SELECT chat_id FROM msgs WHERE id=?", paramsv![msg_id])
-        .await?
+        .query_get_value(
+            context,
+            "SELECT chat_id FROM msgs WHERE id=?",
+            paramsv![msg_id],
+        )
+        .await
         .unwrap_or_default();
     context.emit_event(EventType::MsgDelivered { chat_id, msg_id });
-    Ok(())
 }
 
 async fn add_all_recipients_as_contacts(context: &Context, imap: &mut Imap, folder: Config) {
-    let mailbox = if let Ok(Some(m)) = context.get_config(folder).await {
+    let mailbox = if let Some(m) = context.get_config(folder).await {
         m
     } else {
         return;
@@ -951,14 +933,14 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
 
     let from = context
         .get_config(Config::ConfiguredAddr)
-        .await?
+        .await
         .unwrap_or_default();
     let lowercase_from = from.to_lowercase();
 
     // Send BCC to self if it is enabled and we are not going to
     // delete it immediately.
-    if context.get_config_bool(Config::BccSelf).await?
-        && context.get_config_delete_server_after().await? != Some(0)
+    if context.get_config_bool(Config::BccSelf).await
+        && context.get_config_delete_server_after().await != Some(0)
         && !recipients
             .iter()
             .any(|x| x.to_lowercase() == lowercase_from)
@@ -972,7 +954,7 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
             context,
             "message {} has no recipient, skipping smtp-send", msg_id
         );
-        set_delivered(context, msg_id).await?;
+        set_delivered(context, msg_id).await;
         return Ok(None);
     }
 
@@ -1040,7 +1022,7 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
     msg.subject = rendered_msg.subject.clone();
     msg.update_subject(context).await;
 
-    let job = create(Action::SendMsgToSmtp, msg_id.to_u32(), param, 0)?;
+    let job = create(Action::SendMsgToSmtp, msg_id.to_u32() as i32, param, 0)?;
 
     Ok(Some(job))
 }
@@ -1050,7 +1032,7 @@ pub(crate) enum Connection<'a> {
     Smtp(&'a mut Smtp),
 }
 
-pub(crate) async fn load_imap_deletion_job(context: &Context) -> sql::Result<Option<Job>> {
+async fn load_imap_deletion_job(context: &Context) -> sql::Result<Option<Job>> {
     let res = if let Some(msg_id) = load_imap_deletion_msgid(context).await? {
         Some(Job::new(
             Action::DeleteMsgOnImap,
@@ -1137,7 +1119,7 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
             if let Err(err) = res {
                 warn!(
                     context,
-                    "{} removes job {} as it failed with error {:#}", &connection, job, err
+                    "{} removes job {} as it failed with error {:?}", &connection, job, err
                 );
             } else {
                 info!(
@@ -1218,13 +1200,13 @@ pub(crate) async fn schedule_resync(context: &Context) {
 }
 
 /// Creates a job.
-pub fn create(action: Action, foreign_id: u32, param: Params, delay_seconds: i64) -> Result<Job> {
+pub fn create(action: Action, foreign_id: i32, param: Params, delay_seconds: i64) -> Result<Job> {
     ensure!(
         action != Action::Unknown,
         "Invalid action passed to job_add"
     );
 
-    Ok(Job::new(action, foreign_id, param, delay_seconds))
+    Ok(Job::new(action, foreign_id as u32, param, delay_seconds))
 }
 
 /// Adds a job to the database, scheduling it.
@@ -1263,13 +1245,7 @@ pub async fn add(context: &Context, job: Job) {
 }
 
 async fn load_housekeeping_job(context: &Context) -> Option<Job> {
-    let last_time = match context.get_config_i64(Config::LastHousekeeping).await {
-        Ok(last_time) => last_time,
-        Err(err) => {
-            warn!(context, "failed to load housekeeping config: {:?}", err);
-            return None;
-        }
-    };
+    let last_time = context.get_config_i64(Config::LastHousekeeping).await;
 
     let next_time = last_time + (60 * 60 * 24);
     if next_time <= time() {
@@ -1377,13 +1353,11 @@ LIMIT 1;
                     .await
                 {
                     Ok(id) => {
-                        if let Err(err) = context
+                        context
                             .sql
                             .execute("DELETE FROM jobs WHERE id=?;", paramsv![id])
                             .await
-                        {
-                            warn!(context, "failed to delete job {}: {:?}", id, err);
-                        }
+                            .ok();
                     }
                     Err(err) => {
                         error!(context, "failed to retrieve invalid job from DB: {}", err);
@@ -1425,7 +1399,7 @@ mod tests {
 
     use crate::test_utils::TestContext;
 
-    async fn insert_job(context: &Context, foreign_id: i64, valid: bool) {
+    async fn insert_job(context: &Context, foreign_id: i64) {
         let now = time();
         context
             .sql
@@ -1436,7 +1410,7 @@ mod tests {
                 paramsv![
                     now,
                     Thread::from(Action::MoveMsg),
-                    if valid { Action::MoveMsg as i32 } else { -1 },
+                    Action::MoveMsg,
                     foreign_id,
                     Params::new().to_string(),
                     now
@@ -1452,7 +1426,7 @@ mod tests {
         // fails to load from the database instead of failing to load
         // all jobs.
         let t = TestContext::new().await;
-        insert_job(&t, 1, false).await; // This can not be loaded into Job struct.
+        insert_job(&t, -1).await; // This can not be loaded into Job struct.
         let jobs = load_next(
             &t,
             Thread::from(Action::MoveMsg),
@@ -1460,9 +1434,9 @@ mod tests {
         )
         .await;
         // The housekeeping job should be loaded as we didn't run housekeeping in the last day:
-        assert_eq!(jobs.unwrap().action, Action::Housekeeping);
+        assert!(jobs.unwrap().action == Action::Housekeeping);
 
-        insert_job(&t, 1, true).await;
+        insert_job(&t, 1).await;
         let jobs = load_next(
             &t,
             Thread::from(Action::MoveMsg),
@@ -1476,7 +1450,7 @@ mod tests {
     async fn test_load_next_job_one() {
         let t = TestContext::new().await;
 
-        insert_job(&t, 1, true).await;
+        insert_job(&t, 1).await;
 
         let jobs = load_next(
             &t,

src/key.rs

@@ -41,8 +41,6 @@ pub enum Error {
     InvalidConfiguredAddr(#[from] InvalidEmailError),
     #[error("no data provided")]
     Empty,
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -120,7 +118,7 @@ impl DcKey for SignedPublicKey {
     async fn load_self(context: &Context) -> Result<Self::KeyType> {
         match context
             .sql
-            .query_row_optional(
+            .query_row(
                 r#"
             SELECT public_key
               FROM keypairs
@@ -128,18 +126,16 @@ impl DcKey for SignedPublicKey {
                AND is_default=1;
             "#,
                 paramsv![],
-                |row| {
-                    let bytes: Vec<u8> = row.get(0)?;
-                    Ok(bytes)
-                },
+                |row| row.get::<_, Vec<u8>>(0),
             )
-            .await?
+            .await
         {
-            Some(bytes) => Self::from_slice(&bytes),
-            None => {
+            Ok(bytes) => Self::from_slice(&bytes),
+            Err(sql::Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => {
                 let keypair = generate_keypair(context).await?;
                 Ok(keypair.public)
             }
+            Err(err) => Err(err.into()),
         }
     }
 
@@ -167,7 +163,7 @@ impl DcKey for SignedSecretKey {
     async fn load_self(context: &Context) -> Result<Self::KeyType> {
         match context
             .sql
-            .query_row_optional(
+            .query_row(
                 r#"
             SELECT private_key
               FROM keypairs
@@ -175,18 +171,16 @@ impl DcKey for SignedSecretKey {
                AND is_default=1;
             "#,
                 paramsv![],
-                |row| {
-                    let bytes: Vec<u8> = row.get(0)?;
-                    Ok(bytes)
-                },
+                |row| row.get::<_, Vec<u8>>(0),
             )
-            .await?
+            .await
         {
-            Some(bytes) => Self::from_slice(&bytes),
-            None => {
+            Ok(bytes) => Self::from_slice(&bytes),
+            Err(sql::Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => {
                 let keypair = generate_keypair(context).await?;
                 Ok(keypair.secret)
             }
+            Err(err) => Err(err.into()),
         }
     }
 
@@ -227,7 +221,7 @@ impl DcSecretKey for SignedSecretKey {
 async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     let addr = context
         .get_config(Config::ConfiguredAddr)
-        .await?
+        .await
         .ok_or(Error::NoConfiguredAddr)?;
     let addr = EmailAddress::new(&addr)?;
     let _guard = context.generating_key_mutex.lock().await;
@@ -235,7 +229,7 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     // Check if the key appeared while we were waiting on the lock.
     match context
         .sql
-        .query_row_optional(
+        .query_row(
             r#"
         SELECT public_key, private_key
           FROM keypairs
@@ -243,22 +237,18 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
            AND is_default=1;
         "#,
             paramsv![addr],
-            |row| {
-                let pub_bytes: Vec<u8> = row.get(0)?;
-                let sec_bytes: Vec<u8> = row.get(1)?;
-                Ok((pub_bytes, sec_bytes))
-            },
+            |row| Ok((row.get::<_, Vec<u8>>(0)?, row.get::<_, Vec<u8>>(1)?)),
         )
-        .await?
+        .await
     {
-        Some((pub_bytes, sec_bytes)) => Ok(KeyPair {
+        Ok((pub_bytes, sec_bytes)) => Ok(KeyPair {
             addr,
             public: SignedPublicKey::from_slice(&pub_bytes)?,
             secret: SignedSecretKey::from_slice(&sec_bytes)?,
         }),
-        None => {
+        Err(sql::Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => {
             let start = std::time::SystemTime::now();
-            let keytype = KeyGenType::from_i32(context.get_config_int(Config::KeyGenType).await?)
+            let keytype = KeyGenType::from_i32(context.get_config_int(Config::KeyGenType).await)
                 .unwrap_or_default();
             info!(context, "Generating keypair with type {}", keytype);
             let keypair =
@@ -272,6 +262,7 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
             );
             Ok(keypair)
         }
+        Err(err) => Err(err.into()),
     }
 }
 
@@ -349,12 +340,13 @@ pub async fn store_self_keypair(
     let addr = keypair.addr.to_string();
     let t = time();
 
+    let params = paramsv![addr, is_default, public_key, secret_key, t];
     context
         .sql
         .execute(
             "INSERT INTO keypairs (addr, is_default, public_key, private_key, created)
                 VALUES (?,?,?,?,?);",
-            paramsv![addr, is_default, public_key, secret_key, t],
+            params,
         )
         .await
         .map_err(|err| SaveKeyError::new("failed to insert keypair", err))?;
@@ -628,7 +620,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
 
         let nrows = || async {
             ctx.sql
-                .count("SELECT COUNT(*) FROM keypairs;", paramsv![])
+                .query_get_value::<u32>(&ctx, "SELECT COUNT(*) FROM keypairs;", paramsv![])
                 .await
                 .unwrap()
         };

src/location.rs

@@ -1,5 +1,4 @@
 //! Location handling
-use std::convert::TryFrom;
 
 use anyhow::{ensure, Error};
 use bitflags::bitflags;
@@ -260,7 +259,7 @@ pub async fn is_sending_locations_to_chat(context: &Context, chat_id: Option<Cha
         Some(chat_id) => context
             .sql
             .exists(
-                "SELECT COUNT(id) FROM chats  WHERE id=?  AND locations_send_until>?;",
+                "SELECT id  FROM chats  WHERE id=?  AND locations_send_until>?;",
                 paramsv![chat_id, time()],
             )
             .await
@@ -268,7 +267,7 @@ pub async fn is_sending_locations_to_chat(context: &Context, chat_id: Option<Cha
         None => context
             .sql
             .exists(
-                "SELECT COUNT(id) FROM chats  WHERE locations_send_until>?;",
+                "SELECT id  FROM chats  WHERE locations_send_until>?;",
                 paramsv![time()],
             )
             .await
@@ -325,11 +324,10 @@ pub async fn get_range(
     contact_id: Option<u32>,
     timestamp_from: i64,
     mut timestamp_to: i64,
-) -> Result<Vec<Location>, Error> {
+) -> Vec<Location> {
     if timestamp_to == 0 {
         timestamp_to = time() + 10;
     }
-
     let (disable_chat_id, chat_id) = match chat_id {
         Some(chat_id) => (0, chat_id),
         None => (1, ChatId::new(0)), // this ChatId is unused
@@ -338,7 +336,7 @@ pub async fn get_range(
         Some(contact_id) => (0, contact_id),
         None => (1, 0), // this contact_id is unused
     };
-    let list = context
+    context
         .sql
         .query_map(
             "SELECT l.id, l.latitude, l.longitude, l.accuracy, l.timestamp, l.independent, \
@@ -386,8 +384,8 @@ pub async fn get_range(
                 Ok(ret)
             },
         )
-        .await?;
-    Ok(list)
+        .await
+        .unwrap_or_default()
 }
 
 fn is_marker(txt: &str) -> bool {
@@ -414,7 +412,7 @@ pub async fn get_kml(context: &Context, chat_id: ChatId) -> Result<(String, u32)
 
     let self_addr = context
         .get_config(Config::ConfiguredAddr)
-        .await?
+        .await
         .unwrap_or_default();
 
     let (locations_send_begin, locations_send_until, locations_last_sent) = context.sql.query_row(
@@ -433,54 +431,44 @@ pub async fn get_kml(context: &Context, chat_id: ChatId) -> Result<(String, u32)
     let mut ret = String::new();
     if locations_send_begin != 0 && now <= locations_send_until {
         ret += &format!(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-            <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"{}\">\n",
             self_addr,
         );
 
-        context
-            .sql
-            .query_map(
-                "SELECT id, latitude, longitude, accuracy, timestamp \
+        context.sql.query_map(
+            "SELECT id, latitude, longitude, accuracy, timestamp \
              FROM locations  WHERE from_id=? \
              AND timestamp>=? \
-             AND (timestamp>=? OR \
-                  timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
+             AND (timestamp>=? OR timestamp=(SELECT MAX(timestamp) FROM locations WHERE from_id=?)) \
              AND independent=0 \
              GROUP BY timestamp \
              ORDER BY timestamp;",
-                paramsv![
-                    DC_CONTACT_ID_SELF,
-                    locations_send_begin,
-                    locations_last_sent,
-                    DC_CONTACT_ID_SELF
-                ],
-                |row| {
-                    let location_id: i32 = row.get(0)?;
-                    let latitude: f64 = row.get(1)?;
-                    let longitude: f64 = row.get(2)?;
-                    let accuracy: f64 = row.get(3)?;
-                    let timestamp = get_kml_timestamp(row.get(4)?);
+            paramsv![DC_CONTACT_ID_SELF, locations_send_begin, locations_last_sent, DC_CONTACT_ID_SELF],
+            |row| {
+                let location_id: i32 = row.get(0)?;
+                let latitude: f64 = row.get(1)?;
+                let longitude: f64 = row.get(2)?;
+                let accuracy: f64 = row.get(3)?;
+                let timestamp = get_kml_timestamp(row.get(4)?);
 
-                    Ok((location_id, latitude, longitude, accuracy, timestamp))
-                },
-                |rows| {
-                    for row in rows {
-                        let (location_id, latitude, longitude, accuracy, timestamp) = row?;
-                        ret += &format!(
-                            "<Placemark>\
-                <Timestamp><when>{}</when></Timestamp>\
-                <Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point>\
-                </Placemark>\n",
-                            timestamp, accuracy, longitude, latitude
-                        );
-                        location_count += 1;
-                        last_added_location_id = location_id as u32;
-                    }
-                    Ok(())
-                },
-            )
-            .await?;
+                Ok((location_id, latitude, longitude, accuracy, timestamp))
+            },
+            |rows| {
+                for row in rows {
+                    let (location_id, latitude, longitude, accuracy, timestamp) = row?;
+                    ret += &format!(
+                        "<Placemark><Timestamp><when>{}</when></Timestamp><Point><coordinates accuracy=\"{}\">{},{}</coordinates></Point></Placemark>\n",
+                        timestamp,
+                        accuracy,
+                        longitude,
+                        latitude
+                    );
+                    location_count += 1;
+                    last_added_location_id = location_id as u32;
+                }
+                Ok(())
+            }
+        ).await?;
         ret += "</Document>\n</kml>";
     }
 
@@ -556,10 +544,6 @@ pub async fn save(
     let mut newest_timestamp = 0;
     let mut newest_location_id = 0;
 
-    let stmt_insert = "INSERT INTO locations\
-             (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
-             VALUES (?,?,?,?,?,?,?);";
-
     for location in locations {
         let &Location {
             timestamp,
@@ -570,10 +554,14 @@ pub async fn save(
         } = location;
         let (loc_id, ts) = context
             .sql
-            .with_conn(move |conn| {
+            .with_conn(move |mut conn| {
                 let mut stmt_test = conn
                     .prepare_cached("SELECT id FROM locations WHERE timestamp=? AND from_id=?")?;
-                let mut stmt_insert = conn.prepare_cached(stmt_insert)?;
+                let mut stmt_insert = conn.prepare_cached(
+                    "INSERT INTO locations\
+             (timestamp, from_id, chat_id, latitude, longitude, accuracy, independent) \
+             VALUES (?,?,?,?,?,?,?);",
+                )?;
 
                 let exists = stmt_test.exists(paramsv![timestamp, contact_id as i32])?;
 
@@ -593,7 +581,14 @@ pub async fn save(
                         drop(stmt_test);
                         drop(stmt_insert);
                         newest_timestamp = timestamp;
-                        newest_location_id = conn.last_insert_rowid();
+                        newest_location_id = crate::sql::get_rowid2(
+                            &mut conn,
+                            "locations",
+                            "timestamp",
+                            timestamp,
+                            "from_id",
+                            contact_id as i32,
+                        )?;
                     }
                 }
                 Ok((newest_location_id, newest_timestamp))
@@ -603,7 +598,7 @@ pub async fn save(
         newest_location_id = loc_id;
     }
 
-    Ok(u32::try_from(newest_location_id)?)
+    Ok(newest_location_id)
 }
 
 pub(crate) async fn job_maybe_send_locations(context: &Context, _job: &Job) -> job::Status {
@@ -650,11 +645,11 @@ pub(crate) async fn job_maybe_send_locations(context: &Context, _job: &Job) -> j
 
                 let mut stmt_locations = conn.prepare_cached(
                     "SELECT id \
-         FROM locations \
-         WHERE from_id=? \
-         AND timestamp>=? \
-         AND timestamp>? \
-         AND independent=0 \
+                 FROM locations \
+                 WHERE from_id=? \
+                 AND timestamp>=? \
+                 AND timestamp>? \
+                 AND independent=0 \
                  ORDER BY timestamp;",
                 )?;
 
@@ -690,7 +685,7 @@ pub(crate) async fn job_maybe_send_locations(context: &Context, _job: &Job) -> j
                 Ok(msgs)
             })
             .await
-            .unwrap_or_default(); // TODO: better error handling
+            .unwrap_or_default();
 
         for (chat_id, mut msg) in msgs.into_iter() {
             // TODO: better error handling
@@ -733,17 +728,10 @@ pub(crate) async fn job_maybe_send_locations_ended(
         // do not un-schedule pending DC_MAYBE_SEND_LOC_ENDED jobs
         if !(send_begin == 0 && send_until == 0) {
             // not streaming, device-message already sent
-            job_try!(
-                context
-                    .sql
-                    .execute(
-                        "UPDATE chats \
-                             SET locations_send_begin=0, locations_send_until=0 \
- WHERE id=?",
-                        paramsv![chat_id],
-                    )
-                    .await
-            );
+            job_try!(context.sql.execute(
+                "UPDATE chats    SET locations_send_begin=0, locations_send_until=0  WHERE id=?",
+                paramsv![chat_id],
+            ).await);
 
             let stock_str = stock_str::msg_location_disabled(context).await;
             chat::add_info_msg(context, chat_id, stock_str).await;

src/login_param.rs

@@ -7,7 +7,7 @@ use crate::provider::{get_provider_by_id, Provider};
 use crate::{context::Context, provider::Socket};
 
 #[derive(Copy, Clone, Debug, Display, FromPrimitive, PartialEq, Eq)]
-#[repr(u32)]
+#[repr(i32)]
 #[strum(serialize_all = "snake_case")]
 pub enum CertificateChecks {
     /// Same as AcceptInvalidCertificates unless overridden by
@@ -30,7 +30,7 @@ impl Default for CertificateChecks {
 }
 
 /// Login parameters for a single server, either IMAP or SMTP
-#[derive(Default, Debug, Clone, PartialEq)]
+#[derive(Default, Debug, Clone)]
 pub struct ServerLoginParam {
     pub server: String,
     pub user: String,
@@ -43,7 +43,7 @@ pub struct ServerLoginParam {
     pub certificate_checks: CertificateChecks,
 }
 
-#[derive(Default, Debug, Clone, PartialEq)]
+#[derive(Default, Debug, Clone)]
 pub struct LoginParam {
     pub addr: String,
     pub imap: ServerLoginParam,
@@ -54,85 +54,91 @@ pub struct LoginParam {
 
 impl LoginParam {
     /// Read the login parameters from the database.
-    pub async fn from_database(
-        context: &Context,
-        prefix: impl AsRef<str>,
-    ) -> crate::sql::Result<Self> {
+    pub async fn from_database(context: &Context, prefix: impl AsRef<str>) -> Self {
         let prefix = prefix.as_ref();
         let sql = &context.sql;
 
         let key = format!("{}addr", prefix);
         let addr = sql
-            .get_raw_config(key)
-            .await?
+            .get_raw_config(context, key)
+            .await
             .unwrap_or_default()
             .trim()
             .to_string();
 
         let key = format!("{}mail_server", prefix);
-        let mail_server = sql.get_raw_config(key).await?.unwrap_or_default();
+        let mail_server = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}mail_port", prefix);
-        let mail_port = sql.get_raw_config_int(key).await?.unwrap_or_default();
+        let mail_port = sql
+            .get_raw_config_int(context, key)
+            .await
+            .unwrap_or_default();
 
         let key = format!("{}mail_user", prefix);
-        let mail_user = sql.get_raw_config(key).await?.unwrap_or_default();
+        let mail_user = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}mail_pw", prefix);
-        let mail_pw = sql.get_raw_config(key).await?.unwrap_or_default();
+        let mail_pw = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}mail_security", prefix);
         let mail_security = sql
-            .get_raw_config_int(key)
-            .await?
+            .get_raw_config_int(context, key)
+            .await
             .and_then(num_traits::FromPrimitive::from_i32)
             .unwrap_or_default();
 
         let key = format!("{}imap_certificate_checks", prefix);
         let imap_certificate_checks =
-            if let Some(certificate_checks) = sql.get_raw_config_int(key).await? {
+            if let Some(certificate_checks) = sql.get_raw_config_int(context, key).await {
                 num_traits::FromPrimitive::from_i32(certificate_checks).unwrap()
             } else {
                 Default::default()
             };
 
         let key = format!("{}send_server", prefix);
-        let send_server = sql.get_raw_config(key).await?.unwrap_or_default();
+        let send_server = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}send_port", prefix);
-        let send_port = sql.get_raw_config_int(key).await?.unwrap_or_default();
+        let send_port = sql
+            .get_raw_config_int(context, key)
+            .await
+            .unwrap_or_default();
 
         let key = format!("{}send_user", prefix);
-        let send_user = sql.get_raw_config(key).await?.unwrap_or_default();
+        let send_user = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}send_pw", prefix);
-        let send_pw = sql.get_raw_config(key).await?.unwrap_or_default();
+        let send_pw = sql.get_raw_config(context, key).await.unwrap_or_default();
 
         let key = format!("{}send_security", prefix);
         let send_security = sql
-            .get_raw_config_int(key)
-            .await?
+            .get_raw_config_int(context, key)
+            .await
             .and_then(num_traits::FromPrimitive::from_i32)
             .unwrap_or_default();
 
         let key = format!("{}smtp_certificate_checks", prefix);
         let smtp_certificate_checks =
-            if let Some(certificate_checks) = sql.get_raw_config_int(key).await? {
+            if let Some(certificate_checks) = sql.get_raw_config_int(context, key).await {
                 num_traits::FromPrimitive::from_i32(certificate_checks).unwrap()
             } else {
                 Default::default()
             };
 
         let key = format!("{}server_flags", prefix);
-        let server_flags = sql.get_raw_config_int(key).await?.unwrap_or_default();
+        let server_flags = sql
+            .get_raw_config_int(context, key)
+            .await
+            .unwrap_or_default();
 
         let key = format!("{}provider", prefix);
         let provider = sql
-            .get_raw_config(key)
-            .await?
+            .get_raw_config(context, key)
+            .await
             .and_then(|provider_id| get_provider_by_id(&provider_id));
 
-        Ok(LoginParam {
+        LoginParam {
             addr,
             imap: ServerLoginParam {
                 server: mail_server,
@@ -152,7 +158,7 @@ impl LoginParam {
             },
             provider,
             server_flags,
-        })
+        }
     }
 
     /// Save this loginparam to the database.
@@ -165,54 +171,63 @@ impl LoginParam {
         let sql = &context.sql;
 
         let key = format!("{}addr", prefix);
-        sql.set_raw_config(key, Some(&self.addr)).await?;
+        sql.set_raw_config(context, key, Some(&self.addr)).await?;
 
         let key = format!("{}mail_server", prefix);
-        sql.set_raw_config(key, Some(&self.imap.server)).await?;
+        sql.set_raw_config(context, key, Some(&self.imap.server))
+            .await?;
 
         let key = format!("{}mail_port", prefix);
-        sql.set_raw_config_int(key, self.imap.port as i32).await?;
+        sql.set_raw_config_int(context, key, self.imap.port as i32)
+            .await?;
 
         let key = format!("{}mail_user", prefix);
-        sql.set_raw_config(key, Some(&self.imap.user)).await?;
+        sql.set_raw_config(context, key, Some(&self.imap.user))
+            .await?;
 
         let key = format!("{}mail_pw", prefix);
-        sql.set_raw_config(key, Some(&self.imap.password)).await?;
+        sql.set_raw_config(context, key, Some(&self.imap.password))
+            .await?;
 
         let key = format!("{}mail_security", prefix);
-        sql.set_raw_config_int(key, self.imap.security as i32)
+        sql.set_raw_config_int(context, key, self.imap.security as i32)
             .await?;
 
         let key = format!("{}imap_certificate_checks", prefix);
-        sql.set_raw_config_int(key, self.imap.certificate_checks as i32)
+        sql.set_raw_config_int(context, key, self.imap.certificate_checks as i32)
             .await?;
 
         let key = format!("{}send_server", prefix);
-        sql.set_raw_config(key, Some(&self.smtp.server)).await?;
+        sql.set_raw_config(context, key, Some(&self.smtp.server))
+            .await?;
 
         let key = format!("{}send_port", prefix);
-        sql.set_raw_config_int(key, self.smtp.port as i32).await?;
+        sql.set_raw_config_int(context, key, self.smtp.port as i32)
+            .await?;
 
         let key = format!("{}send_user", prefix);
-        sql.set_raw_config(key, Some(&self.smtp.user)).await?;
+        sql.set_raw_config(context, key, Some(&self.smtp.user))
+            .await?;
 
         let key = format!("{}send_pw", prefix);
-        sql.set_raw_config(key, Some(&self.smtp.password)).await?;
+        sql.set_raw_config(context, key, Some(&self.smtp.password))
+            .await?;
 
         let key = format!("{}send_security", prefix);
-        sql.set_raw_config_int(key, self.smtp.security as i32)
+        sql.set_raw_config_int(context, key, self.smtp.security as i32)
             .await?;
 
         let key = format!("{}smtp_certificate_checks", prefix);
-        sql.set_raw_config_int(key, self.smtp.certificate_checks as i32)
+        sql.set_raw_config_int(context, key, self.smtp.certificate_checks as i32)
             .await?;
 
         let key = format!("{}server_flags", prefix);
-        sql.set_raw_config_int(key, self.server_flags).await?;
+        sql.set_raw_config_int(context, key, self.server_flags)
+            .await?;
 
         if let Some(provider) = self.provider {
             let key = format!("{}provider", prefix);
-            sql.set_raw_config(key, Some(provider.id)).await?;
+            sql.set_raw_config(context, key, Some(provider.id)).await?;
         }
 
         Ok(())
@@ -304,8 +319,6 @@ pub fn dc_build_tls(strict_tls: bool) -> async_native_tls::TlsConnector {
 mod tests {
     use super::*;
 
-    use crate::test_utils::TestContext;
-
     #[test]
     fn test_certificate_checks_display() {
         use std::string::ToString;
@@ -315,37 +328,4 @@ mod tests {
             CertificateChecks::AcceptInvalidCertificates.to_string()
         );
     }
-
-    #[async_std::test]
-    async fn test_save_load_login_param() -> anyhow::Result<()> {
-        let t = TestContext::new().await;
-
-        let param = LoginParam {
-            addr: "alice@example.com".to_string(),
-            imap: ServerLoginParam {
-                server: "imap.example.com".to_string(),
-                user: "alice".to_string(),
-                password: "foo".to_string(),
-                port: 123,
-                security: Socket::Starttls,
-                certificate_checks: CertificateChecks::Strict,
-            },
-            smtp: ServerLoginParam {
-                server: "smtp.example.com".to_string(),
-                user: "alice@example.com".to_string(),
-                password: "bar".to_string(),
-                port: 456,
-                security: Socket::Ssl,
-                certificate_checks: CertificateChecks::AcceptInvalidCertificates,
-            },
-            server_flags: 0,
-            provider: get_provider_by_id("example.com"),
-        };
-
-        param.save_to_database(&t, "foobar_").await?;
-        let loaded = LoginParam::from_database(&t, "foobar_").await?;
-
-        assert_eq!(param, loaded);
-        Ok(())
-    }
 }

src/lot.rs

@@ -68,7 +68,7 @@ impl Lot {
     }
 }
 
-#[repr(u32)]
+#[repr(i32)]
 #[derive(
     Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql,
 )]
@@ -87,7 +87,7 @@ pub enum LotState {
     QrFprOk = 210,
 
     /// id=contact
-    QrFprMismatch = 220,
+    QrFprMissmatch = 220,
 
     /// test1=formatted fingerprint
     QrFprWithoutAddr = 230,

src/message.rs

@@ -1,8 +1,5 @@
 //! # Messages and their identifiers
 
-use std::collections::BTreeMap;
-use std::convert::TryInto;
-
 use anyhow::{ensure, Error};
 use async_std::path::{Path, PathBuf};
 use deltachat_derive::{FromSql, ToSql};
@@ -31,6 +28,7 @@ use crate::mimeparser::{FailureReport, SystemMessage};
 use crate::param::{Param, Params};
 use crate::pgp::split_armored_data;
 use crate::stock_str;
+use std::collections::BTreeMap;
 
 // In practice, the user additionally cuts the string themselves
 // pixel-accurate.
@@ -81,7 +79,7 @@ impl MsgId {
     pub async fn get_state(self, context: &Context) -> crate::sql::Result<MessageState> {
         let result = context
             .sql
-            .query_get_value("SELECT state FROM msgs WHERE id=?", paramsv![self])
+            .query_get_value_result("SELECT state FROM msgs WHERE id=?", paramsv![self])
             .await?
             .unwrap_or_default();
         Ok(result)
@@ -96,16 +94,14 @@ impl MsgId {
         folder: &str,
     ) -> Result<Option<Config>, Error> {
         use Config::*;
-        if context.is_mvbox(folder).await? {
+        if context.is_mvbox(folder).await {
             return Ok(None);
         }
 
         let msg = Message::load_from_db(context, self).await?;
 
-        if context.is_spam_folder(folder).await? {
-            let msg_unblocked = msg.chat_id != DC_CHAT_ID_TRASH && msg.chat_blocked == Blocked::Not;
-
-            return if msg_unblocked {
+        if context.is_spam_folder(folder).await {
+            return if msg.chat_blocked == Blocked::Not {
                 if self.needs_move_to_mvbox(context, &msg).await? {
                     Ok(Some(ConfiguredMvboxFolder))
                 } else {
@@ -123,9 +119,9 @@ impl MsgId {
                 && msg.is_dc_message == MessengerMessage::Yes
                 && !msg.is_setupmessage()
                 && msg.to_id != DC_CONTACT_ID_SELF // Leave self-chat-messages in the inbox, not sure about this
-                && context.is_inbox(folder).await?
-                && context.get_config_bool(SentboxMove).await?
-                && context.get_config(ConfiguredSentboxFolder).await?.is_some()
+                && context.is_inbox(folder).await
+                && context.get_config_bool(SentboxMove).await
+                && context.get_config(ConfiguredSentboxFolder).await.is_some()
         {
             Ok(Some(ConfiguredSentboxFolder))
         } else {
@@ -134,7 +130,7 @@ impl MsgId {
     }
 
     async fn needs_move_to_mvbox(self, context: &Context, msg: &Message) -> Result<bool, Error> {
-        if !context.get_config_bool(Config::MvboxMove).await? {
+        if !context.get_config_bool(Config::MvboxMove).await {
             return Ok(false);
         }
 
@@ -157,22 +153,13 @@ impl MsgId {
     /// 1. not download the same message again
     /// 2. be able to delete the message on the server if we want to
     pub async fn trash(self, context: &Context) -> crate::sql::Result<()> {
-        let chat_id = DC_CHAT_ID_TRASH;
+        let chat_id = ChatId::new(DC_CHAT_ID_TRASH);
         context
             .sql
             .execute(
                 // If you change which information is removed here, also change delete_expired_messages() and
                 // which information dc_receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                r#"
-UPDATE msgs 
-SET 
-  chat_id=?, txt='', 
-  subject='', txt_raw='', 
-  mime_headers='', 
-  from_id=0, to_id=0, 
-  param='' 
-WHERE id=?;
-"#,
+                "UPDATE msgs SET chat_id=?, txt='', subject='', txt_raw='', mime_headers='', from_id=0, to_id=0, param='' WHERE id=?",
                 paramsv![chat_id, self],
             )
             .await?;
@@ -345,8 +332,7 @@ impl Message {
     pub async fn load_from_db(context: &Context, id: MsgId) -> Result<Message, Error> {
         ensure!(
             !id.is_special(),
-            "Can not load special message ID {} from DB.",
-            id
+            "Can not load special message IDs from DB."
         );
         let msg = context
             .sql
@@ -382,7 +368,7 @@ impl Message {
                 ),
                 paramsv![id],
                 |row| {
-                    let text = match row.get_ref("txt")? {
+                    let text = match row.get_raw("txt") {
                         rusqlite::types::ValueRef::Text(buf) => {
                             match String::from_utf8(buf.to_vec()) {
                                 Ok(t) => t,
@@ -534,7 +520,7 @@ impl Message {
     /// if the message is a contact request, the DC_CHAT_ID_DEADDROP is returned.
     pub fn get_chat_id(&self) -> ChatId {
         if self.chat_blocked != Blocked::Not {
-            DC_CHAT_ID_DEADDROP
+            ChatId::new(DC_CHAT_ID_DEADDROP)
         } else {
             self.chat_id
         }
@@ -624,7 +610,7 @@ impl Message {
             return ret;
         };
 
-        let contact = if self.from_id != DC_CONTACT_ID_SELF {
+        let contact = if self.from_id != DC_CONTACT_ID_SELF as u32 {
             match chat.typ {
                 Chattype::Group | Chattype::Mailinglist => {
                     Contact::get_by_id(context, self.from_id).await.ok()
@@ -644,7 +630,6 @@ impl Message {
         get_summarytext_by_raw(
             self.viewtype,
             self.text.as_ref(),
-            self.is_forwarded(),
             &self.param,
             approx_characters,
             context,
@@ -661,9 +646,11 @@ impl Message {
     // - We can't make a param `SenderDisplayname` for messages as sometimes the display name of a contact changes, and we want to show
     //   the same display name over all messages from the same sender.
     pub fn get_override_sender_name(&self) -> Option<String> {
-        self.param
-            .get(Param::OverrideSenderDisplayname)
-            .map(|name| name.to_string())
+        if let Some(name) = self.param.get(Param::OverrideSenderDisplayname) {
+            Some(name.to_string())
+        } else {
+            None
+        }
     }
 
     // Exposing this function over the ffi instead of get_override_sender_name() would mean that at least Android Java code has
@@ -691,8 +678,8 @@ impl Message {
 
     pub fn is_info(&self) -> bool {
         let cmd = self.param.get_cmd();
-        self.from_id == DC_CONTACT_ID_INFO
-            || self.to_id == DC_CONTACT_ID_INFO
+        self.from_id == DC_CONTACT_ID_INFO as u32
+            || self.to_id == DC_CONTACT_ID_INFO as u32
             || cmd != SystemMessage::Unknown && cmd != SystemMessage::AutocryptSetupMessage
     }
 
@@ -984,7 +971,7 @@ pub enum ContactRequestDecision {
     Serialize,
     Deserialize,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub enum MessageState {
     Undefined = 0,
 
@@ -1134,7 +1121,6 @@ impl Lot {
         let mut text2 = get_summarytext_by_raw(
             msg.viewtype,
             msg.text.as_ref(),
-            msg.is_forwarded(),
             &msg.param,
             SUMMARY_CHARACTERS,
             context,
@@ -1222,18 +1208,28 @@ pub async fn decide_on_contact_request(
     created_chat_id
 }
 
-pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String, Error> {
-    let msg = Message::load_from_db(context, msg_id).await?;
+pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
+    let mut ret = String::new();
+
+    let msg = Message::load_from_db(context, msg_id).await;
+    if msg.is_err() {
+        return ret;
+    }
+
+    let msg = msg.unwrap_or_default();
+
     let rawtxt: Option<String> = context
         .sql
-        .query_get_value("SELECT txt_raw FROM msgs WHERE id=?;", paramsv![msg_id])
-        .await?;
-
-    let mut ret = String::new();
+        .query_get_value(
+            context,
+            "SELECT txt_raw FROM msgs WHERE id=?;",
+            paramsv![msg_id],
+        )
+        .await;
 
     if rawtxt.is_none() {
         ret += &format!("Cannot load message {}.", msg_id);
-        return Ok(ret);
+        return ret;
     }
     let rawtxt = rawtxt.unwrap_or_default();
     let rawtxt = dc_truncate(rawtxt.trim(), DC_MAX_GET_INFO_LEN);
@@ -1249,7 +1245,7 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String, Er
     ret += &format!(" by {}", name);
     ret += "\n";
 
-    if msg.from_id != DC_CONTACT_ID_SELF {
+    if msg.from_id != DC_CONTACT_ID_SELF as u32 {
         let s = dc_timestamp_to_str(if 0 != msg.timestamp_rcvd {
             msg.timestamp_rcvd
         } else {
@@ -1272,7 +1268,7 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String, Er
 
     if msg.from_id == DC_CONTACT_ID_INFO || msg.to_id == DC_CONTACT_ID_INFO {
         // device-internal message, no further details needed
-        return Ok(ret);
+        return ret;
     }
 
     if let Ok(rows) = context
@@ -1293,7 +1289,7 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String, Er
             let fts = dc_timestamp_to_str(ts);
             ret += &format!("Read: {}", fts);
 
-            let name = Contact::load_from_db(context, contact_id.try_into()?)
+            let name = Contact::load_from_db(context, contact_id as u32)
                 .await
                 .map(|contact| contact.get_name_n_addr())
                 .unwrap_or_default();
@@ -1357,7 +1353,7 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String, Er
         }
     }
 
-    Ok(ret)
+    ret
 }
 
 pub fn guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)> {
@@ -1435,24 +1431,15 @@ pub fn guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)> {
     Some(info)
 }
 
-/// Get the raw mime-headers of the given message.
-/// Raw headers are saved for incoming messages
-/// only if `dc_set_config(context, "save_mime_headers", "1")`
-/// was called before.
-///
-/// Returns an empty string if there are no headers saved for the given message,
-/// e.g. because of save_mime_headers is not set
-/// or the message is not incoming.
-pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<String, Error> {
-    let headers = context
+pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Option<String> {
+    context
         .sql
         .query_get_value(
+            context,
             "SELECT mime_headers FROM msgs WHERE id=?;",
             paramsv![msg_id],
         )
-        .await?
-        .unwrap_or_default();
-    Ok(headers)
+        .await
 }
 
 pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) {
@@ -1547,18 +1534,21 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
             continue;
         }
 
-        if curr_blocked == Blocked::Not
-            && (curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed)
-        {
-            update_msg_state(context, id, MessageState::InSeen).await;
-            info!(context, "Seen message {}.", id);
+        if curr_blocked == Blocked::Not {
+            if curr_state == MessageState::InFresh || curr_state == MessageState::InNoticed {
+                update_msg_state(context, id, MessageState::InSeen).await;
+                info!(context, "Seen message {}.", id);
 
-            job::add(
-                context,
-                job::Job::new(Action::MarkseenMsgOnImap, id.to_u32(), Params::new(), 0),
-            )
-            .await;
-            updated_chat_ids.insert(curr_chat_id, true);
+                job::add(
+                    context,
+                    job::Job::new(Action::MarkseenMsgOnImap, id.to_u32(), Params::new(), 0),
+                )
+                .await;
+                updated_chat_ids.insert(curr_chat_id, true);
+            }
+        } else if curr_state == MessageState::InFresh {
+            update_msg_state(context, id, MessageState::InNoticed).await;
+            updated_chat_ids.insert(ChatId::new(DC_CHAT_ID_DEADDROP), true);
         }
     }
 
@@ -1584,7 +1574,6 @@ pub async fn update_msg_state(context: &Context, msg_id: MsgId, state: MessageSt
 pub async fn get_summarytext_by_raw(
     viewtype: Viewtype,
     text: Option<impl AsRef<str>>,
-    was_forwarded: bool,
     param: &Params,
     approx_characters: usize,
     context: &Context,
@@ -1635,7 +1624,7 @@ pub async fn get_summarytext_by_raw(
         return prefix;
     }
 
-    let summary_content = if let Some(text) = text {
+    let summary = if let Some(text) = text {
         if text.as_ref().is_empty() {
             prefix
         } else if prefix.is_empty() {
@@ -1648,17 +1637,6 @@ pub async fn get_summarytext_by_raw(
         prefix
     };
 
-    let summary = if was_forwarded {
-        let tmp = format!(
-            "{}: {}",
-            stock_str::forwarded(context).await,
-            summary_content
-        );
-        dc_truncate(&tmp, approx_characters).to_string()
-    } else {
-        summary_content
-    };
-
     summary.split_whitespace().join(" ")
 }
 
@@ -1669,20 +1647,24 @@ pub async fn get_summarytext_by_raw(
 
 // Context functions to work with messages
 
-pub async fn exists(context: &Context, msg_id: MsgId) -> anyhow::Result<bool> {
+pub async fn exists(context: &Context, msg_id: MsgId) -> bool {
     if msg_id.is_special() {
-        return Ok(false);
+        return false;
     }
 
     let chat_id: Option<ChatId> = context
         .sql
-        .query_get_value("SELECT chat_id FROM msgs WHERE id=?;", paramsv![msg_id])
-        .await?;
+        .query_get_value(
+            context,
+            "SELECT chat_id FROM msgs WHERE id=?;",
+            paramsv![msg_id],
+        )
+        .await;
 
     if let Some(chat_id) = chat_id {
-        Ok(!chat_id.is_trash())
+        !chat_id.is_trash()
     } else {
-        Ok(false)
+        false
     }
 }
 
@@ -1724,9 +1706,9 @@ pub async fn handle_mdn(
     from_id: u32,
     rfc724_mid: &str,
     timestamp_sent: i64,
-) -> anyhow::Result<Option<(ChatId, MsgId)>> {
+) -> Option<(ChatId, MsgId)> {
     if from_id <= DC_CONTACT_ID_LAST_SPECIAL || rfc724_mid.is_empty() {
-        return Ok(None);
+        return None;
     }
 
     let res = context
@@ -1767,7 +1749,7 @@ pub async fn handle_mdn(
             let mdn_already_in_table = context
                 .sql
                 .exists(
-                    "SELECT COUNT(*) FROM msgs_mdns WHERE msg_id=? AND contact_id=?;",
+                    "SELECT contact_id FROM msgs_mdns WHERE msg_id=? AND contact_id=?;",
                     paramsv![msg_id, from_id as i32,],
                 )
                 .await
@@ -1790,24 +1772,27 @@ pub async fn handle_mdn(
                 // send event about new state
                 let ist_cnt = context
                     .sql
-                    .count(
+                    .query_get_value::<isize>(
+                        context,
                         "SELECT COUNT(*) FROM msgs_mdns WHERE msg_id=?;",
                         paramsv![msg_id],
                     )
-                    .await?;
+                    .await
+                    .unwrap_or_default() as usize;
+                /*
+                Groupsize:  Min. MDNs
 
-                // Groupsize:  Min. MDNs
-                // 1 S         n/a
-                // 2 SR        1
-                // 3 SRR       2
-                // 4 SRRR      2
-                // 5 SRRRR     3
-                // 6 SRRRRR    3
-                //
-                // (S=Sender, R=Recipient)
+                1 S         n/a
+                2 SR        1
+                3 SRR       2
+                4 SRRR      2
+                5 SRRRR     3
+                6 SRRRRR    3
 
+                (S=Sender, R=Recipient)
+                 */
                 // for rounding, SELF is already included!
-                let soll_cnt = (chat::get_chat_contact_cnt(context, chat_id).await? + 1) / 2;
+                let soll_cnt = (chat::get_chat_contact_cnt(context, chat_id).await + 1) / 2;
                 if ist_cnt >= soll_cnt {
                     update_msg_state(context, msg_id, MessageState::OutMdnRcvd).await;
                     read_by_all = true;
@@ -1815,12 +1800,12 @@ pub async fn handle_mdn(
             }
         }
         return if read_by_all {
-            Ok(Some((chat_id, msg_id)))
+            Some((chat_id, msg_id))
         } else {
-            Ok(None)
+            None
         };
     }
-    Ok(None)
+    None
 }
 
 /// Marks a message as failed after an ndn (non-delivery-notification) arrived.
@@ -1859,15 +1844,13 @@ pub(crate) async fn handle_ndn(
         )
         .await?;
 
-    let mut first = true;
-    for msg in msgs.into_iter() {
+    for (i, msg) in msgs.into_iter().enumerate() {
         let (msg_id, chat_id, chat_type) = msg?;
         set_msg_failed(context, msg_id, error.as_ref()).await;
-        if first {
+        if i == 0 {
             // Add only one info msg for all failed messages
             ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
         }
-        first = false;
     }
 
     Ok(())
@@ -1907,14 +1890,15 @@ async fn ndn_maybe_add_info_msg(
 }
 
 /// The number of messages assigned to real chat (!=deaddrop, !=trash)
-pub async fn get_real_msg_cnt(context: &Context) -> usize {
+pub async fn get_real_msg_cnt(context: &Context) -> i32 {
     match context
         .sql
-        .count(
+        .query_row(
             "SELECT COUNT(*) \
          FROM msgs m  LEFT JOIN chats c ON c.id=m.chat_id \
          WHERE m.id>9 AND m.chat_id>9 AND c.blocked=0;",
             paramsv![],
+            |row| row.get(0),
         )
         .await
     {
@@ -1929,15 +1913,16 @@ pub async fn get_real_msg_cnt(context: &Context) -> usize {
 pub async fn get_deaddrop_msg_cnt(context: &Context) -> usize {
     match context
         .sql
-        .count(
+        .query_row(
             "SELECT COUNT(*) \
          FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id \
          WHERE c.blocked=2;",
             paramsv![],
+            |row| row.get::<_, isize>(0),
         )
         .await
     {
-        Ok(res) => res,
+        Ok(res) => res as usize,
         Err(err) => {
             error!(context, "dc_get_deaddrop_msg_cnt() failed. {}", err);
             0
@@ -1956,10 +1941,10 @@ pub async fn estimate_deletion_cnt(
         .0;
     let threshold_timestamp = time() - seconds;
 
-    let cnt = if from_server {
+    let cnt: isize = if from_server {
         context
             .sql
-            .count(
+            .query_row(
                 "SELECT COUNT(*)
              FROM msgs m
              WHERE m.id > ?
@@ -1967,12 +1952,13 @@ pub async fn estimate_deletion_cnt(
                AND chat_id != ?
                AND server_uid != 0;",
                 paramsv![DC_MSG_ID_LAST_SPECIAL, threshold_timestamp, self_chat_id],
+                |row| row.get(0),
             )
             .await?
     } else {
         context
             .sql
-            .count(
+            .query_row(
                 "SELECT COUNT(*)
              FROM msgs m
              WHERE m.id > ?
@@ -1983,25 +1969,27 @@ pub async fn estimate_deletion_cnt(
                     DC_MSG_ID_LAST_SPECIAL,
                     threshold_timestamp,
                     self_chat_id,
-                    DC_CHAT_ID_TRASH
+                    ChatId::new(DC_CHAT_ID_TRASH)
                 ],
+                |row| row.get(0),
             )
             .await?
     };
-    Ok(cnt)
+    Ok(cnt as usize)
 }
 
 /// Counts number of database records pointing to specified
 /// Message-ID.
 ///
 /// Unlinked messages are excluded.
-pub async fn rfc724_mid_cnt(context: &Context, rfc724_mid: &str) -> usize {
+pub async fn rfc724_mid_cnt(context: &Context, rfc724_mid: &str) -> i32 {
     // check the number of messages with the same rfc724_mid
     match context
         .sql
-        .count(
+        .query_row(
             "SELECT COUNT(*) FROM msgs WHERE rfc724_mid=? AND NOT server_uid = 0",
             paramsv![rfc724_mid],
+            |row| row.get(0),
         )
         .await
     {
@@ -2066,8 +2054,7 @@ pub async fn update_server_uid(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::chat::{marknoticed_chat, ChatItem};
-    use crate::chatlist::Chatlist;
+    use crate::chat::ChatItem;
     use crate::constants::DC_CONTACT_ID_DEVICE;
     use crate::dc_receive_imf::dc_receive_imf;
     use crate::test_utils as test;
@@ -2249,7 +2236,7 @@ mod tests {
                     "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
                     {}\
                     Subject: foo\n\
-                    Message-ID: <abc@example.com>\n\
+                    Message-ID: <aehtri@example.com>\n\
                     {}\
                     Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
                     \n\
@@ -2270,11 +2257,9 @@ mod tests {
         .await
         .unwrap();
 
-        let exists = rfc724_mid_exists(&t, "abc@example.com").await.unwrap();
-        let (folder_1, _, msg_id) = exists.unwrap();
-        assert_eq!(folder, folder_1);
-        let actual = if let Some(config) = msg_id.needs_move(&t.ctx, folder).await.unwrap() {
-            t.ctx.get_config(config).await.unwrap()
+        let msg = t.get_last_msg().await;
+        let actual = if let Some(config) = msg.id.needs_move(&t.ctx, folder).await.unwrap() {
+            Some(t.ctx.get_config(config).await.unwrap())
         } else {
             None
         };
@@ -2283,7 +2268,7 @@ mod tests {
         } else {
             Some(expected_destination)
         };
-        assert_eq!(expected, actual.as_deref(), "For folder {}, mvbox_move {}, chat_msg {}, accepted {}, outgoing {}, setupmessage {}: expected {:?}, got {:?}",
+        assert_eq!(expected, actual.as_deref(), "For folder {}, mvbox_move {}, chat_msg {}, accepted {}, outgoing {}, setupmessage {}: expected {:?} , got {:?}",
                                                      folder, mvbox_move, chat_msg, accepted_chat, outgoing, setupmessage, expected, actual);
     }
 
@@ -2334,186 +2319,73 @@ mod tests {
         some_file.set(Param::File, "foo.bar");
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Text,
-                some_text.as_ref(),
-                false,
-                &Params::new(),
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Text, some_text.as_ref(), &Params::new(), 50, ctx)
+                .await,
             "bla bla" // for simple text, the type is not added to the summary
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Image,
-                no_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Image, no_text.as_ref(), &some_file, 50, ctx).await,
             "Image" // file names are not added for images
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Video,
-                no_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Video, no_text.as_ref(), &some_file, 50, ctx).await,
             "Video" // file names are not added for videos
         );
 
         assert_eq!(
-            get_summarytext_by_raw(Viewtype::Gif, no_text.as_ref(), false, &some_file, 50, ctx,)
-                .await,
+            get_summarytext_by_raw(Viewtype::Gif, no_text.as_ref(), &some_file, 50, ctx,).await,
             "GIF" // file names are not added for GIFs
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Sticker,
-                no_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx,
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Sticker, no_text.as_ref(), &some_file, 50, ctx,).await,
             "Sticker" // file names are not added for stickers
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Voice,
-                empty_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx,
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Voice, empty_text.as_ref(), &some_file, 50, ctx,)
+                .await,
             "Voice message" // file names are not added for voice messages, empty text is skipped
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Voice,
-                no_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Voice, no_text.as_ref(), &some_file, 50, ctx).await,
             "Voice message" // file names are not added for voice messages
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Voice,
-                some_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Voice, some_text.as_ref(), &some_file, 50, ctx).await,
             "Voice message \u{2013} bla bla" // `\u{2013}` explicitly checks for "EN DASH"
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Audio,
-                no_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Audio, no_text.as_ref(), &some_file, 50, ctx).await,
             "Audio \u{2013} foo.bar" // file name is added for audio
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Audio,
-                empty_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx,
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Audio, empty_text.as_ref(), &some_file, 50, ctx,)
+                .await,
             "Audio \u{2013} foo.bar" // file name is added for audio, empty text is not added
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Audio,
-                some_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::Audio, some_text.as_ref(), &some_file, 50, ctx).await,
             "Audio \u{2013} foo.bar \u{2013} bla bla" // file name and text added for audio
         );
 
         assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::File,
-                some_text.as_ref(),
-                false,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
+            get_summarytext_by_raw(Viewtype::File, some_text.as_ref(), &some_file, 50, ctx).await,
             "File \u{2013} foo.bar \u{2013} bla bla" // file name is added for files
         );
 
-        // Forwarded
-        assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::Text,
-                some_text.as_ref(),
-                true,
-                &Params::new(),
-                50,
-                ctx
-            )
-            .await,
-            "Forwarded: bla bla" // for simple text, the type is not added to the summary
-        );
-        assert_eq!(
-            get_summarytext_by_raw(
-                Viewtype::File,
-                some_text.as_ref(),
-                true,
-                &some_file,
-                50,
-                ctx
-            )
-            .await,
-            "Forwarded: File \u{2013} foo.bar \u{2013} bla bla"
-        );
-
         let mut asm_file = Params::new();
         asm_file.set(Param::File, "foo.bar");
         asm_file.set_cmd(SystemMessage::AutocryptSetupMessage);
         assert_eq!(
-            get_summarytext_by_raw(Viewtype::File, no_text.as_ref(), false, &asm_file, 50, ctx)
-                .await,
+            get_summarytext_by_raw(Viewtype::File, no_text.as_ref(), &asm_file, 50, ctx).await,
             "Autocrypt Setup Message" // file name is not added for autocrypt setup messages
         );
     }
@@ -2607,9 +2479,7 @@ mod tests {
                 .unwrap();
 
         let mut has_image = false;
-        let chatitems = chat::get_chat_msgs(&t, device_chat_id, 0, None)
-            .await
-            .unwrap();
+        let chatitems = chat::get_chat_msgs(&t, device_chat_id, 0, None).await;
         for chatitem in chatitems {
             if let ChatItem::Message { msg_id } = chatitem {
                 if let Ok(msg) = Message::load_from_db(&t, msg_id).await {
@@ -2698,7 +2568,6 @@ mod tests {
         let chat = alice.create_chat(&bob).await;
         let contact_id = *chat::get_chat_contacts(&alice, chat.id)
             .await
-            .unwrap()
             .first()
             .unwrap();
         let contact = Contact::load_from_db(&alice, contact_id).await.unwrap();
@@ -2718,7 +2587,6 @@ mod tests {
         let chat = bob.create_chat(&alice).await;
         let contact_id = *chat::get_chat_contacts(&bob, chat.id)
             .await
-            .unwrap()
             .first()
             .unwrap();
         let contact = Contact::load_from_db(&bob, contact_id).await.unwrap();
@@ -2737,140 +2605,4 @@ mod tests {
         let chat = Chat::load_from_db(&bob, msg.chat_id).await.unwrap();
         assert_ne!(chat.typ, Chattype::Mailinglist);
     }
-
-    #[async_std::test]
-    async fn test_markseen_msgs() -> anyhow::Result<()> {
-        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(Viewtype::Text);
-        msg.set_text(Some("this is the text!".to_string()));
-
-        // alice sends to bob,
-        // bob does not know alice yet and messages go to bob's deaddrop
-        assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
-        bob.recv_msg(&alice.send_msg(alice_chat.id, &mut msg).await)
-            .await;
-        let msg1 = bob.get_last_msg().await;
-        bob.recv_msg(&alice.send_msg(alice_chat.id, &mut msg).await)
-            .await;
-        let msg2 = bob.get_last_msg().await;
-        assert_eq!(msg1.chat_id, msg2.chat_id);
-        assert_ne!(msg1.chat_id, DC_CHAT_ID_DEADDROP);
-        let chats = Chatlist::try_load(&bob, 0, None, None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.get_chat_id(0), DC_CHAT_ID_DEADDROP);
-        let msgs = chat::get_chat_msgs(&bob, DC_CHAT_ID_DEADDROP, 0, None).await?;
-        assert_eq!(msgs.len(), 2);
-        assert_eq!(bob.get_fresh_msgs().await?.len(), 0);
-
-        // that has no effect in deaddrop
-        markseen_msgs(&bob, vec![msg1.id, msg2.id]).await;
-
-        assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1);
-        let msgs = chat::get_chat_msgs(&bob, DC_CHAT_ID_DEADDROP, 0, None).await?;
-        assert_eq!(msgs.len(), 2);
-        let bob_chat_id =
-            decide_on_contact_request(&bob, msg2.get_id(), ContactRequestDecision::StartChat)
-                .await
-                .unwrap();
-
-        // bob sends to alice,
-        // alice knows bob and messages appear in normal chat
-        alice
-            .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
-            .await;
-        let msg1 = alice.get_last_msg().await;
-        alice
-            .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
-            .await;
-        let msg2 = alice.get_last_msg().await;
-        let chats = Chatlist::try_load(&alice, 0, None, None).await?;
-        assert_eq!(chats.len(), 1);
-        assert_eq!(chats.get_chat_id(0), alice_chat.id);
-        assert_eq!(chats.get_chat_id(0), msg1.chat_id);
-        assert_eq!(chats.get_chat_id(0), msg2.chat_id);
-        assert_eq!(alice_chat.id.get_fresh_msg_cnt(&alice).await?, 2);
-        assert_eq!(alice.get_fresh_msgs().await?.len(), 2);
-
-        // no message-ids, that should have no effect
-        markseen_msgs(&alice, vec![]).await;
-
-        // bad message-id, that should have no effect
-        markseen_msgs(&alice, vec![MsgId::new(123456)]).await;
-
-        assert_eq!(alice_chat.id.get_fresh_msg_cnt(&alice).await?, 2);
-        assert_eq!(alice.get_fresh_msgs().await?.len(), 2);
-
-        // mark the most recent as seen
-        markseen_msgs(&alice, vec![msg2.id]).await;
-
-        assert_eq!(alice_chat.id.get_fresh_msg_cnt(&alice).await?, 1);
-        assert_eq!(alice.get_fresh_msgs().await?.len(), 1);
-
-        // user scrolled up - mark both as seen
-        markseen_msgs(&alice, vec![msg1.id, msg2.id]).await;
-
-        assert_eq!(alice_chat.id.get_fresh_msg_cnt(&alice).await?, 0);
-        assert_eq!(alice.get_fresh_msgs().await?.len(), 0);
-
-        Ok(())
-    }
-
-    #[async_std::test]
-    async fn test_get_state() -> anyhow::Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-        let alice_chat = alice.create_chat(&bob).await;
-        let bob_chat = bob.create_chat(&alice).await;
-
-        // check both get_state() functions,
-        // the one requiring a id and the one requiring an object
-        async fn assert_state(t: &Context, msg_id: MsgId, state: MessageState) {
-            assert_eq!(msg_id.get_state(t).await.unwrap(), state);
-            assert_eq!(
-                Message::load_from_db(t, msg_id).await.unwrap().get_state(),
-                state
-            );
-        }
-
-        // check outgoing messages states on sender side
-        let mut alice_msg = Message::new(Viewtype::Text);
-        alice_msg.set_text(Some("hi!".to_string()));
-        assert_eq!(alice_msg.get_state(), MessageState::Undefined); // message not yet in db, assert_state() won't work
-
-        alice_chat
-            .id
-            .set_draft(&alice, Some(&mut alice_msg))
-            .await?;
-        let mut alice_msg = alice_chat.id.get_draft(&alice).await?.unwrap();
-        assert_state(&alice, alice_msg.id, MessageState::OutDraft).await;
-
-        let msg_id = chat::send_msg(&alice, alice_chat.id, &mut alice_msg).await?;
-        assert_eq!(msg_id, alice_msg.id);
-        assert_state(&alice, alice_msg.id, MessageState::OutPending).await;
-
-        let payload = alice.pop_sent_msg().await;
-        assert_state(&alice, alice_msg.id, MessageState::OutDelivered).await;
-
-        update_msg_state(&alice, alice_msg.id, MessageState::OutMdnRcvd).await;
-        assert_state(&alice, alice_msg.id, MessageState::OutMdnRcvd).await;
-
-        set_msg_failed(&alice, alice_msg.id, Some("badly failed")).await;
-        assert_state(&alice, alice_msg.id, MessageState::OutFailed).await;
-
-        // check incoming message states on receiver side
-        bob.recv_msg(&payload).await;
-        let bob_msg = bob.get_last_msg().await;
-        assert_eq!(bob_chat.id, bob_msg.chat_id);
-        assert_state(&bob, bob_msg.id, MessageState::InFresh).await;
-
-        marknoticed_chat(&bob, bob_msg.chat_id).await?;
-        assert_state(&bob, bob_msg.id, MessageState::InNoticed).await;
-
-        markseen_msgs(&bob, vec![bob_msg.id]).await;
-        assert_state(&bob, bob_msg.id, MessageState::InSeen).await;
-
-        Ok(())
-    }
 }

src/mimefactory.rs

@@ -1,9 +1,3 @@
-use std::convert::TryInto;
-
-use anyhow::{bail, ensure, format_err, Result};
-use chrono::TimeZone;
-use lettre_email::{mime, Address, Header, MimeMultipartType, PartBuilder};
-
 use crate::blob::BlobObject;
 use crate::chat::{self, Chat};
 use crate::config::Config;
@@ -26,6 +20,11 @@ use crate::param::Param;
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::simplify::escape_message_footer_marks;
 use crate::stock_str;
+use anyhow::Context as _;
+use anyhow::{bail, ensure, format_err, Error};
+use chrono::TimeZone;
+use lettre_email::{mime, Address, Header, MimeMultipartType, PartBuilder};
+use std::convert::TryInto;
 
 // 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).
@@ -37,7 +36,7 @@ const UPPER_LIMIT_FILE_SIZE: u64 = 49 * 1024 * 1024 / 4 * 3;
 #[derive(Debug, Clone)]
 pub enum Loaded {
     Message { chat: Chat },
-    Mdn { additional_msg_ids: Vec<String> },
+    MDN { additional_msg_ids: Vec<String> },
 }
 
 /// Helper to construct mime messages.
@@ -83,49 +82,22 @@ pub struct RenderedEmail {
     pub subject: String,
 }
 
-#[derive(Debug, Clone, Default)]
-struct MessageHeaders {
-    /// Opportunistically protected headers.
-    ///
-    /// These headers are placed into encrypted part *if* the message is encrypted. Place headers
-    /// which are not needed before decryption (e.g. Chat-Group-Name) or are not interesting if the
-    /// message cannot be decrypted (e.g. Chat-Disposition-Notification-To) here.
-    ///
-    /// If the message is not encrypted, these headers are placed into IMF header section, so make
-    /// sure that the message will be encrypted if you place any sensitive information here.
-    pub protected: Vec<Header>,
-
-    /// Headers that must go into IMF header section.
-    ///
-    /// These are standard headers such as Date, In-Reply-To, References, which cannot be placed
-    /// anywhere else according to the standard. Placing headers here also allows them to be fetched
-    /// individually over IMAP without downloading the message body. This is why Chat-Version is
-    /// placed here.
-    pub unprotected: Vec<Header>,
-
-    /// Headers that MUST NOT go into IMF header section.
-    ///
-    /// These are large headers which may hit the header section size limit on the server, such as
-    /// Chat-User-Avatar with a base64-encoded image inside.
-    pub hidden: Vec<Header>,
-}
-
 impl<'a> MimeFactory<'a> {
     pub async fn from_msg(
         context: &Context,
         msg: &'a Message,
         attach_selfavatar: bool,
-    ) -> Result<MimeFactory<'a>> {
+    ) -> Result<MimeFactory<'a>, Error> {
         let chat = Chat::load_from_db(context, msg.chat_id).await?;
 
         let from_addr = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .unwrap_or_default();
 
         let config_displayname = context
             .get_config(Config::Displayname)
-            .await?
+            .await
             .unwrap_or_default();
         let (from_displayname, sender_displayname) =
             if let Some(override_name) = msg.param.get(Param::OverrideSenderDisplayname) {
@@ -165,7 +137,7 @@ impl<'a> MimeFactory<'a> {
                 )
                 .await?;
 
-            if !msg.is_system_message() && context.get_config_bool(Config::MdnsEnabled).await? {
+            if !msg.is_system_message() && context.get_config_bool(Config::MdnsEnabled).await {
                 req_mdn = true;
             }
         }
@@ -184,7 +156,8 @@ impl<'a> MimeFactory<'a> {
                     ))
                 },
             )
-            .await?;
+            .await
+            .context("Can't get mime_in_reply_to, mime_references")?;
 
         let default_str = stock_str::status_line(context).await;
         let factory = MimeFactory {
@@ -193,7 +166,7 @@ impl<'a> MimeFactory<'a> {
             sender_displayname,
             selfstatus: context
                 .get_config(Config::Selfstatus)
-                .await?
+                .await
                 .unwrap_or(default_str),
             recipients,
             timestamp: msg.timestamp_sort,
@@ -212,22 +185,22 @@ impl<'a> MimeFactory<'a> {
         context: &Context,
         msg: &'a Message,
         additional_msg_ids: Vec<String>,
-    ) -> Result<MimeFactory<'a>> {
+    ) -> Result<MimeFactory<'a>, Error> {
         ensure!(!msg.chat_id.is_special(), "Invalid chat id");
 
         let contact = Contact::load_from_db(context, msg.from_id).await?;
         let from_addr = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .unwrap_or_default();
         let from_displayname = context
             .get_config(Config::Displayname)
-            .await?
+            .await
             .unwrap_or_default();
         let default_str = stock_str::status_line(context).await;
         let selfstatus = context
             .get_config(Config::Selfstatus)
-            .await?
+            .await
             .unwrap_or(default_str);
         let timestamp = dc_create_smeared_timestamp(context).await;
 
@@ -241,7 +214,7 @@ impl<'a> MimeFactory<'a> {
                 contact.get_addr().to_string(),
             )],
             timestamp,
-            loaded: Loaded::Mdn { additional_msg_ids },
+            loaded: Loaded::MDN { additional_msg_ids },
             msg,
             in_reply_to: String::default(),
             references: String::default(),
@@ -256,10 +229,10 @@ impl<'a> MimeFactory<'a> {
     async fn peerstates_for_recipients(
         &self,
         context: &Context,
-    ) -> Result<Vec<(Option<Peerstate>, &str)>> {
+    ) -> Result<Vec<(Option<Peerstate>, &str)>, Error> {
         let self_addr = context
             .get_config(Config::ConfiguredAddr)
-            .await?
+            .await
             .ok_or_else(|| format_err!("Not configured"))?;
 
         let mut res = Vec::new();
@@ -292,7 +265,7 @@ impl<'a> MimeFactory<'a> {
                         .get_bool(Param::GuaranteeE2ee)
                         .unwrap_or_default()
             }
-            Loaded::Mdn { .. } => false,
+            Loaded::MDN { .. } => false,
         }
     }
 
@@ -305,7 +278,7 @@ impl<'a> MimeFactory<'a> {
                     PeerstateVerifiedStatus::Unverified
                 }
             }
-            Loaded::Mdn { .. } => PeerstateVerifiedStatus::Unverified,
+            Loaded::MDN { .. } => PeerstateVerifiedStatus::Unverified,
         }
     }
 
@@ -321,7 +294,7 @@ impl<'a> MimeFactory<'a> {
                         .unwrap_or_default()
                 }
             }
-            Loaded::Mdn { .. } => true,
+            Loaded::MDN { .. } => true,
         }
     }
 
@@ -332,22 +305,22 @@ impl<'a> MimeFactory<'a> {
                 .param
                 .get_bool(Param::SkipAutocrypt)
                 .unwrap_or_default(),
-            Loaded::Mdn { .. } => true,
+            Loaded::MDN { .. } => true,
         }
     }
 
-    async fn should_do_gossip(&self, context: &Context) -> Result<bool> {
+    async fn should_do_gossip(&self, context: &Context) -> bool {
         match &self.loaded {
             Loaded::Message { chat } => {
                 // beside key- and member-changes, force re-gossip every 48 hours
-                let gossiped_timestamp = chat.get_gossiped_timestamp(context).await?;
+                let gossiped_timestamp = chat.get_gossiped_timestamp(context).await;
                 if time() > gossiped_timestamp + (2 * 24 * 60 * 60) {
-                    Ok(true)
-                } else {
-                    Ok(self.msg.param.get_cmd() == SystemMessage::MemberAddedToGroup)
+                    return true;
                 }
+
+                self.msg.param.get_cmd() == SystemMessage::MemberAddedToGroup
             }
-            Loaded::Mdn { .. } => Ok(false),
+            Loaded::MDN { .. } => false,
         }
     }
 
@@ -377,14 +350,14 @@ impl<'a> MimeFactory<'a> {
 
                 None
             }
-            Loaded::Mdn { .. } => None,
+            Loaded::MDN { .. } => None,
         }
     }
 
     async fn subject_str(&self, context: &Context) -> anyhow::Result<String> {
         let quoted_msg_subject = self.msg.quoted_message(context).await?.map(|m| m.subject);
 
-        let subject = match self.loaded {
+        Ok(match self.loaded {
             Loaded::Message { ref chat } => {
                 if self.msg.param.get_cmd() == SystemMessage::AutocryptSetupMessage {
                     return Ok(stock_str::ac_setup_msg_subject(context).await);
@@ -414,18 +387,16 @@ impl<'a> MimeFactory<'a> {
                 if let Some(last_subject) = parent_subject {
                     format!("Re: {}", remove_subject_prefix(last_subject))
                 } else {
-                    let self_name = match context.get_config(Config::Displayname).await? {
+                    let self_name = match context.get_config(Config::Displayname).await {
                         Some(name) => name,
-                        None => context.get_config(Config::Addr).await?.unwrap_or_default(),
+                        None => context.get_config(Config::Addr).await.unwrap_or_default(),
                     };
 
                     stock_str::subject_for_new_contact(context, self_name).await
                 }
             }
-            Loaded::Mdn { .. } => stock_str::read_rcpt(context).await,
-        };
-
-        Ok(subject)
+            Loaded::MDN { .. } => stock_str::read_rcpt(context).await,
+        })
     }
 
     pub fn recipients(&self) -> Vec<String> {
@@ -435,8 +406,15 @@ impl<'a> MimeFactory<'a> {
             .collect()
     }
 
-    pub async fn render(mut self, context: &Context) -> Result<RenderedEmail> {
-        let mut headers: MessageHeaders = Default::default();
+    pub async fn render(mut self, context: &Context) -> Result<RenderedEmail, Error> {
+        // Headers that are encrypted
+        // - Chat-*, except Chat-Version
+        // - Secure-Join*
+        // - Subject
+        let mut protected_headers: Vec<Header> = Vec::new();
+
+        // All other headers
+        let mut unprotected_headers: Vec<Header> = Vec::new();
 
         let from = Address::new_mailbox_with_name(
             self.from_displayname.to_string(),
@@ -459,20 +437,14 @@ impl<'a> MimeFactory<'a> {
             to.push(from.clone());
         }
 
-        headers
-            .unprotected
-            .push(Header::new("MIME-Version".into(), "1.0".into()));
+        unprotected_headers.push(Header::new("MIME-Version".into(), "1.0".into()));
 
         if !self.references.is_empty() {
-            headers
-                .unprotected
-                .push(Header::new("References".into(), self.references.clone()));
+            unprotected_headers.push(Header::new("References".into(), self.references.clone()));
         }
 
         if !self.in_reply_to.is_empty() {
-            headers
-                .unprotected
-                .push(Header::new("In-Reply-To".into(), self.in_reply_to.clone()));
+            unprotected_headers.push(Header::new("In-Reply-To".into(), self.in_reply_to.clone()));
         }
 
         let date = chrono::Utc
@@ -480,14 +452,12 @@ impl<'a> MimeFactory<'a> {
             .unwrap()
             .to_rfc2822();
 
-        headers.unprotected.push(Header::new("Date".into(), date));
+        unprotected_headers.push(Header::new("Date".into(), date));
 
-        headers
-            .unprotected
-            .push(Header::new("Chat-Version".to_string(), "1.0".to_string()));
+        unprotected_headers.push(Header::new("Chat-Version".to_string(), "1.0".to_string()));
 
-        if let Loaded::Mdn { .. } = self.loaded {
-            headers.unprotected.push(Header::new(
+        if let Loaded::MDN { .. } = self.loaded {
+            unprotected_headers.push(Header::new(
                 "Auto-Submitted".to_string(),
                 "auto-replied".to_string(),
             ));
@@ -497,7 +467,7 @@ impl<'a> MimeFactory<'a> {
             // we use "Chat-Disposition-Notification-To"
             // because replies to "Disposition-Notification-To" are weird in many cases
             // eg. are just freetext and/or do not follow any standard.
-            headers.protected.push(Header::new(
+            protected_headers.push(Header::new(
                 "Chat-Disposition-Notification-To".into(),
                 self.from_addr.clone(),
             ));
@@ -525,44 +495,35 @@ impl<'a> MimeFactory<'a> {
         if !skip_autocrypt {
             // unless determined otherwise we add the Autocrypt header
             let aheader = encrypt_helper.get_aheader().to_string();
-            headers
-                .unprotected
-                .push(Header::new("Autocrypt".into(), aheader));
+            unprotected_headers.push(Header::new("Autocrypt".into(), aheader));
         }
 
-        headers
-            .protected
-            .push(Header::new("Subject".into(), encoded_subject));
+        protected_headers.push(Header::new("Subject".into(), encoded_subject));
 
         let rfc724_mid = match self.loaded {
             Loaded::Message { .. } => self.msg.rfc724_mid.clone(),
-            Loaded::Mdn { .. } => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
+            Loaded::MDN { .. } => dc_create_outgoing_rfc724_mid(None, &self.from_addr),
         };
 
         let ephemeral_timer = self.msg.chat_id.get_ephemeral_timer(context).await?;
         if let EphemeralTimer::Enabled { duration } = ephemeral_timer {
-            headers.protected.push(Header::new(
+            protected_headers.push(Header::new(
                 "Ephemeral-Timer".to_string(),
                 duration.to_string(),
             ));
         }
 
-        headers.unprotected.push(Header::new(
+        unprotected_headers.push(Header::new(
             "Message-ID".into(),
             render_rfc724_mid(&rfc724_mid),
         ));
 
-        headers
-            .unprotected
-            .push(Header::new_with_value("To".into(), to).unwrap());
-        headers
-            .unprotected
-            .push(Header::new_with_value("From".into(), vec![from]).unwrap());
+        unprotected_headers.push(Header::new_with_value("To".into(), to).unwrap());
+        unprotected_headers.push(Header::new_with_value("From".into(), vec![from]).unwrap());
         if let Some(sender_displayname) = &self.sender_displayname {
             let sender =
                 Address::new_mailbox_with_name(sender_displayname.clone(), self.from_addr.clone());
-            headers
-                .unprotected
+            unprotected_headers
                 .push(Header::new_with_value("Sender".into(), vec![sender]).unwrap());
         }
 
@@ -570,10 +531,15 @@ impl<'a> MimeFactory<'a> {
 
         let (main_part, parts) = match self.loaded {
             Loaded::Message { .. } => {
-                self.render_message(context, &mut headers, &grpimage)
-                    .await?
+                self.render_message(
+                    context,
+                    &mut protected_headers,
+                    &mut unprotected_headers,
+                    &grpimage,
+                )
+                .await?
             }
-            Loaded::Mdn { .. } => (self.render_mdn(context).await?, Vec::new()),
+            Loaded::MDN { .. } => (self.render_mdn(context).await?, Vec::new()),
         };
 
         let peerstates = self.peerstates_for_recipients(context).await?;
@@ -594,21 +560,14 @@ impl<'a> MimeFactory<'a> {
             )
         };
 
+        // Store protected headers in the inner message.
+        let mut message = protected_headers
+            .into_iter()
+            .fold(message, |message, header| message.header(header));
+
         let outer_message = if is_encrypted {
-            // Store protected headers in the inner message.
-            let message = headers
-                .protected
-                .into_iter()
-                .fold(message, |message, header| message.header(header));
-
-            // Add hidden headers to encrypted payload.
-            let mut message = headers
-                .hidden
-                .into_iter()
-                .fold(message, |message, header| message.header(header));
-
             // Add gossip headers in chats with multiple recipients
-            if peerstates.len() > 1 && self.should_do_gossip(context).await? {
+            if peerstates.len() > 1 && self.should_do_gossip(context).await {
                 for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
                     if peerstate.peek_key(min_verified).is_some() {
                         if let Some(header) = peerstate.render_gossip_header(min_verified) {
@@ -640,6 +599,11 @@ impl<'a> MimeFactory<'a> {
                 "multipart/encrypted; protocol=\"application/pgp-encrypted\"".to_string(),
             ));
 
+            // Store the unprotected headers on the outer message.
+            let outer_message = unprotected_headers
+                .into_iter()
+                .fold(outer_message, |message, header| message.header(header));
+
             if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
                 info!(context, "mimefactory: outgoing message mime:");
                 let raw_message = message.clone().build().as_string();
@@ -674,33 +638,11 @@ impl<'a> MimeFactory<'a> {
                 )
                 .header(("Subject".to_string(), "...".to_string()))
         } else {
-            let message = if headers.hidden.is_empty() {
-                message
-            } else {
-                // Store hidden headers in the inner unencrypted message.
-                let message = headers
-                    .hidden
-                    .into_iter()
-                    .fold(message, |message, header| message.header(header));
-
-                PartBuilder::new()
-                    .message_type(MimeMultipartType::Mixed)
-                    .child(message.build())
-            };
-
-            // Store protected headers in the outer message.
-            headers
-                .protected
+            unprotected_headers
                 .into_iter()
                 .fold(message, |message, header| message.header(header))
         };
 
-        // Store the unprotected headers on the outer message.
-        let outer_message = headers
-            .unprotected
-            .into_iter()
-            .fold(outer_message, |message, header| message.header(header));
-
         let MimeFactory {
             last_added_location_id,
             ..
@@ -736,7 +678,7 @@ impl<'a> MimeFactory<'a> {
         Some(part)
     }
 
-    async fn get_location_kml_part(&mut self, context: &Context) -> Result<PartBuilder> {
+    async fn get_location_kml_part(&mut self, context: &Context) -> Result<PartBuilder, Error> {
         let (kml_content, last_added_location_id) =
             location::get_kml(context, self.msg.chat_id).await?;
         let part = PartBuilder::new()
@@ -761,38 +703,33 @@ impl<'a> MimeFactory<'a> {
     async fn render_message(
         &mut self,
         context: &Context,
-        headers: &mut MessageHeaders,
+        protected_headers: &mut Vec<Header>,
+        unprotected_headers: &mut Vec<Header>,
         grpimage: &Option<String>,
-    ) -> Result<(PartBuilder, Vec<PartBuilder>)> {
+    ) -> Result<(PartBuilder, Vec<PartBuilder>), Error> {
         let chat = match &self.loaded {
             Loaded::Message { chat } => chat,
-            Loaded::Mdn { .. } => bail!("Attempt to render MDN as a message"),
+            Loaded::MDN { .. } => bail!("Attempt to render MDN as a message"),
         };
         let command = self.msg.param.get_cmd();
         let mut placeholdertext = None;
         let mut meta_part = None;
 
         if chat.is_protected() {
-            headers
-                .protected
-                .push(Header::new("Chat-Verified".to_string(), "1".to_string()));
+            protected_headers.push(Header::new("Chat-Verified".to_string(), "1".to_string()));
         }
 
         if chat.typ == Chattype::Group {
-            headers
-                .protected
-                .push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));
+            protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));
 
             let encoded = encode_words(&chat.name);
-            headers
-                .protected
-                .push(Header::new("Chat-Group-Name".into(), encoded));
+            protected_headers.push(Header::new("Chat-Group-Name".into(), encoded));
 
             match command {
                 SystemMessage::MemberRemovedFromGroup => {
                     let email_to_remove = self.msg.param.get(Param::Arg).unwrap_or_default();
                     if !email_to_remove.is_empty() {
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             "Chat-Group-Member-Removed".into(),
                             email_to_remove.into(),
                         ));
@@ -801,7 +738,7 @@ impl<'a> MimeFactory<'a> {
                 SystemMessage::MemberAddedToGroup => {
                     let email_to_add = self.msg.param.get(Param::Arg).unwrap_or_default();
                     if !email_to_add.is_empty() {
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             "Chat-Group-Member-Added".into(),
                             email_to_add.into(),
                         ));
@@ -814,7 +751,7 @@ impl<'a> MimeFactory<'a> {
                             "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>",
                             "vg-member-added",
                         );
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             "Secure-Join".to_string(),
                             "vg-member-added".to_string(),
                         ));
@@ -822,18 +759,18 @@ impl<'a> MimeFactory<'a> {
                 }
                 SystemMessage::GroupNameChanged => {
                     let old_name = self.msg.param.get(Param::Arg).unwrap_or_default();
-                    headers.protected.push(Header::new(
+                    protected_headers.push(Header::new(
                         "Chat-Group-Name-Changed".into(),
                         maybe_encode_words(old_name),
                     ));
                 }
                 SystemMessage::GroupImageChanged => {
-                    headers.protected.push(Header::new(
+                    protected_headers.push(Header::new(
                         "Chat-Content".to_string(),
                         "group-avatar-changed".to_string(),
                     ));
                     if grpimage.is_none() {
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             "Chat-Group-Avatar".to_string(),
                             "0".to_string(),
                         ));
@@ -845,13 +782,13 @@ impl<'a> MimeFactory<'a> {
 
         match command {
             SystemMessage::LocationStreamingEnabled => {
-                headers.protected.push(Header::new(
+                protected_headers.push(Header::new(
                     "Chat-Content".into(),
                     "location-streaming-enabled".into(),
                 ));
             }
             SystemMessage::EphemeralTimerChanged => {
-                headers.protected.push(Header::new(
+                protected_headers.push(Header::new(
                     "Chat-Content".to_string(),
                     "ephemeral-timer-changed".to_string(),
                 ));
@@ -865,14 +802,13 @@ impl<'a> MimeFactory<'a> {
                 // Adding this header without encryption leaks some
                 // information about the message contents, but it can
                 // already be easily guessed from message timing and size.
-                headers.unprotected.push(Header::new(
+                unprotected_headers.push(Header::new(
                     "Auto-Submitted".to_string(),
                     "auto-generated".to_string(),
                 ));
             }
             SystemMessage::AutocryptSetupMessage => {
-                headers
-                    .unprotected
+                unprotected_headers
                     .push(Header::new("Autocrypt-Setup-Message".into(), "v1".into()));
 
                 placeholdertext = Some(stock_str::ac_setup_msg_body(context).await);
@@ -885,13 +821,11 @@ impl<'a> MimeFactory<'a> {
                         context,
                         "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>", step,
                     );
-                    headers
-                        .protected
-                        .push(Header::new("Secure-Join".into(), step.into()));
+                    protected_headers.push(Header::new("Secure-Join".into(), step.into()));
 
                     let param2 = msg.param.get(Param::Arg2).unwrap_or_default();
                     if !param2.is_empty() {
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             if step == "vg-request-with-auth" || step == "vc-request-with-auth" {
                                 "Secure-Join-Auth".into()
                             } else {
@@ -903,26 +837,24 @@ impl<'a> MimeFactory<'a> {
 
                     let fingerprint = msg.param.get(Param::Arg3).unwrap_or_default();
                     if !fingerprint.is_empty() {
-                        headers.protected.push(Header::new(
+                        protected_headers.push(Header::new(
                             "Secure-Join-Fingerprint".into(),
                             fingerprint.into(),
                         ));
                     }
                     if let Some(id) = msg.param.get(Param::Arg4) {
-                        headers
-                            .protected
-                            .push(Header::new("Secure-Join-Group".into(), id.into()));
+                        protected_headers.push(Header::new("Secure-Join-Group".into(), id.into()));
                     };
                 }
             }
             SystemMessage::ChatProtectionEnabled => {
-                headers.protected.push(Header::new(
+                protected_headers.push(Header::new(
                     "Chat-Content".to_string(),
                     "protection-enabled".to_string(),
                 ));
             }
             SystemMessage::ChatProtectionDisabled => {
-                headers.protected.push(Header::new(
+                protected_headers.push(Header::new(
                     "Chat-Content".to_string(),
                     "protection-disabled".to_string(),
                 ));
@@ -940,21 +872,17 @@ impl<'a> MimeFactory<'a> {
 
             let (mail, filename_as_sent) = build_body_file(context, &meta, "group-image").await?;
             meta_part = Some(mail);
-            headers
-                .protected
-                .push(Header::new("Chat-Group-Avatar".into(), filename_as_sent));
+            protected_headers.push(Header::new("Chat-Group-Avatar".into(), filename_as_sent));
         }
 
         if self.msg.viewtype == Viewtype::Sticker {
-            headers
-                .protected
-                .push(Header::new("Chat-Content".into(), "sticker".into()));
+            protected_headers.push(Header::new("Chat-Content".into(), "sticker".into()));
         } else if self.msg.viewtype == Viewtype::VideochatInvitation {
-            headers.protected.push(Header::new(
+            protected_headers.push(Header::new(
                 "Chat-Content".into(),
                 "videochat-invitation".into(),
             ));
-            headers.protected.push(Header::new(
+            protected_headers.push(Header::new(
                 "Chat-Webrtc-Room".into(),
                 self.msg
                     .param
@@ -969,16 +897,12 @@ impl<'a> MimeFactory<'a> {
             || self.msg.viewtype == Viewtype::Video
         {
             if self.msg.viewtype == Viewtype::Voice {
-                headers
-                    .protected
-                    .push(Header::new("Chat-Voice-Message".into(), "1".into()));
+                protected_headers.push(Header::new("Chat-Voice-Message".into(), "1".into()));
             }
             let duration_ms = self.msg.param.get_int(Param::Duration).unwrap_or_default();
             if duration_ms > 0 {
                 let dur = duration_ms.to_string();
-                headers
-                    .protected
-                    .push(Header::new("Chat-Duration".into(), dur));
+                protected_headers.push(Header::new("Chat-Duration".into(), dur));
             }
         }
 
@@ -1042,9 +966,7 @@ impl<'a> MimeFactory<'a> {
         // for simplificity and to avoid conversion errors, we're generating the HTML-part from the original message.
         if self.msg.has_html() {
             let html = if let Some(orig_msg_id) = self.msg.param.get_int(Param::Forwarded) {
-                MsgId::new(orig_msg_id.try_into()?)
-                    .get_html(context)
-                    .await?
+                MsgId::new(orig_msg_id.try_into()?).get_html(context).await
             } else {
                 self.msg.param.get(Param::SendHtml).map(|s| s.to_string())
             };
@@ -1058,7 +980,7 @@ impl<'a> MimeFactory<'a> {
 
         // add attachment part
         if chat::msgtype_has_file(self.msg.viewtype) {
-            if !is_file_size_okay(context, self.msg).await? {
+            if !is_file_size_okay(context, self.msg).await {
                 bail!(
                     "Message exceeds the recommended {} MB.",
                     RECOMMENDED_FILE_SIZE / 1_000_000,
@@ -1087,17 +1009,15 @@ impl<'a> MimeFactory<'a> {
         }
 
         if self.attach_selfavatar {
-            match context.get_config(Config::Selfavatar).await? {
+            match context.get_config(Config::Selfavatar).await {
                 Some(path) => match build_selfavatar_file(context, &path) {
-                    Ok(avatar) => headers.hidden.push(Header::new(
-                        "Chat-User-Avatar".into(),
-                        format!("base64:{}", avatar),
-                    )),
+                    Ok((part, filename)) => {
+                        parts.push(part);
+                        protected_headers.push(Header::new("Chat-User-Avatar".into(), filename))
+                    }
                     Err(err) => warn!(context, "mimefactory: cannot attach selfavatar: {}", err),
                 },
-                None => headers
-                    .protected
-                    .push(Header::new("Chat-User-Avatar".into(), "0".into())),
+                None => protected_headers.push(Header::new("Chat-User-Avatar".into(), "0".into())),
             }
         }
 
@@ -1105,7 +1025,7 @@ impl<'a> MimeFactory<'a> {
     }
 
     /// Render an MDN
-    async fn render_mdn(&mut self, context: &Context) -> Result<PartBuilder> {
+    async fn render_mdn(&mut self, context: &Context) -> Result<PartBuilder, Error> {
         // RFC 6522, this also requires the `report-type` parameter which is equal
         // to the MIME subtype of the second body part of the multipart/report
         //
@@ -1120,7 +1040,7 @@ impl<'a> MimeFactory<'a> {
 
         let additional_msg_ids = match &self.loaded {
             Loaded::Message { .. } => bail!("Attempt to render a message as MDN"),
-            Loaded::Mdn {
+            Loaded::MDN {
                 additional_msg_ids, ..
             } => additional_msg_ids,
         };
@@ -1203,7 +1123,7 @@ async fn build_body_file(
     context: &Context,
     msg: &Message,
     base_name: &str,
-) -> Result<(PartBuilder, String)> {
+) -> Result<(PartBuilder, String), Error> {
     let blob = msg
         .param
         .get_blob(Param::File, context, true)
@@ -1217,14 +1137,14 @@ async fn build_body_file(
     // etc.
     let filename_to_send: String = match msg.viewtype {
         Viewtype::Voice => chrono::Utc
-            .timestamp(msg.timestamp_sort, 0)
+            .timestamp(msg.timestamp_sort as i64, 0)
             .format(&format!("voice-message_%Y-%m-%d_%H-%M-%S.{}", &suffix))
             .to_string(),
         Viewtype::Image | Viewtype::Gif => format!(
             "{}.{}",
             if base_name.is_empty() {
                 chrono::Utc
-                    .timestamp(msg.timestamp_sort, 0)
+                    .timestamp(msg.timestamp_sort as i64, 0)
                     .format("image_%Y-%m-%d_%H-%M-%S")
                     .to_string()
             } else {
@@ -1235,7 +1155,7 @@ async fn build_body_file(
         Viewtype::Video => format!(
             "video_{}.{}",
             chrono::Utc
-                .timestamp(msg.timestamp_sort, 0)
+                .timestamp(msg.timestamp_sort as i64, 0)
                 .format("%Y-%m-%d_%H-%M-%S")
                 .to_string(),
             &suffix
@@ -1277,11 +1197,29 @@ async fn build_body_file(
     Ok((mail, filename_to_send))
 }
 
-fn build_selfavatar_file(context: &Context, path: &str) -> Result<String> {
+fn build_selfavatar_file(context: &Context, path: &str) -> Result<(PartBuilder, String), Error> {
     let blob = BlobObject::from_path(context, path)?;
+    let filename_to_send = match blob.suffix() {
+        Some(suffix) => format!("avatar.{}", suffix),
+        None => "avatar".to_string(),
+    };
+    let mimetype = match message::guess_msgtype_from_suffix(blob.as_rel_path()) {
+        Some(res) => res.1.parse()?,
+        None => mime::APPLICATION_OCTET_STREAM,
+    };
     let body = std::fs::read(blob.to_abs_path())?;
     let encoded_body = wrapped_base64_encode(&body);
-    Ok(encoded_body)
+
+    let part = PartBuilder::new()
+        .content_type(&mimetype)
+        .header((
+            "Content-Disposition",
+            format!("attachment; filename=\"{}\"", &filename_to_send),
+        ))
+        .header(("Content-Transfer-Encoding", "base64"))
+        .body(encoded_body);
+
+    Ok((part, filename_to_send))
 }
 
 fn recipients_contain_addr(recipients: &[(String, String)], addr: &str) -> bool {
@@ -1291,13 +1229,13 @@ fn recipients_contain_addr(recipients: &[(String, String)], addr: &str) -> bool
         .any(|(_, cur)| cur.to_lowercase() == addr_lc)
 }
 
-async fn is_file_size_okay(context: &Context, msg: &Message) -> Result<bool> {
-    match msg.param.get_path(Param::File, context)? {
+async fn is_file_size_okay(context: &Context, msg: &Message) -> bool {
+    match msg.param.get_path(Param::File, context).unwrap_or(None) {
         Some(path) => {
             let bytes = dc_get_filebytes(context, &path).await;
-            Ok(bytes <= UPPER_LIMIT_FILE_SIZE)
+            bytes <= UPPER_LIMIT_FILE_SIZE
         }
-        None => Ok(false),
+        None => false,
     }
 }
 
@@ -1345,16 +1283,14 @@ fn maybe_encode_words(words: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use async_std::prelude::*;
-
     use crate::chat::ChatId;
+
     use crate::contact::Origin;
     use crate::dc_receive_imf::dc_receive_imf;
     use crate::mimeparser::MimeMessage;
     use crate::test_utils::TestContext;
     use crate::{chatlist::Chatlist, test_utils::get_chat_msg};
 
-    use async_std::fs::File;
     use pretty_assertions::assert_eq;
 
     #[test]
@@ -1905,59 +1841,4 @@ mod tests {
 
         assert!(!headers.lines().any(|l| l.trim().is_empty()));
     }
-
-    #[async_std::test]
-    async fn test_selfavatar_unencrypted() -> anyhow::Result<()> {
-        // create chat with bob, set selfavatar
-        let t = TestContext::new_alice().await;
-        let chat = t.create_chat_with_contact("bob", "bob@example.org").await;
-
-        let file = t.dir.path().join("avatar.png");
-        let bytes = include_bytes!("../test-data/image/avatar64x64.png");
-        File::create(&file).await?.write_all(bytes).await?;
-        t.set_config(Config::Selfavatar, Some(file.to_str().unwrap()))
-            .await?;
-
-        // 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(Viewtype::Text);
-        msg.set_text(Some("this is the text!".to_string()));
-
-        let payload = t.send_msg(chat.id, &mut msg).await.payload();
-        let mut payload = payload.splitn(3, "\r\n\r\n");
-        let outer = payload.next().unwrap();
-        let inner = payload.next().unwrap();
-        let body = payload.next().unwrap();
-
-        assert_eq!(outer.match_indices("multipart/mixed").count(), 1);
-        assert_eq!(outer.match_indices("Subject:").count(), 1);
-        assert_eq!(outer.match_indices("Autocrypt:").count(), 1);
-        assert_eq!(outer.match_indices("Chat-User-Avatar:").count(), 0);
-
-        assert_eq!(inner.match_indices("text/plain").count(), 1);
-        assert_eq!(inner.match_indices("Chat-User-Avatar:").count(), 1);
-        assert_eq!(inner.match_indices("Subject:").count(), 0);
-
-        assert_eq!(body.match_indices("this is the text!").count(), 1);
-
-        // if another message is sent, that one must not contain the avatar
-        // and no artificial multipart/mixed nesting
-        let payload = t.send_msg(chat.id, &mut msg).await.payload();
-        let mut payload = payload.splitn(2, "\r\n\r\n");
-        let outer = payload.next().unwrap();
-        let body = payload.next().unwrap();
-
-        assert_eq!(outer.match_indices("text/plain").count(), 1);
-        assert_eq!(outer.match_indices("Subject:").count(), 1);
-        assert_eq!(outer.match_indices("Autocrypt:").count(), 1);
-        assert_eq!(outer.match_indices("multipart/mixed").count(), 0);
-        assert_eq!(outer.match_indices("Chat-User-Avatar:").count(), 0);
-
-        assert_eq!(body.match_indices("this is the text!").count(), 1);
-        assert_eq!(body.match_indices("text/plain").count(), 0);
-        assert_eq!(body.match_indices("Chat-User-Avatar:").count(), 0);
-        assert_eq!(body.match_indices("Subject:").count(), 0);
-
-        Ok(())
-    }
 }

src/mimeparser.rs

@@ -106,7 +106,7 @@ pub(crate) enum MailinglistType {
 #[derive(
     Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql,
 )]
-#[repr(u32)]
+#[repr(i32)]
 pub enum SystemMessage {
     Unknown = 0,
     GroupNameChanged = 2,
@@ -149,7 +149,7 @@ impl MimeMessage {
         let mut from = Default::default();
         let mut chat_disposition_notification_to = None;
 
-        // Parse IMF headers.
+        // init known headers with what mailparse provided us
         MimeMessage::merge_headers(
             context,
             &mut headers,
@@ -159,21 +159,6 @@ impl MimeMessage {
             &mail.headers,
         );
 
-        // Parse hidden headers.
-        let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
-        if mimetype.type_() == mime::MULTIPART && mimetype.subtype().as_str() == "mixed" {
-            if let Some(part) = mail.subparts.first() {
-                for field in &part.headers {
-                    let key = field.get_key().to_lowercase();
-
-                    // For now only Chat-User-Avatar can be hidden.
-                    if !headers.contains_key(&key) && key == "chat-user-avatar" {
-                        headers.insert(key.to_string(), field.get_value());
-                    }
-                }
-            }
-        }
-
         // remove headers that are allowed _only_ in the encrypted part
         headers.remove("secure-join-fingerprint");
         headers.remove("chat-verified");
@@ -278,7 +263,7 @@ impl MimeMessage {
         parser.maybe_remove_bad_parts();
         parser.maybe_remove_inline_mailinglist_footer();
         parser.heuristically_parse_ndn(context).await;
-        parser.parse_headers(context).await;
+        parser.parse_headers(context);
 
         if warn_empty_signature && parser.signatures.is_empty() {
             for part in parser.parts.iter_mut() {
@@ -325,13 +310,13 @@ impl MimeMessage {
     }
 
     /// Parses avatar action headers.
-    async fn parse_avatar_headers(&mut self, context: &Context) {
+    fn parse_avatar_headers(&mut self) {
         if let Some(header_value) = self.get(HeaderDef::ChatGroupAvatar).cloned() {
-            self.group_avatar = self.avatar_action_from_header(context, header_value).await;
+            self.group_avatar = self.avatar_action_from_header(header_value);
         }
 
         if let Some(header_value) = self.get(HeaderDef::ChatUserAvatar).cloned() {
-            self.user_avatar = self.avatar_action_from_header(context, header_value).await;
+            self.user_avatar = self.avatar_action_from_header(header_value);
         }
     }
 
@@ -421,9 +406,9 @@ impl MimeMessage {
         }
     }
 
-    async fn parse_headers(&mut self, context: &Context) {
+    fn parse_headers(&mut self, context: &Context) {
         self.parse_system_message_headers(context);
-        self.parse_avatar_headers(context).await;
+        self.parse_avatar_headers();
         self.parse_videochat_headers();
         self.squash_attachment_parts();
 
@@ -500,48 +485,10 @@ impl MimeMessage {
         }
     }
 
-    async fn avatar_action_from_header(
-        &mut self,
-        context: &Context,
-        header_value: String,
-    ) -> Option<AvatarAction> {
+    fn avatar_action_from_header(&mut self, header_value: String) -> Option<AvatarAction> {
         if header_value == "0" {
             Some(AvatarAction::Delete)
-        } else if let Some(avatar) = header_value
-            .split_ascii_whitespace()
-            .collect::<String>()
-            .strip_prefix("base64:")
-            .map(base64::decode)
-        {
-            // Avatar sent directly in the header as base64.
-            if let Ok(decoded_data) = avatar {
-                let extension = if let Ok(format) = image::guess_format(&decoded_data) {
-                    if let Some(ext) = format.extensions_str().first() {
-                        format!(".{}", ext)
-                    } else {
-                        String::new()
-                    }
-                } else {
-                    String::new()
-                };
-                match BlobObject::create(context, format!("avatar{}", extension), &decoded_data)
-                    .await
-                {
-                    Ok(blob) => Some(AvatarAction::Change(blob.as_name().to_string())),
-                    Err(err) => {
-                        warn!(
-                            context,
-                            "Could not save decoded avatar to blob file: {}", err
-                        );
-                        None
-                    }
-                }
-            } else {
-                None
-            }
         } else {
-            // Avatar sent in attachment, as previous versions of Delta Chat did.
-
             let mut i = 0;
             while let Some(part) = self.parts.get_mut(i) {
                 if let Some(part_filename) = &part.org_filename {
@@ -1268,16 +1215,10 @@ impl MimeMessage {
             for original_message_id in
                 std::iter::once(&report.original_message_id).chain(&report.additional_message_ids)
             {
-                match message::handle_mdn(context, from_id, original_message_id, sent_timestamp)
-                    .await
+                if let Some((chat_id, msg_id)) =
+                    message::handle_mdn(context, from_id, original_message_id, sent_timestamp).await
                 {
-                    Ok(Some((chat_id, msg_id))) => {
-                        context.emit_event(EventType::MsgRead { chat_id, msg_id });
-                    }
-                    Ok(None) => {}
-                    Err(err) => {
-                        warn!(context, "failed to handle_mdn: {:#}", err);
-                    }
+                    context.emit_event(EventType::MsgRead { chat_id, msg_id });
                 }
             }
         }
@@ -1304,7 +1245,7 @@ impl MimeMessage {
         {
             context
                 .sql
-                .query_get_value(
+                .query_get_value_result(
                     "SELECT timestamp FROM msgs WHERE rfc724_mid=?",
                     paramsv![field],
                 )
@@ -2800,19 +2741,6 @@ On 2020-10-25, Bob wrote:
         assert_eq!(mimeparser.parts[0].param.get(Param::Quote).unwrap(), "Now?");
     }
 
-    #[async_std::test]
-    async fn test_allinkl_blockquote() {
-        // all-inkl.com puts quotes into `<blockquote> </blockquote>`.
-        let t = TestContext::new().await;
-        let raw = include_bytes!("../test-data/message/allinkl-quote.eml");
-        let mimeparser = MimeMessage::from_bytes(&t, raw).await.unwrap();
-        assert!(mimeparser.parts[0].msg.starts_with("It's 1.0."));
-        assert_eq!(
-            mimeparser.parts[0].param.get(Param::Quote).unwrap(),
-            "What's the version?"
-        );
-    }
-
     #[async_std::test]
     async fn test_add_subj_to_multimedia_msg() {
         let t = TestContext::new_alice().await;

src/oauth2.rs

@@ -2,7 +2,6 @@
 
 use std::collections::HashMap;
 
-use anyhow::Result;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 
@@ -59,7 +58,11 @@ pub async fn dc_get_oauth2_url(
     if let Some(oauth2) = Oauth2::from_address(addr).await {
         if context
             .sql
-            .set_raw_config("oauth2_pending_redirect_uri", Some(redirect_uri.as_ref()))
+            .set_raw_config(
+                context,
+                "oauth2_pending_redirect_uri",
+                Some(redirect_uri.as_ref()),
+            )
             .await
             .is_err()
         {
@@ -79,25 +82,31 @@ pub async fn dc_get_oauth2_access_token(
     addr: impl AsRef<str>,
     code: impl AsRef<str>,
     regenerate: bool,
-) -> Result<Option<String>> {
+) -> Option<String> {
     if let Some(oauth2) = Oauth2::from_address(addr).await {
         let lock = context.oauth2_mutex.lock().await;
 
         // read generated token
-        if !regenerate && !is_expired(context).await? {
-            let access_token = context.sql.get_raw_config("oauth2_access_token").await?;
+        if !regenerate && !is_expired(context).await {
+            let access_token = context
+                .sql
+                .get_raw_config(context, "oauth2_access_token")
+                .await;
             if access_token.is_some() {
                 // success
-                return Ok(access_token);
+                return access_token;
             }
         }
 
         // generate new token: build & call auth url
-        let refresh_token = context.sql.get_raw_config("oauth2_refresh_token").await?;
+        let refresh_token = context
+            .sql
+            .get_raw_config(context, "oauth2_refresh_token")
+            .await;
         let refresh_token_for = context
             .sql
-            .get_raw_config("oauth2_refresh_token_for")
-            .await?
+            .get_raw_config(context, "oauth2_refresh_token_for")
+            .await
             .unwrap_or_else(|| "unset".into());
 
         let (redirect_uri, token_url, update_redirect_uri_on_success) =
@@ -106,8 +115,8 @@ pub async fn dc_get_oauth2_access_token(
                 (
                     context
                         .sql
-                        .get_raw_config("oauth2_pending_redirect_uri")
-                        .await?
+                        .get_raw_config(context, "oauth2_pending_redirect_uri")
+                        .await
                         .unwrap_or_else(|| "unset".into()),
                     oauth2.init_token,
                     true,
@@ -120,8 +129,8 @@ pub async fn dc_get_oauth2_access_token(
                 (
                     context
                         .sql
-                        .get_raw_config("oauth2_redirect_uri")
-                        .await?
+                        .get_raw_config(context, "oauth2_redirect_uri")
+                        .await
                         .unwrap_or_else(|| "unset".into()),
                     oauth2.refresh_token,
                     false,
@@ -157,7 +166,7 @@ pub async fn dc_get_oauth2_access_token(
         let mut req = surf::post(post_url).build();
         if let Err(err) = req.body_form(&post_param) {
             warn!(context, "Error calling OAuth2 at {}: {:?}", token_url, err);
-            return Ok(None);
+            return None;
         }
 
         let client = surf::Client::new();
@@ -167,7 +176,7 @@ pub async fn dc_get_oauth2_access_token(
                 context,
                 "Failed to parse OAuth2 JSON response from {}: error: {:?}", token_url, parsed
             );
-            return Ok(None);
+            return None;
         }
 
         // update refresh_token if given, typically on the first round, but we update it later as well.
@@ -175,12 +184,14 @@ pub async fn dc_get_oauth2_access_token(
         if let Some(ref token) = response.refresh_token {
             context
                 .sql
-                .set_raw_config("oauth2_refresh_token", Some(token))
-                .await?;
+                .set_raw_config(context, "oauth2_refresh_token", Some(token))
+                .await
+                .ok();
             context
                 .sql
-                .set_raw_config("oauth2_refresh_token_for", Some(code.as_ref()))
-                .await?;
+                .set_raw_config(context, "oauth2_refresh_token_for", Some(code.as_ref()))
+                .await
+                .ok();
         }
 
         // after that, save the access token.
@@ -188,8 +199,9 @@ pub async fn dc_get_oauth2_access_token(
         if let Some(ref token) = response.access_token {
             context
                 .sql
-                .set_raw_config("oauth2_access_token", Some(token))
-                .await?;
+                .set_raw_config(context, "oauth2_access_token", Some(token))
+                .await
+                .ok();
             let expires_in = response
                 .expires_in
                 // refresh a bit before
@@ -197,14 +209,16 @@ pub async fn dc_get_oauth2_access_token(
                 .unwrap_or_else(|| 0);
             context
                 .sql
-                .set_raw_config_int64("oauth2_timestamp_expires", expires_in)
-                .await?;
+                .set_raw_config_int64(context, "oauth2_timestamp_expires", expires_in)
+                .await
+                .ok();
 
             if update_redirect_uri_on_success {
                 context
                     .sql
-                    .set_raw_config("oauth2_redirect_uri", Some(redirect_uri.as_ref()))
-                    .await?;
+                    .set_raw_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref()))
+                    .await
+                    .ok();
             }
         } else {
             warn!(context, "Failed to find OAuth2 access token");
@@ -212,11 +226,11 @@ pub async fn dc_get_oauth2_access_token(
 
         drop(lock);
 
-        Ok(response.access_token)
+        response.access_token
     } else {
         warn!(context, "Internal OAuth2 error: 2");
 
-        Ok(None)
+        None
     }
 }
 
@@ -224,33 +238,27 @@ pub async fn dc_get_oauth2_addr(
     context: &Context,
     addr: impl AsRef<str>,
     code: impl AsRef<str>,
-) -> Result<Option<String>> {
-    let oauth2 = match Oauth2::from_address(addr.as_ref()).await {
-        Some(o) => o,
-        None => return Ok(None),
-    };
-    if oauth2.get_userinfo.is_none() {
-        return Ok(None);
-    }
+) -> Option<String> {
+    let oauth2 = Oauth2::from_address(addr.as_ref()).await?;
+    oauth2.get_userinfo?;
 
     if let Some(access_token) =
-        dc_get_oauth2_access_token(context, addr.as_ref(), code.as_ref(), false).await?
+        dc_get_oauth2_access_token(context, addr.as_ref(), code.as_ref(), false).await
     {
         let addr_out = oauth2.get_addr(context, access_token).await;
         if addr_out.is_none() {
             // regenerate
-            if let Some(access_token) =
-                dc_get_oauth2_access_token(context, addr, code, true).await?
+            if let Some(access_token) = dc_get_oauth2_access_token(context, addr, code, true).await
             {
-                Ok(oauth2.get_addr(context, access_token).await)
+                oauth2.get_addr(context, access_token).await
             } else {
-                Ok(None)
+                None
             }
         } else {
-            Ok(addr_out)
+            addr_out
         }
     } else {
-        Ok(None)
+        None
     }
 }
 
@@ -309,21 +317,21 @@ impl Oauth2 {
     }
 }
 
-async fn is_expired(context: &Context) -> Result<bool, crate::sql::Error> {
+async fn is_expired(context: &Context) -> bool {
     let expire_timestamp = context
         .sql
-        .get_raw_config_int64("oauth2_timestamp_expires")
-        .await?
+        .get_raw_config_int64(context, "oauth2_timestamp_expires")
+        .await
         .unwrap_or_default();
 
     if expire_timestamp <= 0 {
-        return Ok(false);
+        return false;
     }
     if expire_timestamp > time() {
-        return Ok(false);
+        return false;
     }
 
-    Ok(true)
+    true
 }
 
 fn replace_in_uri(uri: impl AsRef<str>, key: impl AsRef<str>, value: impl AsRef<str>) -> String {
@@ -391,7 +399,7 @@ mod tests {
         let ctx = TestContext::new().await;
         let addr = "dignifiedquire@gmail.com";
         let code = "fail";
-        let res = dc_get_oauth2_addr(&ctx.ctx, addr, code).await.unwrap();
+        let res = dc_get_oauth2_addr(&ctx.ctx, addr, code).await;
         // this should fail as it is an invalid password
         assert_eq!(res, None);
     }
@@ -411,9 +419,7 @@ mod tests {
         let ctx = TestContext::new().await;
         let addr = "dignifiedquire@gmail.com";
         let code = "fail";
-        let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, false)
-            .await
-            .unwrap();
+        let res = dc_get_oauth2_access_token(&ctx.ctx, addr, code, false).await;
         // this should fail as it is an invalid password
         assert_eq!(res, None);
     }

src/param.rs

@@ -333,7 +333,7 @@ impl Params {
 
     pub fn get_msg_id(&self) -> Option<MsgId> {
         self.get(Param::MsgId)
-            .and_then(|x| x.parse().ok())
+            .and_then(|x| x.parse::<u32>().ok())
             .map(MsgId::new)
     }
 

src/peerstate.rs

@@ -3,6 +3,9 @@
 use std::collections::HashSet;
 use std::fmt;
 
+use anyhow::{bail, Result};
+use num_traits::FromPrimitive;
+
 use crate::aheader::{Aheader, EncryptPreference};
 use crate::chat;
 use crate::constants::Blocked;
@@ -11,8 +14,6 @@ use crate::events::EventType;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey};
 use crate::sql::Sql;
 use crate::stock_str;
-use anyhow::{bail, Result};
-use num_traits::FromPrimitive;
 
 #[derive(Debug)]
 pub enum PeerstateKeyType {
@@ -165,15 +166,16 @@ impl Peerstate {
     async fn from_stmt(
         context: &Context,
         query: &str,
-        params: impl rusqlite::Params,
+        params: Vec<&dyn crate::ToSql>,
     ) -> Result<Option<Peerstate>> {
         let peerstate = context
             .sql
             .query_row_optional(query, params, |row| {
-                // all the above queries start with this: SELECT
-                //   addr, last_seen, last_seen_autocrypt, prefer_encrypted,
-                //   public_key, gossip_timestamp, gossip_key, public_key_fingerprint,
-                //   gossip_key_fingerprint, verified_key, verified_key_fingerprint
+                /* all the above queries start with this: SELECT
+                addr, last_seen, last_seen_autocrypt, prefer_encrypted,
+                public_key, gossip_timestamp, gossip_key, public_key_fingerprint,
+                gossip_key_fingerprint, verified_key, verified_key_fingerprint
+                */
 
                 let res = Peerstate {
                     addr: row.get(0)?,
@@ -264,7 +266,10 @@ impl Peerstate {
         if self.fingerprint_changed {
             if let Some(contact_id) = context
                 .sql
-                .query_get_value("SELECT id FROM contacts WHERE addr=?;", paramsv![self.addr])
+                .query_get_value_result(
+                    "SELECT id FROM contacts WHERE addr=?;",
+                    paramsv![self.addr],
+                )
                 .await?
             {
                 let (contact_chat_id, _) =
@@ -425,48 +430,31 @@ impl Peerstate {
         if self.to_save == Some(ToSave::All) || create {
             sql.execute(
                 if create {
-                    "INSERT INTO acpeerstates ( \
-                         last_seen, \
-                         last_seen_autocrypt, \
-                         prefer_encrypted, \
-                         public_key, \
-                         gossip_timestamp, \
-                         gossip_key, \
-                         public_key_fingerprint, \
-                         gossip_key_fingerprint, \
-                         verified_key, \
-                         verified_key_fingerprint, \
-                         addr \
+                    "INSERT INTO acpeerstates (last_seen, last_seen_autocrypt, prefer_encrypted, \
+                 public_key, gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, \
+                 verified_key, verified_key_fingerprint, addr \
                 ) VALUES(?,?,?,?,?,?,?,?,?,?,?)"
                 } else {
                     "UPDATE acpeerstates \
-                 SET last_seen=?, \
-                 last_seen_autocrypt=?, \
-                 prefer_encrypted=?, \
-                 public_key=?, \
-                 gossip_timestamp=?, \
-                 gossip_key=?, \
-                 public_key_fingerprint=?, \
-                 gossip_key_fingerprint=?, \
-                 verified_key=?, \
-                 verified_key_fingerprint=? \
+                 SET last_seen=?, last_seen_autocrypt=?, prefer_encrypted=?, \
+                 public_key=?, gossip_timestamp=?, gossip_key=?, public_key_fingerprint=?, gossip_key_fingerprint=?, \
+                 verified_key=?, verified_key_fingerprint=? \
                  WHERE addr=?"
                 },
                 paramsv![
-                    self.last_seen,
-                    self.last_seen_autocrypt,
-                    self.prefer_encrypt as i64,
-                    self.public_key.as_ref().map(|k| k.to_bytes()),
-                    self.gossip_timestamp,
-                    self.gossip_key.as_ref().map(|k| k.to_bytes()),
-                    self.public_key_fingerprint.as_ref().map(|fp| fp.hex()),
-                    self.gossip_key_fingerprint.as_ref().map(|fp| fp.hex()),
-                    self.verified_key.as_ref().map(|k| k.to_bytes()),
-                    self.verified_key_fingerprint.as_ref().map(|fp| fp.hex()),
-                    self.addr,
+                self.last_seen,
+                self.last_seen_autocrypt,
+                self.prefer_encrypt as i64,
+                self.public_key.as_ref().map(|k| k.to_bytes()),
+                self.gossip_timestamp,
+                self.gossip_key.as_ref().map(|k| k.to_bytes()),
+                self.public_key_fingerprint.as_ref().map(|fp| fp.hex()),
+                self.gossip_key_fingerprint.as_ref().map(|fp| fp.hex()),
+                self.verified_key.as_ref().map(|k| k.to_bytes()),
+                self.verified_key_fingerprint.as_ref().map(|fp| fp.hex()),
+                self.addr,
                 ],
-            )
-            .await?;
+                ).await?;
         } else if self.to_save == Some(ToSave::Timestamps) {
             sql.execute(
                 "UPDATE acpeerstates SET last_seen=?, last_seen_autocrypt=?, gossip_timestamp=? \

src/provider/mod.rs

@@ -10,24 +10,24 @@ use chrono::{NaiveDateTime, NaiveTime};
 #[derive(Debug, Display, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Status {
-    Ok = 1,
-    Preparation = 2,
-    Broken = 3,
+    OK = 1,
+    PREPARATION = 2,
+    BROKEN = 3,
 }
 
 #[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Protocol {
-    Smtp = 1,
-    Imap = 2,
+    SMTP = 1,
+    IMAP = 2,
 }
 
 #[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Socket {
     Automatic = 0,
-    Ssl = 1,
-    Starttls = 2,
+    SSL = 1,
+    STARTTLS = 2,
     Plain = 3,
 }
 
@@ -40,8 +40,8 @@ impl Default for Socket {
 #[derive(Debug, PartialEq, Clone)]
 #[repr(u8)]
 pub enum UsernamePattern {
-    Email = 1,
-    Emaillocalpart = 2,
+    EMAIL = 1,
+    EMAILLOCALPART = 2,
 }
 
 #[derive(Debug, PartialEq)]
@@ -51,7 +51,7 @@ pub enum Oauth2Authorizer {
     Gmail = 2,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone)]
 pub struct Server {
     pub protocol: Protocol,
     pub socket: Socket,
@@ -60,13 +60,13 @@ pub struct Server {
     pub username_pattern: UsernamePattern,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug)]
 pub struct ConfigDefault {
     pub key: Config,
     pub value: &'static str,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug)]
 pub struct Provider {
     /// Unique ID, corresponding to provider database filename.
     pub id: &'static str,
@@ -151,8 +151,6 @@ pub async fn get_provider_by_mx(domain: impl AsRef<str>) -> Option<&'static Prov
     None
 }
 
-// TODO: uncomment when clippy starts complaining about it
-//#[allow(clippy::manual_map)] // Can't use .map() because the lifetime is not propagated
 pub fn get_provider_by_id(id: &str) -> Option<&'static Provider> {
     if let Some(provider) = PROVIDER_IDS.get(id) {
         Some(provider)
@@ -183,34 +181,34 @@ mod tests {
     #[test]
     fn test_get_provider_by_domain_mixed_case() {
         let provider = get_provider_by_domain("nAUta.Cu").unwrap();
-        assert!(provider.status == Status::Ok);
+        assert!(provider.status == Status::OK);
     }
 
     #[test]
     fn test_get_provider_by_domain() {
         let addr = "nauta.cu";
         let provider = get_provider_by_domain(addr).unwrap();
-        assert!(provider.status == Status::Ok);
+        assert!(provider.status == Status::OK);
         let server = &provider.server[0];
-        assert_eq!(server.protocol, Protocol::Imap);
-        assert_eq!(server.socket, Socket::Starttls);
+        assert_eq!(server.protocol, Protocol::IMAP);
+        assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "imap.nauta.cu");
         assert_eq!(server.port, 143);
-        assert_eq!(server.username_pattern, UsernamePattern::Email);
+        assert_eq!(server.username_pattern, UsernamePattern::EMAIL);
         let server = &provider.server[1];
-        assert_eq!(server.protocol, Protocol::Smtp);
-        assert_eq!(server.socket, Socket::Starttls);
+        assert_eq!(server.protocol, Protocol::SMTP);
+        assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "smtp.nauta.cu");
         assert_eq!(server.port, 25);
-        assert_eq!(server.username_pattern, UsernamePattern::Email);
+        assert_eq!(server.username_pattern, UsernamePattern::EMAIL);
 
         let provider = get_provider_by_domain("gmail.com").unwrap();
-        assert!(provider.status == Status::Preparation);
+        assert!(provider.status == Status::PREPARATION);
         assert!(!provider.before_login_hint.is_empty());
         assert!(!provider.overview_page.is_empty());
 
         let provider = get_provider_by_domain("googlemail.com").unwrap();
-        assert!(provider.status == Status::Preparation);
+        assert!(provider.status == Status::PREPARATION);
     }
 
     #[test]

src/provider/update.py

@@ -103,8 +103,8 @@ def process_data(data, file):
             if username_pattern != "EMAIL" and username_pattern != "EMAILLOCALPART":
                 raise TypeError("bad username pattern")
 
-            server += ("        Server { protocol: " + protocol.capitalize() + ", socket: " + socket.capitalize() + ", hostname: \""
-            + hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern.capitalize() + " },\n")
+            server += ("        Server { protocol: " + protocol + ", socket: " + socket + ", hostname: \""
+            + hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern + " },\n")
 
     config_defaults = process_config_defaults(data)
 
@@ -123,7 +123,7 @@ def process_data(data, file):
     if (not has_imap and not has_smtp) or (has_imap and has_smtp):
         provider += "static " + file2varname(file) + ": Lazy<Provider> = Lazy::new(|| Provider {\n"
         provider += "    id: \"" + file2id(file) + "\",\n"
-        provider += "    status: Status::" + status.capitalize() + ",\n"
+        provider += "    status: Status::" + status + ",\n"
         provider += "    before_login_hint: \"" + before_login_hint + "\",\n"
         provider += "    after_login_hint: \"" + after_login_hint + "\",\n"
         provider += "    overview_page: \"" + file2url(file) + "\",\n"
@@ -175,7 +175,7 @@ if __name__ == "__main__":
     "use crate::provider::Protocol::*;\n"
     "use crate::provider::Socket::*;\n"
     "use crate::provider::UsernamePattern::*;\n"
-    "use crate::provider::{Config, ConfigDefault, Oauth2Authorizer, Provider, Server, Status};\n"
+    "use crate::provider::*;\n"
     "use std::collections::HashMap;\n\n"
     "use once_cell::sync::Lazy;\n\n")
 

src/qr.rs

@@ -27,11 +27,11 @@ const HTTP_SCHEME: &str = "http://";
 const HTTPS_SCHEME: &str = "https://";
 
 // Make it easy to convert errors into the final `Lot`.
-impl From<Error> for Lot {
-    fn from(error: Error) -> Self {
-        let mut l = Self::new();
+impl Into<Lot> for Error {
+    fn into(self) -> Lot {
+        let mut l = Lot::new();
         l.state = LotState::QrError;
-        l.text1 = Some(error.to_string());
+        l.text1 = Some(self.to_string());
 
         l
     }
@@ -72,7 +72,6 @@ pub async fn check_qr(context: &Context, qr: impl AsRef<str>) -> Lot {
 
 /// scheme: `OPENPGP4FPR:FINGERPRINT#a=ADDR&n=NAME&i=INVITENUMBER&s=AUTH`
 ///     or: `OPENPGP4FPR:FINGERPRINT#a=ADDR&g=GROUPNAME&x=GROUPID&i=INVITENUMBER&s=AUTH`
-///     or: `OPENPGP4FPR:FINGERPRINT#a=ADDR`
 #[allow(clippy::indexing_slicing)]
 async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
     let payload = &qr[OPENPGP4FPR_SCHEME.len()..];
@@ -170,14 +169,6 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
                 .unwrap_or_default();
 
             chat::add_info_msg(context, id, format!("{} verified.", peerstate.addr)).await;
-        } else if let Some(addr) = addr {
-            lot.state = LotState::QrFprMismatch;
-            lot.id = match Contact::lookup_id_by_addr(context, &addr, Origin::Unknown).await {
-                Ok(contact_id) => contact_id.unwrap_or_default(),
-                Err(err) => {
-                    return format_err!("Error looking up contact {:?}: {}", addr, err).into()
-                }
-            };
         } else {
             lot.state = LotState::QrFprWithoutAddr;
             lot.text1 = Some(fingerprint.to_string());
@@ -445,10 +436,7 @@ fn normalize_address(addr: &str) -> Result<String, Error> {
 mod tests {
     use super::*;
 
-    use crate::aheader::EncryptPreference;
-    use crate::key::DcKey;
-    use crate::peerstate::ToSave;
-    use crate::test_utils::{alice_keypair, TestContext};
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_decode_http() {
@@ -637,59 +625,6 @@ mod tests {
         assert_eq!(contact.get_name(), "");
     }
 
-    #[async_std::test]
-    async fn test_decode_openpgp_fingerprint() {
-        let ctx = TestContext::new().await;
-
-        let contact_id = Contact::create(&ctx, "Alice", "alice@example.com")
-            .await
-            .expect("failed to create contact");
-        let pub_key = alice_keypair().public;
-        let peerstate = Peerstate {
-            addr: "alice@example.com".to_string(),
-            last_seen: 1,
-            last_seen_autocrypt: 1,
-            prefer_encrypt: EncryptPreference::Mutual,
-            public_key: Some(pub_key.clone()),
-            public_key_fingerprint: Some(pub_key.fingerprint()),
-            gossip_key: None,
-            gossip_timestamp: 0,
-            gossip_key_fingerprint: None,
-            verified_key: None,
-            verified_key_fingerprint: None,
-            to_save: Some(ToSave::All),
-            fingerprint_changed: false,
-        };
-        assert!(
-            peerstate.save_to_db(&ctx.ctx.sql, true).await.is_ok(),
-            "failed to save peerstate"
-        );
-
-        let res = check_qr(
-            &ctx.ctx,
-            "OPENPGP4FPR:1234567890123456789012345678901234567890#a=alice@example.com",
-        )
-        .await;
-        assert_eq!(res.get_state(), LotState::QrFprMismatch);
-        assert_eq!(res.get_id(), contact_id);
-
-        let res = check_qr(
-            &ctx.ctx,
-            format!("OPENPGP4FPR:{}#a=alice@example.com", pub_key.fingerprint()),
-        )
-        .await;
-        assert_eq!(res.get_state(), LotState::QrFprOk);
-        assert_eq!(res.get_id(), contact_id);
-
-        let res = check_qr(
-            &ctx.ctx,
-            "OPENPGP4FPR:1234567890123456789012345678901234567890#a=bob@example.org",
-        )
-        .await;
-        assert_eq!(res.get_state(), LotState::QrFprMismatch);
-        assert_eq!(res.get_id(), 0);
-    }
-
     #[async_std::test]
     async fn test_decode_openpgp_without_addr() {
         let ctx = TestContext::new().await;
@@ -791,39 +726,20 @@ mod tests {
     async fn test_set_config_from_qr() {
         let ctx = TestContext::new().await;
 
-        assert!(ctx
-            .ctx
-            .get_config(Config::WebrtcInstance)
-            .await
-            .unwrap()
-            .is_none());
+        assert!(ctx.ctx.get_config(Config::WebrtcInstance).await.is_none());
 
         let res = set_config_from_qr(&ctx.ctx, "badqr:https://example.org/").await;
         assert!(!res.is_ok());
-        assert!(ctx
-            .ctx
-            .get_config(Config::WebrtcInstance)
-            .await
-            .unwrap()
-            .is_none());
+        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_ok());
-        assert!(ctx
-            .ctx
-            .get_config(Config::WebrtcInstance)
-            .await
-            .unwrap()
-            .is_none());
+        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!(
-            ctx.ctx
-                .get_config(Config::WebrtcInstance)
-                .await
-                .unwrap()
-                .unwrap(),
+            ctx.ctx.get_config(Config::WebrtcInstance).await.unwrap(),
             "https://example.org/"
         );
 
@@ -831,11 +747,7 @@ mod tests {
             set_config_from_qr(&ctx.ctx, "DCWEBRTC:basicwebrtc:https://foo.bar/?$ROOM&test").await;
         assert!(res.is_ok());
         assert_eq!(
-            ctx.ctx
-                .get_config(Config::WebrtcInstance)
-                .await
-                .unwrap()
-                .unwrap(),
+            ctx.ctx.get_config(Config::WebrtcInstance).await.unwrap(),
             "basicwebrtc:https://foo.bar/?$ROOM&test"
         );
     }

src/scheduler.rs

@@ -77,11 +77,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
                 Some(job) => {
                     // Let the fetch run, but return back to the job afterwards.
                     jobs_loaded = 0;
-                    if ctx
-                        .get_config_bool(Config::InboxWatch)
-                        .await
-                        .unwrap_or_default()
-                    {
+                    if ctx.get_config_bool(Config::InboxWatch).await {
                         info!(ctx, "postponing imap-job {} to run fetch...", job);
                         fetch(&ctx, &mut connection).await;
                     }
@@ -97,11 +93,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
 
                     maybe_add_time_based_warnings(&ctx).await;
 
-                    info = if ctx
-                        .get_config_bool(Config::InboxWatch)
-                        .await
-                        .unwrap_or_default()
-                    {
+                    info = if ctx.get_config_bool(Config::InboxWatch).await {
                         fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await
                     } else {
                         if let Err(err) = connection.scan_folders(&ctx).await {
@@ -129,7 +121,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
 
 async fn fetch(ctx: &Context, connection: &mut Imap) {
     match ctx.get_config(Config::ConfiguredInboxFolder).await {
-        Ok(Some(watch_folder)) => {
+        Some(watch_folder) => {
             if let Err(err) = connection.connect_configured(ctx).await {
                 error_network!(ctx, "{}", err);
                 return;
@@ -141,23 +133,16 @@ async fn fetch(ctx: &Context, connection: &mut Imap) {
                 warn!(ctx, "{:#}", err);
             }
         }
-        Ok(None) => {
+        None => {
             warn!(ctx, "Can not fetch inbox folder, not set");
             connection.fake_idle(ctx, None).await;
         }
-        Err(err) => {
-            warn!(
-                ctx,
-                "Can not fetch inbox folder, failed to get config: {:?}", err
-            );
-            connection.fake_idle(ctx, None).await;
-        }
     }
 }
 
 async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> InterruptInfo {
     match ctx.get_config(folder).await {
-        Ok(Some(watch_folder)) => {
+        Some(watch_folder) => {
             // connect and fake idle if unable to connect
             if let Err(err) = connection.connect_configured(ctx).await {
                 warn!(ctx, "imap connection failed: {}", err);
@@ -193,17 +178,10 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
                 connection.fake_idle(ctx, Some(watch_folder)).await
             }
         }
-        Ok(None) => {
+        None => {
             warn!(ctx, "Can not watch {} folder, not set", folder);
             connection.fake_idle(ctx, None).await
         }
-        Err(err) => {
-            warn!(
-                ctx,
-                "Can not watch {} folder, failed to retrieve config: {:?}", folder, err
-            );
-            connection.fake_idle(ctx, None).await
-        }
     }
 }
 
@@ -321,11 +299,7 @@ impl Scheduler {
             }))
         };
 
-        if ctx
-            .get_config_bool(Config::MvboxWatch)
-            .await
-            .unwrap_or_default()
-        {
+        if ctx.get_config_bool(Config::MvboxWatch).await {
             let ctx = ctx.clone();
             mvbox_handle = Some(task::spawn(async move {
                 simple_imap_loop(
@@ -343,11 +317,7 @@ impl Scheduler {
                 .expect("mvbox start send, missing receiver");
         }
 
-        if ctx
-            .get_config_bool(Config::SentboxWatch)
-            .await
-            .unwrap_or_default()
-        {
+        if ctx.get_config_bool(Config::SentboxWatch).await {
             let ctx = ctx.clone();
             sentbox_handle = Some(task::spawn(async move {
                 simple_imap_loop(
@@ -553,9 +523,9 @@ impl SmtpConnectionState {
         };
 
         let state = ConnectionState {
+            idle_interrupt_sender,
             shutdown_receiver,
             stop_sender,
-            idle_interrupt_sender,
         };
 
         let conn = SmtpConnectionState { state };
@@ -600,9 +570,9 @@ impl ImapConnectionState {
         };
 
         let state = ConnectionState {
+            idle_interrupt_sender,
             shutdown_receiver,
             stop_sender,
-            idle_interrupt_sender,
         };
 
         let conn = ImapConnectionState { state };

src/securejoin/bobstate.rs

@@ -60,11 +60,14 @@ pub struct BobStateHandle<'a> {
 impl<'a> BobStateHandle<'a> {
     /// Creates a new instance, upholding the guarantee that [`BobState`] must exist.
     pub fn from_guard(mut guard: MutexGuard<'a, Option<BobState>>) -> Option<Self> {
-        guard.take().map(|bobstate| Self {
-            guard,
-            bobstate,
-            clear_state_on_drop: false,
-        })
+        match guard.take() {
+            Some(bobstate) => Some(Self {
+                guard,
+                bobstate,
+                clear_state_on_drop: false,
+            }),
+            None => None,
+        }
     }
 
     /// Returns the [`ChatId`] of the 1:1 chat with the inviter (Alice).
@@ -188,7 +191,7 @@ impl BobState {
         let chat_id = chat::create_by_contact_id(context, invite.contact_id())
             .await
             .map_err(JoinError::UnknownContact)?;
-        if fingerprint_equals_sender(context, invite.fingerprint(), chat_id).await? {
+        if fingerprint_equals_sender(context, invite.fingerprint(), chat_id).await {
             // The scanned fingerprint matches Alice's key, we can proceed to step 4b.
             info!(context, "Taking securejoin protocol shortcut");
             let state = Self {
@@ -297,7 +300,7 @@ impl BobState {
             self.next = SecureJoinStep::Terminated;
             return Ok(Some(BobHandshakeStage::Terminated(reason)));
         }
-        if !fingerprint_equals_sender(context, self.invite.fingerprint(), self.chat_id).await? {
+        if !fingerprint_equals_sender(context, self.invite.fingerprint(), self.chat_id).await {
             self.next = SecureJoinStep::Terminated;
             return Ok(Some(BobHandshakeStage::Terminated("Fingerprint mismatch")));
         }

src/securejoin/mod.rs

@@ -173,16 +173,9 @@ pub async fn dc_get_securejoin_qr(context: &Context, group: Option<ChatId>) -> O
     let invitenumber = token::lookup_or_new(context, token::Namespace::InviteNumber, group).await;
     let auth = token::lookup_or_new(context, token::Namespace::Auth, group).await;
     let self_addr = match context.get_config(Config::ConfiguredAddr).await {
-        Ok(Some(addr)) => addr,
-        Ok(None) => {
-            error!(context, "Not configured, cannot generate QR code.");
-            return None;
-        }
-        Err(err) => {
-            error!(
-                context,
-                "Unable to retrieve configuration, cannot generate QR code: {:?}", err
-            );
+        Some(addr) => addr,
+        None => {
+            error!(context, "Not configured, cannot generate QR code.",);
             return None;
         }
     };
@@ -190,7 +183,6 @@ pub async fn dc_get_securejoin_qr(context: &Context, group: Option<ChatId>) -> O
     let self_name = context
         .get_config(Config::Displayname)
         .await
-        .ok()?
         .unwrap_or_default();
 
     let fingerprint: Fingerprint = match get_self_fingerprint(context).await {
@@ -271,8 +263,6 @@ pub enum JoinError {
     MissingChat(#[source] sql::Error),
     #[error("Ongoing sender dropped (this is a bug)")]
     OngoingSenderDropped,
-    #[error("Other")]
-    Other(#[from] anyhow::Error),
 }
 
 /// Take a scanned QR-code and do the setup-contact/join-group/invite handshake.
@@ -300,7 +290,6 @@ async fn securejoin(context: &Context, qr: &str) -> Result<ChatId, JoinError> {
 
     info!(context, "Requesting secure-join ...",);
     let qr_scan = check_qr(context, &qr).await;
-
     let invite = QrInvite::try_from(qr_scan)?;
 
     match context.bob.start_protocol(context, invite.clone()).await? {
@@ -401,11 +390,11 @@ async fn send_handshake_msg(
     Ok(())
 }
 
-async fn chat_id_2_contact_id(context: &Context, contact_chat_id: ChatId) -> Result<u32, Error> {
-    if let [contact_id] = chat::get_chat_contacts(context, contact_chat_id).await?[..] {
-        Ok(contact_id)
+async fn chat_id_2_contact_id(context: &Context, contact_chat_id: ChatId) -> u32 {
+    if let [contact_id] = chat::get_chat_contacts(context, contact_chat_id).await[..] {
+        contact_id
     } else {
-        Ok(0)
+        0
     }
 }
 
@@ -413,8 +402,8 @@ async fn fingerprint_equals_sender(
     context: &Context,
     fingerprint: &Fingerprint,
     contact_chat_id: ChatId,
-) -> Result<bool, Error> {
-    if let [contact_id] = chat::get_chat_contacts(context, contact_chat_id).await?[..] {
+) -> bool {
+    if let [contact_id] = chat::get_chat_contacts(context, contact_chat_id).await[..] {
         if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
             let peerstate = match Peerstate::from_addr(context, contact.get_addr()).await {
                 Ok(peerstate) => peerstate,
@@ -425,7 +414,7 @@ async fn fingerprint_equals_sender(
                         contact.get_addr(),
                         err
                     );
-                    return Ok(false);
+                    return false;
                 }
             };
 
@@ -433,12 +422,12 @@ async fn fingerprint_equals_sender(
                 if peerstate.public_key_fingerprint.is_some()
                     && fingerprint == peerstate.public_key_fingerprint.as_ref().unwrap()
                 {
-                    return Ok(true);
+                    return true;
                 }
             }
         }
     }
-    Ok(false)
+    false
 }
 
 /// What to do with a Secure-Join handshake message after it was handled.
@@ -563,7 +552,7 @@ pub(crate) async fn handle_securejoin_handshake(
                 Some(mut bobstate) => match bobstate.handle_message(context, mime_message).await {
                     Some(BobHandshakeStage::Terminated(why)) => {
                         could_not_establish_secure_connection(context, bobstate.chat_id(), why)
-                            .await?;
+                            .await;
                         Ok(HandshakeMessage::Done)
                     }
                     Some(_stage) => {
@@ -592,7 +581,7 @@ pub(crate) async fn handle_securejoin_handshake(
                         contact_chat_id,
                         "Fingerprint not provided.",
                     )
-                    .await?;
+                    .await;
                     return Ok(HandshakeMessage::Ignore);
                 }
             };
@@ -602,16 +591,16 @@ pub(crate) async fn handle_securejoin_handshake(
                     contact_chat_id,
                     "Auth not encrypted.",
                 )
-                .await?;
+                .await;
                 return Ok(HandshakeMessage::Ignore);
             }
-            if !fingerprint_equals_sender(context, &fingerprint, contact_chat_id).await? {
+            if !fingerprint_equals_sender(context, &fingerprint, contact_chat_id).await {
                 could_not_establish_secure_connection(
                     context,
                     contact_chat_id,
                     "Fingerprint mismatch on inviter-side.",
                 )
-                .await?;
+                .await;
                 return Ok(HandshakeMessage::Ignore);
             }
             info!(context, "Fingerprint verified.",);
@@ -624,13 +613,13 @@ pub(crate) async fn handle_securejoin_handshake(
                         contact_chat_id,
                         "Auth not provided.",
                     )
-                    .await?;
+                    .await;
                     return Ok(HandshakeMessage::Ignore);
                 }
             };
             if !token::exists(context, token::Namespace::Auth, auth_0).await {
                 could_not_establish_secure_connection(context, contact_chat_id, "Auth invalid.")
-                    .await?;
+                    .await;
                 return Ok(HandshakeMessage::Ignore);
             }
             if mark_peer_as_verified(context, &fingerprint).await.is_err() {
@@ -639,12 +628,12 @@ pub(crate) async fn handle_securejoin_handshake(
                     contact_chat_id,
                     "Fingerprint mismatch on inviter-side.",
                 )
-                .await?;
+                .await;
                 return Ok(HandshakeMessage::Ignore);
             }
             Contact::scaleup_origin_by_id(context, contact_id, Origin::SecurejoinInvited).await;
             info!(context, "Auth verified.",);
-            secure_connection_established(context, contact_chat_id).await?;
+            secure_connection_established(context, contact_chat_id).await;
             emit_event!(context, EventType::ContactsChanged(Some(contact_id)));
             inviter_progress!(context, contact_id, 600);
             if join_vg {
@@ -704,12 +693,12 @@ pub(crate) async fn handle_securejoin_handshake(
                 Some(mut bobstate) => match bobstate.handle_message(context, mime_message).await {
                     Some(BobHandshakeStage::Terminated(why)) => {
                         could_not_establish_secure_connection(context, bobstate.chat_id(), why)
-                            .await?;
+                            .await;
                         Ok(HandshakeMessage::Done)
                     }
                     Some(BobHandshakeStage::Completed) => {
                         // Can only be BobHandshakeStage::Completed
-                        secure_connection_established(context, bobstate.chat_id()).await?;
+                        secure_connection_established(context, bobstate.chat_id()).await;
                         Ok(retval)
                     }
                     Some(_) => {
@@ -823,7 +812,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                     contact_chat_id,
                     "Message not encrypted correctly.",
                 )
-                .await?;
+                .await;
                 return Ok(HandshakeMessage::Ignore);
             }
             let fingerprint: Fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint)
@@ -835,7 +824,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                         contact_chat_id,
                         "Fingerprint not provided, please update Delta Chat on all your devices.",
                     )
-                    .await?;
+                    .await;
                     return Ok(HandshakeMessage::Ignore);
                 }
             };
@@ -845,7 +834,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                     contact_chat_id,
                     format!("Fingerprint mismatch on observing {}.", step).as_ref(),
                 )
-                .await?;
+                .await;
                 return Ok(HandshakeMessage::Ignore);
             }
             Ok(if step.as_str() == "vg-member-added" {
@@ -858,11 +847,8 @@ pub(crate) async fn observe_securejoin_on_other_device(
     }
 }
 
-async fn secure_connection_established(
-    context: &Context,
-    contact_chat_id: ChatId,
-) -> Result<(), Error> {
-    let contact_id = chat_id_2_contact_id(context, contact_chat_id).await?;
+async fn secure_connection_established(context: &Context, contact_chat_id: ChatId) {
+    let contact_id: u32 = chat_id_2_contact_id(context, contact_chat_id).await;
     let contact = Contact::get_by_id(context, contact_id).await;
 
     let addr = if let Ok(ref contact) = contact {
@@ -874,16 +860,14 @@ async fn secure_connection_established(
     chat::add_info_msg(context, contact_chat_id, msg).await;
     emit_event!(context, EventType::ChatModified(contact_chat_id));
     info!(context, "StockMessage::ContactVerified posted to 1:1 chat");
-
-    Ok(())
 }
 
 async fn could_not_establish_secure_connection(
     context: &Context,
     contact_chat_id: ChatId,
     details: &str,
-) -> Result<(), Error> {
-    let contact_id = chat_id_2_contact_id(context, contact_chat_id).await?;
+) {
+    let contact_id = chat_id_2_contact_id(context, contact_chat_id).await;
     let contact = Contact::get_by_id(context, contact_id).await;
     let msg = stock_str::contact_not_verified(
         context,
@@ -900,8 +884,6 @@ async fn could_not_establish_secure_connection(
         context,
         "StockMessage::ContactNotVerified posted to 1:1 chat ({})", details
     );
-
-    Ok(())
 }
 
 async fn mark_peer_as_verified(context: &Context, fingerprint: &Fingerprint) -> Result<(), Error> {
@@ -1079,7 +1061,6 @@ mod tests {
             let chat = alice.create_chat(&bob).await;
             let msg_id = chat::get_chat_msgs(&alice.ctx, chat.get_id(), 0x1, None)
                 .await
-                .unwrap()
                 .into_iter()
                 .filter_map(|item| match item {
                     chat::ChatItem::Message { msg_id } => Some(msg_id),
@@ -1128,7 +1109,6 @@ mod tests {
             let chat = bob.create_chat(&alice).await;
             let msg_id = chat::get_chat_msgs(&bob.ctx, chat.get_id(), 0x1, None)
                 .await
-                .unwrap()
                 .into_iter()
                 .filter_map(|item| match item {
                     chat::ChatItem::Message { msg_id } => Some(msg_id),

src/smtp/mod.rs

@@ -22,24 +22,25 @@ const SMTP_TIMEOUT: u64 = 30;
 pub enum Error {
     #[error("Bad parameters")]
     BadParameters,
+
     #[error("Invalid login address {address}: {error}")]
     InvalidLoginAddress {
         address: String,
         #[source]
         error: error::Error,
     },
+
     #[error("SMTP: failed to connect: {0}")]
     ConnectionFailure(#[source] smtp::error::Error),
+
     #[error("SMTP: failed to setup connection {0:?}")]
     ConnectionSetupFailure(#[source] smtp::error::Error),
+
     #[error("SMTP: oauth2 error {address}")]
     Oauth2Error { address: String },
-    #[error("TLS error {0}")]
+
+    #[error("TLS error")]
     Tls(#[from] async_native_tls::Error),
-    #[error("Sql {0}")]
-    Sql(#[from] crate::sql::Error),
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -99,7 +100,7 @@ impl Smtp {
             return Ok(());
         }
 
-        let lp = LoginParam::from_database(context, "configured_").await?;
+        let lp = LoginParam::from_database(context, "configured_").await;
         let res = self
             .connect(
                 context,
@@ -163,7 +164,7 @@ impl Smtp {
         let (creds, mechanism) = if oauth2 {
             // oauth2
             let send_pw = &lp.password;
-            let access_token = dc_get_oauth2_access_token(context, addr, send_pw, false).await?;
+            let access_token = dc_get_oauth2_access_token(context, addr, send_pw, false).await;
             if access_token.is_none() {
                 return Err(Error::Oauth2Error {
                     address: addr.to_string(),
@@ -192,7 +193,7 @@ impl Smtp {
 
         let security = match lp.security {
             Socket::Plain => smtp::ClientSecurity::None,
-            Socket::Starttls => smtp::ClientSecurity::Required(tls_parameters),
+            Socket::STARTTLS => smtp::ClientSecurity::Required(tls_parameters),
             _ => smtp::ClientSecurity::Wrapper(tls_parameters),
         };
 

src/smtp/send.rs

@@ -15,12 +15,12 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub enum Error {
     #[error("Envelope error: {}", _0)]
     EnvelopeError(#[from] async_smtp::error::Error),
+
     #[error("Send error: {}", _0)]
     SendError(#[from] async_smtp::smtp::error::Error),
+
     #[error("SMTP has no transport")]
     NoTransport,
-    #[error("{}", _0)]
-    Other(#[from] anyhow::Error),
 }
 
 impl Smtp {
@@ -36,7 +36,7 @@ impl Smtp {
         let message_len_bytes = message.len();
 
         let mut chunk_size = DEFAULT_MAX_SMTP_RCPT_TO;
-        if let Some(provider) = context.get_configured_provider().await? {
+        if let Some(provider) = context.get_configured_provider().await {
             if let Some(max_smtp_rcpt_to) = provider.max_smtp_rcpt_to {
                 chunk_size = max_smtp_rcpt_to as usize;
             }

src/sql/error.rs

@@ -1,21 +0,0 @@
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("Sqlite error: {0:?}")]
-    Sql(#[from] rusqlite::Error),
-    #[error("Sqlite Connection Pool Error: {0:?}")]
-    ConnectionPool(#[from] r2d2::Error),
-    #[error("Sqlite: Connection closed")]
-    SqlNoConnection,
-    #[error("Sqlite: Already open")]
-    SqlAlreadyOpen,
-    #[error("Sqlite: Failed to open")]
-    SqlFailedToOpen,
-    #[error("{0}")]
-    Io(#[from] std::io::Error),
-    // #[error("{0:?}")]
-    // BlobError(#[from] crate::blob::BlobError),
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
-}
-
-pub type Result<T> = std::result::Result<T, Error>;