trying trying

.circleci/config.yml

@@ -138,6 +138,12 @@ jobs:
             - py-docs
             - wheelhouse
 
+  remote_tests_rust:
+    machine: true
+    steps:
+      - checkout
+      - run: ci_scripts/remote_tests_rust.sh
+    
   remote_tests_python:
     machine: true
     steps:
@@ -172,6 +178,11 @@ workflows:
     jobs:
       # - cargo_fetch
 
+      - remote_tests_rust:
+          filters:
+            tags:
+              only: /.*/
+
       - remote_tests_python:
           filters:
             tags:
@@ -180,9 +191,8 @@ workflows:
       - remote_python_packaging:
           requires: 
              - remote_tests_python
+             - remote_tests_rust 
           filters:
-            branches:
-              only: master
             tags:
               only: /.*/
 
@@ -191,8 +201,6 @@ workflows:
              - remote_python_packaging
              - build_doxygen
           filters:
-            branches:
-              only: master
             tags:
               only: /.*/
       # - rustfmt:
@@ -204,8 +212,6 @@ workflows:
 
       - build_doxygen:
           filters:
-            branches:
-              only: master
             tags:
               only: /.*/
 

.github/workflows/ci.yml

@@ -1,89 +0,0 @@
-name: Rust CI
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - staging
-      - trying
-
-jobs:
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.43.1
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  run_clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: 1.43.1
-            components: clippy
-            override: true
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-
-  build_and_test:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [nightly, 1.43.1]
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install ${{ matrix.rust }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        override: true
-
-    - name: Cache cargo registry
-      uses: actions/cache@v2
-      with:
-        path: ~/.cargo/registry
-        key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-registry-${{ hashFiles('**/Cargo.toml') }}
-
-    - name: Cache cargo index
-      uses: actions/cache@v2
-      with:
-        path: ~/.cargo/git
-        key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-index-${{ hashFiles('**/Cargo.toml') }}
-
-    - name: Cache cargo build
-      uses: actions/cache@v2
-      with:
-        path: target
-        key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }}
-
-    - name: check
-      uses: actions-rs/cargo@v1
-      with:
-        command:  check
-        args: --workspace --all --bins --examples --tests
-
-    - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --workspace
-          

.github/workflows/code-quality.yml

@@ -0,0 +1,48 @@
+on: push
+name: Code Quality
+jobs:
+
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2020-03-19
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --workspace --examples --tests --all-features
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2020-03-19
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  run_clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly-2020-03-19
+            components: clippy
+            override: true
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features

CHANGELOG.md

@@ -1,44 +1,5 @@
 # Changelog 
 
-## 1.35.0
-
-- enable strict-tls from a new provider-db setting #1587
-
-- new subject 'Message from USER' for one-to-one chats #1395
-
-- recode images #1563
-
-- improve reconnect handling #1549 #1580
-
-- improve importing addresses #1544
-
-- improve configure and folder detection #1539 #1548
-
-- improve test suite #1559 #1564 #1580 #1581 #1582 #1584 #1588:
-
-- fix ad-hoc groups #1566
-
-- preventions against being marked as spam #1575
-
-- refactorings #1542 #1569
-
-
-## 1.34.0
-
-- new api for io, thread and event handling #1356,
-  see the example atop of `deltachat.h` to get an overview
-
-- LOTS of speed improvements due to async processing #1356
-
-- enable WAL mode for sqlite #1492
-
-- process incoming messages in bulk #1527
-
-- improve finding out the sent-folder #1488
-
-- several bug fixes
-
-
 ## 1.33.0
 
 - let `dc_set_muted()` also mute one-to-one chats #1470

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.35.0"
+version = "1.33.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL-2.0"
@@ -12,55 +12,55 @@ license = "MPL-2.0"
 deltachat_derive = { path = "./deltachat_derive" }
 
 libc = "0.2.51"
-pgp = { version = "0.6.0", default-features = false } 
+pgp = { version = "0.5.1", default-features = false } 
 hex = "0.4.0"
-sha2 = "0.9.0"
+sha2 = "0.8.0"
 rand = "0.7.0"
 smallvec = "1.0.0"
-surf = { version = "2.0.0-alpha.4", default-features = false, features = ["h1-client"] }
+surf = { version = "2.0.0-alpha.2", default-features = false, features = ["h1-client"] }
 num-derive = "0.3.0"
 num-traits = "0.2.6"
 async-smtp = { version = "0.3" }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
-async-imap = "0.3.1"
+async-imap = "0.3.0"
 async-native-tls = { version = "0.3.3" }
-async-std = { version = "1.6.1", features = ["unstable"] }
-base64 = "0.12"
+async-std = { version = "1.6.0", features = ["unstable"] }
+base64 = "0.11"
 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"
 lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.23", features = ["bundled"] }
-r2d2_sqlite = "0.16.0"
+rusqlite = { version = "0.22", features = ["bundled"] }
+r2d2_sqlite = "0.15.0"
 r2d2 = "0.8.5"
-strum = "0.18.0"
-strum_macros = "0.18.0"
+strum = "0.16.0"
+strum_macros = "0.16.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.8.0"
 image-meta = "0.1.0"
-quick-xml = "0.18.1"
+quick-xml = "0.17.1"
 escaper = "0.1.0"
 bitflags = "1.1.0"
+debug_stub_derive = "0.3.0"
 sanitize-filename = "0.2.1"
 stop-token = { version = "0.1.1", features = ["unstable"] }
-mailparse = "0.12.1"
+mailparse = "0.12.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"] }
+image = { version = "0.22.4", default-features=false, features = ["gif_codec", "jpeg", "ico", "png_codec", "pnm", "webp", "bmp"] }
 futures = "0.3.4"
 thiserror = "1.0.14"
 anyhow = "1.0.28"
 async-trait = "0.1.31"
 url = "2.1.1"
 
-pretty_env_logger = { version = "0.4.0", optional = true }
+pretty_env_logger = { version = "0.3.1", optional = true }
 log = {version = "0.4.8", optional = true }
 rustyline = { version = "4.1.0", optional = true }
 ansi_term = { version = "0.12.1", optional = true }
@@ -69,10 +69,9 @@ ansi_term = { version = "0.12.1", optional = true }
 [dev-dependencies]
 tempfile = "3.0"
 pretty_assertions = "0.6.1"
-pretty_env_logger = "0.4.0"
-proptest = "0.10"
+pretty_env_logger = "0.3.0"
+proptest = "0.9.4"
 async-std = { version = "1.6.0", features = ["unstable", "attributes"] }
-smol = "0.1.10"
 
 [workspace]
 members = [
@@ -83,7 +82,6 @@ members = [
 [[example]]
 name = "simple"
 path = "examples/simple.rs"
-required-features = ["repl"]
 
 [[example]]
 name = "repl"

README.md

@@ -132,5 +132,4 @@ or its language bindings:
 - [iOS](https://github.com/deltachat/deltachat-ios)
 - [Desktop](https://github.com/deltachat/deltachat-desktop)
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
-- [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**

appveyor.yml

@@ -0,0 +1,19 @@
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+
+install:
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init -yv --default-toolchain nightly-2020-03-19
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+build: false
+
+test_script:
+  - cargo test --release --all
+
+cache:
+  - target
+  - C:\Users\appveyor\.cargo\registry

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.35.0"
+version = "1.33.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"

deltachat-ffi/deltachat.h

@@ -32,40 +32,63 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  *
  * Let's start.
  *
- * First of all, you have to **create a context object**
- * bound to a database.
- * The database is a normal sqlite-file and is created as needed:
+ * First of all, you have to **define an event-handler-function**
+ * that is called by the library on specific events
+ * (eg. when the configuration is done or when fresh messages arrive).
+ * With this function you can create a Delta Chat context then:
  *
  * ~~~
- * dc_context_t* context = dc_context_new(NULL, "example.db", NULL);
- * ~~~
+ * #include <deltachat.h>
  *
- * After that, make sure, you can **receive events from the context**.
- * For that purpose, create an event emitter you can ask for events.
- * If there are no event, the emitter will wait until there is one,
- * so, in many situations you will do this in a thread:
- *
- * ~~~
- * void* event_handler(void* context)
+ * uintptr_t event_handler_func(dc_context_t* context, int event,
+ *                              uintptr_t data1, uintptr_t data2)
  * {
- *     dc_event_emitter_t* emitter = dc_get_event_emitter(context);
- *     dc_event_t* event;
- *     while ((event = dc_get_next_event(emitter)) != NULL) {
- *         // use the event as needed, eg. dc_event_get_id() returns the type.
- *         // once you're done, unref the event to avoid memory leakage:
- *         dc_event_unref(event);
- *     }
- *     dc_event_emitter_unref(emitter);
+ *     return 0;
  * }
  *
- * static pthread_t event_thread;
- * pthread_create(&event_thread, NULL, event_handler, context);
+ * dc_context_t* context = dc_context_new(event_handler_func, NULL, NULL);
+ * ~~~
+ *
+ * After that, you should make sure,
+ * sending and receiving jobs are processed as needed.
+ * For this purpose, you have to **create two threads:**
+ *
+ * ~~~
+ * #include <pthread.h>
+ *
+ * void* imap_thread_func(void* context)
+ * {
+ *     while (true) {
+ *         dc_perform_imap_jobs(context);
+ *         dc_perform_imap_fetch(context);
+ *         dc_perform_imap_idle(context);
+ *     }
+ * }
+ *
+ * void* smtp_thread_func(void* context)
+ * {
+ *     while (true) {
+ *         dc_perform_smtp_jobs(context);
+ *         dc_perform_smtp_idle(context);
+ *     }
+ * }
+ *
+ * static pthread_t imap_thread, smtp_thread;
+ * pthread_create(&imap_thread, NULL, imap_thread_func, context);
+ * pthread_create(&smtp_thread, NULL, smtp_thread_func, context);
  * ~~~
  *
  * The example above uses "pthreads",
  * however, you can also use anything else for thread handling.
  * All deltachat-core-functions, unless stated otherwise, are thread-safe.
  *
+ * After that you can  **define and open a database.**
+ * The database is a normal sqlite-file and is created as needed:
+ *
+ * ~~~
+ * dc_open(context, "example.db", NULL);
+ * ~~~
+ *
  * Now you can **configure the context:**
  *
  * ~~~
@@ -75,22 +98,15 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  * dc_configure(context);
  * ~~~
  *
- * dc_configure() returns immediately,
- * the configuration itself runs in background and may take a while.
+ * dc_configure() returns immediately, the configuration itself may take a while
+ * and is done by a job in the imap-thread you've defined above.
  * Once done, the #DC_EVENT_CONFIGURE_PROGRESS reports success
- * to the event_handler() you've defined above.
+ * to the event_handler_func() that is also defined above.
  *
  * The configuration result is saved in the database,
  * on subsequent starts it is not needed to call dc_configure()
  * (you can check this using dc_is_configured()).
  *
- * On a successfully configured context,
- * you can finally **connect to the servers:**
- *
- * ~~~
- * dc_start_io(context);
- * ~~~
- *
  * Now you can **send the first message:**
  *
  * ~~~
@@ -102,11 +118,11 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  * ~~~
  *
  * dc_send_text_msg() returns immediately;
- * the sending itself is done in the background.
+ * the sending itself is done by a job in the smtp-thread you've defined above.
  * If you check the testing address (bob)
  * and you should have received a normal email.
  * Answer this email in any email program with "Got it!"
- * and the IO you started above will **receive the message**.
+ * and the imap-thread you've create above will **receive the message**.
  *
  * You can then **list all messages** of a chat as follow:
  *
@@ -150,6 +166,19 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  * - The issue-tracker for the core library is here:
  *   <https://github.com/deltachat/deltachat-core-rust/issues>
  *
+ * The following points are important mainly
+ * for the authors of the library itself:
+ *
+ * - For indentation, use tabs.
+ *   Alignments that are not placed at the beginning of a line
+ *   should be done with spaces.
+ *
+ * - For padding between functions,
+ *   classes etc. use 2 empty lines
+ *
+ * - Source files are encoded as UTF-8 with Unix line endings
+ *   (a simple `LF`, `0x0A` or `\n`)
+ *
  * If you need further assistance,
  * please do not hesitate to contact us
  * through the channels shown at https://delta.chat/en/contribute
@@ -162,6 +191,24 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  */
 
 
+/**
+ * TODO: document
+ */  
+dc_event_t*   dc_get_next_event(dc_event_emitter_t* emitter);
+
+dc_event_emitter_t* dc_get_event_emitter(dc_context_t* context);
+void  dc_event_emitter_unref(dc_event_emitter_t* emitter);
+
+int           dc_event_get_id   (dc_event_t* event);
+int           dc_event_get_data1_int(dc_event_t* event);
+int           dc_event_get_data2_int(dc_event_t* event);
+char*         dc_event_get_data3_str(dc_event_t* event);
+
+/**
+ * TODO: document
+ */
+void          dc_event_unref   (dc_event_t* event);
+
 /**
  * @class dc_context_t
  *
@@ -179,6 +226,21 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  * opened, connected and mails are fetched.
  *
  * @memberof dc_context_t
+ * @param cb a callback function that is called for events (update,
+ *     state changes etc.) and to get some information from the client (eg. translation
+ *     for a given string).
+ *     See @ref DC_EVENT for a list of possible events that may be passed to the callback.
+ *     - The callback MAY be called from _any_ thread, not only the main/GUI thread!
+ *     - The callback MUST NOT call any dc_* and related functions unless stated
+ *       otherwise!
+ *     - The callback SHOULD return _fast_, for GUI updates etc. you should
+ *       post yourself an asynchronous message to your GUI thread, if needed.
+ *     - events do not expect a return value, just always return 0.
+ * @param dbfile The file to use to store the database, something like `~/file` won't
+ *     work on all systems, if in doubt, use absolute paths.
+ * @param blobdir A directory to store the blobs in; a trailing slash is not needed.
+ *     If you pass NULL or the empty string, deltachat-core creates a directory
+ *     beside _dbfile_ with the same name and the suffix `-blobs`.
  * @param os_name is only for decorative use
  *     and is shown eg. in the `X-Mailer:` header
  *     in the form "Delta Chat Core <version>/<os_name>".
@@ -186,11 +248,6 @@ typedef struct _dc_event_emitter dc_event_emitter_t;
  *     the used environment and/or the version here.
  *     It is okay to give NULL, in this case `X-Mailer:` header
  *     is set to "Delta Chat Core <version>".
- * @param dbfile The file to use to store the database,
- *     something like `~/file` won't work, use absolute paths.
- * @param blobdir A directory to store the blobs in; a trailing slash is not needed.
- *     If you pass NULL or the empty string, deltachat-core creates a directory
- *     beside _dbfile_ with the same name and the suffix `-blobs`.
  * @return A context object with some public members.
  *     The object must be passed to the other context functions
  *     and must be freed using dc_context_unref() after usage.
@@ -212,25 +269,6 @@ dc_context_t*   dc_context_new               (const char* os_name, const char* d
  */
 void            dc_context_unref             (dc_context_t* context);
 
-
-/**
- * Create the event emitter that is used to receive events.
- * The library will emit various @ref DC_EVENT events as "new message", "message read" etc.
- * To get these events, you have to create an event emitter using this function
- * and call dc_get_next_event() on the emitter.
- *
- * @memberof dc_context_t
- * @param context The context object as created by dc_context_new().
- * @return Returns the event emitter, NULL on errors.
- *     Must be freed using dc_event_emitter_unref() after usage.
- *
- * Note: Use only one event emitter per context.
- * Having more than one event emitter running at the same time on the same context
- * will result in events randomly delivered to the one or to the other.
- */
-dc_event_emitter_t* dc_get_event_emitter(dc_context_t* context);
-
-
 /**
  * Get the blob directory.
  *
@@ -430,7 +468,9 @@ char*           dc_get_oauth2_url            (dc_context_t* context, const char*
 
 /**
  * Configure a context.
- * While configuration IO must not be started, if needed stop IO using dc_stop_io() first.
+ * For this purpose, the function creates a job
+ * that is executed in the IMAP-thread then;
+ * this requires to call dc_perform_imap_jobs() regularly.
  * If the context is already configured,
  * this function will try to change the configuration.
  *
@@ -497,8 +537,6 @@ int             dc_is_configured   (const dc_context_t* context);
 
 /**
  * Start job and IMAP/SMTP tasks.
- * If IO is already running, nothing happens.
- * To check the current IO state, use dc_is_io_running().
  *
  * @memberof dc_context_t
  * @param context The context object as created by dc_context_new().
@@ -518,8 +556,6 @@ int             dc_is_io_running(const dc_context_t* context);
 
 /**
  * Stop job and IMAP/SMTP tasks and return when they are finished. 
- * If IO is not running, nothing happens.
- * To check the current IO state, use dc_is_io_running().
  *
  * @memberof dc_context_t
  * @param context The context object as created by dc_context_new().
@@ -1638,6 +1674,9 @@ dc_contact_t*   dc_get_contact               (dc_context_t* context, uint32_t co
 
 /**
  * Import/export things.
+ * For this purpose, the function creates a job that is executed in the IMAP-thread then;
+ * this requires to call dc_perform_imap_jobs() regularly.
+ *
  * What to do is defined by the _what_ parameter which may be one of the following:
  *
  * - **DC_IMEX_EXPORT_BACKUP** (11) - Export a backup to the directory given as `param1`.
@@ -3818,122 +3857,11 @@ int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 #define DC_EMPTY_INBOX 0x02 // Deprecated, flag for dc_empty_server(): Clear all INBOX messages
 
 
-/**
- * @class dc_event_emitter_t
- *
- * Opaque object that is used to get events.
- * You can get an event emitter from a context using dc_get_event_emitter().
- */
-
-/**
- * Get the next event from an event emitter object.
- *
- * @memberof dc_event_emitter_t
- * @param emitter Event emitter object as returned from dc_get_event_emitter().
- * @return An event as an dc_event_t object.
- *     You can query the event for information using dc_event_get_id(), dc_event_get_data1_int() and so on;
- *     if you are done with the event, you have to free the event using dc_event_unref().
- *     If NULL is returned, the context belonging to the event emitter is unref'd and the no more events will come;
- *     in this case, free the event emitter using dc_event_emitter_unref().
- */
-dc_event_t* dc_get_next_event(dc_event_emitter_t* emitter);
-
-
-/**
- * Free an event emitter object.
- *
- * @memberof dc_event_emitter_t
- * @param emitter Event emitter object as returned from dc_get_event_emitter().
- *     If NULL is given, nothing is done and an error is logged.
- * @return None.
- */
-void  dc_event_emitter_unref(dc_event_emitter_t* emitter);
-
-
-/**
- * @class dc_event_t
- *
- * Opaque object describing a single event.
- * To get events, call dc_get_next_event() on an event emitter created by dc_get_event_emitter().
- */
-
-/**
- * Get the event-id from an event object.
- * The event-id is one of the @ref DC_EVENT constants.
- * There may be additional data belonging to an event,
- * to get them, use dc_event_get_data1_int(), dc_event_get_data2_int() and dc_event_get_data2_str().
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return once of the @ref DC_EVENT constants.
- *     0 on errors.
- */
-int dc_event_get_id(dc_event_t* event);
-
-
-/**
- * Get a data associated with an event object.
- * The meaning of the data depends on the event-id
- * returned as @ref DC_EVENT constants by dc_event_get_id().
- * See also dc_event_get_data2_int() and dc_event_get_data2_str().
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return "data1" as a signed integer, at least 32bit,
- *     the meaning depends on the event type associated with this event.
- */
-int dc_event_get_data1_int(dc_event_t* event);
-
-
-/**
- * Get a data associated with an event object.
- * The meaning of the data depends on the event-id
- * returned as @ref DC_EVENT constants by dc_event_get_id().
- * See also dc_event_get_data2_int() and dc_event_get_data2_str().
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return "data2" as a signed integer, at least 32bit,
- *     the meaning depends on the event type associated with this event.
- */
-int dc_event_get_data2_int(dc_event_t* event);
-
-
-/**
- * Get a data associated with an event object.
- * The meaning of the data depends on the event-id
- * returned as @ref DC_EVENT constants by dc_event_get_id().
- * See also dc_event_get_data1_int() and dc_event_get_data2_int().
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return "data2" as a string,
- *     the meaning depends on the event type associated with this event.
- *     Once you're done with the string, you have to unref it using dc_unref_str().
- */
-char* dc_event_get_data2_str(dc_event_t* event);
-
-
-/**
- * Free memory used by an event object.
- * If you forget to do this for an event, this will result in memory leakage.
- *
- * @memberof dc_event_t
- * @param event Event object as returned from dc_get_next_event().
- * @return None.
- */
-void dc_event_unref(dc_event_t* event);
-
-
 /**
  * @defgroup DC_EVENT DC_EVENT
  *
- * These constants are used as event-id
- * in events returned by dc_get_next_event().
- *
- * Events typically come with some additional data,
- * use dc_event_get_data1_int(), dc_event_get_data2_int() and dc_event_get_data2_str() to read this data.
- * The meaning of the data depends on the event.
+ * These constants are used as events
+ * reported to the callback given to dc_context_new().
  *
  * @addtogroup DC_EVENT
  * @{
@@ -3941,11 +3869,13 @@ void dc_event_unref(dc_event_t* event);
 
 /**
  * The library-user may write an informational string to the log.
+ * Passed to the callback given to dc_context_new().
  *
  * This event should not be reported to the end-user using a popup or something like that.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_INFO                     100
 
@@ -3954,7 +3884,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when SMTP connection is established and login was successful.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_SMTP_CONNECTED           101
 
@@ -3963,7 +3894,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when IMAP connection is established and login was successful.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_IMAP_CONNECTED           102
 
@@ -3971,7 +3903,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when a message was successfully sent to the SMTP server.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_SMTP_MESSAGE_SENT        103
 
@@ -3979,7 +3912,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when a message was successfully marked as deleted on the IMAP server.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_IMAP_MESSAGE_DELETED   104
 
@@ -3987,7 +3921,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when a message was successfully moved on IMAP.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_IMAP_MESSAGE_MOVED   105
 
@@ -3995,7 +3930,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when an IMAP folder was emptied.
  *
  * @param data1 0
- * @param data2 (char*) Folder name.
+ * @param data2 (const char*) folder name.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_IMAP_FOLDER_EMPTIED  106
 
@@ -4003,7 +3939,8 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when a new blob file was successfully written
  *
  * @param data1 0
- * @param data2 (char*) Path name
+ * @param data2 (const char*) path name
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_NEW_BLOB_FILE 150
 
@@ -4011,23 +3948,27 @@ void dc_event_unref(dc_event_t* event);
  * Emitted when a blob file was successfully deleted
  *
  * @param data1 0
- * @param data2 (char*) Path name
+ * @param data2 (const char*) path name
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_DELETED_BLOB_FILE 151
 
 /**
  * The library-user should write a warning string to the log.
+ * Passed to the callback given to dc_context_new().
  *
  * This event should not be reported to the end-user using a popup or something like that.
  *
  * @param data1 0
- * @param data2 (char*) Warning string in english language.
+ * @param data2 (const char*) Warning string in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_WARNING                  300
 
 
 /**
  * The library-user should report an error to the end-user.
+ * Passed to the callback given to dc_context_new().
  *
  * As most things are asynchronous, things may go wrong at any time and the user
  * should not be disturbed by a dialog or so.  Instead, use a bubble or so.
@@ -4039,9 +3980,10 @@ void dc_event_unref(dc_event_t* event);
  * in a messasge box then.
  *
  * @param data1 0
- * @param data2 (char*) Error string, always set, never NULL.
+ * @param data2 (const char*) Error string, always set, never NULL.
  *     Some error strings are taken from dc_set_stock_translation(),
  *     however, most error strings will be in english language.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_ERROR                    400
 
@@ -4063,7 +4005,8 @@ void dc_event_unref(dc_event_t* event);
  *
  * @param data1 (int) 1=first/new network error, should be reported the user;
  *     0=subsequent network error, should be logged only
- * @param data2 (char*) Error string, always set, never NULL.
+ * @param data2 (const char*) Error string, always set, never NULL.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
  */
 #define DC_EVENT_ERROR_NETWORK            401
 
@@ -4076,7 +4019,9 @@ void dc_event_unref(dc_event_t* event);
  * dc_send_text_msg() or another sending function.
  *
  * @param data1 0
- * @param data2 (char*) Info string in english language.
+ * @param data2 (const char*) Info string in english language.
+ *     Must not be unref'd or modified
+ *     and is valid only until the callback returns.
  */
 #define DC_EVENT_ERROR_SELF_NOT_IN_GROUP  410
 
@@ -4194,8 +4139,9 @@ void dc_event_unref(dc_event_t* event);
  * A typical purpose for a handler of this event may be to make the file public to some system
  * services.
  *
- * @param data1 0
- * @param data2 (char*) Path and file name.
+ * @param data1 (const char*) Path and file name.
+ *     Must not be unref'd or modified and is valid only until the callback returns.
+ * @param data2 0
  */
 #define DC_EVENT_IMEX_FILE_WRITTEN        2052
 
@@ -4423,26 +4369,12 @@ void dc_event_unref(dc_event_t* event);
 #define DC_STR_LOCATION                   66
 #define DC_STR_STICKER                    67
 #define DC_STR_DEVICE_MESSAGES            68
-#define DC_STR_SAVED_MESSAGES             69
-#define DC_STR_DEVICE_MESSAGES_HINT       70
-#define DC_STR_WELCOME_MESSAGE            71
-#define DC_STR_UNKNOWN_SENDER_FOR_CHAT    72
-#define DC_STR_SUBJECT_FOR_NEW_CONTACT    73
-#define DC_STR_FAILED_SENDING_TO          74
-
-#define DC_STR_COUNT                      74
+#define DC_STR_COUNT                      68
 
 /*
  * @}
  */
 
-#ifdef PY_CFFI_INC
-/* Helper utility to locate the header file when building python bindings. */
-char* _dc_header_file_location(void) {
-    return __FILE__;
-}
-#endif
-
 
 #ifdef __cplusplus
 }

deltachat-ffi/src/lib.rs

@@ -403,9 +403,9 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut libc::c_char {
+pub unsafe extern "C" fn dc_event_get_data3_str(event: *mut dc_event_t) -> *mut libc::c_char {
     if event.is_null() {
-        eprintln!("ignoring careless call to dc_event_get_data2_str()");
+        eprintln!("ignoring careless call to dc_event_get_data3_str()");
         return ptr::null_mut();
     }
 

examples/repl/main.rs

@@ -146,8 +146,10 @@ const IMEX_COMMANDS: [&str; 12] = [
     "stop",
 ];
 
-const DB_COMMANDS: [&str; 9] = [
+const DB_COMMANDS: [&str; 11] = [
     "info",
+    "open",
+    "close",
     "set",
     "get",
     "oauth2",
@@ -288,59 +290,48 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         .edit_mode(EditMode::Emacs)
         .output_stream(OutputStreamType::Stdout)
         .build();
+    let h = DcHelper {
+        completer: FilenameCompleter::new(),
+        highlighter: MatchingBracketHighlighter::new(),
+        hinter: HistoryHinter {},
+    };
+    let mut rl = Editor::with_config(config);
+    rl.set_helper(Some(h));
+    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.");
+    }
+
     let mut selected_chat = ChatId::default();
-    let (reader_s, reader_r) = async_std::sync::channel(100);
-    let input_loop = async_std::task::spawn_blocking(move || {
-        let h = DcHelper {
-            completer: FilenameCompleter::new(),
-            highlighter: MatchingBracketHighlighter::new(),
-            hinter: HistoryHinter {},
-        };
-        let mut rl = Editor::with_config(config);
-        rl.set_helper(Some(h));
-        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.");
-        }
 
-        loop {
-            let p = "> ";
-            let readline = rl.readline(&p);
-
-            match readline {
-                Ok(line) => {
-                    // TODO: ignore "set mail_pw"
-                    rl.add_history_entry(line.as_str());
-                    async_std::task::block_on(reader_s.send(line));
-                }
-                Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
-                    println!("Exiting...");
-                    drop(reader_s);
-                    break;
-                }
-                Err(err) => {
-                    println!("Error: {}", err);
-                    drop(reader_s);
-                    break;
+    loop {
+        let p = "> ";
+        let readline = rl.readline(&p);
+        match readline {
+            Ok(line) => {
+                // TODO: ignore "set mail_pw"
+                rl.add_history_entry(line.as_str());
+                match handle_cmd(line.trim(), context.clone(), &mut selected_chat).await {
+                    Ok(ExitResult::Continue) => {}
+                    Ok(ExitResult::Exit) => break,
+                    Err(err) => println!("Error: {}", err),
                 }
             }
-        }
-
-        rl.save_history(".dc-history.txt")?;
-        println!("history saved");
-        Ok::<_, Error>(())
-    });
-
-    while let Ok(line) = reader_r.recv().await {
-        match handle_cmd(line.trim(), context.clone(), &mut selected_chat).await {
-            Ok(ExitResult::Continue) => {}
-            Ok(ExitResult::Exit) => break,
-            Err(err) => println!("Error: {}", err),
+            Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
+                println!("Exiting...");
+                context.stop_io().await;
+                break;
+            }
+            Err(err) => {
+                println!("Error: {}", err);
+                break;
+            }
         }
     }
-    context.stop_io().await;
-    input_loop.await?;
+
+    rl.save_history(".dc-history.txt")?;
+    println!("history saved");
 
     Ok(())
 }

examples/simple.rs

@@ -1,3 +1,6 @@
+extern crate deltachat;
+
+use std::time;
 use tempfile::tempdir;
 
 use deltachat::chat;
@@ -5,42 +8,35 @@ use deltachat::chatlist::*;
 use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
-use deltachat::message::Message;
 use deltachat::Event;
 
 fn cb(event: Event) {
+    print!("[{:?}]", event);
+
     match event {
         Event::ConfigureProgress(progress) => {
-            log::info!("progress: {}", progress);
+            println!("  progress: {}", progress);
         }
-        Event::Info(msg) => {
-            log::info!("{}", msg);
+        Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
+            println!("  {}", msg);
         }
-        Event::Warning(msg) => {
-            log::warn!("{}", msg);
-        }
-        Event::Error(msg) | Event::ErrorNetwork(msg) => {
-            log::error!("{}", msg);
-        }
-        event => {
-            log::info!("{:?}", event);
+        _ => {
+            println!();
         }
     }
 }
 
-/// Run with `RUST_LOG=simple=info cargo run --release --example simple --features repl -- email pw`.
 #[async_std::main]
 async fn main() {
-    pretty_env_logger::try_init_timed().ok();
-
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
-    log::info!("creating database {:?}", dbfile);
+    println!("creating database {:?}", dbfile);
     let ctx = Context::new("FakeOs".into(), dbfile.into())
         .await
         .expect("Failed to create context");
     let info = ctx.get_info().await;
-    log::info!("info: {:#?}", info);
+    let duration = time::Duration::from_millis(4000);
+    println!("info: {:#?}", info);
 
     let events = ctx.get_event_emitter();
     let events_spawn = async_std::task::spawn(async move {
@@ -49,7 +45,7 @@ async fn main() {
         }
     });
 
-    log::info!("configuring");
+    println!("configuring");
     let args = std::env::args().collect::<Vec<String>>();
     assert_eq!(args.len(), 3, "requires email password");
     let email = args[1].clone();
@@ -63,38 +59,35 @@ async fn main() {
 
     ctx.configure().await.unwrap();
 
-    log::info!("------ RUN ------");
-    ctx.start_io().await;
-    log::info!("--- SENDING A MESSAGE ---");
+    println!("------ RUN ------");
+    ctx.clone().start_io().await;
+    println!("--- SENDING A MESSAGE ---");
 
     let contact_id = Contact::create(&ctx, "dignifiedquire", "dignifiedquire@gmail.com")
         .await
         .unwrap();
     let chat_id = chat::create_by_contact_id(&ctx, contact_id).await.unwrap();
 
-    for i in 0..1 {
-        log::info!("sending message {}", i);
+    for i in 0..2 {
         chat::send_text_msg(&ctx, chat_id, format!("Hi, here is my {}nth message!", i))
             .await
             .unwrap();
     }
 
-    // wait for the message to be sent out
-    async_std::task::sleep(std::time::Duration::from_secs(1)).await;
-
-    log::info!("fetching chats..");
+    println!("fetching chats..");
     let chats = Chatlist::try_load(&ctx, 0, None, None).await.unwrap();
 
     for i in 0..chats.len() {
-        let msg = Message::load_from_db(&ctx, chats.get_msg_id(i).unwrap())
-            .await
-            .unwrap();
-        log::info!("[{}] msg: {:?}", i, msg);
+        let summary = chats.get_summary(&ctx, 0, None).await;
+        let text1 = summary.get_text1();
+        let text2 = summary.get_text2();
+        println!("chat: {} - {:?} - {:?}", i, text1, text2,);
     }
 
-    log::info!("stopping");
+    async_std::task::sleep(duration).await;
+
+    println!("stopping");
     ctx.stop_io().await;
-    log::info!("closing");
-    drop(ctx);
+    println!("closing");
     events_spawn.await;
 }

python/examples/echo_and_quit.py

@@ -12,7 +12,7 @@ class EchoPlugin:
             message.account.shutdown()
         else:
             # unconditionally accept the chat
-            message.create_chat()
+            message.accept_sender_contact()
             addr = message.get_sender_contact().addr
             if message.is_system_message():
                 message.chat.send_text("echoing system message from {}:\n{}".format(addr, message))

python/examples/group_tracking.py

@@ -12,7 +12,7 @@ class GroupTrackingPlugin:
             message.account.shutdown()
         else:
             # unconditionally accept the chat
-            message.create_chat()
+            message.accept_sender_contact()
             addr = message.get_sender_contact().addr
             text = message.text
             message.chat.send_text("echoing from {}:\n{}".format(addr, text))

python/examples/test_examples.py

@@ -26,15 +26,15 @@ def test_echo_quit_plugin(acfactory, lp):
 
     lp.sec("sending a message to the bot")
     bot_contact = ac1.create_contact(botproc.addr)
-    bot_chat = bot_contact.create_chat()
-    bot_chat.send_text("hello")
+    ch1 = ac1.create_chat_by_contact(bot_contact)
+    ch1.send_text("hello")
 
-    lp.sec("waiting for the reply message from the bot to arrive")
+    lp.sec("waiting for the bot-reply to arrive")
     reply = ac1._evtracker.wait_next_incoming_message()
-    assert reply.chat == bot_chat
     assert "hello" in reply.text
+    assert reply.chat == ch1
     lp.sec("send quit sequence")
-    bot_chat.send_text("/quit")
+    ch1.send_text("/quit")
     botproc.wait()
 
 
@@ -47,8 +47,8 @@ def test_group_tracking_plugin(acfactory, lp):
     botproc.fnmatch_lines("""
         *ac_configure_completed*
     """)
-    ac1.add_account_plugin(FFIEventLogger(ac1))
-    ac2.add_account_plugin(FFIEventLogger(ac2))
+    ac1.add_account_plugin(FFIEventLogger(ac1, "ac1"))
+    ac2.add_account_plugin(FFIEventLogger(ac2, "ac2"))
 
     lp.sec("creating bot test group with bot")
     bot_contact = ac1.create_contact(botproc.addr)

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'],
+        install_requires=['cffi>=1.0.0', 'pluggy'],
         packages=setuptools.find_packages('src'),
         package_dir={'': 'src'},
         cffi_modules=['src/deltachat/_build.py:ffibuilder'],

python/src/deltachat/__init__.py

@@ -60,8 +60,7 @@ def run_cmdline(argv=None, account_plugins=None):
     ac = Account(args.db)
 
     if args.show_ffi:
-        ac.set_config("displayname", "bot")
-        log = events.FFIEventLogger(ac)
+        log = events.FFIEventLogger(ac, "bot")
         ac.add_account_plugin(log)
 
     for plugin in account_plugins or []:
@@ -77,8 +76,8 @@ def run_cmdline(argv=None, account_plugins=None):
         ac.set_config("mvbox_move", "0")
         ac.set_config("mvbox_watch", "0")
         ac.set_config("sentbox_watch", "0")
-        configtracker = ac.configure()
-        configtracker.wait_finish()
+        ac.configure()
+        ac.wait_configure_finish()
 
     # start IO threads and configure if neccessary
     ac.start_io()

python/src/deltachat/_build.py

@@ -1,64 +1,65 @@
 import distutils.ccompiler
 import distutils.log
 import distutils.sysconfig
-import os
-import platform
-import re
-import shutil
-import subprocess
 import tempfile
-import textwrap
-import types
-from os.path import abspath
-from os.path import dirname as dn
-
+import platform
+import os
 import cffi
+import shutil
+from os.path import dirname as dn
+from os.path import abspath
 
 
-def local_build_flags(projdir, target):
-    """Construct build flags for building against a checkout.
-
-    :param projdir: The root directory of the deltachat-core-rust project.
-    :param target: The rust build target, `debug` or `release`.
-    """
-    flags = types.SimpleNamespace()
-    if platform.system() == 'Darwin':
-        flags.libs = ['resolv', 'dl']
-        flags.extra_link_args = [
-                '-framework', 'CoreFoundation',
-                '-framework', 'CoreServices',
-                '-framework', 'Security',
-        ]
-    elif platform.system() == 'Linux':
-        flags.libs = ['rt', 'dl', 'm']
-        flags.extra_link_args = []
+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:
+        if platform.system() == 'Darwin':
+            libs = ['resolv', 'dl']
+            extra_link_args = [
+                    '-framework', 'CoreFoundation',
+                    '-framework', 'CoreServices',
+                    '-framework', 'Security',
+            ]
+        elif platform.system() == 'Linux':
+            libs = ['rt', 'dl', 'm']
+            extra_link_args = []
+        else:
+            raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
+        target_dir = os.environ.get("CARGO_TARGET_DIR")
+        if target_dir is None:
+            target_dir = os.path.join(projdir, 'target')
+        objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+        assert os.path.exists(objs[0]), objs
+        incs = [os.path.join(projdir, 'deltachat-ffi')]
     else:
-        raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
-    target_dir = os.environ.get("CARGO_TARGET_DIR")
-    if target_dir is None:
-        target_dir = os.path.join(projdir, 'target')
-    flags.objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
-    assert os.path.exists(flags.objs[0]), flags.objs
-    flags.incs = [os.path.join(projdir, 'deltachat-ffi')]
-    return flags
-
-
-def system_build_flags():
-    """Construct build flags for building against an installed libdeltachat."""
-    flags = types.SimpleNamespace()
-    flags.libs = ['deltachat']
-    flags.objs = []
-    flags.incs = []
-    flags.extra_link_args = []
-
-
-def extract_functions(flags):
-    """Extract the function definitions from deltachat.h.
-
-    This creates a .h file with a single `#include <deltachat.h>` line
-    in it.  It then runs the C preprocessor to create an output file
-    which contains all function definitions found in `deltachat.h`.
-    """
+        libs = ['deltachat']
+        objs = []
+        incs = []
+        extra_link_args = []
+    builder = cffi.FFI()
+    builder.set_source(
+        'deltachat.capi',
+        """
+            #include <deltachat.h>
+            int dc_event_has_string_data(int e)
+            {
+                return DC_EVENT_DATA2_IS_STRING(e);
+            }
+        """,
+        include_dirs=incs,
+        libraries=libs,
+        extra_objects=objs,
+        extra_link_args=extra_link_args,
+    )
+    builder.cdef("""
+        typedef int... time_t;
+        void free(void *ptr);
+        extern int dc_event_has_string_data(int);
+    """)
     distutils.log.set_verbosity(distutils.log.INFO)
     cc = distutils.ccompiler.new_compiler(force=True)
     distutils.sysconfig.customize_compiler(cc)
@@ -70,133 +71,13 @@ def extract_functions(flags):
             src_fp.write('#include <deltachat.h>')
         cc.preprocess(source=src_name,
                       output_file=dst_name,
-                      include_dirs=flags.incs,
+                      include_dirs=incs,
                       macros=[('PY_CFFI', '1')])
         with open(dst_name, "r") as dst_fp:
-            return dst_fp.read()
+            builder.cdef(dst_fp.read())
     finally:
         shutil.rmtree(tmpdir)
 
-
-def find_header(flags):
-    """Use the compiler to find the deltachat.h header location.
-
-    This uses a small utility in deltachat.h to find the location of
-    the header file location.
-    """
-    distutils.log.set_verbosity(distutils.log.INFO)
-    cc = distutils.ccompiler.new_compiler(force=True)
-    distutils.sysconfig.customize_compiler(cc)
-    tmpdir = tempfile.mkdtemp()
-    try:
-        src_name = os.path.join(tmpdir, "where.c")
-        obj_name = os.path.join(tmpdir, "where.o")
-        dst_name = os.path.join(tmpdir, "where")
-        with open(src_name, "w") as src_fp:
-            src_fp.write(textwrap.dedent("""
-                #include <stdio.h>
-                #include <deltachat.h>
-
-                int main(void) {
-                    printf("%s", _dc_header_file_location());
-                    return 0;
-                }
-            """))
-        cwd = os.getcwd()
-        try:
-            os.chdir(tmpdir)
-            cc.compile(sources=["where.c"],
-                       include_dirs=flags.incs,
-                       macros=[("PY_CFFI_INC", "1")])
-        finally:
-            os.chdir(cwd)
-        cc.link_executable(objects=[obj_name],
-                           output_progname="where",
-                           output_dir=tmpdir)
-        return subprocess.check_output(dst_name)
-    finally:
-        shutil.rmtree(tmpdir)
-
-
-def extract_defines(flags):
-    """Extract the required #DEFINEs from deltachat.h.
-
-    Since #DEFINEs are interpreted by the C preprocessor we can not
-    use the compiler to extract these and need to parse the header
-    file ourselves.
-
-    The defines are returned in a string that can be passed to CFFIs
-    cdef() method.
-    """
-    header = find_header(flags)
-    defines_re = re.compile(r"""
-        \#define\s+   # The start of a define.
-        (             # Begin capturing group which captures the define name.
-            (?:       # A nested group which is not captured, this allows us
-                      #    to build the list of prefixes to extract without
-                      #    creation another capture group.
-                DC_EVENT
-                | DC_QR
-                | DC_MSG
-                | DC_LP
-                | DC_EMPTY
-                | DC_CERTCK
-                | DC_STATE
-                | DC_STR
-                | DC_CONTACT_ID
-                | DC_GCL
-                | DC_CHAT
-                | DC_PROVIDER
-                | DC_KEY_GEN
-            )         # End of prefix matching
-            _[\w_]+   # Match the suffix, e.g. _RSA2048 in DC_KEY_GEN_RSA2048
-        )             # Close the capturing group, this contains
-                      # the entire name e.g. DC_MSG_TEXT.
-        \s+\S+        # Ensure there is whitespace followed by a value.
-    """, re.VERBOSE)
-    defines = []
-    with open(header) as fp:
-        for line in fp:
-            match = defines_re.match(line)
-            if match:
-                defines.append(match.group(1))
-    return '\n'.join('#define {} ...'.format(d) for d in defines)
-
-
-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:
-        flags = local_build_flags(projdir, target)
-    else:
-        flags = system_build_flags()
-    builder = cffi.FFI()
-    builder.set_source(
-        'deltachat.capi',
-        """
-            #include <deltachat.h>
-            int dc_event_has_string_data(int e)
-            {
-                return DC_EVENT_DATA2_IS_STRING(e);
-            }
-        """,
-        include_dirs=flags.incs,
-        libraries=flags.libs,
-        extra_objects=flags.objs,
-        extra_link_args=flags.extra_link_args,
-    )
-    builder.cdef("""
-        typedef int... time_t;
-        void free(void *ptr);
-        extern int dc_event_has_string_data(int);
-    """)
-    function_defs = extract_functions(flags)
-    defines = extract_defines(flags)
-    builder.cdef(function_defs)
-    builder.cdef(defines)
     return builder
 
 

python/src/deltachat/account.py

@@ -50,7 +50,7 @@ class Account(object):
             lib.dc_context_unref,
         )
         if self._dc_context == ffi.NULL:
-            raise ValueError("Could not dc_context_new: {} {}".format(os_name, db_path))
+            raise ValueError("FAILED dc_context_new: {} {}".format(os_name, db_path))
 
         self._shutdown_event = Event()
         self._event_thread = EventThread(self)
@@ -213,40 +213,22 @@ class Account(object):
         """
         return Contact(self, const.DC_CONTACT_ID_SELF)
 
-    def create_contact(self, obj, name=None):
-        """ create a (new) Contact or return an existing one.
+    def create_contact(self, email, name=None):
+        """ create a (new) Contact. If there already is a Contact
+        with that e-mail address, it is unblocked and its name is
+        updated.
 
-        Calling this method will always resulut in the same
-        underlying contact id.  If there already is a Contact
-        with that e-mail address, it is unblocked and its display
-        `name` is updated if specified.
-
-        :param obj: email-address, Account or Contact instance.
-        :param name: (optional) display name for this contact
+        :param email: email-address (text type)
+        :param name: display name for this contact (optional)
         :returns: :class:`deltachat.contact.Contact` instance.
         """
-        if isinstance(obj, Account):
-            if not obj.is_configured():
-                raise ValueError("can only add addresses from configured accounts")
-            addr, displayname = obj.get_config("addr"), obj.get_config("displayname")
-        elif isinstance(obj, Contact):
-            if obj.account != self:
-                raise ValueError("account mismatch {}".format(obj))
-            addr, displayname = obj.addr, obj.name
-        elif isinstance(obj, str):
-            displayname, addr = parseaddr(obj)
-        else:
-            raise TypeError("don't know how to create chat for %r" % (obj, ))
-
-        if name is None and displayname:
-            name = displayname
-        return self._create_contact(addr, name)
-
-    def _create_contact(self, addr, name):
+        realname, addr = parseaddr(email)
+        if name:
+            realname = name
+        realname = as_dc_charpointer(realname)
         addr = as_dc_charpointer(addr)
-        name = as_dc_charpointer(name)
-        contact_id = lib.dc_create_contact(self._dc_context, name, addr)
-        assert contact_id > const.DC_CHAT_ID_LAST_SPECIAL, contact_id
+        contact_id = lib.dc_create_contact(self._dc_context, realname, addr)
+        assert contact_id > const.DC_CHAT_ID_LAST_SPECIAL
         return Contact(self, contact_id)
 
     def delete_contact(self, contact):
@@ -268,13 +250,6 @@ class Account(object):
         if contact_id:
             return self.get_contact_by_id(contact_id)
 
-    def get_contact_by_id(self, contact_id):
-        """ return Contact instance or None.
-        :param contact_id: integer id of this contact.
-        :returns: None or :class:`deltachat.contact.Contact` instance.
-        """
-        return Contact(self, contact_id)
-
     def get_contacts(self, query=None, with_self=False, only_verified=False):
         """ get a (filtered) list of contacts.
 
@@ -304,29 +279,53 @@ class Account(object):
         )
         yield from iter_array(dc_array, lambda x: Message.from_db(self, x))
 
-    def create_chat(self, obj):
-        """ Create a 1:1 chat with Account, Contact or e-mail address. """
-        return self.create_contact(obj).create_chat()
+    def create_chat_by_contact(self, contact):
+        """ create or get an existing 1:1 chat object for the specified contact or contact id.
 
-    def _create_chat_by_message_id(self, msg_id):
-        return Chat(self, lib.dc_create_chat_by_msg_id(self._dc_context, msg_id))
+        :param contact: chat_id (int) or contact object.
+        :returns: a :class:`deltachat.chat.Chat` object.
+        """
+        if hasattr(contact, "id"):
+            if contact.account != self:
+                raise ValueError("Contact belongs to a different Account")
+            contact_id = contact.id
+        else:
+            assert isinstance(contact, int)
+            contact_id = contact
+        chat_id = lib.dc_create_chat_by_contact_id(self._dc_context, contact_id)
+        return Chat(self, chat_id)
 
-    def create_group_chat(self, name, contacts=None, verified=False):
+    def create_chat_by_message(self, message):
+        """ create or get an existing chat object for the
+        the specified message.
+
+        If this message is in the deaddrop chat then
+        the sender will become an accepted contact.
+
+        :param message: messsage id or message instance.
+        :returns: a :class:`deltachat.chat.Chat` object.
+        """
+        if hasattr(message, "id"):
+            if message.account != self:
+                raise ValueError("Message belongs to a different Account")
+            msg_id = message.id
+        else:
+            assert isinstance(message, int)
+            msg_id = message
+        chat_id = lib.dc_create_chat_by_msg_id(self._dc_context, msg_id)
+        return Chat(self, chat_id)
+
+    def create_group_chat(self, name, verified=False):
         """ create a new group chat object.
 
         Chats are unpromoted until the first message is sent.
 
-        :param contacts: list of contacts to add
         :param verified: if true only verified contacts can be added.
         :returns: a :class:`deltachat.chat.Chat` object.
         """
         bytes_name = name.encode("utf8")
         chat_id = lib.dc_create_group_chat(self._dc_context, int(verified), bytes_name)
-        chat = Chat(self, chat_id)
-        if contacts is not None:
-            for contact in contacts:
-                chat.add_contact(contact)
-        return chat
+        return Chat(self, chat_id)
 
     def get_chats(self):
         """ return list of chats.
@@ -355,6 +354,13 @@ class Account(object):
         """
         return Message.from_db(self, msg_id)
 
+    def get_contact_by_id(self, contact_id):
+        """ return Contact instance or None.
+        :param contact_id: integer id of this contact.
+        :returns: None or :class:`deltachat.contact.Contact` instance.
+        """
+        return Contact(self, contact_id)
+
     def get_chat_by_id(self, chat_id):
         """ return Chat instance.
         :param chat_id: integer id of this chat.
@@ -561,24 +567,29 @@ class Account(object):
         :raises MissingCredentials: if `addr` and `mail_pw` values are not set.
         :raises ConfigureFailed: if the account could not be configured.
 
-        :returns: None
+        :returns: None (account is configured and with io-scheduling running)
         """
         if not self.is_configured():
             raise ValueError("account not configured, cannot start io")
         lib.dc_start_io(self._dc_context)
 
     def configure(self):
-        """ Start configuration process and return a Configtracker instance
-        on which you can block with wait_finish() to get a True/False success
-        value for the configuration process.
-        """
         assert not self.is_configured()
+        assert not hasattr(self, "_configtracker")
         if not self.get_config("addr") or not self.get_config("mail_pw"):
             raise MissingCredentials("addr or mail_pwd not set in config")
-        configtracker = ConfigureTracker(self)
-        self.add_account_plugin(configtracker)
+        if hasattr(self, "_configtracker"):
+            self.remove_account_plugin(self._configtracker)
+        self._configtracker = ConfigureTracker()
+        self.add_account_plugin(self._configtracker)
         lib.dc_configure(self._dc_context)
-        return configtracker
+
+    def wait_configure_finish(self):
+        try:
+            self._configtracker.wait_finish()
+        finally:
+            self.remove_account_plugin(self._configtracker)
+            del self._configtracker
 
     def is_started(self):
         return self._event_thread.is_alive() and bool(lib.dc_is_io_running(self._dc_context))

python/src/deltachat/chat.py

@@ -18,8 +18,6 @@ class Chat(object):
     """
 
     def __init__(self, account, id):
-        from .account import Account
-        assert isinstance(account, Account), repr(account)
         self.account = account
         self.id = id
 
@@ -330,34 +328,33 @@ class Chat(object):
 
     # ------  group management API ------------------------------
 
-    def add_contact(self, obj):
+    def add_contact(self, contact):
         """ add a contact to this chat.
 
-        :params obj: Contact, Account or e-mail address.
+        :params: contact object.
         :raises ValueError: if contact could not be added
         :returns: None
         """
-        contact = self.account.create_contact(obj)
         ret = lib.dc_add_contact_to_chat(self.account._dc_context, self.id, contact.id)
         if ret != 1:
             raise ValueError("could not add contact {!r} to chat".format(contact))
-        return contact
 
-    def remove_contact(self, obj):
+    def remove_contact(self, contact):
         """ remove a contact from this chat.
 
-        :params obj: Contact, Account or e-mail address.
+        :params: contact object.
         :raises ValueError: if contact could not be removed
         :returns: None
         """
-        contact = self.account.create_contact(obj)
         ret = lib.dc_remove_contact_from_chat(self.account._dc_context, self.id, contact.id)
         if ret != 1:
             raise ValueError("could not remove contact {!r} from chat".format(contact))
 
     def get_contacts(self):
         """ get all contacts for this chat.
+        :params: contact object.
         :returns: list of :class:`deltachat.contact.Contact` objects for this chat
+
         """
         from .contact import Contact
         dc_array = ffi.gc(
@@ -368,14 +365,6 @@ class Chat(object):
             dc_array, lambda id: Contact(self.account, id))
         )
 
-    def num_contacts(self):
-        """ return number of contacts in this chat. """
-        dc_array = ffi.gc(
-            lib.dc_get_chat_contacts(self.account._dc_context, self.id),
-            lib.dc_array_unref
-        )
-        return lib.dc_array_get_cnt(dc_array)
-
     def set_profile_image(self, img_path):
         """Set group profile image.
 

python/src/deltachat/const.py

@@ -1,7 +1,197 @@
-from .capi import lib
+import sys
+import re
+import os
+from os.path import dirname, abspath
+from os.path import join as joinpath
+
+# the following const are generated from deltachat.h
+# this works well when you in a git-checkout
+# run "python deltachat/const.py" to regenerate events
+# begin const generated
+DC_GCL_ARCHIVED_ONLY = 0x01
+DC_GCL_NO_SPECIALS = 0x02
+DC_GCL_ADD_ALLDONE_HINT = 0x04
+DC_GCL_FOR_FORWARDING = 0x08
+DC_GCL_VERIFIED_ONLY = 0x01
+DC_GCL_ADD_SELF = 0x02
+DC_QR_ASK_VERIFYCONTACT = 200
+DC_QR_ASK_VERIFYGROUP = 202
+DC_QR_FPR_OK = 210
+DC_QR_FPR_MISMATCH = 220
+DC_QR_FPR_WITHOUT_ADDR = 230
+DC_QR_ACCOUNT = 250
+DC_QR_ADDR = 320
+DC_QR_TEXT = 330
+DC_QR_URL = 332
+DC_QR_ERROR = 400
+DC_CHAT_ID_DEADDROP = 1
+DC_CHAT_ID_TRASH = 3
+DC_CHAT_ID_MSGS_IN_CREATION = 4
+DC_CHAT_ID_STARRED = 5
+DC_CHAT_ID_ARCHIVED_LINK = 6
+DC_CHAT_ID_ALLDONE_HINT = 7
+DC_CHAT_ID_LAST_SPECIAL = 9
+DC_CHAT_TYPE_UNDEFINED = 0
+DC_CHAT_TYPE_SINGLE = 100
+DC_CHAT_TYPE_GROUP = 120
+DC_CHAT_TYPE_VERIFIED_GROUP = 130
+DC_MSG_ID_MARKER1 = 1
+DC_MSG_ID_DAYMARKER = 9
+DC_MSG_ID_LAST_SPECIAL = 9
+DC_STATE_UNDEFINED = 0
+DC_STATE_IN_FRESH = 10
+DC_STATE_IN_NOTICED = 13
+DC_STATE_IN_SEEN = 16
+DC_STATE_OUT_PREPARING = 18
+DC_STATE_OUT_DRAFT = 19
+DC_STATE_OUT_PENDING = 20
+DC_STATE_OUT_FAILED = 24
+DC_STATE_OUT_DELIVERED = 26
+DC_STATE_OUT_MDN_RCVD = 28
+DC_CONTACT_ID_SELF = 1
+DC_CONTACT_ID_INFO = 2
+DC_CONTACT_ID_DEVICE = 5
+DC_CONTACT_ID_LAST_SPECIAL = 9
+DC_MSG_TEXT = 10
+DC_MSG_IMAGE = 20
+DC_MSG_GIF = 21
+DC_MSG_STICKER = 23
+DC_MSG_AUDIO = 40
+DC_MSG_VOICE = 41
+DC_MSG_VIDEO = 50
+DC_MSG_FILE = 60
+DC_LP_AUTH_OAUTH2 = 0x2
+DC_LP_AUTH_NORMAL = 0x4
+DC_LP_IMAP_SOCKET_STARTTLS = 0x100
+DC_LP_IMAP_SOCKET_SSL = 0x200
+DC_LP_IMAP_SOCKET_PLAIN = 0x400
+DC_LP_SMTP_SOCKET_STARTTLS = 0x10000
+DC_LP_SMTP_SOCKET_SSL = 0x20000
+DC_LP_SMTP_SOCKET_PLAIN = 0x40000
+DC_CERTCK_AUTO = 0
+DC_CERTCK_STRICT = 1
+DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3
+DC_EMPTY_MVBOX = 0x01
+DC_EMPTY_INBOX = 0x02
+DC_EVENT_INFO = 100
+DC_EVENT_SMTP_CONNECTED = 101
+DC_EVENT_IMAP_CONNECTED = 102
+DC_EVENT_SMTP_MESSAGE_SENT = 103
+DC_EVENT_IMAP_MESSAGE_DELETED = 104
+DC_EVENT_IMAP_MESSAGE_MOVED = 105
+DC_EVENT_IMAP_FOLDER_EMPTIED = 106
+DC_EVENT_NEW_BLOB_FILE = 150
+DC_EVENT_DELETED_BLOB_FILE = 151
+DC_EVENT_WARNING = 300
+DC_EVENT_ERROR = 400
+DC_EVENT_ERROR_NETWORK = 401
+DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410
+DC_EVENT_MSGS_CHANGED = 2000
+DC_EVENT_INCOMING_MSG = 2005
+DC_EVENT_MSG_DELIVERED = 2010
+DC_EVENT_MSG_FAILED = 2012
+DC_EVENT_MSG_READ = 2015
+DC_EVENT_CHAT_MODIFIED = 2020
+DC_EVENT_CONTACTS_CHANGED = 2030
+DC_EVENT_LOCATION_CHANGED = 2035
+DC_EVENT_CONFIGURE_PROGRESS = 2041
+DC_EVENT_IMEX_PROGRESS = 2051
+DC_EVENT_IMEX_FILE_WRITTEN = 2052
+DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
+DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
+DC_EVENT_FILE_COPIED = 2055
+DC_EVENT_IS_OFFLINE = 2081
+DC_EVENT_GET_STRING = 2091
+DC_STR_SELFNOTINGRP = 21
+DC_KEY_GEN_DEFAULT = 0
+DC_KEY_GEN_RSA2048 = 1
+DC_KEY_GEN_ED25519 = 2
+DC_PROVIDER_STATUS_OK = 1
+DC_PROVIDER_STATUS_PREPARATION = 2
+DC_PROVIDER_STATUS_BROKEN = 3
+DC_CHAT_VISIBILITY_NORMAL = 0
+DC_CHAT_VISIBILITY_ARCHIVED = 1
+DC_CHAT_VISIBILITY_PINNED = 2
+DC_STR_NOMESSAGES = 1
+DC_STR_SELF = 2
+DC_STR_DRAFT = 3
+DC_STR_VOICEMESSAGE = 7
+DC_STR_DEADDROP = 8
+DC_STR_IMAGE = 9
+DC_STR_VIDEO = 10
+DC_STR_AUDIO = 11
+DC_STR_FILE = 12
+DC_STR_STATUSLINE = 13
+DC_STR_NEWGROUPDRAFT = 14
+DC_STR_MSGGRPNAME = 15
+DC_STR_MSGGRPIMGCHANGED = 16
+DC_STR_MSGADDMEMBER = 17
+DC_STR_MSGDELMEMBER = 18
+DC_STR_MSGGROUPLEFT = 19
+DC_STR_GIF = 23
+DC_STR_ENCRYPTEDMSG = 24
+DC_STR_E2E_AVAILABLE = 25
+DC_STR_ENCR_TRANSP = 27
+DC_STR_ENCR_NONE = 28
+DC_STR_CANTDECRYPT_MSG_BODY = 29
+DC_STR_FINGERPRINTS = 30
+DC_STR_READRCPT = 31
+DC_STR_READRCPT_MAILBODY = 32
+DC_STR_MSGGRPIMGDELETED = 33
+DC_STR_E2E_PREFERRED = 34
+DC_STR_CONTACT_VERIFIED = 35
+DC_STR_CONTACT_NOT_VERIFIED = 36
+DC_STR_CONTACT_SETUP_CHANGED = 37
+DC_STR_ARCHIVEDCHATS = 40
+DC_STR_STARREDMSGS = 41
+DC_STR_AC_SETUP_MSG_SUBJECT = 42
+DC_STR_AC_SETUP_MSG_BODY = 43
+DC_STR_CANNOT_LOGIN = 60
+DC_STR_SERVER_RESPONSE = 61
+DC_STR_MSGACTIONBYUSER = 62
+DC_STR_MSGACTIONBYME = 63
+DC_STR_MSGLOCATIONENABLED = 64
+DC_STR_MSGLOCATIONDISABLED = 65
+DC_STR_LOCATION = 66
+DC_STR_STICKER = 67
+DC_STR_DEVICE_MESSAGES = 68
+DC_STR_COUNT = 68
+# end const generated
 
 
-for name in dir(lib):
-    if name.startswith("DC_"):
-        globals()[name] = getattr(lib, name)
-del name
+def read_event_defines(f):
+    rex = re.compile(r'#define\s+((?:DC_EVENT|DC_QR|DC_MSG|DC_LP|DC_EMPTY|DC_CERTCK|DC_STATE|DC_STR|'
+                     r'DC_CONTACT_ID|DC_GCL|DC_CHAT|DC_PROVIDER|DC_KEY_GEN)_\S+)\s+([x\d]+).*')
+    for line in f:
+        m = rex.match(line)
+        if m:
+            yield m.groups()
+
+
+if __name__ == "__main__":
+    here = abspath(__file__).rstrip("oc")
+    here_dir = dirname(here)
+    if len(sys.argv) >= 2:
+        deltah = sys.argv[1]
+    else:
+        deltah = joinpath(dirname(dirname(dirname(here_dir))), "deltachat-ffi", "deltachat.h")
+    assert os.path.exists(deltah)
+
+    lines = []
+    skip_to_end = False
+    for orig_line in open(here):
+        if skip_to_end:
+            if not orig_line.startswith("# end const"):
+                continue
+            skip_to_end = False
+        lines.append(orig_line)
+        if orig_line.startswith("# begin const"):
+            with open(deltah) as f:
+                for name, item in read_event_defines(f):
+                    lines.append("{} = {}\n".format(name, item))
+            skip_to_end = True
+
+    tmpname = here + ".tmp"
+    with open(tmpname, "w") as f:
+        f.write("".join(lines))
+    os.rename(tmpname, here)

python/src/deltachat/contact.py

@@ -3,8 +3,6 @@
 from . import props
 from .cutil import from_dc_charpointer
 from .capi import lib, ffi
-from .chat import Chat
-from . import const
 
 
 class Contact(object):
@@ -13,8 +11,6 @@ class Contact(object):
     You obtain instances of it through :class:`deltachat.account.Account`.
     """
     def __init__(self, account, id):
-        from .account import Account
-        assert isinstance(account, Account), repr(account)
         self.account = account
         self.id = id
 
@@ -40,13 +36,10 @@ class Contact(object):
         return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))
 
     @props.with_doc
-    def name(self):
+    def display_name(self):
         """ display name for this contact. """
         return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))
 
-    # deprecated alias
-    display_name = name
-
     def is_blocked(self):
         """ Return True if the contact is blocked. """
         return lib.dc_contact_is_blocked(self._dc_contact)
@@ -65,16 +58,6 @@ class Contact(object):
             return None
         return from_dc_charpointer(dc_res)
 
-    def create_chat(self):
-        """ create or get an existing 1:1 chat object for the specified contact or contact id.
-
-        :param contact: chat_id (int) or contact object.
-        :returns: a :class:`deltachat.chat.Chat` object.
-        """
-        dc_context = self.account._dc_context
-        chat_id = lib.dc_create_chat_by_contact_id(dc_context, self.id)
-        assert chat_id > const.DC_CHAT_ID_LAST_SPECIAL, chat_id
-        return Chat(self.account, chat_id)
-
-    # deprecated name
-    get_chat = create_chat
+    def get_chat(self):
+        """return 1:1 chat for this contact. """
+        return self.account.create_chat_by_contact(self)

python/src/deltachat/direct_imap.py

@@ -1,211 +0,0 @@
-"""
-Internal Python-level IMAP handling used by the testplugin
-and for cleaning up inbox/mvbox for each test function run.
-"""
-
-import io
-import email
-import ssl
-import pathlib
-from imapclient import IMAPClient
-from imapclient.exceptions import IMAPClientError
-import deltachat
-
-
-SEEN = b'\\Seen'
-DELETED = b'\\Deleted'
-FLAGS = b'FLAGS'
-FETCH = b'FETCH'
-ALL = "1:*"
-
-
-@deltachat.global_hookimpl
-def dc_account_extra_configure(account):
-    """ Reset the account (we reuse accounts across tests)
-    and make 'account.direct_imap' available for direct IMAP ops.
-    """
-    imap = DirectImap(account)
-    if imap.select_config_folder("mvbox"):
-        imap.delete(ALL, expunge=True)
-    assert imap.select_config_folder("inbox")
-    imap.delete(ALL, expunge=True)
-    setattr(account, "direct_imap", imap)
-
-
-@deltachat.global_hookimpl
-def dc_account_after_shutdown(account):
-    """ shutdown the imap connection if there is one. """
-    imap = getattr(account, "direct_imap", None)
-    if imap is not None:
-        imap.shutdown()
-        del account.direct_imap
-
-
-class DirectImap:
-    def __init__(self, account):
-        self.account = account
-        self.logid = account.get_config("displayname") or id(account)
-        self._idling = False
-        self.connect()
-
-    def connect(self):
-        ssl_context = ssl.create_default_context()
-
-        # don't check if certificate hostname doesn't match target hostname
-        ssl_context.check_hostname = False
-
-        # don't check if the certificate is trusted by a certificate authority
-        ssl_context.verify_mode = ssl.CERT_NONE
-
-        host = self.account.get_config("configured_mail_server")
-        user = self.account.get_config("addr")
-        pw = self.account.get_config("mail_pw")
-        self.conn = IMAPClient(host, ssl_context=ssl_context)
-        self.conn.login(user, pw)
-
-        self.select_folder("INBOX")
-
-    def shutdown(self):
-        try:
-            self.conn.idle_done()
-        except (OSError, IMAPClientError):
-            pass
-        try:
-            self.conn.logout()
-        except (OSError, IMAPClientError):
-            print("Could not logout direct_imap conn")
-
-    def select_folder(self, foldername):
-        assert not self._idling
-        return self.conn.select_folder(foldername)
-
-    def select_config_folder(self, config_name):
-        """ Return info about selected folder if it is
-        configured, otherwise None. """
-        if "_" not in config_name:
-            config_name = "configured_{}_folder".format(config_name)
-        foldername = self.account.get_config(config_name)
-        if foldername:
-            return self.select_folder(foldername)
-
-    def list_folders(self):
-        """ return list of all existing folder names"""
-        assert not self._idling
-        folders = []
-        for meta, sep, foldername in self.conn.list_folders():
-            folders.append(foldername)
-        return folders
-
-    def delete(self, range, expunge=True):
-        """ delete a range of messages (imap-syntax).
-        If expunge is true, perform the expunge-operation
-        to make sure the messages are really gone and not
-        just flagged as deleted.
-        """
-        self.conn.set_flags(range, [DELETED])
-        if expunge:
-            self.conn.expunge()
-
-    def get_all_messages(self):
-        assert not self._idling
-        return self.conn.fetch(ALL, [FLAGS])
-
-    def get_unread_messages(self):
-        assert not self._idling
-        res = self.conn.fetch(ALL, [FLAGS])
-        return [uid for uid in res
-                if SEEN not in res[uid][FLAGS]]
-
-    def mark_all_read(self):
-        messages = self.get_unread_messages()
-        if messages:
-            res = self.conn.set_flags(messages, [SEEN])
-            print("marked seen:", messages, res)
-
-    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()
-
-        def log(*args, **kwargs):
-            kwargs["file"] = stream
-            print(*args, **kwargs)
-
-        empty_folders = []
-        for imapfolder in self.list_folders():
-            self.select_folder(imapfolder)
-            messages = list(self.get_all_messages())
-            if not messages:
-                empty_folders.append(imapfolder)
-                continue
-
-            log("---------", imapfolder, len(messages), "messages ---------")
-            # get message content without auto-marking it as seen
-            # fetching 'RFC822' would mark it as seen.
-            requested = [b'BODY.PEEK[HEADER]', FLAGS]
-            for uid, data in self.conn.fetch(messages, requested).items():
-                body_bytes = data[b'BODY[HEADER]']
-                flags = data[FLAGS]
-                path = pathlib.Path(str(dir)).joinpath("IMAP", self.logid, imapfolder)
-                path.mkdir(parents=True, exist_ok=True)
-                fn = path.joinpath(str(uid))
-                fn.write_bytes(body_bytes)
-                log("Message", uid, fn)
-                email_message = email.message_from_bytes(body_bytes)
-                log("Message", uid, flags, "Message-Id:", email_message.get("Message-Id"))
-
-        if empty_folders:
-            log("--------- EMPTY FOLDERS:", empty_folders)
-
-        print(stream.getvalue(), file=logfile)
-
-    def idle_start(self):
-        """ switch this connection to idle mode. non-blocking. """
-        assert not self._idling
-        res = self.conn.idle()
-        self._idling = True
-        return res
-
-    def idle_check(self, terminate=False):
-        """ (blocking) wait for next idle message from server. """
-        assert self._idling
-        self.account.log("imap-direct: calling idle_check")
-        res = self.conn.idle_check()
-        if terminate:
-            self.idle_done()
-        return res
-
-    def idle_wait_for_seen(self):
-        """ Return first message with SEEN flag
-        from a running idle-stream REtiurn.
-        """
-        while 1:
-            for item in self.idle_check():
-                if item[1] == FETCH:
-                    if item[2][0] == FLAGS:
-                        if SEEN in item[2][1]:
-                            return item[0]
-
-    def idle_done(self):
-        """ send idle-done to server if we are currently in idle mode. """
-        if self._idling:
-            res = self.conn.idle_done()
-            self._idling = False
-            return res

python/src/deltachat/events.py

@@ -28,9 +28,13 @@ class FFIEventLogger:
     # to prevent garbled logging
     _loglock = threading.RLock()
 
-    def __init__(self, account):
+    def __init__(self, account, logid):
+        """
+        :param logid: an optional logging prefix that should be used with
+                      the default internal logging.
+        """
         self.account = account
-        self.logid = self.account.get_config("displayname")
+        self.logid = logid
         self.init_time = time.time()
 
     @account_hookimpl
@@ -123,12 +127,6 @@ class FFIEventTracker:
         if ev.data2 > 0:
             return self.account.get_message_by_id(ev.data2)
 
-    def wait_msg_delivered(self, msg):
-        ev = self.get_matching("DC_EVENT_MSG_DELIVERED")
-        assert ev.data1 == msg.chat.id
-        assert ev.data2 == msg.id
-        assert msg.is_out_delivered()
-
 
 class EventThread(threading.Thread):
     """ Event Thread for an account.
@@ -174,7 +172,7 @@ class EventThread(threading.Thread):
             # function which provides us signature info of an event call
             evt_name = deltachat.get_dc_event_name(evt)
             if lib.dc_event_has_string_data(evt):
-                data2 = from_dc_charpointer(lib.dc_event_get_data2_str(event))
+                data2 = from_dc_charpointer(lib.dc_event_get_data3_str(event))
             else:
                 data2 = lib.dc_event_get_data2_int(event)
 

python/src/deltachat/hookspec.py

@@ -43,7 +43,7 @@ class PerAccount:
 
     @account_hookspec
     def ac_configure_completed(self, success):
-        """ Called after a configure process completed. """
+        """ Called when a configure process completed. """
 
     @account_hookspec
     def ac_incoming_message(self, message):
@@ -88,14 +88,6 @@ class Global:
     def dc_account_init(self, account):
         """ called when `Account::__init__()` function starts executing. """
 
-    @global_hookspec
-    def dc_account_extra_configure(self, account):
-        """ Called when account configuration successfully finished.
-
-        This hook can be used to perform extra work before
-        ac_configure_completed is called.
-        """
-
     @global_hookspec
     def dc_account_after_shutdown(self, account):
         """ Called after the account has been shutdown. """

python/src/deltachat/message.py

@@ -53,19 +53,15 @@ class Message(object):
             lib.dc_msg_unref
         ))
 
-    def create_chat(self):
-        """ create or get an existing chat (group) object for this message.
-
-        If the message is a deaddrop contact request
-        the sender will become an accepted contact.
-
-        :returns: a :class:`deltachat.chat.Chat` object.
+    def accept_sender_contact(self):
+        """ ensure that the sender is an accepted contact
+        and that the message has a non-deaddrop chat object.
         """
-        from .chat import Chat
-        chat_id = lib.dc_create_chat_by_msg_id(self.account._dc_context, self.id)
-        ctx = self.account._dc_context
-        self._dc_msg = ffi.gc(lib.dc_get_msg(ctx, self.id), lib.dc_msg_unref)
-        return Chat(self.account, chat_id)
+        self.account.create_chat_by_message(self)
+        self._dc_msg = ffi.gc(
+                lib.dc_get_msg(self.account._dc_context, self.id),
+                lib.dc_msg_unref
+        )
 
     @props.with_doc
     def text(self):

python/src/deltachat/testplugin.py

@@ -1,7 +1,6 @@
 from __future__ import print_function
 import os
 import sys
-import io
 import subprocess
 import queue
 import threading
@@ -17,7 +16,6 @@ from . import Account, const
 from .capi import lib
 from .events import FFIEventLogger, FFIEventTracker
 from _pytest._code import Source
-from deltachat import direct_imap
 
 import deltachat
 
@@ -35,6 +33,9 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
+    config.addinivalue_line(
+        "markers", "ignored: Mark test as bing slow, skipped unless --ignored is used."
+    )
     cfg = config.getoption('--liveconfig')
     if not cfg:
         cfg = os.getenv('DCC_NEW_TMP_EMAIL')
@@ -215,7 +216,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
             self._generated_keys = ["alice", "bob", "charlie",
                                     "dom", "elena", "fiona"]
             self.set_logging_default(False)
-            deltachat.register_global_plugin(direct_imap)
 
         def finalize(self):
             while self._finalizers:
@@ -226,15 +226,13 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                 acc = self._accounts.pop()
                 acc.shutdown()
                 acc.disable_logging()
-            deltachat.unregister_global_plugin(direct_imap)
 
         def make_account(self, path, logid, quiet=False):
             ac = Account(path, logging=self._logging)
             ac._evtracker = ac.add_account_plugin(FFIEventTracker(ac))
             ac.addr = ac.get_self_contact().addr
-            ac.set_config("displayname", logid)
             if not quiet:
-                ac.add_account_plugin(FFIEventLogger(ac))
+                ac.add_account_plugin(FFIEventLogger(ac, logid=logid))
             self._accounts.append(ac)
             return ac
 
@@ -303,27 +301,31 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
             configdict["mvbox_move"] = str(int(move))
             configdict["sentbox_watch"] = str(int(sentbox))
             ac.update_config(configdict)
-            ac._configtracker = ac.configure()
+            ac.configure()
             return ac
 
         def get_one_online_account(self, pre_generated_key=True, mvbox=False, move=False):
             ac1 = self.get_online_configuring_account(
                 pre_generated_key=pre_generated_key, mvbox=mvbox, move=move)
-            self.wait_configure_and_start_io()
+            ac1.wait_configure_finish()
+            ac1.start_io()
             return ac1
 
         def get_two_online_accounts(self, move=False, quiet=False):
-            ac1 = self.get_online_configuring_account(move=move, quiet=quiet)
+            ac1 = self.get_online_configuring_account(move=True, quiet=quiet)
             ac2 = self.get_online_configuring_account(quiet=quiet)
-            self.wait_configure_and_start_io()
+            ac1.wait_configure_finish()
+            ac1.start_io()
+            ac2.wait_configure_finish()
+            ac2.start_io()
             return ac1, ac2
 
-        def get_many_online_accounts(self, num, move=True):
-            accounts = [self.get_online_configuring_account(move=move, quiet=True)
+        def get_many_online_accounts(self, num, move=True, quiet=True):
+            accounts = [self.get_online_configuring_account(move=move, quiet=quiet)
                         for i in range(num)]
-            self.wait_configure_and_start_io()
             for acc in accounts:
-                acc.add_account_plugin(FFIEventLogger(acc))
+                acc._configtracker.wait_finish()
+                acc.start_io()
             return accounts
 
         def clone_online_account(self, account, pre_generated_key=True):
@@ -341,28 +343,14 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
                 mvbox_move=account.get_config("mvbox_move"),
                 sentbox_watch=account.get_config("sentbox_watch"),
             ))
-            ac._configtracker = ac.configure()
+            ac.configure()
             return ac
 
-        def wait_configure_and_start_io(self):
-            for acc in self._accounts:
-                if hasattr(acc, "_configtracker"):
-                    acc._configtracker.wait_finish()
-                    del acc._configtracker
-                if acc.is_configured() and not acc.is_started():
-                    acc.start_io()
-                print("{}: {} account was successfully setup".format(
-                    acc.get_config("displayname"), acc.get_config("addr")))
-
         def run_bot_process(self, module, ffi=True):
             fn = module.__file__
 
             bot_ac, bot_cfg = self.get_online_config()
 
-            # Avoid starting ac so we don't interfere with the bot operating on
-            # the same database.
-            self._accounts.remove(bot_ac)
-
             args = [
                 sys.executable,
                 "-u",
@@ -387,42 +375,9 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, data):
             self._finalizers.append(bot.kill)
             return bot
 
-        def dump_imap_summary(self, logfile):
-            for ac in self._accounts:
-                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):
-            ac2.create_chat(ac1)
-            return ac1.create_chat(ac2)
-
-        def introduce_each_other(self, accounts, sending=True):
-            to_wait = []
-            for i, acc in enumerate(accounts):
-                for acc2 in accounts[i + 1:]:
-                    chat = self.get_accepted_chat(acc, acc2)
-                    if sending:
-                        chat.send_text("hi")
-                        to_wait.append(acc2)
-                        acc2.create_chat(acc).send_text("hi back")
-                        to_wait.append(acc)
-            for acc in to_wait:
-                acc._evtracker.wait_next_incoming_message()
-
     am = AccountMaker()
     request.addfinalizer(am.finalize)
-    yield am
-    if hasattr(request.node, "rep_call") and request.node.rep_call.failed:
-        logfile = io.StringIO()
-        am.dump_imap_summary(logfile=logfile)
-        print(logfile.getvalue())
-        # request.node.add_report_section("call", "imap-server-state", s)
+    return am
 
 
 class BotProcess:
@@ -490,17 +445,4 @@ def lp():
 
         def step(self, msg):
             print("-" * 5, "step " + msg, "-" * 5)
-
     return Printer()
-
-
-@pytest.hookimpl(tryfirst=True, hookwrapper=True)
-def pytest_runtest_makereport(item, call):
-    # execute all other hooks to obtain the report object
-    outcome = yield
-    rep = outcome.get_result()
-
-    # set a report attribute for each phase of a call, which can
-    # be "setup", "call", "teardown"
-
-    setattr(item, "rep_" + rep.when, rep)

python/src/deltachat/tracker.py

@@ -2,7 +2,7 @@
 from queue import Queue
 from threading import Event
 
-from .hookspec import account_hookimpl, Global
+from .hookspec import account_hookimpl
 
 
 class ImexFailed(RuntimeError):
@@ -40,14 +40,12 @@ class ConfigureFailed(RuntimeError):
 class ConfigureTracker:
     ConfigureFailed = ConfigureFailed
 
-    def __init__(self, account):
-        self.account = account
+    def __init__(self):
         self._configure_events = Queue()
         self._smtp_finished = Event()
         self._imap_finished = Event()
         self._ffi_events = []
         self._progress = Queue()
-        self._gm = Global._get_plugin_manager()
 
     @account_hookimpl
     def ac_process_ffi_event(self, ffi_event):
@@ -61,10 +59,7 @@ class ConfigureTracker:
 
     @account_hookimpl
     def ac_configure_completed(self, success):
-        if success:
-            self._gm.hook.dc_account_extra_configure(account=self.account)
         self._configure_events.put(success)
-        self.account.remove_account_plugin(self)
 
     def wait_smtp_connected(self):
         """ wait until smtp is configured. """

python/tests/stress_test_db.py

@@ -17,7 +17,7 @@ def test_db_busy_error(acfactory, tmpdir):
             print("%3.2f %s" % (time.time() - starttime, string))
 
     # make a number of accounts
-    accounts = acfactory.get_many_online_accounts(3, quiet=True)
+    accounts = acfactory.get_many_online_accounts(5, quiet=True)
     log("created %s accounts" % len(accounts))
 
     # put a bigfile into each account
@@ -41,7 +41,7 @@ def test_db_busy_error(acfactory, tmpdir):
     # each replier receives all events and sends report events to receive_queue
     repliers = []
     for acc in accounts:
-        replier = AutoReplier(acc, log=log, num_send=500, num_bigfiles=5, report_func=report_func)
+        replier = AutoReplier(acc, log=log, num_send=1000, num_bigfiles=0, report_func=report_func)
         acc.add_account_plugin(replier)
         repliers.append(replier)
 
@@ -57,9 +57,9 @@ def test_db_busy_error(acfactory, tmpdir):
             log("timeout waiting for next event")
             pytest.fail("timeout exceeded")
         if report_type == ReportType.exit:
-            replier.log("EXIT")
+            replier.log("EXIT".format(alive_count))
         elif report_type == ReportType.ffi_error:
-            replier.log("ERROR: {}".format(report_args[0]))
+            replier.log("ERROR: {}".format(addr, report_args[0]))
         elif report_type == ReportType.message_echo:
             continue
         else:
@@ -108,15 +108,14 @@ class AutoReplier:
     @deltachat.account_hookimpl
     def ac_incoming_message(self, message):
         if self.current_sent >= self.num_send:
-            self.report_func(self, ReportType.exit)
             return
-        message.create_chat()
+        message.accept_sender_contact()
         message.mark_seen()
         self.log("incoming message: {}".format(message))
 
         self.current_sent += 1
         # we are still alive, let's send a reply
-        if self.num_bigfiles and self.current_sent % (self.num_send / self.num_bigfiles) == 0:
+        if self.num_bigfiles and self.current_sent % self.num_bigfiles == 0:
             message.chat.send_text("send big file as reply to: {}".format(message.text))
             msg = message.chat.send_file(self.account.bigfile)
         else:

python/tests/test_increation.py

@@ -36,7 +36,9 @@ def wait_msgs_changed(account, msgs_list):
 class TestOnlineInCreation:
     def test_increation_not_blobdir(self, tmpdir, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = ac1.create_chat(ac2)
+
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat = ac1.create_chat_by_contact(c2)
 
         lp.sec("Creating in-creation file outside of blobdir")
         assert tmpdir.strpath != ac1.get_blobdir()
@@ -46,7 +48,9 @@ class TestOnlineInCreation:
 
     def test_no_increation_copies_to_blobdir(self, tmpdir, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
-        chat = ac1.create_chat(ac2)
+
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat = ac1.create_chat_by_contact(c2)
 
         lp.sec("Creating file outside of blobdir")
         assert tmpdir.strpath != ac1.get_blobdir()
@@ -60,7 +64,9 @@ class TestOnlineInCreation:
     def test_forward_increation(self, acfactory, data, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
 
-        chat = ac1.create_chat(ac2)
+        c2 = ac1.create_contact(email=ac2.get_config("addr"))
+        chat = ac1.create_chat_by_contact(c2)
+        assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL
         wait_msgs_changed(ac1, [(0, 0)])  # why no chat id?
 
         lp.sec("create a message with a file in creation")
@@ -74,7 +80,7 @@ class TestOnlineInCreation:
 
         lp.sec("forward the message while still in creation")
         chat2 = ac1.create_group_chat("newgroup")
-        chat2.add_contact(ac2)
+        chat2.add_contact(c2)
         wait_msgs_changed(ac1, [(0, 0)])  # why not chat id?
         ac1.forward_messages([prepared_original], chat2)
         # XXX there might be two EVENT_MSGS_CHANGED and only one of them

python/tests/test_lowlevel.py

@@ -69,8 +69,8 @@ def test_sig():
 def test_markseen_invalid_message_ids(acfactory):
     ac1 = acfactory.get_configured_offline_account()
 
-    contact1 = ac1.create_contact("some1@example.com", name="some1")
-    chat = contact1.create_chat()
+    contact1 = ac1.create_contact(email="some1@example.com", name="some1")
+    chat = ac1.create_chat_by_contact(contact1)
     chat.send_text("one messae")
     ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
     msg_ids = [9]

python/tox.ini

@@ -71,8 +71,6 @@ norecursedirs = .tox
 xfail_strict=true
 timeout = 90
 timeout_method = thread
-markers = 
-    ignored: ignore this test in default test runs, use --ignored to run.
 
 [flake8]
 max-line-length = 120

spec.md

@@ -1,12 +1,10 @@
-# chat-mail specification
+# Chat-over-Email specification
 
-Version: 0.32.0
-Status:  In-progress 
-Format:  [Semantic Line Breaks](https://sembr.org/)
+Version 0.30.0
 
-This document roughly describes how chat-mail 
-apps use the standard e-mail system 
-to implement typical messenger functions.
+This document describes how emails can be used
+to implement typical messenger functions
+while staying compatible to existing MUAs.
 
 - [Encryption](#encryption)
 - [Outgoing messages](#outgoing-messages)
@@ -32,14 +30,17 @@ Messages SHOULD be encrypted by the
 `prefer-encrypt=mutual` MAY be set by default.
 
 Meta data (at least the subject and all chat-headers) SHOULD be encrypted
-by the [Protected Headers](https://www.ietf.org/id/draft-autocrypt-lamps-protected-headers-02.html) standard.
+by the [Memoryhole](https://github.com/autocrypt/memoryhole) standard.
+If Memoryhole is not used,
+the subject of encrypted messages SHOULD be replaced by the string `...`.
 
 
 # Outgoing messages
 
 Messengers MUST add a `Chat-Version: 1.0` header to outgoing messages.
 For filtering and smart appearance of the messages in normal MUAs,
-the `Subject` header SHOULD be `Message from <sender name>`.
+the `Subject` header SHOULD start with the characters `Chat:`
+and SHOULD be an excerpt of the message.
 Replies to messages MAY follow the typical `Re:`-format.
 
 The body MAY contain text which MUST have the content type `text/plain`
@@ -57,7 +58,7 @@ Full quotes, footers or sth. like that MUST NOT go to the user-text-part.
     To: rcpt@domain
     Chat-Version: 1.0
     Content-Type: text/plain
-    Subject: Message from sender@domain
+    Subject: Chat: Hello ...
 
     Hello world!
 

src/blob.rs

@@ -8,15 +8,11 @@ use async_std::prelude::*;
 use async_std::{fs, io};
 
 use image::GenericImageView;
-use num_traits::FromPrimitive;
 use thiserror::Error;
 
-use crate::config::Config;
-use crate::constants::*;
+use crate::constants::AVATAR_SIZE;
 use crate::context::Context;
-use crate::error::Error;
 use crate::events::Event;
-use crate::message;
 
 /// Represents a file in the blob directory.
 ///
@@ -61,7 +57,7 @@ impl<'a> BlobObject<'a> {
             .map_err(|err| BlobError::WriteFailure {
                 blobdir: blobdir.to_path_buf(),
                 blobname: name.clone(),
-                cause: err.into(),
+                cause: err,
             })?;
         let blob = BlobObject {
             blobdir,
@@ -374,75 +370,13 @@ impl<'a> BlobObject<'a> {
         let img = img.thumbnail(AVATAR_SIZE, AVATAR_SIZE);
 
         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(())
-    }
-
-    pub async fn recode_to_image_size(&self, context: &Context) -> Result<(), BlobError> {
-        let blob_abs = self.to_abs_path();
-        if message::guess_msgtype_from_suffix(Path::new(&blob_abs))
-            != Some((Viewtype::Image, "image/jpeg"))
-        {
-            return Ok(());
-        }
-
-        let 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 img_wh = if MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await)
-            .unwrap_or_default()
-            == MediaQuality::Balanced
-        {
-            BALANCED_IMAGE_SIZE
-        } else {
-            WORSE_IMAGE_SIZE
-        };
-
-        if img.width() <= img_wh && img.height() <= img_wh {
-            return Ok(());
-        }
-
-        let mut img = img.thumbnail(img_wh, img_wh);
-        match self.get_exif_orientation(context) {
-            Ok(90) => img = img.rotate90(),
-            Ok(180) => img = img.rotate180(),
-            Ok(270) => img = img.rotate270(),
-            _ => {}
-        }
-
-        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(())
     }
-
-    pub fn get_exif_orientation(&self, context: &Context) -> Result<i32, Error> {
-        let file = std::fs::File::open(self.to_abs_path())?;
-        let mut bufreader = std::io::BufReader::new(&file);
-        let exifreader = exif::Reader::new();
-        let exif = exifreader.read_from_container(&mut bufreader)?;
-        if let Some(orientation) = exif.get_field(exif::Tag::Orientation, exif::In::PRIMARY) {
-            // possible orientation values are described at http://sylvana.net/jpegcrop/exif_orientation.html
-            // we only use rotation, in practise, flipping is not used.
-            match orientation.value.get_uint(0) {
-                Some(3) => return Ok(180),
-                Some(6) => return Ok(90),
-                Some(8) => return Ok(270),
-                other => warn!(context, "exif orientation value ignored: {:?}", other),
-            }
-        }
-        Ok(0)
-    }
 }
 
 impl<'a> fmt::Display for BlobObject<'a> {
@@ -466,7 +400,7 @@ pub enum BlobError {
         blobdir: PathBuf,
         blobname: String,
         #[source]
-        cause: anyhow::Error,
+        cause: std::io::Error,
     },
     #[error("Failed to copy data from {} to blob {blobname} in {}", .src.display(), .blobdir.display())]
     CopyFailure {

src/chat.rs

@@ -39,9 +39,18 @@ impl ChatId {
         ChatId(id)
     }
 
+    /// A ChatID which indicates an error.
+    ///
+    /// This is transitional and should not be used in new code.  Do
+    /// not represent errors in a ChatId.
+    pub fn is_error(self) -> bool {
+        self.0 == 0
+    }
+
     /// An unset ChatId
     ///
-    /// This is transitional and should not be used in new code.
+    /// Like [ChatId::is_error], from which it is indistinguishable, this is
+    /// transitional and should not be used in new code.
     pub fn is_unset(self) -> bool {
         self.0 == 0
     }
@@ -422,44 +431,24 @@ impl ChatId {
     }
 
     async fn get_parent_mime_headers(self, context: &Context) -> Option<(String, String, String)> {
-        let collect =
-            |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?, row.get(3)?));
-        let (rfc724_mid, mime_in_reply_to, mime_references, error): (
-            String,
-            String,
-            String,
-            String,
-        ) = self
-            .parent_query(
-                context,
-                "rfc724_mid, mime_in_reply_to, mime_references, error",
-                collect,
-            )
-            .await
-            .ok()
-            .flatten()?;
-
-        if !error.is_empty() {
-            // Do not reply to error messages.
-            //
-            // An error message could be a group chat message that we failed to decrypt and
-            // assigned to 1:1 chat. A reply to it will show up as a reply to group message
-            // on the other side. To avoid such situations, it is better not to reply to
-            // error messages at all.
-            None
-        } else {
-            Some((rfc724_mid, mime_in_reply_to, mime_references))
-        }
+        let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?));
+        self.parent_query(
+            context,
+            "rfc724_mid, mime_in_reply_to, mime_references",
+            collect,
+        )
+        .await
+        .ok()
+        .flatten()
     }
 
     async fn parent_is_encrypted(self, context: &Context) -> Result<bool, Error> {
-        let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?));
-        let res: Option<(String, String)> =
-            self.parent_query(context, "param, error", collect).await?;
+        let collect = |row: &rusqlite::Row| Ok(row.get(0)?);
+        let packed: Option<String> = self.parent_query(context, "param", collect).await?;
 
-        if let Some((ref packed, ref error)) = res {
+        if let Some(ref packed) = packed {
             let param = packed.parse::<Params>()?;
-            Ok(error.is_empty() && param.exists(Param::GuaranteeE2ee))
+            Ok(param.exists(Param::GuaranteeE2ee))
         } else {
             // No messages
             Ok(false)
@@ -1352,12 +1341,6 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Er
             .ok_or_else(|| {
                 format_err!("Attachment missing for message of type #{}", msg.viewtype)
             })?;
-
-        if msg.viewtype == Viewtype::Image {
-            if let Err(e) = blob.recode_to_image_size(context).await {
-                warn!(context, "Cannot recode image, using original data: {:?}", e);
-            }
-        }
         msg.param.set(Param::File, blob.as_name());
 
         if msg.viewtype == Viewtype::File || msg.viewtype == Viewtype::Image {
@@ -1464,7 +1447,7 @@ pub async fn send_msg(
                 }
             }
             msg.param.remove(Param::PrepForwards);
-            msg.update_param(context).await;
+            msg.save_param_to_disk(context).await;
         }
         return send_msg_inner(context, chat_id, msg).await;
     }
@@ -1947,18 +1930,19 @@ pub async fn create_group_chat(
         .sql
         .get_rowid(context, "chats", "grpid", grpid)
         .await?;
-
     let chat_id = ChatId::new(row_id);
-    if add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF).await {
-        let mut draft_msg = Message::new(Viewtype::Text);
-        draft_msg.set_text(Some(draft_txt));
-        chat_id.set_draft_raw(context, &mut draft_msg).await;
-    }
+    if !chat_id.is_error() {
+        if add_to_chat_contacts_table(context, chat_id, DC_CONTACT_ID_SELF).await {
+            let mut draft_msg = Message::new(Viewtype::Text);
+            draft_msg.set_text(Some(draft_txt));
+            chat_id.set_draft_raw(context, &mut draft_msg).await;
+        }
 
-    context.emit_event(Event::MsgsChanged {
-        msg_id: MsgId::new(0),
-        chat_id: ChatId::new(0),
-    });
+        context.emit_event(Event::MsgsChanged {
+            msg_id: MsgId::new(0),
+            chat_id: ChatId::new(0),
+        });
+    }
 
     Ok(chat_id)
 }
@@ -2596,7 +2580,7 @@ pub async fn forward_msgs(
                         .set(Param::PrepForwards, new_msg_id.to_u32().to_string());
                 }
 
-                msg.update_param(context).await;
+                msg.save_param_to_disk(context).await;
                 msg.param = save_param;
             } else {
                 msg.state = MessageState::OutPending;
@@ -2784,7 +2768,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
 pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl AsRef<str>) {
     let rfc724_mid = dc_create_outgoing_rfc724_mid(None, "@device");
 
-    if let Err(e) = context.sql.execute(
+    if context.sql.execute(
         "INSERT INTO msgs (chat_id,from_id,to_id, timestamp,type,state, txt,rfc724_mid) VALUES (?,?,?, ?,?,?, ?,?);",
         paramsv![
             chat_id,
@@ -2796,8 +2780,7 @@ pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl
             text.as_ref().to_string(),
             rfc724_mid,
         ]
-    ).await {
-        warn!(context, "Could not add info msg: {}", e);
+    ).await.is_err() {
         return;
     }
 

src/config.rs

@@ -11,7 +11,7 @@ use crate::dc_tools::*;
 use crate::events::Event;
 use crate::message::MsgId;
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
-use crate::{scheduler::InterruptInfo, stock::StockMessage};
+use crate::stock::StockMessage;
 
 /// The available configuration keys.
 #[derive(
@@ -104,9 +104,6 @@ pub enum Config {
     ConfiguredServerFlags,
     ConfiguredSendSecurity,
     ConfiguredE2EEEnabled,
-    ConfiguredInboxFolder,
-    ConfiguredMvboxFolder,
-    ConfiguredSentboxFolder,
     Configured,
 
     #[strum(serialize = "sys.version")]
@@ -140,7 +137,6 @@ impl Context {
         // Default values
         match key {
             Config::Selfstatus => Some(self.stock_str(StockMessage::StatusLine).await.into_owned()),
-            Config::ConfiguredInboxFolder => Some("INBOX".to_owned()),
             _ => key.get_str("default").map(|s| s.to_string()),
         }
     }
@@ -203,18 +199,17 @@ impl Context {
             }
             Config::InboxWatch => {
                 let ret = self.sql.set_raw_config(self, key, value).await;
-                self.interrupt_inbox(InterruptInfo::new(false, None)).await;
+                self.interrupt_inbox().await;
                 ret
             }
             Config::SentboxWatch => {
                 let ret = self.sql.set_raw_config(self, key, value).await;
-                self.interrupt_sentbox(InterruptInfo::new(false, None))
-                    .await;
+                self.interrupt_sentbox().await;
                 ret
             }
             Config::MvboxWatch => {
                 let ret = self.sql.set_raw_config(self, key, value).await;
-                self.interrupt_mvbox(InterruptInfo::new(false, None)).await;
+                self.interrupt_mvbox().await;
                 ret
             }
             Config::Selfstatus => {

src/configure/mod.rs

@@ -4,7 +4,7 @@ mod auto_mozilla;
 mod auto_outlook;
 mod read_url;
 
-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, ensure, Result};
 use async_std::prelude::*;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
@@ -66,11 +66,58 @@ impl Context {
     }
 
     async fn inner_configure(&self) -> Result<()> {
+        let mut success = false;
+        let mut param_autoconfig: Option<LoginParam> = None;
+
         info!(self, "Configure ...");
 
-        let was_configured_before = self.is_configured().await;
+        // Variables that are shared between steps:
         let mut param = LoginParam::from_database(self, "").await;
-        let success = configure(self, &mut param).await;
+        // need all vars here to be mutable because rust thinks the same step could be called multiple times
+        // and also initialize, because otherwise rust thinks it's used while unitilized, even if thats not the case as the loop goes only forward
+        let mut param_domain = "undefined.undefined".to_owned();
+        let mut param_addr_urlencoded: String =
+            "Internal Error: this value should never be used".to_owned();
+        let mut keep_flags = 0;
+
+        let mut step_counter: u8 = 0;
+        let (_s, r) = async_std::sync::channel(1);
+        let mut imap = Imap::new(r);
+        let was_configured_before = self.is_configured().await;
+
+        while !self.shall_stop_ongoing().await {
+            step_counter += 1;
+
+            match exec_step(
+                self,
+                &mut imap,
+                &mut param,
+                &mut param_domain,
+                &mut param_autoconfig,
+                &mut param_addr_urlencoded,
+                &mut keep_flags,
+                &mut step_counter,
+            )
+            .await
+            {
+                Ok(step) => {
+                    success = true;
+                    match step {
+                        Step::Continue => {}
+                        Step::Done => break,
+                    }
+                }
+                Err(err) => {
+                    error!(self, "{}", err);
+                    success = false;
+                    break;
+                }
+            }
+        }
+
+        if imap.is_connected() {
+            imap.disconnect(self).await;
+        }
 
         if let Some(provider) = provider::get_provider_info(&param.addr) {
             if !was_configured_before {
@@ -94,294 +141,329 @@ impl Context {
             }
         }
 
-        match success {
-            Ok(_) => {
-                progress!(self, 1000);
-                Ok(())
-            }
-            Err(err) => {
-                error!(self, "Configure Failed: {}", err);
-                progress!(self, 0);
-                Err(err)
-            }
-        }
-    }
-}
+        // remember the entered parameters on success
+        // and restore to last-entered on failure.
+        // this way, the parameters visible to the ui are always in-sync with the current configuration.
+        if success {
+            LoginParam::from_database(self, "")
+                .await
+                .save_to_database(self, "configured_raw_")
+                .await
+                .ok();
 
-async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
-    let mut param_autoconfig: Option<LoginParam> = None;
-    let mut keep_flags = 0;
-
-    // Read login parameters from the database
-    progress!(ctx, 1);
-    ensure!(!param.addr.is_empty(), "Please enter an email address.");
-
-    // Step 1: Load the parameters and check email-address and password
-
-    if 0 != param.server_flags & DC_LP_AUTH_OAUTH2 {
-        // the used oauth2 addr may differ, check this.
-        // 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.mail_pw)
-            .await
-            .and_then(|e| e.parse().ok())
-        {
-            info!(ctx, "Authorized address is {}", oauth2_addr);
-            param.addr = oauth2_addr;
-            ctx.sql
-                .set_raw_config(ctx, "addr", Some(param.addr.as_str()))
-                .await?;
-        }
-        progress!(ctx, 20);
-    }
-    // no oauth? - just continue it's no error
-
-    let parsed: EmailAddress = param.addr.parse().context("Bad email-address")?;
-    let param_domain = parsed.domain;
-    let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
-
-    // Step 2: Autoconfig
-    progress!(ctx, 200);
-
-    // param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then
-    // param.send_pw.is_empty()   -- the password cannot be auto-configured and is no criterion for
-    //                               autoconfig or not
-    if param.mail_server.is_empty()
-        && param.mail_port == 0
-        && param.send_server.is_empty()
-        && param.send_port == 0
-        && param.send_user.is_empty()
-        && (param.server_flags & !DC_LP_AUTH_OAUTH2) == 0
-    {
-        // no advanced parameters entered by the user: query provider-database or do Autoconfig
-        keep_flags = param.server_flags & DC_LP_AUTH_OAUTH2;
-        if let Some(new_param) = get_offline_autoconfig(ctx, &param) {
-            // got parameters from our provider-database, skip Autoconfig, preserve the OAuth2 setting
-            param_autoconfig = Some(new_param);
-        }
-
-        if param_autoconfig.is_none() {
-            param_autoconfig =
-                get_autoconfig(ctx, param, &param_domain, &param_addr_urlencoded).await;
-        }
-    }
-
-    // C.  Do we have any autoconfig result?
-    progress!(ctx, 500);
-    if let Some(ref cfg) = param_autoconfig {
-        info!(ctx, "Got autoconfig: {}", &cfg);
-        if !cfg.mail_user.is_empty() {
-            param.mail_user = cfg.mail_user.clone();
-        }
-        // all other values are always NULL when entering autoconfig
-        param.mail_server = cfg.mail_server.clone();
-        param.mail_port = cfg.mail_port;
-        param.send_server = cfg.send_server.clone();
-        param.send_port = cfg.send_port;
-        param.send_user = cfg.send_user.clone();
-        param.server_flags = cfg.server_flags;
-        // although param_autoconfig's data are no longer needed from,
-        // it is used to later to prevent trying variations of port/server/logins
-    }
-    param.server_flags |= keep_flags;
-
-    // Step 3: Fill missing fields with defaults
-    if param.mail_server.is_empty() {
-        param.mail_server = format!("imap.{}", param_domain,)
-    }
-    if param.mail_port == 0 {
-        param.mail_port = if 0 != param.server_flags & (0x100 | 0x400) {
-            143
+            progress!(self, 1000);
+            Ok(())
         } else {
-            993
+            LoginParam::from_database(self, "configured_raw_")
+                .await
+                .save_to_database(self, "")
+                .await
+                .ok();
+
+            progress!(self, 0);
+            bail!("Configure failed")
         }
     }
-    if param.mail_user.is_empty() {
-        param.mail_user = param.addr.clone();
-    }
-    if param.send_server.is_empty() && !param.mail_server.is_empty() {
-        param.send_server = param.mail_server.clone();
-        if param.send_server.starts_with("imap.") {
-            param.send_server = param.send_server.replacen("imap", "smtp", 1);
-        }
-    }
-    if param.send_port == 0 {
-        param.send_port = if 0 != param.server_flags & DC_LP_SMTP_SOCKET_STARTTLS as i32 {
-            587
-        } else if 0 != param.server_flags & DC_LP_SMTP_SOCKET_PLAIN as i32 {
-            25
-        } else {
-            465
-        }
-    }
-    if param.send_user.is_empty() && !param.mail_user.is_empty() {
-        param.send_user = param.mail_user.clone();
-    }
-    if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
-        param.send_pw = param.mail_pw.clone()
-    }
-    if !dc_exactly_one_bit_set(param.server_flags & DC_LP_AUTH_FLAGS as i32) {
-        param.server_flags &= !(DC_LP_AUTH_FLAGS as i32);
-        param.server_flags |= DC_LP_AUTH_NORMAL as i32
-    }
-    if !dc_exactly_one_bit_set(param.server_flags & DC_LP_IMAP_SOCKET_FLAGS as i32) {
-        param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS as i32);
-        param.server_flags |= if param.send_port == 143 {
-            DC_LP_IMAP_SOCKET_STARTTLS as i32
-        } else {
-            DC_LP_IMAP_SOCKET_SSL as i32
-        }
-    }
-    if !dc_exactly_one_bit_set(param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32)) {
-        param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-        param.server_flags |= if param.send_port == 587 {
-            DC_LP_SMTP_SOCKET_STARTTLS as i32
-        } else if param.send_port == 25 {
-            DC_LP_SMTP_SOCKET_PLAIN as i32
-        } else {
-            DC_LP_SMTP_SOCKET_SSL as i32
-        }
-    }
-
-    // do we have a complete configuration?
-    ensure!(
-        !param.mail_server.is_empty()
-            && param.mail_port != 0
-            && !param.mail_user.is_empty()
-            && !param.mail_pw.is_empty()
-            && !param.send_server.is_empty()
-            && param.send_port != 0
-            && !param.send_user.is_empty()
-            && !param.send_pw.is_empty()
-            && param.server_flags != 0,
-        "Account settings incomplete."
-    );
-
-    progress!(ctx, 600);
-    // try to connect to IMAP - if we did not got an autoconfig,
-    // do some further tries with different settings and username variations
-    let (_s, r) = async_std::sync::channel(1);
-    let mut imap = Imap::new(r);
-
-    try_imap_connections(ctx, param, param_autoconfig.is_some(), &mut imap).await?;
-    progress!(ctx, 800);
-
-    try_smtp_connections(ctx, param, param_autoconfig.is_some()).await?;
-    progress!(ctx, 900);
-
-    let create_mvbox = ctx.get_config_bool(Config::MvboxWatch).await
-        || ctx.get_config_bool(Config::MvboxMove).await;
-
-    imap.configure_folders(ctx, create_mvbox).await?;
-
-    imap.select_with_uidvalidity(ctx, "INBOX")
-        .await
-        .context("could not read INBOX status")?;
-
-    drop(imap);
-
-    progress!(ctx, 910);
-    // configuration success - write back the configured parameters with the
-    // "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(ctx, "configured", true).await?;
-
-    progress!(ctx, 920);
-
-    e2ee::ensure_secret_key_exists(ctx).await?;
-    info!(ctx, "key generation completed");
-
-    progress!(ctx, 940);
-
-    Ok(())
-}
-
-#[derive(Debug, PartialEq, Eq)]
-enum AutoconfigProvider {
-    Mozilla,
-    Outlook,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-struct AutoconfigSource {
-    provider: AutoconfigProvider,
-    url: String,
-}
-
-impl AutoconfigSource {
-    fn all(domain: &str, addr: &str) -> [Self; 5] {
-        [
-            AutoconfigSource {
-                provider: AutoconfigProvider::Mozilla,
-                url: format!(
-                    "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
-                    domain, addr,
-                ),
-            },
-            // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ ,  which makes some sense
-            AutoconfigSource {
-                provider: AutoconfigProvider::Mozilla,
-                url: format!(
-                    "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
-                    domain, addr
-                ),
-            },
-            AutoconfigSource {
-                provider: AutoconfigProvider::Outlook,
-                url: format!("https://{}/autodiscover/autodiscover.xml", domain),
-            },
-            // Outlook uses always SSL but different domains (this comment describes the next two steps)
-            AutoconfigSource {
-                provider: AutoconfigProvider::Outlook,
-                url: format!(
-                    "https://{}{}/autodiscover/autodiscover.xml",
-                    "autodiscover.", domain
-                ),
-            },
-            // always SSL for Thunderbird's database
-            AutoconfigSource {
-                provider: AutoconfigProvider::Mozilla,
-                url: format!("https://autoconfig.thunderbird.net/v1.1/{}", domain),
-            },
-        ]
-    }
-
-    async fn fetch(&self, ctx: &Context, param: &LoginParam) -> Result<LoginParam> {
-        let params = match self.provider {
-            AutoconfigProvider::Mozilla => moz_autoconfigure(ctx, &self.url, &param).await?,
-            AutoconfigProvider::Outlook => outlk_autodiscover(ctx, &self.url, &param).await?,
-        };
-
-        Ok(params)
-    }
 }
 
-/// Retrieve available autoconfigurations.
-///
-/// A Search configurations from the domain used in the email-address, prefer encrypted
-/// B. If we have no configuration yet, search configuration in Thunderbird's centeral database
-async fn get_autoconfig(
+#[allow(clippy::too_many_arguments)]
+async fn exec_step(
     ctx: &Context,
-    param: &LoginParam,
-    param_domain: &str,
-    param_addr_urlencoded: &str,
-) -> Option<LoginParam> {
-    let sources = AutoconfigSource::all(param_domain, param_addr_urlencoded);
+    imap: &mut Imap,
+    param: &mut LoginParam,
+    param_domain: &mut String,
+    param_autoconfig: &mut Option<LoginParam>,
+    param_addr_urlencoded: &mut String,
+    keep_flags: &mut i32,
+    step_counter: &mut u8,
+) -> Result<Step> {
+    const STEP_12_USE_AUTOCONFIG: u8 = 12;
+    const STEP_13_AFTER_AUTOCONFIG: u8 = 13;
 
-    let mut progress = 300;
-    for source in &sources {
-        let res = source.fetch(ctx, param).await;
-        progress!(ctx, progress);
-        progress += 10;
-        if let Ok(res) = res {
-            return Some(res);
+    match *step_counter {
+        // Read login parameters from the database
+        1 => {
+            progress!(ctx, 1);
+            ensure!(!param.addr.is_empty(), "Please enter an email address.");
+        }
+        // Step 1: Load the parameters and check email-address and password
+        2 => {
+            if 0 != param.server_flags & DC_LP_AUTH_OAUTH2 {
+                // the used oauth2 addr may differ, check this.
+                // 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.mail_pw)
+                    .await
+                    .and_then(|e| e.parse().ok())
+                {
+                    info!(ctx, "Authorized address is {}", oauth2_addr);
+                    param.addr = oauth2_addr;
+                    ctx.sql
+                        .set_raw_config(ctx, "addr", Some(param.addr.as_str()))
+                        .await?;
+                }
+                progress!(ctx, 20);
+            }
+            // no oauth? - just continue it's no error
+        }
+        3 => {
+            if let Ok(parsed) = param.addr.parse() {
+                let parsed: EmailAddress = parsed;
+                *param_domain = parsed.domain;
+                *param_addr_urlencoded =
+                    utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();
+            } else {
+                bail!("Bad email-address.");
+            }
+        }
+        // Step 2: Autoconfig
+        4 => {
+            progress!(ctx, 200);
+
+            if param.mail_server.is_empty()
+                && param.mail_port == 0
+            /* && param.mail_user.is_empty() -- the user can enter a loginname which is used by autoconfig then */
+                && param.send_server.is_empty()
+                && param.send_port == 0
+                && param.send_user.is_empty()
+            /* && param.send_pw.is_empty() -- the password cannot be auto-configured and is no criterion for autoconfig or not */
+                && (param.server_flags & !DC_LP_AUTH_OAUTH2) == 0
+            {
+                // no advanced parameters entered by the user: query provider-database or do Autoconfig
+                *keep_flags = param.server_flags & DC_LP_AUTH_OAUTH2;
+                if let Some(new_param) = get_offline_autoconfig(ctx, &param) {
+                    // got parameters from our provider-database, skip Autoconfig, preserve the OAuth2 setting
+                    *param_autoconfig = Some(new_param);
+                    *step_counter = STEP_12_USE_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
+                }
+            } else {
+                // advanced parameters entered by the user: skip Autoconfig
+                *step_counter = STEP_13_AFTER_AUTOCONFIG - 1; // minus one as step_counter is increased on next loop
+            }
+        }
+        /* A.  Search configurations from the domain used in the email-address, prefer encrypted */
+        5 => {
+            if param_autoconfig.is_none() {
+                let url = format!(
+                    "https://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
+                    param_domain, param_addr_urlencoded
+                );
+                *param_autoconfig = moz_autoconfigure(ctx, &url, &param).await.ok();
+            }
+        }
+        6 => {
+            progress!(ctx, 300);
+            if param_autoconfig.is_none() {
+                // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ ,  which makes some sense
+                let url = format!(
+                    "https://{}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={}",
+                    param_domain, param_addr_urlencoded
+                );
+                *param_autoconfig = moz_autoconfigure(ctx, &url, &param).await.ok();
+            }
+        }
+        /* Outlook section start ------------- */
+        /* Outlook uses always SSL but different domains (this comment describes the next two steps) */
+        7 => {
+            progress!(ctx, 310);
+            if param_autoconfig.is_none() {
+                let url = format!("https://{}/autodiscover/autodiscover.xml", param_domain);
+                *param_autoconfig = outlk_autodiscover(ctx, &url, &param).await.ok();
+            }
+        }
+        8 => {
+            progress!(ctx, 320);
+            if param_autoconfig.is_none() {
+                let url = format!(
+                    "https://{}{}/autodiscover/autodiscover.xml",
+                    "autodiscover.", param_domain
+                );
+                *param_autoconfig = outlk_autodiscover(ctx, &url, &param).await.ok();
+            }
+        }
+        /* ----------- Outlook section end */
+        9 => {
+            progress!(ctx, 330);
+            if param_autoconfig.is_none() {
+                let url = format!(
+                    "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
+                    param_domain, param_addr_urlencoded
+                );
+                *param_autoconfig = moz_autoconfigure(ctx, &url, &param).await.ok();
+            }
+        }
+        10 => {
+            progress!(ctx, 340);
+            if param_autoconfig.is_none() {
+                // do not transfer the email-address unencrypted
+                let url = format!(
+                    "http://{}/.well-known/autoconfig/mail/config-v1.1.xml",
+                    param_domain
+                );
+                *param_autoconfig = moz_autoconfigure(ctx, &url, &param).await.ok();
+            }
+        }
+        /* B.  If we have no configuration yet, search configuration in Thunderbird's centeral database */
+        11 => {
+            progress!(ctx, 350);
+            if param_autoconfig.is_none() {
+                /* always SSL for Thunderbird's database */
+                let url = format!("https://autoconfig.thunderbird.net/v1.1/{}", param_domain);
+                *param_autoconfig = moz_autoconfigure(ctx, &url, &param).await.ok();
+            }
+        }
+        /* C.  Do we have any autoconfig result?
+           If you change the match-number here, also update STEP_12_COPY_AUTOCONFIG above
+        */
+        STEP_12_USE_AUTOCONFIG => {
+            progress!(ctx, 500);
+            if let Some(ref cfg) = param_autoconfig {
+                info!(ctx, "Got autoconfig: {}", &cfg);
+                if !cfg.mail_user.is_empty() {
+                    param.mail_user = cfg.mail_user.clone();
+                }
+                param.mail_server = cfg.mail_server.clone(); /* all other values are always NULL when entering autoconfig */
+                param.mail_port = cfg.mail_port;
+                param.send_server = cfg.send_server.clone();
+                param.send_port = cfg.send_port;
+                param.send_user = cfg.send_user.clone();
+                param.server_flags = cfg.server_flags;
+                /* although param_autoconfig's data are no longer needed from,
+                it is used to later to prevent trying variations of port/server/logins */
+            }
+            param.server_flags |= *keep_flags;
+        }
+        // Step 3: Fill missing fields with defaults
+        // If you change the match-number here, also update STEP_13_AFTER_AUTOCONFIG above
+        STEP_13_AFTER_AUTOCONFIG => {
+            if param.mail_server.is_empty() {
+                param.mail_server = format!("imap.{}", param_domain,)
+            }
+            if param.mail_port == 0 {
+                param.mail_port = if 0 != param.server_flags & (0x100 | 0x400) {
+                    143
+                } else {
+                    993
+                }
+            }
+            if param.mail_user.is_empty() {
+                param.mail_user = param.addr.clone();
+            }
+            if param.send_server.is_empty() && !param.mail_server.is_empty() {
+                param.send_server = param.mail_server.clone();
+                if param.send_server.starts_with("imap.") {
+                    param.send_server = param.send_server.replacen("imap", "smtp", 1);
+                }
+            }
+            if param.send_port == 0 {
+                param.send_port = if 0 != param.server_flags & DC_LP_SMTP_SOCKET_STARTTLS as i32 {
+                    587
+                } else if 0 != param.server_flags & DC_LP_SMTP_SOCKET_PLAIN as i32 {
+                    25
+                } else {
+                    465
+                }
+            }
+            if param.send_user.is_empty() && !param.mail_user.is_empty() {
+                param.send_user = param.mail_user.clone();
+            }
+            if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
+                param.send_pw = param.mail_pw.clone()
+            }
+            if !dc_exactly_one_bit_set(param.server_flags & DC_LP_AUTH_FLAGS as i32) {
+                param.server_flags &= !(DC_LP_AUTH_FLAGS as i32);
+                param.server_flags |= DC_LP_AUTH_NORMAL as i32
+            }
+            if !dc_exactly_one_bit_set(param.server_flags & DC_LP_IMAP_SOCKET_FLAGS as i32) {
+                param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS as i32);
+                param.server_flags |= if param.send_port == 143 {
+                    DC_LP_IMAP_SOCKET_STARTTLS as i32
+                } else {
+                    DC_LP_IMAP_SOCKET_SSL as i32
+                }
+            }
+            if !dc_exactly_one_bit_set(param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32)) {
+                param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
+                param.server_flags |= if param.send_port == 587 {
+                    DC_LP_SMTP_SOCKET_STARTTLS as i32
+                } else if param.send_port == 25 {
+                    DC_LP_SMTP_SOCKET_PLAIN as i32
+                } else {
+                    DC_LP_SMTP_SOCKET_SSL as i32
+                }
+            }
+            /* do we have a complete configuration? */
+            if param.mail_server.is_empty()
+                || param.mail_port == 0
+                || param.mail_user.is_empty()
+                || param.mail_pw.is_empty()
+                || param.send_server.is_empty()
+                || param.send_port == 0
+                || param.send_user.is_empty()
+                || param.send_pw.is_empty()
+                || param.server_flags == 0
+            {
+                bail!("Account settings incomplete.");
+            }
+        }
+        14 => {
+            progress!(ctx, 600);
+            /* try to connect to IMAP - if we did not got an autoconfig,
+            do some further tries with different settings and username variations */
+            try_imap_connections(ctx, param, param_autoconfig.is_some(), imap).await?;
+        }
+        15 => {
+            progress!(ctx, 800);
+            try_smtp_connections(ctx, param, param_autoconfig.is_some()).await?;
+        }
+        16 => {
+            progress!(ctx, 900);
+
+            let create_mvbox = ctx.get_config_bool(Config::MvboxWatch).await
+                || ctx.get_config_bool(Config::MvboxMove).await;
+
+            if let Err(err) = imap.configure_folders(ctx, create_mvbox).await {
+                bail!("configuring folders failed: {:?}", err);
+            }
+
+            if let Err(err) = imap.select_with_uidvalidity(ctx, "INBOX").await {
+                bail!("could not read INBOX status: {:?}", err);
+            }
+        }
+        17 => {
+            progress!(ctx, 910);
+            // configuration success - write back the configured parameters with the
+            // "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(ctx, "configured", true).await?;
+        }
+        18 => {
+            progress!(ctx, 920);
+            // we generate the keypair just now - we could also postpone this until the first message is sent, however,
+            // this may result in a unexpected and annoying delay when the user sends his very first message
+            // (~30 seconds on a Moto G4 play) and might looks as if message sending is always that slow.
+            e2ee::ensure_secret_key_exists(ctx).await?;
+            info!(ctx, "key generation completed");
+            progress!(ctx, 940);
+            return Ok(Step::Done);
+        }
+        _ => {
+            bail!("Internal error: step counter out of bound");
         }
     }
 
-    None
+    Ok(Step::Continue)
 }
 
+#[derive(Debug)]
+enum Step {
+    Done,
+    Continue,
+}
+
+#[allow(clippy::unnecessary_unwrap)]
 fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<LoginParam> {
     info!(
         context,
@@ -397,35 +479,37 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
                 // however, rewriting the code to "if let" would make things less obvious,
                 // esp. if we allow more combinations of servers (pop, jmap).
                 // therefore, #[allow(clippy::unnecessary_unwrap)] is added above.
-                if let Some(imap) = imap {
-                    if let Some(smtp) = smtp {
-                        let mut p = LoginParam::new();
-                        p.addr = param.addr.clone();
+                if imap.is_some() && smtp.is_some() {
+                    let imap = imap.unwrap();
+                    let smtp = smtp.unwrap();
 
-                        p.mail_server = imap.hostname.to_string();
-                        p.mail_user = imap.apply_username_pattern(param.addr.clone());
-                        p.mail_port = imap.port as i32;
-                        p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
-                        p.server_flags |= match imap.socket {
-                            provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS,
-                            provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL,
-                        };
+                    let mut p = LoginParam::new();
+                    p.addr = param.addr.clone();
 
-                        p.send_server = smtp.hostname.to_string();
-                        p.send_user = smtp.apply_username_pattern(param.addr.clone());
-                        p.send_port = smtp.port as i32;
-                        p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
-                        p.server_flags |= match smtp.socket {
-                            provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32,
-                            provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32,
-                        };
+                    p.mail_server = imap.hostname.to_string();
+                    p.mail_user = imap.apply_username_pattern(param.addr.clone());
+                    p.mail_port = imap.port as i32;
+                    p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
+                    p.server_flags |= match imap.socket {
+                        provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS,
+                        provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL,
+                    };
 
-                        info!(context, "offline autoconfig found: {}", p);
-                        return Some(p);
-                    }
+                    p.send_server = smtp.hostname.to_string();
+                    p.send_user = smtp.apply_username_pattern(param.addr.clone());
+                    p.send_port = smtp.port as i32;
+                    p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
+                    p.server_flags |= match smtp.socket {
+                        provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32,
+                        provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32,
+                    };
+
+                    info!(context, "offline autoconfig found: {}", p);
+                    return Some(p);
+                } else {
+                    info!(context, "offline autoconfig found, but no servers defined");
+                    return None;
                 }
-                info!(context, "offline autoconfig found, but no servers defined");
-                return None;
             }
             provider::Status::BROKEN => {
                 info!(context, "offline autoconfig found, provider is broken");
@@ -439,32 +523,19 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
 
 async fn try_imap_connections(
     context: &Context,
-    param: &mut LoginParam,
+    mut param: &mut LoginParam,
     was_autoconfig: bool,
     imap: &mut Imap,
-) -> Result<()> {
-    // manually_set_param is used to check whether a particular setting was set manually by the user.
-    // If yes, we do not want to change it to avoid confusing error messages
-    // (you set port 443, but the app tells you it couldn't connect on port 993).
-    let manually_set_param = LoginParam::from_database(context, "").await;
-
+) -> Result<bool> {
     // progress 650 and 660
-    if try_imap_connection(context, param, &manually_set_param, was_autoconfig, 0, imap)
-        .await
-        .is_ok()
-    {
-        return Ok(()); // we directly return here if it was autoconfig or the connection succeeded
+    if let Ok(val) = try_imap_connection(context, &mut param, was_autoconfig, 0, imap).await {
+        return Ok(val);
     }
-
     progress!(context, 670);
-    // try_imap_connection() changed the flags and port. Change them back:
-    if manually_set_param.server_flags & DC_LP_IMAP_SOCKET_FLAGS == 0 {
-        param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS);
-        param.server_flags |= DC_LP_IMAP_SOCKET_SSL;
-    }
-    if manually_set_param.mail_port == 0 {
-        param.mail_port = 993;
-    }
+    param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS);
+    param.server_flags |= DC_LP_IMAP_SOCKET_SSL;
+    param.mail_port = 993;
+
     if let Some(at) = param.mail_user.find('@') {
         param.mail_user = param.mail_user.split_at(at).0.to_string();
     }
@@ -472,43 +543,35 @@ async fn try_imap_connections(
         param.send_user = param.send_user.split_at(at).0.to_string();
     }
     // progress 680 and 690
-    try_imap_connection(context, param, &manually_set_param, was_autoconfig, 1, imap).await
+    try_imap_connection(context, &mut param, was_autoconfig, 1, imap).await
 }
 
 async fn try_imap_connection(
     context: &Context,
     param: &mut LoginParam,
-    manually_set_param: &LoginParam,
     was_autoconfig: bool,
     variation: usize,
     imap: &mut Imap,
-) -> Result<()> {
-    if try_imap_one_param(context, param, imap).await.is_ok() {
-        return Ok(());
+) -> Result<bool> {
+    if try_imap_one_param(context, &param, imap).await.is_ok() {
+        return Ok(true);
     }
     if was_autoconfig {
-        return Ok(());
+        return Ok(false);
     }
-
     progress!(context, 650 + variation * 30);
-
-    if manually_set_param.server_flags & DC_LP_IMAP_SOCKET_FLAGS == 0 {
-        param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS);
-        param.server_flags |= DC_LP_IMAP_SOCKET_STARTTLS;
-
-        if try_imap_one_param(context, &param, imap).await.is_ok() {
-            return Ok(());
-        }
+    param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS);
+    param.server_flags |= DC_LP_IMAP_SOCKET_STARTTLS;
+    if try_imap_one_param(context, &param, imap).await.is_ok() {
+        return Ok(true);
     }
 
     progress!(context, 660 + variation * 30);
+    param.mail_port = 143;
 
-    if manually_set_param.mail_port == 0 {
-        param.mail_port = 143;
-        try_imap_one_param(context, param, imap).await
-    } else {
-        Err(format_err!("no more possible configs"))
-    }
+    try_imap_one_param(context, &param, imap).await?;
+
+    Ok(true)
 }
 
 async fn try_imap_one_param(context: &Context, param: &LoginParam, imap: &mut Imap) -> Result<()> {
@@ -527,51 +590,41 @@ async fn try_imap_one_param(context: &Context, param: &LoginParam, imap: &mut Im
         return Ok(());
     }
 
+    if context.shall_stop_ongoing().await {
+        bail!("Interrupted");
+    }
+
     bail!("Could not connect: {}", inf);
 }
 
 async fn try_smtp_connections(
     context: &Context,
-    param: &mut LoginParam,
+    mut param: &mut LoginParam,
     was_autoconfig: bool,
 ) -> Result<()> {
-    // manually_set_param is used to check whether a particular setting was set manually by the user.
-    // If yes, we do not want to change it to avoid confusing error messages
-    // (you set port 443, but the app tells you it couldn't connect on port 993).
-    let manually_set_param = LoginParam::from_database(context, "").await;
-
     let mut smtp = Smtp::new();
-    // try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do
-    // a second try with STARTTLS-587
-    if try_smtp_one_param(context, param, &mut smtp).await.is_ok() {
+    /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */
+    if try_smtp_one_param(context, &param, &mut smtp).await.is_ok() {
         return Ok(());
     }
     if was_autoconfig {
         return Ok(());
     }
     progress!(context, 850);
+    param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
+    param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
+    param.send_port = 587;
 
-    if manually_set_param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32) == 0 {
-        param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-        param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
-    }
-    if manually_set_param.send_port == 0 {
-        param.send_port = 587;
-    }
-
-    if try_smtp_one_param(context, param, &mut smtp).await.is_ok() {
+    if try_smtp_one_param(context, &param, &mut smtp).await.is_ok() {
         return Ok(());
     }
     progress!(context, 860);
+    param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
+    param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
+    param.send_port = 25;
+    try_smtp_one_param(context, &param, &mut smtp).await?;
 
-    if manually_set_param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32) == 0 {
-        param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
-        param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
-    }
-    if manually_set_param.send_port == 0 {
-        param.send_port = 25;
-    }
-    try_smtp_one_param(context, param, &mut smtp).await
+    Ok(())
 }
 
 async fn try_smtp_one_param(context: &Context, param: &LoginParam, smtp: &mut Smtp) -> Result<()> {

src/constants.rs

@@ -227,10 +227,6 @@ pub const DC_BOB_SUCCESS: i32 = 1;
 // max. width/height of an avatar
 pub const AVATAR_SIZE: u32 = 192;
 
-// max. width/height of images
-pub const BALANCED_IMAGE_SIZE: u32 = 1280;
-pub const WORSE_IMAGE_SIZE: u32 = 640;
-
 // this value can be increased if the folder configuration is changed and must be redone on next program start
 pub const DC_FOLDERS_CONFIGURED_VERSION: i32 = 3;
 

src/contact.rs

@@ -3,8 +3,6 @@
 use async_std::path::PathBuf;
 use deltachat_derive::*;
 use itertools::Itertools;
-use lazy_static::lazy_static;
-use regex::Regex;
 
 use crate::aheader::EncryptPreference;
 use crate::chat::ChatId;
@@ -14,7 +12,7 @@ use crate::context::Context;
 use crate::dc_tools::*;
 use crate::error::{bail, ensure, format_err, Result};
 use crate::events::Event;
-use crate::key::{DcKey, SignedPublicKey};
+use crate::key::{DcKey, Key, SignedPublicKey};
 use crate::login_param::LoginParam;
 use crate::message::{MessageState, MsgId};
 use crate::mimeparser::AvatarAction;
@@ -240,8 +238,6 @@ impl Contact {
             "Cannot create contact with empty address"
         );
 
-        let (name, addr) = sanitize_name_and_addr(name, addr);
-
         let (contact_id, sth_modified) =
             Contact::add_or_lookup(context, name, addr, Origin::ManuallyCreated).await?;
         let blocked = Contact::is_blocked_load(context, contact_id).await;
@@ -516,9 +512,8 @@ impl Contact {
         let mut modify_cnt = 0;
 
         for (name, addr) in split_address_book(addr_book.as_ref()).into_iter() {
-            let (name, addr) = sanitize_name_and_addr(name, addr);
             let name = normalize_name(name);
-            match Contact::add_or_lookup(context, name, &addr, Origin::AddressBook).await {
+            match Contact::add_or_lookup(context, name, addr, Origin::AddressBook).await {
                 Err(err) => {
                     warn!(
                         context,
@@ -696,20 +691,18 @@ impl Contact {
                     })
                     .await;
                 ret += &p;
+                let self_key = Key::from(SignedPublicKey::load_self(context).await?);
                 let p = context.stock_str(StockMessage::FingerPrints).await;
                 ret += &format!(" {}:", p);
 
-                let fingerprint_self = SignedPublicKey::load_self(context)
-                    .await?
-                    .fingerprint()
-                    .to_string();
+                let fingerprint_self = self_key.formatted_fingerprint();
                 let fingerprint_other_verified = peerstate
                     .peek_key(PeerstateVerifiedStatus::BidirectVerified)
-                    .map(|k| k.fingerprint().to_string())
+                    .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 let fingerprint_other_unverified = peerstate
                     .peek_key(PeerstateVerifiedStatus::Unverified)
-                    .map(|k| k.fingerprint().to_string())
+                    .map(|k| k.formatted_fingerprint())
                     .unwrap_or_default();
                 if loginparam.addr < peerstate.addr {
                     cat_fingerprint(&mut ret, &loginparam.addr, &fingerprint_self, "");
@@ -1035,24 +1028,6 @@ pub fn addr_normalize(addr: &str) -> &str {
     norm
 }
 
-fn sanitize_name_and_addr(name: impl AsRef<str>, addr: impl AsRef<str>) -> (String, String) {
-    lazy_static! {
-        static ref ADDR_WITH_NAME_REGEX: Regex = Regex::new("(.*)<(.*)>").unwrap();
-    }
-    if let Some(captures) = ADDR_WITH_NAME_REGEX.captures(addr.as_ref()) {
-        (
-            if name.as_ref().is_empty() {
-                normalize_name(&captures[1])
-            } else {
-                name.as_ref().to_string()
-            },
-            captures[2].to_string(),
-        )
-    } else {
-        (name.as_ref().to_string(), addr.as_ref().to_string())
-    }
-}
-
 async fn set_block_contact(context: &Context, contact_id: u32, new_blocking: bool) {
     if contact_id <= DC_CONTACT_ID_LAST_SPECIAL {
         return;
@@ -1227,10 +1202,6 @@ mod tests {
         assert_eq!(may_be_valid_addr("u@d.tt"), true);
         assert_eq!(may_be_valid_addr("u@.tt"), false);
         assert_eq!(may_be_valid_addr("@d.tt"), false);
-        assert_eq!(may_be_valid_addr("<da@d.tt"), false);
-        assert_eq!(may_be_valid_addr("sk <@d.tt>"), false);
-        assert_eq!(may_be_valid_addr("as@sd.de>"), false);
-        assert_eq!(may_be_valid_addr("ask dkl@dd.tt"), false);
     }
 
     #[test]
@@ -1313,10 +1284,9 @@ mod tests {
             "Name two\ntwo@deux.net\n",
             "Invalid\n+1234567890\n", // invalid, should be ignored
             "\nthree@drei.sam\n",
-            "Name two\ntwo@deux.net\n", // should not be added again
-            "\nWonderland, Alice <alice@w.de>\n",
+            "Name two\ntwo@deux.net\n" // should not be added again
         );
-        assert_eq!(Contact::add_address_book(&t.ctx, book).await.unwrap(), 4);
+        assert_eq!(Contact::add_address_book(&t.ctx, book).await.unwrap(), 3);
 
         // check first added contact, this does not modify because of lower origin
         let (contact_id, sth_modified) =
@@ -1392,19 +1362,6 @@ mod tests {
         assert_eq!(contact.get_name_n_addr(), "schnucki (three@drei.sam)");
         assert!(!contact.is_blocked());
 
-        // Fourth contact:
-        let (contact_id, sth_modified) =
-            Contact::add_or_lookup(&t.ctx, "", "alice@w.de", Origin::IncomingUnknownTo)
-                .await
-                .unwrap();
-        assert!(contact_id > DC_CONTACT_ID_LAST_SPECIAL);
-        assert_eq!(sth_modified, Modifier::None);
-        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "Alice Wonderland");
-        assert_eq!(contact.get_display_name(), "Alice Wonderland");
-        assert_eq!(contact.get_addr(), "alice@w.de");
-        assert_eq!(contact.get_name_n_addr(), "Alice Wonderland (alice@w.de)");
-
         // check SELF
         let contact = Contact::load_from_db(&t.ctx, DC_CONTACT_ID_SELF)
             .await
@@ -1571,50 +1528,4 @@ mod tests {
         assert!(addr_cmp(" aa@aa.ORG ", "AA@AA.ORG"));
         assert!(addr_cmp(" mailto:AA@AA.ORG", "Aa@Aa.orG"));
     }
-
-    #[async_std::test]
-    async fn test_name_in_address() {
-        let t = dummy_context().await;
-
-        let contact_id = Contact::create(&t.ctx, "", "<dave@example.org>")
-            .await
-            .unwrap();
-        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_addr(), "dave@example.org");
-
-        let contact_id = Contact::create(&t.ctx, "", "Mueller, Dave <dave@example.org>")
-            .await
-            .unwrap();
-        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "Dave Mueller");
-        assert_eq!(contact.get_addr(), "dave@example.org");
-
-        let contact_id = Contact::create(&t.ctx, "name1", "name2 <dave@example.org>")
-            .await
-            .unwrap();
-        let contact = Contact::load_from_db(&t.ctx, contact_id).await.unwrap();
-        assert_eq!(contact.get_name(), "name1");
-        assert_eq!(contact.get_addr(), "dave@example.org");
-
-        assert!(Contact::create(&t.ctx, "", "<dskjfdslk@sadklj.dk")
-            .await
-            .is_err());
-        assert!(Contact::create(&t.ctx, "", "<dskjf>dslk@sadklj.dk>")
-            .await
-            .is_err());
-        assert!(Contact::create(&t.ctx, "", "dskjfdslksadklj.dk")
-            .await
-            .is_err());
-        assert!(Contact::create(&t.ctx, "", "dskjfdslk@sadklj.dk>")
-            .await
-            .is_err());
-        assert!(Contact::create(&t.ctx, "", "dskjf@dslk@sadkljdk")
-            .await
-            .is_err());
-        assert!(Contact::create(&t.ctx, "", "dskjf dslk@d.e").await.is_err());
-        assert!(Contact::create(&t.ctx, "", "<dskjf dslk@sadklj.dk")
-            .await
-            .is_err());
-    }
 }

src/context.rs

@@ -15,7 +15,7 @@ use crate::dc_tools::duration_to_str;
 use crate::error::*;
 use crate::events::{Event, EventEmitter, Events};
 use crate::job::{self, Action};
-use crate::key::{DcKey, SignedPublicKey};
+use crate::key::{DcKey, Key, SignedPublicKey};
 use crate::login_param::LoginParam;
 use crate::lot::Lot;
 use crate::message::{self, Message, MessengerMessage, MsgId};
@@ -138,15 +138,10 @@ impl Context {
     /// Starts the IO scheduler.
     pub async fn start_io(&self) {
         info!(self, "starting IO");
-        if self.is_io_running().await {
-            info!(self, "IO is already running");
-            return;
-        }
+        assert!(!self.is_io_running().await, "context is already running");
 
-        {
-            let l = &mut *self.inner.scheduler.write().await;
-            l.start(self.clone()).await;
-        }
+        let l = &mut *self.inner.scheduler.write().await;
+        l.start(self.clone()).await;
     }
 
     /// Returns if the IO scheduler is running.
@@ -157,11 +152,6 @@ impl Context {
     /// Stops the IO scheduler.
     pub async fn stop_io(&self) {
         info!(self, "stopping IO");
-        if !self.is_io_running().await {
-            info!(self, "IO is not running");
-            return;
-        }
-
         self.inner.stop_io().await;
     }
 
@@ -285,7 +275,7 @@ impl Context {
             .query_get_value(self, "SELECT COUNT(*) FROM acpeerstates;", paramsv![])
             .await;
         let fingerprint_str = match SignedPublicKey::load_self(self).await {
-            Ok(key) => key.fingerprint().hex(),
+            Ok(key) => Key::from(key).fingerprint(),
             Err(err) => format!("<key failure: {}>", err),
         };
 
@@ -300,11 +290,13 @@ impl Context {
             .unwrap_or_default();
 
         let configured_sentbox_folder = self
-            .get_config(Config::ConfiguredSentboxFolder)
+            .sql
+            .get_raw_config(self, "configured_sentbox_folder")
             .await
             .unwrap_or_else(|| "<unset>".to_string());
         let configured_mvbox_folder = self
-            .get_config(Config::ConfiguredMvboxFolder)
+            .sql
+            .get_raw_config(self, "configured_mvbox_folder")
             .await
             .unwrap_or_else(|| "<unset>".to_string());
 
@@ -440,19 +432,33 @@ impl Context {
             .unwrap_or_default()
     }
 
-    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 fn is_inbox(&self, folder_name: impl AsRef<str>) -> bool {
+        folder_name.as_ref() == "INBOX"
     }
 
     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())
+        let sentbox_name = self
+            .sql
+            .get_raw_config(self, "configured_sentbox_folder")
+            .await;
+        if let Some(name) = sentbox_name {
+            name == folder_name.as_ref()
+        } else {
+            false
+        }
     }
 
     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())
+        let mvbox_name = self
+            .sql
+            .get_raw_config(self, "configured_mvbox_folder")
+            .await;
+
+        if let Some(name) = mvbox_name {
+            name == folder_name.as_ref()
+        } else {
+            false
+        }
     }
 
     pub async fn do_heuristics_moves(&self, folder: &str, msg_id: MsgId) {

src/dc_receive_imf.rs

@@ -10,7 +10,7 @@ use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
 use crate::dc_tools::*;
-use crate::error::{bail, ensure, format_err, Result};
+use crate::error::{bail, ensure, Result};
 use crate::events::Event;
 use crate::headerdef::HeaderDef;
 use crate::job::{self, Action};
@@ -238,7 +238,7 @@ pub async fn dc_receive_imf(
     cleanup(context, &create_event_to_send, created_db_entries);
 
     mime_parser
-        .handle_reports(context, from_id, sent_timestamp, &mime_parser.parts)
+        .handle_reports(context, from_id, sent_timestamp)
         .await;
 
     Ok(())
@@ -313,6 +313,8 @@ async fn add_parts(
 ) -> Result<()> {
     let mut state: MessageState;
     let mut chat_id_blocked = Blocked::Not;
+    let mut sort_timestamp = 0;
+    let mut rcvd_timestamp = 0;
     let mut mime_in_reply_to = String::new();
     let mut mime_references = String::new();
     let mut incoming_origin = incoming_origin;
@@ -405,14 +407,6 @@ async fn add_parts(
                 .await
                 .unwrap_or_default();
 
-        if chat_id.is_unset() && mime_parser.failure_report.is_some() {
-            *chat_id = ChatId::new(DC_CHAT_ID_TRASH);
-            info!(
-                context,
-                "Message belongs to an NDN and is not shown in a chat.",
-            );
-        }
-
         // get the chat_id - a chat_id here is no indicator that the chat is displayed in the normal list,
         // it might also be blocked and displayed in the deaddrop as a result
         if chat_id.is_unset() {
@@ -607,9 +601,17 @@ async fn add_parts(
     }
     // correct message_timestamp, it should not be used before,
     // however, we cannot do this earlier as we need from_id to be set
-    let rcvd_timestamp = time();
-    let sort_timestamp = calc_sort_timestamp(context, *sent_timestamp, *chat_id, !seen).await;
-    *sent_timestamp = std::cmp::min(*sent_timestamp, rcvd_timestamp);
+    calc_timestamps(
+        context,
+        *chat_id,
+        from_id,
+        *sent_timestamp,
+        !seen,
+        &mut sort_timestamp,
+        sent_timestamp,
+        &mut rcvd_timestamp,
+    )
+    .await;
 
     // unarchive chat
     chat_id.unarchive(context).await?;
@@ -645,7 +647,7 @@ async fn add_parts(
     let sent_timestamp = *sent_timestamp;
     let is_hidden = *hidden;
     let chat_id = *chat_id;
-    let is_mdn = !mime_parser.mdn_reports.is_empty();
+    let is_mdn = !mime_parser.reports.is_empty();
 
     // TODO: can this clone be avoided?
     let rfc724_mid = rfc724_mid.to_string();
@@ -662,8 +664,8 @@ async fn add_parts(
                     "INSERT INTO msgs \
          (rfc724_mid, server_folder, server_uid, chat_id, from_id, to_id, timestamp, \
          timestamp_sent, timestamp_rcvd, type, state, msgrmsg,  txt, txt_raw, param, \
-         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references, error) \
-         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?, ?);",
+         bytes, hidden, mime_headers,  mime_in_reply_to, mime_references) \
+         VALUES (?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?, ?,?);",
                 )?;
 
                 let is_location_kml = location_kml_is
@@ -707,7 +709,6 @@ async fn add_parts(
                     mime_headers,
                     mime_in_reply_to,
                     mime_references,
-                    part.error,
                 ])?;
 
                 drop(stmt);
@@ -748,31 +749,6 @@ async fn add_parts(
         }
     }
 
-    async fn update_last_subject(
-        context: &Context,
-        chat_id: ChatId,
-        mime_parser: &MimeMessage,
-    ) -> Result<()> {
-        let mut chat = Chat::load_from_db(context, chat_id).await?;
-        chat.param.set(
-            Param::LastSubject,
-            mime_parser
-                .get_subject()
-                .ok_or_else(|| format_err!("No subject in email"))?,
-        );
-        chat.update_param(context).await?;
-        Ok(())
-    }
-    update_last_subject(context, chat_id, mime_parser)
-        .await
-        .unwrap_or_else(|e| {
-            warn!(
-                context,
-                "Could not update LastSubject of chat: {}",
-                e.to_string()
-            )
-        });
-
     Ok(())
 }
 
@@ -836,38 +812,41 @@ async fn save_locations(
     }
 }
 
-async fn calc_sort_timestamp(
+#[allow(clippy::too_many_arguments)]
+async fn calc_timestamps(
     context: &Context,
-    message_timestamp: i64,
     chat_id: ChatId,
+    from_id: u32,
+    message_timestamp: i64,
     is_fresh_msg: bool,
-) -> i64 {
-    let mut sort_timestamp = message_timestamp;
-
-    // get newest non fresh message for this chat
-    // update sort_timestamp if less than that
+    sort_timestamp: &mut i64,
+    sent_timestamp: &mut i64,
+    rcvd_timestamp: &mut i64,
+) {
+    *rcvd_timestamp = time();
+    *sent_timestamp = message_timestamp;
+    if *sent_timestamp > *rcvd_timestamp {
+        *sent_timestamp = *rcvd_timestamp
+    }
+    *sort_timestamp = message_timestamp;
     if is_fresh_msg {
         let last_msg_time: Option<i64> = context
             .sql
             .query_get_value(
                 context,
-                "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? AND state>?",
-                paramsv![chat_id, MessageState::InFresh],
+                "SELECT MAX(timestamp) FROM msgs WHERE chat_id=? and from_id!=? AND timestamp>=?",
+                paramsv![chat_id, from_id as i32, *sort_timestamp],
             )
             .await;
-
         if let Some(last_msg_time) = last_msg_time {
-            if last_msg_time > sort_timestamp {
-                sort_timestamp = last_msg_time;
+            if last_msg_time > 0 && *sort_timestamp <= last_msg_time {
+                *sort_timestamp = last_msg_time + 1;
             }
         }
     }
-
-    if sort_timestamp >= dc_smeared_time(context).await {
-        sort_timestamp = dc_create_smeared_timestamp(context).await;
+    if *sort_timestamp >= dc_smeared_time(context).await {
+        *sort_timestamp = dc_create_smeared_timestamp(context).await;
     }
-
-    sort_timestamp
 }
 
 /// This function tries extracts the group-id from the message and returns the
@@ -910,29 +889,32 @@ async fn create_or_lookup_group(
     }
 
     if grpid.is_empty() {
-        if let Some(extracted_grpid) = mime_parser
-            .get(HeaderDef::MessageId)
-            .and_then(|value| dc_extract_grpid_from_rfc724_mid(&value))
-        {
-            grpid = extracted_grpid.to_string();
-        } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
-            grpid = extracted_grpid.to_string();
-        } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References) {
-            grpid = extracted_grpid.to_string();
-        } else {
-            return create_or_lookup_adhoc_group(
-                context,
-                mime_parser,
-                allow_creation,
-                create_blocked,
-                from_id,
-                to_ids,
-            )
-            .await
-            .map_err(|err| {
-                info!(context, "could not create adhoc-group: {:?}", err);
-                err
-            });
+        if let Some(value) = mime_parser.get(HeaderDef::MessageId) {
+            if let Some(extracted_grpid) = dc_extract_grpid_from_rfc724_mid(&value) {
+                grpid = extracted_grpid.to_string();
+            }
+        }
+        if grpid.is_empty() {
+            if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
+                grpid = extracted_grpid.to_string();
+            } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References)
+            {
+                grpid = extracted_grpid.to_string();
+            } else {
+                return create_or_lookup_adhoc_group(
+                    context,
+                    mime_parser,
+                    allow_creation,
+                    create_blocked,
+                    from_id,
+                    to_ids,
+                )
+                .await
+                .map_err(|err| {
+                    info!(context, "could not create adhoc-group: {:?}", err);
+                    err
+                });
+            }
         }
     }
     // now we have a grpid that is non-empty
@@ -1019,7 +1001,7 @@ async fn create_or_lookup_group(
     let (mut chat_id, chat_id_verified, _blocked) = chat::get_chat_id_by_grpid(context, &grpid)
         .await
         .unwrap_or((ChatId::new(0), false, Blocked::Not));
-    if !chat_id.is_unset() {
+    if !chat_id.is_error() {
         if chat_id_verified {
             if let Err(err) =
                 check_verified_properties(context, mime_parser, from_id as u32, to_ids).await
@@ -1050,7 +1032,7 @@ async fn create_or_lookup_group(
         .await
         .unwrap_or_default();
 
-    if chat_id.is_unset()
+    if chat_id.is_error()
             && !mime_parser.is_mailinglist_message()
             && !grpid.is_empty()
             && grpname.is_some()
@@ -1223,6 +1205,10 @@ async fn create_or_lookup_adhoc_group(
     from_id: u32,
     to_ids: &ContactIds,
 ) -> Result<(ChatId, Blocked)> {
+    // if we're here, no grpid was found, check if there is an existing
+    // ad-hoc group matching the to-list or if we should and can create one
+    // (we do not want to heuristically look at the likely mangled Subject)
+
     if mime_parser.is_mailinglist_message() {
         // XXX we could parse List-* headers and actually create and
         // manage a mailing list group, eventually
@@ -1233,10 +1219,6 @@ async fn create_or_lookup_adhoc_group(
         return Ok((ChatId::new(0), Blocked::Not));
     }
 
-    // if we're here, no grpid was found, check if there is an existing
-    // ad-hoc group matching the to-list or if we should and can create one
-    // (we do not want to heuristically look at the likely mangled Subject)
-
     let mut member_ids: Vec<u32> = to_ids.iter().copied().collect();
     if !member_ids.contains(&from_id) {
         member_ids.push(from_id);
@@ -1289,24 +1271,6 @@ async fn create_or_lookup_adhoc_group(
         return Ok((ChatId::new(0), Blocked::Not));
     }
 
-    if mime_parser.decrypting_failed {
-        // Do not create a new ad-hoc group if the message cannot be
-        // decrypted.
-        //
-        // The subject may be encrypted and contain a placeholder such
-        // as "...". Besides that, it is possible that the message was
-        // sent to a valid, yet unknown group, which was rejected
-        // because Chat-Group-Name, which is in the encrypted part,
-        // was not found. Generating a new ID in this case would
-        // result in creation of a twin group with a different group
-        // ID.
-        warn!(
-            context,
-            "not creating ad-hoc group for message that cannot be decrypted"
-        );
-        return Ok((ChatId::new(0), Blocked::Not));
-    }
-
     // we do not check if the message is a reply to another group, this may result in
     // chats with unclear member list. instead we create a new group in the following lines ...
 
@@ -1776,7 +1740,7 @@ mod tests {
     use crate::chat::ChatVisibility;
     use crate::chatlist::Chatlist;
     use crate::message::Message;
-    use crate::test_utils::*;
+    use crate::test_utils::{dummy_context, TestContext};
 
     #[test]
     fn test_hex_hash() {
@@ -1872,6 +1836,23 @@ mod tests {
         assert!(!is_msgrmsg_rfc724_mid(&t.ctx, "nonexistant@message.id").await);
     }
 
+    async fn configured_offline_context() -> TestContext {
+        let t = dummy_context().await;
+        t.ctx
+            .set_config(Config::Addr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::ConfiguredAddr, Some("alice@example.org"))
+            .await
+            .unwrap();
+        t.ctx
+            .set_config(Config::Configured, Some("1"))
+            .await
+            .unwrap();
+        t
+    }
+
     static MSGRMSG: &[u8] = b"From: Bob <bob@example.org>\n\
                     To: alice@example.org\n\
                     Chat-Version: 1.0\n\
@@ -2333,170 +2314,4 @@ mod tests {
             "Carl"
         );
     }
-
-    #[async_std::test]
-    async fn test_parse_ndn_testrun() {
-        test_parse_ndn(
-            "alice@testrun.org",
-            "hcksocnsofoejx@five.chat",
-            "Mr.A7pTA5IgrUA.q4bP41vAJOp@testrun.org",
-            include_bytes!("../test-data/message/testrun_ndn.eml"),
-            "Undelivered Mail Returned to Sender – This is the mail system at host hq5.merlinux.eu.\n\nI\'m sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It\'s attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<hcksocnsofoejx@five.chat>: host mail.five.chat[195.62.125.103] said: 550 5.1.1\n    <hcksocnsofoejx@five.chat>: Recipient address rejected: User unknown in\n    virtual mailbox table (in reply to RCPT TO command)"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_yahoo() {
-        test_parse_ndn(
-            "alice@yahoo.com",
-            "haeclirth.sinoenrat@yahoo.com",
-            "1680295672.3657931.1591783872936@mail.yahoo.com",
-            include_bytes!("../test-data/message/yahoo_ndn.eml"),
-            "Failure Notice – Sorry, we were unable to deliver your message to the following address.\n\n<haeclirth.sinoenrat@yahoo.com>:\n554: delivery error: dd Not a valid recipient - atlas117.free.mail.ne1.yahoo.com"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_gmail() {
-        test_parse_ndn(
-            "alice@gmail.com",
-            "assidhfaaspocwaeofi@gmail.com",
-            "CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com",
-            include_bytes!("../test-data/message/gmail_ndn.eml"),
-            "Delivery Status Notification (Failure) – ** Die Adresse wurde nicht gefunden **\n\nIhre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.\n\nHier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser\n\nAntwort:\n\n550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient\'s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp",
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_gmx() {
-        test_parse_ndn(
-            "alice@gmx.com",
-            "snaerituhaeirns@gmail.com",
-            "9c9c2a32-056b-3592-c372-d7e8f0bd4bc2@gmx.de",
-            include_bytes!("../test-data/message/gmx_ndn.eml"),
-            "Mail delivery failed: returning message to sender – This message was created automatically by mail delivery software.\n\nA message that you sent could not be delivered to one or more of\nits recipients. This is a permanent error. The following address(es)\nfailed:\n\nsnaerituhaeirns@gmail.com:\nSMTP error from remote server for RCPT TO command, host: gmail-smtp-in.l.google.com (66.102.1.27) reason: 550-5.1.1 The email account that you tried to reach does not exist. Please\n try\n550-5.1.1 double-checking the recipient\'s email address for typos or\n550-5.1.1 unnecessary spaces. Learn more at\n550 5.1.1  https://support.google.com/mail/?p=NoSuchUser f6si2517766wmc.21\n9 - gsmtp"
-        )
-        .await;
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_posteo() {
-        test_parse_ndn(
-            "alice@posteo.org",
-            "hanerthaertidiuea@gmx.de",
-            "04422840-f884-3e37-5778-8192fe22d8e1@posteo.de",
-            include_bytes!("../test-data/message/posteo_ndn.eml"),
-            "Undelivered Mail Returned to Sender – This is the mail system at host mout01.posteo.de.\n\nI\'m sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It\'s attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<hanerthaertidiuea@gmx.de>: host mx01.emig.gmx.net[212.227.17.5] said: 550\n    Requested action not taken: mailbox unavailable (in reply to RCPT TO\n    command)",
-        )
-        .await;
-    }
-
-    // ndn = Non Delivery Notification
-    async fn test_parse_ndn(
-        self_addr: &str,
-        foreign_addr: &str,
-        rfc724_mid_outgoing: &str,
-        raw_ndn: &[u8],
-        error_msg: &str,
-    ) {
-        let t = configured_offline_context_with_addr(self_addr).await;
-
-        dc_receive_imf(
-            &t.ctx,
-            format!(
-                "From: {}\n\
-                To: {}\n\
-                Subject: foo\n\
-                Message-ID: <{}>\n\
-                Chat-Version: 1.0\n\
-                Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
-                \n\
-                hello\n",
-                self_addr, foreign_addr, rfc724_mid_outgoing
-            )
-            .as_bytes(),
-            "INBOX",
-            1,
-            false,
-        )
-        .await
-        .unwrap();
-
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        let msg_id = chats.get_msg_id(0).unwrap();
-
-        // Check that the ndn would be downloaded:
-        let headers = mailparse::parse_mail(raw_ndn).unwrap().headers;
-        assert!(
-            crate::imap::prefetch_should_download(&t.ctx, &headers, ShowEmails::Off)
-                .await
-                .unwrap()
-        );
-
-        dc_receive_imf(&t.ctx, raw_ndn, "INBOX", 1, false)
-            .await
-            .unwrap();
-        let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
-
-        assert_eq!(msg.state, MessageState::OutFailed);
-        assert_eq!(msg.error, error_msg);
-    }
-
-    #[async_std::test]
-    async fn test_parse_ndn_group_msg() {
-        let t = configured_offline_context_with_addr("alice@gmail.com").await;
-
-        dc_receive_imf(
-            &t.ctx,
-            b"From: alice@gmail.com\n\
-                 To: bob@example.org, assidhfaaspocwaeofi@gmail.com\n\
-                 Subject: foo\n\
-                 Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>\n\
-                 Chat-Version: 1.0\n\
-                 Chat-Group-ID: abcde\n\
-                 Chat-Group-Name: foo\n\
-                 Chat-Disposition-Notification-To: alice@example.org\n\
-                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
-                 \n\
-                 hello\n",
-            "INBOX",
-            1,
-            false,
-        )
-        .await
-        .unwrap();
-
-        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
-        let msg_id = chats.get_msg_id(0).unwrap();
-
-        let raw = include_bytes!("../test-data/message/gmail_ndn_group.eml");
-        dc_receive_imf(&t.ctx, raw, "INBOX", 1, false)
-            .await
-            .unwrap();
-
-        let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
-
-        assert_eq!(msg.state, MessageState::OutFailed);
-
-        let msgs = chat::get_chat_msgs(&t.ctx, msg.chat_id, 0, None).await;
-        let last_msg = Message::load_from_db(&t.ctx, *msgs.last().unwrap())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            last_msg.text,
-            Some(
-                t.ctx
-                    .stock_string_repl_str(
-                        StockMessage::FailedSendingTo,
-                        "assidhfaaspocwaeofi@gmail.com",
-                    )
-                    .await,
-            )
-        );
-        assert_eq!(last_msg.from_id, DC_CONTACT_ID_INFO);
-    }
 }

src/dc_tools.rs

@@ -482,6 +482,15 @@ pub struct InvalidEmailError {
     addr: String,
 }
 
+impl InvalidEmailError {
+    fn new(msg: impl Into<String>, addr: impl Into<String>) -> InvalidEmailError {
+        InvalidEmailError {
+            message: msg.into(),
+            addr: addr.into(),
+        }
+    }
+}
+
 /// Very simple email address wrapper.
 ///
 /// Represents an email address, right now just the `name@domain` portion.
@@ -521,24 +530,17 @@ impl FromStr for EmailAddress {
 
     /// Performs a dead-simple parse of an email address.
     fn from_str(input: &str) -> Result<EmailAddress, InvalidEmailError> {
+        if input.is_empty() {
+            return Err(InvalidEmailError::new("empty string is not valid", input));
+        }
+        let parts: Vec<&str> = input.rsplitn(2, '@').collect();
+
         let err = |msg: &str| {
             Err(InvalidEmailError {
                 message: msg.to_string(),
                 addr: input.to_string(),
             })
         };
-        if input.is_empty() {
-            return err("empty string is not valid");
-        }
-        let parts: Vec<&str> = input.rsplitn(2, '@').collect();
-
-        if input
-            .chars()
-            .any(|c| c.is_whitespace() || c == '<' || c == '>')
-        {
-            return err("Email must not contain whitespaces, '>' or '<'");
-        }
-
         match &parts[..] {
             [domain, local] => {
                 if local.is_empty() {

src/e2ee.rs

@@ -11,7 +11,7 @@ use crate::context::Context;
 use crate::error::*;
 use crate::headerdef::HeaderDef;
 use crate::headerdef::HeaderDefMap;
-use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
+use crate::key::{DcKey, Key, SignedPublicKey, SignedSecretKey};
 use crate::keyring::*;
 use crate::peerstate::*;
 use crate::pgp;
@@ -87,29 +87,30 @@ impl EncryptHelper {
 
     /// Tries to encrypt the passed in `mail`.
     pub async fn encrypt(
-        self,
+        &mut self,
         context: &Context,
         min_verified: PeerstateVerifiedStatus,
         mail_to_encrypt: lettre_email::PartBuilder,
-        peerstates: Vec<(Option<Peerstate<'_>>, &str)>,
+        peerstates: &[(Option<Peerstate<'_>>, &str)],
     ) -> Result<String> {
-        let mut keyring: Keyring<SignedPublicKey> = Keyring::new();
+        let mut keyring = Keyring::default();
 
         for (peerstate, addr) in peerstates
-            .into_iter()
-            .filter_map(|(state, addr)| state.map(|s| (s, addr)))
+            .iter()
+            .filter_map(|(state, addr)| state.as_ref().map(|s| (s, addr)))
         {
-            let key = peerstate.take_key(min_verified).ok_or_else(|| {
+            let key = peerstate.peek_key(min_verified).ok_or_else(|| {
                 format_err!("proper enc-key for {} missing, cannot encrypt", addr)
             })?;
-            keyring.add(key);
+            keyring.add_ref(key);
         }
-        keyring.add(self.public_key.clone());
-        let sign_key = SignedSecretKey::load_self(context).await?;
+        let public_key = Key::from(self.public_key.clone());
+        keyring.add_ref(&public_key);
+        let sign_key = Key::from(SignedSecretKey::load_self(context).await?);
 
         let raw_message = mail_to_encrypt.build().as_string().into_bytes();
 
-        let ctext = pgp::pk_encrypt(&raw_message, keyring, Some(sign_key)).await?;
+        let ctext = pgp::pk_encrypt(&raw_message, &keyring, Some(&sign_key))?;
 
         Ok(ctext)
     }
@@ -119,7 +120,7 @@ pub async fn try_decrypt(
     context: &Context,
     mail: &ParsedMail<'_>,
     message_time: i64,
-) -> Result<(Option<Vec<u8>>, HashSet<Fingerprint>)> {
+) -> Result<(Option<Vec<u8>>, HashSet<String>)> {
     let from = mail
         .headers
         .get_header(HeaderDef::From_)
@@ -150,33 +151,41 @@ pub async fn try_decrypt(
     }
 
     /* possibly perform decryption */
-    let private_keyring: Keyring<SignedSecretKey> = Keyring::new_self(context).await?;
-    let mut public_keyring_for_validate: Keyring<SignedPublicKey> = Keyring::new();
+    let mut private_keyring = Keyring::default();
+    let mut public_keyring_for_validate = Keyring::default();
+    let mut out_mail = None;
     let mut signatures = HashSet::default();
+    let self_addr = context.get_config(Config::ConfiguredAddr).await;
 
-    if peerstate.as_ref().map(|p| p.last_seen).unwrap_or_else(|| 0) == 0 {
-        peerstate = Peerstate::from_addr(&context, &from).await;
-    }
-    if let Some(peerstate) = peerstate {
-        if peerstate.degrade_event.is_some() {
-            handle_degrade_event(context, &peerstate).await?;
-        }
-        if let Some(key) = peerstate.gossip_key {
-            public_keyring_for_validate.add(key);
-        }
-        if let Some(key) = peerstate.public_key {
-            public_keyring_for_validate.add(key);
+    if let Some(self_addr) = self_addr {
+        if private_keyring
+            .load_self_private_for_decrypting(context, self_addr, &context.sql)
+            .await
+        {
+            if peerstate.as_ref().map(|p| p.last_seen).unwrap_or_else(|| 0) == 0 {
+                peerstate = Peerstate::from_addr(&context, &from).await;
+            }
+            if let Some(ref peerstate) = peerstate {
+                if peerstate.degrade_event.is_some() {
+                    handle_degrade_event(context, &peerstate).await?;
+                }
+                if let Some(ref key) = peerstate.gossip_key {
+                    public_keyring_for_validate.add_ref(key);
+                }
+                if let Some(ref key) = peerstate.public_key {
+                    public_keyring_for_validate.add_ref(key);
+                }
+            }
+
+            out_mail = decrypt_if_autocrypt_message(
+                context,
+                mail,
+                &private_keyring,
+                &public_keyring_for_validate,
+                &mut signatures,
+            )?;
         }
     }
-
-    let out_mail = decrypt_if_autocrypt_message(
-        context,
-        mail,
-        private_keyring,
-        public_keyring_for_validate,
-        &mut signatures,
-    )
-    .await?;
     Ok((out_mail, signatures))
 }
 
@@ -207,12 +216,12 @@ fn get_autocrypt_mime<'a, 'b>(mail: &'a ParsedMail<'b>) -> Result<&'a ParsedMail
     Ok(&mail.subparts[1])
 }
 
-async fn decrypt_if_autocrypt_message<'a>(
+fn decrypt_if_autocrypt_message<'a>(
     context: &Context,
     mail: &ParsedMail<'a>,
-    private_keyring: Keyring<SignedSecretKey>,
-    public_keyring_for_validate: Keyring<SignedPublicKey>,
-    ret_valid_signatures: &mut HashSet<Fingerprint>,
+    private_keyring: &Keyring,
+    public_keyring_for_validate: &Keyring,
+    ret_valid_signatures: &mut HashSet<String>,
 ) -> Result<Option<Vec<u8>>> {
     //  The returned bool is true if we detected an Autocrypt-encrypted
     // message and successfully decrypted it. Decryption then modifies the
@@ -231,20 +240,21 @@ async fn decrypt_if_autocrypt_message<'a>(
     info!(context, "Detected Autocrypt-mime message");
 
     decrypt_part(
+        context,
         encrypted_data_part,
         private_keyring,
         public_keyring_for_validate,
         ret_valid_signatures,
     )
-    .await
 }
 
 /// Returns Ok(None) if nothing encrypted was found.
-async fn decrypt_part(
+fn decrypt_part(
+    _context: &Context,
     mail: &ParsedMail<'_>,
-    private_keyring: Keyring<SignedSecretKey>,
-    public_keyring_for_validate: Keyring<SignedPublicKey>,
-    ret_valid_signatures: &mut HashSet<Fingerprint>,
+    private_keyring: &Keyring,
+    public_keyring_for_validate: &Keyring,
+    ret_valid_signatures: &mut HashSet<String>,
 ) -> Result<Option<Vec<u8>>> {
     let data = mail.get_body_raw()?;
 
@@ -253,12 +263,11 @@ async fn decrypt_part(
         ensure!(ret_valid_signatures.is_empty(), "corrupt signatures");
 
         let plain = pgp::pk_decrypt(
-            data,
-            private_keyring,
-            public_keyring_for_validate,
+            &data,
+            &private_keyring,
+            &public_keyring_for_validate,
             Some(ret_valid_signatures),
-        )
-        .await?;
+        )?;
 
         ensure!(!ret_valid_signatures.is_empty(), "no valid signatures");
         return Ok(Some(plain));

src/headerdef.rs

@@ -21,7 +21,6 @@ pub enum HeaderDef {
     References,
     InReplyTo,
     Precedence,
-    ContentType,
     ChatVersion,
     ChatGroupId,
     ChatGroupName,

src/imap/client.rs

@@ -7,7 +7,7 @@ use async_imap::{
 use async_std::net::{self, TcpStream};
 
 use super::session::Session;
-use crate::login_param::dc_build_tls;
+use crate::login_param::{dc_build_tls, CertificateChecks};
 
 use super::session::SessionStream;
 
@@ -78,10 +78,10 @@ impl Client {
     pub async fn connect_secure<A: net::ToSocketAddrs, S: AsRef<str>>(
         addr: A,
         domain: S,
-        strict_tls: bool,
+        certificate_checks: CertificateChecks,
     ) -> ImapResult<Self> {
         let stream = TcpStream::connect(addr).await?;
-        let tls = dc_build_tls(strict_tls);
+        let tls = dc_build_tls(certificate_checks);
         let tls_stream: Box<dyn SessionStream> =
             Box::new(tls.connect(domain.as_ref(), stream).await?);
         let mut client = ImapClient::new(tls_stream);
@@ -118,12 +118,16 @@ impl Client {
         })
     }
 
-    pub async fn secure<S: AsRef<str>>(self, domain: S, strict_tls: bool) -> ImapResult<Client> {
+    pub async fn secure<S: AsRef<str>>(
+        self,
+        domain: S,
+        certificate_checks: CertificateChecks,
+    ) -> ImapResult<Client> {
         if self.is_secure {
             Ok(self)
         } else {
             let Client { mut inner, .. } = self;
-            let tls = dc_build_tls(strict_tls);
+            let tls = dc_build_tls(certificate_checks);
             inner.run_command_and_check_ok("STARTTLS", None).await?;
 
             let stream = inner.into_inner();

src/imap/idle.rs

@@ -4,7 +4,7 @@ use async_imap::extensions::idle::IdleResponse;
 use async_std::prelude::*;
 use std::time::{Duration, SystemTime};
 
-use crate::{context::Context, scheduler::InterruptInfo};
+use crate::context::Context;
 
 use super::select_folder;
 use super::session::Session;
@@ -34,11 +34,7 @@ impl Imap {
         self.config.can_idle
     }
 
-    pub async fn idle(
-        &mut self,
-        context: &Context,
-        watch_folder: Option<String>,
-    ) -> Result<InterruptInfo> {
+    pub async fn idle(&mut self, context: &Context, watch_folder: Option<String>) -> Result<()> {
         use futures::future::FutureExt;
 
         if !self.can_idle() {
@@ -50,7 +46,6 @@ impl Imap {
 
         let session = self.session.take();
         let timeout = Duration::from_secs(23 * 60);
-        let mut info = Default::default();
 
         if let Some(session) = session {
             let mut handle = session.idle();
@@ -60,11 +55,6 @@ impl Imap {
 
             let (idle_wait, interrupt) = handle.wait_with_timeout(timeout);
 
-            enum Event {
-                IdleResponse(IdleResponse),
-                Interrupt(InterruptInfo),
-            }
-
             if self.skip_next_idle_wait {
                 // interrupt_idle has happened before we
                 // provided self.interrupt
@@ -75,27 +65,23 @@ impl Imap {
                 info!(context, "Idle wait was skipped");
             } else {
                 info!(context, "Idle entering wait-on-remote state");
-                let fut = idle_wait.map(|ev| ev.map(Event::IdleResponse)).race(
-                    self.idle_interrupt.recv().map(|probe_network| {
-                        Ok(Event::Interrupt(probe_network.unwrap_or_default()))
-                    }),
+                let fut = idle_wait.race(
+                    self.idle_interrupt
+                        .recv()
+                        .map(|_| Ok(IdleResponse::ManualInterrupt)),
                 );
 
                 match fut.await {
-                    Ok(Event::IdleResponse(IdleResponse::NewData(_))) => {
+                    Ok(IdleResponse::NewData(_)) => {
                         info!(context, "Idle has NewData");
                     }
                     // TODO: idle_wait does not distinguish manual interrupts
                     // from Timeouts if we would know it's a Timeout we could bail
                     // directly and reconnect .
-                    Ok(Event::IdleResponse(IdleResponse::Timeout)) => {
+                    Ok(IdleResponse::Timeout) => {
                         info!(context, "Idle-wait timeout or interruption");
                     }
-                    Ok(Event::IdleResponse(IdleResponse::ManualInterrupt)) => {
-                        info!(context, "Idle wait was interrupted");
-                    }
-                    Ok(Event::Interrupt(i)) => {
-                        info = i;
+                    Ok(IdleResponse::ManualInterrupt) => {
                         info!(context, "Idle wait was interrupted");
                     }
                     Err(err) => {
@@ -129,26 +115,16 @@ impl Imap {
             }
         }
 
-        Ok(info)
+        Ok(())
     }
 
-    pub(crate) async fn fake_idle(
-        &mut self,
-        context: &Context,
-        watch_folder: Option<String>,
-    ) -> InterruptInfo {
+    pub(crate) async fn fake_idle(&mut self, context: &Context, watch_folder: Option<String>) {
         // Idle using polling. This is also needed if we're not yet configured -
         // in this case, we're waiting for a configure job (and an interrupt).
 
         let fake_idle_start_time = SystemTime::now();
         info!(context, "IMAP-fake-IDLEing...");
 
-        // Do not poll, just wait for an interrupt when no folder is passed in.
-        if watch_folder.is_none() {
-            return self.idle_interrupt.recv().await.unwrap_or_default();
-        }
-
-        let mut info: InterruptInfo = Default::default();
         if self.skip_next_idle_wait {
             // interrupt_idle has happened before we
             // provided self.interrupt
@@ -159,61 +135,53 @@ impl Imap {
             // TODO: grow sleep durations / make them more flexible
             let mut interval = async_std::stream::interval(Duration::from_secs(60));
 
-            enum Event {
-                Tick,
-                Interrupt(InterruptInfo),
-            }
             // loop until we are interrupted or if we fetched something
-            info =
-                loop {
-                    use futures::future::FutureExt;
-                    match interval
-                        .next()
-                        .map(|_| Event::Tick)
-                        .race(self.idle_interrupt.recv().map(|probe_network| {
-                            Event::Interrupt(probe_network.unwrap_or_default())
-                        }))
-                        .await
-                    {
-                        Event::Tick => {
-                            // try to connect with proper login params
-                            // (setup_handle_if_needed might not know about them if we
-                            // never successfully connected)
-                            if let Err(err) = self.connect_configured(context).await {
-                                warn!(context, "fake_idle: could not connect: {}", err);
-                                continue;
-                            }
-                            if self.config.can_idle {
-                                // we only fake-idled because network was gone during IDLE, probably
-                                break InterruptInfo::new(false, None);
-                            }
-                            info!(context, "fake_idle is connected");
-                            // we are connected, let's see if fetching messages results
-                            // in anything.  If so, we behave as if IDLE had data but
-                            // will have already fetched the messages so perform_*_fetch
-                            // will not find any new.
+            loop {
+                use futures::future::FutureExt;
+                match interval
+                    .next()
+                    .race(self.idle_interrupt.recv().map(|_| None))
+                    .await
+                {
+                    Some(_) => {
+                        // try to connect with proper login params
+                        // (setup_handle_if_needed might not know about them if we
+                        // never successfully connected)
+                        if let Err(err) = self.connect_configured(context).await {
+                            warn!(context, "fake_idle: could not connect: {}", err);
+                            continue;
+                        }
+                        if self.config.can_idle {
+                            // we only fake-idled because network was gone during IDLE, probably
+                            break;
+                        }
+                        info!(context, "fake_idle is connected");
+                        // we are connected, let's see if fetching messages results
+                        // in anything.  If so, we behave as if IDLE had data but
+                        // will have already fetched the messages so perform_*_fetch
+                        // will not find any new.
 
-                            if let Some(ref watch_folder) = watch_folder {
-                                match self.fetch_new_messages(context, watch_folder).await {
-                                    Ok(res) => {
-                                        info!(context, "fetch_new_messages returned {:?}", res);
-                                        if res {
-                                            break InterruptInfo::new(false, None);
-                                        }
-                                    }
-                                    Err(err) => {
-                                        error!(context, "could not fetch from folder: {}", err);
-                                        self.trigger_reconnect()
+                        if let Some(ref watch_folder) = watch_folder {
+                            match self.fetch_new_messages(context, watch_folder).await {
+                                Ok(res) => {
+                                    info!(context, "fetch_new_messages returned {:?}", res);
+                                    if res {
+                                        break;
                                     }
                                 }
+                                Err(err) => {
+                                    error!(context, "could not fetch from folder: {}", err);
+                                    self.trigger_reconnect()
+                                }
                             }
                         }
-                        Event::Interrupt(info) => {
-                            // Interrupt
-                            break info;
-                        }
                     }
-                };
+                    None => {
+                        // Interrupt
+                        break;
+                    }
+                }
+            }
         }
 
         info!(
@@ -225,7 +193,5 @@ impl Imap {
                 .as_millis() as f64
                 / 1000.,
         );
-
-        info
     }
 }

src/imap/mod.rs

@@ -3,7 +3,7 @@
 //! uses [async-email/async-imap](https://github.com/async-email/async-imap)
 //! to implement connect, fetch, delete functionality with standard IMAP servers.
 
-use std::collections::BTreeMap;
+use num_traits::FromPrimitive;
 
 use async_imap::{
     error::Result as ImapResult,
@@ -11,7 +11,6 @@ use async_imap::{
 };
 use async_std::prelude::*;
 use async_std::sync::Receiver;
-use num_traits::FromPrimitive;
 
 use crate::config::*;
 use crate::constants::*;
@@ -27,8 +26,7 @@ use crate::message::{self, update_server_uid};
 use crate::mimeparser;
 use crate::oauth2::dc_get_oauth2_access_token;
 use crate::param::Params;
-use crate::provider::get_provider_info;
-use crate::{scheduler::InterruptInfo, stock::StockMessage};
+use crate::stock::StockMessage;
 
 mod client;
 mod idle;
@@ -110,7 +108,7 @@ const SELECT_ALL: &str = "1:*";
 
 #[derive(Debug)]
 pub struct Imap {
-    idle_interrupt: Receiver<InterruptInfo>,
+    idle_interrupt: Receiver<()>,
     config: ImapConfig,
     session: Option<Session>,
     connected: bool,
@@ -150,7 +148,7 @@ struct ImapConfig {
     pub imap_port: u16,
     pub imap_user: String,
     pub imap_pw: String,
-    pub strict_tls: bool,
+    pub certificate_checks: CertificateChecks,
     pub server_flags: usize,
     pub selected_folder: Option<String>,
     pub selected_mailbox: Option<Mailbox>,
@@ -170,7 +168,7 @@ impl Default for ImapConfig {
             imap_port: 0,
             imap_user: "".into(),
             imap_pw: "".into(),
-            strict_tls: false,
+            certificate_checks: Default::default(),
             server_flags: 0,
             selected_folder: None,
             selected_mailbox: None,
@@ -182,7 +180,7 @@ impl Default for ImapConfig {
 }
 
 impl Imap {
-    pub fn new(idle_interrupt: Receiver<InterruptInfo>) -> Self {
+    pub fn new(idle_interrupt: Receiver<()>) -> Self {
         Imap {
             idle_interrupt,
             config: Default::default(),
@@ -229,7 +227,7 @@ impl Imap {
                 match Client::connect_insecure((imap_server, imap_port)).await {
                     Ok(client) => {
                         if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
-                            client.secure(imap_server, config.strict_tls).await
+                            client.secure(imap_server, config.certificate_checks).await
                         } else {
                             Ok(client)
                         }
@@ -241,8 +239,12 @@ impl Imap {
                 let imap_server: &str = config.imap_server.as_ref();
                 let imap_port = config.imap_port;
 
-                Client::connect_secure((imap_server, imap_port), imap_server, config.strict_tls)
-                    .await
+                Client::connect_secure(
+                    (imap_server, imap_port),
+                    imap_server,
+                    config.certificate_checks,
+                )
+                .await
             };
 
         let login_res = match connection_res {
@@ -292,8 +294,6 @@ impl Imap {
 
         match login_res {
             Ok(session) => {
-                // needs to be set here to ensure it is set on reconnects.
-                self.connected = true;
                 self.session = Some(session);
                 Ok(())
             }
@@ -314,15 +314,9 @@ impl Imap {
     }
 
     async fn unsetup_handle(&mut self, context: &Context) {
-        // Close folder if messages should be expunged
-        if let Err(err) = self.close_folder(context).await {
-            warn!(context, "failed to close folder: {:?}", err);
-        }
-
-        // Logout from the server
         if let Some(mut session) = self.session.take() {
-            if let Err(err) = session.logout().await {
-                warn!(context, "failed to logout: {:?}", err);
+            if let Err(err) = session.close().await {
+                warn!(context, "failed to close connection: {:?}", err);
             }
         }
         self.connected = false;
@@ -382,15 +376,7 @@ impl Imap {
             config.imap_port = imap_port;
             config.imap_user = imap_user.to_string();
             config.imap_pw = imap_pw.to_string();
-            let provider = get_provider_info(&lp.addr);
-            config.strict_tls = match lp.imap_certificate_checks {
-                CertificateChecks::Automatic => {
-                    provider.map_or(false, |provider| provider.strict_tls)
-                }
-                CertificateChecks::Strict => true,
-                CertificateChecks::AcceptInvalidCertificates
-                | CertificateChecks::AcceptInvalidCertificates2 => false,
-            };
+            config.certificate_checks = lp.imap_certificate_checks;
             config.server_flags = server_flags;
         }
 
@@ -591,120 +577,164 @@ impl Imap {
             .select_with_uidvalidity(context, folder.as_ref())
             .await?;
 
-        let msgs = self.fetch_after(context, last_seen_uid).await?;
-        let read_cnt = msgs.len();
-        let folder: &str = folder.as_ref();
+        let mut read_cnt: usize = 0;
+
+        if self.session.is_none() {
+            return Err(Error::NoConnection);
+        }
+        let session = self.session.as_mut().unwrap();
+
+        // fetch messages with larger UID than the last one seen
+        // `(UID FETCH lastseenuid+1:*)`, see RFC 4549
+        let set = format!("{}:*", last_seen_uid + 1);
+
+        info!(context, "fetch_new_messages {:?}", set);
+        let mut list = match session.uid_fetch(&set, PREFETCH_FLAGS).await {
+            Ok(list) => list,
+            Err(err) => {
+                warn!(context, "ERROR: fetch_new_messages {:?} -> {:?}", &set, err);
+                return Err(Error::FetchFailed(err));
+            }
+        };
+        info!(context, "fetch_new_messages {:?} RETURNED", &set);
+
+        let mut msgs = Vec::new();
+        while let Some(fetch) = list.next().await {
+            let fetch = fetch.map_err(|err| Error::Other(err.to_string()))?;
+            msgs.push(fetch);
+        }
+        drop(list);
+        info!(context, "fetch_new_messages got {:?} messsages", msgs.len());
+
+        msgs.sort_unstable_by_key(|msg| msg.uid.unwrap_or_default());
+        let msgs: Vec<_> = msgs
+            .into_iter()
+            .filter(|msg| {
+                let cur_uid = msg.uid.unwrap_or_default();
+                if cur_uid <= last_seen_uid {
+                    // If the mailbox is not empty, results always include
+                    // at least one UID, even if last_seen_uid+1 is past
+                    // the last UID in the mailbox.  It happens because
+                    // uid+1:* is interpreted the same way as *:uid+1.
+                    // See https://tools.ietf.org/html/rfc3501#page-61 for
+                    // standard reference. Therefore, sometimes we receive
+                    // already seen messages and have to filter them out.
+                    info!(
+                        context,
+                        "fetch_new_messages: ignoring uid {}, last seen was {}",
+                        cur_uid,
+                        last_seen_uid
+                    );
+                    false
+                } else {
+                    true
+                }
+            })
+            .collect();
+
+        read_cnt += msgs.len();
 
         let mut read_errors = 0;
+
         let mut uids = Vec::with_capacity(msgs.len());
         let mut new_last_seen_uid = None;
 
-        for (current_uid, msg) in msgs.into_iter() {
-            let (headers, msg_id) = match get_fetch_headers(&msg) {
-                Ok(headers) => {
-                    let msg_id = prefetch_get_message_id(&headers).unwrap_or_default();
-                    (headers, msg_id)
-                }
+        for fetch in msgs.into_iter() {
+            let folder: &str = folder.as_ref();
+
+            let cur_uid = fetch.uid.unwrap_or_default();
+            let headers = match get_fetch_headers(&fetch) {
+                Ok(h) => h,
                 Err(err) => {
-                    warn!(context, "{}", err);
+                    warn!(context, "get_fetch_headers error: {}", err);
                     read_errors += 1;
                     continue;
                 }
             };
 
-            if message_needs_processing(
-                context,
-                current_uid,
-                &headers,
-                &msg_id,
-                folder,
-                show_emails,
-            )
-            .await
-            {
-                // Trigger download and processing for this message.
-                uids.push(current_uid);
-            } else if read_errors == 0 {
-                // No errors so far, but this was skipped, so mark as last_seen_uid
-                new_last_seen_uid = Some(current_uid);
+            let message_id = prefetch_get_message_id(&headers).unwrap_or_default();
+            let skip = match precheck_imf(context, &message_id, folder, cur_uid).await {
+                Ok(skip) => skip,
+                Err(err) => {
+                    warn!(context, "precheck_imf error: {}", err);
+                    true
+                }
+            };
+
+            if skip {
+                // we know the message-id already or don't want the message otherwise.
+                info!(
+                    context,
+                    "Skipping message {} from \"{}\" by precheck.", message_id, folder,
+                );
+                if read_errors == 0 {
+                    new_last_seen_uid = Some(cur_uid);
+                }
+            } else {
+                // we do not know the message-id
+                // or the message-id is missing (in this case, we create one in the further process)
+                // or some other error happened
+                let show = match prefetch_should_download(context, &headers, show_emails).await {
+                    Ok(show) => show,
+                    Err(err) => {
+                        warn!(context, "prefetch_should_download error: {}", err);
+                        true
+                    }
+                };
+
+                if show {
+                    uids.push(cur_uid);
+                } else {
+                    info!(
+                        context,
+                        "Ignoring new message {} from \"{}\".", message_id, folder,
+                    );
+                }
+                if read_errors == 0 {
+                    new_last_seen_uid = Some(cur_uid);
+                }
             }
         }
 
+        info!(
+            context,
+            "fetch_many_msgs fetching {} messages in batch",
+            uids.len()
+        );
         // check passed, go fetch the emails
         let (new_last_seen_uid_processed, error_cnt) =
             self.fetch_many_msgs(context, &folder, &uids).await;
-        read_errors += error_cnt;
 
-        // determine which last_seen_uid to use to update  to
         let new_last_seen_uid_processed = new_last_seen_uid_processed.unwrap_or_default();
         let new_last_seen_uid = new_last_seen_uid.unwrap_or_default();
         let last_one = new_last_seen_uid.max(new_last_seen_uid_processed);
-
         if last_one > last_seen_uid {
-            self.set_config_last_seen_uid(context, &folder, uid_validity, last_one)
+            self.set_config_last_seen_uid(context, &folder, uid_validity, new_last_seen_uid)
                 .await;
         }
 
-        if read_errors == 0 {
-            info!(context, "{} mails read from \"{}\".", read_cnt, folder,);
-        } else {
+        read_errors += error_cnt;
+
+        if read_errors > 0 {
             warn!(
                 context,
-                "{} mails read from \"{}\" with {} errors.", read_cnt, folder, read_errors
+                "{} mails read from \"{}\" with {} errors.",
+                read_cnt,
+                folder.as_ref(),
+                read_errors
+            );
+        } else {
+            info!(
+                context,
+                "{} mails read from \"{}\".",
+                read_cnt,
+                folder.as_ref()
             );
         }
 
         Ok(read_cnt > 0)
     }
 
-    /// Fetch all uids larger than the passed in. Returns a sorted list of fetch results.
-    async fn fetch_after(
-        &mut self,
-        context: &Context,
-        uid: u32,
-    ) -> Result<BTreeMap<u32, async_imap::types::Fetch>> {
-        if self.session.is_none() {
-            return Err(Error::NoConnection);
-        }
-
-        let session = self.session.as_mut().unwrap();
-
-        // fetch messages with larger UID than the last one seen
-        // `(UID FETCH lastseenuid+1:*)`, see RFC 4549
-        let set = format!("{}:*", uid + 1);
-        let mut list = session
-            .uid_fetch(set, PREFETCH_FLAGS)
-            .await
-            .map_err(Error::FetchFailed)?;
-
-        let mut msgs = BTreeMap::new();
-        while let Some(fetch) = list.next().await {
-            let msg = fetch.map_err(|err| Error::Other(err.to_string()))?;
-            if let Some(msg_uid) = msg.uid {
-                msgs.insert(msg_uid, msg);
-            }
-        }
-        drop(list);
-
-        // If the mailbox is not empty, results always include
-        // at least one UID, even if last_seen_uid+1 is past
-        // the last UID in the mailbox.  It happens because
-        // uid+1:* is interpreted the same way as *:uid+1.
-        // See https://tools.ietf.org/html/rfc3501#page-61 for
-        // standard reference. Therefore, sometimes we receive
-        // already seen messages and have to filter them out.
-        let new_msgs = msgs.split_off(&(uid + 1));
-
-        for current_uid in msgs.keys() {
-            info!(
-                context,
-                "fetch_new_messages: ignoring uid {}, last seen was {}", current_uid, uid
-            );
-        }
-
-        Ok(new_msgs)
-    }
-
     async fn set_config_last_seen_uid<S: AsRef<str>>(
         &self,
         context: &Context,
@@ -736,20 +766,6 @@ impl Imap {
             return (None, 0);
         }
 
-        if !self.is_connected() {
-            warn!(context, "Not connected");
-            return (None, server_uids.len());
-        }
-
-        if self.session.is_none() {
-            // we could not get a valid imap session, this should be retried
-            self.trigger_reconnect();
-            warn!(context, "Could not get IMAP session");
-            return (None, server_uids.len());
-        }
-
-        let session = self.session.as_mut().unwrap();
-
         let set = if server_uids.len() == 1 {
             server_uids[0].to_string()
         } else {
@@ -759,67 +775,74 @@ impl Imap {
             format!("{}:{}", first_uid, last_uid)
         };
 
-        let mut msgs = match session.uid_fetch(&set, BODY_FLAGS).await {
-            Ok(msgs) => msgs,
-            Err(err) => {
-                // TODO: maybe differentiate between IO and input/parsing problems
-                // so we don't reconnect if we have a (rare) input/output parsing problem?
-                self.should_reconnect = true;
-                warn!(
-                    context,
-                    "Error on fetching messages #{} from folder \"{}\"; error={}.",
-                    &set,
-                    folder.as_ref(),
-                    err
-                );
-                return (None, server_uids.len());
-            }
-        };
+        if !self.is_connected() {
+            warn!(context, "Not connected");
+            return (None, server_uids.len());
+        }
 
-        let folder = folder.as_ref().to_string();
+        let mut msgs = if let Some(ref mut session) = &mut self.session {
+            match session.uid_fetch(&set, BODY_FLAGS).await {
+                Ok(msgs) => msgs,
+                Err(err) => {
+                    // TODO maybe differentiate between IO and input/parsing problems
+                    // so we don't reconnect if we have a (rare) input/output parsing problem?
+                    self.should_reconnect = true;
+                    warn!(
+                        context,
+                        "Error on fetching messages #{} from folder \"{}\"; error={}.",
+                        &set,
+                        folder.as_ref(),
+                        err
+                    );
+                    return (None, server_uids.len());
+                }
+            }
+        } else {
+            // we could not get a valid imap session, this should be retried
+            self.trigger_reconnect();
+            warn!(context, "Could not get IMAP session");
+            return (None, server_uids.len());
+        };
 
         let mut read_errors = 0;
         let mut last_uid = None;
         let mut count = 0;
 
-        let mut tasks = Vec::with_capacity(server_uids.len());
+        let mut jobs = Vec::with_capacity(server_uids.len());
+
         while let Some(Ok(msg)) = msgs.next().await {
             let server_uid = msg.uid.unwrap_or_default();
-
             if !server_uids.contains(&server_uid) {
                 // skip if there are some in between we are not interested in
                 continue;
             }
             count += 1;
 
-            let is_deleted = msg.flags().any(|flag| flag == Flag::Deleted);
-            if is_deleted || msg.body().is_none() {
-                // No need to process these.
-                continue;
-            }
-
             // XXX put flags into a set and pass them to dc_receive_imf
-            let context = context.clone();
-            let folder = folder.clone();
+            let is_deleted = msg.flags().any(|flag| flag == Flag::Deleted);
+            let is_seen = msg.flags().any(|flag| flag == Flag::Seen);
 
-            let task = async_std::task::spawn(async move {
-                // safe, as we checked above that there is a body.
-                let body = msg.body().unwrap();
-                let is_seen = msg.flags().any(|flag| flag == Flag::Seen);
+            if !is_deleted && msg.body().is_some() {
+                let folder = folder.as_ref().to_string();
+                let context = context.clone();
+                let task = async_std::task::spawn(async move {
+                    let body = msg.body().unwrap_or_default();
 
-                match dc_receive_imf(&context, &body, &folder, server_uid, is_seen).await {
-                    Ok(_) => Some(server_uid),
-                    Err(err) => {
+                    if let Err(err) =
+                        dc_receive_imf(&context, &body, &folder, server_uid, is_seen).await
+                    {
                         warn!(context, "dc_receive_imf error: {}", err);
                         read_errors += 1;
                         None
+                    } else {
+                        Some(server_uid)
                     }
-                }
-            });
-            tasks.push(task);
+                });
+                jobs.push(task);
+            }
         }
 
-        for task in futures::future::join_all(tasks).await {
+        for task in futures::future::join_all(jobs).await {
             match task {
                 Some(uid) => {
                     last_uid = Some(uid);
@@ -985,7 +1008,7 @@ impl Imap {
         uid: u32,
     ) -> Option<ImapActionResult> {
         if uid == 0 {
-            return Some(ImapActionResult::RetryLater);
+            return Some(ImapActionResult::Failed);
         }
         if !self.is_connected() {
             // currently jobs are only performed on the INBOX thread
@@ -1153,54 +1176,54 @@ impl Imap {
                 }
             };
 
-            let mut delimiter = ".".to_string();
-            let mut delimiter_is_default = true;
             let mut sentbox_folder = None;
             let mut mvbox_folder = None;
-            let mut fallback_folder = get_fallback_folder(&delimiter);
+
+            let mut delimiter = ".".to_string();
+            if let Some(folder) = folders.next().await {
+                let folder = folder.map_err(|err| Error::Other(err.to_string()))?;
+                if let Some(d) = folder.delimiter() {
+                    if !d.is_empty() {
+                        delimiter = d.to_string();
+                    }
+                }
+            }
+            info!(context, "Using \"{}\" as folder-delimiter.", delimiter);
+            let fallback_folder = format!("INBOX{}DeltaChat", delimiter);
 
             while let Some(folder) = folders.next().await {
                 let folder = folder.map_err(|err| Error::Other(err.to_string()))?;
                 info!(context, "Scanning folder: {:?}", folder);
 
-                // Update the delimiter iff there is a different one, but only once.
-                if let Some(d) = folder.delimiter() {
-                    if delimiter_is_default && !d.is_empty() && delimiter != d {
-                        delimiter = d.to_string();
-                        fallback_folder = get_fallback_folder(&delimiter);
-                        delimiter_is_default = false;
+                if mvbox_folder.is_none()
+                    && (folder.name() == "DeltaChat" || folder.name() == fallback_folder)
+                {
+                    mvbox_folder = Some(folder.name().to_string());
+                }
+
+                if sentbox_folder.is_none() {
+                    if let FolderMeaning::SentObjects = get_folder_meaning(&folder) {
+                        sentbox_folder = Some(folder);
+                    } else if let FolderMeaning::SentObjects = get_folder_meaning_by_name(&folder) {
+                        sentbox_folder = Some(folder);
                     }
                 }
 
-                if folder.name() == "DeltaChat" {
-                    // Always takes precendent
-                    mvbox_folder = Some(folder.name().to_string());
-                } else if folder.name() == fallback_folder {
-                    // only set iff none has been already set
-                    if mvbox_folder.is_none() {
-                        mvbox_folder = Some(folder.name().to_string());
-                    }
-                } else if let FolderMeaning::SentObjects = get_folder_meaning(&folder) {
-                    // Always takes precedent
-                    sentbox_folder = Some(folder.name().to_string());
-                } else if let FolderMeaning::SentObjects = get_folder_meaning_by_name(&folder) {
-                    // only set iff none has been already set
-                    if sentbox_folder.is_none() {
-                        sentbox_folder = Some(folder.name().to_string());
-                    }
+                if mvbox_folder.is_some() && sentbox_folder.is_some() {
+                    break;
                 }
             }
-            drop(folders);
-
-            info!(context, "Using \"{}\" as folder-delimiter.", delimiter);
             info!(context, "sentbox folder is {:?}", sentbox_folder);
 
+            drop(folders);
+
             if mvbox_folder.is_none() && create_mvbox {
                 info!(context, "Creating MVBOX-folder \"DeltaChat\"...",);
 
                 match session.create("DeltaChat").await {
                     Ok(_) => {
                         mvbox_folder = Some("DeltaChat".into());
+
                         info!(context, "MVBOX-folder created.",);
                     }
                     Err(err) => {
@@ -1234,16 +1257,23 @@ impl Imap {
                 }
             }
             context
-                .set_config(Config::ConfiguredInboxFolder, Some("INBOX"))
+                .sql
+                .set_raw_config(context, "configured_inbox_folder", Some("INBOX"))
                 .await?;
             if let Some(ref mvbox_folder) = mvbox_folder {
                 context
-                    .set_config(Config::ConfiguredMvboxFolder, Some(mvbox_folder))
+                    .sql
+                    .set_raw_config(context, "configured_mvbox_folder", Some(mvbox_folder))
                     .await?;
             }
             if let Some(ref sentbox_folder) = sentbox_folder {
                 context
-                    .set_config(Config::ConfiguredSentboxFolder, Some(sentbox_folder))
+                    .sql
+                    .set_raw_config(
+                        context,
+                        "configured_sentbox_folder",
+                        Some(sentbox_folder.name()),
+                    )
                     .await?;
             }
             context
@@ -1401,8 +1431,7 @@ async fn precheck_imf(
         }
 
         if old_server_folder != server_folder || old_server_uid != server_uid {
-            update_server_uid(context, rfc724_mid, server_folder, server_uid).await;
-            info!(context, "Updating server_uid")
+            update_server_uid(context, &rfc724_mid, server_folder, server_uid).await;
         }
         Ok(true)
     } else {
@@ -1446,7 +1475,7 @@ async fn prefetch_is_reply_to_chat_message(
     false
 }
 
-pub(crate) async fn prefetch_should_download(
+async fn prefetch_should_download(
     context: &Context,
     headers: &[mailparse::MailHeader<'_>],
     show_emails: ShowEmails,
@@ -1454,12 +1483,6 @@ pub(crate) async fn prefetch_should_download(
     let is_chat_message = headers.get_header_value(HeaderDef::ChatVersion).is_some();
     let is_reply_to_chat_message = prefetch_is_reply_to_chat_message(context, &headers).await;
 
-    let maybe_ndn = if let Some(from) = headers.get_header_value(HeaderDef::From_) {
-        from.to_ascii_lowercase().contains("mailer-daemon")
-    } else {
-        false
-    };
-
     // Autocrypt Setup Message should be shown even if it is from non-chat client.
     let is_autocrypt_setup_message = headers
         .get_header_value(HeaderDef::AutocryptSetupMessage)
@@ -1470,7 +1493,6 @@ pub(crate) async fn prefetch_should_download(
     let accepted_contact = origin.is_known();
 
     let show = is_autocrypt_setup_message
-        || maybe_ndn
         || match show_emails {
             ShowEmails::Off => is_chat_message || is_reply_to_chat_message,
             ShowEmails::AcceptedContacts => {
@@ -1481,54 +1503,3 @@ pub(crate) async fn prefetch_should_download(
     let show = show && !blocked_contact;
     Ok(show)
 }
-
-async fn message_needs_processing(
-    context: &Context,
-    current_uid: u32,
-    headers: &[mailparse::MailHeader<'_>],
-    msg_id: &str,
-    folder: &str,
-    show_emails: ShowEmails,
-) -> bool {
-    let skip = match precheck_imf(context, &msg_id, folder, current_uid).await {
-        Ok(skip) => skip,
-        Err(err) => {
-            warn!(context, "precheck_imf error: {}", err);
-            true
-        }
-    };
-
-    if skip {
-        // we know the message-id already or don't want the message otherwise.
-        info!(
-            context,
-            "Skipping message {} from \"{}\" by precheck.", msg_id, folder,
-        );
-        return false;
-    }
-
-    // we do not know the message-id
-    // or the message-id is missing (in this case, we create one in the further process)
-    // or some other error happened
-    let show = match prefetch_should_download(context, &headers, show_emails).await {
-        Ok(show) => show,
-        Err(err) => {
-            warn!(context, "prefetch_should_download error: {}", err);
-            true
-        }
-    };
-
-    if !show {
-        info!(
-            context,
-            "Ignoring new message {} from \"{}\".", msg_id, folder,
-        );
-        return false;
-    }
-
-    true
-}
-
-fn get_fallback_folder(delimiter: &str) -> String {
-    format!("INBOX{}DeltaChat", delimiter)
-}

src/imap/select_folder.rs

@@ -27,7 +27,7 @@ impl Imap {
     ///
     /// CLOSE is considerably faster than an EXPUNGE, see
     /// https://tools.ietf.org/html/rfc3501#section-6.4.2
-    pub(super) async fn close_folder(&mut self, context: &Context) -> Result<()> {
+    async fn close_folder(&mut self, context: &Context) -> Result<()> {
         if let Some(ref folder) = self.config.selected_folder {
             info!(context, "Expunge messages in \"{}\".", folder);
 

src/imex.rs

@@ -1,6 +1,5 @@
 //! # Import/export module
 
-use std::any::Any;
 use std::cmp::{max, min};
 
 use async_std::path::{Path, PathBuf};
@@ -17,7 +16,7 @@ use crate::dc_tools::*;
 use crate::e2ee;
 use crate::error::*;
 use crate::events::Event;
-use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
+use crate::key::{self, DcKey, Key, SignedSecretKey};
 use crate::message::{Message, MsgId};
 use crate::mimeparser::SystemMessage;
 use crate::param::*;
@@ -182,13 +181,13 @@ pub async fn render_setup_file(context: &Context, passphrase: &str) -> Result<St
         passphrase.len() >= 2,
         "Passphrase must be at least 2 chars long."
     );
-    let private_key = SignedSecretKey::load_self(context).await?;
+    let private_key = Key::from(SignedSecretKey::load_self(context).await?);
     let ac_headers = match context.get_config_bool(Config::E2eeEnabled).await {
         false => None,
         true => Some(("Autocrypt-Prefer-Encrypt", "mutual")),
     };
     let private_key_asc = private_key.to_asc(ac_headers);
-    let encr = pgp::symm_encrypt(&passphrase, private_key_asc.as_bytes()).await?;
+    let encr = pgp::symm_encrypt(&passphrase, private_key_asc.as_bytes())?;
 
     let replacement = format!(
         concat!(
@@ -275,7 +274,7 @@ pub async fn continue_key_transfer(
     if let Some(filename) = msg.get_file(context) {
         let file = dc_open_file_std(context, filename)?;
         let sc = normalize_setup_code(setup_code);
-        let armored_key = decrypt_setup_file(&sc, file).await?;
+        let armored_key = decrypt_setup_file(context, &sc, file)?;
         set_self_key(context, &armored_key, true, true).await?;
         maybe_add_bcc_self_device_msg(context).await?;
 
@@ -292,8 +291,12 @@ async fn set_self_key(
     prefer_encrypt_required: bool,
 ) -> Result<()> {
     // try hard to only modify key-state
-    let (private_key, header) = SignedSecretKey::from_asc(armored)?;
-    let public_key = private_key.split_public_key()?;
+    let keys = Key::from_armored_string(armored, KeyType::Private)
+        .and_then(|(k, h)| if k.verify() { Some((k, h)) } else { None })
+        .and_then(|(k, h)| k.split_key().map(|pub_key| (k, pub_key, h)));
+
+    ensure!(keys.is_some(), "Not a valid private key");
+    let (private_key, public_key, header) = keys.unwrap();
     let preferencrypt = header.get("Autocrypt-Prefer-Encrypt");
     match preferencrypt.map(|s| s.as_str()) {
         Some(headerval) => {
@@ -319,10 +322,15 @@ async fn set_self_key(
     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 (public, secret) = match (public_key, private_key) {
+        (Key::Public(p), Key::Secret(s)) => (p, s),
+        _ => bail!("wrong keys unpacked"),
+    };
     let keypair = pgp::KeyPair {
         addr,
-        public: public_key,
-        secret: private_key,
+        public,
+        secret,
     };
     key::store_self_keypair(
         context,
@@ -337,11 +345,12 @@ async fn set_self_key(
     Ok(())
 }
 
-async fn decrypt_setup_file<T: std::io::Read + std::io::Seek>(
+fn decrypt_setup_file<T: std::io::Read + std::io::Seek>(
+    _context: &Context,
     passphrase: &str,
     file: T,
 ) -> Result<String> {
-    let plain_bytes = pgp::symm_decrypt(passphrase, file).await?;
+    let plain_bytes = pgp::symm_decrypt(passphrase, file)?;
     let plain_text = std::string::String::from_utf8(plain_bytes)?;
 
     Ok(plain_text)
@@ -688,9 +697,9 @@ async fn export_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()
             |row| {
                 let id = row.get(0)?;
                 let public_key_blob: Vec<u8> = row.get(1)?;
-                let public_key = SignedPublicKey::from_slice(&public_key_blob);
+                let public_key = Key::from_slice(&public_key_blob, KeyType::Public);
                 let private_key_blob: Vec<u8> = row.get(2)?;
-                let private_key = SignedSecretKey::from_slice(&private_key_blob);
+                let private_key = Key::from_slice(&private_key_blob, KeyType::Private);
                 let is_default: i32 = row.get(3)?;
 
                 Ok((id, public_key, private_key, is_default))
@@ -704,7 +713,7 @@ async fn export_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()
 
     for (id, public_key, private_key, is_default) in keys {
         let id = Some(id).filter(|_| is_default != 0);
-        if let Ok(key) = public_key {
+        if let Some(key) = public_key {
             if export_key_to_asc_file(context, &dir, id, &key)
                 .await
                 .is_err()
@@ -714,7 +723,7 @@ async fn export_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()
         } else {
             export_errors += 1;
         }
-        if let Ok(key) = private_key {
+        if let Some(key) = private_key {
             if export_key_to_asc_file(context, &dir, id, &key)
                 .await
                 .is_err()
@@ -733,32 +742,22 @@ async fn export_self_keys(context: &Context, dir: impl AsRef<Path>) -> Result<()
 /*******************************************************************************
  * Classic key export
  ******************************************************************************/
-async fn export_key_to_asc_file<T>(
+async fn export_key_to_asc_file(
     context: &Context,
     dir: impl AsRef<Path>,
     id: Option<i64>,
-    key: &T,
-) -> std::io::Result<()>
-where
-    T: DcKey + Any,
-{
+    key: &Key,
+) -> std::io::Result<()> {
     let file_name = {
-        let any_key = key as &dyn Any;
-        let kind = if any_key.downcast_ref::<SignedPublicKey>().is_some() {
-            "public"
-        } else if any_key.downcast_ref::<SignedPublicKey>().is_some() {
-            "private"
-        } else {
-            "unknown"
-        };
+        let kind = if key.is_public() { "public" } else { "private" };
         let id = id.map_or("default".into(), |i| i.to_string());
+
         dir.as_ref().join(format!("{}-key-{}.asc", kind, &id))
     };
     info!(context, "Exporting key {}", file_name.display());
     dc_delete_file(context, &file_name).await;
 
-    let content = key.to_asc(None).into_bytes();
-    let res = dc_write_file(context, &file_name, &content).await;
+    let res = key.write_asc_to_file(&file_name, context).await;
     if res.is_err() {
         error!(context, "Cannot write key to {}", file_name.display());
     } else {
@@ -824,7 +823,7 @@ mod tests {
     #[async_std::test]
     async fn test_export_key_to_asc_file() {
         let context = dummy_context().await;
-        let key = alice_keypair().public;
+        let key = Key::from(alice_keypair().public);
         let blobdir = "$BLOBDIR";
         assert!(export_key_to_asc_file(&context.ctx, blobdir, None, &key)
             .await
@@ -853,6 +852,9 @@ mod tests {
 
     #[async_std::test]
     async fn test_split_and_decrypt() {
+        let ctx = dummy_context().await;
+        let context = &ctx.ctx;
+
         let buf_1 = S_EM_SETUPFILE.as_bytes().to_vec();
         let (typ, headers, base64) = split_armored_data(&buf_1).unwrap();
         assert_eq!(typ, BlockType::Message);
@@ -862,10 +864,12 @@ mod tests {
         assert!(!base64.is_empty());
 
         let setup_file = S_EM_SETUPFILE.to_string();
-        let decrypted =
-            decrypt_setup_file(S_EM_SETUPCODE, std::io::Cursor::new(setup_file.as_bytes()))
-                .await
-                .unwrap();
+        let decrypted = decrypt_setup_file(
+            context,
+            S_EM_SETUPCODE,
+            std::io::Cursor::new(setup_file.as_bytes()),
+        )
+        .unwrap();
 
         let (typ, headers, _base64) = split_armored_data(decrypted.as_bytes()).unwrap();
 

src/job.rs

@@ -31,7 +31,7 @@ use crate::message::{self, Message, MessageState};
 use crate::mimefactory::MimeFactory;
 use crate::param::*;
 use crate::smtp::Smtp;
-use crate::{scheduler::InterruptInfo, sql};
+use crate::sql;
 
 // results in ~3 weeks for the last backoff timespan
 const JOB_RETRIES: u32 = 17;
@@ -190,7 +190,7 @@ impl Job {
     /// Saves the job to the database, creating a new entry if necessary.
     ///
     /// The Job is consumed by this method.
-    pub(crate) async fn save(self, context: &Context) -> Result<()> {
+    pub async fn save(self, context: &Context) -> Result<()> {
         let thread: Thread = self.action.into();
 
         info!(context, "saving job for {}-thread: {:?}", thread, self);
@@ -329,7 +329,7 @@ impl Job {
         }
     }
 
-    pub(crate) async fn send_msg_to_smtp(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
+    pub async fn send_msg_to_smtp(&mut self, context: &Context, smtp: &mut Smtp) -> Status {
         //  SMTP server, if not yet done
         if !smtp.is_connected().await {
             let loginparam = LoginParam::from_database(context, "configured_").await;
@@ -498,13 +498,16 @@ impl Job {
     }
 
     async fn move_msg(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if let Err(err) = imap.connect_configured(context).await {
-            warn!(context, "could not connect: {:?}", err);
+        let msg = job_try!(Message::load_from_db(context, MsgId::new(self.foreign_id)).await);
+
+        if let Err(err) = imap.ensure_configured_folders(context, true).await {
+            warn!(context, "could not configure folders: {:?}", err);
             return Status::RetryLater;
         }
-
-        let msg = job_try!(Message::load_from_db(context, MsgId::new(self.foreign_id)).await);
-        let dest_folder = context.get_config(Config::ConfiguredMvboxFolder).await;
+        let dest_folder = context
+            .sql
+            .get_raw_config(context, "configured_mvbox_folder")
+            .await;
 
         if let Some(dest_folder) = dest_folder {
             let server_folder = msg.server_folder.as_ref().unwrap();
@@ -515,7 +518,7 @@ impl Job {
             {
                 ImapActionResult::RetryLater => Status::RetryLater,
                 ImapActionResult::Success => {
-                    // Rust-Imap provides no target uid on mv, so just set it to 0, update again when precheck_imf() is called for the moved message
+                    // XXX Rust-Imap provides no target uid on mv, so just set it to 0
                     message::update_server_uid(context, &msg.rfc724_mid, &dest_folder, 0).await;
                     Status::Finished(Ok(()))
                 }
@@ -538,11 +541,6 @@ impl Job {
     /// records pointing to the same message on the server, the job
     /// also removes the message on the server.
     async fn delete_msg_on_imap(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if let Err(err) = imap.connect_configured(context).await {
-            warn!(context, "could not connect: {:?}", err);
-            return Status::RetryLater;
-        }
-
         let msg = job_try!(Message::load_from_db(context, MsgId::new(self.foreign_id)).await);
 
         if !msg.rfc724_mid.is_empty() {
@@ -613,13 +611,12 @@ impl Job {
     }
 
     async fn empty_server(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if let Err(err) = imap.connect_configured(context).await {
-            warn!(context, "could not connect: {:?}", err);
-            return Status::RetryLater;
-        }
-
         if self.foreign_id & DC_EMPTY_MVBOX > 0 {
-            if let Some(mvbox_folder) = &context.get_config(Config::ConfiguredMvboxFolder).await {
+            if let Some(mvbox_folder) = context
+                .sql
+                .get_raw_config(context, "configured_mvbox_folder")
+                .await
+            {
                 imap.empty_folder(context, &mvbox_folder).await;
             }
         }
@@ -630,11 +627,6 @@ impl Job {
     }
 
     async fn markseen_msg_on_imap(&mut self, context: &Context, imap: &mut Imap) -> Status {
-        if let Err(err) = imap.connect_configured(context).await {
-            warn!(context, "could not connect: {:?}", err);
-            return Status::RetryLater;
-        }
-
         let msg = job_try!(Message::load_from_db(context, MsgId::new(self.foreign_id)).await);
 
         let folder = msg.server_folder.as_ref().unwrap();
@@ -806,7 +798,7 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
 
     if rendered_msg.is_encrypted && !needs_encryption {
         msg.param.set_int(Param::GuaranteeE2ee, 1);
-        msg.update_param(context).await;
+        msg.save_param_to_disk(context).await;
     }
 
     ensure!(!recipients.is_empty(), "no recipients for smtp job set");
@@ -823,7 +815,8 @@ pub async fn send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<Job
     Ok(Some(job))
 }
 
-pub(crate) enum Connection<'a> {
+#[derive(Debug)]
+pub enum Connection<'a> {
     Inbox(&'a mut Imap),
     Smtp(&'a mut Smtp),
 }
@@ -1035,19 +1028,13 @@ pub async fn add(context: &Context, job: Job) {
             | Action::DeleteMsgOnImap
             | Action::MarkseenMsgOnImap
             | Action::MoveMsg => {
-                info!(context, "interrupt: imap");
-                context
-                    .interrupt_inbox(InterruptInfo::new(false, None))
-                    .await;
+                context.interrupt_inbox().await;
             }
             Action::MaybeSendLocations
             | Action::MaybeSendLocationsEnded
             | Action::SendMdn
             | Action::SendMsgToSmtp => {
-                info!(context, "interrupt: smtp");
-                context
-                    .interrupt_smtp(InterruptInfo::new(false, None))
-                    .await;
+                context.interrupt_smtp().await;
             }
         }
     }
@@ -1062,49 +1049,38 @@ pub async fn add(context: &Context, job: Job) {
 pub(crate) async fn load_next(
     context: &Context,
     thread: Thread,
-    info: &InterruptInfo,
+    probe_network: bool,
 ) -> Option<Job> {
     info!(context, "loading job for {}-thread", thread);
-
-    let query;
-    let params;
-    let t = time();
-    let m;
-    let thread_i = thread as i64;
-
-    if let Some(msg_id) = info.msg_id {
-        query = r#"
-SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
-FROM jobs
-WHERE thread=? AND foreign_id=?
-ORDER BY action DESC, added_timestamp
-LIMIT 1;
-"#;
-        m = msg_id;
-        params = paramsv![thread_i, m];
-    } else if !info.probe_network {
+    let query = if !probe_network {
         // processing for first-try and after backoff-timeouts:
         // process jobs in the order they were added.
-        query = r#"
+        r#"
 SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
 FROM jobs
 WHERE thread=? AND desired_timestamp<=?
 ORDER BY action DESC, added_timestamp
 LIMIT 1;
-"#;
-        params = paramsv![thread_i, t];
+"#
     } else {
         // processing after call to dc_maybe_network():
         // process _all_ pending jobs that failed before
         // in the order of their backoff-times.
-        query = r#"
+        r#"
 SELECT id, action, foreign_id, param, added_timestamp, desired_timestamp, tries
 FROM jobs
 WHERE thread=? AND tries>0
 ORDER BY desired_timestamp, action DESC
 LIMIT 1;
-"#;
-        params = paramsv![thread_i];
+"#
+    };
+
+    let thread_i = thread as i64;
+    let t = time();
+    let params = if !probe_network {
+        paramsv![thread_i, t]
+    } else {
+        paramsv![thread_i]
     };
 
     let job = loop {
@@ -1112,13 +1088,13 @@ LIMIT 1;
             .sql
             .query_row_optional(query, params.clone(), |row| {
                 let job = Job {
-                    job_id: row.get("id")?,
-                    action: row.get("action")?,
-                    foreign_id: row.get("foreign_id")?,
-                    desired_timestamp: row.get("desired_timestamp")?,
-                    added_timestamp: row.get("added_timestamp")?,
-                    tries: row.get("tries")?,
-                    param: row.get::<_, String>("param")?.parse().unwrap_or_default(),
+                    job_id: row.get(0)?,
+                    action: row.get(1)?,
+                    foreign_id: row.get(2)?,
+                    desired_timestamp: row.get(5)?,
+                    added_timestamp: row.get(4)?,
+                    tries: row.get(6)?,
+                    param: row.get::<_, String>(3)?.parse().unwrap_or_default(),
                     pending_error: None,
                 };
 
@@ -1128,9 +1104,8 @@ LIMIT 1;
 
         match job_res {
             Ok(job) => break job,
-            Err(err) => {
+            Err(_) => {
                 // Remove invalid job from the DB
-                info!(context, "cleaning up job, because of {}", err);
 
                 // TODO: improve by only doing a single query
                 match context
@@ -1141,7 +1116,7 @@ LIMIT 1;
                     Ok(id) => {
                         context
                             .sql
-                            .execute("DELETE FROM jobs WHERE id=?;", paramsv![id])
+                            .execute("DELETE FROM jobs WHERE id=?", paramsv![id])
                             .await
                             .ok();
                     }
@@ -1154,26 +1129,21 @@ LIMIT 1;
         }
     };
 
-    match thread {
-        Thread::Unknown => {
-            error!(context, "unknown thread for job");
-            None
-        }
-        Thread::Imap => {
-            if let Some(job) = job {
-                if job.action < Action::DeleteMsgOnImap {
-                    load_imap_deletion_job(context)
-                        .await
-                        .unwrap_or_default()
-                        .or(Some(job))
-                } else {
-                    Some(job)
-                }
+    if thread == Thread::Imap {
+        if let Some(job) = job {
+            if job.action < Action::DeleteMsgOnImap {
+                load_imap_deletion_job(context)
+                    .await
+                    .unwrap_or_default()
+                    .or(Some(job))
             } else {
-                load_imap_deletion_job(context).await.unwrap_or_default()
+                Some(job)
             }
+        } else {
+            load_imap_deletion_job(context).await.unwrap_or_default()
         }
-        Thread::Smtp => job,
+    } else {
+        job
     }
 }
 
@@ -1205,42 +1175,17 @@ mod tests {
     }
 
     #[async_std::test]
-    async fn test_load_next_job_two() {
+    async fn test_load_next_job() {
         // We want to ensure that loading jobs skips over jobs which
         // fails to load from the database instead of failing to load
         // all jobs.
         let t = dummy_context().await;
         insert_job(&t.ctx, -1).await; // This can not be loaded into Job struct.
-        let jobs = load_next(
-            &t.ctx,
-            Thread::from(Action::MoveMsg),
-            &InterruptInfo::new(false, None),
-        )
-        .await;
+        let jobs = load_next(&t.ctx, Thread::from(Action::MoveMsg), false).await;
         assert!(jobs.is_none());
 
         insert_job(&t.ctx, 1).await;
-        let jobs = load_next(
-            &t.ctx,
-            Thread::from(Action::MoveMsg),
-            &InterruptInfo::new(false, None),
-        )
-        .await;
-        assert!(jobs.is_some());
-    }
-
-    #[async_std::test]
-    async fn test_load_next_job_one() {
-        let t = dummy_context().await;
-
-        insert_job(&t.ctx, 1).await;
-
-        let jobs = load_next(
-            &t.ctx,
-            Thread::from(Action::MoveMsg),
-            &InterruptInfo::new(false, None),
-        )
-        .await;
+        let jobs = load_next(&t.ctx, Thread::from(Action::MoveMsg), false).await;
         assert!(jobs.is_some());
     }
 }

src/key.rs

@@ -1,20 +1,19 @@
 //! Cryptographic key module
 
 use std::collections::BTreeMap;
-use std::fmt;
 use std::io::Cursor;
 
+use async_std::path::Path;
 use async_trait::async_trait;
 use num_traits::FromPrimitive;
 use pgp::composed::Deserializable;
 use pgp::ser::Serialize;
 use pgp::types::{KeyTrait, SecretKeyTrait};
-use thiserror::Error;
 
 use crate::config::Config;
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_tools::{time, EmailAddress, InvalidEmailError};
+use crate::dc_tools::{dc_write_file, time, EmailAddress, InvalidEmailError};
 use crate::sql;
 
 // Re-export key types
@@ -39,8 +38,6 @@ pub enum Error {
     NoConfiguredAddr,
     #[error("Configured address is invalid: {}", _0)]
     InvalidConfiguredAddr(#[from] InvalidEmailError),
-    #[error("no data provided")]
-    Empty,
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -51,8 +48,8 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// [SignedSecretKey] types and makes working with them a little
 /// easier in the deltachat world.
 #[async_trait]
-pub trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
-    type KeyType: Serialize + Deserializable + KeyTrait + Clone;
+pub trait DcKey: Serialize + Deserializable {
+    type KeyType: Serialize + Deserializable;
 
     /// Create a key from some bytes.
     fn from_slice(bytes: &[u8]) -> Result<Self::KeyType> {
@@ -69,45 +66,18 @@ pub trait DcKey: Serialize + Deserializable + KeyTrait + Clone {
         Self::from_slice(&bytes)
     }
 
-    /// Create a key from an ASCII-armored string.
-    ///
-    /// Returns the key and a map of any headers which might have been set in
-    /// the ASCII-armored representation.
-    fn from_asc(data: &str) -> Result<(Self::KeyType, BTreeMap<String, String>)> {
-        let bytes = data.as_bytes();
-        Self::KeyType::from_armor_single(Cursor::new(bytes)).map_err(Error::Pgp)
-    }
-
     /// Load the users' default key from the database.
     async fn load_self(context: &Context) -> Result<Self::KeyType>;
 
-    /// Serialise the key as bytes.
-    fn to_bytes(&self) -> Vec<u8> {
+    /// Serialise the key to a base64 string.
+    fn to_base64(&self) -> String {
         // Not using Serialize::to_bytes() to make clear *why* it is
         // safe to ignore this error.
         // Because we write to a Vec<u8> the io::Write impls never
         // fail and we can hide this error.
         let mut buf = Vec::new();
         self.to_writer(&mut buf).unwrap();
-        buf
-    }
-
-    /// Serialise the key to a base64 string.
-    fn to_base64(&self) -> String {
-        base64::encode(&DcKey::to_bytes(self))
-    }
-
-    /// Serialise the key to ASCII-armored representation.
-    ///
-    /// Each header line must be terminated by `\r\n`.  Only allows setting one
-    /// header as a simplification since that's the only way it's used so far.
-    // Since .to_armored_string() are actual methods on SignedPublicKey and
-    // SignedSecretKey we can not generically implement this.
-    fn to_asc(&self, header: Option<(&str, &str)>) -> String;
-
-    /// The fingerprint for the key.
-    fn fingerprint(&self) -> Fingerprint {
-        Fingerprint::new(KeyTrait::fingerprint(self)).expect("Invalid fingerprint from rpgp")
+        base64::encode(&buf)
     }
 }
 
@@ -138,22 +108,6 @@ impl DcKey for SignedPublicKey {
             Err(err) => Err(err.into()),
         }
     }
-
-    fn to_asc(&self, header: Option<(&str, &str)>) -> String {
-        // Not using .to_armored_string() to make clear *why* it is
-        // safe to ignore this error.
-        // Because we write to a Vec<u8> the io::Write impls never
-        // fail and we can hide this error.
-        let headers = header.map(|(key, value)| {
-            let mut m = BTreeMap::new();
-            m.insert(key.to_string(), value.to_string());
-            m
-        });
-        let mut buf = Vec::new();
-        self.to_armored_writer(&mut buf, headers.as_ref())
-            .unwrap_or_default();
-        std::string::String::from_utf8(buf).unwrap_or_default()
-    }
 }
 
 #[async_trait]
@@ -183,39 +137,6 @@ impl DcKey for SignedSecretKey {
             Err(err) => Err(err.into()),
         }
     }
-
-    fn to_asc(&self, header: Option<(&str, &str)>) -> String {
-        // Not using .to_armored_string() to make clear *why* it is
-        // safe to do these unwraps.
-        // Because we write to a Vec<u8> the io::Write impls never
-        // fail and we can hide this error.  The string is always ASCII.
-        let headers = header.map(|(key, value)| {
-            let mut m = BTreeMap::new();
-            m.insert(key.to_string(), value.to_string());
-            m
-        });
-        let mut buf = Vec::new();
-        self.to_armored_writer(&mut buf, headers.as_ref())
-            .unwrap_or_default();
-        std::string::String::from_utf8(buf).unwrap_or_default()
-    }
-}
-
-/// Deltachat extension trait for secret keys.
-///
-/// Provides some convenience wrappers only applicable to [SignedSecretKey].
-pub trait DcSecretKey {
-    /// Create a public key from a private one.
-    fn split_public_key(&self) -> Result<SignedPublicKey>;
-}
-
-impl DcSecretKey for SignedSecretKey {
-    fn split_public_key(&self) -> Result<SignedPublicKey> {
-        self.verify()?;
-        let unsigned_pubkey = SecretKeyTrait::public_key(self);
-        let signed_pubkey = unsigned_pubkey.sign(self, || "".into())?;
-        Ok(signed_pubkey)
-    }
 }
 
 async fn generate_keypair(context: &Context) -> Result<KeyPair> {
@@ -251,9 +172,7 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
             let keytype = KeyGenType::from_i32(context.get_config_int(Config::KeyGenType).await)
                 .unwrap_or_default();
             info!(context, "Generating keypair with type {}", keytype);
-            let keypair =
-                async_std::task::spawn_blocking(move || crate::pgp::create_keypair(addr, keytype))
-                    .await?;
+            let keypair = crate::pgp::create_keypair(addr, keytype)?;
             store_self_keypair(context, &keypair, KeyPairUse::Default).await?;
             info!(
                 context,
@@ -266,6 +185,198 @@ async fn generate_keypair(context: &Context) -> Result<KeyPair> {
     }
 }
 
+/// Cryptographic key
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum Key {
+    Public(SignedPublicKey),
+    Secret(SignedSecretKey),
+}
+
+impl From<SignedPublicKey> for Key {
+    fn from(key: SignedPublicKey) -> Self {
+        Key::Public(key)
+    }
+}
+
+impl From<SignedSecretKey> for Key {
+    fn from(key: SignedSecretKey) -> Self {
+        Key::Secret(key)
+    }
+}
+
+impl std::convert::TryFrom<Key> for SignedSecretKey {
+    type Error = ();
+
+    fn try_from(value: Key) -> std::result::Result<Self, Self::Error> {
+        match value {
+            Key::Public(_) => Err(()),
+            Key::Secret(key) => Ok(key),
+        }
+    }
+}
+
+impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedSecretKey {
+    type Error = ();
+
+    fn try_from(value: &'a Key) -> std::result::Result<Self, Self::Error> {
+        match value {
+            Key::Public(_) => Err(()),
+            Key::Secret(key) => Ok(key),
+        }
+    }
+}
+
+impl std::convert::TryFrom<Key> for SignedPublicKey {
+    type Error = ();
+
+    fn try_from(value: Key) -> std::result::Result<Self, Self::Error> {
+        match value {
+            Key::Public(key) => Ok(key),
+            Key::Secret(_) => Err(()),
+        }
+    }
+}
+
+impl<'a> std::convert::TryFrom<&'a Key> for &'a SignedPublicKey {
+    type Error = ();
+
+    fn try_from(value: &'a Key) -> std::result::Result<Self, Self::Error> {
+        match value {
+            Key::Public(key) => Ok(key),
+            Key::Secret(_) => Err(()),
+        }
+    }
+}
+
+impl Key {
+    pub fn is_public(&self) -> bool {
+        match self {
+            Key::Public(_) => true,
+            Key::Secret(_) => false,
+        }
+    }
+
+    pub fn is_secret(&self) -> bool {
+        !self.is_public()
+    }
+
+    pub fn from_slice(bytes: &[u8], key_type: KeyType) -> Option<Self> {
+        if bytes.is_empty() {
+            return None;
+        }
+        let res: std::result::Result<Key, _> = match key_type {
+            KeyType::Public => SignedPublicKey::from_bytes(Cursor::new(bytes)).map(Into::into),
+            KeyType::Private => SignedSecretKey::from_bytes(Cursor::new(bytes)).map(Into::into),
+        };
+
+        match res {
+            Ok(key) => Some(key),
+            Err(err) => {
+                eprintln!("Invalid key bytes: {:?}", err);
+                None
+            }
+        }
+    }
+
+    pub fn from_armored_string(
+        data: &str,
+        key_type: KeyType,
+    ) -> Option<(Self, BTreeMap<String, String>)> {
+        let bytes = data.as_bytes();
+        let res: std::result::Result<(Key, _), _> = match key_type {
+            KeyType::Public => SignedPublicKey::from_armor_single(Cursor::new(bytes))
+                .map(|(k, h)| (Into::into(k), h)),
+            KeyType::Private => SignedSecretKey::from_armor_single(Cursor::new(bytes))
+                .map(|(k, h)| (Into::into(k), h)),
+        };
+
+        match res {
+            Ok(res) => Some(res),
+            Err(err) => {
+                eprintln!("Invalid key bytes: {:?}", err);
+                None
+            }
+        }
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        match self {
+            Key::Public(k) => k.to_bytes().unwrap_or_default(),
+            Key::Secret(k) => k.to_bytes().unwrap_or_default(),
+        }
+    }
+
+    pub fn verify(&self) -> bool {
+        match self {
+            Key::Public(k) => k.verify().is_ok(),
+            Key::Secret(k) => k.verify().is_ok(),
+        }
+    }
+
+    pub fn to_base64(&self) -> String {
+        let buf = self.to_bytes();
+        base64::encode(&buf)
+    }
+
+    pub fn to_armored_string(
+        &self,
+        headers: Option<&BTreeMap<String, String>>,
+    ) -> pgp::errors::Result<String> {
+        match self {
+            Key::Public(k) => k.to_armored_string(headers),
+            Key::Secret(k) => k.to_armored_string(headers),
+        }
+    }
+
+    /// Each header line must be terminated by `\r\n`
+    pub fn to_asc(&self, header: Option<(&str, &str)>) -> String {
+        let headers = header.map(|(key, value)| {
+            let mut m = BTreeMap::new();
+            m.insert(key.to_string(), value.to_string());
+            m
+        });
+
+        self.to_armored_string(headers.as_ref())
+            .expect("failed to serialize key")
+    }
+
+    pub async fn write_asc_to_file(
+        &self,
+        file: impl AsRef<Path>,
+        context: &Context,
+    ) -> std::io::Result<()> {
+        let file_content = self.to_asc(None).into_bytes();
+
+        let res = dc_write_file(context, &file, &file_content).await;
+        if res.is_err() {
+            error!(context, "Cannot write key to {}", file.as_ref().display());
+        }
+        res
+    }
+
+    pub fn fingerprint(&self) -> String {
+        match self {
+            Key::Public(k) => hex::encode_upper(k.fingerprint()),
+            Key::Secret(k) => hex::encode_upper(k.fingerprint()),
+        }
+    }
+
+    pub fn formatted_fingerprint(&self) -> String {
+        let rawhex = self.fingerprint();
+        dc_format_fingerprint(&rawhex)
+    }
+
+    pub fn split_key(&self) -> Option<Key> {
+        match self {
+            Key::Public(_) => None,
+            Key::Secret(k) => {
+                let pub_key = k.public_key();
+                pub_key.sign(k, || "".into()).map(Key::Public).ok()
+            }
+        }
+    }
+}
+
 /// Use of a [KeyPair] for encryption or decryption.
 ///
 /// This is used by [store_self_keypair] to know what kind of key is
@@ -315,8 +426,14 @@ pub async fn store_self_keypair(
 ) -> std::result::Result<(), SaveKeyError> {
     // Everything should really be one transaction, more refactoring
     // is needed for that.
-    let public_key = DcKey::to_bytes(&keypair.public);
-    let secret_key = DcKey::to_bytes(&keypair.secret);
+    let public_key = keypair
+        .public
+        .to_bytes()
+        .map_err(|err| SaveKeyError::new("failed to serialise public key", err))?;
+    let secret_key = keypair
+        .secret
+        .to_bytes()
+        .map_err(|err| SaveKeyError::new("failed to serialise secret key", err))?;
     context
         .sql
         .execute(
@@ -354,73 +471,37 @@ pub async fn store_self_keypair(
     Ok(())
 }
 
-/// A key fingerprint
-#[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub struct Fingerprint(Vec<u8>);
+/// Make a fingerprint human-readable, in hex format.
+pub fn dc_format_fingerprint(fingerprint: &str) -> String {
+    // split key into chunks of 4 with space, and 20 newline
+    let mut res = String::new();
 
-impl Fingerprint {
-    pub fn new(v: Vec<u8>) -> std::result::Result<Fingerprint, FingerprintError> {
-        match v.len() {
-            20 => Ok(Fingerprint(v)),
-            _ => Err(FingerprintError::WrongLength),
+    for (i, c) in fingerprint.chars().enumerate() {
+        if i > 0 && i % 20 == 0 {
+            res += "\n";
+        } else if i > 0 && i % 4 == 0 {
+            res += " ";
         }
+
+        res += &c.to_string();
     }
 
-    /// Make a hex string from the fingerprint.
-    ///
-    /// Use [std::fmt::Display] or [ToString::to_string] to get a
-    /// human-readable formatted string.
-    pub fn hex(&self) -> String {
-        hex::encode_upper(&self.0)
-    }
+    res
 }
 
-/// Make a human-readable fingerprint.
-impl fmt::Display for Fingerprint {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Split key into chunks of 4 with space and newline at 20 chars
-        for (i, c) in self.hex().chars().enumerate() {
-            if i > 0 && i % 20 == 0 {
-                writeln!(f)?;
-            } else if i > 0 && i % 4 == 0 {
-                write!(f, " ")?;
-            }
-            write!(f, "{}", c)?;
-        }
-        Ok(())
-    }
-}
-
-/// Parse a human-readable or otherwise formatted fingerprint.
-impl std::str::FromStr for Fingerprint {
-    type Err = FingerprintError;
-
-    fn from_str(input: &str) -> std::result::Result<Self, Self::Err> {
-        let hex_repr: String = input
-            .to_uppercase()
-            .chars()
-            .filter(|&c| c >= '0' && c <= '9' || c >= 'A' && c <= 'F')
-            .collect();
-        let v: Vec<u8> = hex::decode(hex_repr)?;
-        let fp = Fingerprint::new(v)?;
-        Ok(fp)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum FingerprintError {
-    #[error("Invalid hex characters")]
-    NotHex(#[from] hex::FromHexError),
-    #[error("Incorrect fingerprint lengths")]
-    WrongLength,
+/// Bring a human-readable or otherwise formatted fingerprint back to the 40-characters-uppercase-hex format.
+pub fn dc_normalize_fingerprint(fp: &str) -> String {
+    fp.to_uppercase()
+        .chars()
+        .filter(|&c| c >= '0' && c <= '9' || c >= 'A' && c <= 'F')
+        .collect()
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::test_utils::*;
-
-    use std::error::Error;
+    use std::convert::TryFrom;
 
     use async_std::sync::Arc;
     use lazy_static::lazy_static;
@@ -429,9 +510,16 @@ mod tests {
         static ref KEYPAIR: KeyPair = alice_keypair();
     }
 
+    #[test]
+    fn test_normalize_fingerprint() {
+        let fingerprint = dc_normalize_fingerprint(" 1234  567890 \n AbcD abcdef ABCDEF ");
+
+        assert_eq!(fingerprint, "1234567890ABCDABCDEFABCDEF");
+    }
+
     #[test]
     fn test_from_armored_string() {
-        let (private_key, _) = SignedSecretKey::from_asc(
+        let (private_key, _) = Key::from_armored_string(
             "-----BEGIN PGP PRIVATE KEY BLOCK-----
 
 xcLYBF0fgz4BCADnRUV52V4xhSsU56ZaAn3+3oG86MZhXy4X8w14WZZDf0VJGeTh
@@ -489,62 +577,56 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
 7yPJeQ==
 =KZk/
 -----END PGP PRIVATE KEY BLOCK-----",
+            KeyType::Private,
         )
-        .expect("failed to decode");
-        let binary = DcKey::to_bytes(&private_key);
-        SignedSecretKey::from_slice(&binary).expect("invalid private key");
+        .expect("failed to decode"); // NOTE: if you take out the ===GU1/ part, everything passes!
+        let binary = private_key.to_bytes();
+        Key::from_slice(&binary, KeyType::Private).expect("invalid private key");
     }
 
     #[test]
-    fn test_asc_roundtrip() {
-        let key = KEYPAIR.public.clone();
-        let asc = key.to_asc(Some(("spam", "ham")));
-        let (key2, hdrs) = SignedPublicKey::from_asc(&asc).unwrap();
-        assert_eq!(key, key2);
-        assert_eq!(hdrs.len(), 1);
-        assert_eq!(hdrs.get("spam"), Some(&String::from("ham")));
+    fn test_format_fingerprint() {
+        let fingerprint = dc_format_fingerprint("1234567890ABCDABCDEFABCDEF1234567890ABCD");
 
-        let key = KEYPAIR.secret.clone();
-        let asc = key.to_asc(Some(("spam", "ham")));
-        let (key2, hdrs) = SignedSecretKey::from_asc(&asc).unwrap();
-        assert_eq!(key, key2);
-        assert_eq!(hdrs.len(), 1);
-        assert_eq!(hdrs.get("spam"), Some(&String::from("ham")));
+        assert_eq!(
+            fingerprint,
+            "1234 5678 90AB CDAB CDEF\nABCD EF12 3456 7890 ABCD"
+        );
     }
 
     #[test]
     fn test_from_slice_roundtrip() {
-        let public_key = KEYPAIR.public.clone();
-        let private_key = KEYPAIR.secret.clone();
+        let public_key = Key::from(KEYPAIR.public.clone());
+        let private_key = Key::from(KEYPAIR.secret.clone());
 
-        let binary = DcKey::to_bytes(&public_key);
-        let public_key2 = SignedPublicKey::from_slice(&binary).expect("invalid public key");
+        let binary = public_key.to_bytes();
+        let public_key2 = Key::from_slice(&binary, KeyType::Public).expect("invalid public key");
         assert_eq!(public_key, public_key2);
 
-        let binary = DcKey::to_bytes(&private_key);
-        let private_key2 = SignedSecretKey::from_slice(&binary).expect("invalid private key");
+        let binary = private_key.to_bytes();
+        let private_key2 = Key::from_slice(&binary, KeyType::Private).expect("invalid private key");
         assert_eq!(private_key, private_key2);
     }
 
     #[test]
     fn test_from_slice_bad_data() {
         let mut bad_data: [u8; 4096] = [0; 4096];
+
         for i in 0..4096 {
             bad_data[i] = (i & 0xff) as u8;
         }
-        for j in 0..(4096 / 40) {
-            let slice = &bad_data[j..j + 4096 / 2 + j];
-            assert!(SignedPublicKey::from_slice(slice).is_err());
-            assert!(SignedSecretKey::from_slice(slice).is_err());
-        }
-    }
 
-    #[test]
-    fn test_base64_roundtrip() {
-        let key = KEYPAIR.public.clone();
-        let base64 = key.to_base64();
-        let key2 = SignedPublicKey::from_base64(&base64).unwrap();
-        assert_eq!(key, key2);
+        for j in 0..(4096 / 40) {
+            let bad_key = Key::from_slice(
+                &bad_data[j..j + 4096 / 2 + j],
+                if 0 != j & 1 {
+                    KeyType::Public
+                } else {
+                    KeyType::Private
+                },
+            );
+            assert!(bad_key.is_none());
+        }
     }
 
     #[async_std::test]
@@ -559,6 +641,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     }
 
     #[async_std::test]
+    #[ignore] // generating keys is expensive
     async fn test_load_self_generate_public() {
         let t = dummy_context().await;
         t.ctx
@@ -570,6 +653,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     }
 
     #[async_std::test]
+    #[ignore] // generating keys is expensive
     async fn test_load_self_generate_secret() {
         let t = dummy_context().await;
         t.ctx
@@ -581,6 +665,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     }
 
     #[async_std::test]
+    #[ignore] // generating keys is expensive
     async fn test_load_self_generate_concurrent() {
         use std::thread;
 
@@ -601,10 +686,29 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
         assert_eq!(res0.unwrap(), res1.unwrap());
     }
 
+    #[test]
+    fn test_ascii_roundtrip() {
+        let public_key = Key::from(KEYPAIR.public.clone());
+        let private_key = Key::from(KEYPAIR.secret.clone());
+
+        let s = public_key.to_armored_string(None).unwrap();
+        let (public_key2, _) =
+            Key::from_armored_string(&s, KeyType::Public).expect("invalid public key");
+        assert_eq!(public_key, public_key2);
+
+        let s = private_key.to_armored_string(None).unwrap();
+        println!("{}", &s);
+        let (private_key2, _) =
+            Key::from_armored_string(&s, KeyType::Private).expect("invalid private key");
+        assert_eq!(private_key, private_key2);
+    }
+
     #[test]
     fn test_split_key() {
-        let pubkey = KEYPAIR.secret.split_public_key().unwrap();
-        assert_eq!(pubkey.primary_key, KEYPAIR.public.primary_key);
+        let private_key = Key::from(KEYPAIR.secret.clone());
+        let public_wrapped = private_key.split_key().unwrap();
+        let public = SignedPublicKey::try_from(public_wrapped).unwrap();
+        assert_eq!(public.primary_key, KEYPAIR.public.primary_key);
     }
 
     #[async_std::test]
@@ -652,49 +756,4 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD
     //     )
     //     .unwrap();
     // }
-
-    #[test]
-    fn test_fingerprint_from_str() {
-        let res = Fingerprint::new(vec![
-            1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-        ])
-        .unwrap();
-
-        let fp: Fingerprint = "0102030405060708090A0B0c0d0e0F1011121314".parse().unwrap();
-        assert_eq!(fp, res);
-
-        let fp: Fingerprint = "zzzz 0102 0304 0506\n0708090a0b0c0D0E0F1011121314 yyy"
-            .parse()
-            .unwrap();
-        assert_eq!(fp, res);
-
-        let err = "1".parse::<Fingerprint>().err().unwrap();
-        match err {
-            FingerprintError::NotHex(_) => (),
-            _ => panic!("Wrong error"),
-        }
-        let src_err = err.source().unwrap().downcast_ref::<hex::FromHexError>();
-        assert_eq!(src_err, Some(&hex::FromHexError::OddLength));
-    }
-
-    #[test]
-    fn test_fingerprint_hex() {
-        let fp = Fingerprint::new(vec![
-            1, 2, 4, 8, 16, 32, 64, 128, 255, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-        ])
-        .unwrap();
-        assert_eq!(fp.hex(), "0102040810204080FF0A0B0C0D0E0F1011121314");
-    }
-
-    #[test]
-    fn test_fingerprint_to_string() {
-        let fp = Fingerprint::new(vec![
-            1, 2, 4, 8, 16, 32, 64, 128, 255, 1, 2, 4, 8, 16, 32, 64, 128, 255, 19, 20,
-        ])
-        .unwrap();
-        assert_eq!(
-            fp.to_string(),
-            "0102 0408 1020 4080 FF01\n0204 0810 2040 80FF 1314"
-        );
-    }
 }

src/keyring.rs

@@ -1,92 +1,46 @@
-//! Keyring to perform rpgp operations with.
-
-use anyhow::Result;
+use std::borrow::Cow;
 
+use crate::constants::KeyType;
 use crate::context::Context;
-use crate::key::{self, DcKey};
+use crate::key::Key;
+use crate::sql::Sql;
 
-/// An in-memory keyring.
-///
-/// Instances are usually constructed just for the rpgp operation and
-/// short-lived.
-#[derive(Clone, Debug, Default)]
-pub struct Keyring<T>
-where
-    T: DcKey,
-{
-    keys: Vec<T>,
+#[derive(Default, Clone, Debug)]
+pub struct Keyring<'a> {
+    keys: Vec<Cow<'a, Key>>,
 }
 
-impl<T> Keyring<T>
-where
-    T: DcKey<KeyType = T>,
-{
-    /// New empty keyring.
-    pub fn new() -> Keyring<T> {
-        Keyring { keys: Vec::new() }
+impl<'a> Keyring<'a> {
+    pub fn add_owned(&mut self, key: Key) {
+        self.add(Cow::Owned(key))
     }
 
-    /// Create a new keyring with the the user's secret key loaded.
-    pub async fn new_self(context: &Context) -> Result<Keyring<T>, key::Error> {
-        let mut keyring: Keyring<T> = Keyring::new();
-        keyring.load_self(context).await?;
-        Ok(keyring)
+    pub fn add_ref(&mut self, key: &'a Key) {
+        self.add(Cow::Borrowed(key))
     }
 
-    /// Load the user's key into the keyring.
-    pub async fn load_self(&mut self, context: &Context) -> Result<(), key::Error> {
-        self.add(T::load_self(context).await?);
-        Ok(())
-    }
-
-    /// Add a key to the keyring.
-    pub fn add(&mut self, key: T) {
+    fn add(&mut self, key: Cow<'a, Key>) {
         self.keys.push(key);
     }
 
-    pub fn len(&self) -> usize {
-        self.keys.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.keys.is_empty()
-    }
-
-    /// A vector with reference to all the keys in the keyring.
-    pub fn keys(&self) -> &[T] {
+    pub fn keys(&self) -> &[Cow<'a, Key>] {
         &self.keys
     }
-}
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::key::{SignedPublicKey, SignedSecretKey};
-    use crate::test_utils::*;
-
-    #[test]
-    fn test_keyring_add_keys() {
-        let alice = alice_keypair();
-        let mut pub_ring: Keyring<SignedPublicKey> = Keyring::new();
-        pub_ring.add(alice.public.clone());
-        assert_eq!(pub_ring.keys(), [alice.public]);
-
-        let mut sec_ring: Keyring<SignedSecretKey> = Keyring::new();
-        sec_ring.add(alice.secret.clone());
-        assert_eq!(sec_ring.keys(), [alice.secret]);
-    }
-
-    #[async_std::test]
-    async fn test_keyring_load_self() {
-        // new_self() implies load_self()
-        let t = dummy_context().await;
-        configure_alice_keypair(&t.ctx).await;
-        let alice = alice_keypair();
-
-        let pub_ring: Keyring<SignedPublicKey> = Keyring::new_self(&t.ctx).await.unwrap();
-        assert_eq!(pub_ring.keys(), [alice.public]);
-
-        let sec_ring: Keyring<SignedSecretKey> = Keyring::new_self(&t.ctx).await.unwrap();
-        assert_eq!(sec_ring.keys(), [alice.secret]);
+    pub async fn load_self_private_for_decrypting(
+        &mut self,
+        context: &Context,
+        self_addr: impl AsRef<str>,
+        sql: &Sql,
+    ) -> bool {
+        sql.query_get_value(
+            context,
+            "SELECT private_key FROM keypairs ORDER BY addr=? DESC, is_default DESC;",
+            paramsv![self_addr.as_ref().to_string()],
+        )
+        .await
+        .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Private))
+        .map(|key| self.add_owned(key))
+        .is_some()
     }
 }

src/lib.rs

@@ -11,6 +11,8 @@ extern crate rusqlite;
 extern crate strum;
 #[macro_use]
 extern crate strum_macros;
+#[macro_use]
+extern crate debug_stub_derive;
 
 pub trait ToSql: rusqlite::ToSql + Send + Sync {}
 

src/login_param.rs

@@ -130,6 +130,10 @@ impl LoginParam {
         }
     }
 
+    pub fn addr_str(&self) -> &str {
+        self.addr.as_str()
+    }
+
     /// Save this loginparam to the database.
     pub async fn save_to_database(
         &self,
@@ -273,15 +277,21 @@ fn get_readable_flags(flags: i32) -> String {
     res
 }
 
-pub fn dc_build_tls(strict_tls: bool) -> async_native_tls::TlsConnector {
+pub fn dc_build_tls(certificate_checks: CertificateChecks) -> async_native_tls::TlsConnector {
     let tls_builder = async_native_tls::TlsConnector::new();
-
-    if strict_tls {
-        tls_builder
-    } else {
-        tls_builder
+    match certificate_checks {
+        CertificateChecks::Automatic => {
+            // Same as AcceptInvalidCertificates for now.
+            // TODO: use provider database when it becomes available
+            tls_builder
+                .danger_accept_invalid_hostnames(true)
+                .danger_accept_invalid_certs(true)
+        }
+        CertificateChecks::Strict => tls_builder,
+        CertificateChecks::AcceptInvalidCertificates
+        | CertificateChecks::AcceptInvalidCertificates2 => tls_builder
             .danger_accept_invalid_hostnames(true)
-            .danger_accept_invalid_certs(true)
+            .danger_accept_invalid_certs(true),
     }
 }
 

src/lot.rs

@@ -1,7 +1,5 @@
 use deltachat_derive::{FromSql, ToSql};
 
-use crate::key::Fingerprint;
-
 /// An object containing a set of values.
 /// The meaning of the values is defined by the function returning the object.
 /// Lot objects are created
@@ -16,7 +14,7 @@ pub struct Lot {
     pub(crate) timestamp: i64,
     pub(crate) state: LotState,
     pub(crate) id: u32,
-    pub(crate) fingerprint: Option<Fingerprint>,
+    pub(crate) fingerprint: Option<String>,
     pub(crate) invitenumber: Option<String>,
     pub(crate) auth: Option<String>,
 }

src/message.rs

@@ -14,7 +14,7 @@ use crate::error::{ensure, Error};
 use crate::events::Event;
 use crate::job::{self, Action};
 use crate::lot::{Lot, LotState, Meaning};
-use crate::mimeparser::{FailureReport, SystemMessage};
+use crate::mimeparser::SystemMessage;
 use crate::param::*;
 use crate::pgp::*;
 use crate::stock::StockMessage;
@@ -255,7 +255,6 @@ pub struct Message {
     pub(crate) starred: bool,
     pub(crate) chat_blocked: Blocked,
     pub(crate) location_id: u32,
-    pub(crate) error: String,
     pub(crate) param: Params,
 }
 
@@ -290,7 +289,6 @@ impl Message {
                     "    m.timestamp_rcvd AS timestamp_rcvd,",
                     "    m.type AS type,",
                     "    m.state AS state,",
-                    "    m.error AS error,",
                     "    m.msgrmsg AS msgrmsg,",
                     "    m.txt AS txt,",
                     "    m.param AS param,",
@@ -318,7 +316,6 @@ impl Message {
                     msg.timestamp_rcvd = row.get("timestamp_rcvd")?;
                     msg.viewtype = row.get("type")?;
                     msg.state = row.get("state")?;
-                    msg.error = row.get("error")?;
                     msg.is_dc_message = row.get("msgrmsg")?;
 
                     let text;
@@ -393,7 +390,7 @@ impl Message {
                     }
 
                     if !self.id.is_unset() {
-                        self.update_param(context).await;
+                        self.save_param_to_disk(context).await;
                     }
                 }
             }
@@ -646,10 +643,10 @@ impl Message {
         if duration > 0 {
             self.param.set_int(Param::Duration, duration);
         }
-        self.update_param(context).await;
+        self.save_param_to_disk(context).await;
     }
 
-    pub async fn update_param(&mut self, context: &Context) -> bool {
+    pub async fn save_param_to_disk(&mut self, context: &Context) -> bool {
         context
             .sql
             .execute(
@@ -766,10 +763,9 @@ impl From<MessageState> for LotState {
 impl MessageState {
     pub fn can_fail(self) -> bool {
         match self {
-            MessageState::OutPreparing
-            | MessageState::OutPending
-            | MessageState::OutDelivered
-            | MessageState::OutMdnRcvd => true, // OutMdnRcvd can still fail because it could be a group message and only some recipients failed.
+            MessageState::OutPreparing | MessageState::OutPending | MessageState::OutDelivered => {
+                true
+            }
             _ => false,
         }
     }
@@ -941,9 +937,8 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> String {
     }
 
     ret += "\n";
-
-    if !msg.error.is_empty() {
-        ret += &format!("Error: {}", msg.error);
+    if let Some(err) = msg.param.get(Param::Error) {
+        ret += &format!("Error: {}", err)
     }
 
     if let Some(path) = msg.get_file(context) {
@@ -1256,38 +1251,33 @@ pub async fn exists(context: &Context, msg_id: MsgId) -> bool {
 
 pub async fn set_msg_failed(context: &Context, msg_id: MsgId, error: Option<impl AsRef<str>>) {
     if let Ok(mut msg) = Message::load_from_db(context, msg_id).await {
-        let error = error.map(|e| e.as_ref().to_string()).unwrap_or_default();
         if msg.state.can_fail() {
             msg.state = MessageState::OutFailed;
-            warn!(context, "{} failed: {}", msg_id, error);
-        } else {
-            warn!(
-                context,
-                "{} seems to have failed ({}), but state is {}", msg_id, error, msg.state
-            )
+        }
+        if let Some(error) = error {
+            msg.param.set(Param::Error, error.as_ref());
+            warn!(context, "Message failed: {}", error.as_ref());
         }
 
-        match context
+        if context
             .sql
             .execute(
-                "UPDATE msgs SET state=?, error=? WHERE id=?;",
-                paramsv![msg.state, error, msg_id],
+                "UPDATE msgs SET state=?, param=? WHERE id=?;",
+                paramsv![msg.state, msg.param.to_string(), msg_id],
             )
             .await
+            .is_ok()
         {
-            Ok(_) => context.emit_event(Event::MsgFailed {
+            context.emit_event(Event::MsgFailed {
                 chat_id: msg.chat_id,
                 msg_id,
-            }),
-            Err(e) => {
-                warn!(context, "{:?}", e);
-            }
+            });
         }
     }
 }
 
 /// returns Some if an event should be send
-pub async fn handle_mdn(
+pub async fn mdn_from_ext(
     context: &Context,
     from_id: u32,
     rfc724_mid: &str,
@@ -1328,10 +1318,10 @@ pub async fn handle_mdn(
     if let Ok((msg_id, chat_id, chat_type, msg_state)) = res {
         let mut read_by_all = false;
 
-        if msg_state == MessageState::OutPreparing
-            || msg_state == MessageState::OutPending
-            || msg_state == MessageState::OutDelivered
-        {
+        // if already marked as MDNS_RCVD msgstate_can_fail() returns false.
+        // however, it is important, that ret_msg_id is set above as this
+        // will allow the caller eg. to move the message away
+        if msg_state.can_fail() {
             let mdn_already_in_table = context
                 .sql
                 .exists(
@@ -1394,69 +1384,6 @@ pub async fn handle_mdn(
     None
 }
 
-/// Marks a message as failed after an ndn (non-delivery-notification) arrived.
-/// Where appropriate, also adds an info message telling the user which of the recipients of a group message failed.
-pub(crate) async fn handle_ndn(
-    context: &Context,
-    failed: &FailureReport,
-    error: Option<impl AsRef<str>>,
-) {
-    if failed.rfc724_mid.is_empty() {
-        return;
-    }
-
-    let res = context
-        .sql
-        .query_row(
-            concat!(
-                "SELECT",
-                "    m.id AS msg_id,",
-                "    c.id AS chat_id,",
-                "    c.type AS type",
-                " FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id",
-                " WHERE rfc724_mid=? AND from_id=1",
-            ),
-            paramsv![failed.rfc724_mid],
-            |row| {
-                Ok((
-                    row.get::<_, MsgId>("msg_id")?,
-                    row.get::<_, ChatId>("chat_id")?,
-                    row.get::<_, Chattype>("type")?,
-                ))
-            },
-        )
-        .await;
-    if let Err(ref err) = res {
-        info!(context, "Failed to select NDN {:?}", err);
-    }
-
-    if let Ok((msg_id, chat_id, chat_type)) = res {
-        set_msg_failed(context, msg_id, error).await;
-
-        if chat_type == Chattype::Group || chat_type == Chattype::VerifiedGroup {
-            if let Some(failed_recipient) = &failed.failed_recipient {
-                let contact_id =
-                    Contact::lookup_id_by_addr(context, failed_recipient, Origin::Unknown).await;
-                if let Ok(contact) = Contact::load_from_db(context, contact_id).await {
-                    // Tell the user which of the recipients failed if we know that (because in a group, this might otherwise be unclear)
-                    chat::add_info_msg(
-                        context,
-                        chat_id,
-                        context
-                            .stock_string_repl_str(
-                                StockMessage::FailedSendingTo,
-                                contact.get_display_name(),
-                            )
-                            .await,
-                    )
-                    .await;
-                    context.emit_event(Event::ChatModified(chat_id));
-                }
-            }
-        }
-    }
-}
-
 /// The number of messages assigned to real chat (!=deaddrop, !=trash)
 pub async fn get_real_msg_cnt(context: &Context) -> i32 {
     match context

src/mimefactory.rs

@@ -351,47 +351,16 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
                     };
                     format!("{}{}", re, chat.name)
                 } else {
-                    match chat.param.get(Param::LastSubject) {
-                        Some(last_subject) => {
-                            let subject_start = if last_subject.starts_with("Chat:") {
-                                0
-                            } else {
-                                // "Antw:" is the longest abbreviation in
-                                // https://en.wikipedia.org/wiki/List_of_email_subject_abbreviations#Abbreviations_in_other_languages,
-                                // so look at the first _5_ characters:
-                                match last_subject.chars().take(5).position(|c| c == ':') {
-                                    Some(prefix_end) => prefix_end + 1,
-                                    None => 0,
-                                }
-                            };
-                            format!(
-                                "Re: {}",
-                                last_subject
-                                    .chars()
-                                    .skip(subject_start)
-                                    .collect::<String>()
-                                    .trim()
-                            )
-                        }
-                        None => {
-                            let self_name = match self.context.get_config(Config::Displayname).await
-                            {
-                                Some(name) => name,
-                                None => self
-                                    .context
-                                    .get_config(Config::Addr)
-                                    .await
-                                    .unwrap_or_default(),
-                            };
-
-                            self.context
-                                .stock_string_repl_str(
-                                    StockMessage::SubjectForNewContact,
-                                    self_name,
-                                )
-                                .await
-                        }
-                    }
+                    let raw = message::get_summarytext_by_raw(
+                        self.msg.viewtype,
+                        self.msg.text.as_ref(),
+                        &self.msg.param,
+                        32,
+                        self.context,
+                    )
+                    .await;
+                    let raw_subject = raw.lines().next().unwrap_or_default();
+                    format!("Chat: {}", raw_subject)
                 }
             }
             Loaded::MDN { .. } => self
@@ -440,8 +409,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             to.push(from.clone());
         }
 
-        unprotected_headers.push(Header::new("MIME-Version".into(), "1.0".into()));
-
         if !self.references.is_empty() {
             unprotected_headers.push(Header::new("References".into(), self.references.clone()));
         }
@@ -496,7 +463,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         let force_plaintext = self.should_force_plaintext();
         let subject_str = self.subject_str().await;
         let e2ee_guaranteed = self.is_e2ee_guaranteed();
-        let encrypt_helper = EncryptHelper::new(self.context).await?;
+        let mut encrypt_helper = EncryptHelper::new(self.context).await?;
 
         let subject = encode_words(&subject_str);
 
@@ -593,7 +560,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
             }
 
             let encrypted = encrypt_helper
-                .encrypt(self.context, min_verified, message, peerstates)
+                .encrypt(self.context, min_verified, message, &peerstates)
                 .await?;
 
             outer_message = outer_message
@@ -1207,11 +1174,6 @@ pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::chatlist::Chatlist;
-    use crate::dc_receive_imf::dc_receive_imf;
-    use crate::mimeparser::*;
-    use crate::test_utils::configured_offline_context;
-    use crate::test_utils::TestContext;
 
     #[test]
     fn test_render_email_address() {
@@ -1219,9 +1181,6 @@ mod tests {
         let addr = "x@y.org";
 
         assert!(!display_name.is_ascii());
-        assert!(!display_name
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == ' '));
 
         let s = format!(
             "{}",
@@ -1233,25 +1192,6 @@ mod tests {
         assert_eq!(s, "=?utf-8?q?=C3=A4_space?= <x@y.org>");
     }
 
-    #[test]
-    fn test_render_email_address_noescape() {
-        let display_name = "a space";
-        let addr = "x@y.org";
-
-        assert!(display_name.is_ascii());
-        assert!(display_name
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == ' '));
-
-        let s = format!(
-            "{}",
-            Address::new_mailbox_with_name(display_name.to_string(), addr.to_string())
-        );
-
-        // Addresses should not be unnecessarily be encoded, see https://github.com/deltachat/deltachat-core-rust/issues/1575:
-        assert_eq!(s, "a space <x@y.org>");
-    }
-
     #[test]
     fn test_render_rfc724_mid() {
         assert_eq!(
@@ -1294,192 +1234,4 @@ mod tests {
         assert!(needs_encoding(" "));
         assert!(needs_encoding("foo bar"));
     }
-
-    #[async_std::test]
-    async fn test_subject() {
-        // 1.: Receive a mail from an MUA or Delta Chat
-        assert_eq!(
-            msg_to_subject_str(
-                b"From: Bob <bob@example.org>\n\
-                To: alice@example.org\n\
-                Subject: Antw: Chat: hello\n\
-                Message-ID: <2222@example.org>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n"
-            )
-            .await,
-            "Re: Chat: hello"
-        );
-
-        assert_eq!(
-            msg_to_subject_str(
-                b"From: Bob <bob@example.org>\n\
-                To: alice@example.org\n\
-                Subject: Infos: 42\n\
-                Message-ID: <2222@example.org>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n"
-            )
-            .await,
-            "Re: Infos: 42"
-        );
-
-        // 2. Receive a message from Delta Chat when we did not send any messages before
-        assert_eq!(
-            msg_to_subject_str(
-                b"From: Charlie <charlie@example.org>\n\
-                To: alice@example.org\n\
-                Subject: Chat: hello\n\
-                Chat-Version: 1.0\n\
-                Message-ID: <2223@example.org>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n"
-            )
-            .await,
-            "Re: Chat: hello"
-        );
-
-        // 3. Send the first message to a new contact
-        let t = configured_offline_context().await;
-        assert_eq!(first_subject_str(t).await, "Message from alice@example.org");
-
-        let t = configured_offline_context().await;
-        t.ctx
-            .set_config(Config::Displayname, Some("Alice"))
-            .await
-            .unwrap();
-        assert_eq!(first_subject_str(t).await, "Message from Alice");
-
-        // 4. Receive messages with unicode characters and make sure that we do not panic (we do not care about the result)
-        msg_to_subject_str(
-            "From: Charlie <charlie@example.org>\n\
-            To: alice@example.org\n\
-            Subject: äääää\n\
-            Chat-Version: 1.0\n\
-            Message-ID: <2893@example.org>\n\
-            Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-            \n\
-            hello\n"
-                .as_bytes(),
-        )
-        .await;
-
-        msg_to_subject_str(
-            "From: Charlie <charlie@example.org>\n\
-            To: alice@example.org\n\
-            Subject: aäääää\n\
-            Chat-Version: 1.0\n\
-            Message-ID: <2893@example.org>\n\
-            Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-            \n\
-            hello\n"
-                .as_bytes(),
-        )
-        .await;
-    }
-
-    async fn first_subject_str(t: TestContext) -> String {
-        let contact_id =
-            Contact::add_or_lookup(&t.ctx, "Dave", "dave@example.org", Origin::ManuallyCreated)
-                .await
-                .unwrap()
-                .0;
-
-        let chat_id = chat::create_by_contact_id(&t.ctx, contact_id)
-            .await
-            .unwrap();
-
-        let mut new_msg = Message::new(Viewtype::Text);
-        new_msg.set_text(Some("Hi".to_string()));
-        new_msg.chat_id = chat_id;
-        chat::prepare_msg(&t.ctx, chat_id, &mut new_msg)
-            .await
-            .unwrap();
-
-        let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
-            .await
-            .unwrap();
-
-        mf.subject_str().await
-    }
-
-    async fn msg_to_subject_str(imf_raw: &[u8]) -> String {
-        let t = configured_offline_context().await;
-        let new_msg = incoming_msg_to_reply_msg(imf_raw, &t.ctx).await;
-        let mf = MimeFactory::from_msg(&t.ctx, &new_msg, false)
-            .await
-            .unwrap();
-        mf.subject_str().await
-    }
-
-    // Creates a mimefactory for a message that replies "Hi" to the incoming message in `imf_raw`.
-    async fn incoming_msg_to_reply_msg(imf_raw: &[u8], context: &Context) -> Message {
-        context
-            .set_config(Config::ShowEmails, Some("2"))
-            .await
-            .unwrap();
-
-        dc_receive_imf(context, imf_raw, "INBOX", 1, false)
-            .await
-            .unwrap();
-
-        let chats = Chatlist::try_load(context, 0, None, None).await.unwrap();
-
-        let chat_id = chat::create_by_msg_id(context, chats.get_msg_id(0).unwrap())
-            .await
-            .unwrap();
-
-        let mut new_msg = Message::new(Viewtype::Text);
-        new_msg.set_text(Some("Hi".to_string()));
-        new_msg.chat_id = chat_id;
-        chat::prepare_msg(context, chat_id, &mut new_msg)
-            .await
-            .unwrap();
-
-        new_msg
-    }
-
-    #[async_std::test]
-    // This test could still be extended
-    async fn test_render_reply() {
-        let t = configured_offline_context().await;
-        let context = &t.ctx;
-
-        let msg = incoming_msg_to_reply_msg(
-            b"From: Charlie <charlie@example.org>\n\
-                To: alice@example.org\n\
-                Subject: Chat: hello\n\
-                Chat-Version: 1.0\n\
-                Message-ID: <2223@example.org>\n\
-                Date: Sun, 22 Mar 2020 22:37:56 +0000\n\
-                \n\
-                hello\n",
-            context,
-        )
-        .await;
-
-        let mimefactory = MimeFactory::from_msg(&t.ctx, &msg, false).await.unwrap();
-
-        let recipients = mimefactory.recipients();
-        assert_eq!(recipients, vec!["charlie@example.org"]);
-
-        let rendered_msg = mimefactory.render().await.unwrap();
-
-        let mail = mailparse::parse_mail(&rendered_msg.message).unwrap();
-        assert_eq!(
-            mail.headers
-                .iter()
-                .find(|h| h.get_key() == "MIME-Version")
-                .unwrap()
-                .get_value(),
-            "1.0"
-        );
-
-        let _mime_msg = MimeMessage::from_bytes(context, &rendered_msg.message)
-            .await
-            .unwrap();
-    }
 }

src/mimeparser.rs

@@ -3,7 +3,6 @@ use std::future::Future;
 use std::pin::Pin;
 
 use deltachat_derive::{FromSql, ToSql};
-use lazy_static::lazy_static;
 use lettre_email::mime::{self, Mime};
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
 
@@ -18,7 +17,6 @@ use crate::e2ee;
 use crate::error::{bail, Result};
 use crate::events::Event;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
-use crate::key::Fingerprint;
 use crate::location;
 use crate::message;
 use crate::param::*;
@@ -46,7 +44,7 @@ pub struct MimeMessage {
     pub from: Vec<SingleInfo>,
     pub chat_disposition_notification_to: Option<SingleInfo>,
     pub decrypting_failed: bool,
-    pub signatures: HashSet<Fingerprint>,
+    pub signatures: HashSet<String>,
     pub gossipped_addr: HashSet<String>,
     pub is_forwarded: bool,
     pub is_system_message: SystemMessage,
@@ -54,8 +52,7 @@ pub struct MimeMessage {
     pub message_kml: Option<location::Kml>,
     pub(crate) user_avatar: Option<AvatarAction>,
     pub(crate) group_avatar: Option<AvatarAction>,
-    pub(crate) mdn_reports: Vec<Report>,
-    pub(crate) failure_report: Option<FailureReport>,
+    pub(crate) reports: Vec<Report>,
 }
 
 #[derive(Debug, PartialEq)]
@@ -178,16 +175,14 @@ impl MimeMessage {
             signatures,
             gossipped_addr,
             is_forwarded: false,
-            mdn_reports: Vec::new(),
+            reports: Vec::new(),
             is_system_message: SystemMessage::Unknown,
             location_kml: None,
             message_kml: None,
             user_avatar: None,
             group_avatar: None,
-            failure_report: None,
         };
         parser.parse_mime_recursive(context, &mail).await?;
-        parser.heuristically_parse_ndn(context).await;
         parser.parse_headers(context)?;
 
         Ok(parser)
@@ -357,7 +352,7 @@ impl MimeMessage {
         // just have send a message in the subject with an empty body.
         // Besides, we want to show something in case our incoming-processing
         // failed to properly handle an incoming message.
-        if self.parts.is_empty() && self.mdn_reports.is_empty() {
+        if self.parts.is_empty() && self.reports.is_empty() {
             let mut part = Part::default();
             part.typ = Viewtype::Text;
 
@@ -531,7 +526,6 @@ impl MimeMessage {
                 part.typ = Viewtype::Text;
                 part.msg_raw = Some(txt.clone());
                 part.msg = txt;
-                part.error = "Decryption failed".to_string();
 
                 self.parts.push(part);
 
@@ -554,10 +548,10 @@ impl MimeMessage {
             (mime::MULTIPART, "report") => {
                 /* RFC 6522: the first part is for humans, the second for machines */
                 if mail.subparts.len() >= 2 {
-                    match mail.ctype.params.get("report-type").map(|s| s as &str) {
-                        Some("disposition-notification") => {
+                    if let Some(report_type) = mail.ctype.params.get("report-type") {
+                        if report_type == "disposition-notification" {
                             if let Some(report) = self.process_report(context, mail)? {
-                                self.mdn_reports.push(report);
+                                self.reports.push(report);
                             }
 
                             // Add MDN part so we can track it, avoid
@@ -569,26 +563,13 @@ impl MimeMessage {
                             self.parts.push(part);
 
                             any_part_added = true;
-                        }
-                        Some("delivery-status") => {
-                            if let Some(report) = self.process_delivery_status(context, mail)? {
-                                self.failure_report = Some(report);
-                            }
-
-                            // Add all parts (in fact, AddSinglePartIfKnown() later check if
-                            // the parts are really supported)
-                            for cur_data in mail.subparts.iter() {
-                                if self.parse_mime_recursive(context, cur_data).await? {
-                                    any_part_added = true;
-                                }
-                            }
-                        }
-                        Some(_) => {
+                        } else {
+                            /* eg. `report-type=delivery-status`;
+                            maybe we should show them as a little error icon */
                             if let Some(first) = mail.subparts.iter().next() {
                                 any_part_added = self.parse_mime_recursive(context, first).await?;
                             }
                         }
-                        None => {}
                     }
                 }
             }
@@ -857,121 +838,24 @@ impl MimeMessage {
         Ok(None)
     }
 
-    fn process_delivery_status(
-        &self,
-        context: &Context,
-        report: &mailparse::ParsedMail<'_>,
-    ) -> Result<Option<FailureReport>> {
-        // parse as mailheaders
-        if let Some(original_msg) = report
-            .subparts
-            .iter()
-            .find(|p| p.ctype.mimetype.contains("rfc822") || p.ctype.mimetype == "message/global")
-        {
-            let report_body = original_msg.get_body_raw()?;
-            let (report_fields, _) = mailparse::parse_headers(&report_body)?;
-
-            if let Some(original_message_id) = report_fields
-                .get_header_value(HeaderDef::MessageId)
-                .and_then(|v| parse_message_id(&v).ok())
-            {
-                let mut to_list = get_all_addresses_from_header(&report.headers, |header_key| {
-                    header_key == "x-failed-recipients"
-                });
-                let to = if to_list.len() == 1 {
-                    Some(to_list.pop().unwrap())
-                } else {
-                    None // We do not know which recipient failed
-                };
-
-                return Ok(Some(FailureReport {
-                    rfc724_mid: original_message_id,
-                    failed_recipient: to.map(|s| s.addr),
-                }));
-            }
-
-            warn!(
-                context,
-                "ignoring unknown ndn-notification, Message-Id: {:?}",
-                report_fields.get_header_value(HeaderDef::MessageId)
-            );
+    /// Handle reports (only MDNs for now)
+    pub async fn handle_reports(&self, context: &Context, from_id: u32, sent_timestamp: i64) {
+        if self.reports.is_empty() {
+            return;
         }
 
-        Ok(None)
-    }
-
-    /// Some providers like GMX and Yahoo do not send standard NDNs (Non Delivery notifications).
-    /// If you improve heuristics here you might also have to change prefetch_should_download() in imap/mod.rs.
-    /// Also you should add a test in dc_receive_imf.rs (there already are lots of test_parse_ndn_* tests).
-    async fn heuristically_parse_ndn(&mut self, context: &Context) -> Option<()> {
-        if self
-            .get(HeaderDef::Subject)?
-            .to_ascii_lowercase()
-            .contains("fail")
-            && self
-                .get(HeaderDef::From_)?
-                .to_ascii_lowercase()
-                .contains("mailer-daemon")
-            && self.failure_report.is_none()
-        {
-            lazy_static! {
-                static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap();
-            }
-            for captures in self
-                .parts
-                .iter()
-                .filter_map(|part| part.msg_raw.as_ref())
-                .flat_map(|part| part.lines())
-                .filter_map(|line| RE.captures(line))
-            {
-                if let Ok(original_message_id) = parse_message_id(&captures[1]) {
-                    if let Ok(Some(_)) =
-                        message::rfc724_mid_exists(context, &original_message_id).await
-                    {
-                        self.failure_report = Some(FailureReport {
-                            rfc724_mid: original_message_id,
-                            failed_recipient: None,
-                        })
-                    }
-                }
-            }
-        }
-        None // Always return None, we just return anything so that we can use the '?' operator.
-    }
-
-    /// Handle reports
-    /// (MDNs = Message Disposition Notification, the message was read
-    /// and NDNs = Non delivery notification, the message could not be delivered)
-    pub async fn handle_reports(
-        &self,
-        context: &Context,
-        from_id: u32,
-        sent_timestamp: i64,
-        parts: &[Part],
-    ) {
-        for report in &self.mdn_reports {
+        for report in &self.reports {
             for original_message_id in
                 std::iter::once(&report.original_message_id).chain(&report.additional_message_ids)
             {
                 if let Some((chat_id, msg_id)) =
-                    message::handle_mdn(context, from_id, original_message_id, sent_timestamp).await
+                    message::mdn_from_ext(context, from_id, original_message_id, sent_timestamp)
+                        .await
                 {
                     context.emit_event(Event::MsgRead { chat_id, msg_id });
                 }
             }
         }
-
-        if let Some(failure_report) = &self.failure_report {
-            let error = parts.iter().find(|p| p.typ == Viewtype::Text).map(|p| {
-                let msg = &p.msg;
-                match msg.find("\n--- ") {
-                    Some(footer_start) => &msg[..footer_start],
-                    None => msg,
-                }
-                .trim()
-            });
-            message::handle_ndn(context, failure_report, error).await
-        }
     }
 }
 
@@ -1028,12 +912,6 @@ pub(crate) struct Report {
     additional_message_ids: Vec<String>,
 }
 
-#[derive(Debug)]
-pub(crate) struct FailureReport {
-    pub rfc724_mid: String,
-    pub failed_recipient: Option<String>,
-}
-
 pub(crate) fn parse_message_ids(ids: &str) -> Result<Vec<String>> {
     // take care with mailparse::msgidparse() that is pretty untolerant eg. wrt missing `<` or `>`
     let mut msgids = Vec::new();
@@ -1077,7 +955,6 @@ pub struct Part {
     pub bytes: usize,
     pub param: Params,
     org_filename: Option<String>,
-    pub error: String,
 }
 
 /// return mimetype and viewtype for a parsed mail
@@ -1524,7 +1401,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\
         );
 
         assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.mdn_reports.len(), 1);
+        assert_eq!(message.reports.len(), 1);
     }
 
     /// Test parsing multiple MDNs combined in a single message.
@@ -1604,7 +1481,7 @@ Disposition: manual-action/MDN-sent-automatically; displayed\n\
         );
 
         assert_eq!(message.parts.len(), 2);
-        assert_eq!(message.mdn_reports.len(), 2);
+        assert_eq!(message.reports.len(), 2);
     }
 
     #[async_std::test]
@@ -1651,13 +1528,10 @@ Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\
         );
 
         assert_eq!(message.parts.len(), 1);
-        assert_eq!(message.mdn_reports.len(), 1);
+        assert_eq!(message.reports.len(), 1);
+        assert_eq!(message.reports[0].original_message_id, "foo@example.org");
         assert_eq!(
-            message.mdn_reports[0].original_message_id,
-            "foo@example.org"
-        );
-        assert_eq!(
-            &message.mdn_reports[0].additional_message_ids,
+            &message.reports[0].additional_message_ids,
             &["foo@example.com", "foo@example.net"]
         );
     }

src/param.rs

@@ -65,6 +65,9 @@ pub enum Param {
     /// For Messages
     Arg4 = b'H',
 
+    /// For Messages
+    Error = b'L',
+
     /// For Messages
     AttachGroupImage = b'A',
 
@@ -100,9 +103,6 @@ pub enum Param {
     /// For Chats
     Selftalk = b'K',
 
-    /// For Chats: So that on sending a new message we can sent the subject to "Re: <last subject>"
-    LastSubject = b't',
-
     /// For Chats
     Devicetalk = b'D',
 

src/peerstate.rs

@@ -6,8 +6,9 @@ use std::fmt;
 use num_traits::FromPrimitive;
 
 use crate::aheader::*;
+use crate::constants::*;
 use crate::context::Context;
-use crate::key::{DcKey, Fingerprint, SignedPublicKey};
+use crate::key::{Key, SignedPublicKey};
 use crate::sql::Sql;
 
 #[derive(Debug)]
@@ -31,13 +32,13 @@ pub struct Peerstate<'a> {
     pub last_seen: i64,
     pub last_seen_autocrypt: i64,
     pub prefer_encrypt: EncryptPreference,
-    pub public_key: Option<SignedPublicKey>,
-    pub public_key_fingerprint: Option<Fingerprint>,
-    pub gossip_key: Option<SignedPublicKey>,
+    pub public_key: Option<Key>,
+    pub public_key_fingerprint: Option<String>,
+    pub gossip_key: Option<Key>,
     pub gossip_timestamp: i64,
-    pub gossip_key_fingerprint: Option<Fingerprint>,
-    pub verified_key: Option<SignedPublicKey>,
-    pub verified_key_fingerprint: Option<Fingerprint>,
+    pub gossip_key_fingerprint: Option<String>,
+    pub verified_key: Option<Key>,
+    pub verified_key_fingerprint: Option<String>,
     pub to_save: Option<ToSave>,
     pub degrade_event: Option<DegradeEvent>,
 }
@@ -126,7 +127,7 @@ impl<'a> Peerstate<'a> {
         res.last_seen_autocrypt = message_time;
         res.to_save = Some(ToSave::All);
         res.prefer_encrypt = header.prefer_encrypt;
-        res.public_key = Some(header.public_key.clone());
+        res.public_key = Some(Key::from(header.public_key.clone()));
         res.recalc_fingerprint();
 
         res
@@ -137,7 +138,7 @@ impl<'a> Peerstate<'a> {
 
         res.gossip_timestamp = message_time;
         res.to_save = Some(ToSave::All);
-        res.gossip_key = Some(gossip_header.public_key.clone());
+        res.gossip_key = Some(Key::from(gossip_header.public_key.clone()));
         res.recalc_fingerprint();
 
         res
@@ -151,7 +152,7 @@ impl<'a> Peerstate<'a> {
     pub async fn from_fingerprint(
         context: &'a Context,
         _sql: &Sql,
-        fingerprint: &Fingerprint,
+        fingerprint: &str,
     ) -> Option<Peerstate<'a>> {
         let query = "SELECT addr, last_seen, last_seen_autocrypt, prefer_encrypted, public_key, \
                      gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, \
@@ -160,8 +161,13 @@ impl<'a> Peerstate<'a> {
                      WHERE public_key_fingerprint=? COLLATE NOCASE \
                      OR gossip_key_fingerprint=? COLLATE NOCASE  \
                      ORDER BY public_key_fingerprint=? DESC;";
-        let fp = fingerprint.hex();
-        Self::from_stmt(context, query, paramsv![fp, fp, fp]).await
+
+        Self::from_stmt(
+            context,
+            query,
+            paramsv![fingerprint, fingerprint, fingerprint],
+        )
+        .await
     }
 
     async fn from_stmt(
@@ -184,30 +190,45 @@ impl<'a> Peerstate<'a> {
                 res.prefer_encrypt = EncryptPreference::from_i32(row.get(3)?).unwrap_or_default();
                 res.gossip_timestamp = row.get(5)?;
 
-                res.public_key_fingerprint = row
-                    .get::<_, Option<String>>(7)?
-                    .map(|s| s.parse::<Fingerprint>())
-                    .transpose()?;
-                res.gossip_key_fingerprint = row
-                    .get::<_, Option<String>>(8)?
-                    .map(|s| s.parse::<Fingerprint>())
-                    .transpose()?;
-                res.verified_key_fingerprint = row
-                    .get::<_, Option<String>>(10)?
-                    .map(|s| s.parse::<Fingerprint>())
-                    .transpose()?;
+                res.public_key_fingerprint = row.get(7)?;
+                if res
+                    .public_key_fingerprint
+                    .as_ref()
+                    .map(|s| s.is_empty())
+                    .unwrap_or_default()
+                {
+                    res.public_key_fingerprint = None;
+                }
+                res.gossip_key_fingerprint = row.get(8)?;
+                if res
+                    .gossip_key_fingerprint
+                    .as_ref()
+                    .map(|s| s.is_empty())
+                    .unwrap_or_default()
+                {
+                    res.gossip_key_fingerprint = None;
+                }
+                res.verified_key_fingerprint = row.get(10)?;
+                if res
+                    .verified_key_fingerprint
+                    .as_ref()
+                    .map(|s| s.is_empty())
+                    .unwrap_or_default()
+                {
+                    res.verified_key_fingerprint = None;
+                }
                 res.public_key = row
                     .get(4)
                     .ok()
-                    .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok());
+                    .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Public));
                 res.gossip_key = row
                     .get(6)
                     .ok()
-                    .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok());
+                    .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Public));
                 res.verified_key = row
                     .get(9)
                     .ok()
-                    .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok());
+                    .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Public));
 
                 Ok(res)
             })
@@ -279,8 +300,8 @@ impl<'a> Peerstate<'a> {
                 self.to_save = Some(ToSave::All)
             }
 
-            if self.public_key.as_ref() != Some(&header.public_key) {
-                self.public_key = Some(header.public_key.clone());
+            if self.public_key.as_ref() != Some(&Key::from(header.public_key.clone())) {
+                self.public_key = Some(Key::from(header.public_key.clone()));
                 self.recalc_fingerprint();
                 self.to_save = Some(ToSave::All);
             }
@@ -295,8 +316,9 @@ impl<'a> Peerstate<'a> {
         if message_time > self.gossip_timestamp {
             self.gossip_timestamp = message_time;
             self.to_save = Some(ToSave::Timestamps);
-            if self.gossip_key.as_ref() != Some(&gossip_header.public_key) {
-                self.gossip_key = Some(gossip_header.public_key.clone());
+            let hdr_key = Key::from(gossip_header.public_key.clone());
+            if self.gossip_key.as_ref() != Some(&hdr_key) {
+                self.gossip_key = Some(hdr_key);
                 self.recalc_fingerprint();
                 self.to_save = Some(ToSave::All)
             }
@@ -345,16 +367,7 @@ impl<'a> Peerstate<'a> {
         }
     }
 
-    pub fn take_key(mut self, min_verified: PeerstateVerifiedStatus) -> Option<SignedPublicKey> {
-        match min_verified {
-            PeerstateVerifiedStatus::BidirectVerified => self.verified_key.take(),
-            PeerstateVerifiedStatus::Unverified => {
-                self.public_key.take().or_else(|| self.gossip_key.take())
-            }
-        }
-    }
-
-    pub fn peek_key(&self, min_verified: PeerstateVerifiedStatus) -> Option<&SignedPublicKey> {
+    pub fn peek_key(&self, min_verified: PeerstateVerifiedStatus) -> Option<&Key> {
         match min_verified {
             PeerstateVerifiedStatus::BidirectVerified => self.verified_key.as_ref(),
             PeerstateVerifiedStatus::Unverified => self
@@ -367,7 +380,7 @@ impl<'a> Peerstate<'a> {
     pub fn set_verified(
         &mut self,
         which_key: PeerstateKeyType,
-        fingerprint: &Fingerprint,
+        fingerprint: &str,
         verified: PeerstateVerifiedStatus,
     ) -> bool {
         if verified == PeerstateVerifiedStatus::BidirectVerified {
@@ -425,10 +438,10 @@ impl<'a> Peerstate<'a> {
                     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.public_key_fingerprint,
+                    self.gossip_key_fingerprint,
                     self.verified_key.as_ref().map(|k| k.to_bytes()),
-                    self.verified_key_fingerprint.as_ref().map(|fp| fp.hex()),
+                    self.verified_key_fingerprint,
                     self.addr,
                 ],
             ).await?;
@@ -449,18 +462,15 @@ impl<'a> Peerstate<'a> {
         Ok(())
     }
 
-    pub fn has_verified_key(&self, fingerprints: &HashSet<Fingerprint>) -> bool {
-        if let Some(vkc) = &self.verified_key_fingerprint {
-            fingerprints.contains(vkc) && self.verified_key.is_some()
-        } else {
-            false
+    pub fn has_verified_key(&self, fingerprints: &HashSet<String>) -> bool {
+        if self.verified_key.is_some() && self.verified_key_fingerprint.is_some() {
+            let vkc = self.verified_key_fingerprint.as_ref().unwrap();
+            if fingerprints.contains(vkc) {
+                return true;
+            }
         }
-    }
-}
 
-impl From<crate::key::FingerprintError> for rusqlite::Error {
-    fn from(_source: crate::key::FingerprintError) -> Self {
-        Self::InvalidColumnType(0, "Invalid fingerprint".into(), rusqlite::types::Type::Text)
+        false
     }
 }
 
@@ -476,7 +486,7 @@ mod tests {
         let ctx = crate::test_utils::dummy_context().await;
         let addr = "hello@mail.com";
 
-        let pub_key = alice_keypair().public;
+        let pub_key = crate::key::Key::from(alice_keypair().public);
 
         let mut peerstate = Peerstate {
             context: &ctx.ctx,
@@ -518,7 +528,7 @@ mod tests {
     async fn test_peerstate_double_create() {
         let ctx = crate::test_utils::dummy_context().await;
         let addr = "hello@mail.com";
-        let pub_key = alice_keypair().public;
+        let pub_key = crate::key::Key::from(alice_keypair().public);
 
         let peerstate = Peerstate {
             context: &ctx.ctx,
@@ -552,7 +562,7 @@ mod tests {
         let ctx = crate::test_utils::dummy_context().await;
         let addr = "hello@mail.com";
 
-        let pub_key = alice_keypair().public;
+        let pub_key = crate::key::Key::from(alice_keypair().public);
 
         let mut peerstate = Peerstate {
             context: &ctx.ctx,

src/pgp.rs

@@ -1,6 +1,7 @@
 //! OpenPGP helper module using [rPGP facilities](https://github.com/rpgp/rpgp)
 
 use std::collections::{BTreeMap, HashSet};
+use std::convert::TryInto;
 use std::io;
 use std::io::Cursor;
 
@@ -18,8 +19,8 @@ use rand::{thread_rng, CryptoRng, Rng};
 use crate::constants::KeyGenType;
 use crate::dc_tools::EmailAddress;
 use crate::error::{bail, ensure, format_err, Result};
-use crate::key::{DcKey, Fingerprint};
-use crate::keyring::Keyring;
+use crate::key::*;
+use crate::keyring::*;
 
 pub const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";
 pub const HEADER_SETUPCODE: &str = "passphrase-begin";
@@ -237,129 +238,124 @@ fn select_pk_for_encryption(key: &SignedPublicKey) -> Option<SignedPublicKeyOrSu
 
 /// Encrypts `plain` text using `public_keys_for_encryption`
 /// and signs it using `private_key_for_signing`.
-pub async fn pk_encrypt(
+pub fn pk_encrypt(
     plain: &[u8],
-    public_keys_for_encryption: Keyring<SignedPublicKey>,
-    private_key_for_signing: Option<SignedSecretKey>,
+    public_keys_for_encryption: &Keyring,
+    private_key_for_signing: Option<&Key>,
 ) -> Result<String> {
     let lit_msg = Message::new_literal_bytes("", plain);
+    let pkeys: Vec<SignedPublicKeyOrSubkey> = public_keys_for_encryption
+        .keys()
+        .iter()
+        .filter_map(|key| {
+            key.as_ref()
+                .try_into()
+                .ok()
+                .and_then(select_pk_for_encryption)
+        })
+        .collect();
+    let pkeys_refs: Vec<&SignedPublicKeyOrSubkey> = pkeys.iter().collect();
 
-    async_std::task::spawn_blocking(move || {
-        let pkeys: Vec<SignedPublicKeyOrSubkey> = public_keys_for_encryption
-            .keys()
-            .iter()
-            .filter_map(|key| select_pk_for_encryption(key))
-            .collect();
-        let pkeys_refs: Vec<&SignedPublicKeyOrSubkey> = pkeys.iter().collect();
+    let mut rng = thread_rng();
 
-        let mut rng = thread_rng();
+    // TODO: measure time
+    let encrypted_msg = if let Some(private_key) = private_key_for_signing {
+        let skey: &SignedSecretKey = private_key
+            .try_into()
+            .map_err(|_| format_err!("Invalid private key"))?;
 
-        // TODO: measure time
-        let encrypted_msg = if let Some(ref skey) = private_key_for_signing {
-            lit_msg
-                .sign(skey, || "".into(), Default::default())
-                .and_then(|msg| msg.compress(CompressionAlgorithm::ZLIB))
-                .and_then(|msg| msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs))
-        } else {
-            lit_msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs)
-        };
+        lit_msg
+            .sign(skey, || "".into(), Default::default())
+            .and_then(|msg| msg.compress(CompressionAlgorithm::ZLIB))
+            .and_then(|msg| msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs))
+    } else {
+        lit_msg.encrypt_to_keys(&mut rng, Default::default(), &pkeys_refs)
+    };
 
-        let msg = encrypted_msg?;
-        let encoded_msg = msg.to_armored_string(None)?;
+    let msg = encrypted_msg?;
+    let encoded_msg = msg.to_armored_string(None)?;
 
-        Ok(encoded_msg)
-    })
-    .await
+    Ok(encoded_msg)
 }
 
 #[allow(clippy::implicit_hasher)]
-pub async fn pk_decrypt(
-    ctext: Vec<u8>,
-    private_keys_for_decryption: Keyring<SignedSecretKey>,
-    public_keys_for_validation: Keyring<SignedPublicKey>,
-    ret_signature_fingerprints: Option<&mut HashSet<Fingerprint>>,
+pub fn pk_decrypt(
+    ctext: &[u8],
+    private_keys_for_decryption: &Keyring,
+    public_keys_for_validation: &Keyring,
+    ret_signature_fingerprints: Option<&mut HashSet<String>>,
 ) -> Result<Vec<u8>> {
-    let msgs = async_std::task::spawn_blocking(move || {
-        let cursor = Cursor::new(ctext);
-        let (msg, _) = Message::from_armor_single(cursor)?;
-
-        let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption.keys().iter().collect();
-
-        let (decryptor, _) = msg.decrypt(|| "".into(), || "".into(), &skeys[..])?;
-        decryptor.collect::<pgp::errors::Result<Vec<_>>>()
-    })
-    .await?;
+    let (msg, _) = Message::from_armor_single(Cursor::new(ctext))?;
+    let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption
+        .keys()
+        .iter()
+        .filter_map(|key| {
+            let k: &Key = &key;
+            k.try_into().ok()
+        })
+        .collect();
 
+    let (decryptor, _) = msg.decrypt(|| "".into(), || "".into(), &skeys[..])?;
+    let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
     ensure!(!msgs.is_empty(), "No valid messages found");
 
-    let content = match msgs[0].get_content()? {
-        Some(content) => content,
-        None => bail!("Decrypted message is empty"),
-    };
+    let dec_msg = &msgs[0];
 
     if let Some(ret_signature_fingerprints) = ret_signature_fingerprints {
-        if !public_keys_for_validation.is_empty() {
-            let fingerprints = async_std::task::spawn_blocking(move || {
-                let dec_msg = &msgs[0];
+        if !public_keys_for_validation.keys().is_empty() {
+            let pkeys: Vec<&SignedPublicKey> = public_keys_for_validation
+                .keys()
+                .iter()
+                .filter_map(|key| {
+                    let k: &Key = &key;
+                    k.try_into().ok()
+                })
+                .collect();
 
-                let pkeys = public_keys_for_validation.keys();
-
-                let mut fingerprints: Vec<Fingerprint> = Vec::new();
-                for pkey in pkeys {
-                    if dec_msg.verify(&pkey.primary_key).is_ok() {
-                        let fp = DcKey::fingerprint(pkey);
-                        fingerprints.push(fp);
-                    }
+            for pkey in &pkeys {
+                if dec_msg.verify(&pkey.primary_key).is_ok() {
+                    let fp = hex::encode_upper(pkey.fingerprint());
+                    ret_signature_fingerprints.insert(fp);
                 }
-                fingerprints
-            })
-            .await;
-
-            ret_signature_fingerprints.extend(fingerprints);
+            }
         }
     }
 
-    Ok(content)
+    match dec_msg.get_content()? {
+        Some(content) => Ok(content),
+        None => bail!("Decrypted message is empty"),
+    }
 }
 
 /// Symmetric encryption.
-pub async fn symm_encrypt(passphrase: &str, plain: &[u8]) -> Result<String> {
+pub fn symm_encrypt(passphrase: &str, plain: &[u8]) -> Result<String> {
+    let mut rng = thread_rng();
     let lit_msg = Message::new_literal_bytes("", plain);
-    let passphrase = passphrase.to_string();
 
-    async_std::task::spawn_blocking(move || {
-        let mut rng = thread_rng();
-        let s2k = StringToKey::new_default(&mut rng);
-        let msg =
-            lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || passphrase)?;
+    let s2k = StringToKey::new_default(&mut rng);
+    let msg =
+        lit_msg.encrypt_with_password(&mut rng, s2k, Default::default(), || passphrase.into())?;
 
-        let encoded_msg = msg.to_armored_string(None)?;
+    let encoded_msg = msg.to_armored_string(None)?;
 
-        Ok(encoded_msg)
-    })
-    .await
+    Ok(encoded_msg)
 }
 
 /// Symmetric decryption.
-pub async fn symm_decrypt<T: std::io::Read + std::io::Seek>(
+pub fn symm_decrypt<T: std::io::Read + std::io::Seek>(
     passphrase: &str,
     ctext: T,
 ) -> Result<Vec<u8>> {
     let (enc_msg, _) = Message::from_armor_single(ctext)?;
+    let decryptor = enc_msg.decrypt_with_password(|| passphrase.into())?;
 
-    let passphrase = passphrase.to_string();
-    async_std::task::spawn_blocking(move || {
-        let decryptor = enc_msg.decrypt_with_password(|| passphrase)?;
+    let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
+    ensure!(!msgs.is_empty(), "No valid messages found");
 
-        let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
-        ensure!(!msgs.is_empty(), "No valid messages found");
-
-        match msgs[0].get_content()? {
-            Some(content) => Ok(content),
-            None => bail!("Decrypted message is empty"),
-        }
-    })
-    .await
+    match msgs[0].get_content()? {
+        Some(content) => Ok(content),
+        None => bail!("Decrypted message is empty"),
+    }
 }
 
 #[cfg(test)]
@@ -412,10 +408,10 @@ mod tests {
 
     /// [Key] objects to use in tests.
     struct TestKeys {
-        alice_secret: SignedSecretKey,
-        alice_public: SignedPublicKey,
-        bob_secret: SignedSecretKey,
-        bob_public: SignedPublicKey,
+        alice_secret: Key,
+        alice_public: Key,
+        bob_secret: Key,
+        bob_public: Key,
     }
 
     impl TestKeys {
@@ -423,10 +419,10 @@ mod tests {
             let alice = alice_keypair();
             let bob = bob_keypair();
             TestKeys {
-                alice_secret: alice.secret.clone(),
-                alice_public: alice.public.clone(),
-                bob_secret: bob.secret.clone(),
-                bob_public: bob.public.clone(),
+                alice_secret: Key::from(alice.secret.clone()),
+                alice_public: Key::from(alice.public.clone()),
+                bob_secret: Key::from(bob.secret.clone()),
+                bob_public: Key::from(bob.public.clone()),
             }
         }
     }
@@ -440,18 +436,18 @@ mod tests {
 
         /// A cyphertext encrypted to Alice & Bob, signed by Alice.
         static ref CTEXT_SIGNED: String = {
-            let mut keyring = Keyring::new();
-            keyring.add(KEYS.alice_public.clone());
-            keyring.add(KEYS.bob_public.clone());
-            smol::block_on(pk_encrypt(CLEARTEXT, keyring, Some(KEYS.alice_secret.clone()))).unwrap()
+            let mut keyring = Keyring::default();
+            keyring.add_owned(KEYS.alice_public.clone());
+            keyring.add_ref(&KEYS.bob_public);
+            pk_encrypt(CLEARTEXT, &keyring, Some(&KEYS.alice_secret)).unwrap()
         };
 
         /// A cyphertext encrypted to Alice & Bob, not signed.
         static ref CTEXT_UNSIGNED: String = {
-            let mut keyring = Keyring::new();
-            keyring.add(KEYS.alice_public.clone());
-            keyring.add(KEYS.bob_public.clone());
-            smol::block_on(pk_encrypt(CLEARTEXT, keyring, None)).unwrap()
+            let mut keyring = Keyring::default();
+            keyring.add_owned(KEYS.alice_public.clone());
+            keyring.add_ref(&KEYS.bob_public);
+            pk_encrypt(CLEARTEXT, &keyring, None).unwrap()
         };
     }
 
@@ -467,115 +463,110 @@ mod tests {
         assert!(CTEXT_UNSIGNED.starts_with("-----BEGIN PGP MESSAGE-----"));
     }
 
-    #[async_std::test]
-    async fn test_decrypt_singed() {
+    #[test]
+    fn test_decrypt_singed() {
         // Check decrypting as Alice
-        let mut decrypt_keyring: Keyring<SignedSecretKey> = Keyring::new();
-        decrypt_keyring.add(KEYS.alice_secret.clone());
-        let mut sig_check_keyring: Keyring<SignedPublicKey> = Keyring::new();
-        sig_check_keyring.add(KEYS.alice_public.clone());
-        let mut valid_signatures: HashSet<Fingerprint> = Default::default();
+        let mut decrypt_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.alice_secret);
+        let mut sig_check_keyring = Keyring::default();
+        sig_check_keyring.add_ref(&KEYS.alice_public);
+        let mut valid_signatures: HashSet<String> = Default::default();
         let plain = pk_decrypt(
-            CTEXT_SIGNED.as_bytes().to_vec(),
-            decrypt_keyring,
-            sig_check_keyring,
+            CTEXT_SIGNED.as_bytes(),
+            &decrypt_keyring,
+            &sig_check_keyring,
             Some(&mut valid_signatures),
         )
-        .await
         .map_err(|err| println!("{:?}", err))
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 1);
 
         // Check decrypting as Bob
-        let mut decrypt_keyring = Keyring::new();
-        decrypt_keyring.add(KEYS.bob_secret.clone());
-        let mut sig_check_keyring = Keyring::new();
-        sig_check_keyring.add(KEYS.alice_public.clone());
-        let mut valid_signatures: HashSet<Fingerprint> = Default::default();
+        let mut decrypt_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.bob_secret);
+        let mut sig_check_keyring = Keyring::default();
+        sig_check_keyring.add_ref(&KEYS.alice_public);
+        let mut valid_signatures: HashSet<String> = Default::default();
         let plain = pk_decrypt(
-            CTEXT_SIGNED.as_bytes().to_vec(),
-            decrypt_keyring,
-            sig_check_keyring,
+            CTEXT_SIGNED.as_bytes(),
+            &decrypt_keyring,
+            &sig_check_keyring,
             Some(&mut valid_signatures),
         )
-        .await
         .map_err(|err| println!("{:?}", err))
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 1);
     }
 
-    #[async_std::test]
-    async fn test_decrypt_no_sig_check() {
-        let mut keyring = Keyring::new();
-        keyring.add(KEYS.alice_secret.clone());
-        let empty_keyring = Keyring::new();
-        let mut valid_signatures: HashSet<Fingerprint> = Default::default();
+    #[test]
+    fn test_decrypt_no_sig_check() {
+        let mut keyring = Keyring::default();
+        keyring.add_ref(&KEYS.alice_secret);
+        let empty_keyring = Keyring::default();
+        let mut valid_signatures: HashSet<String> = Default::default();
         let plain = pk_decrypt(
-            CTEXT_SIGNED.as_bytes().to_vec(),
-            keyring,
-            empty_keyring,
+            CTEXT_SIGNED.as_bytes(),
+            &keyring,
+            &empty_keyring,
             Some(&mut valid_signatures),
         )
-        .await
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 0);
     }
 
-    #[async_std::test]
-    async fn test_decrypt_signed_no_key() {
+    #[test]
+    fn test_decrypt_signed_no_key() {
         // The validation does not have the public key of the signer.
-        let mut decrypt_keyring = Keyring::new();
-        decrypt_keyring.add(KEYS.bob_secret.clone());
-        let mut sig_check_keyring = Keyring::new();
-        sig_check_keyring.add(KEYS.bob_public.clone());
-        let mut valid_signatures: HashSet<Fingerprint> = Default::default();
+        let mut decrypt_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.bob_secret);
+        let mut sig_check_keyring = Keyring::default();
+        sig_check_keyring.add_ref(&KEYS.bob_public);
+        let mut valid_signatures: HashSet<String> = Default::default();
         let plain = pk_decrypt(
-            CTEXT_SIGNED.as_bytes().to_vec(),
-            decrypt_keyring,
-            sig_check_keyring,
+            CTEXT_SIGNED.as_bytes(),
+            &decrypt_keyring,
+            &sig_check_keyring,
             Some(&mut valid_signatures),
         )
-        .await
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 0);
     }
 
-    #[async_std::test]
-    async fn test_decrypt_unsigned() {
-        let mut decrypt_keyring = Keyring::new();
-        decrypt_keyring.add(KEYS.bob_secret.clone());
-        let sig_check_keyring = Keyring::new();
-        let mut valid_signatures: HashSet<Fingerprint> = Default::default();
+    #[test]
+    fn test_decrypt_unsigned() {
+        let mut decrypt_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.bob_secret);
+        let sig_check_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.alice_public);
+        let mut valid_signatures: HashSet<String> = Default::default();
         let plain = pk_decrypt(
-            CTEXT_UNSIGNED.as_bytes().to_vec(),
-            decrypt_keyring,
-            sig_check_keyring,
+            CTEXT_UNSIGNED.as_bytes(),
+            &decrypt_keyring,
+            &sig_check_keyring,
             Some(&mut valid_signatures),
         )
-        .await
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
         assert_eq!(valid_signatures.len(), 0);
     }
 
-    #[async_std::test]
-    async fn test_decrypt_signed_no_sigret() {
+    #[test]
+    fn test_decrypt_signed_no_sigret() {
         // Check decrypting signed cyphertext without providing the HashSet for signatures.
-        let mut decrypt_keyring = Keyring::new();
-        decrypt_keyring.add(KEYS.bob_secret.clone());
-        let mut sig_check_keyring = Keyring::new();
-        sig_check_keyring.add(KEYS.alice_public.clone());
+        let mut decrypt_keyring = Keyring::default();
+        decrypt_keyring.add_ref(&KEYS.bob_secret);
+        let mut sig_check_keyring = Keyring::default();
+        sig_check_keyring.add_ref(&KEYS.alice_public);
         let plain = pk_decrypt(
-            CTEXT_SIGNED.as_bytes().to_vec(),
-            decrypt_keyring,
-            sig_check_keyring,
+            CTEXT_SIGNED.as_bytes(),
+            &decrypt_keyring,
+            &sig_check_keyring,
             None,
         )
-        .await
         .unwrap();
         assert_eq!(plain, CLEARTEXT);
     }

src/provider/data.rs

@@ -19,7 +19,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "newyear.aktivix.org", port: 25, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // aol.md: aol.com
@@ -31,7 +30,6 @@ lazy_static::lazy_static! {
         server: vec![
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // autistici.org.md: autistici.org
@@ -45,7 +43,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: SSL, hostname: "smtp.autistici.org", port: 465, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // bluewin.ch.md: bluewin.ch
@@ -59,21 +56,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: SSL, hostname: "smtpauths.bluewin.ch", port: 465, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
-    };
-
-    // chello.at.md: chello.at
-    static ref P_CHELLO_AT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/chello-at",
-        server: vec![
-            Server { protocol: IMAP, socket: SSL, hostname: "mail.mymagenta.at", port: 993, username_pattern: EMAIL },
-            Server { protocol: SMTP, socket: SSL, hostname: "mail.mymagenta.at", port: 465, username_pattern: EMAIL },
-        ],
-        config_defaults: None,
-        strict_tls: false,
     };
 
     // comcast.md: xfinity.com, comcast.net
@@ -83,16 +65,7 @@ lazy_static::lazy_static! {
     // - skipping provider with status OK and no special things to do
 
     // disroot.md: disroot.org
-    static ref P_DISROOT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/disroot",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do
 
     // example.com.md: example.com, example.org
     static ref P_EXAMPLE_COM: Provider = Provider {
@@ -105,7 +78,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.example.com", port: 1337, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // fastmail.md: fastmail.com
@@ -117,19 +89,6 @@ lazy_static::lazy_static! {
         server: vec![
         ],
         config_defaults: None,
-        strict_tls: false,
-    };
-
-    // five.chat.md: five.chat
-    static ref P_FIVE_CHAT: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/five-chat",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
     };
 
     // freenet.de.md: freenet.de
@@ -143,7 +102,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "mx.freenet.de", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // gmail.md: gmail.com, googlemail.com
@@ -157,7 +115,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: SSL, hostname: "smtp.gmail.com", port: 465, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: true,
     };
 
     // gmx.net.md: gmx.net, gmx.de, gmx.at, gmx.ch, gmx.org, gmx.eu, gmx.info, gmx.biz, gmx.com
@@ -172,7 +129,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "mail.gmx.net", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // i.ua.md: i.ua
@@ -189,7 +145,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.mail.me.com", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // kolst.com.md: kolst.com
@@ -202,16 +157,7 @@ lazy_static::lazy_static! {
     // - skipping provider with status OK and no special things to do
 
     // mailbox.org.md: mailbox.org, secure.mailbox.org
-    static ref P_MAILBOX_ORG: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/mailbox-org",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do
 
     // nauta.cu.md: nauta.cu
     static ref P_NAUTA_CU: Provider = Provider {
@@ -232,7 +178,6 @@ lazy_static::lazy_static! {
             ConfigDefault { key: Config::E2eeEnabled, value: "0" },
             ConfigDefault { key: Config::MediaQuality, value: "1" },
         ]),
-        strict_tls: false,
     };
 
     // outlook.com.md: hotmail.com, outlook.com, office365.com, outlook.com.tr, live.com
@@ -246,10 +191,9 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp-mail.outlook.com", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
-    // posteo.md: posteo.de, posteo.af, posteo.at, posteo.be, posteo.ch, posteo.cl, posteo.co, posteo.co.uk, posteo.com.br, posteo.cr, posteo.cz, posteo.dk, posteo.ee, posteo.es, posteo.eu, posteo.fi, posteo.gl, posteo.gr, posteo.hn, posteo.hr, posteo.hu, posteo.ie, posteo.in, posteo.is, posteo.jp, posteo.la, posteo.li, posteo.lt, posteo.lu, posteo.me, posteo.mx, posteo.my, posteo.net, posteo.nl, posteo.no, posteo.nz, posteo.org, posteo.pe, posteo.pl, posteo.pm, posteo.pt, posteo.ro, posteo.ru, posteo.se, posteo.sg, posteo.si, posteo.tn, posteo.uk, posteo.us
+    // posteo.md: posteo.de
     static ref P_POSTEO: Provider = Provider {
         status: Status::OK,
         before_login_hint: "",
@@ -260,7 +204,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "posteo.de", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: true,
     };
 
     // protonmail.md: protonmail.com, protonmail.ch
@@ -272,35 +215,16 @@ lazy_static::lazy_static! {
         server: vec![
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // riseup.net.md: riseup.net
-    static ref P_RISEUP_NET: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/riseup-net",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do
 
     // rogers.com.md: rogers.com
     // - skipping provider with status OK and no special things to do
 
     // systemli.org.md: systemli.org
-    static ref P_SYSTEMLI_ORG: Provider = Provider {
-        status: Status::OK,
-        before_login_hint: "",
-        after_login_hint: "",
-        overview_page: "https://providers.delta.chat/systemli-org",
-        server: vec![
-        ],
-        config_defaults: None,
-        strict_tls: true,
-    };
+    // - skipping provider with status OK and no special things to do
 
     // t-online.md: t-online.de, magenta.de
     static ref P_T_ONLINE: Provider = Provider {
@@ -311,7 +235,6 @@ lazy_static::lazy_static! {
         server: vec![
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // testrun.md: testrun.org
@@ -326,7 +249,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "testrun.org", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: true,
     };
 
     // tiscali.it.md: tiscali.it
@@ -340,7 +262,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: SSL, hostname: "smtp.tiscali.it", port: 465, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // ukr.net.md: ukr.net
@@ -361,13 +282,12 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.web.de", port: 587, username_pattern: EMAILLOCALPART },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // yahoo.md: yahoo.com, yahoo.de, yahoo.it, yahoo.fr, yahoo.es, yahoo.se, yahoo.co.uk, yahoo.co.nz, yahoo.com.au, yahoo.com.ar, yahoo.com.br, yahoo.com.mx, ymail.com, rocketmail.com, yahoodns.net
     static ref P_YAHOO: Provider = Provider {
         status: Status::PREPARATION,
-        before_login_hint: "To use Delta Chat with your Yahoo email address you have to create an \"App-Password\" in the account security screen.",
+        before_login_hint: "To use Delta Chat with your Yahoo email address you have to allow \"less secure apps\" in the Yahoo webinterface.",
         after_login_hint: "",
         overview_page: "https://providers.delta.chat/yahoo",
         server: vec![
@@ -375,7 +295,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: SSL, hostname: "smtp.mail.yahoo.com", port: 465, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     // yandex.ru.md: yandex.ru, yandex.com
@@ -387,7 +306,6 @@ lazy_static::lazy_static! {
         server: vec![
         ],
         config_defaults: None,
-        strict_tls: true,
     };
 
     // ziggo.nl.md: ziggo.nl
@@ -401,7 +319,6 @@ lazy_static::lazy_static! {
             Server { protocol: SMTP, socket: STARTTLS, hostname: "smtp.ziggo.nl", port: 587, username_pattern: EMAIL },
         ],
         config_defaults: None,
-        strict_tls: false,
     };
 
     pub static ref PROVIDER_DATA: HashMap<&'static str, &'static Provider> = [
@@ -409,12 +326,9 @@ lazy_static::lazy_static! {
         ("aol.com", &*P_AOL),
         ("autistici.org", &*P_AUTISTICI_ORG),
         ("bluewin.ch", &*P_BLUEWIN_CH),
-        ("chello.at", &*P_CHELLO_AT),
-        ("disroot.org", &*P_DISROOT),
         ("example.com", &*P_EXAMPLE_COM),
         ("example.org", &*P_EXAMPLE_COM),
         ("fastmail.com", &*P_FASTMAIL),
-        ("five.chat", &*P_FIVE_CHAT),
         ("freenet.de", &*P_FREENET_DE),
         ("gmail.com", &*P_GMAIL),
         ("googlemail.com", &*P_GMAIL),
@@ -430,8 +344,6 @@ lazy_static::lazy_static! {
         ("icloud.com", &*P_ICLOUD),
         ("me.com", &*P_ICLOUD),
         ("mac.com", &*P_ICLOUD),
-        ("mailbox.org", &*P_MAILBOX_ORG),
-        ("secure.mailbox.org", &*P_MAILBOX_ORG),
         ("nauta.cu", &*P_NAUTA_CU),
         ("hotmail.com", &*P_OUTLOOK_COM),
         ("outlook.com", &*P_OUTLOOK_COM),
@@ -439,58 +351,8 @@ lazy_static::lazy_static! {
         ("outlook.com.tr", &*P_OUTLOOK_COM),
         ("live.com", &*P_OUTLOOK_COM),
         ("posteo.de", &*P_POSTEO),
-        ("posteo.af", &*P_POSTEO),
-        ("posteo.at", &*P_POSTEO),
-        ("posteo.be", &*P_POSTEO),
-        ("posteo.ch", &*P_POSTEO),
-        ("posteo.cl", &*P_POSTEO),
-        ("posteo.co", &*P_POSTEO),
-        ("posteo.co.uk", &*P_POSTEO),
-        ("posteo.com.br", &*P_POSTEO),
-        ("posteo.cr", &*P_POSTEO),
-        ("posteo.cz", &*P_POSTEO),
-        ("posteo.dk", &*P_POSTEO),
-        ("posteo.ee", &*P_POSTEO),
-        ("posteo.es", &*P_POSTEO),
-        ("posteo.eu", &*P_POSTEO),
-        ("posteo.fi", &*P_POSTEO),
-        ("posteo.gl", &*P_POSTEO),
-        ("posteo.gr", &*P_POSTEO),
-        ("posteo.hn", &*P_POSTEO),
-        ("posteo.hr", &*P_POSTEO),
-        ("posteo.hu", &*P_POSTEO),
-        ("posteo.ie", &*P_POSTEO),
-        ("posteo.in", &*P_POSTEO),
-        ("posteo.is", &*P_POSTEO),
-        ("posteo.jp", &*P_POSTEO),
-        ("posteo.la", &*P_POSTEO),
-        ("posteo.li", &*P_POSTEO),
-        ("posteo.lt", &*P_POSTEO),
-        ("posteo.lu", &*P_POSTEO),
-        ("posteo.me", &*P_POSTEO),
-        ("posteo.mx", &*P_POSTEO),
-        ("posteo.my", &*P_POSTEO),
-        ("posteo.net", &*P_POSTEO),
-        ("posteo.nl", &*P_POSTEO),
-        ("posteo.no", &*P_POSTEO),
-        ("posteo.nz", &*P_POSTEO),
-        ("posteo.org", &*P_POSTEO),
-        ("posteo.pe", &*P_POSTEO),
-        ("posteo.pl", &*P_POSTEO),
-        ("posteo.pm", &*P_POSTEO),
-        ("posteo.pt", &*P_POSTEO),
-        ("posteo.ro", &*P_POSTEO),
-        ("posteo.ru", &*P_POSTEO),
-        ("posteo.se", &*P_POSTEO),
-        ("posteo.sg", &*P_POSTEO),
-        ("posteo.si", &*P_POSTEO),
-        ("posteo.tn", &*P_POSTEO),
-        ("posteo.uk", &*P_POSTEO),
-        ("posteo.us", &*P_POSTEO),
         ("protonmail.com", &*P_PROTONMAIL),
         ("protonmail.ch", &*P_PROTONMAIL),
-        ("riseup.net", &*P_RISEUP_NET),
-        ("systemli.org", &*P_SYSTEMLI_ORG),
         ("t-online.de", &*P_T_ONLINE),
         ("magenta.de", &*P_T_ONLINE),
         ("testrun.org", &*P_TESTRUN),

src/provider/mod.rs

@@ -72,7 +72,6 @@ pub struct Provider {
     pub overview_page: &'static str,
     pub server: Vec<Server>,
     pub config_defaults: Option<Vec<ConfigDefault>>,
-    pub strict_tls: bool,
 }
 
 impl Provider {

src/provider/update.py

@@ -100,9 +100,6 @@ def process_data(data, file):
 
     config_defaults = process_config_defaults(data)
 
-    strict_tls = data.get("strict_tls", False)
-    strict_tls = "true" if strict_tls else "false"
-
     provider = ""
     before_login_hint = cleanstr(data.get("before_login_hint", ""))
     after_login_hint = cleanstr(data.get("after_login_hint", ""))
@@ -114,7 +111,6 @@ def process_data(data, file):
         provider += "        overview_page: \"" + file2url(file) + "\",\n"
         provider += "        server: vec![\n" + server + "        ],\n"
         provider += "        config_defaults: " + config_defaults + ",\n"
-        provider += "        strict_tls: " + strict_tls + ",\n"
         provider += "    };\n\n"
     else:
         raise TypeError("SMTP and IMAP must be specified together or left out both")
@@ -125,7 +121,7 @@ def process_data(data, file):
     # finally, add the provider
     global out_all, out_domains
     out_all += "    // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
-    if status == "OK" and before_login_hint == "" and after_login_hint == "" and server == "" and config_defaults == "None" and strict_tls == "false":
+    if status == "OK" and before_login_hint == "" and after_login_hint == "" and server == "" and config_defaults == "None":
         out_all += "    // - skipping provider with status OK and no special things to do\n\n"
     else:
         out_all += provider

src/qr.rs

@@ -10,7 +10,8 @@ use crate::constants::Blocked;
 use crate::contact::*;
 use crate::context::Context;
 use crate::error::{bail, ensure, format_err, Error};
-use crate::key::Fingerprint;
+use crate::key::dc_format_fingerprint;
+use crate::key::dc_normalize_fingerprint;
 use crate::lot::{Lot, LotState};
 use crate::param::*;
 use crate::peerstate::*;
@@ -79,14 +80,6 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
         Some(pair) => pair,
         None => (payload, ""),
     };
-    let fingerprint: Fingerprint = match fingerprint.parse() {
-        Ok(fp) => fp,
-        Err(err) => {
-            return Error::new(err)
-                .context("Failed to parse fingerprint in QR code")
-                .into()
-        }
-    };
 
     // replace & with \n to match expected param format
     let fragment = fragment.replace('&', "\n");
@@ -135,6 +128,13 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
         None
     };
 
+    let fingerprint = dc_normalize_fingerprint(fingerprint);
+
+    // ensure valid fingerprint
+    if fingerprint.len() != 40 {
+        return format_err!("Bad fingerprint length in QR code").into();
+    }
+
     let mut lot = Lot::new();
 
     // retrieve known state for this fingerprint
@@ -161,7 +161,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Lot {
             chat::add_info_msg(context, id, format!("{} verified.", peerstate.addr)).await;
         } else {
             lot.state = LotState::QrFprWithoutAddr;
-            lot.text1 = Some(fingerprint.to_string());
+            lot.text1 = Some(dc_format_fingerprint(&fingerprint));
         }
     } else if let Some(addr) = addr {
         if grpid.is_some() && grpname.is_some() {

src/scheduler.rs

@@ -2,10 +2,12 @@ use async_std::prelude::*;
 use async_std::sync::{channel, Receiver, Sender};
 use async_std::task;
 
+use std::time::Duration;
+
 use crate::context::Context;
 use crate::imap::Imap;
 use crate::job::{self, Thread};
-use crate::{config::Config, message::MsgId, smtp::Smtp};
+use crate::smtp::Smtp;
 
 pub(crate) struct StopToken;
 
@@ -23,29 +25,30 @@ pub(crate) enum Scheduler {
         sentbox_handle: Option<task::JoinHandle<()>>,
         smtp: SmtpConnectionState,
         smtp_handle: Option<task::JoinHandle<()>>,
+        probe_network: bool,
     },
 }
 
 impl Context {
     /// Indicate that the network likely has come back.
     pub async fn maybe_network(&self) {
-        self.scheduler.read().await.maybe_network().await;
+        self.scheduler.write().await.maybe_network().await;
     }
 
-    pub(crate) async fn interrupt_inbox(&self, info: InterruptInfo) {
-        self.scheduler.read().await.interrupt_inbox(info).await;
+    pub(crate) async fn interrupt_inbox(&self) {
+        self.scheduler.read().await.interrupt_inbox().await;
     }
 
-    pub(crate) async fn interrupt_sentbox(&self, info: InterruptInfo) {
-        self.scheduler.read().await.interrupt_sentbox(info).await;
+    pub(crate) async fn interrupt_sentbox(&self) {
+        self.scheduler.read().await.interrupt_sentbox().await;
     }
 
-    pub(crate) async fn interrupt_mvbox(&self, info: InterruptInfo) {
-        self.scheduler.read().await.interrupt_mvbox(info).await;
+    pub(crate) async fn interrupt_mvbox(&self) {
+        self.scheduler.read().await.interrupt_mvbox().await;
     }
 
-    pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
-        self.scheduler.read().await.interrupt_smtp(info).await;
+    pub(crate) async fn interrupt_smtp(&self) {
+        self.scheduler.read().await.interrupt_smtp().await;
     }
 }
 
@@ -63,26 +66,33 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
     let fut = async move {
         started.send(()).await;
         let ctx = ctx1;
+        if let Err(err) = connection.connect_configured(&ctx).await {
+            error!(ctx, "{}", err);
+            return;
+        }
 
         // track number of continously executed jobs
         let mut jobs_loaded = 0;
-        let mut info = InterruptInfo::default();
         loop {
-            match job::load_next(&ctx, Thread::Imap, &info).await {
-                Some(job) if jobs_loaded <= 20 => {
+            let probe_network = ctx.scheduler.read().await.get_probe_network();
+            match job::load_next(&ctx, Thread::Imap, probe_network)
+                .timeout(Duration::from_millis(200))
+                .await
+            {
+                Ok(Some(job)) if jobs_loaded <= 20 => {
                     jobs_loaded += 1;
                     job::perform_job(&ctx, job::Connection::Inbox(&mut connection), job).await;
-                    info = Default::default();
+                    ctx.scheduler.write().await.set_probe_network(false);
                 }
-                Some(job) => {
+                Ok(Some(job)) => {
                     // Let the fetch run, but return back to the job afterwards.
                     info!(ctx, "postponing imap-job {} to run fetch...", job);
                     jobs_loaded = 0;
                     fetch(&ctx, &mut connection).await;
                 }
-                None => {
+                Ok(None) | Err(async_std::future::TimeoutError { .. }) => {
                     jobs_loaded = 0;
-                    info = fetch_idle(&ctx, &mut connection, Config::ConfiguredInboxFolder).await;
+                    fetch_idle(&ctx, &mut connection).await;
                 }
             }
         }
@@ -99,18 +109,15 @@ 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 {
+    match get_watch_folder(&ctx, "configured_inbox_folder").await {
         Some(watch_folder) => {
-            if let Err(err) = connection.connect_configured(&ctx).await {
-                error!(ctx, "{}", err);
-                return;
-            }
-
             // fetch
-            if let Err(err) = connection.fetch(&ctx, &watch_folder).await {
-                connection.trigger_reconnect();
-                warn!(ctx, "{}", err);
-            }
+            connection
+                .fetch(&ctx, &watch_folder)
+                .await
+                .unwrap_or_else(|err| {
+                    error!(ctx, "{}", err);
+                });
         }
         None => {
             warn!(ctx, "Can not fetch inbox folder, not set");
@@ -119,20 +126,16 @@ async fn fetch(ctx: &Context, connection: &mut Imap) {
     }
 }
 
-async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> InterruptInfo {
-    match ctx.get_config(folder).await {
+async fn fetch_idle(ctx: &Context, connection: &mut Imap) {
+    match get_watch_folder(&ctx, "configured_inbox_folder").await {
         Some(watch_folder) => {
-            // connect and fake idle if unable to connect
-            if let Err(err) = connection.connect_configured(&ctx).await {
-                error!(ctx, "imap connection failed: {}", err);
-                return connection.fake_idle(&ctx, None).await;
-            }
-
             // fetch
-            if let Err(err) = connection.fetch(&ctx, &watch_folder).await {
-                connection.trigger_reconnect();
-                warn!(ctx, "{}", err);
-            }
+            connection
+                .fetch(&ctx, &watch_folder)
+                .await
+                .unwrap_or_else(|err| {
+                    error!(ctx, "{}", err);
+                });
 
             // idle
             if connection.can_idle() {
@@ -140,17 +143,15 @@ async fn fetch_idle(ctx: &Context, connection: &mut Imap, folder: Config) -> Int
                     .idle(&ctx, Some(watch_folder))
                     .await
                     .unwrap_or_else(|err| {
-                        connection.trigger_reconnect();
-                        warn!(ctx, "{}", err);
-                        InterruptInfo::new(false, None)
-                    })
+                        error!(ctx, "{}", err);
+                    });
             } else {
-                connection.fake_idle(&ctx, Some(watch_folder)).await
+                connection.fake_idle(&ctx, Some(watch_folder)).await;
             }
         }
         None => {
-            warn!(ctx, "Can not watch {} folder, not set", folder);
-            connection.fake_idle(&ctx, None).await
+            warn!(ctx, "Can not watch inbox folder, not set");
+            connection.fake_idle(&ctx, None).await;
         }
     }
 }
@@ -159,7 +160,7 @@ async fn simple_imap_loop(
     ctx: Context,
     started: Sender<()>,
     inbox_handlers: ImapConnectionHandlers,
-    folder: Config,
+    folder: impl AsRef<str>,
 ) {
     use futures::future::FutureExt;
 
@@ -175,9 +176,43 @@ async fn simple_imap_loop(
     let fut = async move {
         started.send(()).await;
         let ctx = ctx1;
+        if let Err(err) = connection.connect_configured(&ctx).await {
+            error!(ctx, "{}", err);
+            return;
+        }
 
         loop {
-            fetch_idle(&ctx, &mut connection, folder).await;
+            match get_watch_folder(&ctx, folder.as_ref()).await {
+                Some(watch_folder) => {
+                    // fetch
+                    connection
+                        .fetch(&ctx, &watch_folder)
+                        .await
+                        .unwrap_or_else(|err| {
+                            error!(ctx, "{}", err);
+                        });
+
+                    // idle
+                    if connection.can_idle() {
+                        connection
+                            .idle(&ctx, Some(watch_folder))
+                            .await
+                            .unwrap_or_else(|err| {
+                                error!(ctx, "{}", err);
+                            });
+                    } else {
+                        connection.fake_idle(&ctx, Some(watch_folder)).await;
+                    }
+                }
+                None => {
+                    warn!(
+                        &ctx,
+                        "No watch folder found for {}, skipping",
+                        folder.as_ref()
+                    );
+                    connection.fake_idle(&ctx, None).await
+                }
+            }
         }
     };
 
@@ -206,20 +241,25 @@ async fn smtp_loop(ctx: Context, started: Sender<()>, smtp_handlers: SmtpConnect
     let fut = async move {
         started.send(()).await;
         let ctx = ctx1;
-
-        let mut interrupt_info = Default::default();
         loop {
-            match job::load_next(&ctx, Thread::Smtp, &interrupt_info).await {
-                Some(job) => {
+            let probe_network = ctx.scheduler.read().await.get_probe_network();
+            match job::load_next(&ctx, Thread::Smtp, probe_network)
+                .timeout(Duration::from_millis(200))
+                .await
+            {
+                Ok(Some(job)) => {
                     info!(ctx, "executing smtp job");
                     job::perform_job(&ctx, job::Connection::Smtp(&mut connection), job).await;
-                    interrupt_info = Default::default();
+                    ctx.scheduler.write().await.set_probe_network(false);
                 }
-                None => {
+                Ok(None) | Err(async_std::future::TimeoutError { .. }) => {
+                    info!(ctx, "smtp fake idle");
                     // Fake Idle
-                    info!(ctx, "smtp fake idle - started");
-                    interrupt_info = idle_interrupt_receiver.recv().await.unwrap_or_default();
-                    info!(ctx, "smtp fake idle - interrupted")
+                    idle_interrupt_receiver
+                        .recv()
+                        .timeout(Duration::from_secs(5))
+                        .await
+                        .ok();
                 }
             }
         }
@@ -248,6 +288,7 @@ impl Scheduler {
             mvbox,
             sentbox,
             smtp,
+            probe_network: false,
             inbox_handle: None,
             mvbox_handle: None,
             sentbox_handle: None,
@@ -270,7 +311,7 @@ impl Scheduler {
                     ctx1,
                     mvbox_start_send,
                     mvbox_handlers,
-                    Config::ConfiguredMvboxFolder,
+                    "configured_mvbox_folder",
                 )
                 .await
             }));
@@ -284,7 +325,7 @@ impl Scheduler {
                     ctx1,
                     sentbox_start_send,
                     sentbox_handlers,
-                    Config::ConfiguredSentboxFolder,
+                    "configured_sentbox_folder",
                 )
                 .await
             }));
@@ -312,39 +353,58 @@ impl Scheduler {
         info!(ctx, "scheduler is running");
     }
 
-    async fn maybe_network(&self) {
+    fn set_probe_network(&mut self, val: bool) {
+        match self {
+            Scheduler::Running {
+                ref mut probe_network,
+                ..
+            } => {
+                *probe_network = val;
+            }
+            _ => panic!("set_probe_network can only be called when running"),
+        }
+    }
+
+    fn get_probe_network(&self) -> bool {
+        match self {
+            Scheduler::Running { probe_network, .. } => *probe_network,
+            _ => panic!("get_probe_network can only be called when running"),
+        }
+    }
+
+    async fn maybe_network(&mut self) {
         if !self.is_running() {
             return;
         }
-
-        self.interrupt_inbox(InterruptInfo::new(true, None))
-            .join(self.interrupt_mvbox(InterruptInfo::new(true, None)))
-            .join(self.interrupt_sentbox(InterruptInfo::new(true, None)))
-            .join(self.interrupt_smtp(InterruptInfo::new(true, None)))
+        self.set_probe_network(true);
+        self.interrupt_inbox()
+            .join(self.interrupt_mvbox())
+            .join(self.interrupt_sentbox())
+            .join(self.interrupt_smtp())
             .await;
     }
 
-    async fn interrupt_inbox(&self, info: InterruptInfo) {
+    async fn interrupt_inbox(&self) {
         if let Scheduler::Running { ref inbox, .. } = self {
-            inbox.interrupt(info).await;
+            inbox.interrupt().await;
         }
     }
 
-    async fn interrupt_mvbox(&self, info: InterruptInfo) {
+    async fn interrupt_mvbox(&self) {
         if let Scheduler::Running { ref mvbox, .. } = self {
-            mvbox.interrupt(info).await;
+            mvbox.interrupt().await;
         }
     }
 
-    async fn interrupt_sentbox(&self, info: InterruptInfo) {
+    async fn interrupt_sentbox(&self) {
         if let Scheduler::Running { ref sentbox, .. } = self {
-            sentbox.interrupt(info).await;
+            sentbox.interrupt().await;
         }
     }
 
-    async fn interrupt_smtp(&self, info: InterruptInfo) {
+    async fn interrupt_smtp(&self) {
         if let Scheduler::Running { ref smtp, .. } = self {
-            smtp.interrupt(info).await;
+            smtp.interrupt().await;
         }
     }
 
@@ -413,7 +473,7 @@ struct ConnectionState {
     /// Channel to interrupt the whole connection.
     stop_sender: Sender<()>,
     /// Channel to interrupt idle.
-    idle_interrupt_sender: Sender<InterruptInfo>,
+    idle_interrupt_sender: Sender<()>,
 }
 
 impl ConnectionState {
@@ -425,9 +485,11 @@ impl ConnectionState {
         self.shutdown_receiver.recv().await.ok();
     }
 
-    async fn interrupt(&self, info: InterruptInfo) {
-        // Use try_send to avoid blocking on interrupts.
-        self.idle_interrupt_sender.try_send(info).ok();
+    async fn interrupt(&self) {
+        if !self.idle_interrupt_sender.is_full() {
+            // Use try_send to avoid blocking on interrupts.
+            self.idle_interrupt_sender.send(()).await;
+        }
     }
 }
 
@@ -461,8 +523,8 @@ impl SmtpConnectionState {
     }
 
     /// Interrupt any form of idle.
-    async fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info).await;
+    async fn interrupt(&self) {
+        self.state.interrupt().await;
     }
 
     /// Shutdown this connection completely.
@@ -471,11 +533,12 @@ impl SmtpConnectionState {
     }
 }
 
+#[derive(Debug)]
 struct SmtpConnectionHandlers {
     connection: Smtp,
     stop_receiver: Receiver<()>,
     shutdown_sender: Sender<()>,
-    idle_interrupt_receiver: Receiver<InterruptInfo>,
+    idle_interrupt_receiver: Receiver<()>,
 }
 
 #[derive(Debug)]
@@ -487,8 +550,8 @@ impl ImapConnectionState {
     /// Construct a new connection.
     fn new() -> (Self, ImapConnectionHandlers) {
         let (stop_sender, stop_receiver) = channel(1);
-        let (shutdown_sender, shutdown_receiver) = channel(1);
         let (idle_interrupt_sender, idle_interrupt_receiver) = channel(1);
+        let (shutdown_sender, shutdown_receiver) = channel(1);
 
         let handlers = ImapConnectionHandlers {
             connection: Imap::new(idle_interrupt_receiver),
@@ -508,8 +571,8 @@ impl ImapConnectionState {
     }
 
     /// Interrupt any form of idle.
-    async fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info).await;
+    async fn interrupt(&self) {
+        self.state.interrupt().await;
     }
 
     /// Shutdown this connection completely.
@@ -525,17 +588,20 @@ struct ImapConnectionHandlers {
     shutdown_sender: Sender<()>,
 }
 
-#[derive(Default, Debug)]
-pub struct InterruptInfo {
-    pub probe_network: bool,
-    pub msg_id: Option<MsgId>,
-}
-
-impl InterruptInfo {
-    pub fn new(probe_network: bool, msg_id: Option<MsgId>) -> Self {
-        Self {
-            probe_network,
-            msg_id,
+async fn get_watch_folder(context: &Context, config_name: impl AsRef<str>) -> Option<String> {
+    match context
+        .sql
+        .get_raw_config(context, config_name.as_ref())
+        .await
+    {
+        Some(name) => Some(name),
+        None => {
+            if config_name.as_ref() == "configured_inbox_folder" {
+                // initialized with old version, so has not set configured_inbox_folder
+                Some("INBOX".to_string())
+            } else {
+                None
+            }
         }
     }
 }

src/securejoin.rs

@@ -14,7 +14,7 @@ use crate::e2ee::*;
 use crate::error::{bail, Error};
 use crate::events::Event;
 use crate::headerdef::HeaderDef;
-use crate::key::{DcKey, Fingerprint, SignedPublicKey};
+use crate::key::{dc_normalize_fingerprint, DcKey, Key, SignedPublicKey};
 use crate::lot::LotState;
 use crate::message::Message;
 use crate::mimeparser::*;
@@ -73,6 +73,8 @@ pub async fn dc_get_securejoin_qr(context: &Context, group_chat_id: ChatId) -> O
     ====   Step 1 in "Setup verified contact" protocol   ====
     =======================================================*/
 
+    let fingerprint: String;
+
     ensure_secret_key_exists(context).await.ok();
 
     // invitenumber will be used to allow starting the handshake,
@@ -93,7 +95,7 @@ pub async fn dc_get_securejoin_qr(context: &Context, group_chat_id: ChatId) -> O
         .await
         .unwrap_or_default();
 
-    let fingerprint: Fingerprint = match get_self_fingerprint(context).await {
+    fingerprint = match get_self_fingerprint(context).await {
         Some(fp) => fp,
         None => {
             return None;
@@ -138,9 +140,9 @@ pub async fn dc_get_securejoin_qr(context: &Context, group_chat_id: ChatId) -> O
     qr
 }
 
-async fn get_self_fingerprint(context: &Context) -> Option<Fingerprint> {
+async fn get_self_fingerprint(context: &Context) -> Option<String> {
     match SignedPublicKey::load_self(context).await {
-        Ok(key) => Some(key.fingerprint()),
+        Ok(key) => Some(Key::from(key).fingerprint()),
         Err(_) => {
             warn!(context, "get_self_fingerprint(): failed to load key");
             None
@@ -247,7 +249,7 @@ async fn securejoin(context: &Context, qr: &str) -> ChatId {
             chat_id_2_contact_id(context, contact_chat_id).await,
             400
         );
-        let own_fingerprint = get_self_fingerprint(context).await;
+        let own_fingerprint = get_self_fingerprint(context).await.unwrap_or_default();
 
         // Bob -> Alice
         if let Err(err) = send_handshake_msg(
@@ -259,7 +261,7 @@ async fn securejoin(context: &Context, qr: &str) -> ChatId {
                 "vc-request-with-auth"
             },
             get_qr_attr!(context, auth).to_string(),
-            own_fingerprint,
+            Some(own_fingerprint),
             if join_vg {
                 get_qr_attr!(context, text2).to_string()
             } else {
@@ -309,7 +311,7 @@ async fn send_handshake_msg(
     contact_chat_id: ChatId,
     step: &str,
     param2: impl AsRef<str>,
-    fingerprint: Option<Fingerprint>,
+    fingerprint: Option<String>,
     grpid: impl AsRef<str>,
 ) -> Result<(), HandshakeError> {
     let mut msg = Message::default();
@@ -326,7 +328,7 @@ async fn send_handshake_msg(
         msg.param.set(Param::Arg2, param2);
     }
     if let Some(fp) = fingerprint {
-        msg.param.set(Param::Arg3, fp.hex());
+        msg.param.set(Param::Arg3, fp);
     }
     if !grpid.as_ref().is_empty() {
         msg.param.set(Param::Arg4, grpid.as_ref());
@@ -358,7 +360,7 @@ async fn chat_id_2_contact_id(context: &Context, contact_chat_id: ChatId) -> u32
 
 async fn fingerprint_equals_sender(
     context: &Context,
-    fingerprint: &Fingerprint,
+    fingerprint: impl AsRef<str>,
     contact_chat_id: ChatId,
 ) -> bool {
     let contacts = chat::get_chat_contacts(context, contact_chat_id).await;
@@ -366,8 +368,9 @@ async fn fingerprint_equals_sender(
     if contacts.len() == 1 {
         if let Ok(contact) = Contact::load_from_db(context, contacts[0]).await {
             if let Some(peerstate) = Peerstate::from_addr(context, contact.get_addr()).await {
+                let fingerprint_normalized = dc_normalize_fingerprint(fingerprint.as_ref());
                 if peerstate.public_key_fingerprint.is_some()
-                    && fingerprint == peerstate.public_key_fingerprint.as_ref().unwrap()
+                    && &fingerprint_normalized == peerstate.public_key_fingerprint.as_ref().unwrap()
                 {
                     return true;
                 }
@@ -394,8 +397,6 @@ pub(crate) enum HandshakeError {
     NoSelfAddr,
     #[error("Failed to send message")]
     MsgSendFailed(#[source] Error),
-    #[error("Failed to parse fingerprint")]
-    BadFingerprint(#[from] crate::key::FingerprintError),
 }
 
 /// What to do with a Secure-Join handshake message after it was handled.
@@ -515,11 +516,10 @@ pub(crate) async fn handle_securejoin_handshake(
                 // no error, just aborted somehow or a mail from another handshake
                 return Ok(HandshakeMessage::Ignore);
             }
-            let scanned_fingerprint_of_alice: Fingerprint =
-                get_qr_attr!(context, fingerprint).clone();
+            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
             let auth = get_qr_attr!(context, auth).to_string();
 
-            if !encrypted_and_signed(context, mime_message, Some(&scanned_fingerprint_of_alice)) {
+            if !encrypted_and_signed(context, mime_message, &scanned_fingerprint_of_alice) {
                 could_not_establish_secure_connection(
                     context,
                     contact_chat_id,
@@ -576,9 +576,8 @@ pub(crate) async fn handle_securejoin_handshake(
             ==========================================================*/
 
             // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
-            let fingerprint: Fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint)
-            {
-                Some(fp) => fp.parse()?,
+            let fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint) {
+                Some(fp) => fp,
                 None => {
                     could_not_establish_secure_connection(
                         context,
@@ -589,7 +588,7 @@ pub(crate) async fn handle_securejoin_handshake(
                     return Ok(HandshakeMessage::Ignore);
                 }
             };
-            if !encrypted_and_signed(context, mime_message, Some(&fingerprint)) {
+            if !encrypted_and_signed(context, mime_message, &fingerprint) {
                 could_not_establish_secure_connection(
                     context,
                     contact_chat_id,
@@ -626,7 +625,7 @@ pub(crate) async fn handle_securejoin_handshake(
                     .await;
                 return Ok(HandshakeMessage::Ignore);
             }
-            if mark_peer_as_verified(context, &fingerprint).await.is_err() {
+            if mark_peer_as_verified(context, fingerprint).await.is_err() {
                 could_not_establish_secure_connection(
                     context,
                     contact_chat_id,
@@ -674,7 +673,7 @@ pub(crate) async fn handle_securejoin_handshake(
                     contact_chat_id,
                     "vc-contact-confirm",
                     "",
-                    Some(fingerprint),
+                    Some(fingerprint.clone()),
                     "",
                 )
                 .await?;
@@ -710,8 +709,7 @@ pub(crate) async fn handle_securejoin_handshake(
                 );
                 return Ok(abort_retval);
             }
-            let scanned_fingerprint_of_alice: Fingerprint =
-                get_qr_attr!(context, fingerprint).clone();
+            let scanned_fingerprint_of_alice = get_qr_attr!(context, fingerprint).to_string();
 
             let vg_expect_encrypted = if join_vg {
                 let group_id = get_qr_attr!(context, text2).to_string();
@@ -733,7 +731,7 @@ pub(crate) async fn handle_securejoin_handshake(
                 true
             };
             if vg_expect_encrypted
-                && !encrypted_and_signed(context, mime_message, Some(&scanned_fingerprint_of_alice))
+                && !encrypted_and_signed(context, mime_message, &scanned_fingerprint_of_alice)
             {
                 could_not_establish_secure_connection(
                     context,
@@ -890,7 +888,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
             if !encrypted_and_signed(
                 context,
                 mime_message,
-                get_self_fingerprint(context).await.as_ref(),
+                get_self_fingerprint(context).await.unwrap_or_default(),
             ) {
                 could_not_establish_secure_connection(
                     context,
@@ -900,9 +898,8 @@ pub(crate) async fn observe_securejoin_on_other_device(
                 .await;
                 return Ok(HandshakeMessage::Ignore);
             }
-            let fingerprint: Fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint)
-            {
-                Some(fp) => fp.parse()?,
+            let fingerprint = match mime_message.get(HeaderDef::SecureJoinFingerprint) {
+                Some(fp) => fp,
                 None => {
                     could_not_establish_secure_connection(
                         context,
@@ -913,7 +910,7 @@ pub(crate) async fn observe_securejoin_on_other_device(
                     return Ok(HandshakeMessage::Ignore);
                 }
             };
-            if mark_peer_as_verified(context, &fingerprint).await.is_err() {
+            if mark_peer_as_verified(context, fingerprint).await.is_err() {
                 could_not_establish_secure_connection(
                     context,
                     contact_chat_id,
@@ -970,13 +967,16 @@ async fn could_not_establish_secure_connection(
     error!(context, "{} ({})", &msg, details);
 }
 
-async fn mark_peer_as_verified(context: &Context, fingerprint: &Fingerprint) -> Result<(), Error> {
+async fn mark_peer_as_verified(
+    context: &Context,
+    fingerprint: impl AsRef<str>,
+) -> Result<(), Error> {
     if let Some(ref mut peerstate) =
-        Peerstate::from_fingerprint(context, &context.sql, fingerprint).await
+        Peerstate::from_fingerprint(context, &context.sql, fingerprint.as_ref()).await
     {
         if peerstate.set_verified(
             PeerstateKeyType::PublicKey,
-            fingerprint,
+            fingerprint.as_ref(),
             PeerstateVerifiedStatus::BidirectVerified,
         ) {
             peerstate.prefer_encrypt = EncryptPreference::Mutual;
@@ -990,7 +990,7 @@ async fn mark_peer_as_verified(context: &Context, fingerprint: &Fingerprint) ->
     }
     bail!(
         "could not mark peer as verified for fingerprint {}",
-        fingerprint.hex()
+        fingerprint.as_ref()
     );
 }
 
@@ -1001,7 +1001,7 @@ async fn mark_peer_as_verified(context: &Context, fingerprint: &Fingerprint) ->
 fn encrypted_and_signed(
     context: &Context,
     mimeparser: &MimeMessage,
-    expected_fingerprint: Option<&Fingerprint>,
+    expected_fingerprint: impl AsRef<str>,
 ) -> bool {
     if !mimeparser.was_encrypted() {
         warn!(context, "Message not encrypted.",);
@@ -1009,17 +1009,17 @@ fn encrypted_and_signed(
     } else if mimeparser.signatures.is_empty() {
         warn!(context, "Message not signed.",);
         false
-    } else if expected_fingerprint.is_none() {
-        warn!(context, "Fingerprint for comparison missing.");
+    } else if expected_fingerprint.as_ref().is_empty() {
+        warn!(context, "Fingerprint for comparison missing.",);
         false
     } else if !mimeparser
         .signatures
-        .contains(expected_fingerprint.unwrap())
+        .contains(expected_fingerprint.as_ref())
     {
         warn!(
             context,
             "Message does not match expected fingerprint {}.",
-            expected_fingerprint.unwrap(),
+            expected_fingerprint.as_ref(),
         );
         false
     } else {

src/smtp/mod.rs

@@ -10,9 +10,8 @@ use async_smtp::*;
 use crate::constants::*;
 use crate::context::Context;
 use crate::events::Event;
-use crate::login_param::{dc_build_tls, CertificateChecks, LoginParam};
+use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;
-use crate::provider::get_provider_info;
 use crate::stock::StockMessage;
 
 /// SMTP write and read timeout in seconds.
@@ -45,8 +44,9 @@ pub enum Error {
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Default)]
-pub(crate) struct Smtp {
+#[derive(Default, DebugStub)]
+pub struct Smtp {
+    #[debug_stub(some = "SmtpTransport")]
     transport: Option<smtp::SmtpTransport>,
 
     /// Email address we are sending from.
@@ -113,14 +113,7 @@ impl Smtp {
         let domain = &lp.send_server;
         let port = lp.send_port as u16;
 
-        let provider = get_provider_info(&lp.addr);
-        let strict_tls = match lp.smtp_certificate_checks {
-            CertificateChecks::Automatic => provider.map_or(false, |provider| provider.strict_tls),
-            CertificateChecks::Strict => true,
-            CertificateChecks::AcceptInvalidCertificates
-            | CertificateChecks::AcceptInvalidCertificates2 => false,
-        };
-        let tls_config = dc_build_tls(strict_tls);
+        let tls_config = dc_build_tls(lp.smtp_certificate_checks);
         let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls_config);
 
         let (creds, mechanism) = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {
@@ -179,7 +172,7 @@ impl Smtp {
                 .stock_string_repl_str2(
                     StockMessage::ServerResponse,
                     format!("SMTP {}:{}", domain, port),
-                    format!("{}, ({:?})", err.to_string(), err),
+                    err.to_string(),
                 )
                 .await;
 

src/sql.rs

@@ -49,7 +49,7 @@ pub enum Error {
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// A wrapper around the underlying Sqlite3 object.
-#[derive(Debug)]
+#[derive(DebugStub)]
 pub struct Sql {
     pool: RwLock<Option<r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>>>,
 }
@@ -1241,15 +1241,6 @@ async fn open(
                 .await?;
             sql.set_raw_config_int(context, "dbversion", 63).await?;
         }
-        if dbversion < 64 {
-            info!(context, "[migration] v64");
-            sql.execute(
-                "ALTER TABLE msgs ADD COLUMN error TEXT DEFAULT '';",
-                paramsv![],
-            )
-            .await?;
-            sql.set_raw_config_int(context, "dbversion", 64).await?;
-        }
 
         // (2) updates that require high-level objects
         // (the structure is complete now and all objects are usable)

src/stock.rs

@@ -179,12 +179,6 @@ pub enum StockMessage {
 
     #[strum(props(fallback = "Unknown Sender for this chat. See 'info' for more details."))]
     UnknownSenderForChat = 72,
-
-    #[strum(props(fallback = "Message from %1$s"))]
-    SubjectForNewContact = 73,
-
-    #[strum(props(fallback = "Failed to send message to %1$s."))]
-    FailedSendingTo = 74,
 }
 
 /*

src/test_utils.rs

@@ -40,24 +40,6 @@ pub(crate) async fn dummy_context() -> TestContext {
     test_context().await
 }
 
-pub(crate) async fn configured_offline_context() -> TestContext {
-    configured_offline_context_with_addr("alice@example.org").await
-}
-
-pub(crate) async fn configured_offline_context_with_addr(addr: &str) -> TestContext {
-    let t = dummy_context().await;
-    t.ctx.set_config(Config::Addr, Some(addr)).await.unwrap();
-    t.ctx
-        .set_config(Config::ConfiguredAddr, Some(addr))
-        .await
-        .unwrap();
-    t.ctx
-        .set_config(Config::Configured, Some("1"))
-        .await
-        .unwrap();
-    t
-}
-
 /// Load a pre-generated keypair for alice@example.com from disk.
 ///
 /// This saves CPU cycles by avoiding having to generate a key.

test-data/message/gmail_ndn.eml

@@ -1,242 +0,0 @@
-Delivered-To: alice@gmail.com
-Received: by 2002:a1c:b4d7:0:0:0:0:0 with SMTP id d206csp3026053wmf;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-X-Received: by 2002:a5d:4651:: with SMTP id j17mr19532177wrs.50.1589819005555;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1589819005; cv=none;
-        d=google.com; s=arc-20160816;
-        b=IZbNnzzuYzTFuqfuZwpd3ehqpYYGpn31c8DsfGbQ8rpbS0OTTROkVYvihQl8Ne/8X/
-         brEWsrcmaCh9WpFMzpI+cp/TY39uusnI6qdp5rcgrFmFgoANtwf3TBBj1+f7wBPn46BP
-         dQOUsg/J8KVfvzVgvL1x4uyJ0m9QirDgJeJ/BvrswbTleRQK7oY3fIireUCDxj6r2lCB
-         1Z0TKw1mgIb1LiFMZz8kvCNn3R4KSFnwS8rIju0hYwnsioNiExVQgumXL+RVkEZ9BMzf
-         UdoWIAw3VW+MOZFTpfLCEfgIPtLg/gtE0Q1P+a3KKpi8dkPiV2n6DGMecy9lTLtdhCXt
-         pnaA==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=in-reply-to:references:subject:from:date:message-id:auto-submitted
-         :to:dkim-signature;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=nNP0DktrSjdBaFfhhoDi2O9KVKM0iXE5ZgubQ0q0ff68Z6Ke7c8dDBXEsZoToI0s4Y
-         w90KyJFpgMJLFmP3iVDRqCfohi2y1HGdWg5VXQPTvzM7+YozZRlbNNV9UsuyRY91CXrJ
-         a2XREBgB+LPMGQivwcHtUMZfyNv/4uiwWivk+92ySNDhxqOiDt4R5Jak/7RkZMFwQpsE
-         JGwk6asM6VqZlihkF24lKv3pPaob6feyX3wD5N0+Mqiy1kQTj2JkpQk6nkTmdf0gapZe
-         fOhU1NkbNfbuS3U7m2gEUiyktE+MhV/MgAzgBhm9bgNt2gQLVWju8rHkPndfv1PDmEkC
-         FsYQ==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=dPisws+O;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-Return-Path: <>
-Received: from mail-sor-f69.google.com (mail-sor-f69.google.com. [209.85.220.69])
-        by mx.google.com with SMTPS id s18sor5584435wrb.25.2020.05.18.09.23.25
-        for <alice@gmail.com>
-        (Google Transport Security);
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) client-ip=209.85.220.69;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=dPisws+O;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=googlemail.com; s=20161025;
-        h=to:auto-submitted:message-id:date:from:subject:references
-         :in-reply-to;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=dPisws+OwGFyOy0a612XYZgvz5T71GcJRJtU068/Tce8vN/+ggIQtUsZnZtsphe71v
-         2NvfP9ULxR4cXvomTvhrYAk19KdxN/S7SeyBbmXv3x/tg+DBVCmmPS/6RXrcl6Ms3Hkw
-         uPFQ9S3KcvHe/2bcb5LSTA/stIP4tuxxAXvsX2j+MjPYPWKAl50jkSbWK98U0Q0U+MTl
-         pKaaC9s9iEBafac8BFZCy4DfpumKlemNEyRa3cSV2hw+DYHKA5peModrK1A2tcsfstFF
-         rZi8yF/D90RIFbE04DI2QCxB3trsChNF1aYF06aSzI//wsfM1+lb+uGPi0YVkw3n4HrX
-         Xw4w==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:to:auto-submitted:message-id:date:from:subject
-         :references:in-reply-to;
-        bh=5xjZvcHbEGbMY0K2QB+3U6tpm1L1LAVv5h1pd4YXDEE=;
-        b=A/NCOtgbpA7VzB1G7ZFo8TA2FfrjuqjGdwMrJr3yXe21FrBFwzssprJwOkynqoVLkK
-         iJU7uMF/KTcQPDEmOLFThzFfe5GCx7eJtZPhwY+FbBlC5sq4I55/xaQLd0gOZ1BYXwMn
-         2bk169d2aoukbaLbGSQZF3d9atd+/e48YzkRxpmUoLcrWk2LcHAeQIG7SgT9pfX5DKPr
-         VpxM5/GMVEBbTRhBIWCeVSfpYCs80l0xEeTC3/B5lzpzMVDE8QCW6Dwh75b4Tb2K6yru
-         Zsy5ZpRmwv0wrkrb2vM+pl4IMkaF7s8XosIvlIT++fQV5xDFItT4atpykZvSDB92RKV0
-         8lEA==
-X-Gm-Message-State: AOAM532RG/PT3ChZHBCDORGLtAjKvX8TGBuOy+AxrnEaJT6v1ieb+VV1
-	+ejly+/6UthxHYlkOJYAszCSgL4dKVFotoVaN7LhEA==
-X-Google-Smtp-Source: ABdhPJz6veVKWhomCL4gK+whrybuMzHCDCq8AowgQvi7sobpMoM/k9CDw79jo1j3OUcTz6MEeUYLxEXuNIuu4zyoS7kVtsUYryGFHAI=
-X-Received: by 2002:a5d:5183:: with SMTP id k3mr20545185wrv.159.1589819005394;
-        Mon, 18 May 2020 09:23:25 -0700 (PDT)
-Content-Type: multipart/report; boundary="00000000000012d63005a5ee9520"; report-type=delivery-status
-To: alice@gmail.com
-Received: by 2002:a5d:5183:: with SMTP id k3mr13704211wrv.159; Mon, 18 May
- 2020 09:23:25 -0700 (PDT)
-Return-Path: <>
-Auto-Submitted: auto-replied
-Message-ID: <5ec2b67d.1c69fb81.213af.67a5.GMR@mx.google.com>
-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
-Subject: Delivery Status Notification (Failure)
-References: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-In-Reply-To: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-X-Failed-Recipients: assidhfaaspocwaeofi@gmail.com
-
---00000000000012d63005a5ee9520
-Content-Type: multipart/related; boundary="00000000000012dc0005a5ee952f"
-
---00000000000012dc0005a5ee952f
-Content-Type: multipart/alternative; boundary="00000000000012dc0705a5ee9530"
-
---00000000000012dc0705a5ee9530
-Content-Type: text/plain; charset="UTF-8"
-
-
-** Die Adresse wurde nicht gefunden **
-
-Ihre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-
-Hier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser
-
-Antwort:
-
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-
---00000000000012dc0705a5ee9530
-Content-Type: text/html; charset="UTF-8"
-
-
-<html>
-<head>
-<style>
-* {
-font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
-<tr><td>
-<table cellpadding=0 cellspacing=0><tbody>
-<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
-<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Fehlersymbol" src="cid:icon.png">
-<table style="min-width:272px;padding-top:8px"><tbody>
-<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
-Die Adresse wurde nicht gefunden
-</h2></td></tr>
-<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
-Ihre Nachricht wurde nicht an <a style='color:#212121;text-decoration:none'><b>assidhfaaspocwaeofi@gmail.com</b></a> zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-</td></tr>
-<tr><td style="padding-top:24px;color:#4285F4;font-size:14px;font-weight:bold;text-align:left">
-<a style="text-decoration:none" href="https://support.google.com/mail/?p=NoSuchUser">WEITERE INFORMATIONEN</a>
-</td></tr>
-</tbody></table>
-</td></tr>
-</tbody></table>
-</td></tr>
-<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
-<td align="left" style="padding:48px 10px">
-Antwort:<br/>
-<p style="font-family:monospace">
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient&#39;s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-</p>
-</td>
-</tr>
-</tbody></table>
-</body>
-</html>
-
---00000000000012dc0705a5ee9530--
---00000000000012dc0005a5ee952f
-Content-Type: image/png; name="icon.png"
-Content-Disposition: attachment; filename="icon.png"
-Content-Transfer-Encoding: base64
-Content-ID: <icon.png>
-
-iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
-yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
-YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
-AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
-f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
-rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
-G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
-VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
-ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
-zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
-Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
-Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
-4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
-eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
-/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
-Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
-YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
-nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
-OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
-ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
-PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
-dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
-XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
-IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
-LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
---00000000000012dc0005a5ee952f--
---00000000000012d63005a5ee9520
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; googlemail.com
-Arrival-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-X-Original-Message-ID: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-
-Final-Recipient: rfc822; assidhfaaspocwaeofi@gmail.com
-Action: failed
-Status: 5.1.1
-Diagnostic-Code: smtp; 550-5.1.1 The email account that you tried to reach does not exist. Please try
- 550-5.1.1 double-checking the recipient's email address for typos or
- 550-5.1.1 unnecessary spaces. Learn more at
- 550 5.1.1  https://support.google.com/mail/?p=NoSuchUser i18sor6261697wrs.38 - gsmtp
-Last-Attempt-Date: Mon, 18 May 2020 09:23:25 -0700 (PDT)
-
---00000000000012d63005a5ee9520
-Content-Type: message/rfc822
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=mime-version:from:date:message-id:subject:to;
-        bh=gtlm3j0shCgZYOVxUt74zkQ69Zq+GTQeHeXLfMlrhlk=;
-        b=a185ogBcMzF9whNVWvuyUoUunNZk3Vc1kEIFmPkX0IxLpAFcI+fOQajOSromGl7Oyi
-         yecLwQevpww2Xd0XjZ3UkZvrI9m9koRmh0QeoHvgTRORiVwj08+PVc3N4F9bCO4w9i0J
-         ir7SSsJqBCDovoIFSFDyNa64vs6Nxno0cH/DaPG7pVTdD+3jfB7nLXIsMQYeX+1eP6rB
-         UhKxH82r7Mh9CI2PWDQpVtGj63AMUEyHgE9Ou08PWbbKjrQOasoG3Tw8tB1GoN1XYssM
-         rxOTgWEoTiduZ35AUH6h+eChOn9OHuI3SPECcVob70Qndayia3dMKfHMO6sEx9J0Wpic
-         29vg==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
-        bh=gtlm3j0shCgZYOVxUt74zkQ69Zq+GTQeHeXLfMlrhlk=;
-        b=miGIfL5BgnkD3wQvS34RtGwRRoh+8gJT5sFFfdX/hVyG/dvjXfdwP4yyNWr8ox8iY2
-         BLlahS4y4VGcbG1e2aYjurnWNytGu6utQcZax/uUngJ0bTOwXW1VaIiEZtqd6gTV+8d/
-         rrfQ459+4vXqIoQf0+Oi/U6dWwgJvPPjjRiToWdF3vIJE8R1iTRdZbW4lkgxSADbmskg
-         noT/gWGWblHtR6uuGuKGJ3bkhJKCBnjavKh0LlbWEeFBZfmVNPRvzEFWHjBDdu5wvSL5
-         0QJ+Qn0Orfn5CJuN3xPfzT1S2rI2iYZx37KX9zyMnZEx0ilkTYqCtBPWkrXRYDSXcxYS
-         Y1ag==
-X-Gm-Message-State: AOAM531vhwpXiK8M12286dOJx0Q5fBl9ZaH6BJKts93GoxvPv0xdryP0
-	jg9wYmoP5MUHudsxAMCYDFsCUMVx2PEywyIsaQqklw==
-X-Google-Smtp-Source: ABdhPJxlVJtTODM3pZZSTbbpAAAQRU8XbmuosDF9fgQZmVwxGZSzRWl22o+moppVRU/r8xMAyf0r3+qXwEBe1vZfjZo=
-X-Received: by 2002:a5d:5183:: with SMTP id k3mr20545162wrv.159.1589819005034;
- Mon, 18 May 2020 09:23:25 -0700 (PDT)
-MIME-Version: 1.0
-From: <alice@gmail.com>
-Date: Mon, 18 May 2020 18:23:39 +0200
-Message-ID: <CABXKi8zruXJc_6e4Dr087H5wE7sLp+u250o0N2q5DdjF_r-8wg@mail.gmail.com>
-Subject: Kommt sowieso nicht an
-To: assidhfaaspocwaeofi@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000000d652a05a5ee95df"
-
---0000000000000d652a05a5ee95df
-Content-Type: text/plain; charset="UTF-8"
-
-Wollte nur was testen
-
---0000000000000d652a05a5ee95df
-Content-Type: text/html; charset="UTF-8"
-
-<div dir="ltr">Wollte nur was testen<br></div>
-
---0000000000000d652a05a5ee95df--
-
---00000000000012d63005a5ee9520--

test-data/message/gmail_ndn_group.eml

@@ -1,242 +0,0 @@
-Delivered-To: alice@gmail.com
-Received: by 2002:a02:6629:0:0:0:0:0 with SMTP id k41csp368502jac;
-        Wed, 10 Jun 2020 05:17:57 -0700 (PDT)
-X-Received: by 2002:a6b:1448:: with SMTP id 69mr2898530iou.83.1591791475733;
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1591791475; cv=none;
-        d=google.com; s=arc-20160816;
-        b=a0vSKJPbMtGYFnuk1ye/gnnV00Zvva4OOJTMOyfm13xMJD0YAhzGVfa7Z+wn5sQ8dw
-         VAxpmDHCkjp4jol0C1iutiq2Nl0qma819oFPuuoMLLatKQXHpo8Jt+sL3MnwNR7J5bZC
-         1c6Fjk75EIsRWhJd1HCkm44A6UYHxqqsTnzQCaNiHbjsRsvbggxwlMGSrZ4silxqSDvo
-         Pzd/YDLCvsnZNSNIjIckKAwtGmY6sXctZ+JnOTykXAyL32Milfwy1vRL9xm10Q14biTR
-         +qaIQp4E6WE63g1WHvfAjs0Dru7DalUh4GGl/NAwqVhY1gVyRD5E9/nODyHAfxjvaxDD
-         4sMw==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=in-reply-to:references:subject:from:date:message-id:auto-submitted
-         :to:dkim-signature;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=OJbgbrktMKyczw25z/ib7lSdRX80PEK3Myh9fj4q6mDlXmPPv//Gv069znRQ4QbadM
-         HUXZH0WLMZcGyqI6SvGL/noxQ1O8yP0FYJJKTkoX0Gk2hHzfaE3x1scOP/o2FMMQXIFm
-         S4CgGBD6HHzBJYj/rSL3gzqLzx1Id/z5kTeDvH2cn8JJAcCE2q/nhjTyWUb87geoNlDJ
-         A1HRrLHK/0JOyRjHfg2zZCqIvSi1xmpiHStMyL9mfVyrQs98tsPxaOkJHjLplFARoPlr
-         mmmDvsFg7MPvFqkkANzz4JDHidnfKRULCgnrVj1yTU66UagUpQEGjZqz8/99YuU6nt1t
-         81sQ==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=aO4aNy7C;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-Return-Path: <>
-Received: from mail-sor-f69.google.com (mail-sor-f69.google.com. [209.85.220.69])
-        by mx.google.com with SMTPS id w14sor16686480iow.23.2020.06.10.05.17.55
-        for <alice@gmail.com>
-        (Google Transport Security);
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) client-ip=209.85.220.69;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@googlemail.com header.s=20161025 header.b=aO4aNy7C;
-       spf=pass (google.com: best guess record for domain of postmaster@mail-sor-f69.google.com designates 209.85.220.69 as permitted sender) smtp.helo=mail-sor-f69.google.com;
-       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=googlemail.com; s=20161025;
-        h=to:auto-submitted:message-id:date:from:subject:references
-         :in-reply-to;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=aO4aNy7CUOk9O4Jnsue/DvMFY6Ph0C34AbpoxJH+mLZpOmt/KYGCGYWgunZgamF15U
-         Vm8JY5yLKGwkTz2m3abDnKNP4fpl6zeZ5fyk5LvXH2Jema0iocHai6pJZBoFGPnonNmd
-         MscTf1sEltbOxwfOmM1BRHX34c1jW0+8Yd2+Nhg2DPvzuq1brOVin6bUV4VX5EeeuNqT
-         ZTewjJVPmO/B5NQhdpG81FO5w4hKSQ/VzZXnap2thMf3gOmnaoR+tbsnOIAiklcLdJ7b
-         57SKUwI041pwSmh9dffs0STl2GvMRSJyGCtBqMnzXgflqoGTcnPflWgR3LXHM/MIA0q8
-         WqRQ==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:to:auto-submitted:message-id:date:from:subject
-         :references:in-reply-to;
-        bh=XaR1H4XeD+InO7mULPJn53omDGmxN+KG6DbSxyyErPM=;
-        b=iORAzNvXegQ8oSp4RYb/S168muAiBox769seMk49kDBIvXwI+N8P4mUZq/zDi8DmQd
-         +wlLzVzowQq6EofiSpjOJWT9IC/k8otk15PMGtgHE4BGSSeKn7L30d3ocQS93HzYnLmA
-         VBlHBdFTKrsfKhe2+CQyCosTDGRpbkQLuRRyhxChEq8ltvaOHgbu1+eCeb9PsPuh6OxH
-         kvTHJZeA9A+eLOl26pBmqGIWkr7FlYW0wI6YPoEs9WXX5LSFOQs6fm/9l366eIR7IFFI
-         ihX5LrZl/Cf0lwwYX7fqIMgnHy1K+QnKuEb+dRQGqLbxdIEls9bXIF98iPQVkEWzgSZy
-         ip8Q==
-X-Gm-Message-State: AOAM531ahfHE6oS9/nuni8pNf9bwC+DXAcaLV0owBwNCj9kcTPLCCNhX
-	W1JNciK0ivEIVB4dgiyLE/5K7iKbEznQhqyG9Bi1QA==
-X-Google-Smtp-Source: ABdhPJygljUXswH0ycJyHmXVthi5IjlDvP8QdYlMdHUPKEtgIZeUk69Acti5LnswGhg63T9/L0PuGZGBM5XE5BsP0mMNNDRZyt+DgnE=
-X-Received: by 2002:a05:6638:101c:: with SMTP id r28mr2990163jab.84.1591791475516;
-        Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-Content-Type: multipart/report; boundary="00000000000074432a05a7b9d512"; report-type=delivery-status
-To: alice@gmail.com
-Received: by 2002:a05:6638:101c:: with SMTP id r28mr3059870jab.84; Wed, 10 Jun
- 2020 05:17:55 -0700 (PDT)
-Return-Path: <>
-Auto-Submitted: auto-replied
-Message-ID: <5ee0cf73.1c69fb81.6888.c2f4.GMR@mx.google.com>
-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
-Subject: Delivery Status Notification (Failure)
-References: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-In-Reply-To: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-X-Failed-Recipients: assidhfaaspocwaeofi@gmail.com
-
---00000000000074432a05a7b9d512
-Content-Type: multipart/related; boundary="000000000000745e0805a7b9d51b"
-
---000000000000745e0805a7b9d51b
-Content-Type: multipart/alternative; boundary="000000000000745e1705a7b9d51c"
-
---000000000000745e1705a7b9d51c
-Content-Type: text/plain; charset="UTF-8"
-
-
-** Die Adresse wurde nicht gefunden **
-
-Ihre Nachricht wurde nicht an assidhfaaspocwaeofi@gmail.com zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-
-Hier erfahren Sie mehr: https://support.google.com/mail/?p=NoSuchUser
-
-Antwort:
-
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient's email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-
---000000000000745e1705a7b9d51c
-Content-Type: text/html; charset="UTF-8"
-
-
-<html>
-<head>
-<style>
-* {
-font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
-<tr><td>
-<table cellpadding=0 cellspacing=0><tbody>
-<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
-<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Fehlersymbol" src="cid:icon.png">
-<table style="min-width:272px;padding-top:8px"><tbody>
-<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
-Die Adresse wurde nicht gefunden
-</h2></td></tr>
-<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
-Ihre Nachricht wurde nicht an <a style='color:#212121;text-decoration:none'><b>assidhfaaspocwaeofi@gmail.com</b></a> zugestellt, weil die Adresse nicht gefunden wurde oder keine E-Mails empfangen kann.
-</td></tr>
-<tr><td style="padding-top:24px;color:#4285F4;font-size:14px;font-weight:bold;text-align:left">
-<a style="text-decoration:none" href="https://support.google.com/mail/?p=NoSuchUser">WEITERE INFORMATIONEN</a>
-</td></tr>
-</tbody></table>
-</td></tr>
-</tbody></table>
-</td></tr>
-<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
-<td align="left" style="padding:48px 10px">
-Antwort:<br/>
-<p style="font-family:monospace">
-550 5.1.1 The email account that you tried to reach does not exist. Please try double-checking the recipient&#39;s email address for typos or unnecessary spaces. Learn more at https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-</p>
-</td>
-</tr>
-</tbody></table>
-</body>
-</html>
-
---000000000000745e1705a7b9d51c--
---000000000000745e0805a7b9d51b
-Content-Type: image/png; name="icon.png"
-Content-Disposition: attachment; filename="icon.png"
-Content-Transfer-Encoding: base64
-Content-ID: <icon.png>
-
-iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
-GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
-yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
-YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
-AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
-f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
-rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
-G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
-VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
-ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
-zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
-Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
-Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
-4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
-eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
-/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
-Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
-YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
-nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
-OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
-ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
-PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
-dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
-XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
-IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
-LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
---000000000000745e0805a7b9d51b--
---00000000000074432a05a7b9d512
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; googlemail.com
-Arrival-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-X-Original-Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-
-Final-Recipient: rfc822; assidhfaaspocwaeofi@gmail.com
-Action: failed
-Status: 5.1.1
-Diagnostic-Code: smtp; 550-5.1.1 The email account that you tried to reach does not exist. Please try
- 550-5.1.1 double-checking the recipient's email address for typos or
- 550-5.1.1 unnecessary spaces. Learn more at
- 550 5.1.1  https://support.google.com/mail/?p=NoSuchUser h20sor9401601jar.6 - gsmtp
-Last-Attempt-Date: Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-
---00000000000074432a05a7b9d512
-Content-Type: message/rfc822
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20161025;
-        h=mime-version:from:date:message-id:subject:to;
-        bh=Y1ylbv3YC5frF/LtF2it4tQQ0OVZstDdWqivvggIOB0=;
-        b=eyr60XbgOrgHoZFpRYzw9WQIR7aEBaYKWhiEcqdnugB+hn0W2KVcTkKiL2C6zSF+jh
-         l+lM+dNZZTUcMqWx4kVgTVtqwUNea8OUqe+WLqx04ULwdKZn1okbKYovaiavCLKOKDnf
-         ZP5mNz3Ka/ywpCGoq8rdgnXc7NunnkWeaBpYY/BWOmLU4WNXX8zS7etXXhQE4YPQEJT4
-         Sh2o/YIIjDLncJFMyE+25n3tbd2mIoLt4sjaCHE5ibm9w7zojyHM+LDCQ37cM74FEAAa
-         88KTn0gSnCFBCfojhfxOH78CpySHG3FFfTlpCefwP2A5J9MQlb6QdSVa9STYSx3IntJ4
-         L7Tg==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
-        bh=Y1ylbv3YC5frF/LtF2it4tQQ0OVZstDdWqivvggIOB0=;
-        b=pBL4/bKUDw5E2zo1uR2Tl69h2iTlMgIAcnzQgodPCbU4jZ9kH+F5H9rfbzXCjT06J7
-         L72SYpdfgc5fOwM4GhRcdYnyK3wiXQ8ugpL19nbYt2iWo/vRF3GidawXXDGb2GUYpkzX
-         1Mz531cy2/HOsmQbUQ7304KV+OUghtcg8eLNnFuhQch7n12Kk3yy3AOzjrLoktcdgIsy
-         /HxBjyut0Au+A2t6si+PVwTHvC647a0BioeV0tUYLigzu3/jgP9Hb8eRZaXTX5VC6iZi
-         9QMH/+rXp05IK7OpGWh22xDpeV8CDkQ2sLFaBhKxtJ+nYoerM64t8EJXBBsVQb18ojGz
-         pW/A==
-X-Gm-Message-State: AOAM5330q6kn/TKataMNEVigNfNdr/xii/PQgHXzJyMbwLvsETlNfLoy
-	1rM9JBIGrcHeEDRx4qhZfl5S4bircceU7c3i6Fyn2fRO
-X-Google-Smtp-Source: ABdhPJwysG+S90b/g+9mK7LgeHhmJTBowst6JMhL16+a0coTi7P1NVp9jjaNHJfhvhLodYG6eHIvWdbQGJnAP2brEzI=
-X-Received: by 2002:a05:6638:101c:: with SMTP id r28mr2990137jab.84.1591791475066;
- Wed, 10 Jun 2020 05:17:55 -0700 (PDT)
-MIME-Version: 1.0
-From: Deltachat Test <alice@gmail.com>
-Date: Wed, 10 Jun 2020 14:18:26 +0200
-Message-ID: <CADWx9Cs32Wa7Gy-gM0bvbq54P_FEHe7UcsAV=yW7sVVW=fiMYQ@mail.gmail.com>
-Subject: test
-To: bob@example.org, assidhfaaspocwaeofi@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000006d8d7d05a7b9d5b3"
-
---0000000000006d8d7d05a7b9d5b3
-Content-Type: text/plain; charset="UTF-8"
-
-test
-
---0000000000006d8d7d05a7b9d5b3
-Content-Type: text/html; charset="UTF-8"
-
-<div dir="ltr">test<br></div>
-
---0000000000006d8d7d05a7b9d5b3--
-
---00000000000074432a05a7b9d512--

test-data/message/gmx_ndn.eml

@@ -1,113 +0,0 @@
-Return-Path: <>
-Received: from mout-bounce.gmx.net ([212.227.15.44]) by mx-ha.gmx.net
- (mxgmx101 [212.227.17.5]) with ESMTPS (Nemesis) id 1Mr97m-1jC6Y01o86-00oEqk
- for <alice@gmx.de>; Tue, 09 Jun 2020 14:35:30 +0200
-Received: from localhost by mout-bounce.gmx.net id 0LhiZF-1jDTj11ZoH-00msO3
-    Tue, 09 Jun 2020 14:35:30 +0200
-Date: Tue, 09 Jun 2020 14:35:30 +0200
-From: "GMX Mailer Daemon" <mailer-daemon@gmx.de>
-To: alice@gmx.de
-Subject: Mail delivery failed: returning message to sender
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-X-UI-Out-Filterresults: unknown:0;V03:K0:O8yx6kuPaGQ=:0wIDPNXEr0wX2oNsLnXaWA
- ==
-Envelope-To: <alice@gmx.de>
-X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
-X-Spam-Flag: NO
-X-UI-Filterresults: notjunk:1;V03:K0:QcE43EBhMmU=:IC5vvzi9jhPS/698Wuubzw1Q4N
- h87X9j9B3CBN0ZKXB67KepwyNHmh9pxmFIUOMimylv7UK9np+j3X55roOd0nX9BmaaZ3Twvqf
- UaSsxmyU+cNr6m3+oOb3udJBLe2pJEZDk1cOwACb5NXzYPSaIj4APfGCyvrzIx3FGkNuScNBb
- tCbbKUJ0GB/VmJLB34XfF6dNN+Iwv9IQ9Yrvw/VXv9vWKsi3qRGGUt3yRw5jUKhQlBY21Pnoq
- m0LqoMbAKfH1tKEQ/5TymH1ei50YKyWzZ89ISkQwkbYLaqN+6meGACpY18j43VCU9Fk4WQR7y
- 3XvBYh2CO0CnCn+M9VsnasYag2sNrySe9nzyKfRTaxEg8qlJtl7kS4GX/FsxhHPavkqnU62Gl
- 9V5TxIG7tmIR0Bf11sPzG/WGegoOHxrfz+qYR81llLMOHznpdDRKjsYDtO/rFBGZzYTiCZsrW
- dZPVXV25SVcrDGZOaop3JoCbglmXLcSLLhmfE5MzyJEGte3I+6EiZJNeIe8qN3wMDTsRtJL9S
- J6b2F/5/kTGVAWnXtNlf69BholCrxvjC4Snt3Xjc+7WIO8iw2c5YjmWy+4bAwd4uWll529hZd
- 6pUYGwjFRnKleivCaJIt7DqbvbE7GZSbQH8fXm3zYqYTrrxiWdlykdoOA1OGbeM06RHJt3mJB
- osZPU8BZKt0OiBOW64vg6gyAsNC0f02EA7dvRWYgFYqlSogfWZQIOKDKibMVHpIaA0foXg4BG
- TEQDlsTIL0n2WC9WVqkMdm6xUXHgpArCrAsUhw3mEqPywEfJeBHn60tP2vQ9+pDIQAj5dQCDV
- y96qSiCX4p31HfrWwAXB9mHfl4OO/tPcKUGBclj2rZ/NMc4O+7yDedLWXQnRzQExfOJLBbBh3
- xgiNlWFHvDLn0pKG9EI1+3wJ7m2GF2jzDtbQTBv9z26DuAq5WbHZHupzeyfP7VCVXcKuB6sG1
- 3+LWcdYtcXfqT58HwcvDLwowC4uJpiHfHwtVdiGMtHnmYLysp0V425g+vofQfNzBgR3d9JC15
- G+HS44o6x6Legm6KnHYH3k0KhR7fgcgswJv/S+I/ryppUhGb2jezVZIUzgvAplzIUDAWnrHdF
- KVqZ5wBJ0acShIfgMlsIxnBmcnIQ4R4jq3zAyj4XTFxVUFanU8ySiXubxV5PzJqj+GsVa2sjx
- 9n/xQRJLwgMC4BYqzP6lEPwg/g5AneDAnl7ZlcQPC4SCMblC8N1KZyyIDTXPOI/o4lfdMYb9P
- 7DmBp2S8aA2yuDe5XT20OmX3kVWeBOsBaAGvVFpIn7gwIDqnFh9WSMP6mkCwfChN3D1yLquYB
- KAODgRZV5lVNmK+eOjW8m2oiRxmfxrjXLtw5PEhn3RkiRN4HnoePJeoYC7SG4EUwg+wYPu3M6
- exP/YigoE6bjuBS5d0imUTRDMiwg469GyrFo1J1GkRVvj3lXSF4Nt11j6waqu1l0ReDYfU+QM
- EMPGLEh1vRChCaqz4L7YI5FlSAVXxfmst0JRyE4k5r9CToEbZuYlPQ+jbcvptwBSaqzMb/YfT
- cCrU2RWHUfmYIy8x8A/t8ScRbYPzs1lTK3yn1hYeXpw8Fgkip6DIIXAJwUUp+2SLcELICIo+p
- uumMN0P/OZHH3V/hZ0dPr9xsYi7gdd/vyRIRPUwiL1rSp2WJGi+w4atun8kQBgnbAznRObDh1
- 4zzKhApX9jo5gtFN6640QDEI5KpsMuPoty4rj9OK163ntKWGR451n+5ZX2FilTlpZYlIPO9Hy
- SrjHzBog4texceR1OLh4pb/WFB0XFSjQchPAltXCYQFs82aDDk/A0nOPk=
-
-This message was created automatically by mail delivery software.
-
-A message that you sent could not be delivered to one or more of
-its recipients. This is a permanent error. The following address(es)
-failed:
-
-snaerituhaeirns@gmail.com:
-SMTP error from remote server for RCPT TO command, host: gmail-smtp-in.l.google.com (66.102.1.27) reason: 550-5.1.1 The email account that you tried to reach does not exist. Please
- try
-550-5.1.1 double-checking the recipient's email address for typos or
-550-5.1.1 unnecessary spaces. Learn more at
-550 5.1.1  https://support.google.com/mail/?p=NoSuchUser f6si2517766wmc.21
-9 - gsmtp
-
-
-
---- The header of the original message is following. ---
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
-	s=badeba3b8450; t=1591706130;
-	bh=g3zLYH4xKxcPrHOD18z9YfpQcnk/GaJedfustWU5uGs=;
-	h=X-UI-Sender-Class:To:From:Subject:Date;
-	b=NwY6W33mI1bAq6lpr6kbY+LD2hO9cDJBItTgY3NRIT94A6rKTVlSmhFM3AxYgFnj0
-	 Db0hncsNRDqcdtRoOo8Emcah5NJURvEQohG37lkug3GqneB4+FNTdYCeQbOKlZn6on
-	 pYYD/T9CmeL2HG3+8voeBjZIUenyXrF2WXG37hFY=
-X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
-Received: from [192.168.178.30] ([84.57.126.154]) by mail.gmx.com (mrgmx005
- [212.227.17.190]) with ESMTPSA (Nemesis) id 1MKbkM-1jNoq60HKm-00KyL2 for
- <snaerituhaeirns@gmail.com>; Tue, 09 Jun 2020 14:35:30 +0200
-To: snaerituhaeirns@gmail.com
-From: Alice <alice@gmx.de>
-Subject: test
-Message-ID: <9c9c2a32-056b-3592-c372-d7e8f0bd4bc2@gmx.de>
-Date: Tue, 9 Jun 2020 14:36:10 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
- Thunderbird/68.8.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-Content-Language: de-DE
-X-Provags-ID: V03:K1:7awoptmynaF5MqxCAincdsa7zFCwQFNkFb6xRxigK06uEiGN00b
- Mv2wJU91CEd4mvCCWzrTtaWLZDLH8pjAWaT4+HvYIUbpwNx2jC6WHTppkYYRMVJnm4lG9pr
- SUx1OlIcp0kbsnl3mB9xYNFwm9jzpR9Kx8QEHwIbZiiSFBcH56498UGQi//kKXVMos8C14o
- I7cmwYmr8xB09DwLMKXfg==
-X-Spam-Flag: NO
-X-UI-Out-Filterresults: notjunk:1;V03:K0:NWQAUbhAkBc=:yAaolOnVCDWEZhgUwwvtEs
- wXbSJ/GfMvDRpCkYpFBvHXOTpGm6hjdjQ0vLK2hvu/Hz22UdlWbIdc1J2oO9S5U20mIdc+1bS
- TPSSpqPFc7ICPx4Wbvv2SEp9ZqH2q7ORC52UvUWfI6OjAJEPDNrXQFdUiZAa72hLj1NPeG6Qi
- 4AbL2HwLfJ8s6TeOCm6TXRRuD+w1o/ASFOqQmoao2dFyZ2BaoAgOKPKxXYfwVGceuUygpchyS
- 0d2bZYOXSLR+6rUYevjZAq1OCi9AIC6/wlkOe5yIRk4gJFMfPauaICsdnq3uZ9ikCAX83VWun
- PJVMxTLTP54lgo2h0jMBX3uKk10+/wzXWplllxX9NnSa3x1V28n6raslNF0IoC6Pm72kC6Jzr
- GkC22viCm3/Y4uHlPMOXbY5WFrQe/D9GKeJeXBLoGciNwIFkUG12a+iqWtoT+h5HVObTW8LxM
- +UtEl97nAwxYSM+sGfIpasRpZc7r/SgN3JWGO9R9WaXpW4Cc1dH7RI+hzuZDsDUBEGTUTVPDo
- 0SvjKHiJ6sUqGDyfv4HUgVutus6EYP27LALND4ekfom2DPRFopZhbtV5fZT7CL1Q1NogU7tYf
- /FdmR1T1J1zCAZSFvyR5LBkfglZlHzgdnTF2heuxyqKq4dm0hnLFSULB1+CVWsg8hzrruvO5q
- XzA6qIhBQUZmWo7wBpqpkBPxzjgTGGtXc5y5e6+crxYbbuQdnUWEnyw2xI4d6pJPqtHDA2/vT
- ZgvNDUGceavTR5Rtyb14hhX4Q6dWK3ATy16j4hs9Aq+q/IKyVAX3A5nFYbJRIz+2YnoLr2YOa
- IrScEorXjvTxjw+aBy73SZBe2REPzJ+O6k7chVrYjV9Q28FiGVuRYJYxWw/59Pes7IAbmfQBV
- 4vqGCQQr4eG78gVwjw+SNdp4/6jdNkIHDqR4XW9id/r5wYxKKj4UUkSor3/+h9Rd9srh+GApy
- uOxw/ejFvbRcxFIjvadpq1KLnO7nM27nJ4lp44ul3i7VUGefLM/45TCsuds2HM1iQWhPFQ54y
- SA5sYjf73EUJdkHchaf5i+4uSOmbOWQ4Yvmd8+IoyoXAxvEzY2Xh53nWi8ZPY1Tu4Bw8GRrz7
- L+VK0QiWCg3/hM7wRlFFyshmMrScMk5fOf9ynqd0JbHB7u+n4/GUwx3im/w8+NgSd3YOz7wNU
- KD1snDWoMUO8f23Ik1Osym688OLWNwKYT+mZbMIMXcz1fB+olRZn4czMhN5DiSb8hyOxRI8NE
- PNfaoN87CXiRkgazV6U1eiRkfcK2AvI7zOJF1tclUHZ9awyYoXtxfEzZ+J/2TCXiC7V2iSkUF
- EjwgPxlJmccccjsxc46v1ajnTxLo0tJbZ0+DJXWkCgQ0d/iiScQ=
-
-

test-data/message/posteo_ndn.eml

@@ -1,113 +0,0 @@
-Return-Path: <>
-Delivered-To: alice@posteo.org
-Received: from proxy02.posteo.name ([127.0.0.1])
-	by dovecot03.posteo.local (Dovecot) with LMTP id zvCFJRzX317LGQIA+3EWog
-	for <alice@posteo.org>; Tue, 09 Jun 2020 20:44:24 +0200
-Received: from proxy02.posteo.de ([127.0.0.1])
-	by proxy02.posteo.name (Dovecot) with LMTP id mhNkNAnR316xBQMAGFAyLg
-	; Tue, 09 Jun 2020 20:44:23 +0200
-Received: from mailin06.posteo.de (unknown [10.0.1.6])
-	by proxy02.posteo.de (Postfix) with ESMTPS id 49hJtv3RRcz11m7
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:23 +0200 (CEST)
-Received: from mx04.posteo.de (mailin06.posteo.de [127.0.0.1])
-	by mailin06.posteo.de (Postfix) with ESMTPS id 6935920DD2
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:23 +0200 (CEST)
-X-Virus-Scanned: amavisd-new at posteo.de
-X-Spam-Flag: NO
-X-Spam-Score: -1
-X-Spam-Level: 
-X-Spam-Status: No, score=-1 tagged_above=-1000 required=8
-	tests=[ALL_TRUSTED=-1] autolearn=disabled
-Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65])
-	by mx04.posteo.de (Postfix) with ESMTPS id 49hJtv001Vz10kT
-	for <alice@posteo.org>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Authentication-Results: mx04.posteo.de; dmarc=none (p=none dis=none) header.from=mout01.posteo.de
-Received: by mout01.posteo.de (Postfix)
-	id DCB6B1200DD; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Date: Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-From: MAILER-DAEMON@mout01.posteo.de (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: alice@posteo.org
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="B39111200B9.1591728262/mout01.posteo.de"
-Content-Transfer-Encoding: 7bit
-Message-Id: <20200609184422.DCB6B1200DD@mout01.posteo.de>
-
-This is a MIME-encapsulated message.
-
---B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Notification
-Content-Type: text/plain; charset=us-ascii
-
-This is the mail system at host mout01.posteo.de.
-
-I'm sorry to have to inform you that your message could not
-be delivered to one or more recipients. It's attached below.
-
-For further assistance, please send mail to postmaster.
-
-If you do so, please include this problem report. You can
-delete your own text from the attached returned message.
-
-                   The mail system
-
-<hanerthaertidiuea@gmx.de>: host mx01.emig.gmx.net[212.227.17.5] said: 550
-    Requested action not taken: mailbox unavailable (in reply to RCPT TO
-    command)
-
---B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Delivery report
-Content-Type: message/delivery-status
-
-Reporting-MTA: dns; mout01.posteo.de
-X-Postfix-Queue-ID: B39111200B9
-X-Postfix-Sender: rfc822; alice@posteo.org
-Arrival-Date: Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-
-Final-Recipient: rfc822; hanerthaertidiuea@gmx.de
-Original-Recipient: rfc822;hanerthaertidiuea@gmx.de
-Action: failed
-Status: 5.0.0
-Remote-MTA: dns; mx01.emig.gmx.net
-Diagnostic-Code: smtp; 550 Requested action not taken: mailbox unavailable
-
---B39111200B9.1591728262/mout01.posteo.de
-Content-Description: Undelivered Message Headers
-Content-Type: text/rfc822-headers
-
-Return-Path: <alice@posteo.org>
-Received: from mout01.posteo.de (unknown [10.0.0.65])
-	by mout01.posteo.de (Postfix) with ESMTPS id B39111200B9
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-Received: from submission-encrypt01.posteo.de (unknown [10.0.0.75])
-	by mout01.posteo.de (Postfix) with ESMTPS id 8A684160060
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017;
-	t=1591728262; bh=g3zLYH4xKxcPrHOD18z9YfpQcnk/GaJedfustWU5uGs=;
-	h=To:From:Subject:Date:From;
-	b=brJnt4PLAX3Tda1RHCo91aB1kMAL/Ku9dmO7D2DD41Zu5ShNsyqqyDkyxb1DsDn3O
-	 6KuBZe3/8gemBuCJ/mxzwd9v8sBnlrV+5afIk0Ye9VvthZsc4HoG79+FiVOi9F38o0
-	 DtJJFYFw/X7mAc5Xyt0B0JvtiTPpBdRAkluUQm+QW6cW6GGlwicVW19qvebzq+sHyP
-	 X2bZ8wpo78yVgvjPBK3DLaXa+pKFMBjLdDUcIE2bZnY6u6F1x8SXGKGBoxVwdJipJx
-	 v14so5IejNsf4LYJjH3Qb8xgK1aAi6e6nQn4YXV0INL6ahzgALiT9N6vwunNKYVJNi
-	 fPPKvBWDfUS4Q==
-Received: from customer (localhost [127.0.0.1])
-	by submission (posteo.de) with ESMTPSA id 49hJtt1WPbz6tmV
-	for <hanerthaertidiuea@gmx.de>; Tue,  9 Jun 2020 20:44:22 +0200 (CEST)
-To: hanerthaertidiuea@gmx.de
-From: deltachat <alice@posteo.org>
-Subject: test
-Message-ID: <04422840-f884-3e37-5778-8192fe22d8e1@posteo.de>
-Date: Tue, 9 Jun 2020 20:45:02 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
- Thunderbird/68.8.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-Content-Language: de-DE
-Posteo-User: alice@posteo.org
-Posteo-Dkim: ok
-
---B39111200B9.1591728262/mout01.posteo.de--

test-data/message/testrun_ndn.eml

@@ -1,107 +0,0 @@
-Return-Path: <>
-Delivered-To: alice@testrun.org
-Received: from hq5.merlinux.eu
-	by hq5.merlinux.eu (Dovecot) with LMTP id Ye02K6PB5F43cQAAPzvFDg
-	for <alice@testrun.org>; Sat, 13 Jun 2020 14:08:03 +0200
-Received: by hq5.merlinux.eu (Postfix)
-	id 9EBE627A0B2E; Sat, 13 Jun 2020 14:08:03 +0200 (CEST)
-Date: Sat, 13 Jun 2020 14:08:03 +0200 (CEST)
-From: MAILER-DAEMON@hq5.merlinux.eu (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: alice@testrun.org
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
-	boundary="CDB8D27A0B2C.1592050083/hq5.merlinux.eu"
-Content-Transfer-Encoding: 8bit
-Message-Id: <20200613120803.9EBE627A0B2E@hq5.merlinux.eu>
-
-This is a MIME-encapsulated message.
-
---CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Notification
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This is the mail system at host hq5.merlinux.eu.
-
-I'm sorry to have to inform you that your message could not
-be delivered to one or more recipients. It's attached below.
-
-For further assistance, please send mail to postmaster.
-
-If you do so, please include this problem report. You can
-delete your own text from the attached returned message.
-
-                   The mail system
-
-<hcksocnsofoejx@five.chat>: host mail.five.chat[195.62.125.103] said: 550 5.1.1
-    <hcksocnsofoejx@five.chat>: Recipient address rejected: User unknown in
-    virtual mailbox table (in reply to RCPT TO command)
-
---CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Delivery report
-Content-Type: message/global-delivery-status
-Content-Transfer-Encoding: 8bit
-
-Reporting-MTA: dns; hq5.merlinux.eu
-X-Postfix-Queue-ID: CDB8D27A0B2C
-X-Postfix-Sender: rfc822; alice@testrun.org
-Arrival-Date: Sat, 13 Jun 2020 14:08:01 +0200 (CEST)
-
-Final-Recipient: rfc822; hcksocnsofoejx@five.chat
-Original-Recipient: rfc822;hcksocnsofoejx@five.chat
-Action: failed
-Status: 5.1.1
-Remote-MTA: dns; mail.five.chat
-Diagnostic-Code: smtp; 550 5.1.1 <hcksocnsofoejx@five.chat>: Recipient address
-    rejected: User unknown in virtual mailbox table
-
---CDB8D27A0B2C.1592050083/hq5.merlinux.eu
-Content-Description: Undelivered Message
-Content-Type: message/global
-Content-Transfer-Encoding: 8bit
-
-Return-Path: <alice@testrun.org>
-Received: from localhost (p200300edb723070079835ce22985a199.dip0.t-ipconnect.de [IPv6:2003:ed:b723:700:7983:5ce2:2985:a199])
-	by hq5.merlinux.eu (Postfix) with UTF8SMTPSA id CDB8D27A0B2C;
-	Sat, 13 Jun 2020 14:08:01 +0200 (CEST)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=testrun.org;
-	s=testrun; t=1592050082;
-	bh=Kvhta0OMsTRVC7OlaAqo68TBE0KuGBv4vUBp6Ez/7VY=;
-	h=Subject:References:In-Reply-To:Date:To:From:From;
-	b=Ql60JEGFXLNvjsyihATw2z34ct++8xZvTPNw0snXe6+oqdqsRZJ9tWNDTxOgx8Iqf
-	 HQ4puBVGcWjIlszYQVLlq3APi04o2ep3GrD8EF0J0GpDdW8yw6wCos6Q8r+TWmXwET
-	 kGXHTRPVaUIqZF2i/utypxMfd1ua0S3jBDnIXTe/p2+XvfC3Cf3hZGW+FQ/Zd7G8Vh
-	 /U2rgX5BTIGf26ZCbmcMaXWkftgv6+yns0AmzorV9yB+EhTkWIUjk+C25bRtMbJ5mZ
-	 93dwdr+sXrrSZLSi+LBqc57Dv9j4p/SUmB4zPlvfUv7/bqLi36pypvtCJ5Ul8UEXSb
-	 XNFZPaEl+mwjA==
-Content-Type: text/plain; charset=utf-8
-Chat-Disposition-Notification-To: alice@testrun.org
-Subject: =?utf-8?q?Message_from_hocuri1=40testrun=2Eorg?=
-MIME-Version: 1.0
-References: <Mr.VSg3KXFUOTG.9sn7JBxZn1W@testrun.org>
-	<Mr.F4nR4LnXb6v.gqVbCJRgsmn@testrun.org>
-In-Reply-To: <Mr.F4nR4LnXb6v.gqVbCJRgsmn@testrun.org>
-Date: Sat, 13 Jun 2020 12:08:01 +0000
-X-Mailer: Delta Chat Core 1.35.0/Android 1.9.5
-Chat-Version: 1.0
-Autocrypt: addr=alice@testrun.org; prefer-encrypt=mutual;
-	keydata=xjMEXt3z1xYJKwYBBAHaRw8BAQdAf6MctU/8cmEqwEN9VFZ3gHBFIxKiEaARZl1DFUkI7e
-	rNFTxob2N1cmkxQHRlc3RydW4ub3JnPsKLBBAWCAAzAhkBBQJe3fPXAhsDBAsJCAcGFQgJCgsCAxYC
-	ARYhBIZ3ajRUkki89+04sgctAtaIXygAAAoJEActAtaIXygAG2IA/1nTmmmkHAc1Bjtx2FOstbaS+N
-	XHjxaK+hkoWllsyhz0AQDJJ1++u7jVZPRn/j1LlByrT3Jv/D1aY14J5rjj+ADVBM44BF7d89cSCisG
-	AQQBl1UBBQEBB0DpSTaZ30dAVwM9PkBe2h+gFyxn9HSorP4XCHJu/lIdPAMBCAfCeAQYFggAIAUCXt
-	3z1wIbDBYhBIZ3ajRUkki89+04sgctAtaIXygAAAoJEActAtaIXygA2QkA/16toWCtseYKw8G1X2j7
-	xYR3Cyabq37hgbesDOThIIzNAP0UCUS8mnunmkS5adEbftRaDi2JZoGxDw46jtJJ2+13Cw==
-Message-ID: <Mr.A7pTA5IgrUA.q4bP41vAJOp@testrun.org>
-To: <hcksocnsofoejx@five.chat>
-From:  <alice@testrun.org>
-
-F
-
--- 
-Sent with my Delta Chat Messenger: https://delta.chat
-
-
---CDB8D27A0B2C.1592050083/hq5.merlinux.eu--

test-data/message/yahoo_ndn.eml

@@ -1,100 +0,0 @@
-X-Atlas-Received: from 10.218.250.153 by atlas222.free.mail.ne1.yahoo.com with http; Wed, 10 Jun 2020 10:11:23 +0000
-Return-Path: <>
-Received: from 77.238.177.145 (EHLO sonic314-19.consmr.mail.ir2.yahoo.com)
- by atlas222.free.mail.ne1.yahoo.com with SMTPs; Wed, 10 Jun 2020 10:11:23 +0000
-X-Originating-Ip: [77.238.177.145]
-Received-SPF: none (domain of sonic314-19.consmr.mail.ir2.yahoo.com does not designate permitted sender hosts)
-Authentication-Results: atlas222.free.mail.ne1.yahoo.com;
- dkim=pass header.i=@yahoo.com header.s=@bounce;
- spf=none smtp.mailfrom=sonic314-19.consmr.mail.ir2.yahoo.com;
- dmarc=success(p=REJECT) header.from=yahoo.com;
-X-Apparently-To: alice@yahoo.com; Wed, 10 Jun 2020 10:11:23 +0000
-X-YMailISG: RT5ZnycWLDvIW52uqHS_EWNgl31NdJPyLLB2F4SYb1GCAoo9
- pcninuVU5GDMBZykeMT4cSUt4ZqXxS5FdEeWJqtGIAtbEGbIL8Uhcoszqm4m
- JuMJiQZwEE7W_fsS_9MUK5gZtMkhKkSnAuaeaOLKNYAwFZdBqA0uEYA5EmVf
- EC9J4RGQ4hZvrMqMj_W.cj4pvbEC.pyirLxTfkICuUkZVguYoxG16y1EOJPw
- B48fhXvF5ErU7WAHKxyRM3bMOg7b5pXHKn1dtRSVAXEuqBAQrWig1pePpYH1
- wO54sYT7cgmdiFvfLY5rR7YcBzopmKJBycKzBVoRLCY4gvoNyTLPKx9o3AAz
- WU4B7TGejDBElYSLpfnyvQg8wU27zzo2IVBZWUNztP0Ca8CQ07Y7TxUZAO.f
- DNO5c7nd81PHMRDbSeaw1BTV2Yd9vlBc7syYmwGvtVBJQwRU7qPN.DpFO2jC
- 9j9DytVhm5231gdBBRSzW78yG.VvaIdJgq_YViKNM9VxFseTz3Sjt3TaYznP
- gAVq.MxpopNsSZf_tedwAhXDWyrjKsRPK.v2ANivmuWGPednniEaMYhxJ05M
- _5SnJ.hAU.l6h3HCEfiU.SH390_3tZgYNfxCo4GPPFMfnNPmKa3.rgpChBCz
- 9CRexJ8BSFyCEeAhuqQ8vSJfSuittJmXvS6Tk8Rxd9HUJAtKzZ.xCWZQ4tA6
- Yp2aRG23_rK_C6hH8ArkkvbG.uVQTt6DltSX6avJLObBfIhBH0x64RoFjGee
- vYXxM741Okm0jH7r79c8GhnAwas_bwfkaTW9e1nhYP0eyI36z_QwLYgOH3Mm
- LrUcejpOMDR60QWDuDyRbWXOJdr3Q2K0ERhuAy6YnINq0sL3HX7t5wjsFLvp
- _7Ri_eruTfIst4C7DZwERwui6aDSEAdF1Z8oZukBVmiyZsHmhJQCUik646iy
- 3ASMR3lX7R3q2PBHQo2oC3qte8Fzz1FhKoMtfCGtIpeCazlkhDEJ6eTBSQ3R
- Pe7M_GPiv3QNp7qu5CWHlzy6hWEKIkNwx.WRGYzfxkyJMmJm4UrhQYUfa4lG
- Wb8n.mfYnS_KGYtzyRFNqAL0IGo.1MB9aG6qQk456Fz9GJgbHLWrMXVtyfrr
- Uo7mKih8FCrdUKv5X6KBnpY0vvyoH5jrWyrvo3DW0bq_JvZ9U51JwUhoGY5U
- c1t.yCSJbs8tnrGZHuUTOvouWzpCAJsk34AqRyH0wDJZQsAwBW5UZ3jx8ARA
- FicoSqZCa4wEP9WaaXvfzFbmLW0-
-X-Originating-IP: [77.238.177.145]
-Received: from 10.217.135.165  (EHLO sonic314-19.consmr.mail.ir2.yahoo.com) (77.238.177.145)
-  by mta4277.mail.ne1.yahoo.com with SMTPS; Wed, 10 Jun 2020 10:11:21 +0000
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=bounce; t=1591783879; bh=4BmZzBC/nu0AJ9r0i0xNuCENks2KZcuXCbjSHdzbg9Y=; h=Date:From:To:Subject:From:Subject; b=lPxu8goOGOLVgnwbndfdptZ7zI5VEo0lSSr+ONGxwdtuhrySKDU6Sp41/g6jWbAiVPT1947j/B5wOlPfa5tv4XkWrGf0JCbT1I20ZJIkNfNwt4F0qPnbJAiHFIDPxcY68utjC9IgPWJd0cGqJNXbFwbJBu88rtrbMoInzLakh5I=
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ir2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:11:19 +0000
-Date: Wed, 10 Jun 2020 10:11:19 +0000
-From: MAILER-DAEMON@yahoo.com
-To: alice@yahoo.com
-Message-ID: <1713051795.39992.1591783879940@sonic314.consmr.mail.ir2.yahoo.com>
-Subject: Failure Notice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-Content-Length: 3347
-
-Sorry, we were unable to deliver your message to the following address.
-
-<haeclirth.sinoenrat@yahoo.com>:
-554: delivery error: dd Not a valid recipient - atlas117.free.mail.ne1.yahoo.com
-
---- Below this line is a copy of the message.
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1591783876; bh=kXD6TZuQDjqZf/AEAJ2HCX32Titkj3IywytG6GSm4yQ=; h=Date:From:To:Subject:References:From:Subject; b=PexnIBxnVSkyutv/jVn+Wlt5QPuVHnWleP3baWlvqkXaKR51pCaZIoGJggMEonitEeJkcYpgplBawEBz0hlGf63NqOHHkxUk6U1olwc0y9kj5kDH5lrORgXrf7U4z5t+i5n0II36MxbG9n/5tDRXoiabLFoWx//3O9x/ZJvVWPlq8RBFzVG8aoL2TkBQAVcqX/vW1f3WJuopaUYWB4AzR3TyuC2kVQPFqbPMk+G/VmyuZFmZesh1bSBva5hdKYLxES5v8hvTIDRqSYZrnZ4V67MqicZ8m229Xf4Za8qOE+a2Z+Vv5VrQ+CjjPZwRAcmKHkLY80VCSkpeL2R2YG4APg==
-X-YMail-OSG: 4spnw98VM1k_g51CM6oepdNEMiPFRtZ0ZG_zOBGIlhcNvS1mkzr8l8VTB0CY_Q0
- dR52ikl7QVYESerRQgcGqBfLwKpem7i1XSrCl2HuyHeWzF6Gu5MqFPMCak.v8GyDXNO075NEwNt1
- i18CJ29cEjiHthoamgmj0oqerAglglKRhTuuAFy4wUmZZm7VyvaW4wHUD1g7DeWGijQsCglSYMUK
- CmoFcKsWOZBSYPMkp7iRwUp52pXHFin3qf4uQ27K_Sh.6s7KLAfWVkV7L_5AR3MyCPAVzm71.1yG
- G7Vy5HSBgGMQ90B7VbcjOkCg3F4JNl4Z_P2ejV1KZ.tNoPLgO.FmsfFy1OXBGf3m2mDmRcuEO4K2
- mTRhsjZf.2iiWpx02b3tY.oUtYrIBXBVIFPbTB9sBMn_9Z_qdVmO3gjD6gCPEBzuVvEO0eZIrgaw
- EDTZt8Z9tSRDm1.4gV8LWQBYShF7XuMV0togiLYIO8s_iTHcTbhKhPlwxP.mxr06xcx_9kzReVTL
- 9lB1FkB5Jm0WccWHGhLBqeMjGDoaNqPxLqJ.1tI58tLXsPoR6m1NFVEdzI1G.4AVBeXZ_9BjgUhm
- KY33sEg.GwIjUlWWWuSyRZ1q1K2nqi1z29wH2R1Glmdmx0lyqfMg9Xe8HV7YZu2CuZ8SlDLLB.rX
- NU4PwMsNfU6pK2HejQPsJuyOlI5Q824rXRF5xTLYKsYcQptoFXyLe6MXKW1ThBLQV2nWYDRs_V.e
- SBmt22TfuOwu4Y5ju0sXmztZ8zpiIC8_rnAa5bVBEHxzkic64UZdukDX9V12Pk3G2sGYRyPTH472
- wBX33JpDuq6BtrKr4FXjCLeVppARTHpiKM0jHMjmNf1bF0TvrcCsC9zAYtitAqgcGZNFETNuV3KM
- 57XifdDEwUPOuww0ApSWO.iwP2POvIRBVlrxdgA8MbLmuuX4UxNCw23z1f7MVY6F3L60LUrX5GZO
- aKaMmD1XTzx32J6c_TUmyuViT5vphqpEooTzHG2X7ALb4xC8yHlE4wDKyaEDARZ.8P2lO9T18oCz
- OQvJjwDaLOkeAmo23yRMn70bYJK3tP9Z5cS1C0TE8PEtz4sd1syQUIZZ2g8JG_AQcE4lUZSZlIKN
- AHjB8h8Uin35zKe0Le1DBjdQUmpgAETlmYE7V0nJDEmagB3dtpbokgRBuuBfhXlFpxHcnAmBFFFm
- XOSLWEPnmxu2o8CCjjz3QUBy2fr3EI_D2VFpy..MuZgRwtES.l24m_95xtQxI28R4SWZN6LsS_rr
- 1S33BJCCCAfXtCAFzCfz5.qSzHRYbLdY5do6yKj0pPLQTUTjlMwmCUGPcSJhsyxkkEVIK1W_Z16R
- ZRls-
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ir2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:11:16 +0000
-Date: Wed, 10 Jun 2020 10:11:12 +0000 (UTC)
-From: Delta Chat Test <alice@yahoo.com>
-To: "haeclirth.sinoenrat@yahoo.com" <haeclirth.sinoenrat@yahoo.com>
-Message-ID: <1680295672.3657931.1591783872936@mail.yahoo.com>
-Subject: test
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="----=_Part_3657930_145367320.1591783872935"
-References: <1680295672.3657931.1591783872936.ref@mail.yahoo.com>
-X-Mailer: WebService/1.1.16072 YMailNorrin Mozilla/5.0 (X11; Linux x86_64; rv:77.0) Gecko/20100101 Firefox/77.0
-Content-Length: 494
-
-------=_Part_3657930_145367320.1591783872935
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-test
-
-------=_Part_3657930_145367320.1591783872935
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<html><head></head><body><div class="yahoo-style-wrap" style="font-family:Helvetica Neue, Helvetica, Arial, sans-serif;font-size:16px;"><div dir="ltr" data-setdir="false">test<br></div></div></body></html>
-------=_Part_3657930_145367320.1591783872935--